[PATCH 3 of 3] Fix usage of OU / O

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398783751 0
# Node ID dec797c7230c2f6ef1dab6e3f221f068aa0c6b4c
# Parent  fb47bab4c71a5ebe51d4648497255252b340a181
Fix usage of OU / O

diff -r fb47bab4c71a -r dec797c7230c ui/aboutdialog.cpp
--- a/ui/aboutdialog.cpp	Tue Apr 29 15:01:02 2014 +0000
+++ b/ui/aboutdialog.cpp	Tue Apr 29 15:02:31 2014 +0000
@@ -47,7 +47,7 @@
     headerLayout->addLayout(headerTextLayout);
     headerLayout->insertStretch(2, 10);
 
-    QLabel *textDesc = new QLabel(tr("TrustBridge is a secure root certificate"
+    QLabel *textDesc = new QLabel(tr("TrustBridge is a root certificate"
         " installer for Windows and Linux."));
     QLabel *textManage = new QLabel(tr("The root certificate lists are managed"
         " by the German <a href=\"https://www.bsi.bund.de\">"
diff -r fb47bab4c71a -r dec797c7230c ui/l10n/administrator_de_DE.ts
--- a/ui/l10n/administrator_de_DE.ts	Tue Apr 29 15:01:02 2014 +0000
+++ b/ui/l10n/administrator_de_DE.ts	Tue Apr 29 15:02:31 2014 +0000
@@ -14,9 +14,13 @@
         <translation>Version:</translation>
     </message>
     <message>
+        <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
+        <translation type="vanished">TrustBridge ist ein sicherer Wurzelzertifikatsinstaller für Windows und Linux.</translation>
+    </message>
+    <message>
         <location filename="../aboutdialog.cpp" line="50"/>
-        <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
-        <translation>TrustBridge ist ein sicherer Wurzelzertifikatsinstaller für Windows und Linux.</translation>
+        <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
+        <translation>TrustBridge ist ein Wurzelzertifikatsinstaller für Windows und Linux.</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="52"/>
diff -r fb47bab4c71a -r dec797c7230c ui/l10n/trustbridge_de_DE.ts
--- a/ui/l10n/trustbridge_de_DE.ts	Tue Apr 29 15:01:02 2014 +0000
+++ b/ui/l10n/trustbridge_de_DE.ts	Tue Apr 29 15:02:31 2014 +0000
@@ -14,9 +14,13 @@
         <translation>Version:</translation>
     </message>
     <message>
+        <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
+        <translation type="vanished">TrustBridge ist eine sicherer Wurzelzertifikatsinstaller für Windows und Linux.</translation>
+    </message>
+    <message>
         <location filename="../aboutdialog.cpp" line="50"/>
-        <source>TrustBridge is a secure root certificate installer for Windows and Linux.</source>
-        <translation>TrustBridge ist eine sicherer Wurzelzertifikatsinstaller für Windows und Linux.</translation>
+        <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
+        <translation type="unfinished">TrustBridge ist eine Wurzelzertifikatsinstaller für Windows und Linux.</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="52"/>
@@ -229,7 +233,7 @@
     <message>
         <location filename="../mainwindow.cpp" line="425"/>
         <source>Issuer Organisation:</source>
-        <translation>Aussteller Organidation:</translation>
+        <translation>Aussteller Organisation:</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="426"/>
diff -r fb47bab4c71a -r dec797c7230c ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Tue Apr 29 15:01:02 2014 +0000
+++ b/ui/mainwindow.cpp	Tue Apr 29 15:02:31 2014 +0000
@@ -34,8 +34,8 @@
 #endif
 
 #define SERVER_URL "https://files.intevation.de:443"
-#define LIST_RESOURCE "/users/aheinecke/zertifikatsliste_1.txt"
-#define SW_RESOURCE   "/users/aheinecke/zertifikatsliste_1.txt"
+#define LIST_RESOURCE "/users/aheinecke/zertifikatsliste.txt"
+#define SW_RESOURCE   "/users/aheinecke/zertifikatsliste.txt"
 #ifdef Q_OS_WIN
 #define SW_RESOURCE_VERSION "/users/aheinecke/trustbridge-%1.exe"
 #else
@@ -434,17 +434,17 @@
     detailLabelLayout->addWidget(validTo);
     detailLabelLayout->addWidget(fingerprint);
     mSubjectCN = new QLabel(tr(""));
-    mSubjectOU = new QLabel(tr(""));
+    mSubjectO = new QLabel(tr(""));
     mIssuerCN = new QLabel(tr(""));
-    mIssuerOU = new QLabel(tr(""));
+    mIssuerO = new QLabel(tr(""));
     mValidFrom = new QLabel(tr(""));
     mValidTo = new QLabel(tr(""));
     mFingerprint = new QLabel(tr(""));
     mFingerprint->setFont(QFont("DejaVu Sans Mono"));
     detailContentLayout->addWidget(mSubjectCN);
-    detailContentLayout->addWidget(mSubjectOU);
+    detailContentLayout->addWidget(mSubjectO);
     detailContentLayout->addWidget(mIssuerCN);
-    detailContentLayout->addWidget(mIssuerOU);
+    detailContentLayout->addWidget(mIssuerO);
     detailContentLayout->addWidget(mValidFrom);
     detailContentLayout->addWidget(mValidTo);
     detailContentLayout->addWidget(mFingerprint);
@@ -610,9 +610,9 @@
     }
     Certificate cert = item->data(CertificateItemDelegate::DataRole).value<Certificate>();
     mSubjectCN->setText(cert.subjectCN());
-    mSubjectOU->setText(cert.subjectOU());
+    mSubjectO->setText(cert.subjectO());
     mIssuerCN->setText(cert.issuerCN());
-    mIssuerOU->setText(cert.issuerO());
+    mIssuerO->setText(cert.issuerO());
     mValidFrom->setText(cert.validFrom().toString());
     mValidTo->setText(cert.validTo().toString());
     mFingerprint->setText(cert.fingerprint());
diff -r fb47bab4c71a -r dec797c7230c ui/mainwindow.h
--- a/ui/mainwindow.h	Tue Apr 29 15:01:02 2014 +0000
+++ b/ui/mainwindow.h	Tue Apr 29 15:02:31 2014 +0000
@@ -176,9 +176,9 @@
     QListWidget *mCertListWidget;
 
     QLabel *mSubjectCN;
-    QLabel *mSubjectOU;
+    QLabel *mSubjectO;
     QLabel *mIssuerCN;
-    QLabel *mIssuerOU;
+    QLabel *mIssuerO;
     QLabel *mValidFrom;
     QLabel *mValidTo;
     QLabel *mFingerprint;