Skip to content

Commit 123ea73

Browse files
laanwjlaanwj
committed
Merge #9457: [qt] Select more files for translation
facf3e7 [qt] `make translate` (MarcoFalke) fae26e8 [qt] Add more sources to translate (MarcoFalke)
2 parents df1ab5b + facf3e7 commit 123ea73

File tree

3 files changed

+91
-27
lines changed

3 files changed

+91
-27
lines changed

‎src/Makefile.qt.include

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,11 @@ QT_QM=$(QT_TS:.ts=.qm)
414414

415415
SECONDARY: $(QT_QM)
416416

417-
$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
417+
$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES)
418418
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
419419
$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
420420

421-
translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
421+
translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/bitcoin.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
422422
@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
423423
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/bitcoin_en.ts
424424

‎src/qt/bitcoinstrings.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
157157
QT_TRANSLATE_NOOP("bitcoin-core", ""
158158
"The transaction amount is too small to send after the fee has been deducted"),
159159
QT_TRANSLATE_NOOP("bitcoin-core", ""
160+
"This is a pre-release test build - use at your own risk - do not use for "
161+
"mining or merchant applications"),
162+
QT_TRANSLATE_NOOP("bitcoin-core", ""
160163
"This is the transaction fee you may pay when fee estimates are not available."),
161164
QT_TRANSLATE_NOOP("bitcoin-core", ""
162165
"This product includes software developed by the OpenSSL Project for use in "
@@ -193,13 +196,19 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
193196
"Wallet will not create transactions that violate mempool chain limits "
194197
"(default: %u)"),
195198
QT_TRANSLATE_NOOP("bitcoin-core", ""
199+
"Warning: The network does not appear to fully agree! Some miners appear to "
200+
"be experiencing issues."),
201+
QT_TRANSLATE_NOOP("bitcoin-core", ""
196202
"Warning: Unknown block versions being mined! It's possible unknown rules are "
197203
"in effect"),
198204
QT_TRANSLATE_NOOP("bitcoin-core", ""
199205
"Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; "
200206
"if your balance or transactions are incorrect you should restore from a "
201207
"backup."),
202208
QT_TRANSLATE_NOOP("bitcoin-core", ""
209+
"Warning: We do not appear to fully agree with our peers! You may need to "
210+
"upgrade, or other nodes may need to upgrade."),
211+
QT_TRANSLATE_NOOP("bitcoin-core", ""
203212
"Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR "
204213
"notated network (e.g. 1.2.3.0/24). Can be specified multiple times."),
205214
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -228,6 +237,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"),
228237
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
229238
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
230239
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
240+
QT_TRANSLATE_NOOP("bitcoin-core", "Chain selection options:"),
231241
QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
232242
QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"),
233243
QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
@@ -350,6 +360,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use -
350360
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -tor found, use -onion."),
351361
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format on startup"),
352362
QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: %u)"),
363+
QT_TRANSLATE_NOOP("bitcoin-core", "Use the test chain"),
353364
QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
354365
QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
355366
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),

‎src/qt/locale/bitcoin_en.ts

