From 0f55d43fadc8642831413fdb7c1fec2f87eef99d Mon Sep 17 00:00:00 2001 From: lateminer Date: Sun, 30 Sep 2018 17:43:22 +0300 Subject: [PATCH] Get rid of Lore leftovers --- src/bitcoind.cpp | 6 +++--- src/init.cpp | 12 ++++++------ src/qt/res/bitcoin-qt-res.rc | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 80fec86fe..365c08e6d 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -76,7 +76,7 @@ bool AppInit(int argc, char* argv[]) // Process help and version before taking care about datadir if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Blackcoin Lore Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n"; + std::string strUsage = _("Blackcoin More Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n"; if (mapArgs.count("-version")) { @@ -85,7 +85,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " lored [options] " + _("Start Blackcoin Lore Daemon") + "\n"; + " blackmored [options] " + _("Start Blackcoin More Daemon") + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -124,7 +124,7 @@ bool AppInit(int argc, char* argv[]) if (fCommandLine) { - fprintf(stderr, "Error: There is no RPC client functionality in lored anymore. Use the lore-cli utility instead.\n"); + fprintf(stderr, "Error: There is no RPC client functionality in blackmored anymore. Use the blackmore-cli utility instead.\n"); exit(1); } #ifndef WIN32 diff --git a/src/init.cpp b/src/init.cpp index 54207cbd9..1c376074c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -478,11 +478,11 @@ std::string LicenseInfo() const std::string URL_SOURCE_CODE = ""; const std::string URL_WEBSITE = ""; // todo: remove urls from translations on next change - return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + + return FormatParagraph(strprintf("Copyright (C) 2009-%i The Bitcoin Core Developers", COPYRIGHT_YEAR)) + "\n" + "\n" + - FormatParagraph(strprintf(_("Copyright (C) 2014-2018 The Blackcoin Developers"), COPYRIGHT_YEAR)) + "\n" + + FormatParagraph(strprintf("Copyright (C) 2014-2018 The Blackcoin Developers", COPYRIGHT_YEAR)) + "\n" + "\n" + - FormatParagraph(strprintf(_("Copyright (C) 2018-%i The Blackcoin More Developers"), COPYRIGHT_YEAR)) + "\n" + + FormatParagraph(strprintf("Copyright (C) 2018-%i The Blackcoin More Developers", COPYRIGHT_YEAR)) + "\n" + "\n" + FormatParagraph(strprintf(_("Please contribute if you find Blackcoin More useful. " "Visit %s for further information about the software."), @@ -991,7 +991,7 @@ bool AppInit2(Config& config, boost::thread_group& threadGroup, CScheduler& sche // Sanity check if (!InitSanityCheck()) - return InitError(_("Initialization sanity check failed. Blackcoin Lore is shutting down.")); + return InitError(_("Initialization sanity check failed. Bitcoin Core is shutting down.")); std::string strDataDir = GetDataDir().string(); @@ -1003,9 +1003,9 @@ bool AppInit2(Config& config, boost::thread_group& threadGroup, CScheduler& sche try { static boost::interprocess::file_lock lock(pathLockFile.string().c_str()); if (!lock.try_lock()) - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Blackcoin Lore is probably already running."), strDataDir)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running."), strDataDir)); } catch(const boost::interprocess::interprocess_exception& e) { - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Blackcoin Lore is probably already running.") + " %s.", strDataDir, e.what())); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.") + " %s.", strDataDir, e.what())); } #ifndef WIN32 diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index a5cd3e5f2..cda9f0031 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -20,13 +20,13 @@ BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN VALUE "CompanyName", "Blackcoin" - VALUE "FileDescription", "Blackcoin Lore (GUI node for Blackcoin)" + VALUE "FileDescription", "Blackcoin More (GUI node for Blackcoin)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "blackcoin-qt" + VALUE "InternalName", "blackmore-qt" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "blackcoin-qt.exe" - VALUE "ProductName", "Blackcoin Lore" + VALUE "OriginalFilename", "blackmore-qt.exe" + VALUE "ProductName", "Blackcoin More" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END