Skip to content

Commit bc49a47

Browse files
committed
Merge #724: Update translation source file for v25.0 string freeze
e414edd qt: Update translation source file (Hennadii Stepanov) b780095 qt: Adjust plural forms for translations (Hennadii Stepanov) 6ae8a24 GUI: Send: Make feerates translatable (Luke Dashjr) bd42f5e Bugfix: GUI: Send/PSBT: Correct virtual size unit and make translatable (Luke Dashjr) 1b0407f Bugfix: GUI: transactiondesc: Translate outlier "own address" and "watch-only" (Luke Dashjr) 170f312 GUI: Use translated external signer errors for messagebox text (Luke Dashjr) 9698959 GUI: Make messages for copying unsigned PSBTs translatable (Luke Dashjr) 08b8b28 Bugfix: GUI: Debug info: Use correct "kB" case for small mempool sizes, and make translation-friendly (Luke Dashjr) dacc322 GUI: PSBTOperationsDialog: Support translating window title (Luke Dashjr) 5a4fe55 GUI: Intro: Support translating caption of data directory chooser (Luke Dashjr) 3868ba3 GUI: Support translating peer network names (Luke Dashjr) f1f9811 GUI: Support translating address type dropdown entries (Luke Dashjr) Pull request description: This PR updates the `src/qt/locale/bitcoin_en.xlf` translation source file according to [Release schedule for 25.0](bitcoin/bitcoin#26549). Some translation-related fixes have been picked from #599 and #716. Note for reviewers: it is expected to get a zero diff after running `make -C src translate` locally. ACKs for top commit: jarolrod: ACK e414edd Tree-SHA512: 5b0c70db1e2f5871067e84f43ebea4ee4f0027fc5f2be49bbcb1d04e162ae76607b2b038e9d0622bcb5b3658d0ede8c10c4421ddaa3343f0e0be54315ca7a4f5
2 parents a0d37d1 + e414edd commit bc49a47

12 files changed

+1945
-1666
lines changed

src/qt/bitcoinstrings.cpp

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,22 @@ 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 failed to validate the -assumeutxo snapshot state. This indicates a "
18+
"hardware problem, or a bug in the software, or a bad software modification "
19+
"that allowed an invalid snapshot to be loaded. As a result of this, the node "
20+
"will shut down and stop using any state that was built on the snapshot, "
21+
"resetting the chain height from %d to %d. On the next restart, the node will "
22+
"resume syncing from %d without using any snapshot data. Please report this "
23+
"incident to %s, including how you obtained the snapshot. The invalid "
24+
"snapshot chainstate has been left on disk in case it is helpful in "
25+
"diagnosing the issue that caused this error."),
26+
QT_TRANSLATE_NOOP("bitcoin-core", ""
27+
"%s is set very high! Fees this large could be paid on a single transaction."),
28+
QT_TRANSLATE_NOOP("bitcoin-core", ""
1729
"%s request to listen on port %u. This port is considered \"bad\" and thus it "
1830
"is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for "
1931
"details and a full list."),
2032
QT_TRANSLATE_NOOP("bitcoin-core", ""
21-
"-maxtxfee is set very high! Fees this large could be paid on a single "
22-
"transaction."),
23-
QT_TRANSLATE_NOOP("bitcoin-core", ""
2433
"-reindex-chainstate option is not compatible with -blockfilterindex. Please "
2534
"temporarily disable blockfilterindex while using -reindex-chainstate, or "
2635
"replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
@@ -90,17 +99,17 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
9099
"Failed to rename invalid peers.dat file. Please move or delete it and try "
91100
"again."),
92101
QT_TRANSLATE_NOOP("bitcoin-core", ""
93-
"Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -"
94-
"fallbackfee."),
102+
"Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable "
103+
"%s."),
95104
QT_TRANSLATE_NOOP("bitcoin-core", ""
96105
"File %s already exists. If you are sure this is what you want, move it out "
97106
"of the way first."),
98107
QT_TRANSLATE_NOOP("bitcoin-core", ""
99108
"Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet "
100109
"forbids connections to IPv4/IPv6"),
101110
QT_TRANSLATE_NOOP("bitcoin-core", ""
102-
"Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
103-
"fee of %s to prevent stuck transactions)"),
111+
"Invalid amount for %s=<amount>: '%s' (must be at least the minrelay fee of "
112+
"%s to prevent stuck transactions)"),
104113
QT_TRANSLATE_NOOP("bitcoin-core", ""
105114
"Invalid or corrupt peers.dat (%s). If you believe this is a bug, please "
106115
"report it to %s. As a workaround, you can move the file (%s) out of the way "
@@ -186,9 +195,18 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
186195
"Total length of network version string (%i) exceeds maximum length (%i). "
187196
"Reduce the number or size of uacomments."),
188197
QT_TRANSLATE_NOOP("bitcoin-core", ""
198+
"Transaction requires one destination of non-0 value, a non-0 feerate, or a "
199+
"pre-selected input"),
200+
QT_TRANSLATE_NOOP("bitcoin-core", ""
201+
"UTXO snapshot failed to validate. Restart to resume normal initial block "
202+
"download, or try loading a different snapshot."),
203+
QT_TRANSLATE_NOOP("bitcoin-core", ""
189204
"Unable to replay blocks. You will need to rebuild the database using -"
190205
"reindex-chainstate."),
191206
QT_TRANSLATE_NOOP("bitcoin-core", ""
207+
"Unconfirmed UTXOs are available, but spending them creates a chain of "
208+
"transactions that will be rejected by the mempool"),
209+
QT_TRANSLATE_NOOP("bitcoin-core", ""
192210
"Unexpected legacy entry in descriptor wallet found. Loading wallet %s\n"
193211
"\n"
194212
"The wallet might have been tampered with or created with malicious intent.\n"),
@@ -233,6 +251,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
233251
QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high!"),
234252
QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"),
235253
QT_TRANSLATE_NOOP("bitcoin-core", "A fatal internal error occurred, see debug.log for details"),
254+
QT_TRANSLATE_NOOP("bitcoin-core", "Block verification was interrupted"),
236255
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
237256
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -forcednsseed to true when setting -dnsseed to false."),
238257
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -peerblockfilters without -blockfilterindex."),
@@ -255,6 +274,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"),
255274
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"),
256275
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
257276
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
277+
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading configuration file: %s"),
258278
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
259279
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading next record from wallet database"),
260280
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Cannot extract destination from the generated scriptpubkey"),
@@ -293,10 +313,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -i2psam address or hostname: '%s'"),
293313
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -onion address or hostname: '%s'"),
294314
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address or hostname: '%s'"),
295315
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid P2P permission: '%s'"),
316+
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for %s=<amount>: '%s' (must be at least %s)"),
317+
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for %s=<amount>: '%s'"),
296318
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -%s=<amount>: '%s'"),
297-
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -discardfee=<amount>: '%s'"),
298-
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -fallbackfee=<amount>: '%s'"),
299-
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
300319
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"),
301320
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid port specified in %s: '%s'"),
302321
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid pre-selected input %s"),
@@ -323,11 +342,14 @@ QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Failed to prepare statement t
323342
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Failed to read database verification error: %s"),
324343
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Unexpected application id. Expected %u, got %u"),
325344
QT_TRANSLATE_NOOP("bitcoin-core", "Section [%s] is not recognized."),
345+
QT_TRANSLATE_NOOP("bitcoin-core", "Settings file could not be read"),
346+
QT_TRANSLATE_NOOP("bitcoin-core", "Settings file could not be written"),
326347
QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"),
327348
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"),
328349
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"),
329350
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"),
330351
QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist."),
352+
QT_TRANSLATE_NOOP("bitcoin-core", "Specified data directory \"%s\" does not exist."),
331353
QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads…"),
332354
QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
333355
QT_TRANSLATE_NOOP("bitcoin-core", "The specified config file %s does not exist"),

