v2.0-RELEASE

607011 · Sep 3, 2015 · ce8059e · ce8059e
1 parent 8891857
commit ce8059e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/ctSESAM/deploy/ctSESAM.nsi b/ctSESAM/deploy/ctSESAM.nsi
@@ -1,6 +1,6 @@
 !define VERSIONMAJOR "2"
 !define VERSIONMINOR "0"
-!define VERSIONPATCH "-BETA"
+!define VERSIONPATCH "0"
 !define VERSION "${VERSIONMAJOR}.${VERSIONMINOR}${VERSIONPATCH}"
 !define GUID "{f25f512a-7d58-4e2f-a52b-3663fd8ca813}"
 !define APP "ctSESAM"

diff --git a/ctSESAM/global.cpp b/ctSESAM/global.cpp
@@ -21,9 +21,9 @@
 #include "global.h"
 #include <QSysInfo>
 
-const QString AppCompanyName = "c't";
-const QString AppName = "Qt SESAM";
-const QString AppVersion = "2.0 BETA";
+const QString AppCompanyName = "ct";
+const QString AppName = "QtSESAM";
+const QString AppVersion = "2.0.0";
 const QString AppURL = "https://github.com/ola-ct/Qt-SESAM";
 const QString AppAuthor = "Oliver Lau";
 const QString AppAuthorMail = "[email protected]";

diff --git a/ctSESAM/mainwindow.cpp b/ctSESAM/mainwindow.cpp
@@ -1242,7 +1242,6 @@ void MainWindow::mergeLocalAndRemoteData(void)
 {
   Q_D(MainWindow);
   QStringList allDomainNames = d->remoteDomains.keys() + d->domains.keys();
-  qDebug() << "mergeLocalAndRemoteData() combined domain names =" << allDomainNames;
   allDomainNames.removeDuplicates();
   foreach(QString domainName, allDomainNames) {
     const DomainSettings &remoteDomainSetting = d->remoteDomains.at(domainName);
@@ -1334,10 +1333,6 @@ void MainWindow::sendToSyncServer(const QByteArray &cipher)
 void MainWindow::onDomainSelected(const QString &domain)
 {
   Q_D(MainWindow);
-  qDebug() << "MainWindow::onDomainSelected(" << domain << ")";
-  qDebug() << "ui->domainsComboBox->currentText() =" << ui->domainsComboBox->currentText();
-  qDebug() << "ui->domainsComboBox->currentIndex() =" << ui->domainsComboBox->currentIndex();
-
   if (ui->domainsComboBox->currentIndex() == 0 && !d->parameterSetDirty) {
     newDomain();
   }

diff --git a/ctSESAM/translations/i18n_de.ts b/ctSESAM/translations/i18n_de.ts
@@ -858,6 +858,10 @@
         <source>Choose certificate file</source>
         <translation type="vanished">Zertifikatskettendatei wählen</translation>
     </message>
+    <message>
+        <source>Write backup files</source>
+        <translation>Backups schreiben</translation>
+    </message>
 </context>
 <context>
     <name>ProgressDialog</name>