Skip to content

Conversation

@laanwj
Copy link
Member

@laanwj laanwj commented Feb 24, 2022

Last-minute update for #24434 and #24401.

@laanwj laanwj added the GUI label Feb 24, 2022
@laanwj laanwj added this to the 23.0 milestone Feb 24, 2022
Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Light review ACK 38020c4

at least, as far as I can tell. Unrelated, saw the following with make translate (clang 15 and gcc 11)

make translate
  GEN      qt/bitcoinstrings.cpp
protocol.h:379: warning: unterminated character constant
util/strencodings.h:44: warning: unterminated character constant
  GEN      translate
/home/jon/projects/bitcoin/bitcoin/src/util/strencodings.h:44: Unterminated C++ character
/home/jon/projects/bitcoin/bitcoin/src/protocol.h:379: Unterminated C++ character
/home/jon/projects/bitcoin/bitcoin/src/protocol.h:359: Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor)
/home/jon/projects/bitcoin/bitcoin/src/qt/guiutil.cpp:800: Unterminated C++ character
/home/jon/projects/bitcoin/bitcoin/src/qt/guiutil.cpp:803: Unterminated C++ character
/home/jon/projects/bitcoin/bitcoin/src/qt/guiutil.cpp:804: Unterminated C++ character
/home/jon/projects/bitcoin/bitcoin/src/qt/guiutil.cpp:807: Unterminated C++ character
/home/jon/projects/bitcoin/bitcoin/src/qt/guiutil.cpp:800: Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor)
Updating 'qt/locale/bitcoin_en.ts'...
    Found 1100 source text(s) (0 new and 1100 already existing)
  GEN      translate

@laanwj
Copy link
Member Author

laanwj commented Feb 24, 2022

I think the warnings are harmless. They're thrown by qtranslate when encountering constructions like 1'000. I guess it hasn't been updated yet for new C++ syntax. As long as they don't happen on the same line as tr() (making it possible to miss a message?) I think it doesn't matter.

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 38020c4

@fanquake fanquake merged commit c07287d into bitcoin:master Feb 24, 2022
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Feb 24, 2022
@bitcoin bitcoin deleted a comment from Pragmatic2021 Feb 24, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Feb 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants