--- a/ui/l10n/administrator_de_DE.ts	Tue Apr 29 15:26:02 2014 +0200
+++ b/ui/l10n/administrator_de_DE.ts	Tue Apr 29 15:26:43 2014 +0200
@@ -4,45 +4,14 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../aboutdialog.cpp" line="35"/>
-        <source>TrustBridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="36"/>
-        <source>Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="50"/>
-        <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
         <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="../aboutdialog.cpp" line="55"/>
-        <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"></translation>
+        <translation type="obsolete">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="../aboutdialog.cpp" line="59"/>
-        <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"></translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="73"/>
         <source>Close</source>
-        <translation type="unfinished">Schließen</translation>
+        <translation type="obsolete">Schließen</translation>
     </message>
 </context>
 <context>
@@ -80,11 +49,21 @@
         <translation>In der Liste enthaltene Zertifikate:</translation>
     </message>
     <message>
-        <location filename="../administratorwindow.cpp" line="142"/>
+        <location filename="../administratorwindow.cpp" line="143"/>
         <source>Select certificate list file</source>
         <translation>Zertifikatsliste auswählen</translation>
     </message>
     <message>
+        <location filename="../administratorwindow.cpp" line="146"/>
+        <source>Error!</source>
+        <translation>Fehler!</translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="146"/>
+        <source>Failed to load the certificate list.</source>
+        <translation>Fehler beim Laden der Zertifikatsliste</translation>
+    </message>
+    <message>
         <source>All managed root certificates of the certificate list:</source>
         <translation type="vanished">Alle verwalteten Wurzelzertifikate der Zertifikatsliste:</translation>
     </message>
@@ -118,7 +97,7 @@
         <translation type="vanished">Zertifikatslistendatei auswählen</translation>
     </message>
     <message>
-        <location filename="../administratorwindow.cpp" line="161"/>
+        <location filename="../administratorwindow.cpp" line="163"/>
         <source>Select certificate</source>
         <translation>Zertifikat auswählen</translation>
     </message>
@@ -177,10 +156,8 @@
 <context>
     <name>CreateCertListDialog</name>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="30"/>
-        <location filename="../createcertlistdialog.cpp" line="52"/>
         <source>Save certificate list</source>
-        <translation>Zertifikatsliste speichern</translation>
+        <translation type="vanished">Zertifikatsliste speichern</translation>
     </message>
     <message>
         <source>Save all managed root certificates in a new, signed certificate list</source>
@@ -196,94 +173,78 @@
         <translation type="obsolete">Liste signieren</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="54"/>
         <source>Save all managed root certificates in a new, signed certificate list.</source>
-        <translation>Eine neue, signierte Zertifikatsliste erstellen.</translation>
-    </message>
-    <message>
-        <location filename="../createcertlistdialog.cpp" line="84"/>
-        <source>In addition, each certificate list will be saved automatically in the archive directory:
-</source>
-        <translation>Zusätzlich wird jede Zertifikatsliste automatisch in diesem Ordner Archiviert:</translation>
-    </message>
-    <message>
-        <location filename="../createcertlistdialog.cpp" line="94"/>
-        <source>Save list</source>
-        <translation>Liste speichern</translation>
+        <translation type="vanished">Eine neue, signierte Zertifikatsliste erstellen.</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="96"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../createcertlistdialog.cpp" line="121"/>
-        <source>Error!</source>
-        <translation>Fehler!</translation>
+        <source>In addition, each certificate list will be saved automatically in the archive directory:
+</source>
+        <translation type="vanished">Zusätzlich wird jede Zertifikatsliste automatisch in diesem Ordner Archiviert:</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="159"/>
-        <source>Select certificate</source>
-        <translation>Zertifikat auswählen</translation>
+        <source>Save list</source>
+        <translation type="vanished">Liste speichern</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="244"/>
-        <source>Failed to write list to: %1</source>
-        <translation>Fehler beim schreiben der Liste in Datei: %1</translation>
+        <source>Cancel</source>
+        <translation type="vanished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="137"/>
+        <source>Error!</source>
+        <translation type="vanished">Fehler!</translation>
+    </message>
+    <message>
+        <source>Select certificate</source>
+        <translation type="vanished">Zertifikat auswählen</translation>
+    </message>
+    <message>
+        <source>Failed to write list to: %1</source>
+        <translation type="vanished">Fehler beim schreiben der Liste in Datei: %1</translation>
+    </message>
+    <message>
         <source>Failed to load certificate: %1</source>
         <translatorcomment>English wording is wrong</translatorcomment>
