[PATCH] (issue111) Wording and German translation

Wald Commits scm-commit at wald.intevation.org
Mon Sep 15 15:05:25 CEST 2014


# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1410782920 -7200
# Node ID a7a72353d6d2b2c8291fd1f8f9ecaa0e56af6f08
# Parent  c4e3498e716f51d2537efa0da639ca907837f8a4
(issue111) Wording and German translation.

diff -r c4e3498e716f -r a7a72353d6d2 ui/installwrapper.cpp
--- a/ui/installwrapper.cpp	Mon Sep 15 14:00:14 2014 +0200
+++ b/ui/installwrapper.cpp	Mon Sep 15 14:08:40 2014 +0200
@@ -85,7 +85,7 @@
 
     if (vres.result != VerifyValid) {
         emit error(tr("Integrity check of the certificate installation process failed. ") 
-                + "\n" + tr("Please reinstall the Software."));
+                + "\n" + tr("Please reinstall the software."));
         return;
     }
 
diff -r c4e3498e716f -r a7a72353d6d2 ui/l10n/trustbridge_de_DE.ts
--- a/ui/l10n/trustbridge_de_DE.ts	Mon Sep 15 14:00:14 2014 +0200
+++ b/ui/l10n/trustbridge_de_DE.ts	Mon Sep 15 14:08:40 2014 +0200
@@ -161,12 +161,12 @@
     <message>
         <location filename="../installwrapper.cpp" line="87"/>
         <source>Integrity check of the certificate installation process failed. </source>
-        <translation type="unfinished"></translation>
+        <translation>Integritätsprüfung des Zertifikatsinstallationsprozesses fehlgeschlagen.</translation>
     </message>
     <message>
         <location filename="../installwrapper.cpp" line="88"/>
-        <source>Please reinstall the Software.</source>
-        <translation type="unfinished"></translation>
+        <source>Please reinstall the software.</source>
+        <translation>Bitte installieren Sie die Software neu.</translation>
     </message>
     <message>
         <location filename="../installwrapper.cpp" line="128"/>
@@ -213,13 +213,13 @@
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="501"/>
-        <location filename="../mainwindow.cpp" line="663"/>
+        <location filename="../mainwindow.cpp" line="664"/>
         <source>Check for Updates</source>
         <translation>Neue Empfehlungen suchen</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="503"/>
-        <location filename="../mainwindow.cpp" line="1030"/>
+        <location filename="../mainwindow.cpp" line="1028"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
@@ -241,10 +241,8 @@
         <translation type="vanished">Zuletzt nach Aktualisierungen gesucht:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="655"/>
-        <location filename="../mainwindow.cpp" line="658"/>
         <source>Last successful update check:</source>
-        <translation>Zuletzt nach neuen Empfehlungen gesucht:</translation>
+        <translation type="vanished">Zuletzt nach neuen Empfehlungen gesucht:</translation>
     </message>
     <message>
         <source>Updates</source>
@@ -252,7 +250,7 @@
 Empfehlungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="939"/>
+        <location filename="../mainwindow.cpp" line="937"/>
         <source>Revoked
 certificates</source>
         <translation>Abgeratene
@@ -268,40 +266,40 @@
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="613"/>
-        <location filename="../mainwindow.cpp" line="1035"/>
+        <location filename="../mainwindow.cpp" line="1033"/>
         <source>Quit without saving</source>
         <translation>Beenden ohne Schreiben</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="718"/>
