Skip to content

Commit f93d6cb

Browse files
committed
Merge bitcoin#31809: Prepare "Open Transifex translations for v29.0" release step
2f27c91 qt: Update the `src/qt/locale/bitcoin_en.xlf` translation source file (Hennadii Stepanov) 864386a cmake: Ensure generated sources are up to date for `translate` target (Hennadii Stepanov) 2b51dd3 Update Transifex slug for 29.x (Hennadii Stepanov) Pull request description: This PR follows our [Release Process](https://github.com/bitcoin/bitcoin/blob/864386a7444fb5cf16613956ce8bf335f51b67d5/doc/release-process.md). It is required to open Transifex translations for v29.0, as scheduled in bitcoin#31029. The previous similar PR: bitcoin#30548. **Notes for reviewers:** 1. This is the first release process conducted after migrating the build system to CMake. This revealed a bug, which is fixed in the second commit 2. To reproduce the diff in the third commit, follow these steps: ``` gmake -C depends -j $(nproc) MULTIPROCESS=1 cmake --preset dev-mode --toolchain depends/$(./depends/config.guess)/toolchain.cmake cmake --build build_dev_mode --target translate ``` ACKs for top commit: stickies-v: ACK 2f27c91 Tree-SHA512: 325ce2418f218b82cc3b0a6c727473963455680cdf6383a85768613ed9e485974b2e52bd5b2e7a7472ad8ebe40bccb2884764d7f9e83dc10a587cd7892e0028b
2 parents d6c229d + 2f27c91 commit f93d6cb

File tree

5 files changed

+1283
-1236
lines changed

5 files changed

+1283
-1236
lines changed

.tx/config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[o:bitcoin:p:bitcoin:r:qt-translation-028x]
4+
[o:bitcoin:p:bitcoin:r:qt-translation-029x]
55
file_filter = src/qt/locale/bitcoin_<lang>.xlf
66
source_file = src/qt/locale/bitcoin_en.xlf
77
source_lang = en

src/qt/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ else()
324324
COMMAND Qt5::lconvert -drop-translations -o ${CMAKE_CURRENT_SOURCE_DIR}/locale/bitcoin_en.xlf -i ${CMAKE_CURRENT_SOURCE_DIR}/locale/bitcoin_en.ts
325325
COMMAND ${SED_EXECUTABLE} -i.old -e "s|source-language=\"en\" target-language=\"en\"|source-language=\"en\"|" -e "/<target xml:space=\"preserve\"><\\/target>/d" ${CMAKE_CURRENT_SOURCE_DIR}/locale/bitcoin_en.xlf
326326
COMMAND ${CMAKE_COMMAND} -E rm ${CMAKE_CURRENT_SOURCE_DIR}/locale/bitcoin_en.xlf.old
327+
DEPENDS ${translatable_sources}
327328
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src
328329
VERBATIM
329330
)

src/qt/bitcoinstrings.cpp

