Mercurial > trustbridge

changeset 713:cdf8a924e480

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(UI) Increase apply/quit button height. Updated translations.
author Emanuel Schuetze <emanuel@intevation.de>
date Wed, 02 Jul 2014 15:46:50 +0200
parents 1e61903f61e2
children 57bd73145e48
files ui/l10n/trustbridge_de_DE.ts ui/mainwindow.cpp
diffstat 2 files changed, 102 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/ui/l10n/trustbridge_de_DE.ts	Wed Jul 02 15:23:44 2014 +0200
+++ b/ui/l10n/trustbridge_de_DE.ts	Wed Jul 02 15:46:50 2014 +0200
@@ -50,12 +50,13 @@
 <context>
     <name>CertificateItemWidget</name>
     <message>
-        <location filename="../certificateitemwidget.cpp" line="57"/>
+        <location filename="../certificateitemwidget.cpp" line="72"/>
+        <location filename="../certificateitemwidget.cpp" line="94"/>
         <source>uninstall</source>
         <translation>Deinstallieren</translation>
     </message>
     <message>
-        <location filename="../certificateitemwidget.cpp" line="58"/>
+        <location filename="../certificateitemwidget.cpp" line="73"/>
         <source>keep</source>
         <translation>Behalten</translation>
     </message>
@@ -158,83 +159,83 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="232"/>
+        <location filename="../mainwindow.cpp" line="234"/>
         <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="403"/>
+        <location filename="../mainwindow.cpp" line="409"/>
         <source>Check for Updates</source>
         <translation>Aktualisierungen prüfen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="405"/>
-        <location filename="../mainwindow.cpp" line="822"/>
+        <location filename="../mainwindow.cpp" line="411"/>
+        <location filename="../mainwindow.cpp" line="843"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="423"/>
-        <location filename="../mainwindow.cpp" line="735"/>
+        <location filename="../mainwindow.cpp" line="429"/>
+        <location filename="../mainwindow.cpp" line="750"/>
         <source>TrustBridge</source>
         <translation>TrustBridge</translation>
     </message>
     <message>
+        <location filename="../mainwindow.cpp" line="471"/>
         <source>Updates</source>
-        <translation type="vanished">Aktualisierungen</translation>
+        <translation>Aktualisierungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="484"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>Revoked
 certificates</source>
         <translation>Zurückgezogene
 Zertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="540"/>
         <source>Last update of TrustBridge: %1</source>
