Skip to content

Commit 9ff6adc

Browse files
committed
Merge bitcoin/bitcoin#25804: Update translations for 24.0 string freeze
ff52b24 qt: Update translation source file (Hennadii Stepanov) 15f762f qt: Bump Transifex slug for 24.x (Hennadii Stepanov) Pull request description: Required to open Transifex translations for 24.0 (see bitcoin/bitcoin#24987). ACKs for top commit: laanwj: Changes-match-release-process ACK ff52b24 jarolrod: ACK ff52b24 Tree-SHA512: f3e65b1608818084f4a3adddd2a58541ebe91ebcdb3717da2eb6f4147a0fc5f0d536a2e9f8b4eacc2a580b12c619d9eec391bfdcc5e81fa02f527408ec73a984
2 parents a478c53 + ff52b24 commit 9ff6adc

File tree

4 files changed

+2200
-1879
lines changed

4 files changed

+2200
-1879
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-023x]
4+
[bitcoin.qt-translation-024x]
55
file_filter = src/qt/locale/bitcoin_<lang>.xlf
66
source_file = src/qt/locale/bitcoin_en.xlf
77
source_lang = en

src/qt/bitcoinstrings.cpp

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,28 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
1414
"%s corrupt. Try using the wallet tool bitcoin-wallet to salvage or restoring "
1515
"a backup."),
1616
QT_TRANSLATE_NOOP("bitcoin-core", ""
17+
"%s request to listen on port %u. This port is considered \"bad\" and thus it "
18+
"is unlikely that any Bitcoin Core peers connect to it. See doc/p2p-bad-ports."
19+
"md for details and a full list."),
20+
QT_TRANSLATE_NOOP("bitcoin-core", ""
1721
"-maxtxfee is set very high! Fees this large could be paid on a single "
1822
"transaction."),
1923
QT_TRANSLATE_NOOP("bitcoin-core", ""
24+
"-reindex-chainstate option is not compatible with -blockfilterindex. Please "
25+
"temporarily disable blockfilterindex while using -reindex-chainstate, or "
26+
"replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
27+
QT_TRANSLATE_NOOP("bitcoin-core", ""
28+
"-reindex-chainstate option is not compatible with -coinstatsindex. Please "
29+
"temporarily disable coinstatsindex while using -reindex-chainstate, or "
30+
"replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
31+
QT_TRANSLATE_NOOP("bitcoin-core", ""
32+
"-reindex-chainstate option is not compatible with -txindex. Please "
33+
"temporarily disable txindex while using -reindex-chainstate, or replace -"
34+
"reindex-chainstate with -reindex to fully rebuild all indexes."),
35+
QT_TRANSLATE_NOOP("bitcoin-core", ""
36+
"Assumed-valid: last wallet synchronisation goes beyond available block data. "
37+
"You need to wait for the background validation chain to download more blocks."),
38+
QT_TRANSLATE_NOOP("bitcoin-core", ""
2039
"Cannot downgrade wallet from version %i to version %i. Wallet version "
2140
"unchanged."),
2241
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -51,7 +70,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
5170
"Error: Legacy wallets only support the \"legacy\", \"p2sh-segwit\", and "
5271
"\"bech32\" address types"),
5372
QT_TRANSLATE_NOOP("bitcoin-core", ""
54-
"Error: Listening for incoming connections failed (listen returned error %s)"),
73+
"Failed to rename invalid peers.dat file. Please move or delete it and try "
74+
"again."),
5575
QT_TRANSLATE_NOOP("bitcoin-core", ""
5676
"Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -"
5777
"fallbackfee."),
@@ -77,6 +97,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
7797
"No wallet file format provided. To use createfromdump, -format=<format> must "
7898
"be provided."),
7999
QT_TRANSLATE_NOOP("bitcoin-core", ""
100+
"Outbound connections restricted to Tor (-onlynet=onion) but the proxy for "
101+
"reaching the Tor network is not provided (no -proxy= and no -onion= given) "
102+
"or it is explicitly forbidden (-onion=0)"),
103+
QT_TRANSLATE_NOOP("bitcoin-core", ""
80104
"Please check that your computer's date and time are correct! If your clock "
81105
"is wrong, %s will not work properly."),
82106
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -85,6 +109,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
85109
QT_TRANSLATE_NOOP("bitcoin-core", ""
86110
"Prune configured below the minimum of %d MiB. Please use a higher number."),
87111
QT_TRANSLATE_NOOP("bitcoin-core", ""
112+
"Prune mode is incompatible with -reindex-chainstate. Use full -reindex "
113+
"instead."),
114+
QT_TRANSLATE_NOOP("bitcoin-core", ""
88115
"Prune: last wallet synchronisation goes beyond pruned data. You need to -"
89116
"reindex (download the whole blockchain again in case of pruned node)"),
90117
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -129,6 +156,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
129156
"Unknown wallet file format \"%s\" provided. Please provide one of \"bdb\" or "
130157
"\"sqlite\"."),
131158
QT_TRANSLATE_NOOP("bitcoin-core", ""
159+
"Unsupported chainstate database format found. Please restart with -reindex-"
160+
"chainstate. This will rebuild the chainstate database."),
161+
QT_TRANSLATE_NOOP("bitcoin-core", ""
162+
"Wallet created successfully. The legacy wallet type is being deprecated and "
163+
"support for creating and opening legacy wallets will be removed in the "
164+
"future."),
165+
QT_TRANSLATE_NOOP("bitcoin-core", ""
132166
"Warning: Dumpfile wallet format \"%s\" does not match command line specified "
133167
"format \"%s\"."),
134168
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -169,7 +203,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
169203
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
170204
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
171205
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading next record from wallet database"),
172-
QT_TRANSLATE_NOOP("bitcoin-core", "Error upgrading chainstate database"),
173206
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Couldn't create cursor into database"),
174207
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low for %s"),
175208
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Dumpfile checksum does not match. Computed %s, expected %s"),
@@ -199,6 +232,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -discardfee=<amount>: '%s'
199232
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -fallbackfee=<amount>: '%s'"),
200233
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
201234
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"),
235+
QT_TRANSLATE_NOOP("bitcoin-core", "Listening for incoming connections failed (listen returned error %s)"),
202236
QT_TRANSLATE_NOOP("bitcoin-core", "Loading P2P addresses…"),
203237
QT_TRANSLATE_NOOP("bitcoin-core", "Loading banlist…"),
204238
QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index…"),
@@ -207,10 +241,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Missing amount"),
207241
QT_TRANSLATE_NOOP("bitcoin-core", "Missing solving data for estimating transaction size"),
208242
QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"),
209243
QT_TRANSLATE_NOOP("bitcoin-core", "No addresses available"),
210-
QT_TRANSLATE_NOOP("bitcoin-core", "No proxy server specified. Use -proxy=<ip> or -proxy=<ip:port>."),
211244
QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."),
212245
QT_TRANSLATE_NOOP("bitcoin-core", "Prune cannot be configured with a negative value."),
213-
QT_TRANSLATE_NOOP("bitcoin-core", "Prune mode is incompatible with -coinstatsindex."),
214246
QT_TRANSLATE_NOOP("bitcoin-core", "Prune mode is incompatible with -txindex."),
215247
QT_TRANSLATE_NOOP("bitcoin-core", "Pruning blockstore…"),
216248
QT_TRANSLATE_NOOP("bitcoin-core", "Reducing -maxconnections from %d to %d, because of system limitations."),
@@ -241,6 +273,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Transaction has too long of a mempool chain")
241273
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction must have at least one recipient"),
242274
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction needs a change address, but we can't generate it."),
243275
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"),
276+
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to allocate memory for -maxsigcachesize: '%s' MiB"),
244277
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"),
245278
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer. %s is probably already running."),
246279
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to create the PID file '%s': %s"),
@@ -255,7 +288,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unknown change type '%s'"),
255288
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"),
256289
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown new rules activated (versionbit %i)"),
257290
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported logging category %s=%s."),
258-
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading UTXO database"),
259291
QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
260292
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks…"),
261293
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)…"),

0 commit comments

Comments
 (0)