Skip to content

Commit facf3e7

Browse files
author
MarcoFalke
committed
[qt] make translate 
1 parent fae26e8 commit facf3e7

File tree

2 files changed

+89
-25
lines changed

2 files changed

+89
-25
lines changed

‎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>
@@ -3829,7 +3857,7 @@
38293857
<context>
38303858
<name>bitcoin-core</name>
38313859
<message>
3832-
<location filename="../bitcoinstrings.cpp" line="+292"/>
3860+
<location filename="../bitcoinstrings.cpp" line="+302"/>
38333861
<source>Options:</source>
38343862
<translation>Options:</translation>
38353863
</message>
@@ -3849,12 +3877,12 @@
38493877
<translation>Specify your own public address</translation>
38503878
</message>
38513879
<message>
3852-
<location line="-107"/>
3880+
<location line="-108"/>
38533881
<source>Accept command line and JSON-RPC commands</source>
38543882
<translation>Accept command line and JSON-RPC commands</translation>
38553883
</message>
38563884
<message>
3857-
<location line="-196"/>
3885+
<location line="-205"/>
38583886
<source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
38593887
<translation type="unfinished"></translation>
38603888
</message>
@@ -3894,7 +3922,7 @@
38943922
<translation type="unfinished"></translation>
38953923
</message>
38963924
<message>
3897-
<location line="+117"/>
3925+
<location line="+127"/>
38983926
<source>Error: A fatal internal error occurred, see debug.log for details</source>
38993927
<translation type="unfinished"></translation>
39003928
</message>
@@ -3919,7 +3947,7 @@
39193947
<translation type="unfinished"></translation>
39203948
</message>
39213949
<message>
3922-
<location line="-334"/>
3950+
<location line="-344"/>
39233951
<source>Bitcoin Core</source>
39243952
<translation type="unfinished">Bitcoin Core</translation>
39253953
</message>
@@ -3999,7 +4027,12 @@
39994027
<translation type="unfinished"></translation>
40004028
</message>
40014029
<message>
4002-
<location line="+19"/>
4030+
<location line="+7"/>
4031+
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
4032+
<translation type="unfinished"></translation>
4033+
</message>
4034+
<message>
4035+
<location line="+15"/>
40034036
<source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
40044037
<translation type="unfinished"></translation>
40054038
</message>
@@ -4014,7 +4047,17 @@
40144047
<translation type="unfinished"></translation>
40154048
</message>
40164049
<message>
4017-
<location line="+19"/>
4050+
<location line="+3"/>
4051+
<source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
4052+
<translation type="unfinished"></translation>
4053+
</message>
4054+
<message>
4055+
<location line="+10"/>
4056+
<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>
4057+
<translation type="unfinished"></translation>
4058+
</message>
4059+
<message>
4060+
<location line="+12"/>
40184061
<source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
40194062
<translation type="unfinished"></translation>
40204063
</message>
@@ -4055,6 +4098,11 @@
40554098
</message>
40564099
<message>
40574100
<location line="+2"/>
4101+
<source>Chain selection options:</source>
4102+
<translation type="unfinished"></translation>
4103+
</message>
4104+
<message>
4105+
<location line="+1"/>
40584106
<source>Change index out of range</source>
40594107
<translation type="unfinished"></translation>
40604108
</message>
@@ -4298,6 +4346,11 @@
42984346
<source>Use UPnP to map the listening port (default: %u)</source>
42994347
<translation type="unfinished"></translation>
43004348
</message>
4349+
<message>
4350+
<location line="+1"/>
4351+
<source>Use the test chain</source>
4352+
<translation type="unfinished"></translation>
4353+
</message>
43014354
<message>
43024355
<location line="+1"/>
43034356
<source>User Agent comment (%s) contains unsafe characters.</source>
@@ -4334,7 +4387,7 @@
43344387
<translation type="unfinished"></translation>
43354388
</message>
43364389
<message>
4337-
<location line="-331"/>
4390+
<location line="-342"/>
43384391
<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>
43394392
<translation type="unfinished"></translation>
43404393
</message>
@@ -4404,12 +4457,12 @@
44044457
<translation type="unfinished"></translation>
44054458
</message>
44064459
<message>
4407-
<location line="+25"/>
4460+
<location line="+28"/>
44084461
<source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
44094462
<translation type="unfinished"></translation>
44104463
</message>
44114464
<message>
4412-
<location line="+23"/>
4465+
<location line="+29"/>
44134466
<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>
44144467
<translation type="unfinished"></translation>
44154468
</message>
@@ -4434,7 +4487,7 @@
44344487
<translation type="unfinished"></translation>
44354488
</message>
44364489
<message>
4437-
<location line="+6"/>
4490+
<location line="+7"/>
44384491
<source>Connect through SOCKS5 proxy</source>
44394492
<translation type="unfinished"></translation>
44404493
</message>
@@ -4564,7 +4617,7 @@
45644617
<translation type="unfinished"></translation>
45654618
</message>
45664619
<message>
4567-
<location line="+3"/>
4620+
<location line="+4"/>
45684621
<source>Username for JSON-RPC connections</source>
45694622
<translation>Username for JSON-RPC connections</translation>
45704623
</message>
@@ -4594,27 +4647,27 @@
45944647
<translation type="unfinished"></translation>
45954648
</message>
45964649
<message>
4597-
<location line="-72"/>
4650+
<location line="-73"/>
45984651
<source>Password for JSON-RPC connections</source>
45994652
<translation>Password for JSON-RPC connections</translation>
46004653
</message>
46014654
<message>
4602-
<location line="-216"/>
4655+
<location line="-226"/>
46034656
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
46044657
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
46054658
</message>
46064659
<message>
4607-
<location line="+145"/>
4660+
<location line="+154"/>
46084661
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
46094662
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
46104663
</message>
46114664
<message>
4612-
<location line="+57"/>
4665+
<location line="+58"/>
46134666
<source>Loading addresses...</source>
46144667
<translation>Loading addresses...</translation>
46154668
</message>
46164669
<message>
4617-
<location line="-265"/>
4670+
<location line="-275"/>
46184671
<source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
46194672
<translation type="unfinished"></translation>
46204673
</message>
@@ -4679,7 +4732,7 @@
46794732
<translation type="unfinished"></translation>
46804733
</message>
46814734
<message>
4682-
<location line="+9"/>
4735+
<location line="+12"/>
46834736
<source>This is the transaction fee you may pay when fee estimates are not available.</source>
46844737
<translation type="unfinished"></translation>
46854738
</message>
@@ -4719,7 +4772,7 @@
47194772
<translation type="unfinished"></translation>
47204773
</message>
47214774
<message>
4722-
<location line="+7"/>
4775+
<location line="+10"/>
47234776
<source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
47244777
<translation type="unfinished"></translation>
47254778
</message>
@@ -4729,7 +4782,7 @@
47294782
<translation type="unfinished"></translation>
47304783
</message>
47314784
<message>
4732-
<location line="+4"/>
4785+
<location line="+7"/>
47334786
<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>
47344787
<translation type="unfinished"></translation>
47354788
</message>
@@ -4749,7 +4802,7 @@
47494802
<translation type="unfinished"></translation>
47504803
</message>
47514804
<message>
4752-
<location line="+37"/>
4805+
<location line="+38"/>
47534806
<source>How many blocks to check at startup (default: %u, 0 = all)</source>
47544807
<translation type="unfinished"></translation>
47554808
</message>
@@ -4909,17 +4962,17 @@
49094962
<translation>Loading block index...</translation>
49104963
</message>
49114964
<message>
4912-
<location line="-60"/>
4965+
<location line="-61"/>
49134966
<source>Add a node to connect to and attempt to keep the connection open</source>
49144967
<translation>Add a node to connect to and attempt to keep the connection open</translation>
49154968
</message>
49164969
<message>
4917-
<location line="+61"/>
4970+
<location line="+62"/>
49184971
<source>Loading wallet...</source>
49194972
<translation>Loading wallet...</translation>
49204973
</message>
49214974
<message>
4922-
<location line="-54"/>
4975+
<location line="-55"/>
49234976
<source>Cannot downgrade wallet</source>
49244977
<translation>Cannot downgrade wallet</translation>
49254978
</message>
@@ -4929,7 +4982,7 @@
49294982
<translation>Cannot write default address</translation>
49304983
</message>
49314984
<message>
4932-
<location line="+77"/>
4985+
<location line="+78"/>
49334986
<source>Rescanning...</source>
49344987
<translation>Rescanning...</translation>
49354988
</message>

0 commit comments

Comments
 (0)