Skip to content

Commit c44e734

Browse files
committed
Merge bitcoin/bitcoin#24377: qt: Update translation source file
c515829 qt: Update translation source file (Hennadii Stepanov) Pull request description: As the part of the v23.0 [release process](bitcoin/bitcoin#22969) this PR updates translation source file, `src/qt/locale/bitcoin_en.xlf`. The following changes are reflected in this PR: - small string changes from #509 - internal technical details from bitcoin/bitcoin#22151 ACKs for top commit: laanwj: ACK c515829 Tree-SHA512: 2cf08f5b356dca25f99b0342645db5253eab0854796cf44fa52f8a6cf28f6d3f973e21589e0f9d3fef40a1b21b3f0aee00c9ca0897109a1967f9ef3320dd508f
2 parents 8add59d + c515829 commit c44e734

File tree

3 files changed

+666
-1776
lines changed

3 files changed

+666
-1776
lines changed

src/qt/bitcoinstrings.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
8888
"SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is "
8989
"supported"),
9090
QT_TRANSLATE_NOOP("bitcoin-core", ""
91-
"The -txindex upgrade started by a previous version can not be completed. "
91+
"The -txindex upgrade started by a previous version cannot be completed. "
9292
"Restart with the previous version or run a full -reindex."),
9393
QT_TRANSLATE_NOOP("bitcoin-core", ""
9494
"The block database contains a block which appears to be from the future. "
@@ -146,7 +146,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
146146
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -forcednsseed to true when setting -dnsseed to false."),
147147
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot set -peerblockfilters without -blockfilterindex."),
148148
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write to data directory '%s'; check permissions."),
149-
QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
150149
QT_TRANSLATE_NOOP("bitcoin-core", "Config setting for %s only applied on %s network when in [%s] section."),
151150
QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) %i-%i"),
152151
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
@@ -234,6 +233,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "This is the minimum transaction fee you pay o
234233
QT_TRANSLATE_NOOP("bitcoin-core", "This is the transaction fee you will pay if you send a transaction."),
235234
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"),
236235
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must not be negative"),
236+
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction change output index out of range"),
237237
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction has too long of a mempool chain"),
238238
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction must have at least one recipient"),
239239
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction needs a change address, but we can't generate it."),

src/qt/locale/bitcoin_en.ts

