[PATCH 1 of 2] Backed out changeset 27bcdee4e4a6
Wald Commits
scm-commit at wald.intevation.org
Mon Apr 28 12:15:49 CEST 2014
# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398680108 0
# Node ID 794ff2a4700a660c9b4baf4f2cebc63b6225fd91
# Parent 27bcdee4e4a6351b3daba2cbc2874c2dd6c5e5fa
Backed out changeset 27bcdee4e4a6
Make clean trap
diff -r 27bcdee4e4a6 -r 794ff2a4700a ui/l10n/administrator_de_DE.ts
--- a/ui/l10n/administrator_de_DE.ts Mon Apr 28 09:22:41 2014 +0000
+++ b/ui/l10n/administrator_de_DE.ts Mon Apr 28 10:15:08 2014 +0000
@@ -2,72 +2,94 @@
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>The root certificate lists are managed by the German <a href="https://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.
+
+</source>
+ <translation type="obsolete">Die Liste der Wurzelzertifikate wird vom <a href="https://www.bsi.bund.de">Bundesamt für Sicherheit in der Informationstechnik (BSI)</a> verwaltet.</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation type="obsolete">Schließen</translation>
+ </message>
+</context>
+<context>
<name>AdministratorWindow</name>
<message>
<location filename="../administratorwindow.cpp" line="33"/>
<location filename="../administratorwindow.cpp" line="101"/>
<source>TrustBridge Administration</source>
- <translation type="unfinished"></translation>
+ <translation>TrustBridge Verwaltung</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="51"/>
<source>Menu</source>
- <translation type="unfinished"></translation>
+ <translation>Menü</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="53"/>
<source>Create installer ...</source>
- <translation type="unfinished"></translation>
+ <translation>Installationspaket erstellen ...</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="54"/>
<source>About TrustBridge</source>
- <translation type="unfinished"></translation>
+ <translation>Über TrustBridge</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="56"/>
<source>Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Beenden</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="77"/>
<source>All managed root certificates of the certificate list: </source>
- <translation type="unfinished"></translation>
+ <translatorcomment>The english original should be improved</translatorcomment>
+ <translation>In der Liste enthaltene Zertifikate:</translation>
+ </message>
+ <message>
+ <location filename="../administratorwindow.cpp" line="142"/>
+ <source>Select certificate list file</source>
+ <translation>Zertifikatsliste auswählen</translation>
+ </message>
+ <message>
+ <source>All managed root certificates of the certificate list:</source>
+ <translation type="vanished">Alle verwalteten Wurzelzertifikate der Zertifikatsliste:</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="103"/>
<source>Management application of the BSI certificate installer</source>
- <translation type="unfinished"></translation>
+ <translation>Verwaltungsanwendung des BSI-Zertifikatsinstallers</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="113"/>
<source>Save list</source>
- <translation type="unfinished"></translation>
+ <translation>Liste speichern</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="115"/>
<source>Load list</source>
- <translation type="unfinished"></translation>
+ <translation>Liste laden</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="117"/>
<source>Add certificate</source>
- <translation type="unfinished"></translation>
+ <translation>Zertifikat hinzufügen</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="119"/>
<source>Remove certificate</source>
- <translation type="unfinished"></translation>
+ <translation>Zertifikat entfernen</translation>
</message>
<message>
- <location filename="../administratorwindow.cpp" line="142"/>
- <source>Select certificate list file</source>
- <translation type="unfinished"></translation>
+ <source>Select certificate file</source>
+ <translation type="vanished">Zertifikatslistendatei auswählen</translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="161"/>
<source>Select certificate</source>
- <translation type="unfinished"></translation>
+ <translation>Zertifikat auswählen</translation>
</message>
</context>
<context>
@@ -75,37 +97,37 @@
<message>
<location filename="../certificatetablemodel.cpp" line="16"/>
<source>Subject CN</source>
- <translation type="unfinished"></translation>
+ <translation>Inhaber CN</translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="17"/>
<source>Subject O</source>
- <translation type="unfinished"></translation>
+ <translation>Inhaber O</translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="18"/>
<source>Issuer CN</source>
- <translation type="unfinished"></translation>
+ <translation>Aussteller CN</translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="19"/>
<source>Issuer O</source>
- <translation type="unfinished"></translation>
+ <translation>Aussteller O</translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="20"/>
<source>Valid from</source>
- <translation type="unfinished"></translation>
+ <translation>Gültig ab</translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="21"/>
<source>Valid to</source>
- <translation type="unfinished"></translation>
+ <translation>Gültig bis</translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="22"/>
<source>SHA1 Fingerprint</source>
- <translation type="unfinished"></translation>
+ <translation>SHA1 Fingerabdruck</translation>
</message>
</context>
<context>
@@ -113,12 +135,99 @@
<message>
<location filename="../certificatetabledelegate.cpp" line="51"/>
<source>add</source>
- <translation type="unfinished"></translation>
+ <translation>hinzufügen</translation>
</message>
<message>
<location filename="../certificatetabledelegate.cpp" line="54"/>
<source>remove</source>
- <translation type="unfinished"></translation>
+ <translation>entfernen</translation>
+ </message>
+</context>
+<context>
+ <name>CreateCertListDialog</name>
+ <message>
+ <source>Save certificate list</source>
+ <translation type="vanished">Zertifikatsliste speichern</translation>
+ </message>
+ <message>
+ <source>Save all managed root certificates in a new, signed certificate list</source>
+ <translation type="vanished">Alle verwalteten Wurzelzertifikate in einer neuen, signierten Zertifikatsliste speichern</translation>
+ </message>
+ <message>
+ <source>In addition, each certificate list will be savedautomatically in the archive directory:
+</source>
+ <translation type="vanished">Zusätzlich wird jede Zertifikatsliste automatisch im folgenden Archiv-Verzeichnis gespeichert:</translation>
+ </message>
+ <message>
+ <source>Sign list</source>
+ <translation type="obsolete">Liste signieren</translation>
+ </message>
+ <message>
+ <source>Save all managed root certificates in a new, signed certificate list.</source>
+ <translation type="vanished">Eine neue, signierte Zertifikatsliste erstellen.</translation>
+ </message>
+ <message>
+ <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>
+ <source>Save list</source>
+ <translation type="vanished">Liste speichern</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation type="vanished">Abbrechen</translation>
+ </message>
+ <message>
+ <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 type="vanished">Fehler beim laden des Schlüssels: %1</translation>
+ </message>
+ <message>
+ <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>
+ <source>Select target location</source>
+ <translation type="vanished">Zielordner auswählen</translation>
+ </message>
+ <message>
+ <source>Please select a valid rsa key.</source>
+ <translation type="vanished">Kein Signaturschlüssel ausgewählt.</translation>
+ </message>
+ <message>
+ <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 "current_certificates".</translation>
+ </message>
+ <message>
+ <source>Saved certificate list:
+%1</source>
+ <translation type="vanished">Zertifikatsliste: %1 gespeichert.</translation>
</message>
</context>
<context>
@@ -127,7 +236,11 @@
<location filename="../createinstallerdialog.cpp" line="21"/>
<location filename="../createinstallerdialog.cpp" line="38"/>
<source>Create binary installer</source>
- <translation type="unfinished"></translation>
+ <translation>Installationspaket erstellen</translation>
+ </message>
+ <message>
+ <source>Create and signed a TrustBridge binary installer from source.</source>
+ <translation type="vanished">Ein TrustBridge-Installationspaket aus den Quellen erstellen und signieren.</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="40"/>
@@ -137,42 +250,49 @@
<message>
<location filename="../createinstallerdialog.cpp" line="51"/>
<source>Select source archive:</source>
- <translation type="unfinished"></translation>
+ <translation>Quellcode-Archiv auswählen:</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="52"/>
<source>Select code signing certificate (secret key):</source>
- <translation type="unfinished"></translation>
+ <translation>Code Signing Zertifikat auswählen (privater Schlüssel):</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="53"/>
<source>Select output folder:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabeverzeichnis auswählen:</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="82"/>
<source>Create installer</source>
- <translation type="unfinished"></translation>
+ <translation>Installationspaket erzeugen</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="84"/>
<source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>Abbrechen</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="109"/>
<source>Select certificate</source>
- <translation type="unfinished"></translation>
+ <translation>Zertifikat auswählen</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="116"/>
<source>Select source archive</source>
- <translation type="unfinished"></translation>
+ <translation>Archiv auswählen</translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="123"/>
<source>Select target location</source>
- <translation type="unfinished"></translation>
+ <translation>Zielort auswählen</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <source>Failed to parse certificate</source>
+ <translation type="vanished">Fehler beim Parsen des Zertifikats</translation>
</message>
</context>
</TS>
diff -r 27bcdee4e4a6 -r 794ff2a4700a ui/l10n/trustbridge_de_DE.ts
--- a/ui/l10n/trustbridge_de_DE.ts Mon Apr 28 09:22:41 2014 +0000
+++ b/ui/l10n/trustbridge_de_DE.ts Mon Apr 28 10:15:08 2014 +0000
@@ -66,172 +66,172 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../mainwindow.cpp" line="172"/>
+ <location filename="../mainwindow.cpp" line="171"/>
<source>An updated certificate list is available. Click here to install.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="180"/>
+ <location filename="../mainwindow.cpp" line="179"/>
<source>An update for %1 is available. Click here to install.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="271"/>
+ <location filename="../mainwindow.cpp" line="270"/>
<source>New Software version is available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="272"/>
+ <location filename="../mainwindow.cpp" line="271"/>
<source>Do you want to install the new Version?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="290"/>
+ <location filename="../mainwindow.cpp" line="289"/>
<source>Check for Updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="292"/>
- <location filename="../mainwindow.cpp" line="327"/>
- <location filename="../mainwindow.cpp" line="409"/>
+ <location filename="../mainwindow.cpp" line="291"/>
+ <location filename="../mainwindow.cpp" line="326"/>
+ <location filename="../mainwindow.cpp" line="408"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="310"/>
+ <location filename="../mainwindow.cpp" line="309"/>
<source>TrustBridge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="318"/>
+ <location filename="../mainwindow.cpp" line="317"/>
<source>Menu</source>
+ <translation>Menü</translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="319"/>
+ <source>Force Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="320"/>
- <source>Force Update</source>
+ <location filename="../mainwindow.cpp" line="384"/>
+ <source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="321"/>
- <location filename="../mainwindow.cpp" line="385"/>
- <source>Settings</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="322"/>
<source>Statusdialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="324"/>
+ <location filename="../mainwindow.cpp" line="323"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="325"/>
+ <location filename="../mainwindow.cpp" line="324"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="356"/>
+ <location filename="../mainwindow.cpp" line="355"/>
<source>Managed Certificates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="362"/>
- <location filename="../mainwindow.cpp" line="500"/>
- <location filename="../mainwindow.cpp" line="530"/>
+ <location filename="../mainwindow.cpp" line="361"/>
+ <location filename="../mainwindow.cpp" line="492"/>
+ <location filename="../mainwindow.cpp" line="522"/>
<source>Current List Date: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="386"/>
+ <location filename="../mainwindow.cpp" line="385"/>
<source>Autoupdate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="387"/>
+ <location filename="../mainwindow.cpp" line="386"/>
<source>Autostart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="405"/>
+ <location filename="../mainwindow.cpp" line="404"/>
<source>Install selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="426"/>
+ <location filename="../mainwindow.cpp" line="418"/>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="427"/>
+ <location filename="../mainwindow.cpp" line="419"/>
<source>Subject Common Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="428"/>
+ <location filename="../mainwindow.cpp" line="420"/>
<source>Subject Organisation:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="429"/>
+ <location filename="../mainwindow.cpp" line="421"/>
<source>Issuer Common Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="430"/>
+ <location filename="../mainwindow.cpp" line="422"/>
<source>Issuer Organisation:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="431"/>
+ <location filename="../mainwindow.cpp" line="423"/>
<source>Valid from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="432"/>
+ <location filename="../mainwindow.cpp" line="424"/>
<source>Valid to:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="433"/>
+ <location filename="../mainwindow.cpp" line="425"/>
<source>Fingerprint:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="532"/>
+ <location filename="../mainwindow.cpp" line="524"/>
<source>New List Date: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="536"/>
+ <location filename="../mainwindow.cpp" line="528"/>
<source>New certificates to install</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="541"/>
+ <location filename="../mainwindow.cpp" line="533"/>
<source>New certificates to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="546"/>
+ <location filename="../mainwindow.cpp" line="538"/>
<source>Old certificates to install</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="551"/>
+ <location filename="../mainwindow.cpp" line="543"/>
<source>Old certificates to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="637"/>
+ <location filename="../mainwindow.cpp" line="629"/>
<source>Error executing update</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="682"/>
+ <location filename="../mainwindow.cpp" line="674"/>
<source>Installing certificates...</source>
<translation type="unfinished"></translation>
</message>
More information about the Trustbridge-commits
mailing list