Lines changed: 78 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,11 @@
684684
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
685685
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
686686
</message>
687+
<message>
688+
<location filename="../bitcoin.cpp" line="+516"/>
689+
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
690+
<translation type="unfinished"></translation>
691+
</message>
687692
</context>
688693
<context>
689694
<name>CoinControlDialog</name>
@@ -1839,6 +1844,29 @@
18391844
<numerusform>%n years</numerusform>
18401845
</translation>
18411846
</message>
1847+
<message>
1848+
<location filename="../bitcoin.cpp" line="+172"/>
1849+
<source>%1 didn&apos;t yet exit safely...</source>
1850+
<translation type="unfinished"></translation>
1851+
</message>
1852+
</context>
1853+
<context>
1854+
<name>QObject::QObject</name>
1855+
<message>
1856+
<location line="-81"/>
1857+
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
1858+
<translation type="unfinished"></translation>
1859+
</message>
1860+
<message>
1861+
<location line="+7"/>
1862+
<source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
1863+
<translation type="unfinished"></translation>
1864+
</message>
1865+
<message>
1866+
<location line="+14"/>
1867+
<source>Error: %1</source>
1868+
<translation type="unfinished"></translation>
1869+
</message>
18421870
</context>
18431871
<context>
18441872
<name>QRImageWidget</name>
@@ -3824,7 +3852,7 @@
38243852
<context>
38253853
<name>bitcoin-core</name>
38263854
<message>
3827-
<location filename="../bitcoinstrings.cpp" line="+292"/>
3855+
<location filename="../bitcoinstrings.cpp" line="+302"/>
38283856
<source>Options:</source>
38293857
<translation>Options:</translation>
38303858
</message>
@@ -3844,12 +3872,12 @@
38443872
<translation>Specify your own public address</translation>
38453873
</message>
38463874
<message>
3847-
<location line="-107"/>
3875+
<location line="-108"/>
38483876
<source>Accept command line and JSON-RPC commands</source>
38493877
<translation>Accept command line and JSON-RPC commands</translation>
38503878
</message>
38513879
<message>
3852-
<location line="-196"/>
3880+
<location line="-205"/>
38533881
<source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
38543882
<translation type="unfinished"></translation>
38553883
</message>
@@ -3889,7 +3917,7 @@
38893917
<translation type="unfinished"></translation>
38903918
</message>
38913919
<message>
3892-
<location line="+117"/>
3920+
<location line="+127"/>
38933921
<source>Error: A fatal internal error occurred, see debug.log for details</source>
38943922
<translation type="unfinished"></translation>
38953923
</message>
@@ -3914,7 +3942,7 @@
39143942
<translation type="unfinished"></translation>
39153943
</message>
39163944
<message>
3917-
<location line="-334"/>
3945+
<location line="-344"/>
39183946
<source>Bitcoin Core</source>
39193947
<translation type="unfinished">Bitcoin Core</translation>
39203948
</message>
@@ -3994,7 +4022,12 @@
39944022
<translation type="unfinished"></translation>
39954023
</message>
39964024
<message>
3997-
<location line="+19"/>
4025+
<location line="+7"/>
4026+
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
4027+
<translation type="unfinished"></translation>
4028+
</message>
4029+
<message>
4030+
<location line="+15"/>
39984031
<source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
39994032
<translation type="unfinished"></translation>
40004033
</message>
@@ -4009,7 +4042,17 @@
40094042
<translation type="unfinished"></translation>
40104043
</message>
40114044
<message>
4012-
<location line="+19"/>
4045+
<location line="+3"/>
4046+
<source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
4047+
<translation type="unfinished"></translation>
4048+
</message>
4049+
<message>
4050+
<location line="+10"/>
4051+
<source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
4052+
<translation type="unfinished"></translation>
4053+
</message>
4054+
<message>
4055+
<location line="+12"/>
40134056
<source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
40144057
<translation type="unfinished"></translation>
40154058
</message>
@@ -4050,6 +4093,11 @@
40504093
</message>
40514094
<message>
40524095
<location line="+2"/>
4096+
<source>Chain selection options:</source>
4097+
<translation type="unfinished"></translation>
4098+
</message>
4099+
<message>
4100+
<location line="+1"/>
40534101
<source>Change index out of range</source>
40544102
<translation type="unfinished"></translation>
40554103
</message>
@@ -4293,6 +4341,11 @@
42934341
<source>Use UPnP to map the listening port (default: %u)</source>
42944342
<translation type="unfinished"></translation>
42954343
</message>
4344+
<message>
4345+
<location line="+1"/>
4346+
<source>Use the test chain</source>
4347+
<translation type="unfinished"></translation>
4348+
</message>
42964349
<message>
42974350
<location line="+1"/>
42984351
<source>User Agent comment (%s) contains unsafe characters.</source>
@@ -4329,7 +4382,7 @@
43294382
<translation type="unfinished"></translation>
43304383
</message>
43314384
<message>
4332-
<location line="-331"/>
4385+
<location line="-342"/>
43334386
<source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
43344387
<translation type="unfinished"></translation>
43354388
</message>
@@ -4399,12 +4452,12 @@
43994452
<translation type="unfinished"></translation>
44004453
</message>
44014454
<message>
4402-
<location line="+25"/>
4455+
<location line="+28"/>
44034456
<source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
44044457
<translation type="unfinished"></translation>
44054458
</message>
44064459
<message>
4407-
<location line="+23"/>
4460+
<location line="+29"/>
44084461
<source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
44094462
<translation type="unfinished"></translation>
44104463
</message>
@@ -4429,7 +4482,7 @@
44294482
<translation type="unfinished"></translation>
44304483
</message>
44314484
<message>
4432-
<location line="+6"/>
4485+
<location line="+7"/>
44334486
<source>Connect through SOCKS5 proxy</source>
44344487
<translation type="unfinished"></translation>
44354488
</message>
@@ -4559,7 +4612,7 @@
45594612
<translation type="unfinished"></translation>
45604613
</message>
45614614
<message>
4562-
<location line="+3"/>
4615+
<location line="+4"/>
45634616
<source>Username for JSON-RPC connections</source>
45644617
<translation>Username for JSON-RPC connections</translation>
45654618
</message>
@@ -4589,27 +4642,27 @@
45894642
<translation type="unfinished"></translation>
45904643
</message>
45914644
<message>
4592-
<location line="-72"/>
4645+
<location line="-73"/>
45934646
<source>Password for JSON-RPC connections</source>
45944647
<translation>Password for JSON-RPC connections</translation>
45954648
</message>
45964649
<message>
4597-
<location line="-216"/>
4650+
<location line="-226"/>
45984651
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
45994652
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
46004653
</message>
46014654
<message>
4602-
<location line="+145"/>
4655+
<location line="+154"/>
46034656
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
46044657
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
46054658
</message>
46064659
<message>
4607-
<location line="+57"/>
4660+
<location line="+58"/>
46084661
<source>Loading addresses...</source>
46094662
<translation>Loading addresses...</translation>
46104663
</message>
46114664
<message>
4612-
<location line="-265"/>
4665+
<location line="-275"/>
46134666
<source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
46144667
<translation type="unfinished"></translation>
46154668
</message>
@@ -4674,7 +4727,7 @@
46744727
<translation type="unfinished"></translation>
46754728
</message>
46764729
<message>
4677-
<location line="+9"/>
4730+
<location line="+12"/>
46784731
<source>This is the transaction fee you may pay when fee estimates are not available.</source>
46794732
<translation type="unfinished"></translation>
46804733
</message>
@@ -4714,7 +4767,7 @@
47144767
<translation type="unfinished"></translation>
47154768
</message>
47164769
<message>
4717-
<location line="+7"/>
4770+
<location line="+10"/>
47184771
<source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
47194772
<translation type="unfinished"></translation>
47204773
</message>
@@ -4724,7 +4777,7 @@
47244777
<translation type="unfinished"></translation>
47254778
</message>
47264779
<message>
4727-
<location line="+4"/>
4780+
<location line="+7"/>
47284781
<source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
47294782
<translation type="unfinished"></translation>
47304783
</message>
@@ -4744,7 +4797,7 @@
47444797
<translation type="unfinished"></translation>
47454798
</message>
47464799
<message>
4747-
<location line="+37"/>
4800+
<location line="+38"/>
47484801
<source>How many blocks to check at startup (default: %u, 0 = all)</source>
47494802
<translation type="unfinished"></translation>
47504803
</message>
@@ -4904,17 +4957,17 @@
49044957
<translation>Loading block index...</translation>
49054958
</message>
49064959
<message>
4907-
<location line="-60"/>
4960+
<location line="-61"/>
49084961
<source>Add a node to connect to and attempt to keep the connection open</source>
49094962
<translation>Add a node to connect to and attempt to keep the connection open</translation>
49104963
</message>
49114964
<message>
4912-
<location line="+61"/>
4965+
<location line="+62"/>
49134966
<source>Loading wallet...</source>
49144967
<translation>Loading wallet...</translation>
49154968
</message>
49164969
<message>
4917-
<location line="-54"/>
4970+
<location line="-55"/>
49184971
<source>Cannot downgrade wallet</source>
49194972
<translation>Cannot downgrade wallet</translation>
49204973
</message>
@@ -4924,7 +4977,7 @@
49244977
<translation>Cannot write default address</translation>
49254978
</message>
49264979
<message>
4927-
<location line="+77"/>
4980+
<location line="+78"/>
49284981
<source>Rescanning...</source>
49294982
<translation>Rescanning...</translation>
49304983
</message>

0 commit comments

Comments
 (0)