Skip to content

Commit

Permalink
trivial: Merge pruning help message after Transifex comment
Browse files Browse the repository at this point in the history 
The prune help message was broken in nonsensical parts. Merge it into
one, this is easier for translators.

Reported by yahoe.001 on transifex.
  • Loading branch information
@laanwj
laanwj committed May 4, 2015
1 parent 3e2559c commit fc44231
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 62 deletions.
8 changes: 3 additions & 5 deletions src/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,9 @@ std::string HelpMessage(HelpMessageMode mode)
#ifndef WIN32
strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), "bitcoind.pid"));
#endif
strUsage += HelpMessageOpt("-prune=<n>", _("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,") + " " +
strprintf(_(">%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));
strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup"));
strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("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, >%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));

#if !defined(WIN32)
strUsage += HelpMessageOpt("-sysperms", _("Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)"));
Expand Down
12 changes: 5 additions & 7 deletions src/qt/bitcoinstrings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"isolation (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Reduce storage requirements by pruning (deleting) old blocks. This mode "
"disables wallet support and is incompatible with -txindex."),
"disables wallet support and is incompatible with -txindex. Warning: "
"Reverting this setting requires re-downloading the entire blockchain. "
"(default: 0 = disable pruning blocks, >%u = target size in MiB to use for "
"block files)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Require high priority for relaying free or low-fee transactions (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
Expand Down Expand Up @@ -158,9 +161,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Please check that your computer's date and time are correct! If "
"your clock is wrong Bitcoin Core will not work properly."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Reverting this setting requires re-downloading the entire "
"blockchain."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: The network does not appear to fully agree! Some miners appear to "
"be experiencing issues."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
Expand All @@ -184,14 +184,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"mode. This will redownload the entire blockchain"),
QT_TRANSLATE_NOOP("bitcoin-core", "(default: %s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "(default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", "(default: 0 = disable pruning blocks,"),
QT_TRANSLATE_NOOP("bitcoin-core", "(default: 1)"),
QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"),
QT_TRANSLATE_NOOP("bitcoin-core", ">%u = target size in MiB to use for block files)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Accept public REST requests (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Acceptable ciphers (default: %s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Activating best chain..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"),
QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"),
QT_TRANSLATE_NOOP("bitcoin-core", "Allow self signed root certificates (default: 0)"),
Expand Down Expand Up @@ -276,7 +275,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"),
QT_TRANSLATE_NOOP("bitcoin-core", "RPC support for HTTP persistent connections (default: %d)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Randomly drop 1 of every <n> network messages"),
QT_TRANSLATE_NOOP("bitcoin-core", "Randomly fuzz 1 of every <n> network messages"),
QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"),
QT_TRANSLATE_NOOP("bitcoin-core", "Relay and mine data carrier transactions (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Relay non-P2SH multisig (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"),
Expand Down
85 changes: 35 additions & 50 deletions src/qt/locale/bitcoin_en.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3584,22 +3584,22 @@
<context>
<name>bitcoin-core</name>
<message>
<location filename="../bitcoinstrings.cpp" line="+269"/>
<location filename="../bitcoinstrings.cpp" line="+268"/>
<source>Options:</source>
<translation>Options:</translation>
</message>
<message>
<location line="+35"/>
<location line="+34"/>
<source>Specify data directory</source>
<translation>Specify data directory</translation>
</message>
<message>
<location line="-94"/>
<location line="-93"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
</message>
<message>
<location line="+97"/>
<location line="+96"/>
<source>Specify your own public address</source>
<translation>Specify your own public address</translation>
</message>
Expand All @@ -3624,7 +3624,7 @@
<translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
</message>
<message>
<location line="-170"/>
<location line="-168"/>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
</message>
Expand Down Expand Up @@ -3664,7 +3664,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+22"/>
<location line="+15"/>
<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>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+10"/>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -3684,7 +3689,7 @@
<translation>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</translation>
</message>
<message>
<location line="+9"/>
<location line="+6"/>
<source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
<translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
</message>
Expand All @@ -3709,7 +3714,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<location line="+11"/>
<source>(default: 1)</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -3834,12 +3839,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Rebuild block chain index from current blk000??.dat files</translation>
</message>
<message>
<location line="+12"/>
<location line="+17"/>
<source>Set database cache size in megabytes (%d to %d, default: %d)</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -3894,12 +3894,12 @@
<translation>You need to rebuild the database using -reindex to change -txindex</translation>
</message>
<message>
<location line="-99"/>
<location line="-98"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Imports blocks from external blk000??.dat file</translation>
</message>
<message>
<location line="-224"/>
<location line="-223"/>
<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>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -3989,12 +3989,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<location line="+9"/>
<source>Require high priority for relaying free or low-fee transactions (default: %u)</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -4043,11 +4038,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Warning: Reverting this setting requires re-downloading the entire blockchain.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<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>
Expand All @@ -4064,22 +4054,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>(default: 0 = disable pruning blocks,</source>
<location line="+5"/>
<source>Accept public REST requests (default: %u)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>&gt;%u = target size in MiB to use for block files)</source>
<location line="+2"/>
<source>Activating best chain...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Accept public REST requests (default: %u)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Allow self signed root certificates (default: 0)</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -4209,7 +4194,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<location line="+7"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Send trace/debug info to console instead of debug.log file</translation>
</message>
Expand Down Expand Up @@ -4339,17 +4324,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat corrupt, salvage failed</translation>
</message>
<message>
<location line="-71"/>
<location line="-70"/>
<source>Password for JSON-RPC connections</source>
<translation>Password for JSON-RPC connections</translation>
</message>
<message>
<location line="-206"/>
<location line="-205"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
</message>
<message>
<location line="+259"/>
<location line="+257"/>
<source>Upgrade wallet to latest format</source>
<translation>Upgrade wallet to latest format</translation>
</message>
Expand All @@ -4369,7 +4354,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>This help message</translation>
</message>
<message>
<location line="-116"/>
<location line="-115"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
</message>
Expand All @@ -4384,7 +4369,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error loading wallet.dat: Wallet corrupted</translation>
</message>
<message>
<location line="-212"/>
<location line="-211"/>
<source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -4419,22 +4404,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+48"/>
<location line="+51"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+37"/>
<location line="+34"/>
<source>(default: %s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+7"/>
<source>Acceptable ciphers (default: %s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+5"/>
<source>Always query for peer addresses via DNS lookup (default: %u)</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -4519,7 +4504,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+8"/>
<source>Relay and mine data carrier transactions (default: %u)</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -4599,7 +4584,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
</message>
<message>
<location line="-119"/>
<location line="-118"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Cannot resolve -bind address: &apos;%s&apos;</translation>
</message>
Expand Down Expand Up @@ -4644,12 +4629,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Cannot write default address</translation>
</message>
<message>
<location line="+77"/>
<location line="+76"/>
<source>Rescanning...</source>
<translation>Rescanning...</translation>
</message>
<message>
<location line="-64"/>
<location line="-63"/>
<source>Done loading</source>
<translation>Done loading</translation>
</message>
Expand Down

0 comments on commit fc44231

Please sign in to comment.