Mercurial > trustbridge
diff ui/mainwindow.cpp @ 1104:a7a72353d6d2
(issue111) Wording and German translation.
author | Emanuel Schuetze <emanuel@intevation.de> |
---|---|
date | Mon, 15 Sep 2014 14:08:40 +0200 |
parents | c4e3498e716f |
children | 6f7b7d88f048 |
line wrap: on
line diff
--- 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")); }