[PATCH] (issue63) Updated message box text for normal user
Wald Commits
scm-commit at wald.intevation.org
Thu Aug 21 16:55:42 CEST 2014
# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1408632891 -7200
# Node ID ca997bc0f7902af74d1fca8e68e69f785a1d7f23
# Parent 1b77124aea4df3af4366b5904b08d93eb91c397b
(issue63) Updated message box text for normal user.
diff -r 1b77124aea4d -r ca997bc0f790 .hgignore
--- a/.hgignore Thu Aug 21 15:42:32 2014 +0200
+++ b/.hgignore Thu Aug 21 16:54:51 2014 +0200
@@ -1,4 +1,4 @@
-manuals/.venv
-manuals/help-manual/_build
-manuals/admin-manual/_build
-.swp
+build-linux
+build-windows
+build-i386
+testing
diff -r 1b77124aea4d -r ca997bc0f790 ui/l10n/administrator_de_DE.ts
--- a/ui/l10n/administrator_de_DE.ts Thu Aug 21 15:42:32 2014 +0200
+++ b/ui/l10n/administrator_de_DE.ts Thu Aug 21 16:54:51 2014 +0200
@@ -6,65 +6,37 @@
<message>
<location filename="../aboutdialog.cpp" line="31"/>
<source>TrustBridge</source>
- <translation>TrustBridge</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="32"/>
<source>Version: </source>
- <translation>Version:</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="44"/>
<source>TrustBridge is a root certificate installer for Windows and GNU/Linux.<br/></source>
- <translation>TrustBridge ist ein Wurzelzertifikatsinstaller für Windows und Linux.<br/></translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="46"/>
<source>The root certificate lists are managed by the German <a href="https://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.<br/><br/></source>
- <translation>Die Liste der Wurzelzertifikate wird vom <a href="https://www.bsi.bund.de">Bundesamt für Sicherheit in der Informationstechnik (BSI)</a> verwaltet. <br/><br/></translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="49"/>
<source>The software was developed by the companies <a href="http://www.intevation.de">Intevation GmbH</a> and <a href="http://www.dn-systems.de">DN-Systems GmbH</a>, <br> contracted by the German Federal Office for Information Security (BSI).<br/><br/></source>
- <translation>Die Software wurde entwickelt von den Unternehmen <a href="http://www.intevation.net">Intevation GmbH</a> und <a href="http://www.dn-systems.com">DN-Systems GmbH</a>, <br> beauftragt durch das Bundesamt für Sicherheit in der Informationstechnik (BSI).<br/><br/></translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="53"/>
<source>TrustBridge is Free Software licensed under GNU GPL v2+.<br/><br/>Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
- <translation>TrustBridge ist Freie Software, lizensiert unter der GNU GPL v2+.<br/><br/>Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik (BSI)</translation>
- </message>
- <message>
- <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
- <translation type="vanished">TrustBridge ist ein sicherer Wurzelzertifikatsinstaller für Windows und Linux.</translation>
- </message>
- <message>
- <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
- <translation type="vanished">TrustBridge ist ein Wurzelzertifikatsinstaller für Windows und Linux.</translation>
- </message>
- <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="vanished">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>The software was developed by the companies <a href="http://www.intevation.de">Intevation GmbH</a> and <a href="http://www.dn-systems.de">DN-Systems GmbH</a>, <br> contracted by the German Federal Office for Information Security (BSI).
-
-</source>
- <translation type="vanished">Die Software wurde entwickelt von den Unternehmen <a href="http://www.intevation.net">Intevation GmbH</a> und <a href="http://www.dn-systems.com">DN-Systems GmbH</a>, <br> beauftragt durch das Bundesamt für Sicherheit in der Informationstechnik (BSI).</translation>
- </message>
- <message>
- <source>TrustBridge is Free Software licensed under GNU GPL v2+.
-
-Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
- <translation type="vanished">TrustBridge ist Freie Software, lizensiert unter der GNU GPL v2+.
-
-Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik (BSI)</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="66"/>
<source>Close</source>
- <translation>Schließen</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -73,141 +45,124 @@
<location filename="../administratorwindow.cpp" line="34"/>
<location filename="../administratorwindow.cpp" line="102"/>
<source>TrustBridge Administration</source>
- <translation>TrustBridge Verwaltung</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="52"/>
<source>Menu</source>
- <translation>Menü</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="54"/>
<source>Create installer ...</source>
- <translation>Installationspaket erstellen ...</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="55"/>
<source>About TrustBridge</source>
- <translation>Über TrustBridge</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="57"/>
<source>Quit</source>
- <translation>Beenden</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="78"/>
<source>All managed root certificates of the certificate list: </source>
- <translatorcomment>The english original should be improved</translatorcomment>
- <translation>In der Liste enthaltene Zertifikate:</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../administratorwindow.cpp" line="104"/>
+ <source>Management application of the BSI certificate installer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../administratorwindow.cpp" line="114"/>
+ <source>Save list</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../administratorwindow.cpp" line="116"/>
+ <source>Load list</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../administratorwindow.cpp" line="118"/>
+ <source>Add certificate</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../administratorwindow.cpp" line="120"/>
+ <source>Remove certificate</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="144"/>
<source>Select certificate list file</source>
- <translation>Zertifikatsliste auswählen</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="150"/>
<location filename="../administratorwindow.cpp" line="234"/>
<location filename="../administratorwindow.cpp" line="244"/>
<source>Error!</source>
- <translation>Fehler!</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="150"/>
<source>Failed to load the certificate list.</source>
- <translation>Fehler beim Laden der Zertifikatsliste.</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../administratorwindow.cpp" line="171"/>
+ <source>Select certificate</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="234"/>
<source>Failed to open log file: </source>
- <translation>Fehler beim Öffnen der Log-Datei:</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="235"/>
<location filename="../administratorwindow.cpp" line="245"/>
<source> Changes are not logged!</source>
- <translation> Änderungen wurden nicht geloggt!</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="244"/>
<source>Failed to write log file: </source>
- <translation>Fehler beim Schreiben der Log-Datei: </translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="262"/>
<source> new certificatelist </source>
- <translation> neue Zertifikatsliste </translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="264"/>
<source> based on list from </source>
- <translation> basiert auf der Liste vom </translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="267"/>
- <source>signing certificate:
+ <source>signing certificate:
</source>
- <translation>Signaturzertifikat:
-</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="270"/>
- <source>
-new certificates:
+ <source>
+new certificates:
</source>
- <translation>Neue Zertifikate:
-</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../administratorwindow.cpp" line="284"/>
- <source>certificates marked to remove:
+ <source>certificates marked to remove:
</source>
- <translation>Zertifikate zum löschen markiert:
-</translation>
- </message>
- <message>
- <source>new certificates:
-</source>
- <translation type="vanished">Neues Zertifikat:</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="104"/>
- <source>Management application of the BSI certificate installer</source>
- <translation>Verwaltungsanwendung des BSI-Zertifikatsinstallers</translation>
- </message>
- <message>
- <location filename="../administratorwindow.cpp" line="114"/>
- <source>Save list</source>
- <translation>Liste speichern</translation>
- </message>
- <message>
- <location filename="../administratorwindow.cpp" line="116"/>
- <source>Load list</source>
- <translation>Liste laden</translation>
- </message>
- <message>
- <location filename="../administratorwindow.cpp" line="118"/>
- <source>Add certificate</source>
- <translation>Zertifikat hinzufügen</translation>
- </message>
- <message>
- <location filename="../administratorwindow.cpp" line="120"/>
- <source>Remove certificate</source>
- <translation>Zertifikat entfernen</translation>
- </message>
- <message>
- <source>Select certificate file</source>
- <translation type="vanished">Zertifikatslistendatei auswählen</translation>
- </message>
- <message>
- <location filename="../administratorwindow.cpp" line="171"/>
- <source>Select certificate</source>
- <translation>Zertifikat auswählen</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -215,32 +170,32 @@
<message>
<location filename="../certificatediffdialog.cpp" line="22"/>
<source>TrustBridge - List changes</source>
- <translation>TrustBridge - Listenänderungen</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatediffdialog.cpp" line="33"/>
<source>The following certificates are changed:</source>
- <translation>Die folgenden Zertifikate wurden geändert:</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatediffdialog.cpp" line="41"/>
<source>New</source>
- <translation>Neu</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatediffdialog.cpp" line="41"/>
<source>Remove</source>
- <translation>Entfernen</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatediffdialog.cpp" line="50"/>
<source>Ok</source>
- <translation>Ok</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatediffdialog.cpp" line="51"/>
<source>Cancel</source>
- <translation>Abbrechen</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -248,39 +203,27 @@
<message>
<location filename="../certificatetablemodel.cpp" line="16"/>
<source>Subject CN</source>
- <translation>Inhaber CN</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="17"/>
<source>Subject O</source>
- <translation>Inhaber O</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../certificatetablemodel.cpp" line="18"/>
+ <source>Valid from</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../certificatetablemodel.cpp" line="19"/>
+ <source>Valid to</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatetablemodel.cpp" line="20"/>
<source>Fingerprint (SHA1)</source>
- <translation>Fingerabdruck (SHA1)</translation>
- </message>
- <message>
- <source>Issuer CN</source>
- <translation type="vanished">Aussteller CN</translation>
- </message>
- <message>
- <source>Issuer O</source>
- <translation type="vanished">Aussteller O</translation>
- </message>
- <message>
- <location filename="../certificatetablemodel.cpp" line="18"/>
- <source>Valid from</source>
- <translation>Gültig ab</translation>
- </message>
- <message>
- <location filename="../certificatetablemodel.cpp" line="19"/>
- <source>Valid to</source>
- <translation>Gültig bis</translation>
- </message>
- <message>
- <source>SHA1 Fingerprint</source>
- <translation type="vanished">SHA1 Fingerabdruck</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -288,12 +231,12 @@
<message>
<location filename="../certificatetabledelegate.cpp" line="51"/>
<source>add</source>
- <translation>hinzufügen</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificatetabledelegate.cpp" line="54"/>
<source>remove</source>
- <translation>entfernen</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -302,123 +245,109 @@
<location filename="../createcertlistdialog.cpp" line="30"/>
<location filename="../createcertlistdialog.cpp" line="52"/>
<source>Save certificate list</source>
- <translation>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>
+ <translation type="unfinished"></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>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="65"/>
+ <source>Select signing key:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="66"/>
+ <source>Select output folder:</source>
+ <translation type="unfinished"></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>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="94"/>
<source>Save list</source>
- <translation>Liste speichern</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="96"/>
<source>Cancel</source>
- <translation>Abbrechen</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="121"/>
<source>Error!</source>
- <translation>Fehler!</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="137"/>
+ <source>Failed to load certificate: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="148"/>
+ <source>Only 3072 bit RSA keys are supported by the current format.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="159"/>
<source>Select certificate</source>
- <translation>Zertifikat auswählen</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="172"/>
+ <source>Select target location</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="228"/>
+ <source>Please select a valid rsa key.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="231"/>
+ <source>Please select an output location first.</source>
+ <translation type="unfinished"></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>
- </message>
- <message>
- <location filename="../createcertlistdialog.cpp" line="137"/>
- <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="65"/>
- <source>Select signing key:</source>
- <translation>Signaturschlüssel auswählen:</translation>
- </message>
- <message>
- <location filename="../createcertlistdialog.cpp" line="66"/>
- <source>Select output folder:</source>
- <translation>Ausgabeverzeichnis auswählen:</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>
- </message>
- <message>
- <location filename="../createcertlistdialog.cpp" line="231"/>
- <source>Please select an output location first.</source>
- <translation>Kein Zielordner angegeben.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="252"/>
<source>Failed to create archive location.</source>
- <translation>Fehler beim erstellen des Archivordners.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="257"/>
<source>Failed Archive a copy.</source>
- <translation>Fehler beim speichern der Archivkopie.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="265"/>
<source>Failed to update current_certificates.txt</source>
- <translation>Fehler beim Aktualisieren von current_certificates.txt</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="271"/>
<source>Failed to write current_certificates file.</source>
- <translation>Fehler beim schreiben der Datei "current_certificates".</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="284"/>
<source>Failed to calculate key hash.</source>
- <translation>Fehler bei der Berechnung des Schlüsselfingerabdrucks.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createcertlistdialog.cpp" line="302"/>
<source>Saved certificate list:
%1</source>
- <translation>Zertifikatsliste gespeichert: %1</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -427,226 +356,192 @@
<location filename="../createinstallerdialog.cpp" line="47"/>
<location filename="../createinstallerdialog.cpp" line="72"/>
<source>Create binary installer</source>
- <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>
- <source>Select source archive:</source>
- <translation type="vanished">Quellcode-Archiv auswählen:</translation>
- </message>
- <message>
- <source>Select code signing certificate (secret key):</source>
- <translation type="vanished">Code Signing Zertifikat auswählen (privater Schlüssel):</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="74"/>
<source>Create and sign a TrustBridge binary installer.</source>
- <translation>Erzeugt und signiert ein TrustBridge-Installationspaket.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="85"/>
<source>Select binary folder:</source>
- <translation>Binärverzeichnis auswählen:</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="86"/>
<source>Select code signing certificate:</source>
- <translation>Code-Signing-Zertifikat auswählen:</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="87"/>
<source>Select output folder:</source>
- <translation>Ausgabeverzeichnis auswählen:</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="116"/>
<source>Create installer</source>
- <translation>Installationspaket erzeugen</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="118"/>
<source>Cancel</source>
- <translation>Abbrechen</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="149"/>
+ <source>Select certificate</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="160"/>
+ <source>Select binary folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="170"/>
+ <source>Select target location</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="178"/>
+ <source>Error!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="187"/>
+ <source>Created installer in %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="190"/>
+ <source>Signing installer package...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="192"/>
+ <source>Failed to sign installer package.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="212"/>
<source>Creating installer package...</source>
- <translation>Installationspaket wird erstellt...</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="149"/>
- <source>Select certificate</source>
- <translation>Zertifikat auswählen</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="160"/>
- <source>Select binary folder</source>
- <translation>Binärverzeichnis auswählen</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="178"/>
- <source>Error!</source>
- <translation>Fehler!</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="187"/>
- <source>Created installer in %1.</source>
- <translation>Installationspaket erstellt in %1.</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="190"/>
- <source>Signing installer package...</source>
- <translation>Installationspaket signieren...</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="192"/>
- <source>Failed to sign installer package.</source>
- <translation>Fehler beim Signieren des Installationspakets.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="216"/>
<source>Please select an existing input folder.</source>
- <translation>Bitte wählen Sie ein existierendes Eingabeverzeichnis.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="220"/>
<source>Please select a codesigning certificate.</source>
- <translation>Bitte wählen Sie ein Code-Signing-Zertifikat.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="224"/>
<source>Please select a output folder.</source>
- <translation>Bitte wählen Sie ein Ausgabeverzeichnis.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="231"/>
<source>Folder %1 does not appear to contain a meta.ini</source>
- <translation>Das Verzeichnis %1 enthält keine meta.ini Datei</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="238"/>
<source>Failed to find the directory for linux binaries: %1</source>
- <translation>Verzeichnis der Linux Anwendung '%1' konnte nicht gefunden werden.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="246"/>
<source>Failed to find a readable *.sh file in: %1</source>
- <translation>Keine lesbare *.sh Datei in '%1' gefunden.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="251"/>
- <source>Unexpected additional .sh files in: %1</source>
- <translation>Mehrere .sh Dateien in: %1</translation>
+ <location filename="../createinstallerdialog.cpp" line="252"/>
+ <source>Signing Linux package...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Failed to find the directory for linux binaries: %s</source>
- <translation type="obsolete">Das Verzeichnis für Linux Binärdaten %1 konnte nicht gefunden werden.</translation>
+ <location filename="../createinstallerdialog.cpp" line="272"/>
+ <source>Failed to sign linux package: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="255"/>
- <source>Signing Linux package...</source>
- <translation>Signieren des Linux Pakets...</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="278"/>
+ <location filename="../createinstallerdialog.cpp" line="288"/>
<source>Creating NSIS package...</source>
- <translation>NSIS-Paket wird erstellt...</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="314"/>
- <source>Failed to find installer script at: %1 </source>
- <translation>Installer skript konnte nicht unter: %1 gefunden werden</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="324"/>
+ <source>Failed to find installer script at: %1 </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="334"/>
<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>
- <location filename="../createinstallerdialog.cpp" line="380"/>
- <source>Signing binaries...</source>
- <translation>Binärpakete werden signiert...</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../createinstallerdialog.cpp" line="390"/>
- <source>Failed to copy binaries to temporary location.</source>
- <translation>Fehler beim Kopieren der Binärdaten in temporären Ort.</translation>
+ <source>Signing binaries...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="396"/>
+ <location filename="../createinstallerdialog.cpp" line="400"/>
+ <source>Failed to copy binaries to temporary location.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="406"/>
<source>Failed to sign binaries with osslsigncode.
Please check that %1 is a valid code signing certificate and thatosslsigncode can be found in the PATH.</source>
- <translatorcomment>TODO: missing blank in EN string</translatorcomment>
- <translation>Fehler beim Signieren der Binärpakete mit osslsigncode.
-Bitte prüfen Sie, dass %1 ein gültiges Code-Signing-Zertifikat ist und osslsigncode im PATH gefunden wird.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="417"/>
+ <location filename="../createinstallerdialog.cpp" line="427"/>
<source>Failed to load certificate: %1</source>
- <translation>Fehler beim laden des Schlüssels: %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="429"/>
+ <location filename="../createinstallerdialog.cpp" line="439"/>
<source>Only 3072 bit RSA keys are supported by the current format.</source>
- <translation>Nur 3072 bit RSA Schlüssel werden vom aktuellen Format unterstützt.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="435"/>
+ <location filename="../createinstallerdialog.cpp" line="445"/>
<source>Failed to open input file: %1</source>
- <translation>Fehler beim öffnen der Datei: %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="444"/>
+ <location filename="../createinstallerdialog.cpp" line="454"/>
<source>Failed to read input file: %1</source>
- <translation>Fehler beim lesen der Datei: %1</translation>
- </message>
- <message>
- <source>Select source archive</source>
- <translation type="vanished">Archiv auswählen</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="170"/>
- <source>Select target location</source>
- <translation>Zielort auswählen</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FinishedDialog</name>
<message>
- <source>Success!</source>
- <translation type="vanished">Erfolgreich!</translation>
+ <location filename="../createinstallerdialog.cpp" line="491"/>
+ <source>Successfully created installation package</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="481"/>
- <source>Successfully created installation package</source>
- <translation>Installationspaket erfolgreich erstellt.</translation>
+ <location filename="../createinstallerdialog.cpp" line="495"/>
+ <source>Error!</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="485"/>
- <source>Error!</source>
- <translation>Fehler!</translation>
+ <location filename="../createinstallerdialog.cpp" line="503"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="493"/>
- <source>Details</source>
- <translation>Details</translation>
- </message>
- <message>
- <location filename="../createinstallerdialog.cpp" line="497"/>
+ <location filename="../createinstallerdialog.cpp" line="507"/>
<source>OK</source>
- <translation>OK</translation>
- </message>
-</context>
-<context>
- <name>QObject</name>
- <message>
- <source>Failed to parse certificate</source>
- <translation type="vanished">Fehler beim Parsen des Zertifikats</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
diff -r 1b77124aea4d -r ca997bc0f790 ui/l10n/trustbridge_de_DE.ts
--- a/ui/l10n/trustbridge_de_DE.ts Thu Aug 21 15:42:32 2014 +0200
+++ b/ui/l10n/trustbridge_de_DE.ts Thu Aug 21 16:54:51 2014 +0200
@@ -2,117 +2,43 @@
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
<context>
- <name>AboutDialog</name>
- <message>
- <source>TrustBridge</source>
- <translation type="vanished">TrustBridge</translation>
- </message>
- <message>
- <source>Version: </source>
- <translation type="vanished">Version:</translation>
- </message>
- <message>
- <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
- <translation type="vanished">TrustBridge ist ein Wurzelzertifikatsinstaller für Windows und GNU/Linux.</translation>
- </message>
- <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="vanished">Die Wurzelzertifikate wird vom <a href="https://www.bsi.bund.de">Bundesamt für Sicherheit in der Informationstechnik (BSI)</a> vorgeschlagen.
-
-</translation>
- </message>
- <message>
- <source>The software was developed by the companies <a href="http://www.intevation.de">Intevation GmbH</a> and <a href="http://www.dn-systems.de">DN-Systems GmbH</a>, <br> contracted by the German Federal Office for Information Security (BSI).
-
-</source>
- <translation type="vanished">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>TrustBridge is Free Software licensed under GNU GPL v2+.
-
-Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
- <translation type="vanished">TrustBridge ist Freie Software, lizensiert unter der GNU GPL v2+. Die Rechte liegen beim Bundesamt für Sicherheit in der Informationstechnik.</translation>
- </message>
- <message>
- <source>Close</source>
- <translation type="vanished">Schließen</translation>
- </message>
-</context>
-<context>
<name>CertificateItemWidget</name>
<message>
- <source>Valid: %1 until %2</source>
- <translation type="vanished">Gültig von: %1 bis %2</translation>
- </message>
- <message>
- <source>Fingerprint (SHA1): <%1></source>
- <translation type="vanished">Fingerabdruck (SHA1): <%1> </translation>
- </message>
- <message>
<location filename="../certificateitemwidget.cpp" line="50"/>
<source>Validity: %1 until %2</source>
- <translation>Gültigkeit: %1 bis %2</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificateitemwidget.cpp" line="53"/>
<source>Fingerprint (SHA1): <code>%1</code></source>
- <translation>Fingerabdruck (SHA1): <code>%1</code></translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificateitemwidget.cpp" line="74"/>
<location filename="../certificateitemwidget.cpp" line="94"/>
<source>This certificate is currently installed.</source>
- <translation>Dieses Zertifikat ist aktuell installiert.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificateitemwidget.cpp" line="78"/>
<source>This certificate is currently not installed.</source>
- <translation>Dieses Zertifikat ist aktuell nicht installiert.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificateitemwidget.cpp" line="88"/>
<source>This certificate was uninstalled.</source>
- <translation>Dieses Zertifikat wurde deinstalliert.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificateitemwidget.cpp" line="92"/>
<location filename="../certificateitemwidget.cpp" line="115"/>
<source>uninstall</source>
- <translation>Deinstallieren</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../certificateitemwidget.cpp" line="93"/>
<source>keep</source>
- <translation>Behalten</translation>
- </message>
-</context>
-<context>
- <name>CertificateListWidget</name>
- <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>Fingerprint (SHA1):</source>
- <translation type="vanished">Fingerabdruck (SHA1):</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>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -120,12 +46,12 @@
<message>
<location filename="../helpdialog.cpp" line="25"/>
<source>This dialog contains some text to help the user.</source>
- <translation>Dieser Dialog enthält die Hilfe für den Benutzer.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../helpdialog.cpp" line="28"/>
<source>Close</source>
- <translation>Schließen</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -133,418 +59,325 @@
<message>
<location filename="../installwrapper.cpp" line="71"/>
<source>Could not find certificate installation process.</source>
- <translation>Der Zertifikatsinstallations-Prozess konnte nicht gefunden werden.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../installwrapper.cpp" line="76"/>
<source>Failed to write temporary file.</source>
- <translation>Fehler beim Schreiben der temporären Datei.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../installwrapper.cpp" line="113"/>
<source>Error executing process: %1</source>
- <translation>Auführungsfehler: %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../installwrapper.cpp" line="124"/>
<source>Error monitoring process: %1</source>
- <translation>Fehlerüberwachung: %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../installwrapper.cpp" line="127"/>
<source>Certificate installation timed out.</source>
- <translation>Zeitüberschreitung bei der Zertifikatsinstallation.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../installwrapper.cpp" line="140"/>
<source>Failed to check process status: %1</source>
- <translation>Fehler in der Prozess-Statusprüfung: %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../installwrapper.cpp" line="148"/>
<source>The process failed with return code. %1</source>
- <translation>Der Prozess ist fehlgeschlagen. Fehlercode: %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../installwrapper.cpp" line="190"/>
<source>Failed to start installer process.</source>
- <translation>Fehler beim Starten des Installer-Prozess.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<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>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
- <source>An updated certificate list is available. Click here to install.</source>
- <translation type="vanished">Neue Vorschläge für Wurzelzertifikate sind verfügbar. Klicken Sie hier zum Installieren.</translation>
+ <location filename="../mainwindow.cpp" line="244"/>
+ <location filename="../mainwindow.cpp" line="246"/>
+ <source>An updated certificate list is available.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="435"/>
- <location filename="../mainwindow.cpp" line="549"/>
- <source>Check for Updates</source>
- <translation>Neue Empfehlungen suchen</translation>
+ <location filename="../mainwindow.cpp" line="246"/>
+ <source>Click here to install.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="437"/>
- <location filename="../mainwindow.cpp" line="931"/>
- <source>Quit</source>
- <translation>Beenden</translation>
+ <location filename="../mainwindow.cpp" line="256"/>
+ <location filename="../mainwindow.cpp" line="259"/>
+ <source>An update for %1 is available.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="455"/>
- <source>TrustBridge</source>
- <translation>TrustBridge</translation>
+ <location filename="../mainwindow.cpp" line="260"/>
+ <source>Click here to download and install the update.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="529"/>
- <source>Installed certificates from:</source>
- <translation>Empfehlungen bereits berücksichtigt bis:</translation>
+ <location filename="../mainwindow.cpp" line="445"/>
+ <location filename="../mainwindow.cpp" line="559"/>
+ <source>Check for Updates</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="534"/>
- <source>TrustBridge Version:</source>
- <translation>TrustBridge Version:</translation>
+ <location filename="../mainwindow.cpp" line="447"/>
+ <location filename="../mainwindow.cpp" line="941"/>
+ <source>Quit</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Last sucessful update check:</source>
- <translation type="vanished">Zuletzt nach Aktualisierungen gesucht:</translation>
+ <location filename="../mainwindow.cpp" line="465"/>
+ <source>TrustBridge</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="541"/>
- <location filename="../mainwindow.cpp" line="544"/>
- <source>Last successful update check:</source>
- <translation>Zuletzt nach neuen Empfehlungen gesucht:</translation>
+ <location filename="../mainwindow.cpp" line="478"/>
+ <source>Version: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="818"/>
- <source>Updates</source>
- <translation>Neue
-Empfehlungen</translation>
+ <location filename="../mainwindow.cpp" line="493"/>
+ <source>TrustBridge is a root certificate installer for Windows and GNU/Linux.<br/></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="840"/>
+ <location filename="../mainwindow.cpp" line="495"/>
+ <source>The root certificate lists are managed by the German <a href="https://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.<br/><br/></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="498"/>
+ <source>The software was developed by the companies <a href="http://www.intevation.de">Intevation GmbH</a> and <a href="http://www.dn-systems.de">DN-Systems GmbH</a>, <br> contracted by the German Federal Office for Information Security (BSI).<br/><br/></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="502"/>
+ <source>TrustBridge is Free Software licensed under GNU GPL v2+.<br/><br/>Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="537"/>
+ <location filename="../mainwindow.cpp" line="942"/>
+ <source>Certificates unchanged</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="539"/>
+ <source>Installed certificates from:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="544"/>
+ <source>TrustBridge Version:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="551"/>
+ <location filename="../mainwindow.cpp" line="554"/>
+ <source>Last successful update check:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="555"/>
+ <source>No connection with the updateserver.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="557"/>
+ <source>Update</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="582"/>
+ <location filename="../mainwindow.cpp" line="936"/>
+ <source>There are currently no changes for your certificate stores.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="585"/>
+ <location filename="../mainwindow.cpp" line="946"/>
+ <source>Quit without saving</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="589"/>
+ <location filename="../mainwindow.cpp" line="944"/>
+ <source>Install certificates again</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="617"/>
+ <location filename="../mainwindow.cpp" line="966"/>
+ <source>Install new trusted certificates (%1/%2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="620"/>
+ <location filename="../mainwindow.cpp" line="642"/>
+ <location filename="../mainwindow.cpp" line="664"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="621"/>
+ <location filename="../mainwindow.cpp" line="643"/>
+ <location filename="../mainwindow.cpp" line="665"/>
+ <location filename="../mainwindow.cpp" line="956"/>
+ <location filename="../mainwindow.cpp" line="972"/>
+ <location filename="../mainwindow.cpp" line="988"/>
+ <location filename="../mainwindow.cpp" line="1312"/>
+ <location filename="../mainwindow.cpp" line="1325"/>
+ <location filename="../mainwindow.cpp" line="1337"/>
+ <source>Show details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="639"/>
+ <location filename="../mainwindow.cpp" line="982"/>
+ <source>Remove revoked certificates (%1/%2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="661"/>
+ <location filename="../mainwindow.cpp" line="1067"/>
+ <location filename="../mainwindow.cpp" line="1237"/>
+ <location filename="../mainwindow.cpp" line="1247"/>
+ <source>Manually changed certificates (%1)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="720"/>
+ <source>Trusted certificates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="721"/>
+ <source>The following list of trusted root certificates is managed by the BSI. The BSI validates independently the authenticity, security and actuality of these certificates.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="728"/>
+ <source>Please choose the certificates you want to trust or untrust. TrustBridge will install these certificates for your secure communication for email and internet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="761"/>
+ <source>Revoked certificates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="762"/>
+ <source>Certificates can be corrupted or stolen and misused in many ways. Therefore the BSI recommends to remove all revoked certificates from your system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="769"/>
+ <source>The following unsecure certificates were revoked by the BSI. Already uninstalled certificates cannot be reinstalled. It is recommended that you select all certificates to uninstall if you still have revoked certificates installed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="811"/>
+ <source>Trust in your digital communication</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="828"/>
+ <source>Updates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="841"/>
+ <source>Trusted
+certificates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="850"/>
<source>Revoked
certificates</source>
- <translation>Abgeratene
-Wurzelzertifikate</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Last update of TrustBridge: %1</source>
- <translation type="vanished">Letzte Aktualisierung von TrustBridge: %1</translation>
+ <location filename="../mainwindow.cpp" line="859"/>
+ <source>Information
+and help</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Updates (%1/%2)</source>
- <translation type="vanished">Aktualisierungen (%1/%2)</translation>
+ <location filename="../mainwindow.cpp" line="930"/>
+ <source>You should apply the following, recommended changes to your certificate stores.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="575"/>
- <location filename="../mainwindow.cpp" line="936"/>
- <source>Quit without saving</source>
- <translation>Beenden ohne Schreiben</translation>
+ <location filename="../mainwindow.cpp" line="933"/>
+ <source>You can apply the following, changes to your certificate stores.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="629"/>
- <location filename="../mainwindow.cpp" line="972"/>
- <source>Remove revoked certificates (%1/%2)</source>
- <translation>Abgeratene Wurzelzertifikate entfernen (%1/%2)</translation>
+ <location filename="../mainwindow.cpp" line="947"/>
+ <source>Changes to certificate stores (%1)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="710"/>
- <source>Trusted certificates</source>
- <translation>Empfohlene Wurzelzertifikate</translation>
+ <location filename="../mainwindow.cpp" line="950"/>
+ <source>Apply changes</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="711"/>
- <source>The following list of trusted root certificates is managed by the BSI. The BSI validates independently the authenticity, security and actuality of these certificates.</source>
- <translation>Die folgenden Wurzelzertifikate wurden bisher vom BSI zur Installation vorgeschlagen. Sie können erkennen, welche Sie bereits geschrieben haben.</translation>
+ <location filename="../mainwindow.cpp" line="1039"/>
+ <source>install</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="718"/>
- <source>Please choose the certificates you want to trust or untrust. TrustBridge will install these certificates for your secure communication for email and internet.</source>
- <translation>Legen Sie fest, ob Sie der Empfehlung ganz oder teilweise folgen möchten. TrustBridge wird die Änderungen an den Wurzelzertifikaten vornehmen.</translation>
+ <location filename="../mainwindow.cpp" line="1039"/>
+ <source>ignore</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="831"/>
- <source>Trusted
-certificates</source>
- <translation>Empfohlene
-Wurzelzertifikate</translation>
+ <location filename="../mainwindow.cpp" line="1073"/>
+ <source>Error executing update</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="849"/>
- <source>Information
-and help</source>
- <translation>Informationen
-und Hilfe</translation>
+ <location filename="../mainwindow.cpp" line="1164"/>
+ <source>Installation with standard user account.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Updates (%1)</source>
- <translation type="obsolete">Aktualisierungen (%1/%2) {1)?}</translation>
+ <location filename="../mainwindow.cpp" line="1165"/>
+ <source>Windows will now ask you to confirm each root certificate modification because TrustBridge does not have the necessary privileges to install root certificates into the Windows certificate store silently.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Last update of certificates: %1</source>
- <translation type="vanished">Letzte Aktualisierung der Zertifikate: %1</translation>
+ <location filename="../mainwindow.cpp" line="1173"/>
+ <source>Installing certificates...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>You should apply the following changes to your root certificates:</source>
- <translation type="vanished">Sie sollten die folgenden Änderungen an Ihren Wurzelzertifikaten übernehmen:</translation>
+ <location filename="../mainwindow.cpp" line="1306"/>
+ <location filename="../mainwindow.cpp" line="1319"/>
+ <location filename="../mainwindow.cpp" line="1332"/>
+ <source>Hide details</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Check for updates</source>
- <translation type="obsolete">Aktualisierungen suchen</translation>
- </message>
- <message>
- <source>Install updates</source>
- <translation type="vanished">Aktualisierungen einspielen</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="607"/>
- <location filename="../mainwindow.cpp" line="956"/>
- <source>Install new trusted certificates (%1/%2)</source>
- <translation>Neue, empfohlene Wurzelzertifikate installieren (%1/%2)</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="611"/>
- <location filename="../mainwindow.cpp" line="633"/>
- <location filename="../mainwindow.cpp" line="655"/>
- <location filename="../mainwindow.cpp" line="946"/>
- <location filename="../mainwindow.cpp" line="962"/>
- <location filename="../mainwindow.cpp" line="978"/>
- <location filename="../mainwindow.cpp" line="1292"/>
- <location filename="../mainwindow.cpp" line="1305"/>
- <location filename="../mainwindow.cpp" line="1317"/>
- <source>Show details</source>
- <translation>Details einblenden</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="751"/>
- <source>Revoked certificates</source>
- <translation>Abgeratene Wurzelzertifikate</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="752"/>
- <source>Certificates can be corrupted or stolen and misused in many ways. Therefore the BSI recommends to remove all revoked certificates from your system.</source>
- <translation>Wurzelzertifikate können veraltet sein, korrumpiert, gestohlen oder missbraucht werden. Die Wurzelzertifikate , von denen das BSI abrät, sollten umgehend entfernt werden.</translation>
- </message>
- <message>
- <source>The follwing unsecure certificates were revoked by the BSI. Already uninstalled certificates cannot be reinstalled. It is recommended that you select all certificates to uninstall if you still have revoked certificates installed.</source>
- <translation type="obsolete">Von den folgenden, ehemals empfohlenen Wurzelzerts, rät das BSI nun ab. Über diese Anwendung können sie auch nicht mehr installiert werden. Markieren Sie verbleibende Wurzelzerts zur Löschung, sobald Sie können.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="651"/>
- <location filename="../mainwindow.cpp" line="1057"/>
- <location filename="../mainwindow.cpp" line="1217"/>
- <location filename="../mainwindow.cpp" line="1227"/>
- <source>Manually changed certificates (%1)</source>
- <translation>Abweichend zu behandelnde Wurzelzertifikate (%1)</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="801"/>
- <source>Trust in your digital communication</source>
- <translation>Vertrauen in Ihre digitale Kommunikation</translation>
- </message>
- <message>
- <source>Changes</source>
- <translation type="vanished">Änderungen</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="527"/>
- <location filename="../mainwindow.cpp" line="932"/>
- <source>Certificates unchanged</source>
- <translation>Wurzelzertifikate unverändert</translation>
- </message>
- <message>
- <source>TrustBridge Version: %1</source>
- <translation type="vanished">TrustBridge Version: %1</translation>
- </message>
- <message>
- <source>Last sucessful update check: %1</source>
- <translation type="vanished">Letzte erfolgreiche Prüfung nach Aktualisierungen: %1</translation>
- </message>
- <message>
- <source>You should apply the following, recommended changes to your root certificates.</source>
- <translation type="vanished">Es wird empfohlen, die nachfolgenden Änderungen an Ihren Wurzelzertifikaten zu übernehmen.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="940"/>
- <source>Apply changes</source>
- <translation>Änderungen schreiben</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="468"/>
- <source>Version: </source>
- <translation>Version:</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="237"/>
- <location filename="../mainwindow.cpp" line="239"/>
- <source>An updated certificate list is available.</source>
- <translation>Neue Vorschläge für Wurzelzertifikate sind verfügbar.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="239"/>
- <source>Click here to install.</source>
- <translation>Klicken Sie hier zum Installieren.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="249"/>
- <location filename="../mainwindow.cpp" line="252"/>
- <source>An update for %1 is available.</source>
- <translation>Eine Aktualisierung für %1 ist verfügbar.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="253"/>
- <source>Click here to download and install the update.</source>
- <translation>Hier klicken, um Download und Installation zu starten.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="572"/>
- <location filename="../mainwindow.cpp" line="926"/>
- <source>There are currently no changes for your certificate stores.</source>
- <translation>Es liegem keine neuen Empfehlungen vor.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="579"/>
- <location filename="../mainwindow.cpp" line="934"/>
- <source>Install certificates again</source>
- <translation>Wurzelzertifikate erneut schreiben</translation>
- </message>
- <message>
- <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
- <translation type="obsolete">TrustBridge ist eine Wurzelzertifikatsinstaller für Windows und GNU/Linux.</translation>
- </message>
- <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 Wurzelzertifikate werden vom <a href="https://www.bsi.bund.de">Bundesamt für Sicherheit in der Informationstechnik (BSI)</a> vorgeschlagen.
-
-</translation>
- </message>
- <message>
- <source>The software was developed by the companies <a href="http://www.intevation.de">Intevation GmbH</a> and <a href="http://www.dn-systems.de">DN-Systems GmbH</a>, <br> contracted by the German Federal Office for Information Security (BSI).
-
-</source>
- <translation type="vanished">Die Software wurde von den Unternehmen <a href="http://www.intevation.de">Intevation GmbH</a> und <a href="http://www.dn-systems.de">DN-Systems GmbH</a> entwickelt, <br> beauftragt vom Bundesamt für Sicherheit in der Informationstechnik (BSI).</translation>
- </message>
- <message>
- <source>TrustBridge is Free Software licensed under GNU GPL v2+.
-
-Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
- <translation type="vanished">TrustBridge ist Freie Software, lizensiert unter der GNU GPL v2+. Die Rechte liegen beim Bundesamt für Sicherheit in der Informationstechnik.</translation>
- </message>
- <message>
- <source>Changes (%1)</source>
- <translation type="vanished">Änderungen (%1)</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="1029"/>
- <source>install</source>
- <translation>Installieren</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="1029"/>
- <source>ignore</source>
- <translation>Ignorieren</translation>
- </message>
- <message>
- <source>Installed certificates from: %1</source>
- <translation type="vanished">Installierte Zertifikate vom: %1</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="1286"/>
- <location filename="../mainwindow.cpp" line="1299"/>
- <location filename="../mainwindow.cpp" line="1312"/>
- <source>Hide details</source>
- <translation>Details ausblenden</translation>
- </message>
- <message>
- <source>Last successful update check: %1</source>
- <translation type="vanished">Letzte erfolgreiche Prüfung nach Aktualisierungen: %1</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="1341"/>
+ <location filename="../mainwindow.cpp" line="1361"/>
<source>Sucessfully checked for updates.</source>
- <translation>Suche nach neuen Empfehlungen erfolgreich.</translation>
- </message>
- <message>
- <source>An update for %1 is available.
-Click here to download and install the update.</source>
- <translation type="vanished">Eine Aktualisierung für %1 ist verfügbar.
-Hier klicken, um Download und Installation zu starten.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="483"/>
- <source>TrustBridge is a root certificate installer for Windows and GNU/Linux.<br/></source>
- <translation>TrustBridge ist eine Wurzelzertifikatsinstaller für Windows und GNU/Linux.<br/></translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="485"/>
- <source>The root certificate lists are managed by the German <a href="https://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.<br/><br/></source>
- <translation>Die Wurzelzertifikate werden vom <a href="https://www.bsi.bund.de">Bundesamt für Sicherheit in der Informationstechnik (BSI)</a> vorgeschlagen.<br/><br/></translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="488"/>
- <source>The software was developed by the companies <a href="http://www.intevation.de">Intevation GmbH</a> and <a href="http://www.dn-systems.de">DN-Systems GmbH</a>, <br> contracted by the German Federal Office for Information Security (BSI).<br/><br/></source>
- <translation>Die Software wurde von den Unternehmen <a href="http://www.intevation.de">Intevation GmbH</a> und <a href="http://www.dn-systems.de">DN-Systems GmbH</a> entwickelt, <br> beauftragt vom Bundesamt für Sicherheit in der Informationstechnik (BSI).<br/><br/></translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="492"/>
- <source>TrustBridge is Free Software licensed under GNU GPL v2+.<br/><br/>Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
- <translation>TrustBridge ist Freie Software, lizensiert unter der GNU GPL v2+.<br/><br/>(C) 2014. Die Rechte liegen beim Bundesamt für Sicherheit in der Informationstechnik.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="545"/>
- <source>No connection with the updateserver.</source>
- <translation>Keine Verbindung zum Updateserver.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="547"/>
- <source>Update</source>
- <translation>Aktualisieren</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="610"/>
- <location filename="../mainwindow.cpp" line="632"/>
- <location filename="../mainwindow.cpp" line="654"/>
- <source>Details</source>
- <translation>Details</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="759"/>
- <source>The following unsecure certificates were revoked by the BSI. Already uninstalled certificates cannot be reinstalled. It is recommended that you select all certificates to uninstall if you still have revoked certificates installed.</source>
- <translation>Von den folgenden, ehemals empfohlenen Wurzelzertifikaten, rät das BSI ab. Über diese Anwendung können sie auch nicht mehr installiert werden. Markieren Sie verbleibende Wurzelzertifikate zur Löschung, sobald Sie können.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="920"/>
- <source>You should apply the following, recommended changes to your certificate stores.</source>
- <translation>Es wird empfohlen, die nachfolgenden Änderungen an Ihren Zertifikatsspeichern vorzunehmen.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="923"/>
- <source>You can apply the following, changes to your certificate stores.</source>
- <translatorcomment>Der Unterschied "can", "should" könnte nicht signifikant genug sein.</translatorcomment>
- <translation>Sie können die nachfolgenden Änderungen an Ihren Zertifikatsspeichern vornehmen.</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="937"/>
- <source>Changes to certificate stores (%1)</source>
- <translation>Neue empfohlene Änderungen (%1)</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="1063"/>
- <source>Error executing update</source>
- <translation>Fehler bei der Aktualisierung</translation>
- </message>
- <message>
- <location filename="../mainwindow.cpp" line="1153"/>
- <source>Installing certificates...</source>
- <translation>Wurzelzertifikate werden geändert...</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -552,12 +385,12 @@
<message>
<location filename="../processwaitdialog.cpp" line="23"/>
<source>Applications need to be closed.</source>
- <translation>Anwendungen müssen geschlossen werden.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../processwaitdialog.cpp" line="26"/>
<source>Please close all running Firefox and Thunderbird instances to continue installation!</source>
- <translation>Beenden Sie bitte alle laufenden Firefox- und Thunderbird-Instanzen, um die Installation fortzusetzen!</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -565,7 +398,7 @@
<message>
<location filename="../taskscheduler.cpp" line="132"/>
<source>TrustBridge automatic update check.</source>
- <translation>Automatische Aktualisierungsprüfung von TrustBridge.</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -573,12 +406,12 @@
<message>
<location filename="../trayicon.cpp" line="47"/>
<source>Install update</source>
- <translation>Herunterladen und installieren</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../trayicon.cpp" line="48"/>
<source>Remind me later</source>
- <translation>Später erinnern</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
diff -r 1b77124aea4d -r ca997bc0f790 ui/mainwindow.cpp
--- a/ui/mainwindow.cpp Thu Aug 21 15:42:32 2014 +0200
+++ b/ui/mainwindow.cpp Thu Aug 21 16:54:51 2014 +0200
@@ -1161,9 +1161,10 @@
#ifdef Q_OS_WIN
if (!is_admin() || !is_system_install()) {
QMessageBox::information(this,
- tr("Installation as normal user."),
- tr("TrustBridge does not have the necessary privileges to install the certificates silently.") + "\n" +
- tr("Windows will explicitly ask you to verify every modification TrustBridge intends to make."));
+ tr("Installation with standard user account"),
+ tr("Windows will now ask you to confirm qeach root certificate modification "
+ "because TrustBridge does not have the necessary privileges to install "
+ "root certificates into the Windows certificate store silently."));
}
#endif
More information about the Trustbridge-commits
mailing list