diff --git a/README.md b/README.md index 29cddb03..be38fbdd 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ http://www.zeta-coin.org https://bitcointalk.org/index.php?topic=267545.0 Copyright (c) 2009-2013 Bitcoin Developers, -Copyright (c) 2013 Zetacoin Developers +Copyright (c) 2013-2014 Zetacoin Developers What is Zetacoin? ---------------- diff --git a/src/clientversion.h b/src/clientversion.h index be2ca078..806aced0 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,14 +9,14 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 8 #define CLIENT_VERSION_REVISION 99 -#define CLIENT_VERSION_BUILD 7 +#define CLIENT_VERSION_BUILD 8 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true // Copyright year (2009-this) // Todo: update this when changing our copyright comments in the source -#define COPYRIGHT_YEAR 2013 +#define COPYRIGHT_YEAR 2014 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp index 0f6368be..6bbae45e 100644 --- a/src/qt/aboutdialog.cpp +++ b/src/qt/aboutdialog.cpp @@ -11,8 +11,8 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->setupUi(this); // Set current copyright year - ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers")); - ui->copyrightLabel2->setText(tr("Copyright") + QString(" © 2013 ") + tr("The Zetacoin developers")); + ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-2013 ") + tr("The Bitcoin developers")); + ui->copyrightLabel2->setText(tr("Copyright") + QString(" © 2013-%1 ").arg(COPYRIGHT_YEAR) + tr("The Zetacoin developers")); } void AboutDialog::setModel(ClientModel *model) diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc index 3e3672a8..3c5827a1 100644 --- a/src/qt/res/bitcoin-qt.rc +++ b/src/qt/res/bitcoin-qt.rc @@ -8,7 +8,7 @@ IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers" +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers, 2013-2014 The Zetacoin developers" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -20,14 +20,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", "Bitcoin-Qt (OSS GUI client for Bitcoin)" + VALUE "CompanyName", "Zetacoin" + VALUE "FileDescription", "Zetacoin-Qt (OSS GUI client for Bitcoin)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "bitcoin-qt" + VALUE "InternalName", "zetacoin-qt" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "bitcoin-qt.exe" - VALUE "ProductName", "Bitcoin-Qt" + VALUE "OriginalFilename", "zetacoin-qt.exe" + VALUE "ProductName", "Zetacoin-Qt" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index fbd3a540..6aacee76 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -21,8 +21,8 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : // define text to place QString titleText = QString(QApplication::applicationName()).replace(QString("-testnet"), QString(""), Qt::CaseSensitive); // cut of testnet, place it as single object further down QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion())); - QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin developers")); - QString copyrightText2 = QChar(0xA9)+QString(" 2013 ") + QString(tr("The Zetacoin developers")); + QString copyrightText = QChar(0xA9)+QString(" 2009-2013 ") + QString(tr("The Bitcoin developers")); + QString copyrightText2 = QChar(0xA9)+QString(" 2013-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Zetacoin developers")); QString testnetAddText = QString(tr("[testnet]")); // define text to place as single text object QString font = "Arial";