Skip to content

Commit

Permalink
Merge bitcoin-core/gui#854: qt: Update src/qt/locale/bitcoin_en.xlf
Browse files Browse the repository at this point in the history
… after string freeze

7267ed0 qt: Update `src/qt/locale/bitcoin_en.xlf` after string freeze (Hennadii Stepanov)

Pull request description:

  This PR follows our [Release Process](https://github.com/bitcoin/bitcoin/blob/864386a7444fb5cf16613956ce8bf335f51b67d5/doc/release-process.md) and implements the ["Translation string freeze"](bitcoin#31029) step.

  Steps to reproduce the diff on Ubuntu:
  ```
  $ cmake --preset dev-mode -DWITH_USDT=OFF -DWITH_MULTIPROCESS=OFF
  $ cmake --build build_dev_mode --target translate
  ```

  At the moment, the multiprocess-specific code does not introduce any new translatable strings. Therefore, there is no need to build depends with `MULTIPROCESS=1` to review this PR.

ACKs for top commit:
  stickies-v:
    ACK 7267ed0 - I get the same results when building the `translate` target.
  pablomartin4btc:
    tACK 7267ed0

Tree-SHA512: dc3641d3288c00cb7802714680508de517e56c615716e52181555634ad489fbed676229063995170edb8efeaa4e900ef2d3d5a0f1b8ce7cec143ef364c96e1c0
  • Loading branch information
hebasto committed Feb 20, 2025
2 parents db63bfb + 7267ed0 commit 5b8fd7c
Show file tree
Hide file tree
Showing 3 changed files with 418 additions and 383 deletions.
8 changes: 8 additions & 0 deletions src/qt/bitcoinstrings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,14 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is "
"supported"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Specified -blockreservedweight (%d) exceeds consensus maximum block weight "
"(%d)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Specified -blockreservedweight (%d) is lower than minimum safety value of "
"(%d)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"The block database contains a block which appears to be from the future. "
"This may be due to your computer's date and time being set incorrectly. Only "
"rebuild the block database if you are sure that your computer's date and "
Expand Down
21 changes: 18 additions & 3 deletions src/qt/locale/bitcoin_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5553,7 +5553,7 @@ Go to File > Open Wallet to load a wallet.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<location line="+11"/>
<source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -5678,7 +5678,7 @@ Go to File &gt; Open Wallet to load a wallet.
<translation type="unfinished"></translation>
</message>
<message>
<location line="-258"/>
<location line="-266"/>
<source>%s is set very high! Fees this large could be paid on a single transaction.</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -5789,7 +5789,22 @@ Go to File &gt; Open Wallet to load a wallet.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<location line="+10"/>
<source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet&apos;s UTXOs</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading

0 comments on commit 5b8fd7c

Please sign in to comment.