From fc44231cb72afae2fffe0fac64e236a1d33b90e6 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 4 May 2015 18:46:33 +0200 Subject: [PATCH] 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. --- src/init.cpp | 8 ++-- src/qt/bitcoinstrings.cpp | 12 ++--- src/qt/locale/bitcoin_en.ts | 91 ++++++++++++++++--------------------- 3 files changed, 46 insertions(+), 65 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 9c3c4ddb8..a057dc3ac 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -275,11 +275,9 @@ std::string HelpMessage(HelpMessageMode mode) #ifndef WIN32 strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "bitcoind.pid")); #endif - strUsage += HelpMessageOpt("-prune=", _("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=", 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)")); diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index aeabfc424..d14343717 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -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", "" @@ -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", "" @@ -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", " 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)"), @@ -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 network messages"), QT_TRANSLATE_NOOP("bitcoin-core", "Randomly fuzz 1 of every 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"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index c581197dc..8dfef6837 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -3584,22 +3584,22 @@ bitcoin-core - + Options: Options: - + Specify data directory Specify data directory - + Connect to a node to retrieve peer addresses, and disconnect Connect to a node to retrieve peer addresses, and disconnect - + Specify your own public address Specify your own public address @@ -3624,7 +3624,7 @@ Accept connections from outside (default: 1 if no -proxy or -connect) - + Bind to given address and always listen on it. Use [host]:port notation for IPv6 Bind to given address and always listen on it. Use [host]:port notation for IPv6 @@ -3664,7 +3664,12 @@ - + + 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) + + + + Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d) @@ -3684,7 +3689,7 @@ Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. - + Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues. Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues. @@ -3709,7 +3714,7 @@ - + (default: 1) @@ -3834,12 +3839,7 @@ - - Rebuild block chain index from current blk000??.dat files - Rebuild block chain index from current blk000??.dat files - - - + Set database cache size in megabytes (%d to %d, default: %d) @@ -3894,12 +3894,12 @@ You need to rebuild the database using -reindex to change -txindex - + Imports blocks from external blk000??.dat file Imports blocks from external blk000??.dat file - + Allow JSON-RPC connections from specified source. Valid for <ip> 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 @@ -3989,12 +3989,7 @@ - - Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. - - - - + Require high priority for relaying free or low-fee transactions (default: %u) @@ -4043,11 +4038,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly. - - - Warning: Reverting this setting requires re-downloading the entire blockchain. - - 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 @@ -4064,22 +4054,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - (default: 0 = disable pruning blocks, - - - - - >%u = target size in MiB to use for block files) - - - - + Accept public REST requests (default: %u) - + + Activating best chain... + + + + Allow self signed root certificates (default: 0) @@ -4209,7 +4194,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Send trace/debug info to console instead of debug.log file Send trace/debug info to console instead of debug.log file @@ -4339,17 +4324,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrupt, salvage failed - + Password for JSON-RPC connections Password for JSON-RPC connections - + Execute command when the best block changes (%s in cmd is replaced by block hash) Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Upgrade wallet to latest format @@ -4369,7 +4354,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. This help message - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect @@ -4384,7 +4369,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error loading wallet.dat: Wallet corrupted - + (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) @@ -4419,22 +4404,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) - + (default: %s) - + Acceptable ciphers (default: %s) - + Always query for peer addresses via DNS lookup (default: %u) @@ -4519,7 +4504,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Relay and mine data carrier transactions (default: %u) @@ -4599,7 +4584,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unknown network specified in -onlynet: '%s' - + Cannot resolve -bind address: '%s' Cannot resolve -bind address: '%s' @@ -4644,12 +4629,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot write default address - + Rescanning... Rescanning... - + Done loading Done loading