# HG changeset patch # User Emanuel Schuetze # Date 1403791174 -7200 # Node ID 320a64d58e62a3d81807d3c0ac2842653cc192e9 # Parent 392ec26de6870ae9f7ca73214895fd544127eb71 (UI) Updated English strings. Removed Issuer fields. diff -r 392ec26de687 -r 320a64d58e62 ui/certificate.cpp --- a/ui/certificate.cpp Thu Jun 26 15:58:11 2014 +0200 +++ b/ui/certificate.cpp Thu Jun 26 15:59:34 2014 +0200 @@ -53,10 +53,8 @@ chain.valid_to.sec)); mSubjectCN = getX509Value(&(chain.subject), CERT_OID_CN); - mIssuerCN = getX509Value(&(chain.issuer), CERT_OID_CN); mSubjectOU = getX509Value(&(chain.subject), CERT_OID_OU); mSubjectO = getX509Value(&(chain.subject), CERT_OID_O); - mIssuerO = getX509Value(&(chain.issuer), CERT_OID_O); mSubjectSN = getX509Value(&(chain.subject), CERT_OID_SN); /* Calculate sha1 fingerprint */ diff -r 392ec26de687 -r 320a64d58e62 ui/certificatelistwidget.cpp --- a/ui/certificatelistwidget.cpp Thu Jun 26 15:58:11 2014 +0200 +++ b/ui/certificatelistwidget.cpp Thu Jun 26 15:59:34 2014 +0200 @@ -37,30 +37,22 @@ QGroupBox *detailBox = new QGroupBox(tr("Details")); QLabel *subjectCN = new QLabel(tr("Subject Common Name:")); QLabel *subjectOU = new QLabel(tr("Subject Organisation:")); - QLabel *issuerCN = new QLabel(tr("Issuer Common Name:")); - QLabel *issuerOU = new QLabel(tr("Issuer Organisation:")); QLabel *validFrom = new QLabel(tr("Valid from:")); QLabel *validTo = new QLabel(tr("Valid to:")); - QLabel *fingerprint = new QLabel(tr("Fingerprint:")); + QLabel *fingerprint = new QLabel(tr("Fingerprint (SHA1):")); detailLabelLayout->addWidget(subjectCN); detailLabelLayout->addWidget(subjectOU); - detailLabelLayout->addWidget(issuerCN); - detailLabelLayout->addWidget(issuerOU); detailLabelLayout->addWidget(validFrom); detailLabelLayout->addWidget(validTo); detailLabelLayout->addWidget(fingerprint); mSubjectCN = new QLabel(tr("")); mSubjectO = new QLabel(tr("")); - mIssuerCN = 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(mSubjectO); - detailContentLayout->addWidget(mIssuerCN); - detailContentLayout->addWidget(mIssuerO); detailContentLayout->addWidget(mValidFrom); detailContentLayout->addWidget(mValidTo); detailContentLayout->addWidget(mFingerprint); @@ -187,8 +179,6 @@ Certificate cert = item->data(Qt::UserRole).value(); mSubjectCN->setText(cert.subjectCN()); mSubjectO->setText(cert.subjectO()); - mIssuerCN->setText(cert.issuerCN()); - mIssuerO->setText(cert.issuerO()); mValidFrom->setText(cert.validFrom().toString()); mValidTo->setText(cert.validTo().toString()); mFingerprint->setText(cert.fingerprint()); diff -r 392ec26de687 -r 320a64d58e62 ui/certificatetablemodel.cpp --- a/ui/certificatetablemodel.cpp Thu Jun 26 15:58:11 2014 +0200 +++ b/ui/certificatetablemodel.cpp Thu Jun 26 15:59:34 2014 +0200 @@ -15,11 +15,9 @@ header.append(""); header.append(tr("Subject CN")); header.append(tr("Subject O")); - header.append(tr("Issuer CN")); - header.append(tr("Issuer O")); header.append(tr("Valid from")); header.append(tr("Valid to")); - header.append(tr("SHA1 Fingerprint")); + header.append(tr("Fingerprint (SHA1)")); } @@ -65,11 +63,9 @@ case 0: ret = cert.isInstallCert(); break; case 1: ret = cert.subjectCN(); break; case 2: ret = cert.subjectO(); break; - case 3: ret = cert.issuerCN(); break; - case 4: ret = cert.issuerO(); break; - case 5: ret = cert.validFrom(); break; - case 6: ret = cert.validTo(); break; - case 7: ret = cert.fingerprint(); break; + case 3: ret = cert.validFrom(); break; + case 4: ret = cert.validTo(); break; + case 5: ret = cert.fingerprint(); break; default: ; } return ret; diff -r 392ec26de687 -r 320a64d58e62 ui/mainwindow.cpp --- a/ui/mainwindow.cpp Thu Jun 26 15:58:11 2014 +0200 +++ b/ui/mainwindow.cpp Thu Jun 26 15:59:34 2014 +0200 @@ -479,7 +479,7 @@ allRemoveButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); allRemoveButton->setIcon(QIcon(":/img/task-attempt.png")); allRemoveButton->setIconSize(QSize(32, 32)); - allRemoveButton->setText(tr("Insecure\ncertificates")); + allRemoveButton->setText(tr("Revoked\ncertificates")); allRemoveButton->setFixedWidth(90); allRemoveButton->setFixedHeight(70); allRemoveButton->setCheckable(true); @@ -598,7 +598,7 @@ mUpdatesRemoveCertificates = new QLabel("

