From a22a2610b6109741e507e8be005778b16e38a8e8 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 1 Mar 2023 15:47:04 +0000
Subject: [PATCH 1/2] qt: Adjust plural forms for translations
---
src/qt/locale/bitcoin_en.ts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index ebce81b198e..dc541e886a6 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1429,24 +1429,24 @@ Signing is only possible with addresses of the type 'legacy'.
%n GB of space available
-
-
+ %n GB of space available
+ %n GB of space available(of %n GB needed)
-
-
+ (of %n GB needed)
+ (of %n GB needed)(%n GB needed for full chain)
-
-
+ (%n GB needed for full chain)
+ (%n GB needed for full chain)
From 50df63b66451663ed0ed81e0576e7a9754dd51ec Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 1 Mar 2023 16:09:01 +0000
Subject: [PATCH 2/2] qt: Update translation source file
The diff is produced by running `make -C src translate`.
---
src/qt/bitcoinstrings.cpp | 1 +
src/qt/locale/bitcoin_en.ts | 11 +-
src/qt/locale/bitcoin_en.xlf | 270 ++++++++++++++++++-----------------
3 files changed, 146 insertions(+), 136 deletions(-)
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 27aa39a024d..41773890596 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -233,6 +233,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high!"),
QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"),
QT_TRANSLATE_NOOP("bitcoin-core", "A fatal internal error occurred, see debug.log for details"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Block verification was interrupted"),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -forcednsseed to true when setting -dnsseed to false."),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -peerblockfilters without -blockfilterindex."),
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index dc541e886a6..88c2042b45f 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -5455,7 +5455,7 @@ Go to File > Open Wallet to load a wallet.
-
+ Cannot resolve -%s address: '%s'
@@ -5475,7 +5475,7 @@ Go to File > Open Wallet to load a wallet.
-
+ The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.
@@ -5594,7 +5594,12 @@ Unable to restore backup of wallet.
-
+
+ Block verification was interrupted
+
+
+
+ Config setting for %s only applied on %s network when in [%s] section.
diff --git a/src/qt/locale/bitcoin_en.xlf b/src/qt/locale/bitcoin_en.xlf
index 4920a08d72e..b4c1eb7fff4 100644
--- a/src/qt/locale/bitcoin_en.xlf
+++ b/src/qt/locale/bitcoin_en.xlf
@@ -4598,19 +4598,19 @@ Go to File > Open Wallet to load a wallet.
Cannot resolve -%s address: '%s'
- 236
+ 237Cannot set -forcednsseed to true when setting -dnsseed to false.
- 237
+ 238Cannot set -peerblockfilters without -blockfilterindex.
- 238
+ 239Cannot write to data directory '%s'; check permissions.
- 239
+ 240The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.
@@ -4710,517 +4710,521 @@ Unable to restore backup of wallet.
230
- Config setting for %s only applied on %s network when in [%s] section.
- 240
+ Block verification was interrupted
+ 236
- Copyright (C) %i-%i
+ Config setting for %s only applied on %s network when in [%s] section.241
- Corrupted block database detected
+ Copyright (C) %i-%i242
- Could not find asmap file %s
+ Corrupted block database detected243
- Could not parse asmap file %s
+ Could not find asmap file %s244
- Disk space is too low!
+ Could not parse asmap file %s245
- Do you want to rebuild the block database now?
+ Disk space is too low!246
- Done loading
+ Do you want to rebuild the block database now?247
- Dump file %s does not exist.
+ Done loading248
- Error creating %s
+ Dump file %s does not exist.249
- Error initializing block database
+ Error creating %s250
- Error initializing wallet database environment %s!
+ Error initializing block database251
- Error loading %s
+ Error initializing wallet database environment %s!252
- Error loading %s: Private keys can only be disabled during creation
+ Error loading %s253
- Error loading %s: Wallet corrupted
+ Error loading %s: Private keys can only be disabled during creation254
- Error loading %s: Wallet requires newer version of %s
+ Error loading %s: Wallet corrupted255
- Error loading block database
+ Error loading %s: Wallet requires newer version of %s256
- Error opening block database
+ Error loading block database257
- Error reading from database, shutting down.
+ Error opening block database258
- Error reading next record from wallet database
+ Error reading from database, shutting down.259
- Error: Cannot extract destination from the generated scriptpubkey
+ Error reading next record from wallet database260
- Error: Could not add watchonly tx to watchonly wallet
+ Error: Cannot extract destination from the generated scriptpubkey261
- Error: Could not delete watchonly transactions
+ Error: Could not add watchonly tx to watchonly wallet262
- Error: Couldn't create cursor into database
+ Error: Could not delete watchonly transactions263
- Error: Disk space is low for %s
+ Error: Couldn't create cursor into database264
- Error: Dumpfile checksum does not match. Computed %s, expected %s
+ Error: Disk space is low for %s265
- Error: Failed to create new watchonly wallet
+ Error: Dumpfile checksum does not match. Computed %s, expected %s266
- Error: Got key that was not hex: %s
+ Error: Failed to create new watchonly wallet267
- Error: Got value that was not hex: %s
+ Error: Got key that was not hex: %s268
- Error: Keypool ran out, please call keypoolrefill first
+ Error: Got value that was not hex: %s269
- Error: Missing checksum
+ Error: Keypool ran out, please call keypoolrefill first270
- Error: No %s addresses available.
+ Error: Missing checksum271
- Error: Not all watchonly txs could be deleted
+ Error: No %s addresses available.272
- Error: This wallet already uses SQLite
+ Error: Not all watchonly txs could be deleted273
- Error: This wallet is already a descriptor wallet
+ Error: This wallet already uses SQLite274
- Error: Unable to begin reading all records in the database
+ Error: This wallet is already a descriptor wallet275
- Error: Unable to make a backup of your wallet
+ Error: Unable to begin reading all records in the database276
- Error: Unable to parse version %u as a uint32_t
+ Error: Unable to make a backup of your wallet277
- Error: Unable to read all records in the database
+ Error: Unable to parse version %u as a uint32_t278
- Error: Unable to remove watchonly address book data
+ Error: Unable to read all records in the database279
- Error: Unable to write record to new wallet
+ Error: Unable to remove watchonly address book data280
- Failed to listen on any port. Use -listen=0 if you want this.
+ Error: Unable to write record to new wallet281
- Failed to rescan the wallet during initialization
+ Failed to listen on any port. Use -listen=0 if you want this.282
- Failed to verify database
+ Failed to rescan the wallet during initialization283
- Fee rate (%s) is lower than the minimum fee rate setting (%s)
+ Failed to verify database284
- Ignoring duplicate -wallet %s.
+ Fee rate (%s) is lower than the minimum fee rate setting (%s)285
- Importing…
+ Ignoring duplicate -wallet %s.286
- Incorrect or no genesis block found. Wrong datadir for network?
+ Importing…287
- Initialization sanity check failed. %s is shutting down.
+ Incorrect or no genesis block found. Wrong datadir for network?288
- Input not found or already spent
+ Initialization sanity check failed. %s is shutting down.289
- Insufficient dbcache for block verification
+ Input not found or already spent290
- Insufficient funds
+ Insufficient dbcache for block verification291
- Invalid -i2psam address or hostname: '%s'
+ Insufficient funds292
- Invalid -onion address or hostname: '%s'
+ Invalid -i2psam address or hostname: '%s'293
- Invalid -proxy address or hostname: '%s'
+ Invalid -onion address or hostname: '%s'294
- Invalid P2P permission: '%s'
+ Invalid -proxy address or hostname: '%s'295
- Invalid amount for -%s=<amount>: '%s'
+ Invalid P2P permission: '%s'296
- Invalid amount for -discardfee=<amount>: '%s'
+ Invalid amount for -%s=<amount>: '%s'297
- Invalid amount for -fallbackfee=<amount>: '%s'
+ Invalid amount for -discardfee=<amount>: '%s'298
- Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)
+ Invalid amount for -fallbackfee=<amount>: '%s'299
- Invalid netmask specified in -whitelist: '%s'
+ Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)300
- Invalid port specified in %s: '%s'
+ Invalid netmask specified in -whitelist: '%s'301
- Invalid pre-selected input %s
+ Invalid port specified in %s: '%s'302
- Listening for incoming connections failed (listen returned error %s)
+ Invalid pre-selected input %s303
- Loading P2P addresses…
+ Listening for incoming connections failed (listen returned error %s)304
- Loading banlist…
+ Loading P2P addresses…305
- Loading block index…
+ Loading banlist…306
- Loading wallet…
+ Loading block index…307
- Missing amount
+ Loading wallet…308
- Missing solving data for estimating transaction size
+ Missing amount309
- Need to specify a port with -whitebind: '%s'
+ Missing solving data for estimating transaction size310
- No addresses available
+ Need to specify a port with -whitebind: '%s'311
- Not enough file descriptors available.
+ No addresses available312
- Not found pre-selected input %s
+ Not enough file descriptors available.313
- Not solvable pre-selected input %s
+ Not found pre-selected input %s314
- Prune cannot be configured with a negative value.
+ Not solvable pre-selected input %s315
- Prune mode is incompatible with -txindex.
+ Prune cannot be configured with a negative value.316
- Pruning blockstore…
+ Prune mode is incompatible with -txindex.317
- Reducing -maxconnections from %d to %d, because of system limitations.
+ Pruning blockstore…318
- Replaying blocks…
+ Reducing -maxconnections from %d to %d, because of system limitations.319
- Rescanning…
+ Replaying blocks…320
- SQLiteDatabase: Failed to execute statement to verify database: %s
+ Rescanning…321
- SQLiteDatabase: Failed to prepare statement to verify database: %s
+ SQLiteDatabase: Failed to execute statement to verify database: %s322
- SQLiteDatabase: Failed to read database verification error: %s
+ SQLiteDatabase: Failed to prepare statement to verify database: %s323
- SQLiteDatabase: Unexpected application id. Expected %u, got %u
+ SQLiteDatabase: Failed to read database verification error: %s324
- Section [%s] is not recognized.
+ SQLiteDatabase: Unexpected application id. Expected %u, got %u325
- Signing transaction failed
+ Section [%s] is not recognized.326
- Specified -walletdir "%s" does not exist
+ Signing transaction failed327
- Specified -walletdir "%s" is a relative path
+ Specified -walletdir "%s" does not exist328
- Specified -walletdir "%s" is not a directory
+ Specified -walletdir "%s" is a relative path329
- Specified blocks directory "%s" does not exist.
+ Specified -walletdir "%s" is not a directory330
- Starting network threads…
+ Specified blocks directory "%s" does not exist.331
- The source code is available from %s.
+ Starting network threads…332
- The specified config file %s does not exist
+ The source code is available from %s.333
- The transaction amount is too small to pay the fee
+ The specified config file %s does not exist334
- The wallet will avoid paying less than the minimum relay fee.
+ The transaction amount is too small to pay the fee335
- This is experimental software.
+ The wallet will avoid paying less than the minimum relay fee.336
- This is the minimum transaction fee you pay on every transaction.
+ This is experimental software.337
- This is the transaction fee you will pay if you send a transaction.
+ This is the minimum transaction fee you pay on every transaction.338
- Transaction amount too small
+ This is the transaction fee you will pay if you send a transaction.339
- Transaction amounts must not be negative
+ Transaction amount too small340
- Transaction change output index out of range
+ Transaction amounts must not be negative341
- Transaction has too long of a mempool chain
+ Transaction change output index out of range342
- Transaction must have at least one recipient
+ Transaction has too long of a mempool chain343
- Transaction needs a change address, but we can't generate it.
+ Transaction must have at least one recipient344
- Transaction too large
+ Transaction needs a change address, but we can't generate it.345
- Unable to allocate memory for -maxsigcachesize: '%s' MiB
+ Transaction too large346
- Unable to bind to %s on this computer (bind returned error %s)
+ Unable to allocate memory for -maxsigcachesize: '%s' MiB347
- Unable to bind to %s on this computer. %s is probably already running.
+ Unable to bind to %s on this computer (bind returned error %s)348
- Unable to create the PID file '%s': %s
+ Unable to bind to %s on this computer. %s is probably already running.349
- Unable to find UTXO for external input
+ Unable to create the PID file '%s': %s350
- Unable to generate initial keys
+ Unable to find UTXO for external input351
- Unable to generate keys
+ Unable to generate initial keys352
- Unable to open %s for writing
+ Unable to generate keys353
- Unable to parse -maxuploadtarget: '%s'
+ Unable to open %s for writing354
- Unable to start HTTP server. See debug log for details.
+ Unable to parse -maxuploadtarget: '%s'355
- Unable to unload the wallet before migrating
+ Unable to start HTTP server. See debug log for details.356
- Unknown -blockfilterindex value %s.
+ Unable to unload the wallet before migrating357
- Unknown address type '%s'
+ Unknown -blockfilterindex value %s.358
- Unknown change type '%s'
+ Unknown address type '%s'359
- Unknown network specified in -onlynet: '%s'
+ Unknown change type '%s'360
- Unknown new rules activated (versionbit %i)
+ Unknown network specified in -onlynet: '%s'361
- Unsupported global logging level -loglevel=%s. Valid values: %s.
+ Unknown new rules activated (versionbit %i)362
- Unsupported logging category %s=%s.
+ Unsupported global logging level -loglevel=%s. Valid values: %s.363
- User Agent comment (%s) contains unsafe characters.
+ Unsupported logging category %s=%s.364
- Verifying blocks…
+ User Agent comment (%s) contains unsafe characters.365
- Verifying wallet(s)…
+ Verifying blocks…366
- Wallet needed to be rewritten: restart %s to complete
+ Verifying wallet(s)…367
+
+ Wallet needed to be rewritten: restart %s to complete
+ 368
+