From ce787d6cd38230f3eb0960e0c41550a1c60bf9fe Mon Sep 17 00:00:00 2001 From: toyg Date: Mon, 6 Jan 2014 15:53:54 +0000 Subject: [PATCH] Replaced references to bitcoin/bitcoind in user-visible messages --- src/bitcoind.cpp | 14 +++++++------- src/bitcoinrpc.cpp | 10 +++++----- src/init.cpp | 4 ++-- src/net.cpp | 2 +- src/rpcmining.cpp | 8 ++++---- src/util.cpp | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 905e980a..eb7a8502 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -46,13 +46,13 @@ bool AppInit(int argc, char* argv[]) if (mapArgs.count("-?") || mapArgs.count("--help")) { - // First part of help message is specific to bitcoind / RPC client - std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" + + // First part of help message is specific to twisterd / RPC client + std::string strUsage = _("Twister version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " bitcoind [options] " + "\n" + - " bitcoind [options] [params] " + _("Send command to -server or bitcoind") + "\n" + - " bitcoind [options] help " + _("List commands") + "\n" + - " bitcoind [options] help " + _("Get help for a command") + "\n"; + " twisterd [options] " + "\n" + + " twisterd [options] [params] " + _("Send command to -server or twisterd") + "\n" + + " twisterd [options] help " + _("List commands") + "\n" + + " twisterd [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessage(); @@ -133,7 +133,7 @@ int main(int argc, char* argv[]) //GenesisMiner(); - // Connect bitcoind signal handlers + // Connect twisterd signal handlers noui_connect(); fRet = AppInit(argc, argv); diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 989af8ea..cc409c43 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -748,7 +748,7 @@ void StartRPCThreads() { unsigned char rand_pwd[32]; RAND_bytes(rand_pwd, 32); - string strWhatAmI = "To use bitcoind"; + string strWhatAmI = "To use twisterd"; if (mapArgs.count("-server")) strWhatAmI = strprintf(_("To use the %s option"), "\"-server\""); else if (mapArgs.count("-daemon")) @@ -756,14 +756,14 @@ void StartRPCThreads() uiInterface.ThreadSafeMessageBox(strprintf( _("%s, you must set a rpcpassword in the configuration file:\n" "%s\n" - "It is recommended you use the following random password:\n" - "rpcuser=bitcoinrpc\n" - "rpcpassword=%s\n" + "It is recommended you use the following password for now:\n" + "rpcuser=user\n" + "rpcpassword=pwd\n" "(you do not need to remember this password)\n" "The username and password MUST NOT be the same.\n" "If the file does not exist, create it with owner-readable-only file permissions.\n" "It is also recommended to set alertnotify so you are notified of problems;\n" - "for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), + "for example: alertnotify=echo %%s | mail -s \"Twister Alert\" admin@foo.com\n"), strWhatAmI.c_str(), GetConfigFile().string().c_str(), EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()), diff --git a/src/init.cpp b/src/init.cpp index ed7b3ff3..e10ea0a4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -504,7 +504,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (file) fclose(file); 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. Bitcoin is probably already running."), strDataDir.c_str())); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Twister is probably already running."), strDataDir.c_str())); if (GetBoolArg("-shrinkdebugfile", !fDebug)) ShrinkDebugFile(); @@ -851,7 +851,7 @@ bool AppInit2(boost::thread_group& threadGroup) strErrors << _("Error loading twisterwallet.dat: Wallet requires newer version of Bitcoin") << "\n"; else if (nLoadWalletRet == DB_NEED_REWRITE) { - strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n"; + strErrors << _("Wallet needed to be rewritten: restart Twister to complete") << "\n"; printf("%s", strErrors.str().c_str()); return InitError(strErrors.str()); } diff --git a/src/net.cpp b/src/net.cpp index 2863525a..d7553579 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1640,7 +1640,7 @@ bool BindListenPort(const CService &addrBind, string& strError) { int nErr = WSAGetLastError(); if (nErr == WSAEADDRINUSE) - strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin is probably already running."), addrBind.ToString().c_str()); + strError = strprintf(_("Unable to bind to %s on this computer. Twister is probably already running."), addrBind.ToString().c_str()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString().c_str(), nErr, strerror(nErr)); printf("%s\n", strError.c_str()); diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 347825be..5ae0a292 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -111,10 +111,10 @@ Value getwork(const Array& params, bool fHelp) "If [data] is specified, tries to solve the block and returns true if it was successful."); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Twister is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Twister is downloading blocks..."); typedef map > mapNewBlock_t; static mapNewBlock_t mapNewBlock; // FIXME: thread safety @@ -256,10 +256,10 @@ Value getblocktemplate(const Array& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Twister is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Twister is downloading blocks..."); // Update block static unsigned int nTransactionsUpdatedLast; diff --git a/src/util.cpp b/src/util.cpp index fb0699d7..db0a9f7a 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1359,7 +1359,7 @@ void AddTimeData(const CNetAddr& ip, int64 nTime) if (!fMatch) { fDone = true; - string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly."); + string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Twister will not work properly."); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);