Skip to content

Commit baed5ed

Browse files
committed
Merge bitcoin-core/gui#793: Update translation source file for v27.0 string freeze
3d1bb1a qt: Update translation source file for v27.0 string freeze (Hennadii Stepanov) Pull request description: This PR updates the `src/qt/locale/bitcoin_en.xlf` translation source file according to the [Release schedule for 27.0](bitcoin#29028). Note for reviewers: it is expected to get a zero diff after running `make -C src translate` locally. ACKs for top commit: jarolrod: ACK 3d1bb1a Tree-SHA512: 9b6e5aa3aaabb918d0a6418559bc3eb14297abc48b99e8c6e6de770aa1478b8b28881f8965fd15fe23cf4aa377b88ba903e978c8b75681c4f11e428ca1588b96
2 parents 128b4a8 + 3d1bb1a commit baed5ed

File tree

3 files changed

+1251
-1181
lines changed

3 files changed

+1251
-1181
lines changed

src/qt/bitcoinstrings.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Disk space is too low!"),
258258
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
259259
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
260260
QT_TRANSLATE_NOOP("bitcoin-core", "Dump file %s does not exist."),
261+
QT_TRANSLATE_NOOP("bitcoin-core", "Error committing db txn for wallet transactions removal"),
261262
QT_TRANSLATE_NOOP("bitcoin-core", "Error creating %s"),
262263
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),
263264
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"),
@@ -270,9 +271,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
270271
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading configuration file: %s"),
271272
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
272273
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading next record from wallet database"),
274+
QT_TRANSLATE_NOOP("bitcoin-core", "Error starting db txn for wallet transactions removal"),
273275
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Cannot extract destination from the generated scriptpubkey"),
274276
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not add watchonly tx %s to watchonly wallet"),
275-
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not delete watchonly transactions"),
277+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not delete watchonly transactions. "),
276278
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Couldn't create cursor into database"),
277279
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low for %s"),
278280
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Dumpfile checksum does not match. Computed %s, expected %s"),
@@ -282,7 +284,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Got value that was not hex: %s"),
282284
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Keypool ran out, please call keypoolrefill first"),
283285
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Missing checksum"),
284286
QT_TRANSLATE_NOOP("bitcoin-core", "Error: No %s addresses available."),
285-
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Not all watchonly txs could be deleted"),
286287
QT_TRANSLATE_NOOP("bitcoin-core", "Error: This wallet already uses SQLite"),
287288
QT_TRANSLATE_NOOP("bitcoin-core", "Error: This wallet is already a descriptor wallet"),
288289
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to begin reading all records in the database"),
@@ -294,10 +295,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to remove watchonly address boo
294295
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write record to new wallet"),
295296
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write solvable wallet best block locator record"),
296297
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write watchonly wallet best block locator record"),
298+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: address book copy failed for wallet %s"),
299+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: database transaction cannot be executed for wallet %s"),
297300
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
298301
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"),
299302
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to start indexes, shutting down.."),
300303
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to verify database"),
304+
QT_TRANSLATE_NOOP("bitcoin-core", "Failure removing transaction: %s"),
301305
QT_TRANSLATE_NOOP("bitcoin-core", "Fee rate (%s) is lower than the minimum fee rate setting (%s)"),
302306
QT_TRANSLATE_NOOP("bitcoin-core", "Ignoring duplicate -wallet %s."),
303307
QT_TRANSLATE_NOOP("bitcoin-core", "Importing…"),
@@ -355,6 +359,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "The wallet will avoid paying less than the mi
355359
QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
356360
QT_TRANSLATE_NOOP("bitcoin-core", "This is the minimum transaction fee you pay on every transaction."),
357361
QT_TRANSLATE_NOOP("bitcoin-core", "This is the transaction fee you will pay if you send a transaction."),
362+
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction %s does not belong to this wallet"),
358363
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"),
359364
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must not be negative"),
360365
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction change output index out of range"),

0 commit comments

Comments
 (0)