-        <translation>Fehler beim laden des Schlüssels: %1</translation>
-    </message>
-    <message>
-        <location filename="../createcertlistdialog.cpp" line="148"/>
-        <source>Only 3072 bit RSA keys are supported by the current format.</source>
-        <translation>Nur 3027 bit RSA Schlüssel werden vom aktuellen Format unterstützt.</translation>
-    </message>
-    <message>
-        <location filename="../createcertlistdialog.cpp" line="172"/>
-        <source>Select target location</source>
-        <translation>Zielordner auswählen</translation>
-    </message>
-    <message>
-        <location filename="../createcertlistdialog.cpp" line="228"/>
-        <source>Please select a valid rsa key.</source>
-        <translation>Kein Signaturschlüssel ausgewählt.</translation>
+        <translation type="vanished">Fehler beim laden des Schlüssels: %1</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="231"/>
-        <source>Please select an output location first.</source>
-        <translation>Kein Zielordner angegeben.</translation>
-    </message>
-    <message>
-        <location filename="../createcertlistdialog.cpp" line="252"/>
-        <source>Failed to create archive location.</source>
-        <translation>Fehler beim erstellen des Archivordners.</translation>
+        <source>Only 3072 bit RSA keys are supported by the current format.</source>
+        <translation type="vanished">Nur 3027 bit RSA Schlüssel werden vom aktuellen Format unterstützt.</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="257"/>
-        <source>Failed Archive a copy.</source>
-        <translation>Fehler beim speichern der Archivkopie.</translation>
+        <source>Select target location</source>
+        <translation type="vanished">Zielordner auswählen</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="262"/>
-        <source>Failed to write current_certificates file.</source>
-        <translation>Fehler beim schreiben der Datei &quot;current_certificates&quot;.</translation>
+        <source>Please select a valid rsa key.</source>
+        <translation type="vanished">Kein Signaturschlüssel ausgewählt.</translation>
     </message>
     <message>
-        <location filename="../createcertlistdialog.cpp" line="266"/>
+        <source>Please select an output location first.</source>
+        <translation type="vanished">Kein Zielordner angegeben.</translation>
+    </message>
+    <message>
+        <source>Failed to create archive location.</source>
+        <translation type="vanished">Fehler beim erstellen des Archivordners.</translation>
+    </message>
+    <message>
+        <source>Failed Archive a copy.</source>
+        <translation type="vanished">Fehler beim speichern der Archivkopie.</translation>
+    </message>
+    <message>
+        <source>Failed to write current_certificates file.</source>
+        <translation type="vanished">Fehler beim schreiben der Datei &quot;current_certificates&quot;.</translation>
+    </message>
+    <message>
         <source>Saved certificate list:
 %1</source>
-        <translation>Zertifikatsliste: %1 gespeichert.</translation>
+        <translation type="vanished">Zertifikatsliste: %1 gespeichert.</translation>
     </message>
 </context>
 <context>
     <name>CreateInstallerDialog</name>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="21"/>
-        <location filename="../createinstallerdialog.cpp" line="38"/>
+        <location filename="../createinstallerdialog.cpp" line="25"/>
+        <location filename="../createinstallerdialog.cpp" line="50"/>
         <source>Create binary installer</source>
         <translation>Installationspaket erstellen</translation>
     </message>
@@ -292,47 +253,96 @@
         <translation type="vanished">Ein TrustBridge-Installationspaket aus den Quellen erstellen und signieren.</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="40"/>