+51-51
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
313313
<context>
314314
<name>BitcoinApplication</name>
315315
<message>
316-
<location filename="../bitcoin.cpp" line="+429"/>
316+
<location filename="../bitcoin.cpp" line="+433"/>
317317
<source>Runaway exception</source>
318318
<translation type="unfinished"></translation>
319319
</message>
@@ -346,7 +346,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
346346
<translation>Show general overview of wallet</translation>
347347
</message>
348348
<message>
349-
<location line="+28"/>
349+
<location line="+20"/>
350350
<source>&amp;Transactions</source>
351351
<translation>&amp;Transactions</translation>
352352
</message>
@@ -356,7 +356,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
356356
<translation>Browse transaction history</translation>
357357
</message>
358358
<message>
359-
<location line="+23"/>
359+
<location line="+19"/>
360360
<source>E&amp;xit</source>
361361
<translation>E&amp;xit</translation>
362362
</message>
@@ -391,12 +391,12 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
391391
<translation type="unfinished"></translation>
392392
</message>
393393
<message>
394-
<location line="+46"/>
394+
<location line="+44"/>
395395
<source>Create a new wallet</source>
396396
<translation type="unfinished"></translation>
397397
</message>
398398
<message>
399-
<location line="+128"/>
399+
<location line="+127"/>
400400
<source>&amp;Minimize</source>
401401
<translation type="unfinished"></translation>
402402
</message>
@@ -406,7 +406,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
406406
<translation type="unfinished"></translation>
407407
</message>
408408
<message>
409-
<location line="+371"/>
409+
<location line="+392"/>
410410
<source>Network activity disabled.</source>
411411
<extracomment>A substring of the tooltip.</extracomment>
412412
<translation type="unfinished"></translation>
@@ -417,12 +417,12 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
417417
<translation type="unfinished"></translation>
418418
</message>
419419
<message>
420-
<location line="-1103"/>
420+
<location line="-1109"/>
421421
<source>Send coins to a Bitcoin address</source>
422422
<translation>Send coins to a Bitcoin address</translation>
423423
</message>
424424
<message>
425-
<location line="+67"/>
425+
<location line="+53"/>
426426
<source>Backup wallet to another location</source>
427427
<translation>Backup wallet to another location</translation>
428428
</message>
@@ -432,32 +432,22 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
432432
<translation>Change the passphrase used for wallet encryption</translation>
433433
</message>
434434
<message>
435-
<location line="-70"/>
435+
<location line="-56"/>
436436
<source>&amp;Send</source>
437437
<translation>&amp;Send</translation>
438438
</message>
439439
<message>
440-
<location line="+11"/>
440+
<location line="+7"/>
441441
<source>&amp;Receive</source>
442442
<translation>&amp;Receive</translation>
443443
</message>
444444
<message>
445-
<location line="+46"/>
445+
<location line="+38"/>
446446
<source>&amp;Options…</source>
447447
<translation type="unfinished"></translation>
448448
</message>
449449
<message>
450-
<location line="+4"/>
451-
<source>&amp;Show / Hide</source>
452-
<translation>&amp;Show / Hide</translation>
453-
</message>
454-
<message>
455-
<location line="+1"/>
456-
<source>Show or hide the main Window</source>
457-
<translation>Show or hide the main Window</translation>
458-
</message>
459-
<message>
460-
<location line="+2"/>
450+
<location line="+5"/>
461451
<source>&amp;Encrypt Wallet…</source>
462452
<translation type="unfinished"></translation>
463453
</message>
@@ -522,7 +512,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
522512
<translation type="unfinished"></translation>
523513
</message>
524514
<message>
525-
<location line="+95"/>
515+
<location line="+94"/>
526516
<source>&amp;File</source>
527517
<translation>&amp;File</translation>
528518
</message>
@@ -542,7 +532,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
542532
<translation>Tabs toolbar</translation>
543533
</message>
544534
<message>
545-
<location line="+435"/>
535+
<location line="+456"/>
546536
<source>Syncing Headers (%1%)…</source>
547537
<translation type="unfinished"></translation>
548538
</message>
@@ -572,12 +562,12 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
572562
<translation type="unfinished"></translation>
573563
</message>
574564
<message>
575-
<location line="-778"/>
565+
<location line="-788"/>
576566
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
577567
<translation type="unfinished"></translation>
578568
</message>
579569
<message>
580-
<location line="+75"/>
570+
<location line="+65"/>
581571
<source>Show the list of used sending addresses and labels</source>
582572
<translation type="unfinished"></translation>
583573
</message>
@@ -592,7 +582,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
592582
<translation type="unfinished"></translation>
593583
</message>
594584
<message numerus="yes">
595-
<location line="+690"/>
585+
<location line="+710"/>
596586
<source>Processed %n block(s) of transaction history.</source>
597587
<translation>
598588
<numerusform>Processed %n block of transaction history.</numerusform>
@@ -640,7 +630,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
640630
<translation>Up to date</translation>
641631
</message>
642632
<message>
643-
<location line="-727"/>
633+
<location line="-747"/>
644634
<source>Load Partially Signed Bitcoin Transaction</source>
645635
<translation type="unfinished"></translation>
646636
</message>
@@ -715,7 +705,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
715705
<translation type="unfinished"></translation>
716706
</message>
717707
<message>
718-
<location line="+32"/>
708+
<location line="+31"/>
719709
<source>default wallet</source>
720710
<translation type="unfinished"></translation>
721711
</message>
@@ -740,12 +730,22 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
740730
<translation type="unfinished"></translation>
741731
</message>
742732
<message>
743-
<location line="+261"/>
733+
<location line="+257"/>
744734
<source>%1 client</source>
745735
<translation type="unfinished"></translation>
746736
</message>
737+
<message>
738+
<location line="+65"/>
739+
<source>&amp;Hide</source>
740+
<translation type="unfinished"></translation>
741+
</message>
742+
<message>
743+
<location line="+1"/>
744+
<source>S&amp;how</source>
745+
<translation type="unfinished"></translation>
746+
</message>
747747
<message numerus="yes">
748-
<location line="+158"/>
748+
<location line="+117"/>
749749
<source>%n active connection(s) to Bitcoin network.</source>
750750
<extracomment>A substring of the tooltip.</extracomment>
751751
<translation type="unfinished">
@@ -1355,7 +1355,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
13551355
</message>
13561356
<message>
13571357
<location line="+162"/>
1358-
<source>%1 GB of free space available</source>
1358+
<source>%1 GB of space available</source>
13591359
<translation type="unfinished"></translation>
13601360
</message>
13611361
<message>
@@ -2137,7 +2137,7 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
21372137
<translation type="unfinished"></translation>
21382138
</message>
21392139
<message>
2140-
<location filename="../psbtoperationsdialog.cpp" line="+58"/>
2140+
<location filename="../psbtoperationsdialog.cpp" line="+61"/>
21412141
<source>Failed to load transaction: %1</source>
21422142
<translation type="unfinished"></translation>
21432143
</message>
@@ -2389,7 +2389,7 @@ If you are receiving this error you should request the merchant provide a BIP21
23892389
<translation type="unfinished">Amount</translation>
23902390
</message>
23912391
<message>
2392-
<location filename="../guiutil.cpp" line="+122"/>
2392+
<location filename="../guiutil.cpp" line="+127"/>
23932393
<source>Enter a Bitcoin address (e.g. %1)</source>
23942394
<translation type="unfinished"></translation>
23952395
</message>
@@ -2556,7 +2556,7 @@ If you are receiving this error you should request the merchant provide a BIP21
25562556
<translation type="unfinished"></translation>
25572557
</message>
25582558
<message>
2559-
<location filename="../bitcoin.cpp" line="-272"/>
2559+
<location filename="../bitcoin.cpp" line="-276"/>
25602560
<source>Do you want to reset settings to default values, or to abort without making changes?</source>
25612561
<extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
25622562
<translation type="unfinished"></translation>
@@ -2568,7 +2568,7 @@ If you are receiving this error you should request the merchant provide a BIP21
25682568
<translation type="unfinished"></translation>
25692569
</message>
25702570
<message>
2571-
<location line="+359"/>
2571+
<location line="+373"/>
25722572
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
25732573
<translation type="unfinished"></translation>
25742574
</message>
@@ -2791,7 +2791,7 @@ If you are receiving this error you should request the merchant provide a BIP21
27912791
</message>
27922792
<message>
27932793
<location line="+68"/>
2794-
<location filename="../rpcconsole.cpp" line="+1158"/>
2794+
<location filename="../rpcconsole.cpp" line="+1160"/>
27952795
<source>Select a peer to view detailed information.</source>
27962796
<translation type="unfinished"></translation>
27972797
</message>
@@ -3470,7 +3470,7 @@ For more information on using this console, type %6.
34703470
<name>SendCoinsDialog</name>
34713471
<message>
34723472
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
3473-
<location filename="../sendcoinsdialog.cpp" line="+749"/>
3473+
<location filename="../sendcoinsdialog.cpp" line="+752"/>
34743474
<source>Send Coins</source>
34753475
<translation>Send Coins</translation>
34763476
</message>
@@ -4266,7 +4266,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee rate of &quot;100
42664266
<context>
42674267
<name>TrafficGraphWidget</name>
42684268
<message>
4269-
<location filename="../trafficgraphwidget.cpp" line="+82"/>
4269+
<location filename="../trafficgraphwidget.cpp" line="+79"/>
42704270
<source>kB/s</source>
42714271
<translation type="unfinished"></translation>
42724272
</message>
@@ -4872,7 +4872,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee rate of &quot;100
48724872
<context>
48734873
<name>WalletFrame</name>
48744874
<message>
4875-
<location filename="../walletframe.cpp" line="+42"/>
4875+
<location filename="../walletframe.cpp" line="+45"/>
48764876
<source>No wallet has been loaded.
48774877
Go to File &gt; Open Wallet to load a wallet.
48784878
- OR -</source>
@@ -5042,7 +5042,7 @@ Go to File &gt; Open Wallet to load a wallet.
50425042
<translation type="unfinished"></translation>
50435043
</message>
50445044
<message>
5045-
<location line="+35"/>
5045+
<location line="+37"/>
50465046
<source>Cancel</source>
50475047
<translation type="unfinished"></translation>
50485048
</message>
@@ -5190,12 +5190,7 @@ Go to File &gt; Open Wallet to load a wallet.
51905190
<translation type="unfinished"></translation>
51915191
</message>
51925192
<message>
5193-
<location line="+3"/>
5194-
<source>The -txindex upgrade started by a previous version can not be completed. Restart with the previous version or run a full -reindex.</source>
5195-
<translation type="unfinished"></translation>
5196-
</message>
5197-
<message>
5198-
<location line="+3"/>
5193+
<location line="+6"/>
51995194
<source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
52005195
<translation type="unfinished"></translation>
52015196
</message>
@@ -5310,12 +5305,12 @@ Go to File &gt; Open Wallet to load a wallet.
53105305
<translation type="unfinished"></translation>
53115306
</message>
53125307
<message>
5313-
<location line="+1"/>
5314-
<source>Change index out of range</source>
5308+
<location line="-58"/>
5309+
<source>The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.</source>
53155310
<translation type="unfinished"></translation>
53165311
</message>
53175312
<message>
5318-
<location line="+1"/>
5313+
<location line="+59"/>
53195314
<source>Config setting for %s only applied on %s network when in [%s] section.</source>
53205315
<translation type="unfinished"></translation>
53215316
</message>
@@ -5749,6 +5744,11 @@ Go to File &gt; Open Wallet to load a wallet.
57495744
<source>Transaction amounts must not be negative</source>
57505745
<translation type="unfinished"></translation>
57515746
</message>
5747+
<message>
5748+
<location line="+1"/>
5749+
<source>Transaction change output index out of range</source>
5750+
<translation type="unfinished"></translation>
5751+
</message>
57525752
<message>
57535753
<location line="+1"/>
57545754
<source>Transaction has too long of a mempool chain</source>
@@ -5865,7 +5865,7 @@ Go to File &gt; Open Wallet to load a wallet.
58655865
<translation type="unfinished"></translation>
58665866
</message>
58675867
<message>
5868-
<location filename="../bitcoin.cpp" line="-482"/>
5868+
<location filename="../bitcoin.cpp" line="-496"/>
58695869
<source>Settings file could not be read</source>
58705870
<translation type="unfinished"></translation>
58715871
</message>

0 commit comments

Comments
 (0)