src/qt/forms/psbtoperationsdialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Dialog</string>
14+
<string>PSBT Operations</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
1717
<property name="spacing">

src/qt/guiutil.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -673,12 +673,17 @@ QString NetworkToQString(Network net)
673673
{
674674
switch (net) {
675675
case NET_UNROUTABLE: return QObject::tr("Unroutable");
676-
case NET_IPV4: return "IPv4";
677-
case NET_IPV6: return "IPv6";
678-
case NET_ONION: return "Onion";
679-
case NET_I2P: return "I2P";
680-
case NET_CJDNS: return "CJDNS";
681-
case NET_INTERNAL: return QObject::tr("Internal");
676+
//: Name of IPv4 network in peer info
677+
case NET_IPV4: return QObject::tr("IPv4", "network name");
678+
//: Name of IPv6 network in peer info
679+
case NET_IPV6: return QObject::tr("IPv6", "network name");
680+
//: Name of Tor network in peer info
681+
case NET_ONION: return QObject::tr("Onion", "network name");
682+
//: Name of I2P network in peer info
683+
case NET_I2P: return QObject::tr("I2P", "network name");
684+
//: Name of CJDNS network in peer info
685+
case NET_CJDNS: return QObject::tr("CJDNS", "network name");
686+
case NET_INTERNAL: return "Internal"; // should never actually happen
682687
case NET_MAX: assert(false);
683688
} // no default case, so the compiler can warn about missing cases
684689
assert(false);

src/qt/intro.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ void Intro::on_dataDirectory_textChanged(const QString &dataDirStr)
318318

319319
void Intro::on_ellipsisButton_clicked()
320320
{
321-
QString dir = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(nullptr, "Choose data directory", ui->dataDirectory->text()));
321+
QString dir = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(nullptr, tr("Choose data directory"), ui->dataDirectory->text()));
322322
if(!dir.isEmpty())
323323
ui->dataDirectory->setText(dir);
324324
}

0 commit comments

Comments
 (0)