diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -23,8 +23,8 @@ copyright\_header.py ==================== -Provides utilities for managing copyright headers of `The Bitcoin Core -developers` in repository source files. It has three subcommands: +Provides utilities for managing copyright headers of `The Bitcoin developers` +in repository source files. It has three subcommands: ``` $ ./copyright_header.py report [verbose] @@ -42,33 +42,33 @@ copyright\_header.py update \ [verbose] --------------------------------------------------------- -Updates all the copyright headers of `The Bitcoin Core developers` which were -changed in a year more recent than is listed. For example: +Updates all the copyright headers of `The Bitcoin developers` which were changed +in a year more recent than is listed. For example: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Bitcoin developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Bitcoin developers ``` where `` is obtained from the `git log` history. This subcommand also handles copyright headers that have only a single year. In those cases: ``` -// Copyright (c) The Bitcoin Core developers +// Copyright (c) The Bitcoin developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Bitcoin developers ``` where the update is appropriate. copyright\_header.py insert \ ------------------------------------ -Inserts a copyright header for `The Bitcoin Core developers` at the top of the -file in either Python or C++ style as determined by the file extension. If the -file is a Python file and it has `#!` starting the first line, the header is +Inserts a copyright header for `The Bitcoin developers` at the top of the file +in either Python or C++ style as determined by the file extension. If the file +is a Python file and it has `#!` starting the first line, the header is inserted in the line below it. The copyright dates will be set to be `-` where @@ -76,8 +76,8 @@ `` is equal to ``, it will be set as a single year rather than two hyphenated years. -If the file already has a copyright for `The Bitcoin Core developers`, the -script will exit. +If the file already has a copyright for `The Bitcoin developers`, the script +will exit. gen-manpages.sh =============== diff --git a/src/script/sighashtype.h b/src/script/sighashtype.h --- a/src/script/sighashtype.h +++ b/src/script/sighashtype.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 Bitcoin ABC developers +// Copyright (c) 2017-2018 Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util.cpp b/src/util.cpp --- a/src/util.cpp +++ b/src/util.cpp @@ -634,17 +634,8 @@ } std::string CopyrightHolders(const std::string &strPrefix) { - std::string strCopyrightHolders = - strPrefix + - strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION)); - - // Check for untranslated substitution to make sure Bitcoin ABC copyright - // is not removed by accident. - if (strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION) - .find("Bitcoin ABC") == std::string::npos) { - strCopyrightHolders += "\n" + strPrefix + "The Bitcoin ABC developers"; - } - return strCopyrightHolders; + return strPrefix + + strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION)); } // Obtain the application startup time (used for uptime calculation)