Skip to content

Commit fc44231

Browse files
laanwjlaanwj
committed
trivial: Merge pruning help message after Transifex comment
The prune help message was broken in nonsensical parts. Merge it into one, this is easier for translators. Reported by yahoe.001 on transifex.
1 parent 3e2559c commit fc44231

File tree

3 files changed

+43
-62
lines changed

3 files changed

+43
-62
lines changed

‎src/init.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,9 @@ std::string HelpMessage(HelpMessageMode mode)
275275
#ifndef WIN32
276276
strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), "bitcoind.pid"));
277277
#endif
278-
strUsage += HelpMessageOpt("-prune=<n>", _("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex.") + " " +
279-
_("Warning: Reverting this setting requires re-downloading the entire blockchain.") + " " +
280-
_("(default: 0 = disable pruning blocks,") + " " +
281-
strprintf(_(">%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));
282-
strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup"));
278+
strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. "
279+
"Warning: Reverting this setting requires re-downloading the entire blockchain. "
280+
"(default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));
283281

284282
#if !defined(WIN32)
285283
strUsage += HelpMessageOpt("-sysperms", _("Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)"));

‎src/qt/bitcoinstrings.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
109109
"isolation (default: %u)"),
110110
QT_TRANSLATE_NOOP("bitcoin-core", ""
111111
"Reduce storage requirements by pruning (deleting) old blocks. This mode "
112-
"disables wallet support and is incompatible with -txindex."),
112+
"disables wallet support and is incompatible with -txindex. Warning: "
113+
"Reverting this setting requires re-downloading the entire blockchain. "
114+
"(default: 0 = disable pruning blocks, >%u = target size in MiB to use for "
115+
"block files)"),
113116
QT_TRANSLATE_NOOP("bitcoin-core", ""
114117
"Require high priority for relaying free or low-fee transactions (default: %u)"),
115118
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -158,9 +161,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
158161
"Warning: Please check that your computer's date and time are correct! If "
159162
"your clock is wrong Bitcoin Core will not work properly."),
160163
QT_TRANSLATE_NOOP("bitcoin-core", ""
161-
"Warning: Reverting this setting requires re-downloading the entire "
162-
"blockchain."),
163-
QT_TRANSLATE_NOOP("bitcoin-core", ""
164164
"Warning: The network does not appear to fully agree! Some miners appear to "
165165
"be experiencing issues."),
166166
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -184,14 +184,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
184184
"mode. This will redownload the entire blockchain"),
185185
QT_TRANSLATE_NOOP("bitcoin-core", "(default: %s)"),
186186
QT_TRANSLATE_NOOP("bitcoin-core", "(default: %u)"),
187-
QT_TRANSLATE_NOOP("bitcoin-core", "(default: 0 = disable pruning blocks,"),
188187
QT_TRANSLATE_NOOP("bitcoin-core", "(default: 1)"),
189188
QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"),
190-
QT_TRANSLATE_NOOP("bitcoin-core", ">%u = target size in MiB to use for block files)"),
191189
QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
192190
QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"),
193191
QT_TRANSLATE_NOOP("bitcoin-core", "Accept public REST requests (default: %u)"),
194192
QT_TRANSLATE_NOOP("bitcoin-core", "Acceptable ciphers (default: %s)"),
193+
QT_TRANSLATE_NOOP("bitcoin-core", "Activating best chain..."),
195194
QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"),
196195
QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"),
197196
QT_TRANSLATE_NOOP("bitcoin-core", "Allow self signed root certificates (default: 0)"),
@@ -276,7 +275,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"),
276275
QT_TRANSLATE_NOOP("bitcoin-core", "RPC support for HTTP persistent connections (default: %d)"),
277276
QT_TRANSLATE_NOOP("bitcoin-core", "Randomly drop 1 of every <n> network messages"),
278277
QT_TRANSLATE_NOOP("bitcoin-core", "Randomly fuzz 1 of every <n> network messages"),
279-
QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"),
280278
QT_TRANSLATE_NOOP("bitcoin-core", "Relay and mine data carrier transactions (default: %u)"),
281279
QT_TRANSLATE_NOOP("bitcoin-core", "Relay non-P2SH multisig (default: %u)"),
282280
QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"),

‎src/qt/locale/bitcoin_en.ts