" + - tr("Remove insecure certificates (%1/%2)").arg(0).arg(0) + + tr("Remove revoked certificates (%1/%2)").arg(0).arg(0) + "

"); mUpdatesDetailsRemove = new QPushButton(tr("Show details")); connect(mUpdatesDetailsRemove, @@ -688,18 +688,17 @@ QVBoxLayout *removeCenterLayout = new QVBoxLayout; QLabel *removeHeaderLabel = - new QLabel("

" + tr("Insecure certificates") + "

"); - QLabel *removeHeaderText = new QLabel(tr("The following list of insecure root" - " certificates is managed by the BSI. The BSI validates independently the" - " authenticity, security and actuality of these certificates.")); + new QLabel("

" + tr("Revoked certificates") + "

"); + QLabel *removeHeaderText = new QLabel(tr("Certificates can be corrupted" + " or stolen and misused in many ways. Therefore the BSI recommends" + " to remove all revoked certificates from your system.")); removeHeaderLayout->addWidget(removeHeaderLabel); removeHeaderLayout->addWidget(removeHeaderText); - QLabel *removeCenterText = new QLabel(tr("If you have kept an insecure certificate" - " you can selected it to uninstall." - " Already uninstalled certificates cannot be reinstalled." - " Unsecure certificates should be removed to keep your" - " email and internet communication secure.")); + QLabel *removeCenterText = new QLabel(tr("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.")); removeCenterLayout->addWidget(removeCenterText); mRemoveList = new CertificateListWidget(this); connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)), @@ -814,7 +813,7 @@ .arg(mUpdatesNew->certificates().size()) + ""); mUpdatesRemoveCertificates->setText("

" + - tr("Remove insecure certificates (%1/%2)") + tr("Remove revoked certificates (%1/%2)") .arg(mUpdatesRemove->selectedCertCount()) .arg(mUpdatesRemove->certificates().size()) + "

"); @@ -894,7 +893,7 @@ ""); mUpdatesRemoveCertificates->setText("

" + - tr("Remove insecure certificates (%1/%2)") + tr("Remove revoked certificates (%1/%2)") .arg(mUpdatesRemove->selectedCertCount()) .arg(mUpdatesRemove->certificates().size()) + "

"); @@ -1019,7 +1018,7 @@ } mUpdatesManualCertificates->setText("

" + - tr("Manualy changed Certificates (%1)") + tr("Manually changed certificates (%1)") .arg(mUpdatesManual->certificates().size()) + "

"); } @@ -1029,7 +1028,7 @@ mUpdatesManual->removeCertificate(cert); mUpdatesManualCertificates->setText("

" + - tr("Manualy changed Certificates (%1)") + tr("Manually changed certificates (%1)") .arg(mUpdatesManual->certificates().size()) + "

"); diff -r 392ec26de687 -r 320a64d58e62 ui/processwaitdialog.cpp --- a/ui/processwaitdialog.cpp Thu Jun 26 15:58:11 2014 +0200 +++ b/ui/processwaitdialog.cpp Thu Jun 26 15:59:34 2014 +0200 @@ -23,7 +23,7 @@ setWindowTitle(tr("Applications need to be closed.")); setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint); - QLabel *warnLabel = new QLabel(tr("Close all running firefox and thunderbird instances to continue installation!")); + QLabel *warnLabel = new QLabel(tr("Please close all running Firefox and Thunderbird instances to continue installation!")); QLabel *warnIcon = new QLabel(); warnIcon->setPixmap(QApplication::style()->standardPixmap(QStyle::SP_MessageBoxWarning));