-        <translation>Letzte Aktualisierung von TrustBridge: %1</translation>
+        <translation type="vanished">Letzte Aktualisierung von TrustBridge: %1</translation>
     </message>
     <message>
         <source>Updates (%1/%2)</source>
         <translation type="vanished">Aktualisierungen (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="553"/>
-        <location filename="../mainwindow.cpp" line="826"/>
+        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="847"/>
         <source>Quit without saving</source>
         <translation>Beenden ohne Speichern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
-        <location filename="../mainwindow.cpp" line="838"/>
+        <location filename="../mainwindow.cpp" line="617"/>
+        <location filename="../mainwindow.cpp" line="859"/>
         <source>Remove revoked certificates (%1/%2)</source>
         <translation>Zurückgezogene Zertifikate löschen (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="682"/>
         <source>Trusted certificates</source>
         <translation>Vertrauenswürdige Zertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="683"/>
         <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 folgende Liste von Wurzelzertifikaten wird durch das BSI betreut. Das BSI überprüft dabei unabhängig die Echtheit, Sicherheit und Aktualität der Zertifikate.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="675"/>
+        <location filename="../mainwindow.cpp" line="690"/>
         <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, welchen Zertifikaten Sie vertrauen wollen. TrustBridge wird diese Zertifikate dann für Ihre sichere Kommunikation via E-Mail und Internet installieren.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="475"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>Trusted
 certificates</source>
         <translation>Vertrauenswürdige
 Zertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="493"/>
+        <location filename="../mainwindow.cpp" line="499"/>
         <source>Information
 and help</source>
         <translation>Informationen
@@ -245,18 +246,15 @@
         <translation type="obsolete">Aktualisierungen (%1/%2) {1)?}</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="538"/>
-        <location filename="../mainwindow.cpp" line="907"/>
         <source>Last update of certificates: %1</source>
-        <translation>Letzte Aktualisierung der Zertifikate: %1</translation>
+        <translation type="vanished">Letzte Aktualisierung der Zertifikate: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="542"/>
         <source>You should apply the following changes to your root certificates:</source>
-        <translation>Sie sollten die folgenden Änderungen an Ihren Wurzelzertifikaten übernehmen:</translation>
+        <translation type="vanished">Sie sollten die folgenden Änderungen an Ihren Wurzelzertifikaten übernehmen:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>Check for updates</source>
         <translation>Nach Aktualisierungen suchen</translation>
     </message>
@@ -265,91 +263,105 @@
         <translation type="vanished">Aktualisierungen einspielen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="587"/>
-        <location filename="../mainwindow.cpp" line="833"/>
+        <location filename="../mainwindow.cpp" line="600"/>
+        <location filename="../mainwindow.cpp" line="854"/>
         <source>Install new trusted certificates (%1/%2)</source>
         <translation>Neue, vertrauenswürdige Zertifikate installieren (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="606"/>
-        <location filename="../mainwindow.cpp" line="623"/>
-        <location filename="../mainwindow.cpp" line="1111"/>
-        <location filename="../mainwindow.cpp" line="1125"/>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="619"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="1135"/>
+        <location filename="../mainwindow.cpp" line="1149"/>
+        <location filename="../mainwindow.cpp" line="1162"/>
         <source>Show details</source>
         <translation>Details einblenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="698"/>
+        <location filename="../mainwindow.cpp" line="713"/>
         <source>Revoked certificates</source>
         <translation>Zurückgezogene Zertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="699"/>
+        <location filename="../mainwindow.cpp" line="714"/>
         <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>Zertifikate können auf vielfache Weise korrumpiert oder gestohlen und missbraucht werden. Das BSI empfiehlt Ihnen daher zurückgezogene Zertifikate auch umgehend von Ihrem System zu entfernen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="706"/>
+        <location filename="../mainwindow.cpp" line="721"/>
         <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>Die folgenden unsicheren Zertifikate wurden vom BSI zurückgezogen. Bereits deinstallierte Zertifikate können nicht wieder installiert werden. Es wird empfohlen, dass Sie alle Zertifikate zur Deinstallation markieren, sofern Sie noch zurückgezogene Zertifikate installiert haben.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="621"/>
-        <location filename="../mainwindow.cpp" line="910"/>
-        <location filename="../mainwindow.cpp" line="1037"/>
-        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="634"/>
+        <location filename="../mainwindow.cpp" line="934"/>
+        <location filename="../mainwindow.cpp" line="1061"/>
+        <location filename="../mainwindow.cpp" line="1071"/>
         <source>Manually changed certificates (%1)</source>
         <translation>Manuell geänderte Zertifikate (%1)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="448"/>
+        <location filename="../mainwindow.cpp" line="454"/>
         <source>Trust in your digital communication</source>
         <translation>Vertrauen in Ihre digitale Kommunikation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="465"/>
         <source>Changes</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Änderungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="536"/>
-        <location filename="../mainwindow.cpp" line="823"/>
+        <location filename="../mainwindow.cpp" line="538"/>
+        <location filename="../mainwindow.cpp" line="844"/>
         <source>Certificates unchanged</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikate unverändert</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="555"/>
-        <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cpp" line="543"/>
+        <source>TrustBridge Version: %1</source>
+        <translation>TrustBridge Version: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="736"/>
+        <location filename="../mainwindow.cpp" line="548"/>
+        <location filename="../mainwindow.cpp" line="1184"/>
+        <source>Last sucessful update check: %1</source>
+        <translation>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="573"/>
+        <source>Apply changes</source>
+        <translation>Änderungen übernehmen</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="751"/>
         <source>Version: </source>
         <translation>Version:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="753"/>
+        <location filename="../mainwindow.cpp" line="768"/>
         <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
         <translation>TrustBridge ist eine Wurzelzertifikatsinstaller für Windows und Linux.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="758"/>
+        <location filename="../mainwindow.cpp" line="773"/>
         <source>The root certificate lists are managed by the German &lt;a href=&quot;https://www.bsi.bund.de&quot;&gt;Federal Office for Information Security (BSI)&lt;/a&gt;.
 
 </source>
         <translation>Die Liste der Wurzelzertifikate wird vom &lt;a href=&quot;https://www.bsi.bund.de&quot;&gt;Bundesamt für Sicherheit in der Informationstechnik (BSI)&lt;/a&gt; verwaltet.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="764"/>
+        <location filename="../mainwindow.cpp" line="779"/>
         <source>The software was developed by the companies &lt;a href=&quot;http://www.intevation.de&quot;&gt;Intevation GmbH&lt;/a&gt; and  &lt;a href=&quot;http://www.dn-systems.de&quot;&gt;DN-Systems GmbH&lt;/a&gt;, &lt;br&gt; contracted by the German Federal Office for Information Security (BSI).
 
 </source>
         <translation>Die Software wurde von den Unternehmen &lt;a href=&quot;http://www.intevation.de&quot;&gt;Intevation GmbH&lt;/a&gt; und  &lt;a href=&quot;http://www.dn-systems.de&quot;&gt;DN-Systems GmbH&lt;/a&gt; entwickelt, &lt;br&gt; beauftragt vom Bundesamt für Sicherheit in der Informationstechnik (BSI).</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="771"/>
+        <location filename="../mainwindow.cpp" line="786"/>
         <source>TrustBridge is Free Software licensed under GNU GPL v2+.
 
 Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
@@ -358,41 +370,60 @@
 Copyright (C) 2014, Bundesamt für Sicherheit in der Informationstechnik (BSI)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="827"/>
         <source>Changes (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Änderungen (%1)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="886"/>
+        <location filename="../mainwindow.cpp" line="907"/>
         <source>install</source>
         <translation>Installieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="886"/>
+        <location filename="../mainwindow.cpp" line="907"/>
         <source>ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1105"/>
-        <location filename="../mainwindow.cpp" line="1119"/>
-        <location filename="../mainwindow.cpp" line="1133"/>
+        <location filename="../mainwindow.cpp" line="929"/>
+        <source>Installed certificates from: %1</source>
+        <translation>Installierte Zertifikate vom: %1</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1129"/>
+        <location filename="../mainwindow.cpp" line="1143"/>
+        <location filename="../mainwindow.cpp" line="1157"/>
         <source>Hide details</source>
         <translation>Details ausblenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="240"/>
+        <location filename="../mainwindow.cpp" line="1187"/>
+        <source>Sucessfully checked for updates.</source>
+        <translation>Prüfung nach Aktualisierungen erfolgreich.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="242"/>
         <source>An update for %1 is available.
 Click here to download and install the update.</source>
         <translation>Eine Aktualisierung für %1 ist verfügbar.
 Hier klicken, um Download und Installation zu starten.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="916"/>
+        <location filename="../mainwindow.cpp" line="567"/>
+        <source>You should apply the following, recommended changes to your certificate stores.</source>
+        <translation>Es wird empfohlen, die nachfolgenden Änderungen an Ihren Zertifikatsspeichern zu übernehmen.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="848"/>
+        <source>Changes to certificate stores (%1)</source>
+        <translation>Änderungen an Zertifikatsspeichern (%1)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="940"/>
         <source>Error executing update</source>
         <translation>Fehler bei der Aktualisierung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="973"/>
+        <location filename="../mainwindow.cpp" line="997"/>
         <source>Installing certificates...</source>
         <translation>Zertifikate werden installiert...</translation>
     </message>
--- a/ui/mainwindow.cpp	Wed Jul 02 15:23:44 2014 +0200
+++ b/ui/mainwindow.cpp	Wed Jul 02 15:46:50 2014 +0200
@@ -468,7 +468,7 @@
     updatesButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     updatesButton->setIcon(QIcon(":/img/view-refresh.png"));
     updatesButton->setIconSize(QSize(40, 40));
-    updatesButton->setText(tr("Changes"));
+    updatesButton->setText(tr("Updates"));
     updatesButton->setFixedWidth(120);
     updatesButton->setFixedHeight(80);
     updatesButton->setCheckable(true);
@@ -564,12 +564,14 @@
 
     /* Header 2: Action text and buttons */
     QLabel *updatesTip =
-        new QLabel(tr("You should apply the following, recommended changes to your root certificates."));
+        new QLabel(tr("You should apply the following, recommended changes to your certificate stores."));
     updatesTip->setWordWrap(true);
     QHBoxLayout *updatesHeaderActionButtonLayout = new QHBoxLayout;
     mQuitButton = new QPushButton(" " + tr("Quit without saving"));
     mQuitButton->setIcon(QIcon(":/img/application-exit.png"));
+    mQuitButton->setFixedHeight(30);
     QPushButton *installButton = new QPushButton(" " + tr("Apply changes"));
+    installButton->setFixedHeight(30);
 #ifdef Q_OS_WIN
     if (is_admin()) {
         QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
@@ -843,7 +845,7 @@
                 "</h2>");
     } else {
         mQuitButton->setText(" " + tr("Quit without saving"));
-        mUpdatesHeader->setText("<h2>" + tr("Changes (%1)")
+        mUpdatesHeader->setText("<h2>" + tr("Changes to certificate stores (%1)")
                 .arg(totalCount) +
                 "</h2>");
     }
http://wald.intevation.org/projects/trustbridge/