diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-21 09:57:56 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-21 09:58:02 +0100 |
| commit | fc5d85c4bbb5fd5964117d4faf698ef2bf4ec634 (patch) | |
| tree | 505aee491f3c61360f71839472f2503d94eacf8e | |
| parent | be0afe238ba06faa4bedc176174031aefbf1ca6e (diff) | |
| parent | 9e2872c234d9b4fc7ae2b69326fe9610f7b18264 (diff) | |
| download | bitcoin-fc5d85c4bbb5fd5964117d4faf698ef2bf4ec634.tar.xz | |
Merge pull request #3806
9e2872c Adjust branding in datadir lock error message (Michagogo)
d30d379 Slightly tweak error when unable to bind port (Michagogo)
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/net.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 372f5db297..1a325ca691 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -568,7 +568,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)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running."), strDataDir)); if (GetBoolArg("-shrinkdebugfile", !fDebug)) ShrinkDebugFile(); diff --git a/src/net.cpp b/src/net.cpp index 19f4a73bc4..653f24ec37 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1653,7 +1653,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 Core Daemon is probably already running."), addrBind.ToString()); + strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString(), nErr, strerror(nErr)); LogPrintf("%s\n", strError); |