+18-8
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
3333
"Cannot downgrade wallet from version %i to version %i. Wallet version "
3434
"unchanged."),
3535
QT_TRANSLATE_NOOP("bitcoin-core", ""
36-
"Cannot obtain a lock on data directory %s. %s is probably already running."),
37-
QT_TRANSLATE_NOOP("bitcoin-core", ""
3836
"Cannot provide specific connections and have addrman find outgoing "
3937
"connections at the same time."),
4038
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -62,6 +60,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
6260
"Error reading %s! Transaction data may be missing or incorrect. Rescanning "
6361
"wallet."),
6462
QT_TRANSLATE_NOOP("bitcoin-core", ""
63+
"Error starting/committing db txn for wallet transactions removal process"),
64+
QT_TRANSLATE_NOOP("bitcoin-core", ""
6565
"Error: Address book data in wallet cannot be identified to belong to "
6666
"migrated wallets"),
6767
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -114,6 +114,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
114114
"report it to %s. As a workaround, you can move the file (%s) out of the way "
115115
"(rename, move, or delete) to have a new one created on the next start."),
116116
QT_TRANSLATE_NOOP("bitcoin-core", ""
117+
"Invalid value detected for '-wallet' or '-nowallet'. '-wallet' requires a "
118+
"string value, while '-nowallet' accepts only '1' to disable all wallets"),
119+
QT_TRANSLATE_NOOP("bitcoin-core", ""
117120
"Maximum transaction weight is less than transaction weight without inputs"),
118121
QT_TRANSLATE_NOOP("bitcoin-core", ""
119122
"Maximum transaction weight is too low, can not accommodate change output"),
@@ -129,6 +132,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
129132
"No wallet file format provided. To use createfromdump, -format=<format> must "
130133
"be provided."),
131134
QT_TRANSLATE_NOOP("bitcoin-core", ""
135+
"Option '-upnp' is set but UPnP support was dropped in version 29.0. Consider "
136+
"using '-natpmp' instead."),
137+
QT_TRANSLATE_NOOP("bitcoin-core", ""
132138
"Outbound connections restricted to CJDNS (-onlynet=cjdns) but -"
133139
"cjdnsreachable is not provided"),
134140
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -272,22 +278,22 @@ QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"),
272278
QT_TRANSLATE_NOOP("bitcoin-core", "A fatal internal error occurred, see debug.log for details: "),
273279
QT_TRANSLATE_NOOP("bitcoin-core", "Assumeutxo data not found for the given blockhash '%s'."),
274280
QT_TRANSLATE_NOOP("bitcoin-core", "Block verification was interrupted"),
281+
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot obtain a lock on directory %s. %s is probably already running."),
275282
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
276283
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -forcednsseed to true when setting -dnsseed to false."),
277284
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -peerblockfilters without -blockfilterindex."),
278-
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write to data directory '%s'; check permissions."),
285+
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write to directory '%s'; check permissions."),
279286
QT_TRANSLATE_NOOP("bitcoin-core", "Config setting for %s only applied on %s network when in [%s] section."),
280287
QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) %i-%i"),
281288
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupt block found indicating potential hardware failure."),
282289
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
283290
QT_TRANSLATE_NOOP("bitcoin-core", "Could not find asmap file %s"),
284291
QT_TRANSLATE_NOOP("bitcoin-core", "Could not parse asmap file %s"),
285292
QT_TRANSLATE_NOOP("bitcoin-core", "Disk space is too low!"),
286-
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
293+
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the databases now?"),
287294
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
288295
QT_TRANSLATE_NOOP("bitcoin-core", "Dump file %s does not exist."),
289296
QT_TRANSLATE_NOOP("bitcoin-core", "Elliptic curve cryptography sanity check failure. %s is shutting down."),
290-
QT_TRANSLATE_NOOP("bitcoin-core", "Error committing db txn for wallet transactions removal"),
291297
QT_TRANSLATE_NOOP("bitcoin-core", "Error creating %s"),
292298
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),
293299
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"),
@@ -296,11 +302,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Private keys can only be di
296302
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"),
297303
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"),
298304
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
305+
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading databases"),
299306
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
307+
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening coins database"),
300308
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading configuration file: %s"),
301309
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
302310
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading next record from wallet database"),
303-
QT_TRANSLATE_NOOP("bitcoin-core", "Error starting db txn for wallet transactions removal"),
304311
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Cannot extract destination from the generated scriptpubkey"),
305312
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not add watchonly tx %s to watchonly wallet"),
306313
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not delete watchonly transactions. "),
@@ -321,10 +328,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to parse version %u as a uint32
321328
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to read all records in the database"),
322329
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to read wallet's best block locator record"),
323330
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to remove watchonly address book data"),
331+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write data to disk for wallet %s"),
324332
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write record to new wallet"),
325333
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write solvable wallet best block locator record"),
326334
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write watchonly wallet best block locator record"),
327-
QT_TRANSLATE_NOOP("bitcoin-core", "Error: address book copy failed for wallet %s"),
335+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet does not exist"),
336+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: cannot remove legacy wallet records"),
328337
QT_TRANSLATE_NOOP("bitcoin-core", "Error: database transaction cannot be executed for wallet %s"),
329338
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to connect best block (%s)."),
330339
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to disconnect block."),
@@ -366,7 +375,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Missing amount"),
366375
QT_TRANSLATE_NOOP("bitcoin-core", "Missing solving data for estimating transaction size"),
367376
QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"),
368377
QT_TRANSLATE_NOOP("bitcoin-core", "No addresses available"),
369-
QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."),
378+
QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available. %d available, %d required."),
370379
QT_TRANSLATE_NOOP("bitcoin-core", "Not found pre-selected input %s"),
371380
QT_TRANSLATE_NOOP("bitcoin-core", "Not solvable pre-selected input %s"),
372381
QT_TRANSLATE_NOOP("bitcoin-core", "Only direction was set, no permissions: '%s'"),
@@ -399,6 +408,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "System error while saving block to disk: %s")
399408
QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
400409
QT_TRANSLATE_NOOP("bitcoin-core", "The specified config file %s does not exist"),
401410
QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
411+
QT_TRANSLATE_NOOP("bitcoin-core", "The transactions removal process can only be executed within a db txn"),
402412
QT_TRANSLATE_NOOP("bitcoin-core", "The wallet will avoid paying less than the minimum relay fee."),
403413
QT_TRANSLATE_NOOP("bitcoin-core", "There is no ScriptPubKeyManager for this address"),
404414
QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),

0 commit comments

Comments
 (0)