Lines changed: 35 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3584,22 +3584,22 @@
35843584
<context>
35853585
<name>bitcoin-core</name>
35863586
<message>
3587-
<location filename="../bitcoinstrings.cpp" line="+269"/>
3587+
<location filename="../bitcoinstrings.cpp" line="+268"/>
35883588
<source>Options:</source>
35893589
<translation>Options:</translation>
35903590
</message>
35913591
<message>
3592-
<location line="+35"/>
3592+
<location line="+34"/>
35933593
<source>Specify data directory</source>
35943594
<translation>Specify data directory</translation>
35953595
</message>
35963596
<message>
3597-
<location line="-94"/>
3597+
<location line="-93"/>
35983598
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
35993599
<translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
36003600
</message>
36013601
<message>
3602-
<location line="+97"/>
3602+
<location line="+96"/>
36033603
<source>Specify your own public address</source>
36043604
<translation>Specify your own public address</translation>
36053605
</message>
@@ -3624,7 +3624,7 @@
36243624
<translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
36253625
</message>
36263626
<message>
3627-
<location line="-170"/>
3627+
<location line="-168"/>
36283628
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
36293629
<translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
36303630
</message>
@@ -3664,7 +3664,12 @@
36643664
<translation type="unfinished"></translation>
36653665
</message>
36663666
<message>
3667-
<location line="+22"/>
3667+
<location line="+15"/>
3668+
<source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
3669+
<translation type="unfinished"></translation>
3670+
</message>
3671+
<message>
3672+
<location line="+10"/>
36683673
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
36693674
<translation type="unfinished"></translation>
36703675
</message>
@@ -3684,7 +3689,7 @@
36843689
<translation>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</translation>
36853690
</message>
36863691
<message>
3687-
<location line="+9"/>
3692+
<location line="+6"/>
36883693
<source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
36893694
<translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
36903695
</message>
@@ -3709,7 +3714,7 @@
37093714
<translation type="unfinished"></translation>
37103715
</message>
37113716
<message>
3712-
<location line="+12"/>
3717+
<location line="+11"/>
37133718
<source>(default: 1)</source>
37143719
<translation type="unfinished"></translation>
37153720
</message>
@@ -3834,12 +3839,7 @@
38343839
<translation type="unfinished"></translation>
38353840
</message>
38363841
<message>
3837-
<location line="+6"/>
3838-
<source>Rebuild block chain index from current blk000??.dat files</source>
3839-
<translation>Rebuild block chain index from current blk000??.dat files</translation>
3840-
</message>
3841-
<message>
3842-
<location line="+12"/>
3842+
<location line="+17"/>
38433843
<source>Set database cache size in megabytes (%d to %d, default: %d)</source>
38443844
<translation type="unfinished"></translation>
38453845
</message>
@@ -3894,12 +3894,12 @@
38943894
<translation>You need to rebuild the database using -reindex to change -txindex</translation>
38953895
</message>
38963896
<message>
3897-
<location line="-99"/>
3897+
<location line="-98"/>
38983898
<source>Imports blocks from external blk000??.dat file</source>
38993899
<translation>Imports blocks from external blk000??.dat file</translation>
39003900
</message>
39013901
<message>
3902-
<location line="-224"/>
3902+
<location line="-223"/>
39033903
<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>
39043904
<translation type="unfinished"></translation>
39053905
</message>
@@ -3989,12 +3989,7 @@
39893989
<translation type="unfinished"></translation>
39903990
</message>
39913991
<message>
3992-
<location line="+3"/>
3993-
<source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex.</source>
3994-
<translation type="unfinished"></translation>
3995-
</message>
3996-
<message>
3997-
<location line="+3"/>
3992+
<location line="+9"/>
39983993
<source>Require high priority for relaying free or low-fee transactions (default: %u)</source>
39993994
<translation type="unfinished"></translation>
40003995
</message>
@@ -4043,11 +4038,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
40434038
<source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
40444039
<translation type="unfinished"></translation>
40454040
</message>
4046-
<message>
4047-
<location line="+3"/>
4048-
<source>Warning: Reverting this setting requires re-downloading the entire blockchain.</source>
4049-
<translation type="unfinished"></translation>
4050-
</message>
40514041
<message>
40524042
<location line="+19"/>
40534043
<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>
@@ -4064,22 +4054,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
40644054
<translation type="unfinished"></translation>
40654055
</message>
40664056
<message>
4067-
<location line="+1"/>
4068-
<source>(default: 0 = disable pruning blocks,</source>
4057+
<location line="+5"/>
4058+
<source>Accept public REST requests (default: %u)</source>
40694059
<translation type="unfinished"></translation>
40704060
</message>
40714061
<message>
4072-
<location line="+3"/>
4073-
<source>&gt;%u = target size in MiB to use for block files)</source>
4062+
<location line="+2"/>
4063+
<source>Activating best chain...</source>
40744064
<translation type="unfinished"></translation>
40754065
</message>
40764066
<message>
40774067
<location line="+3"/>
4078-
<source>Accept public REST requests (default: %u)</source>
4079-
<translation type="unfinished"></translation>
4080-
</message>
4081-
<message>
4082-
<location line="+4"/>
40834068
<source>Allow self signed root certificates (default: 0)</source>
40844069
<translation type="unfinished"></translation>
40854070
</message>
@@ -4209,7 +4194,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
42094194
<translation type="unfinished"></translation>
42104195
</message>
42114196
<message>
4212-
<location line="+8"/>
4197+
<location line="+7"/>
42134198
<source>Send trace/debug info to console instead of debug.log file</source>
42144199
<translation>Send trace/debug info to console instead of debug.log file</translation>
42154200
</message>
@@ -4339,17 +4324,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
43394324
<translation>wallet.dat corrupt, salvage failed</translation>
43404325
</message>
43414326
<message>
4342-
<location line="-71"/>
4327+
<location line="-70"/>
43434328
<source>Password for JSON-RPC connections</source>
43444329
<translation>Password for JSON-RPC connections</translation>
43454330
</message>
43464331
<message>
4347-
<location line="-206"/>
4332+
<location line="-205"/>
43484333
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
43494334
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
43504335
</message>
43514336
<message>
4352-
<location line="+259"/>
4337+
<location line="+257"/>
43534338
<source>Upgrade wallet to latest format</source>
43544339
<translation>Upgrade wallet to latest format</translation>
43554340
</message>
@@ -4369,7 +4354,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
43694354
<translation>This help message</translation>
43704355
</message>
43714356
<message>
4372-
<location line="-116"/>
4357+
<location line="-115"/>
43734358
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
43744359
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
43754360
</message>
@@ -4384,7 +4369,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
43844369
<translation>Error loading wallet.dat: Wallet corrupted</translation>
43854370
</message>
43864371
<message>
4387-
<location line="-212"/>
4372+
<location line="-211"/>
43884373
<source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
43894374
<translation type="unfinished"></translation>
43904375
</message>
@@ -4419,22 +4404,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
44194404
<translation type="unfinished"></translation>
44204405
</message>
44214406
<message>
4422-
<location line="+48"/>
4407+
<location line="+51"/>
44234408
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
44244409
<translation type="unfinished"></translation>
44254410
</message>
44264411
<message>
4427-
<location line="+37"/>
4412+
<location line="+34"/>
44284413
<source>(default: %s)</source>
44294414
<translation type="unfinished"></translation>
44304415
</message>
44314416
<message>
4432-
<location line="+9"/>
4417+
<location line="+7"/>
44334418
<source>Acceptable ciphers (default: %s)</source>
44344419
<translation type="unfinished"></translation>
44354420
</message>
44364421
<message>
4437-
<location line="+4"/>
4422+
<location line="+5"/>
44384423
<source>Always query for peer addresses via DNS lookup (default: %u)</source>
44394424
<translation type="unfinished"></translation>
44404425
</message>
@@ -4519,7 +4504,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
45194504
<translation type="unfinished"></translation>
45204505
</message>
45214506
<message>
4522-
<location line="+9"/>
4507+
<location line="+8"/>
45234508
<source>Relay and mine data carrier transactions (default: %u)</source>
45244509
<translation type="unfinished"></translation>
45254510
</message>
@@ -4599,7 +4584,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
45994584
<translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
46004585
</message>
46014586
<message>
4602-
<location line="-119"/>
4587+
<location line="-118"/>
46034588
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
46044589
<translation>Cannot resolve -bind address: &apos;%s&apos;</translation>
46054590
</message>
@@ -4644,12 +4629,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
46444629
<translation>Cannot write default address</translation>
46454630
</message>
46464631
<message>
4647-
<location line="+77"/>
4632+
<location line="+76"/>
46484633
<source>Rescanning...</source>
46494634
<translation>Rescanning...</translation>
46504635
</message>
46514636
<message>
4652-
<location line="-64"/>
4637+
<location line="-63"/>
46534638
<source>Done loading</source>
46544639
<translation>Done loading</translation>
46554640
</message>

0 commit comments

Comments
 (0)