[PATCH 3 of 3] Move createcertlist and aboutdialog back into their respective source groups
Wald Commits
scm-commit at wald.intevation.org
Tue Apr 29 15:37:20 CEST 2014
# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398778636 0
# Node ID bedeb38c244af0b149373c040364ee7822fcaf88
# Parent f6371e9c959af50868dbb99372b69ab044cf996b
Move createcertlist and aboutdialog back into their respective source groups.
This is necessary to correctly generate l10n
diff -r f6371e9c959a -r bedeb38c244a ui/CMakeLists.txt
--- a/ui/CMakeLists.txt Tue Apr 29 13:29:57 2014 +0000
+++ b/ui/CMakeLists.txt Tue Apr 29 13:37:16 2014 +0000
@@ -20,8 +20,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/downloader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sslconnection.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sslhelp.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/aboutdialog.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/createcertlistdialog.cpp
)
# Cmake does not correctly identify gcc windres when cross compiling
@@ -38,6 +36,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/separatoritemdelegate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/installwrapper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/img/icon.rc
+ ${CMAKE_CURRENT_SOURCE_DIR}/aboutdialog.cpp
${CERTIFICATELIST_SOURCES}
${DOWNLOADER_SOURCES}
)
@@ -48,6 +47,8 @@
${CMAKE_CURRENT_SOURCE_DIR}/certificatetablemodel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/certificatetabledelegate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/createinstallerdialog.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/aboutdialog.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/createcertlistdialog.cpp
${CERTIFICATELIST_SOURCES}
)
diff -r f6371e9c959a -r bedeb38c244a ui/l10n/administrator_de_DE.ts
--- a/ui/l10n/administrator_de_DE.ts Tue Apr 29 13:29:57 2014 +0000
+++ b/ui/l10n/administrator_de_DE.ts Tue Apr 29 13:37:16 2014 +0000
@@ -4,14 +4,45 @@
<context>
<name>AboutDialog</name>
<message>
+ <location filename="../aboutdialog.cpp" line="35"/>
+ <source>TrustBridge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="36"/>
+ <source>Version: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="50"/>
+ <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="52"/>
<source>The root certificate lists are managed by the German <a href="https://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.
</source>
- <translation type="obsolete">Die Liste der Wurzelzertifikate wird vom <a href="https://www.bsi.bund.de">Bundesamt für Sicherheit in der Informationstechnik (BSI)</a> verwaltet.</translation>
+ <translation type="unfinished">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>
+ <location filename="../aboutdialog.cpp" line="55"/>
+ <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="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="59"/>
+ <source>TrustBridge is Free Software licensed under GNU GPL v2+.
+
+Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="73"/>
<source>Close</source>
- <translation type="obsolete">Schließen</translation>
+ <translation type="unfinished">Schließen</translation>
</message>
</context>
<context>
@@ -156,8 +187,10 @@
<context>
<name>CreateCertListDialog</name>
<message>
+ <location filename="../createcertlistdialog.cpp" line="30"/>
+ <location filename="../createcertlistdialog.cpp" line="52"/>
<source>Save certificate list</source>
- <translation type="vanished">Zertifikatsliste speichern</translation>
+ <translation>Zertifikatsliste speichern</translation>
</message>
<message>
<source>Save all managed root certificates in a new, signed certificate list</source>
@@ -173,78 +206,109 @@
<translation type="obsolete">Liste signieren</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="54"/>
<source>Save all managed root certificates in a new, signed certificate list.</source>
- <translation type="vanished">Eine neue, signierte Zertifikatsliste erstellen.</translation>
+ <translation>Eine neue, signierte Zertifikatsliste erstellen.</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="84"/>
<source>In addition, each certificate list will be saved automatically in the archive directory:
</source>
- <translation type="vanished">Zusätzlich wird jede Zertifikatsliste automatisch in diesem Ordner Archiviert:</translation>
+ <translation>Zusätzlich wird jede Zertifikatsliste automatisch in diesem Ordner Archiviert:</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="94"/>
<source>Save list</source>
- <translation type="vanished">Liste speichern</translation>
+ <translation>Liste speichern</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="96"/>
<source>Cancel</source>
- <translation type="vanished">Abbrechen</translation>
+ <translation>Abbrechen</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="121"/>
<source>Error!</source>
- <translation type="vanished">Fehler!</translation>
+ <translation>Fehler!</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="159"/>
<source>Select certificate</source>
- <translation type="vanished">Zertifikat auswählen</translation>
+ <translation>Zertifikat auswählen</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="244"/>
<source>Failed to write list to: %1</source>
- <translation type="vanished">Fehler beim schreiben der Liste in Datei: %1</translation>
+ <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 type="vanished">Fehler beim laden des Schlüssels: %1</translation>
+ <translation>Fehler beim laden des Schlüssels: %1</translation>
</message>
<message>
- <source>Only 3072 bit RSA keys are supported by the current format.</source>
- <translation type="vanished">Nur 3027 bit RSA Schlüssel werden vom aktuellen Format unterstützt.</translation>
+ <location filename="../createcertlistdialog.cpp" line="65"/>
+ <source>Select signing key:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Select target location</source>
- <translation type="vanished">Zielordner auswählen</translation>
+ <location filename="../createcertlistdialog.cpp" line="66"/>
+ <source>Select output folder:</source>
+ <translation type="unfinished">Ausgabeverzeichnis auswählen:</translation>
</message>
<message>
- <source>Please select a valid rsa key.</source>
- <translation type="vanished">Kein Signaturschlüssel ausgewählt.</translation>
+ <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>
- <source>Please select an output location first.</source>
- <translation type="vanished">Kein Zielordner angegeben.</translation>
+ <location filename="../createcertlistdialog.cpp" line="172"/>
+ <source>Select target location</source>
+ <translation>Zielordner auswählen</translation>
</message>
<message>
- <source>Failed to create archive location.</source>
- <translation type="vanished">Fehler beim erstellen des Archivordners.</translation>
+ <location filename="../createcertlistdialog.cpp" line="228"/>
+ <source>Please select a valid rsa key.</source>
+ <translation>Kein Signaturschlüssel ausgewählt.</translation>
</message>
<message>
- <source>Failed Archive a copy.</source>
- <translation type="vanished">Fehler beim speichern der Archivkopie.</translation>
+ <location filename="../createcertlistdialog.cpp" line="231"/>
+ <source>Please select an output location first.</source>
+ <translation>Kein Zielordner angegeben.</translation>
</message>
<message>
- <source>Failed to write current_certificates file.</source>
- <translation type="vanished">Fehler beim schreiben der Datei "current_certificates".</translation>
+ <location filename="../createcertlistdialog.cpp" line="252"/>
+ <source>Failed to create archive location.</source>
+ <translation>Fehler beim erstellen des Archivordners.</translation>
</message>
<message>
+ <location filename="../createcertlistdialog.cpp" line="257"/>
+ <source>Failed Archive a copy.</source>
+ <translation>Fehler beim speichern der Archivkopie.</translation>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="265"/>
+ <source>Failed to update current_certificates.txt</source>
+ <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>
+ </message>
+ <message>
+ <location filename="../createcertlistdialog.cpp" line="275"/>
<source>Saved certificate list:
%1</source>
- <translation type="vanished">Zertifikatsliste: %1 gespeichert.</translation>
+ <translation>Zertifikatsliste: %1 gespeichert.</translation>
</message>
</context>
<context>
<name>CreateInstallerDialog</name>
<message>
- <location filename="../createinstallerdialog.cpp" line="25"/>
- <location filename="../createinstallerdialog.cpp" line="50"/>
+ <location filename="../createinstallerdialog.cpp" line="28"/>
+ <location filename="../createinstallerdialog.cpp" line="53"/>
<source>Create binary installer</source>
<translation>Installationspaket erstellen</translation>
</message>
@@ -261,77 +325,82 @@
<translation type="vanished">Code Signing Zertifikat auswählen (privater Schlüssel):</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="52"/>
+ <location filename="../createinstallerdialog.cpp" line="55"/>
<source>Create and sign a TrustBridge binary installer.</source>
<translation>Erzeugt und signiert ein TrustBridge-Installationspaket.</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="63"/>
+ <location filename="../createinstallerdialog.cpp" line="66"/>
<source>Select binary folder:</source>
<translation>Binärverzeichnis auswählen:</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="64"/>
+ <location filename="../createinstallerdialog.cpp" line="67"/>
<source>Select code signing certificate:</source>
<translation>Code-Signing-Zertifikat auswählen:</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="65"/>
+ <location filename="../createinstallerdialog.cpp" line="68"/>
<source>Select output folder:</source>
<translation>Ausgabeverzeichnis auswählen:</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="94"/>
+ <location filename="../createinstallerdialog.cpp" line="97"/>
<source>Create installer</source>
<translation>Installationspaket erzeugen</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="96"/>
+ <location filename="../createinstallerdialog.cpp" line="99"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="116"/>
+ <location filename="../createinstallerdialog.cpp" line="119"/>
<source>Creating installer package...</source>
<translation>Installationspaket wird erstellt...</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="128"/>
+ <location filename="../createinstallerdialog.cpp" line="131"/>
<source>Select certificate</source>
<translation>Zertifikat auswählen</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="139"/>
+ <location filename="../createinstallerdialog.cpp" line="142"/>
<source>Select binary folder</source>
<translation>Binärverzeichnis auswählen</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="157"/>
+ <location filename="../createinstallerdialog.cpp" line="160"/>
<source>Error!</source>
<translation>Fehler!</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="177"/>
+ <location filename="../createinstallerdialog.cpp" line="165"/>
+ <source>Created installer in %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="184"/>
<source>Please select an existing input folder.</source>
<translation>Bitte wählen Sie ein existierendes Eingabeverzeichnis.</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="181"/>
+ <location filename="../createinstallerdialog.cpp" line="188"/>
<source>Please select a codesigning certificate.</source>
<translation>Bitte wählen Sie ein Code-Signing-Zertifikat.</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="185"/>
+ <location filename="../createinstallerdialog.cpp" line="192"/>
<source>Please select a output folder.</source>
<translation>Bitte wählen Sie ein Ausgabeverzeichnis.</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="192"/>
+ <location filename="../createinstallerdialog.cpp" line="199"/>
<source>Folder %1 does not appear to contain a meta.ini</source>
<translation>Das Verzeichnis %1 enthält keine meta.ini Datei</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="217"/>
+ <location filename="../createinstallerdialog.cpp" line="224"/>
<source>Failed to start makensis.
Please ensure that makensis is installed and in your PATH variable.</source>
<translation>Fehler beim Starten von makensis.
@@ -342,12 +411,35 @@
<translation type="vanished">Archiv auswählen</translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="149"/>
+ <location filename="../createinstallerdialog.cpp" line="152"/>
<source>Select target location</source>
<translation>Zielort auswählen</translation>
</message>
</context>
<context>
+ <name>FinishedDialog</name>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="243"/>
+ <source>Success!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="247"/>
+ <source>Error!</source>
+ <translation type="unfinished">Fehler!</translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="255"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../createinstallerdialog.cpp" line="259"/>
+ <source>OK</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>QObject</name>
<message>
<source>Failed to parse certificate</source>
diff -r f6371e9c959a -r bedeb38c244a ui/l10n/trustbridge_de_DE.ts
--- a/ui/l10n/trustbridge_de_DE.ts Tue Apr 29 13:29:57 2014 +0000
+++ b/ui/l10n/trustbridge_de_DE.ts Tue Apr 29 13:37:16 2014 +0000
@@ -2,6 +2,50 @@
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../aboutdialog.cpp" line="35"/>
+ <source>TrustBridge</source>
+ <translation type="unfinished">TrustBridge</translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="36"/>
+ <source>Version: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="50"/>
+ <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="52"/>
+ <source>The root certificate lists are managed by the German <a href="https://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.
+
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="55"/>
+ <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="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="59"/>
+ <source>TrustBridge is Free Software licensed under GNU GPL v2+.
+
+Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="73"/>
+ <source>Close</source>
+ <translation type="unfinished">Schließen</translation>
+ </message>
+</context>
+<context>
<name>HelpDialog</name>
<message>
<location filename="../helpdialog.cpp" line="25"/>
@@ -66,174 +110,172 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../mainwindow.cpp" line="172"/>
+ <location filename="../mainwindow.cpp" line="171"/>
<source>An updated certificate list is available. Click here to install.</source>
<translation>Eine aktualisierte Zertifikatsliste ist verfügbar. Klicken Sie hier zum Installieren.</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="180"/>
+ <location filename="../mainwindow.cpp" line="179"/>
<source>An update for %1 is available. Click here to install.</source>
<translation>Eine Aktualisierung für %1 ist verfügbar. Klicken Sie hier zum Installieren.</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="271"/>
+ <location filename="../mainwindow.cpp" line="270"/>
<source>New Software version is available.</source>
<translation>Neue Softwareversion verfügbar.</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="272"/>
+ <location filename="../mainwindow.cpp" line="271"/>
<source>Do you want to install the new Version?</source>
<translatorcomment>typo: _v_ersion</translatorcomment>
<translation>Möchten Sie die neue Version installieren?</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="290"/>
+ <location filename="../mainwindow.cpp" line="289"/>
<source>Check for Updates</source>
<translation>Aktualisierungen prüfen</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="292"/>
- <location filename="../mainwindow.cpp" line="327"/>
- <location filename="../mainwindow.cpp" line="409"/>
+ <location filename="../mainwindow.cpp" line="291"/>
+ <location filename="../mainwindow.cpp" line="324"/>
+ <location filename="../mainwindow.cpp" line="404"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="310"/>
+ <location filename="../mainwindow.cpp" line="309"/>
<source>TrustBridge</source>
<translation>TrustBridge</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="318"/>
+ <location filename="../mainwindow.cpp" line="317"/>
<source>Menu</source>
<translation>Menü</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="320"/>
+ <location filename="../mainwindow.cpp" line="319"/>
<source>Force Update</source>
<translation>Aktualisierung erzwingen</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="321"/>
- <location filename="../mainwindow.cpp" line="385"/>
+ <location filename="../mainwindow.cpp" line="380"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="322"/>
<source>Statusdialog</source>
- <translation>Statusdialog</translation>
+ <translation type="vanished">Statusdialog</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="324"/>
+ <location filename="../mainwindow.cpp" line="321"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="325"/>
+ <location filename="../mainwindow.cpp" line="322"/>
<source>About</source>
<translatorcomment>"TrustBridge" ergänzen</translatorcomment>
<translation>Über TrustBridge</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="356"/>
+ <location filename="../mainwindow.cpp" line="351"/>
<source>Managed Certificates</source>
<translation>Verwaltete Zertifikate</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="362"/>
- <location filename="../mainwindow.cpp" line="500"/>
- <location filename="../mainwindow.cpp" line="530"/>
+ <location filename="../mainwindow.cpp" line="357"/>
+ <location filename="../mainwindow.cpp" line="495"/>
+ <location filename="../mainwindow.cpp" line="525"/>
<source>Current List Date: %1</source>
<translation>Datum der aktuellen Liste: %1</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="386"/>
+ <location filename="../mainwindow.cpp" line="381"/>
<source>Autoupdate</source>
<translation>Automatische Aktualisierung</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="387"/>
+ <location filename="../mainwindow.cpp" line="382"/>
<source>Autostart</source>
<translation>Start der Anwendung bei Systemstart</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="405"/>
+ <location filename="../mainwindow.cpp" line="400"/>
<source>Install selected</source>
<translation>Jetzt installieren</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="426"/>
+ <location filename="../mainwindow.cpp" line="421"/>
<source>Details</source>
<translation>Details</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="427"/>
+ <location filename="../mainwindow.cpp" line="422"/>
<source>Subject Common Name:</source>
<translation>Inhaber CN:</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="428"/>
+ <location filename="../mainwindow.cpp" line="423"/>
<source>Subject Organisation:</source>
<translation>Inhaber Organisation:</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="429"/>
+ <location filename="../mainwindow.cpp" line="424"/>
<source>Issuer Common Name:</source>
<translation>Aussteller CN:</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="430"/>
+ <location filename="../mainwindow.cpp" line="425"/>
<source>Issuer Organisation:</source>
<translation>Aussteller Organidation:</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="431"/>
+ <location filename="../mainwindow.cpp" line="426"/>
<source>Valid from:</source>
<translation>Gültig ab:</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="432"/>
+ <location filename="../mainwindow.cpp" line="427"/>
<source>Valid to:</source>
<translation>Gültig bis:</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="433"/>
+ <location filename="../mainwindow.cpp" line="428"/>
<source>Fingerprint:</source>
<translation>Fingerprint:</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="532"/>
+ <location filename="../mainwindow.cpp" line="527"/>
<source>New List Date: %1</source>
<translation>Datum der neuen Liste: %1</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="537"/>
+ <location filename="../mainwindow.cpp" line="532"/>
<source>New certificates to install</source>
<translation>Neu zu installierende Zertifikate</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="544"/>
+ <location filename="../mainwindow.cpp" line="539"/>
<source>New certificates to remove</source>
<translation>Neu zu löschende Zertifikate</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="551"/>
+ <location filename="../mainwindow.cpp" line="546"/>
<source>Old certificates to install</source>
<translation>Bisher installierte Zertifikate</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="558"/>
+ <location filename="../mainwindow.cpp" line="553"/>
<source>Old certificates to remove</source>
<translation>Bisher gelöschte Zertifikate</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="645"/>
+ <location filename="../mainwindow.cpp" line="628"/>
<source>Error executing update</source>
<translation>Fehler bei der Aktualisierung</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="690"/>
+ <location filename="../mainwindow.cpp" line="673"/>
<source>Installing certificates...</source>
<translation>Zertifikate werden installiert...</translation>
</message>
@@ -249,53 +291,13 @@
<context>
<name>StatusDialog</name>
<message>
- <location filename="../statusdialog.cpp" line="25"/>
<source>The following certificates are successfully installed:
</source>
- <translation>Die folgenden Zertifikate wurden erfolgreich installiert:</translation>
+ <translation type="vanished">Die folgenden Zertifikate wurden erfolgreich installiert:</translation>
</message>
<message>
- <location filename="../statusdialog.cpp" line="26"/>
- <source>* Email CA 2013
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../statusdialog.cpp" line="27"/>
- <source>* Server CA 2010
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../statusdialog.cpp" line="28"/>
- <source>
-The following certificates are successfully removed:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../statusdialog.cpp" line="29"/>
- <source>* Email CA 2010
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../statusdialog.cpp" line="30"/>
- <source>
-Errors while processing certificates:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../statusdialog.cpp" line="31"/>
- <source>* PCA-1-Verwaltung-08
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../statusdialog.cpp" line="35"/>
<source>Close</source>
- <translation>Schließen</translation>
+ <translation type="vanished">Schließen</translation>
</message>
</context>
</TS>
diff -r f6371e9c959a -r bedeb38c244a ui/tests/CMakeLists.txt
--- a/ui/tests/CMakeLists.txt Tue Apr 29 13:29:57 2014 +0000
+++ b/ui/tests/CMakeLists.txt Tue Apr 29 13:37:16 2014 +0000
@@ -55,7 +55,7 @@
add_dependencies(cinstprocesstest cinst)
add_custom_test(commontest.cpp "")
-add_custom_test(createcertlisttest.cpp "")
+add_custom_test(createcertlisttest.cpp "${CMAKE_SOURCE_DIR}/ui/createcertlistdialog.cpp")
if (WIN32)
add_custom_test(windowsstoretest.cpp "${CMAKE_SOURCE_DIR}/cinst/windowsstore.c")
More information about the Trustbridge-commits
mailing list