--- a/ui/l10n/trustbridge_de_DE.ts	Wed Jun 25 15:31:08 2014 +0200
+++ b/ui/l10n/trustbridge_de_DE.ts	Wed Jun 25 15:31:23 2014 +0200
@@ -52,6 +52,72 @@
     </message>
 </context>
 <context>
+    <name>CertificateItemWidget</name>
+    <message>
+        <location filename="../certificateitemwidget.cpp" line="35"/>
+        <source>install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificateitemwidget.cpp" line="37"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificateitemwidget.cpp" line="54"/>
+        <source>deinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificateitemwidget.cpp" line="56"/>
+        <source>leave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CertificateListWidget</name>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="37"/>
+        <source>Details</source>
+        <translation type="unfinished">Details</translation>
+    </message>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="38"/>
+        <source>Subject Common Name:</source>
+        <translation type="unfinished">Inhaber CN:</translation>
+    </message>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="39"/>
+        <source>Subject Organisation:</source>
+        <translation type="unfinished">Inhaber Organisation:</translation>
+    </message>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="40"/>
+        <source>Issuer Common Name:</source>
+        <translation type="unfinished">Aussteller CN:</translation>
+    </message>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="41"/>
+        <source>Issuer Organisation:</source>
+        <translation type="unfinished">Aussteller Organisation:</translation>
+    </message>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="42"/>
+        <source>Valid from:</source>
+        <translation type="unfinished">Gültig ab:</translation>
+    </message>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="43"/>
+        <source>Valid to:</source>
+        <translation type="unfinished">Gültig bis:</translation>
+    </message>
+    <message>
+        <location filename="../certificatelistwidget.cpp" line="44"/>
+        <source>Fingerprint:</source>
+        <translation type="unfinished">Fingerprint:</translation>
+    </message>
+</context>
+<context>
     <name>HelpDialog</name>
     <message>
         <location filename="../helpdialog.cpp" line="25"/>
@@ -102,13 +168,13 @@
         <translation>Der Prozess ist fehlgeschlagen. Fehlercode: %1</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="165"/>
+        <location filename="../installwrapper.cpp" line="190"/>
         <source>Failed to start installer process.</source>
         <translation>Fehler beim Starten des Installer-Prozess.</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="173"/>
-        <location filename="../installwrapper.cpp" line="178"/>
+        <location filename="../installwrapper.cpp" line="199"/>
+        <location filename="../installwrapper.cpp" line="204"/>
         <source>Failed to complete installation.</source>
         <translation>Fehler beim Abschließen der Installation.</translation>
     </message>
@@ -116,7 +182,7 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="228"/>
+        <location filename="../mainwindow.cpp" line="230"/>
         <source>An updated certificate list is available. Click here to install.</source>
         <translation>Eine aktualisierte Zertifikatsliste ist verfügbar. Klicken Sie hier zum Installieren.</translation>
     </message>
@@ -134,158 +200,294 @@
         <translation type="vanished">Möchten Sie die neue Version installieren?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="399"/>
+        <location filename="../mainwindow.cpp" line="401"/>
         <source>Check for Updates</source>
         <translation>Aktualisierungen prüfen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="401"/>
-        <location filename="../mainwindow.cpp" line="434"/>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="403"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="419"/>
+        <location filename="../mainwindow.cpp" line="421"/>
+        <location filename="../mainwindow.cpp" line="725"/>
         <source>TrustBridge</source>
         <translation>TrustBridge</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="427"/>