-        <source>Create and sign a TrustBridge binary installer from source.</source>
-        <translation type="unfinished"></translation>
+        <source>Select source archive:</source>
+        <translation type="vanished">Quellcode-Archiv auswählen:</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="51"/>
-        <source>Select source archive:</source>
-        <translation>Quellcode-Archiv auswählen:</translation>
+        <source>Select code signing certificate (secret key):</source>
+        <translation type="vanished">Code Signing Zertifikat auswählen (privater Schlüssel):</translation>
     </message>
     <message>
         <location filename="../createinstallerdialog.cpp" line="52"/>
-        <source>Select code signing certificate (secret key):</source>
-        <translation>Code Signing Zertifikat auswählen (privater Schlüssel):</translation>
+        <source>Create and sign a TrustBridge binary installer.</source>
+        <translation>Erzeugt und signiert ein TrustBridge-Installationspaket.</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="53"/>
+        <location filename="../createinstallerdialog.cpp" line="63"/>
+        <source>Select binary folder:</source>
+        <translation>Binärverzeichnis auswählen:</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="64"/>
+        <source>Select code signing certificate:</source>
+        <translation>Code-Signing-Zertifikat auswählen:</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="65"/>
         <source>Select output folder:</source>
         <translation>Ausgabeverzeichnis auswählen:</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="82"/>
+        <location filename="../createinstallerdialog.cpp" line="94"/>
         <source>Create installer</source>
         <translation>Installationspaket erzeugen</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="84"/>
+        <location filename="../createinstallerdialog.cpp" line="96"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="109"/>
+        <location filename="../createinstallerdialog.cpp" line="116"/>
+        <source>Creating installer package...</source>
+        <translation>Installationspaket wird erstellt...</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="128"/>
         <source>Select certificate</source>
         <translation>Zertifikat auswählen</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="116"/>
-        <source>Select source archive</source>
-        <translation>Archiv auswählen</translation>
+        <location filename="../createinstallerdialog.cpp" line="139"/>
+        <source>Select binary folder</source>
+        <translation>Binärverzeichnis auswählen</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="123"/>
+        <location filename="../createinstallerdialog.cpp" line="157"/>
+        <source>Error!</source>
+        <translation>Fehler!</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="177"/>
+        <source>Please select an existing input folder.</source>
+        <translation>Bitte wählen Sie ein existierendes Eingabeverzeichnis.</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="181"/>
+        <source>Please select a codesigning certificate.</source>
+        <translation>Bitte wählen Sie ein Code-Signing-Zertifikat.</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="185"/>
+        <source>Please select a output folder.</source>
+        <translation>Bitte wählen Sie ein Ausgabeverzeichnis.</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="192"/>
+        <source>Folder %1 does not appear to contain a meta.ini</source>
+        <translation>Das Verzeichnis %1 enthält keine meta.ini Datei</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="217"/>
+        <source>Failed to start makensis.
+Please ensure that makensis is installed and in your PATH variable.</source>
+        <translation>Fehler beim Starten von makensis.
+Bitte versichern Sie sich, dass makensis korrekt installiert und in der PATH-Variable enthalten ist.</translation>
+    </message>
+    <message>
+        <source>Select source archive</source>
+        <translation type="vanished">Archiv auswählen</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="149"/>
         <source>Select target location</source>
         <translation>Zielort auswählen</translation>
     </message>
@@ -340,22 +350,8 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../certificate.cpp" line="75"/>
-        <source>Certificate:
-    &lt;bold&gt;%1&lt;/bold&gt;
-    %2, %3
-
-Serial number:
-%4
-Valid from: &lt;bold&gt;%5&lt;/bold&gt; to &lt;bold&gt;%6&lt;/bold&gt;
-
-Issued by: ..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../certificate.cpp" line="129"/>
         <source>Failed to parse certificate</source>
-        <translation>Fehler beim Parsen des Zertifikats</translation>
+        <translation type="vanished">Fehler beim Parsen des Zertifikats</translation>
     </message>
 </context>
 </TS>