mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-13 07:28:59 +01:00
Merge #16291: gui: Stop translating PACKAGE_NAME
fa64b947bbutil: No translation of `Bitcoin Core` in the copyright (MarcoFalke)fab85208f6qt: Run «make translate» in ./src/ (MarcoFalke)fabe87d2c9scripted-diff: Avoid passing PACKAGE_NAME for translation (MarcoFalke)fa5e9f157ebuild: Stop translating PACKAGE_NAME (MarcoFalke) Pull request description: Generally the package name is not translated, but the package description is. E.g. `GIMP` or `Firefox` are always called that way regardless of the system language. However, "`Firefox` webbrowser" or "`GIMP` image manipulation program" are translated. ACKs for top commit: hebasto: ACKfa64b947bb, I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged. Tree-SHA512: 626f811531182d0ba0ef1044930d32726773349bcb49b10261288a86ee6b80a183db30a87d817d5b0d501fad058ac22d6272311716b4f5a154f17c6f391a5a1a
This commit is contained in:
@@ -1184,10 +1184,11 @@ int GetNumCores()
|
||||
|
||||
std::string CopyrightHolders(const std::string& strPrefix)
|
||||
{
|
||||
std::string strCopyrightHolders = strPrefix + strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION));
|
||||
const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION);
|
||||
std::string strCopyrightHolders = strPrefix + copyright_devs;
|
||||
|
||||
// Check for untranslated substitution to make sure Bitcoin Core copyright is not removed by accident
|
||||
if (strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION).find("Bitcoin Core") == std::string::npos) {
|
||||
// Make sure Bitcoin Core copyright is not removed by accident
|
||||
if (copyright_devs.find("Bitcoin Core") == std::string::npos) {
|
||||
strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
|
||||
}
|
||||
return strCopyrightHolders;
|
||||
|
||||
Reference in New Issue
Block a user