Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042)

This commit is contained in:
Tom Trevethan 2026-04-01 17:24:49 +01:00
commit 030ab66c70
56 changed files with 153 additions and 147 deletions

View file

@ -20,7 +20,7 @@ using util::Join;
* for both bitcoind and bitcoin-qt, to make it harder for attackers to
* target servers or GUI users specifically.
*/
const std::string CLIENT_NAME("Elements Core");
const std::string UA_NAME("Elements Core");
#include <bitcoin-build-info.h>
@ -36,7 +36,7 @@ const std::string CLIENT_NAME("Elements Core");
#define BUILD_DESC BUILD_GIT_TAG
#define BUILD_SUFFIX ""
#else
#define BUILD_DESC "v" PACKAGE_VERSION
#define BUILD_DESC "v" CLIENT_VERSION_STRING
#if CLIENT_VERSION_IS_RELEASE
#define BUILD_SUFFIX ""
#elif defined(BUILD_GIT_COMMIT)
@ -88,7 +88,7 @@ std::string LicenseInfo()
return CopyrightHolders(strprintf(_("Copyright (C) %i-%i").translated, 2009, COPYRIGHT_YEAR) + " ") + "\n" +
"\n" +
strprintf(_("Please contribute if you find %s useful. "
"Visit %s for further information about the software.").translated, PACKAGE_NAME, "<" PACKAGE_URL ">") +
"Visit %s for further information about the software.").translated, CLIENT_NAME, "<" CLIENT_URL ">") +
"\n" +
strprintf(_("The source code is available from %s.").translated, URL_SOURCE_CODE) +
"\n" +