From d30d379bebc351e5bdcd5b9fa79f47233fa353d0 Mon Sep 17 00:00:00 2001 From: Michagogo Date: Wed, 5 Mar 2014 18:25:35 +0200 Subject: Slightly tweak error when unable to bind port A slight improvement over 2d2d8fae3d8bc4e82dc631d93c6e19f954bbee04 -- we don't know that it's the daemon, it could be the GUI. --- src/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3 From 9e2872c234d9b4fc7ae2b69326fe9610f7b18264 Mon Sep 17 00:00:00 2001 From: Michagogo Date: Wed, 12 Mar 2014 22:14:11 +0200 Subject: Adjust branding in datadir lock error message --- src/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index 4cc18800a5..6e1a320c14 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(); -- cgit v1.2.3