Skip to content

Commit 5152002

Browse files
committed
Merge bitcoin/bitcoin#24250: Update translations for 0.23 string freeze
0425507 qt: Update source translations (laanwj) cf79c56 init: Remove confusing '(possible integer overflow?)' from error message (laanwj) d570a63 qt: Update transifex resource blob to 23.0 (laanwj) Pull request description: - Update translations for 0.23 string freeze - Update transifex resource blob to 23.0 This is necessary before a 23.0 resource can be created on Transifex. ACKs for top commit: hebasto: ACK 0425507 Tree-SHA512: ff886e92721f070e3c135cfec229c41848a67c02355b88f2a5a507241b545f4209167d83b561420c2a82f49a5994170b01dcfb95bfc3fe6b9c832abcc6547b14
2 parents e8a3882 + 0425507 commit 5152002

File tree

5 files changed

+2523
-2047
lines changed

5 files changed

+2523
-2047
lines changed

.tx/config

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

4-
[bitcoin.qt-translation-022x]
4+
[bitcoin.qt-translation-023x]
55
file_filter = src/qt/locale/bitcoin_<lang>.xlf
66
source_file = src/qt/locale/bitcoin_en.xlf
77
source_lang = en

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
11341134

11351135
auto opt_max_upload = ParseByteUnits(args.GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET), ByteUnit::M);
11361136
if (!opt_max_upload) {
1137-
return InitError(strprintf(_("Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)"), args.GetArg("-maxuploadtarget", "")));
1137+
return InitError(strprintf(_("Unable to parse -maxuploadtarget: '%s'"), args.GetArg("-maxuploadtarget", "")));
11381138
}
11391139

11401140
// ********************************************************* Step 4a: application initialization

src/qt/bitcoinstrings.cpp

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
3535
"Error reading %s! All keys read correctly, but transaction data or address "
3636
"book entries might be missing or incorrect."),
3737
QT_TRANSLATE_NOOP("bitcoin-core", ""
38+
"Error reading %s! Transaction data may be missing or incorrect. Rescanning "
39+
"wallet."),
40+
QT_TRANSLATE_NOOP("bitcoin-core", ""
3841
"Error: Dumpfile format record is incorrect. Got \"%s\", expected \"format\"."),
3942
QT_TRANSLATE_NOOP("bitcoin-core", ""
4043
"Error: Dumpfile identifier record is incorrect. Got \"%s\", expected \"%s\"."),
@@ -56,6 +59,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
5659
"Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
5760
"fee of %s to prevent stuck transactions)"),
5861
QT_TRANSLATE_NOOP("bitcoin-core", ""
62+
"Invalid or corrupt peers.dat (%s). If you believe this is a bug, please "
63+
"report it to %s. As a workaround, you can move the file (%s) out of the way "
64+
"(rename, move, or delete) to have a new one created on the next start."),
65+
QT_TRANSLATE_NOOP("bitcoin-core", ""
5966
"More than one onion bind address is provided. Using %s for the automatically "
6067
"created Tor onion service."),
6168
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -81,11 +88,18 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
8188
"SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is "
8289
"supported"),
8390
QT_TRANSLATE_NOOP("bitcoin-core", ""
91+
"The -txindex upgrade started by a previous version can not be completed. "
92+
"Restart with the previous version or run a full -reindex."),
93+
QT_TRANSLATE_NOOP("bitcoin-core", ""
8494
"The block database contains a block which appears to be from the future. "
8595
"This may be due to your computer's date and time being set incorrectly. Only "
8696
"rebuild the block database if you are sure that your computer's date and "
8797
"time are correct"),
8898
QT_TRANSLATE_NOOP("bitcoin-core", ""
99+
"The block index db contains a legacy 'txindex'. To clear the occupied disk "
100+
"space, run a full -reindex, otherwise ignore this error. This error message "
101+
"will not be displayed again."),
102+
QT_TRANSLATE_NOOP("bitcoin-core", ""
89103
"The transaction amount is too small to send after the fee has been deducted"),
90104
QT_TRANSLATE_NOOP("bitcoin-core", ""
91105
"This error could occur if this wallet was not shutdown cleanly and was last "
@@ -129,6 +143,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high!"),
129143
QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"),
130144
QT_TRANSLATE_NOOP("bitcoin-core", "A fatal internal error occurred, see debug.log for details"),
131145
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
146+
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -forcednsseed to true when setting -dnsseed to false."),
132147
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -peerblockfilters without -blockfilterindex."),
133148
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write to data directory '%s'; check permissions."),
134149
QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
@@ -171,6 +186,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Ignoring duplicate -wallet %s."),
171186
QT_TRANSLATE_NOOP("bitcoin-core", "Importing…"),
172187
QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"),
173188
QT_TRANSLATE_NOOP("bitcoin-core", "Initialization sanity check failed. %s is shutting down."),
189+
QT_TRANSLATE_NOOP("bitcoin-core", "Input not found or already spent"),
174190
QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"),
175191
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -i2psam address or hostname: '%s'"),
176192
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -onion address or hostname: '%s'"),
@@ -185,7 +201,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Loading P2P addresses…"),
185201
QT_TRANSLATE_NOOP("bitcoin-core", "Loading banlist…"),
186202
QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index…"),
187203
QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet…"),
204+
QT_TRANSLATE_NOOP("bitcoin-core", "Missing amount"),
205+
QT_TRANSLATE_NOOP("bitcoin-core", "Missing solving data for estimating transaction size"),
188206
QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"),
207+
QT_TRANSLATE_NOOP("bitcoin-core", "No addresses available"),
189208
QT_TRANSLATE_NOOP("bitcoin-core", "No proxy server specified. Use -proxy=<ip> or -proxy=<ip:port>."),
190209
QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."),
191210
QT_TRANSLATE_NOOP("bitcoin-core", "Prune cannot be configured with a negative value."),
@@ -217,14 +236,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"),
217236
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must not be negative"),
218237
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction has too long of a mempool chain"),
219238
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction must have at least one recipient"),
220-
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction needs a change address, but we can't generate it. %s"),
239+
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction needs a change address, but we can't generate it."),
221240
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"),
222241
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"),
223242
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer. %s is probably already running."),
224243
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to create the PID file '%s': %s"),
225244
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate initial keys"),
226245
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate keys"),
227246
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to open %s for writing"),
247+
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to parse -maxuploadtarget: '%s'"),
228248
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to start HTTP server. See debug log for details."),
229249
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown -blockfilterindex value %s."),
230250
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown address type '%s'"),
@@ -233,7 +253,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'")
233253
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown new rules activated (versionbit %i)"),
234254
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported logging category %s=%s."),
235255
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading UTXO database"),
236-
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading txindex database"),
237256
QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
238257
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks…"),
239258
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)…"),

0 commit comments

Comments
 (0)