diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-07-08 13:39:49 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-07-08 13:39:59 -0400 |
commit | 4882040182ea1109ef9befde93c2f49a98aba391 (patch) | |
tree | e8546fc383103bdf2343f679cb81876cdcc21afe /src/timedata.cpp | |
parent | 2679bb8919b5089f8067ccfd94f766747b8df671 (diff) | |
parent | fa64b947bb3075ff8737656706b941af691908ab (diff) | |
download | bitcoin-4882040182ea1109ef9befde93c2f49a98aba391.tar.xz |
Merge #16291: gui: Stop translating PACKAGE_NAME
fa64b947bb3075ff8737656706b941af691908ab util: No translation of `Bitcoin Core` in the copyright (MarcoFalke)
fab85208f678ba1be53bdb73a73ce3c5c937d448 qt: Run «make translate» in ./src/ (MarcoFalke)
fabe87d2c923ab3a70b8cde2666a4d1cda8b22fb scripted-diff: Avoid passing PACKAGE_NAME for translation (MarcoFalke)
fa5e9f157e568b7fbbea1482b393181f0733f2ba build: 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:
ACK fa64b947bb3075ff8737656706b941af691908ab, I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged.
Tree-SHA512: 626f811531182d0ba0ef1044930d32726773349bcb49b10261288a86ee6b80a183db30a87d817d5b0d501fad058ac22d6272311716b4f5a154f17c6f391a5a1a
Diffstat (limited to 'src/timedata.cpp')
-rw-r--r-- | src/timedata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timedata.cpp b/src/timedata.cpp index b43639d729..f4613eeec8 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -100,7 +100,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample) if (!fMatch) { fDone = true; - std::string strMessage = strprintf(_("Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly."), _(PACKAGE_NAME)); + std::string strMessage = strprintf(_("Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly."), PACKAGE_NAME); SetMiscWarning(strMessage); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING); } |