-        <location filename="../mainwindow.cpp" line="1072"/>
+        <location filename="../mainwindow.cpp" line="717"/>
+        <location filename="../mainwindow.cpp" line="1070"/>
         <source>Remove revoked certificates (%1/%2)</source>
         <translation>Abgeratene Wurzelzertifikate entfernen (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="795"/>
+        <location filename="../mainwindow.cpp" line="794"/>
         <source>Trusted certificates</source>
         <translation>Empfohlene Wurzelzertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="796"/>
+        <location filename="../mainwindow.cpp" line="795"/>
         <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="803"/>
+        <location filename="../mainwindow.cpp" line="802"/>
         <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="930"/>
+        <location filename="../mainwindow.cpp" line="928"/>
         <source>Trusted
 certificates</source>
         <translation>Empfohlene
 Wurzelzertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="948"/>
+        <location filename="../mainwindow.cpp" line="946"/>
         <source>Information
 and help</source>
         <translation>Informationen
@@ -328,28 +326,28 @@
         <translation type="vanished">Aktualisierungen einspielen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="696"/>
-        <location filename="../mainwindow.cpp" line="1056"/>
+        <location filename="../mainwindow.cpp" line="695"/>
+        <location filename="../mainwindow.cpp" line="1054"/>
         <source>Install new trusted certificates (%1/%2)</source>
         <translation>Neue, empfohlene Wurzelzertifikate installieren (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="700"/>
-        <location filename="../mainwindow.cpp" line="722"/>
-        <location filename="../mainwindow.cpp" line="741"/>
-        <location filename="../mainwindow.cpp" line="1045"/>
-        <location filename="../mainwindow.cpp" line="1062"/>
-        <location filename="../mainwindow.cpp" line="1078"/>
+        <location filename="../mainwindow.cpp" line="699"/>
+        <location filename="../mainwindow.cpp" line="721"/>
+        <location filename="../mainwindow.cpp" line="740"/>
+        <location filename="../mainwindow.cpp" line="1043"/>
+        <location filename="../mainwindow.cpp" line="1060"/>
+        <location filename="../mainwindow.cpp" line="1076"/>
         <source>Show details</source>
         <translation>Details einblenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="836"/>
+        <location filename="../mainwindow.cpp" line="835"/>
         <source>Revoked certificates</source>
         <translation>Abgeratene Wurzelzertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="837"/>
+        <location filename="../mainwindow.cpp" line="836"/>
         <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>
@@ -358,12 +356,11 @@
         <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="1051"/>
         <source>Manually changed certificates (%1)</source>
-        <translation>Abweichend zu behandelnde Wurzelzertifikate (%1)</translation>
+        <translation type="vanished">Abweichend zu behandelnde Wurzelzertifikate (%1)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="888"/>
+        <location filename="../mainwindow.cpp" line="886"/>
         <source>Trust in your digital communication</source>
         <translation>Vertrauen in Ihre digitale Kommunikation</translation>
     </message>
@@ -373,7 +370,7 @@
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="609"/>
-        <location filename="../mainwindow.cpp" line="1031"/>
+        <location filename="../mainwindow.cpp" line="1029"/>
         <source>Certificates unchanged</source>
         <translation>Wurzelzertifikate unverändert</translation>
     </message>
@@ -390,7 +387,7 @@
         <translation type="vanished">Es wird empfohlen, die nachfolgenden Änderungen an Ihren Wurzelzertifikaten zu übernehmen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1039"/>
+        <location filename="../mainwindow.cpp" line="1037"/>
         <source>Apply changes</source>
         <translation>Änderungen schreiben</translation>
     </message>
@@ -424,16 +421,26 @@
     <message>
         <location filename="../mainwindow.cpp" line="494"/>
         <source>Failed to check for updates:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler bei Updateprüfung:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1025"/>
+        <location filename="../mainwindow.cpp" line="1017"/>
+        <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="1020"/>
+        <source>You can apply the following, changes to your certificate stores:</source>
+        <translation>Sie können die nachfolgenden Änderungen an Ihren Zertifikatsspeichern vornehmen:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1023"/>
         <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="617"/>
-        <location filename="../mainwindow.cpp" line="1033"/>
+        <location filename="../mainwindow.cpp" line="1031"/>
         <source>Install certificates again</source>
         <translation>Wurzelzertifikate erneut schreiben</translation>
     </message>
@@ -466,12 +473,12 @@
         <translation type="vanished">Änderungen (%1)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1157"/>
         <source>install</source>
         <translation>Installieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1157"/>
         <source>ignore</source>
         <translation>Ignorieren</translation>
     </message>
@@ -488,7 +495,7 @@
         <translation type="vanished">Letzte erfolgreiche Prüfung nach Aktualisierungen: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1471"/>
+        <location filename="../mainwindow.cpp" line="1477"/>
         <source>Sucessfully checked for updates.</source>
         <translation>Suche nach neuen Empfehlungen erfolgreich.</translation>
     </message>
@@ -529,118 +536,140 @@
         <translation>Proxy-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="659"/>
+        <location filename="../mainwindow.cpp" line="655"/>
+        <source>Last update check:</source>
+        <translation>Letzte Suche:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="660"/>
         <source>No connection with the updateserver.</source>
         <translation>Keine Verbindung zum Updateserver.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="661"/>
+        <location filename="../mainwindow.cpp" line="662"/>
         <source>Update</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="699"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="740"/>
+        <location filename="../mainwindow.cpp" line="698"/>
+        <location filename="../mainwindow.cpp" line="720"/>
+        <location filename="../mainwindow.cpp" line="739"/>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="844"/>
+        <location filename="../mainwindow.cpp" line="843"/>
         <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="890"/>
+        <location filename="../mainwindow.cpp" line="888"/>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Version</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="917"/>
+        <location filename="../mainwindow.cpp" line="915"/>
         <source>Pending
 changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausstehende
+Änderungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1019"/>
-        <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>
+        <location filename="../mainwindow.cpp" line="1049"/>
+        <source>Manual changes (%1)</source>
+        <translation>Manuelle Änderungen (%1)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1022"/>
+        <location filename="../mainwindow.cpp" line="1100"/>
+        <source>Certificate list from:</source>
+        <translation>Zertifikatsliste vom:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1105"/>
+        <source>Currently installed certificate list:</source>
+        <translation>Aktuell installierte Zertifikatsliste:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <source>No certificate list installed.</source>
+        <translation>Keine Zertifikatsliste installiert.</translation>
+    </message>
+    <message>
+        <source>You should apply the following, recommended changes to your certificate stores.</source>
+        <translation type="vanished">Es wird empfohlen, die nachfolgenden Änderungen an Ihren Zertifikatsspeichern vorzunehmen.</translation>
+    </message>
+    <message>
         <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>
+        <translation type="vanished">Sie können die nachfolgenden Änderungen an Ihren Zertifikatsspeichern vornehmen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1036"/>
-        <source>Outstanding changes (%1)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cpp" line="1034"/>
+        <source>Pending changes (%1)</source>
+        <translation>Ausstehende
+Änderungen (%1)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1088"/>
         <source>New, recommended changes (%1/%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue, empfohlene Änderungen (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1098"/>
+        <location filename="../mainwindow.cpp" line="1096"/>
         <source>No new recommendations</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine neuen Empfehlungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1102"/>
         <source>Certificatelist from:</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Zertifikatsliste vom:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1107"/>
         <source>Currently installed Certificatelist:</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Aktuell installierte Zertifikatsliste:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1111"/>
         <source>No Certificatelist installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1527"/>
-        <source>TrustBridge error</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Keine Zertifikatsliste installiert.</translation>
     </message>
     <message>
         <source>Changes to certificate stores (%1)</source>
         <translation type="vanished">Neue empfohlene Änderungen (%1)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1184"/>
+        <location filename="../mainwindow.cpp" line="1182"/>
         <source>Error executing update</source>
         <translation>Fehler bei der Aktualisierung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1271"/>
+        <location filename="../mainwindow.cpp" line="1269"/>
         <source>Installation with standard user account</source>
         <translation>Installation mit Standardbenutzerkonto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1272"/>
+        <location filename="../mainwindow.cpp" line="1270"/>
         <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="1280"/>
+        <location filename="../mainwindow.cpp" line="1278"/>
         <source>Installing certificates...</source>
         <translation>Wurzelzertifikate werden geändert...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1513"/>
+        <location filename="../mainwindow.cpp" line="1519"/>
         <source>Error!</source>
         <translation>Fehler!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1513"/>
+        <location filename="../mainwindow.cpp" line="1519"/>
         <source>Failed to find the manual</source>
         <translation>Fehler beim Finden des Handbuchs</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1533"/>
+        <source>TrustBridge error</source>
+        <translation>TrustBridge Fehler</translation>
+    </message>
 </context>
 <context>
     <name>ProcessWaitDialog</name>
@@ -675,12 +704,12 @@
     <message>
         <location filename="../proxysettingsdlg.cpp" line="40"/>
         <source>[&lt;username&gt;:&lt;password&gt;@]&lt;hostname&gt;[:&lt;port&gt;]</source>
-        <translation type="unfinished"></translation>
+        <translation>[&lt;Benutzername&gt;:&lt;Passwort&gt;@]&lt;Hostname&gt;[:&lt;Port&gt;]</translation>
     </message>
     <message>
         <location filename="../proxysettingsdlg.cpp" line="49"/>
         <source>Use Proxy Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-Server verwenden</translation>
     </message>
     <message>
         <source>&lt;username&gt;:&lt;password&gt;@&lt;hostname&gt;:&lt;port&gt;</source>
@@ -710,24 +739,24 @@
         <translation>Automatische Aktualisierungsprüfung von TrustBridge.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1408"/>
+        <location filename="../mainwindow.cpp" line="1414"/>
         <source>Hide details</source>
-        <translation type="unfinished">Details ausblenden</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1409"/>
-        <source>Less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1414"/>
-        <source>Show details</source>
-        <translation type="unfinished">Details einblenden</translation>
+        <translation>Details ausblenden</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1415"/>
+        <source>Less</source>
+        <translation>Weniger</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1420"/>
+        <source>Show details</source>
+        <translation>Details einblenden</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1421"/>
         <source>Details</source>
-        <translation type="unfinished">Details</translation>
+        <translation>Details</translation>
     </message>
 </context>
 <context>
diff -r c4e3498e716f -r a7a72353d6d2 ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Mon Sep 15 14:00:14 2014 +0200
+++ b/ui/mainwindow.cpp	Mon Sep 15 14:08:40 2014 +0200
@@ -49,7 +49,7 @@
 // something to say
 #define NAG_INTERVAL_MINUTES 70
 
-#define DATETIME_FORMAT "d. MMM yyyy HH:mm:ss"
+#define DATETIME_FORMAT "d. MMM yyyy HH:mm"
 
 #ifndef APPNAME
 #define APPNAME "TrustBridge"
@@ -652,17 +652,15 @@
         new QLabel(QString());
     mCertListVersionContents = new QLabel(QString());
     const QDateTime lastCheck = mSettings.value("lastUpdateCheck").toDateTime().toLocalTime();
+    mLastUpdateCheck = new QLabel(tr("Last update check:"));
     if (lastCheck.isValid()) {
         const QString lastUpdateCheck = QLocale::system().toString(lastCheck, DATETIME_FORMAT);
-        mLastUpdateCheck =
-            new QLabel(tr("Last successful update check:"));
         mLastUpdateCheckContents = new QLabel(lastUpdateCheck);
     } else {
-        mLastUpdateCheck = new QLabel(tr("Last successful update check:"));
         mLastUpdateCheckContents = new QLabel(tr("No connection with the updateserver."));
     }
     QPushButton *searchUpdates = new QPushButton(" " + tr("Update"));
-    searchUpdates->setFixedHeight(18);
+    searchUpdates->setFixedHeight(22);
     searchUpdates->setToolTip(tr("Check for Updates"));
     searchUpdates->setStyleSheet("font-size: 10px;");
     searchUpdates->setIcon(QIcon(":/img/update-list.png"));
@@ -885,8 +883,7 @@
     logo->setBackgroundRole(QPalette::Base);
     logo->setPixmap(QPixmap::fromImage(*logoImage));
     QLabel *title = new QLabel("<h1>" + QString::fromLatin1(APPNAME) + "</h1>");
-    QLabel *subTitle = new QLabel(QString::fromLatin1("<h3>") +
-            tr("Trust in your digital communication") + QString::fromLatin1("</h3>"));
+    QLabel *subTitle = new QLabel(tr("Trust in your digital communication"));
     QLabel *swVersion = new QLabel(QString::fromLatin1("<i>") +
             tr("Version") + " " + QApplication::applicationVersion() +
             QString::fromLatin1(" </i>"));
@@ -1017,10 +1014,10 @@
      * changes available */
     if (changeCount() && !mUpdatesManual->activeCertificates()) {
         mUpdatesTip->setText(
-                tr("You should apply the following, recommended changes to your certificate stores."));
+                tr("You should apply the following, recommended changes to your certificate stores:"));
     } else if (changeCount()) {
         mUpdatesTip->setText(
-                tr("You can apply the following, changes to your certificate stores."));
+                tr("You can apply the following, changes to your certificate stores:"));
     } else {
         mUpdatesTip->setText(
                 tr("There are currently no changes for your certificate stores."));
@@ -1034,7 +1031,7 @@
         mInstallButton->setText(" " + tr("Install certificates again"));
     } else {
         mQuitButton->setText(" " + tr("Quit without saving"));
-        mUpdatesHeader->setText("<h2>" + tr("Outstanding changes (%1)")
+        mUpdatesHeader->setText("<h2>" + tr("Pending changes (%1)")
                 .arg(changeCount()) +
                 "</h2>");
         mInstallButton->setText(" " + tr("Apply changes"));
@@ -1049,7 +1046,7 @@
         mUpdatesManual->hide();
     }
     mUpdatesManualCertificates->setText("<h2>" +
-            tr("Manually changed certificates (%1)").arg(mUpdatesManual->activeCertificates()) +
+            tr("Manual changes (%1)").arg(mUpdatesManual->activeCertificates()) +
             "</h2>");
 
     if (mUpdatesNew->certificates().size()) {
@@ -1100,16 +1097,16 @@
     }
 
     if (mListToInstall.isValid()) {
-        mCertListVersion->setText(tr("Certificatelist from:"));
+        mCertListVersion->setText(tr("Certificate list from:"));
         mCertListVersionContents->setText(QLocale::system().toString(
                 mListToInstall.date().toLocalTime(), DATETIME_FORMAT));
     } else {
         if (mInstalledList.isValid()) {
-            mCertListVersion->setText(tr("Currently installed Certificatelist:"));
+            mCertListVersion->setText(tr("Currently installed certificate list:"));
             mCertListVersionContents->setText(QLocale::system().toString(
                     mInstalledList.date().toLocalTime(), DATETIME_FORMAT));
         } else {
-            mCertListVersion->setText(tr("No Certificatelist installed."));
+            mCertListVersion->setText(tr("No certificate list installed."));
             mCertListVersionContents->setText("");
         }
     }
@@ -1415,13 +1412,13 @@
 
 static void deactivateDetailsButton(QPushButton *btn) {
     btn->setToolTip(QObject::tr("Hide details"));
-    btn->setText(QObject::tr("Less"));
+    btn->setText(" " + QObject::tr("Less"));
     btn->setIcon(QIcon(":/img/dialog-information_grey_16px.png"));
 }
 
 static void activateDetailsButton(QPushButton *btn) {
     btn->setToolTip(QObject::tr("Show details"));
-    btn->setText(QObject::tr("Details"));
+    btn->setText(" " + QObject::tr("Details"));
     btn->setIcon(QIcon(":/img/dialog-information_16px.png"));
 }
 


More information about the Trustbridge-commits mailing list