-        <source>Menu</source>
-        <translation>Menü</translation>
+        <location filename="../mainwindow.cpp" line="463"/>
+        <source>Updates</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="429"/>
-        <source>Force Update</source>
-        <translation>Aktualisierung erzwingen</translation>
+        <location filename="../mainwindow.cpp" line="473"/>
+        <source>Trusted
+Certificates</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="692"/>
+        <source>Certificates to remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="491"/>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="482"/>
+        <source>Certificates
+to remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="534"/>
+        <location filename="../mainwindow.cpp" line="805"/>
+        <location filename="../mainwindow.cpp" line="882"/>
+        <source>Updates (%1/%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="536"/>
+        <location filename="../mainwindow.cpp" line="885"/>
+        <source>Last certificate update: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="538"/>
+        <source>Last Software update: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="540"/>
+        <source>The following certificate changes are recommended.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="548"/>
+        <source>Search for Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="550"/>
+        <source>Quit without saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="552"/>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="810"/>
+        <location filename="../mainwindow.cpp" line="889"/>
+        <source>Install new Certificates (%1/%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="586"/>
+        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="620"/>
+        <location filename="../mainwindow.cpp" line="1094"/>
+        <location filename="../mainwindow.cpp" line="1108"/>
+        <location filename="../mainwindow.cpp" line="1121"/>
+        <source>Show Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="815"/>
+        <location filename="../mainwindow.cpp" line="895"/>
+        <source>Remove Certificates (%1/%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="618"/>
+        <location filename="../mainwindow.cpp" line="900"/>
+        <location filename="../mainwindow.cpp" line="1020"/>
+        <location filename="../mainwindow.cpp" line="1030"/>
+        <source>Manualy changed Certificates (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="662"/>
+        <source>Trusted Certificates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="663"/>
+        <source>The following list of root certificates was created by the BSI. The BSI vaidates authenticity, security and actuality of these certificates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="669"/>
+        <source>Please choose the certificates you want to trust. TrustBridge will install these certificates for secure communication via email or the internet (e.g. IE, Firefox, Thunderbird)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="693"/>
+        <source>The following list of root certificates was created by the BSI. The BSI validates authenticity, security and actuality of these certificates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="699"/>
+        <source>Please choose the certificates you want to remove. TrustBridge will remove these certificates.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="726"/>
+        <source>Version: </source>
+        <translation type="unfinished">Version:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="743"/>
+        <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
+        <translation type="unfinished">TrustBridge ist eine Wurzelzertifikatsinstaller für Windows und Linux.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="748"/>
+        <source>The root certificate lists are managed by the German &lt;a href=&quot;https://www.bsi.bund.de&quot;&gt;Federal Office for Information Security (BSI)&lt;/a&gt;.
+
+</source>
+        <translation type="unfinished">Die Liste der Wurzelzertifikate wird vom &lt;a href=&quot;https://www.bsi.bund.de&quot;&gt;Bundesamt für Sicherheit in der Informationstechnik (BSI)&lt;/a&gt; verwaltet.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="754"/>
+        <source>The software was developed by the companies &lt;a href=&quot;http://www.intevation.de&quot;&gt;Intevation GmbH&lt;/a&gt; and  &lt;a href=&quot;http://www.dn-systems.de&quot;&gt;DN-Systems GmbH&lt;/a&gt;, &lt;br&gt; contracted by the German Federal Office for Information Security (BSI).
+
+</source>
+        <translation type="unfinished">Die Liste der Wurzelzertifikate wird vom &lt;a href=&quot;https://www.bsi.bund.de&quot;&gt;Bundesamt für Sicherheit in der Informationstechnik (BSI)&lt;/a&gt; verwaltet.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="761"/>
+        <source>TrustBridge is Free Software licensed under GNU GPL v2+.
+
+Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
+        <translation type="unfinished">TrustBridge ist Freie Software, lizensiert unter der GNU GPL v2+.
+
+Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik (BSI)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1088"/>
+        <location filename="../mainwindow.cpp" line="1102"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <source>Hide Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="vanished">Menü</translation>
+    </message>
+    <message>
+        <source>Force Update</source>
+        <translation type="vanished">Aktualisierung erzwingen</translation>
+    </message>
+    <message>
         <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <translation type="vanished">Einstellungen</translation>
     </message>
     <message>
         <source>Statusdialog</source>
         <translation type="vanished">Statusdialog</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="236"/>
+        <location filename="../mainwindow.cpp" line="238"/>
         <source>An update for %1 is available.
 Click here to download and install the update.</source>
         <translation>Eine Aktualisierung für %1 ist verfügbar.
 Hier klicken, um Download und Installation zu starten.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="431"/>
         <source>Help</source>
-        <translation>Hilfe</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="432"/>
-        <source>About</source>
-        <translatorcomment>&quot;TrustBridge&quot; ergänzen</translatorcomment>
-        <translation>Über TrustBridge</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="461"/>
-        <source>Managed Certificates</source>
-        <translation>Verwaltete Zertifikate</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="605"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <source>Current List Date: %1</source>
-        <translation>Datum der aktuellen Liste: %1</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <source>Autoupdate</source>
-        <translation>Automatische Aktualisierung</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="492"/>
-        <source>Autostart</source>
-        <translation>Start der Anwendung bei Systemstart</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="510"/>
-        <source>Install selected</source>
-        <translation>Jetzt installieren</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="531"/>
-        <source>Details</source>
-        <translation>Details</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="532"/>
-        <source>Subject Common Name:</source>
-        <translation>Inhaber CN:</translation>
+        <translation type="vanished">Hilfe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="533"/>
-        <source>Subject Organisation:</source>
-        <translation>Inhaber Organisation:</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="534"/>
-        <source>Issuer Common Name:</source>
-        <translation>Aussteller CN:</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="535"/>
-        <source>Issuer Organisation:</source>
-        <translation>Aussteller Organisation:</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="536"/>
-        <source>Valid from:</source>
-        <translation>Gültig ab:</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="537"/>
-        <source>Valid to:</source>
-        <translation>Gültig bis:</translation>
+        <source>About</source>
+        <translatorcomment>&quot;TrustBridge&quot; ergänzen</translatorcomment>
+        <translation type="vanished">Über TrustBridge</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="538"/>
-        <source>Fingerprint:</source>
-        <translation>Fingerprint:</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="637"/>
-        <source>New List Date: %1</source>
-        <translation>Datum der neuen Liste: %1</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="642"/>
-        <source>New certificates to install</source>
-        <translation>Neu zu installierende Zertifikate</translation>
+        <source>Managed Certificates</source>
+        <translation type="vanished">Verwaltete Zertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="649"/>
-        <source>New certificates to remove</source>
-        <translation>Neu zu löschende Zertifikate</translation>
+        <source>Current List Date: %1</source>
+        <translation type="vanished">Datum der aktuellen Liste: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="656"/>
-        <source>Old certificates to install</source>
-        <translation>Bisher installierte Zertifikate</translation>
+        <source>Autoupdate</source>
+        <translation type="vanished">Automatische Aktualisierung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="663"/>
-        <source>Old certificates to remove</source>
-        <translation>Bisher gelöschte Zertifikate</translation>
+        <source>Autostart</source>
+        <translation type="vanished">Start der Anwendung bei Systemstart</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="738"/>
+        <source>Install selected</source>
+        <translation type="vanished">Jetzt installieren</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Details</translation>
+    </message>
+    <message>
+        <source>Subject Common Name:</source>
+        <translation type="vanished">Inhaber CN:</translation>
+    </message>
+    <message>
+        <source>Subject Organisation:</source>
+        <translation type="vanished">Inhaber Organisation:</translation>
+    </message>
+    <message>
+        <source>Issuer Common Name:</source>
+        <translation type="vanished">Aussteller CN:</translation>
+    </message>
+    <message>
+        <source>Issuer Organisation:</source>
+        <translation type="vanished">Aussteller Organisation:</translation>
+    </message>
+    <message>
+        <source>Valid from:</source>
+        <translation type="vanished">Gültig ab:</translation>
+    </message>
+    <message>
+        <source>Valid to:</source>
+        <translation type="vanished">Gültig bis:</translation>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation type="vanished">Fingerprint:</translation>
+    </message>
+    <message>
+        <source>New List Date: %1</source>
+        <translation type="vanished">Datum der neuen Liste: %1</translation>
+    </message>
+    <message>
+        <source>New certificates to install</source>
+        <translation type="vanished">Neu zu installierende Zertifikate</translation>
+    </message>
+    <message>
+        <source>New certificates to remove</source>
+        <translation type="vanished">Neu zu löschende Zertifikate</translation>
+    </message>
+    <message>
+        <source>Old certificates to install</source>
+        <translation type="vanished">Bisher installierte Zertifikate</translation>
+    </message>
+    <message>
+        <source>Old certificates to remove</source>
+        <translation type="vanished">Bisher gelöschte Zertifikate</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="905"/>
         <source>Error executing update</source>
         <translation>Fehler bei der Aktualisierung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="783"/>
+        <location filename="../mainwindow.cpp" line="956"/>
         <source>Installing certificates...</source>
         <translation>Zertifikate werden installiert...</translation>
     </message>