--- a/ui/certificateitemwidget.cpp	Wed Jun 25 15:31:23 2014 +0200
+++ b/ui/certificateitemwidget.cpp	Thu Jun 26 12:31:55 2014 +0200
@@ -33,8 +33,7 @@
     QHBoxLayout *layout = new QHBoxLayout;
     if (mCertificate.isInstallCert()) {
         mComboBox->addItem(QIcon(":/img/security-high.png"), tr("install"), QVariant("true"));
-        mComboBox->addItem(QIcon(":/img/security-low.png"),
-            tr("remove"), QVariant("false"));
+        mComboBox->addItem(QIcon(":/img/security-low.png"), tr("remove"), QVariant("false"));
         if (mState)
             mComboBox->setCurrentIndex(0);
         else {
@@ -51,9 +50,8 @@
         layout->addWidget(imgLabel);
     }
     else {
-        mComboBox->addItem(QIcon(":/img/trash-empty.png"), tr("deinstall"), QVariant("true"));
-        mComboBox->addItem(QIcon(":/img/security-medium.png"),
-            tr("leave"), QVariant("false"));
+        mComboBox->addItem(QIcon(":/img/trash-empty.png"), tr("uninstall"), QVariant("true"));
+        mComboBox->addItem(QIcon(":/img/security-medium.png"), tr("keep"), QVariant("false"));
         if (mState)
             mComboBox->setCurrentIndex(0);
         else {

--- a/ui/mainwindow.cpp	Wed Jun 25 15:31:23 2014 +0200
+++ b/ui/mainwindow.cpp	Thu Jun 26 12:31:55 2014 +0200
@@ -443,7 +443,7 @@
     logo->setBackgroundRole(QPalette::Base);
     logo->setPixmap(QPixmap::fromImage(*logoImage));
     QLabel *title = new QLabel("<h1>" + QString::fromLatin1(APPNAME) + "</h1>");
-    QLabel *subTitle = new QLabel("This Software installs and removes Certificates");
+    QLabel *subTitle = new QLabel("Trust in your digital communication");
     headerTextLayout->addWidget(title);
     headerTextLayout->addWidget(subTitle);
     headerLayout->addWidget(logo);
@@ -470,7 +470,7 @@
     allInstallButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     allInstallButton->setIcon(QIcon(":/img/document-encrypt.png"));
     allInstallButton->setIconSize(QSize(32, 32));
-    allInstallButton->setText(tr("Trusted\nCertificates"));
+    allInstallButton->setText(tr("Trusted\ncertificates"));
     allInstallButton->setFixedWidth(90);
     allInstallButton->setFixedHeight(70);
     allInstallButton->setCheckable(true);
@@ -479,7 +479,7 @@
     allRemoveButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     allRemoveButton->setIcon(QIcon(":/img/task-attempt.png"));
     allRemoveButton->setIconSize(QSize(32, 32));
-    allRemoveButton->setText(tr("Certificates\nto remove"));
+    allRemoveButton->setText(tr("Insecure\ncertificates"));
     allRemoveButton->setFixedWidth(90);
     allRemoveButton->setFixedHeight(70);
     allRemoveButton->setCheckable(true);
@@ -488,7 +488,7 @@
     infoButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     infoButton->setIcon(QIcon(":/img/dialog-information.png"));
     infoButton->setIconSize(QSize(32, 32));
-    infoButton->setText(tr("Information"));
+    infoButton->setText(tr("Information\nand help"));
     infoButton->setFixedWidth(90);
     infoButton->setFixedHeight(70);
     infoButton->setCheckable(true);
@@ -533,11 +533,11 @@
     mUpdatesHeader =
         new QLabel("<h2>" + tr("Updates (%1/%2)").arg(0).arg(0)+ "</h2>");
     mLastCertUpdate =
-        new QLabel(tr("Last certificate update: %1").arg(""));
+        new QLabel(tr("Last update of certificates: %1").arg(""));
     mLastSWupdate =
-        new QLabel(tr("Last Software update: %1").arg(""));
+        new QLabel(tr("Last update of TrustBridge: %1").arg(""));
     QLabel *updatesTip =
-        new QLabel("<h4>" + tr("The following certificate changes are recommended.") + "</h4>");
+        new QLabel(tr("You should apply the following changes to your root certificates:"));
 
     updatesHeaderTextLayout->addWidget(mUpdatesHeader);
     updatesHeaderTextLayout->addWidget(mLastCertUpdate);
@@ -545,11 +545,11 @@
     updatesHeaderTextLayout->addSpacing(10);
     updatesHeaderTextLayout->addWidget(updatesTip);
 
-    QPushButton *searchUpdates = new QPushButton(tr("Search for Updates"));
+    QPushButton *searchUpdates = new QPushButton(tr("Check for updates"));
     searchUpdates->setIcon(QIcon(":/img/system-search.png"));
     QPushButton *quitButton = new QPushButton(tr("Quit without saving"));
     quitButton->setIcon(QIcon(":/img/system-shutdown.png"));
-    QPushButton *installButton = new QPushButton(tr("Update"));
+    QPushButton *installButton = new QPushButton(tr("Install updates"));
 #ifdef Q_OS_WIN
     if (is_admin()) {
         QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
@@ -581,9 +581,9 @@
     QHBoxLayout *updatesManualLayout = new QHBoxLayout;
     mUpdatesNewCertificates =
         new QLabel("<h3>" +
-            tr("Install new Certificates (%1/%2)").arg(0).arg(0) +
+            tr("Install new trusted certificates (%1/%2)").arg(0).arg(0) +
             "</h3>");
-    mUpdatesDetailsNew = new QPushButton(tr("Show Details"));
+    mUpdatesDetailsNew = new QPushButton(tr("Show details"));
     connect(mUpdatesDetailsNew,
         SIGNAL(clicked()),
         this,
@@ -598,9 +598,9 @@
 
     mUpdatesRemoveCertificates =
         new QLabel("<h3>" +
-            tr("Remove Certificates (%1/%2)").arg(0).arg(0) +
+            tr("Remove insecure certificates (%1/%2)").arg(0).arg(0) +
             "</h3>");
-    mUpdatesDetailsRemove = new QPushButton(tr("Show Details"));
+    mUpdatesDetailsRemove = new QPushButton(tr("Show details"));
     connect(mUpdatesDetailsRemove,
         SIGNAL(clicked()),
         this,
@@ -615,9 +615,9 @@
 
     mUpdatesManualCertificates =
         new QLabel("<h3>" +
-            tr("Manualy changed Certificates (%1)").arg(0) +
+            tr("Manually changed certificates (%1)").arg(0) +
             "</h3>");
-    mUpdatesDetailsManual = new QPushButton(tr("Show Details"));
+    mUpdatesDetailsManual = new QPushButton(tr("Show details"));
     connect(mUpdatesDetailsManual,
         SIGNAL(clicked()),
         this,
@@ -659,17 +659,16 @@
     QVBoxLayout *installCenterLayout = new QVBoxLayout;
 
     QLabel *installHeaderLabel =
-        new QLabel("<h2>" + tr("Trusted Certificates") + "</h2>");
-    QLabel *installHeaderText = new QLabel(tr("The following list of root"
-        " certificates was created by the BSI. The BSI vaidates authenticity,"
-        " security and actuality of these certificates"));
+        new QLabel("<h2>" + tr("Trusted certificates") + "</h2>");
+    QLabel *installHeaderText = new QLabel(tr("The following list of trusted root"
+        " certificates is managed by the BSI. The BSI validates independently the"
+        " authenticity, security and actuality of these certificates."));
     installHeaderLayout->addWidget(installHeaderLabel);
     installHeaderLayout->addWidget(installHeaderText);
 
     QLabel *installCenterText = new QLabel(tr("Please choose the certificates"
-        " you want to trust. TrustBridge will install these certificates for"
-        " secure communication via email or the internet (e.g. IE, Firefox,"
-        " Thunderbird)"));
+        " you want to trust or untrust. TrustBridge will install these certificates for your"
+        " secure communication for email and internet."));
     installCenterLayout->addWidget(installCenterText);
     mInstallList = new CertificateListWidget(this);
     connect(mInstallList, SIGNAL(certChanged(bool, const Certificate&)),
@@ -689,15 +688,18 @@
     QVBoxLayout *removeCenterLayout = new QVBoxLayout;
 
     QLabel *removeHeaderLabel =
-        new QLabel("<h2>" + tr("Certificates to remove") + "</h2>");
-    QLabel *removeHeaderText = new QLabel(tr("The following list of root"
-        " certificates was created by the BSI. The BSI validates authenticity,"
-        " security and actuality of these certificates"));
+        new QLabel("<h2>" + tr("Insecure certificates") + "</h2>");
+    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."));
     removeHeaderLayout->addWidget(removeHeaderLabel);
     removeHeaderLayout->addWidget(removeHeaderText);
 
-    QLabel *removeCenterText = new QLabel(tr("Please choose the certificates"
-        " you want to remove. TrustBridge will remove these certificates."));
+    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."));
     removeCenterLayout->addWidget(removeCenterText);
     mRemoveList = new CertificateListWidget(this);
     connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)),
@@ -807,12 +809,12 @@
             .arg(mUpdatesRemove->certificates().size() + mUpdatesNew->certificates().size()) +
             "</h2>");
     mUpdatesNewCertificates->setText("<h3>" +
-            tr("Install new Certificates (%1/%2)")
+            tr("Install new trusted certificates (%1/%2)")
             .arg(mUpdatesNew->selectedCertCount())
             .arg(mUpdatesNew->certificates().size()) +
             "</h3>");
     mUpdatesRemoveCertificates->setText("<h3>" +
-            tr("Remove Certificates (%1/%2)")
+            tr("Remove insecure certificates (%1/%2)")
             .arg(mUpdatesRemove->selectedCertCount())
             .arg(mUpdatesRemove->certificates().size()) +
             "</h3>");
@@ -882,22 +884,22 @@
             tr("Updates (%1/%2)")
                 .arg(mUpdatesNew->selectedCertCount() + mUpdatesRemove->selectedCertCount())
                 .arg(newRemoveCerts.size() + newInstallCerts.size()) + "</h2>");
-        mLastCertUpdate->setText(tr("Last certificate update: %1")
+        mLastCertUpdate->setText(tr("Last update of certificates: %1")
             .arg(mInstalledList.date().toString()));
     }
     mUpdatesNewCertificates->setText("<h3>" +
-            tr("Install new Certificates (%1/%2)")
+            tr("Install new trusted certificates (%1/%2)")
             .arg(mUpdatesNew->selectedCertCount())
             .arg(mUpdatesNew->certificates().size()) +
             "</h3>");
 
     mUpdatesRemoveCertificates->setText("<h3>" +
-            tr("Remove Certificates (%1/%2)")
+            tr("Remove insecure certificates (%1/%2)")
             .arg(mUpdatesRemove->selectedCertCount())
             .arg(mUpdatesRemove->certificates().size()) +
             "</h3>");
     mUpdatesManualCertificates->setText("<h3>" +
-            tr("Manualy changed Certificates (%1)").arg(0) +
+            tr("Manually changed certificates (%1)").arg(0) +
             "</h3>");
 }
 
@@ -1085,13 +1087,13 @@
 
 void MainWindow::toggleUpdatesNew() {
     if (!mUpdatesNew->isVisible()) {
-        mUpdatesDetailsNew->setText(tr("Hide Details"));
+        mUpdatesDetailsNew->setText(tr("Hide details"));
         mUpdatesNew->show();
         mUpdatesNew->setSelected(0);
     }
     else {
         mUpdatesNew->hide();
-        mUpdatesDetailsNew->setText(tr("Show Details"));
+        mUpdatesDetailsNew->setText(tr("Show details"));
         QSize old = mUpdatesWidget->size();
         mUpdatesWidget->resize(old.width(), old.height() - mUpdatesNew->height());
     }
@@ -1099,13 +1101,13 @@
 
 void MainWindow::toggleUpdatesRemove() {
     if (!mUpdatesRemove->isVisible()) {
-        mUpdatesDetailsRemove->setText(tr("Hide Details"));
+        mUpdatesDetailsRemove->setText(tr("Hide details"));
         mUpdatesRemove->show();
         mUpdatesRemove->setSelected(0);
     }
     else {
         mUpdatesRemove->hide();
-        mUpdatesDetailsRemove->setText(tr("Show Details"));
+        mUpdatesDetailsRemove->setText(tr("Show details"));
         QSize old = mUpdatesWidget->size();
         mUpdatesWidget->resize(old.width(), old.height() - mUpdatesRemove->height());
     }
@@ -1113,12 +1115,12 @@
 
 void MainWindow::toggleUpdatesManual() {
     if (!mUpdatesManual->isVisible()) {
-        mUpdatesDetailsManual->setText(tr("Hide Details"));
+        mUpdatesDetailsManual->setText(tr("Hide details"));
         mUpdatesManual->show();
         mUpdatesManual->setSelected(0);
     }
     else {
-        mUpdatesDetailsManual->setText(tr("Show Details"));
+        mUpdatesDetailsManual->setText(tr("Show details"));
         mUpdatesManual->hide();
         QSize old = mUpdatesWidget->size();
         mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height());