Mercurial > trustbridge
changeset 1276:4523d81eeafe
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Mon, 29 Sep 2014 11:08:46 +0200 |
| parents | be989e9d49a4 (diff) 5e0c338552b4 (current diff) |
| children | 509c48708e47 |
| files | ui/mainwindow.cpp |
| diffstat | 5 files changed, 187 insertions(+), 173 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/aboutdialog.cpp Mon Sep 29 10:19:57 2014 +0200 +++ b/ui/aboutdialog.cpp Mon Sep 29 11:08:46 2014 +0200 @@ -28,7 +28,7 @@ QVBoxLayout *centerLayout = new QVBoxLayout; QHBoxLayout *bottomLayout = new QHBoxLayout; - QLabel *title = new QLabel("<h2>" + tr("TrustBridge") + "</h2>"); + QLabel *title = new QLabel("<h2>" + tr("TrustBridge Administration") + "</h2>"); QString version = tr("Version: "); version.append(QApplication::applicationVersion()); QLabel *appVersion = new QLabel(version); @@ -62,8 +62,8 @@ "<li>OpenSSL (OpenSSL License)" + "<li>NSIS (zlib/libpng license & Common Public License version 1.0)</ul>" + tr("You will find the legally binding details in the 'licenses' directory " - "where TrustBridge is installed " - "or in the corresponding revision of the" + "where TrustBridge is installed<br/>" + "or in the corresponding revision of the " "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>.")); textDesc->setTextFormat(Qt::RichText);
--- a/ui/administratorwindow.cpp Mon Sep 29 10:19:57 2014 +0200 +++ b/ui/administratorwindow.cpp Mon Sep 29 11:08:46 2014 +0200 @@ -119,7 +119,7 @@ // The buttons. bottomLayout->setAlignment(Qt::AlignBottom); - saveButton = new QPushButton(QIcon(":/img/document-save.png"), " " + tr("Save list")); + saveButton = new QPushButton(QIcon(":/img/document-save.png"), " " + tr("Create list")); connect(saveButton, SIGNAL(clicked()), this, SLOT(saveCertificateFile())); loadButton = new QPushButton(QIcon(":/img/document-open.png"), " " + tr("Load list")); connect(loadButton, SIGNAL(clicked()), this, SLOT(loadCertificateFile()));
--- a/ui/l10n/administrator_de_DE.ts Mon Sep 29 10:19:57 2014 +0200 +++ b/ui/l10n/administrator_de_DE.ts Mon Sep 29 11:08:46 2014 +0200 @@ -4,9 +4,13 @@ <context> <name>AboutDialog</name> <message> + <source>TrustBridge</source> + <translation type="vanished">TrustBridge</translation> + </message> + <message> <location filename="../aboutdialog.cpp" line="31"/> - <source>TrustBridge</source> - <translation>TrustBridge</translation> + <source>TrustBridge Administration</source> + <translation>TrustBridge-Verwaltung</translation> </message> <message> <location filename="../aboutdialog.cpp" line="32"/> @@ -26,22 +30,22 @@ <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 BSI.<br/><br/></source> - <translation type="unfinished"></translation> + <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 BSI.<br/><br/></translation> </message> <message> <location filename="../aboutdialog.cpp" line="53"/> <source>TrustBridge is Free Software licensed under GNU GPL v==3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik<br/><br/></source> - <translation type="unfinished"></translation> + <translation type="unfinished">TrustBridge ist Freie Software, lizensiert unter der GNU GPL v==3.<br/>(C) 2014. Die Rechte liegen beim Bundesamt für Sicherheit in der Informationstechnik.<br/><br/></translation> </message> <message> <location filename="../aboutdialog.cpp" line="56"/> <source>TrustBridge Administrator uses several Free Software components with different licenses:</source> - <translation type="unfinished"></translation> + <translation>TrustBridge-Verwaltung verwendet verschiedene Freie Software Komponenten mit unterschiedlichen Lizenzen:</translation> </message> <message> <location filename="../aboutdialog.cpp" line="64"/> - <source>You will find the legally binding details in the 'licenses' directory where TrustBridge is installed or in the corresponding revision of the<a href="https://wald.intevation.org/hg/trustbridge/file/tip/licenses">TrustBridge code repository</a>.</source> - <translation type="unfinished"></translation> + <source>You will find the legally binding details in the 'licenses' directory where TrustBridge is installed<br/>or in the corresponding revision of the <a href="https://wald.intevation.org/hg/trustbridge/file/tip/licenses">TrustBridge code repository</a>.</source> + <translation>Sie finden die rechtsverbindlichen Details im Verzeichnis 'licenses' im TrustBridge-Installationsverzeichnis<br/>oder in der entsprechenden Revision im <a href="https://wald.intevation.org/hg/trustbridge/file/tip/licenses">TrustBridge Quellcode Repository</a>.</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).<br/><br/></source> @@ -125,6 +129,11 @@ <translation>In der Liste enthaltene Zertifikate:</translation> </message> <message> + <location filename="../administratorwindow.cpp" line="122"/> + <source>Create list</source> + <translation>Liste erstellen</translation> + </message> + <message> <location filename="../administratorwindow.cpp" line="152"/> <source>Select certificate list file</source> <translation>Zertifikatsliste auswählen</translation> @@ -190,21 +199,21 @@ <message> <source>signing certificate: </source> - <translation type="obsolete">Signaturzertifikat: + <translation type="vanished">Signaturzertifikat: </translation> </message> <message> <source> new certificates: </source> - <translation type="obsolete"> + <translation type="vanished"> Neues Zertifikat: </translation> </message> <message> <source>certificates marked to remove: </source> - <translation type="obsolete">Zertifikate zum Löschen markiert: + <translation type="vanished">Zertifikate zum Löschen markiert: </translation> </message> <message> @@ -227,9 +236,8 @@ <translation>Verwaltungsanwendung des BSI-Zertifikatsinstallers</translation> </message> <message> - <location filename="../administratorwindow.cpp" line="122"/> <source>Save list</source> - <translation>Liste speichern</translation> + <translation type="vanished">Liste speichern</translation> </message> <message> <location filename="../administratorwindow.cpp" line="124"/> @@ -635,17 +643,17 @@ <translation>Fehler beim laden des Schlüssels: %1</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="470"/> + <location filename="../createinstallerdialog.cpp" line="472"/> <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> </message> <message> - <location filename="../createinstallerdialog.cpp" line="476"/> + <location filename="../createinstallerdialog.cpp" line="478"/> <source>Failed to open input file: %1</source> <translation>Fehler beim öffnen der Datei: %1</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="485"/> + <location filename="../createinstallerdialog.cpp" line="487"/> <source>Failed to read input file: %1</source> <translation>Fehler beim lesen der Datei: %1</translation> </message> @@ -666,22 +674,22 @@ <translation type="vanished">Erfolgreich!</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="522"/> + <location filename="../createinstallerdialog.cpp" line="524"/> <source>Successfully created installation package</source> <translation>Installationspaket erfolgreich erstellt.</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="526"/> + <location filename="../createinstallerdialog.cpp" line="528"/> <source>Error!</source> <translation>Fehler!</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="534"/> + <location filename="../createinstallerdialog.cpp" line="536"/> <source>Details</source> <translation>Details</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="538"/> + <location filename="../createinstallerdialog.cpp" line="540"/> <source>OK</source> <translation>OK</translation> </message>
--- a/ui/l10n/trustbridge_de_DE.ts Mon Sep 29 10:19:57 2014 +0200 +++ b/ui/l10n/trustbridge_de_DE.ts Mon Sep 29 11:08:46 2014 +0200 @@ -203,19 +203,19 @@ <translation type="vanished">Neue Vorschläge für Wurzelzertifikate sind verfügbar. Klicken Sie hier zum Installieren.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="650"/> - <location filename="../mainwindow.cpp" line="822"/> + <location filename="../mainwindow.cpp" line="654"/> + <location filename="../mainwindow.cpp" line="828"/> <source>Check for Updates</source> <translation>Neue Empfehlungen suchen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="652"/> - <location filename="../mainwindow.cpp" line="1182"/> + <location filename="../mainwindow.cpp" line="656"/> + <location filename="../mainwindow.cpp" line="1188"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mainwindow.cpp" line="670"/> + <location filename="../mainwindow.cpp" line="674"/> <source>TrustBridge</source> <translation>TrustBridge</translation> </message> @@ -241,7 +241,7 @@ Empfehlungen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1095"/> + <location filename="../mainwindow.cpp" line="1101"/> <source>Revoked certificates</source> <translation>Abgeratene @@ -256,41 +256,41 @@ <translation type="vanished">Aktualisierungen (%1/%2)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="771"/> - <location filename="../mainwindow.cpp" line="1187"/> + <location filename="../mainwindow.cpp" line="777"/> + <location filename="../mainwindow.cpp" line="1193"/> <source>Quit without saving</source> <translation>Beenden ohne Schreiben</translation> </message> <message> - <location filename="../mainwindow.cpp" line="875"/> - <location filename="../mainwindow.cpp" line="1228"/> + <location filename="../mainwindow.cpp" line="881"/> + <location filename="../mainwindow.cpp" line="1234"/> <source>Remove revoked certificates (%1/%2)</source> <translation>Abgeratene Wurzelzertifikate entfernen (%1/%2)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="952"/> + <location filename="../mainwindow.cpp" line="958"/> <source>Trusted certificates</source> <translation>Empfohlene Wurzelzertifikate</translation> </message> <message> - <location filename="../mainwindow.cpp" line="953"/> + <location filename="../mainwindow.cpp" line="959"/> <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> </message> <message> - <location filename="../mainwindow.cpp" line="960"/> + <location filename="../mainwindow.cpp" line="966"/> <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> </message> <message> - <location filename="../mainwindow.cpp" line="1086"/> + <location filename="../mainwindow.cpp" line="1092"/> <source>Trusted certificates</source> <translation>Empfohlene Wurzelzertifikate</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1104"/> + <location filename="../mainwindow.cpp" line="1110"/> <source>Information and help</source> <translation>Informationen @@ -317,27 +317,27 @@ <translation type="vanished">Aktualisierungen einspielen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="853"/> - <location filename="../mainwindow.cpp" line="1212"/> + <location filename="../mainwindow.cpp" line="859"/> + <location filename="../mainwindow.cpp" line="1218"/> <source>Install new trusted certificates (%1/%2)</source> <translation>Neue, empfohlene Wurzelzertifikate installieren (%1/%2)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="857"/> - <location filename="../mainwindow.cpp" line="879"/> - <location filename="../mainwindow.cpp" line="898"/> - <location filename="../mainwindow.cpp" line="1218"/> - <location filename="../mainwindow.cpp" line="1234"/> + <location filename="../mainwindow.cpp" line="863"/> + <location filename="../mainwindow.cpp" line="885"/> + <location filename="../mainwindow.cpp" line="904"/> + <location filename="../mainwindow.cpp" line="1224"/> + <location filename="../mainwindow.cpp" line="1240"/> <source>Show details</source> <translation>Details einblenden</translation> </message> <message> - <location filename="../mainwindow.cpp" line="993"/> + <location filename="../mainwindow.cpp" line="999"/> <source>Revoked certificates</source> <translation>Abgeratene Wurzelzertifikate</translation> </message> <message> - <location filename="../mainwindow.cpp" line="994"/> + <location filename="../mainwindow.cpp" line="1000"/> <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> @@ -350,7 +350,7 @@ <translation type="vanished">Abweichend zu behandelnde Wurzelzertifikate (%1)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1044"/> + <location filename="../mainwindow.cpp" line="1050"/> <source>Trust in your digital communication</source> <translation>Vertrauen in Ihre digitale Kommunikation</translation> </message> @@ -359,8 +359,8 @@ <translation type="vanished">Änderungen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="767"/> - <location filename="../mainwindow.cpp" line="1183"/> + <location filename="../mainwindow.cpp" line="773"/> + <location filename="../mainwindow.cpp" line="1189"/> <source>Certificates unchanged</source> <translation>Wurzelzertifikate unverändert</translation> </message> @@ -377,12 +377,12 @@ <translation type="vanished">Es wird empfohlen, die nachfolgenden Änderungen an Ihren Wurzelzertifikaten zu übernehmen.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1191"/> + <location filename="../mainwindow.cpp" line="1197"/> <source>Apply changes</source> <translation>Änderungen schreiben</translation> </message> <message> - <location filename="../mainwindow.cpp" line="683"/> + <location filename="../mainwindow.cpp" line="687"/> <source>Version: </source> <translation>Version:</translation> </message> @@ -422,17 +422,22 @@ <translation type="vanished">Ursache dafür könnte nicht genügend Speicherplatz oder ungültige Berechtigungen sein.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="579"/> + <location filename="../mainwindow.cpp" line="559"/> <source>Downloading update...</source> <translation>Software-Aktualisierung wird heruntergeladen...</translation> </message> <message> - <location filename="../mainwindow.cpp" line="643"/> + <location filename="../mainwindow.cpp" line="647"/> <source>Failed to check for updates:</source> <translation>Fehler bei Updateprüfung:</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1175"/> + <location filename="../mainwindow.cpp" line="721"/> + <source>You will find the legally binding details in the 'licenses' directory where TrustBridge is installed<br/>or in the corresponding revision of the <a href="https://wald.intevation.org/hg/trustbridge/file/tip/licenses">TrustBridge code repository</a>.</source> + <translation>Sie finden die rechtsverbindlichen Details im Verzeichnis 'licenses' im TrustBridge-Installationsverzeichnis<br/>oder in der entsprechenden Revision im <a href="https://wald.intevation.org/hg/trustbridge/file/tip/licenses">TrustBridge Quellcode Repository</a>.</translation> + </message> + <message> + <location filename="../mainwindow.cpp" line="1181"/> <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> @@ -445,8 +450,8 @@ <translation type="vanished">Es liegen keine neuen Empfehlungen vor.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="775"/> - <location filename="../mainwindow.cpp" line="1185"/> + <location filename="../mainwindow.cpp" line="781"/> + <location filename="../mainwindow.cpp" line="1191"/> <source>Install certificates again</source> <translation>Wurzelzertifikate erneut schreiben</translation> </message> @@ -499,7 +504,7 @@ <translation type="vanished">Letzte erfolgreiche Prüfung nach Aktualisierungen: %1</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1725"/> + <location filename="../mainwindow.cpp" line="1731"/> <source>Sucessfully checked for updates.</source> <translation>Suche nach neuen Empfehlungen erfolgreich.</translation> </message> @@ -510,12 +515,12 @@ Hier klicken, um Download und Installation zu starten.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="698"/> + <location filename="../mainwindow.cpp" line="702"/> <source>TrustBridge is a root certificate installer for Windows and GNU/Linux.<br/></source> <translation>TrustBridge ist ein Wurzelzertifikatsinstaller für Windows und GNU/Linux.<br/></translation> </message> <message> - <location filename="../mainwindow.cpp" line="700"/> + <location filename="../mainwindow.cpp" line="704"/> <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> @@ -530,217 +535,216 @@ <message> <location filename="../mainwindow.cpp" line="322"/> <source>Failed to create temporary directory.</source> - <translation type="unfinished"></translation> + <translation>Fehler beim Erstellen eines temporären Verzeichnisses.</translation> </message> <message> <location filename="../mainwindow.cpp" line="323"/> <location filename="../mainwindow.cpp" line="337"/> <source>Please ensure that you have the access rights to write in the temporary directory and that there is at least 20MB free disk space available.</source> - <translation type="unfinished"></translation> + <translation>Bitte stellen Sie sicher, dass Sie die nötigen Rechte zum Schreiben eines temporären Verzeichnisses haben und dort mindestens 20MB freien Speicherplatz zur Verfügung steht.</translation> </message> <message> <location filename="../mainwindow.cpp" line="336"/> <source>Failed to create a temporary copy of the installer.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../mainwindow.cpp" line="703"/> - <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 BSI.<br/><br/></source> - <translation type="unfinished"></translation> + <translation>Fehler beim Erstellen einer temporären Kopie des Installers.</translation> </message> <message> <location filename="../mainwindow.cpp" line="707"/> - <source>TrustBridge is Free Software licensed under GNU GPL v>=3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik<br/><br/></source> - <translation type="unfinished"></translation> + <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 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 BSI.<br/><br/></translation> </message> <message> - <location filename="../mainwindow.cpp" line="710"/> - <source>TrustBridge uses several Free Software components with different licenses:</source> - <translation type="unfinished"></translation> + <location filename="../mainwindow.cpp" line="711"/> + <source>TrustBridge is Free Software licensed under GNU GPL v>=3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik<br/><br/></source> + <translation>TrustBridge ist Freie Software, lizensiert unter der GNU GPL v==3.<br/><br/>(C) 2014. Die Rechte liegen beim Bundesamt für Sicherheit in der Informationstechnik.<br/><br/></translation> </message> <message> - <location filename="../mainwindow.cpp" line="717"/> - <source>Read more about the license information in the 'licenses' directory in the <a href="https://wald.intevation.org/hg/trustbridge/file/tip/licenses">TrustBridge code repository</a>.</source> - <translation type="unfinished"></translation> + <location filename="../mainwindow.cpp" line="714"/> + <source>TrustBridge uses several Free Software components with different licenses:</source> + <translation>TrustBridge verwendet verschiedene Freie Software Komponenten mit unterschiedlichen Lizenzen:</translation> </message> <message> - <location filename="../mainwindow.cpp" line="733"/> + <location filename="../mainwindow.cpp" line="739"/> <source>Show Help</source> <translation>Hilfe anzeigen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="738"/> + <location filename="../mainwindow.cpp" line="744"/> <source>Proxy settings</source> <translation>Proxy-Einstellungen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="813"/> + <location filename="../mainwindow.cpp" line="819"/> <source>Last update check:</source> <translation>Letzte Suche:</translation> </message> <message> - <location filename="../mainwindow.cpp" line="818"/> + <location filename="../mainwindow.cpp" line="824"/> <source>No connection with the updateserver.</source> <translation>Keine Verbindung zum Updateserver.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="820"/> + <location filename="../mainwindow.cpp" line="826"/> <source>Update</source> <translation>Aktualisieren</translation> </message> <message> - <location filename="../mainwindow.cpp" line="856"/> - <location filename="../mainwindow.cpp" line="878"/> - <location filename="../mainwindow.cpp" line="897"/> + <location filename="../mainwindow.cpp" line="862"/> + <location filename="../mainwindow.cpp" line="884"/> + <location filename="../mainwindow.cpp" line="903"/> <source>Details</source> <translation>Details</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1001"/> + <location filename="../mainwindow.cpp" line="1007"/> <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="1046"/> + <location filename="../mainwindow.cpp" line="1052"/> <source>Version</source> <translation>Version</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1073"/> + <location filename="../mainwindow.cpp" line="1079"/> <source>Pending changes</source> <translation>Ausstehende Änderungen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1207"/> + <location filename="../mainwindow.cpp" line="1213"/> <source>Manual changes (%1)</source> <translation>Manuelle Änderungen (%1)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1258"/> + <location filename="../mainwindow.cpp" line="1264"/> <source>Certificate list from:</source> <translation>Zertifikatsliste vom:</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1263"/> + <location filename="../mainwindow.cpp" line="1269"/> <source>Currently installed certificate list:</source> <translation>Aktuell installierte Zertifikatsliste:</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1267"/> + <location filename="../mainwindow.cpp" line="1273"/> <source>No certificate list installed.</source> <translation>Keine Zertifikatsliste installiert.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1298"/> - <location filename="../mainwindow.cpp" line="1350"/> - <location filename="../mainwindow.cpp" line="1571"/> + <location filename="../mainwindow.cpp" line="1304"/> + <location filename="../mainwindow.cpp" line="1356"/> + <location filename="../mainwindow.cpp" line="1577"/> <source>Certificate will be installed.</source> <translation>Zertifikat wird installiert.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1299"/> - <location filename="../mainwindow.cpp" line="1339"/> + <location filename="../mainwindow.cpp" line="1305"/> + <location filename="../mainwindow.cpp" line="1345"/> <source>Certifcate is not installed.</source> <translation>Zertifikat ist nicht installiert.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1301"/> - <location filename="../mainwindow.cpp" line="1338"/> + <location filename="../mainwindow.cpp" line="1307"/> + <location filename="../mainwindow.cpp" line="1344"/> <source>Certificate is installed.</source> <translation>Zertifikat ist installiert.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1302"/> - <location filename="../mainwindow.cpp" line="1313"/> - <location filename="../mainwindow.cpp" line="1366"/> - <location filename="../mainwindow.cpp" line="1384"/> - <location filename="../mainwindow.cpp" line="1564"/> - <location filename="../mainwindow.cpp" line="1572"/> + <location filename="../mainwindow.cpp" line="1308"/> + <location filename="../mainwindow.cpp" line="1319"/> + <location filename="../mainwindow.cpp" line="1372"/> + <location filename="../mainwindow.cpp" line="1390"/> + <location filename="../mainwindow.cpp" line="1570"/> + <location filename="../mainwindow.cpp" line="1578"/> <source>Certificate will be removed.</source> <translation>Zertifikat wird entfernt.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1314"/> - <location filename="../mainwindow.cpp" line="1367"/> + <location filename="../mainwindow.cpp" line="1320"/> + <location filename="../mainwindow.cpp" line="1373"/> <source>Certificate has not been removed.</source> <translation>Zertifikat wurde nicht entfernt.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1321"/> - <location filename="../mainwindow.cpp" line="1374"/> + <location filename="../mainwindow.cpp" line="1327"/> + <location filename="../mainwindow.cpp" line="1380"/> <source>Certificate has been removed.</source> <translation>Zertifikat wurde entfernt.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1351"/> + <location filename="../mainwindow.cpp" line="1357"/> <source>Certificate will not be installed.</source> <translation>Zertifikat wird nicht installiert.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1385"/> - <location filename="../mainwindow.cpp" line="1567"/> + <location filename="../mainwindow.cpp" line="1391"/> + <location filename="../mainwindow.cpp" line="1573"/> <source>Certificate will not be removed.</source> <translation>Zertifikat wird nicht entfernt.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1627"/> + <location filename="../mainwindow.cpp" line="1633"/> <source>Firefox and Thunderbird certificate installation.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../mainwindow.cpp" line="1628"/> - <source>Please close all running Firefox and Thunderbird instances before continuing with the installation.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../mainwindow.cpp" line="1631"/> - <source>Continue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../mainwindow.cpp" line="1633"/> - <source>Cancel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../mainwindow.cpp" line="1844"/> - <source>The integrity check for the available software update has failed repeatedly.</source> - <translation type="unfinished"></translation> + <translation>Firefox- und Thunderbird-Zertifikatsinstallation.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1846"/> - <location filename="../mainwindow.cpp" line="1851"/> - <location filename="../mainwindow.cpp" line="1856"/> - <source>Please contact your Support or the publisher of the Software.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../mainwindow.cpp" line="1849"/> - <source>The integrity check of the available certificates has failed repeatedly.</source> - <translation type="unfinished"></translation> + <location filename="../mainwindow.cpp" line="1634"/> + <source>Please close all running Firefox and Thunderbird instances before continuing with the installation.</source> + <translation>Bitte schließen Sie alle laufenden Firefox- und Thunderbird-Instanzen bevor Sie die Installation fortsetzen.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1854"/> - <source>The authentication of the download server has failed repeatedly.</source> - <translation type="unfinished"></translation> + <location filename="../mainwindow.cpp" line="1637"/> + <source>Continue</source> + <translation>Fortsetzen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1861"/> - <location filename="../mainwindow.cpp" line="1866"/> - <source>The connection to the download server has failed repeatedly.</source> - <translation type="unfinished"></translation> + <location filename="../mainwindow.cpp" line="1639"/> + <source>Cancel</source> + <translation>Abbrechen</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1863"/> - <source>Please check that the Proxy Server "%1" is available.</source> - <translation type="unfinished"></translation> + <location filename="../mainwindow.cpp" line="1850"/> + <source>The integrity check for the available software update has failed repeatedly.</source> + <translation>Die Integritätsprüfung der verfügbaren Softwareaktualisierung ist wiederholt fehlgeschlagen.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1868"/> + <location filename="../mainwindow.cpp" line="1852"/> + <location filename="../mainwindow.cpp" line="1857"/> + <location filename="../mainwindow.cpp" line="1862"/> + <source>Please contact your Support or the publisher of the Software.</source> + <translation>Bitte kontaktieren Sie Ihren Support oder den Herausgeber dieser Software.</translation> + </message> + <message> + <location filename="../mainwindow.cpp" line="1855"/> + <source>The integrity check of the available certificates has failed repeatedly.</source> + <translation>Die Integritätsprüfung der verfügbaren Zertifikatsliste ist wiederholt fehlgeschlagen.</translation> + </message> + <message> + <location filename="../mainwindow.cpp" line="1860"/> + <source>The authentication of the update server has failed repeatedly.</source> + <translation>Die Echtheitsprüfung des Update-Servers ist wiederholt fehlgeschlagen.</translation> + </message> + <message> + <location filename="../mainwindow.cpp" line="1867"/> + <location filename="../mainwindow.cpp" line="1872"/> + <source>The connection to the update server has failed repeatedly.</source> + <translation>Die Verbindung zum Update-Server ist wiederholt fehlgeschlagen.</translation> + </message> + <message> + <source>The authentication of the download server has failed repeatedly.</source> + <translation type="vanished">Die Echtheitsprüfung des Download-Servers ist wiederholt fehlgeschlagen.</translation> + </message> + <message> + <location filename="../mainwindow.cpp" line="1869"/> + <source>Please check that the Proxy Server "%1" is available.</source> + <translation>Bitte prüfen Sie, ob der Proxy-Server "%1" erreichbar ist.</translation> + </message> + <message> + <location filename="../mainwindow.cpp" line="1874"/> <source>Please check your internet connection.</source> - <translation type="unfinished"></translation> + <translation>Bitte prüfen Sie Ihre Internetverbindung.</translation> </message> <message> <source>You should apply the following, recommended changes to your certificate stores.</source> @@ -752,18 +756,18 @@ <translation type="vanished">Sie können die nachfolgenden Änderungen an Ihren Zertifikatsspeichern vornehmen.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1188"/> + <location filename="../mainwindow.cpp" line="1194"/> <source>Pending changes (%1)</source> <translation>Ausstehende Änderungen (%1)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1246"/> + <location filename="../mainwindow.cpp" line="1252"/> <source>New, recommended changes (%1/%2)</source> <translation>Neue, empfohlene Änderungen (%1/%2)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1254"/> + <location filename="../mainwindow.cpp" line="1260"/> <source>No new recommendations</source> <translation>Keine neuen Empfehlungen</translation> </message> @@ -784,37 +788,37 @@ <translation type="vanished">Neue empfohlene Änderungen (%1)</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1400"/> + <location filename="../mainwindow.cpp" line="1406"/> <source>Error executing update</source> <translation>Fehler bei der Aktualisierung</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1487"/> + <location filename="../mainwindow.cpp" line="1493"/> <source>Installation with standard user account</source> <translation>Installation mit Standardbenutzerkonto</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1488"/> + <location filename="../mainwindow.cpp" line="1494"/> <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>Windows wird Sie nun bitten, jede Wurzelzertifikatsänderung zu bestätigen. Grund dafür: TrustBridge besitzt nicht die nötigen Privilegien, um Wurzelzertifikate ohne Nachfrage in den Windows-Zertifikatsspeicher zu installieren.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1496"/> + <location filename="../mainwindow.cpp" line="1502"/> <source>Installing certificates...</source> <translation>Wurzelzertifikate werden geändert...</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1769"/> + <location filename="../mainwindow.cpp" line="1775"/> <source>Error!</source> <translation>Fehler!</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1769"/> + <location filename="../mainwindow.cpp" line="1775"/> <source>Failed to find the manual</source> <translation>Fehler beim Finden des Handbuchs</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1783"/> + <location filename="../mainwindow.cpp" line="1789"/> <source>TrustBridge error</source> <translation>TrustBridge Fehler</translation> </message> @@ -893,22 +897,22 @@ <translation>TrustBridge-Updater</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1660"/> + <location filename="../mainwindow.cpp" line="1666"/> <source>Hide details</source> <translation>Details ausblenden</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1661"/> + <location filename="../mainwindow.cpp" line="1667"/> <source>Less</source> <translation>Weniger</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1666"/> + <location filename="../mainwindow.cpp" line="1672"/> <source>Show details</source> <translation>Details einblenden</translation> </message> <message> - <location filename="../mainwindow.cpp" line="1667"/> + <location filename="../mainwindow.cpp" line="1673"/> <source>Details</source> <translation>Details</translation> </message>
--- a/ui/mainwindow.cpp Mon Sep 29 10:19:57 2014 +0200 +++ b/ui/mainwindow.cpp Mon Sep 29 11:08:46 2014 +0200 @@ -718,7 +718,9 @@ "<li>Oxygen-Icons (LGPL v==3)" + "<li>Mozilla NSS (Mozilla Public License v2)" + "<li>libcurl (The curl license)</ul>" + - tr("Read more about the license information in the 'licenses' directory in the " + tr("You will find the legally binding details in the 'licenses' directory " + "where TrustBridge is installed<br/>" + "or in the corresponding revision of the " "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>.")); textDesc->setTextFormat(Qt::RichText); textDesc->setTextInteractionFlags( @@ -1855,19 +1857,19 @@ tr("Please contact your Support or the publisher of the Software.")); break; case lteInvalidCertificate: - showErrorMessage(tr("The authentication of the download server has " + showErrorMessage(tr("The authentication of the update server has " "failed repeatedly.") + "\n" + tr("Please contact your Support or the publisher of the Software.")); break; case lteNoConnection: bool useProxy = mSettings.value("UseProxy", false).toBool(); if (useProxy) { - showErrorMessage(tr("The connection to the download server has " + showErrorMessage(tr("The connection to the update server has " "failed repeatedly.") + "\n" + tr("Please check that the Proxy Server \"%1\" is available.").arg( mSettings.value("ProxyURL").toString())); } else { - showErrorMessage(tr("The connection to the download server has " + showErrorMessage(tr("The connection to the update server has " "failed repeatedly.") + "\n" + tr("Please check your internet connection.")); }