diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp --- a/src/bench/bench_bitcoin.cpp +++ b/src/bench/bench_bitcoin.cpp @@ -24,45 +24,44 @@ static const int64_t DEFAULT_PLOT_HEIGHT = 768; static void SetupBenchArgs() { - gArgs.AddArg("-?", _("Print this help message and exit"), false, + gArgs.AddArg("-?", "Print this help message and exit", false, OptionsCategory::OPTIONS); gArgs.AddArg("-list", - _("List benchmarks without executing them. Can be combined " - "with -scaling and -filter"), + "List benchmarks without executing them. Can be combined " + "with -scaling and -filter", false, OptionsCategory::OPTIONS); gArgs.AddArg( "-evals=", - strprintf( - _("Number of measurement evaluations to perform. (default: %u)"), - DEFAULT_BENCH_EVALUATIONS), + strprintf("Number of measurement evaluations to perform. (default: %u)", + DEFAULT_BENCH_EVALUATIONS), false, OptionsCategory::OPTIONS); gArgs.AddArg("-filter=", - strprintf(_("Regular expression filter to select benchmark by " - "name (default: %s)"), + strprintf("Regular expression filter to select benchmark by " + "name (default: %s)", DEFAULT_BENCH_FILTER), false, OptionsCategory::OPTIONS); gArgs.AddArg( "-scaling=", - strprintf(_("Scaling factor for benchmark's runtime (default: %u)"), + strprintf("Scaling factor for benchmark's runtime (default: %u)", DEFAULT_BENCH_SCALING), false, OptionsCategory::OPTIONS); gArgs.AddArg( "-printer=(console|plot)", - strprintf(_("Choose printer format. console: print data to console. " - "plot: Print results as HTML graph (default: %s)"), + strprintf("Choose printer format. console: print data to console. " + "plot: Print results as HTML graph (default: %s)", DEFAULT_BENCH_PRINTER), false, OptionsCategory::OPTIONS); gArgs.AddArg("-plot-plotlyurl=", - strprintf(_("URL to use for plotly.js (default: %s)"), + strprintf("URL to use for plotly.js (default: %s)", DEFAULT_PLOT_PLOTLYURL), false, OptionsCategory::OPTIONS); gArgs.AddArg( "-plot-width=", - strprintf(_("Plot width in pixel (default: %u)"), DEFAULT_PLOT_WIDTH), + strprintf("Plot width in pixel (default: %u)", DEFAULT_PLOT_WIDTH), false, OptionsCategory::OPTIONS); gArgs.AddArg( "-plot-height=", - strprintf(_("Plot height in pixel (default: %u)"), DEFAULT_PLOT_HEIGHT), + strprintf("Plot height in pixel (default: %u)", DEFAULT_PLOT_HEIGHT), false, OptionsCategory::OPTIONS); // Hidden diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -37,73 +37,70 @@ const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET); - gArgs.AddArg("-?", _("This help message"), false, OptionsCategory::OPTIONS); + gArgs.AddArg("-?", "This help message", false, OptionsCategory::OPTIONS); gArgs.AddArg("-version", "Print version and exit", false, OptionsCategory::OPTIONS); gArgs.AddArg("-conf=", - strprintf(_("Specify configuration file. Relative paths will " - "be prefixed by datadir location. (default: %s)"), + strprintf("Specify configuration file. Relative paths will be " + "prefixed by datadir location. (default: %s)", BITCOIN_CONF_FILENAME), false, OptionsCategory::OPTIONS); gArgs.AddArg("-datadir=", _("Specify data directory"), false, OptionsCategory::OPTIONS); gArgs.AddArg( "-getinfo", - _("Get general information from the remote server. Note that unlike " - "server-side RPC calls, the results of -getinfo is the result of " - "multiple non-atomic requests. Some entries in the result may " - "represent results from different states (e.g. wallet balance may be " - "as of a different block from the chain state reported)"), + "Get general information from the remote server. Note that unlike " + "server-side RPC calls, the results of -getinfo is the result of " + "multiple non-atomic requests. Some entries in the result may " + "represent results from different states (e.g. wallet balance may be " + "as of a different block from the chain state reported)", false, OptionsCategory::OPTIONS); SetupChainParamsBaseOptions(); gArgs.AddArg( "-named", - strprintf(_("Pass named instead of positional arguments (default: %s)"), + strprintf("Pass named instead of positional arguments (default: %s)", DEFAULT_NAMED), false, OptionsCategory::OPTIONS); gArgs.AddArg( "-rpcconnect=", - strprintf(_("Send commands to node running on (default: %s)"), + strprintf("Send commands to node running on (default: %s)", DEFAULT_RPCCONNECT), false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-rpccookiefile=", - _("Location of the auth cookie. Relative paths will be prefixed by a " - "net-specific datadir location. (default: data dir)"), - false, OptionsCategory::OPTIONS); + gArgs.AddArg("-rpccookiefile=", + "Location of the auth cookie. Relative paths will be prefixed " + "by a net-specific datadir location. (default: data dir)", + false, OptionsCategory::OPTIONS); gArgs.AddArg( "-rpcport=", - strprintf( - _("Connect to JSON-RPC on (default: %u or testnet: %u)"), - defaultBaseParams->RPCPort(), testnetBaseParams->RPCPort()), + strprintf("Connect to JSON-RPC on (default: %u or testnet: %u)", + defaultBaseParams->RPCPort(), testnetBaseParams->RPCPort()), false, OptionsCategory::OPTIONS); - gArgs.AddArg("-rpcwait", _("Wait for RPC server to start"), false, + gArgs.AddArg("-rpcwait", "Wait for RPC server to start", false, OptionsCategory::OPTIONS); - gArgs.AddArg("-rpcuser=", _("Username for JSON-RPC connections"), - false, OptionsCategory::OPTIONS); - gArgs.AddArg("-rpcpassword=", _("Password for JSON-RPC connections"), + gArgs.AddArg("-rpcuser=", "Username for JSON-RPC connections", false, + OptionsCategory::OPTIONS); + gArgs.AddArg("-rpcpassword=", "Password for JSON-RPC connections", false, OptionsCategory::OPTIONS); gArgs.AddArg("-rpcclienttimeout=", - strprintf(_("Timeout in seconds during HTTP requests, or 0 " - "for no timeout. (default: %d)"), + strprintf("Timeout in seconds during HTTP requests, or 0 for " + "no timeout. (default: %d)", DEFAULT_HTTP_CLIENT_TIMEOUT), false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-stdinrpcpass", - strprintf(_("Read RPC password from standard input as a single line. " - "When combined with -stdin, the first line from standard " - "input is used for the RPC password.")), - false, OptionsCategory::OPTIONS); + gArgs.AddArg("-stdinrpcpass", + strprintf("Read RPC password from standard input as a single " + "line. When combined with -stdin, the first line " + "from standard input is used for the RPC password."), + false, OptionsCategory::OPTIONS); gArgs.AddArg("-stdin", - _("Read extra arguments from standard input, one per line " - "until EOF/Ctrl-D (recommended for sensitive information " - "such as passphrases)"), + "Read extra arguments from standard input, one per line until " + "EOF/Ctrl-D (recommended for sensitive information such as " + "passphrases)", false, OptionsCategory::OPTIONS); gArgs.AddArg( "-rpcwallet=", - _("Send RPC for non-default wallet on RPC server (needs to exactly " - "match corresponding -wallet option passed to bitcoind)"), + "Send RPC for non-default wallet on RPC server (needs to exactly match " + "corresponding -wallet option passed to bitcoind)", false, OptionsCategory::OPTIONS); // Hidden @@ -471,9 +468,9 @@ } else if (response.status == HTTP_UNAUTHORIZED) { if (failedToGetAuthCookie) { throw std::runtime_error(strprintf( - _("Could not locate RPC credentials. No authentication cookie " - "could be found, and RPC password is not set. See " - "-rpcpassword and -stdinrpcpass. Configuration file: (%s)"), + "Could not locate RPC credentials. No authentication cookie " + "could be found, and RPC password is not set. See " + "-rpcpassword and -stdinrpcpass. Configuration file: (%s)", GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)) .string() .c_str())); diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -34,63 +34,61 @@ const std::function G_TRANSLATION_FUN = nullptr; static void SetupBitcoinTxArgs() { - gArgs.AddArg("-?", _("This help message"), false, OptionsCategory::OPTIONS); - gArgs.AddArg("-create", _("Create new, empty TX."), false, + gArgs.AddArg("-?", "This help message", false, OptionsCategory::OPTIONS); + gArgs.AddArg("-create", "Create new, empty TX.", false, OptionsCategory::OPTIONS); - gArgs.AddArg("-json", _("Select JSON output"), false, + gArgs.AddArg("-json", "Select JSON output", false, OptionsCategory::OPTIONS); gArgs.AddArg("-txid", - _("Output only the hex-encoded transaction id of the " - "resultant transaction."), + "Output only the hex-encoded transaction id of the resultant " + "transaction.", false, OptionsCategory::OPTIONS); SetupChainParamsBaseOptions(); - gArgs.AddArg("delin=N", _("Delete input N from TX"), false, + gArgs.AddArg("delin=N", "Delete input N from TX", false, OptionsCategory::COMMANDS); - gArgs.AddArg("delout=N", _("Delete output N from TX"), false, + gArgs.AddArg("delout=N", "Delete output N from TX", false, OptionsCategory::COMMANDS); - gArgs.AddArg("in=TXID:VOUT(:SEQUENCE_NUMBER)", _("Add input to TX"), false, + gArgs.AddArg("in=TXID:VOUT(:SEQUENCE_NUMBER)", "Add input to TX", false, OptionsCategory::COMMANDS); - gArgs.AddArg("locktime=N", _("Set TX lock time to N"), false, + gArgs.AddArg("locktime=N", "Set TX lock time to N", false, OptionsCategory::COMMANDS); - gArgs.AddArg("nversion=N", _("Set TX version to N"), false, + gArgs.AddArg("nversion=N", "Set TX version to N", false, OptionsCategory::COMMANDS); - gArgs.AddArg("outaddr=VALUE:ADDRESS", _("Add address-based output to TX"), + gArgs.AddArg("outaddr=VALUE:ADDRESS", "Add address-based output to TX", false, OptionsCategory::COMMANDS); gArgs.AddArg("outpubkey=VALUE:PUBKEY[:FLAGS]", - _("Add pay-to-pubkey output to TX") + ". " + - _("Optionally add the \"S\" flag to wrap the output in a " - "pay-to-script-hash."), - false, OptionsCategory::COMMANDS); - gArgs.AddArg("outdata=[VALUE:]DATA", _("Add data-based output to TX"), + "Add pay-to-pubkey output to TX. " + "Optionally add the \"S\" flag to wrap the output in a " + "pay-to-script-hash.", false, OptionsCategory::COMMANDS); + gArgs.AddArg("outdata=[VALUE:]DATA", "Add data-based output to TX", false, + OptionsCategory::COMMANDS); gArgs.AddArg("outscript=VALUE:SCRIPT[:FLAGS]", - _("Add raw script output to TX") + ". " + - _("Optionally add the \"S\" flag to wrap the output in a " - "pay-to-script-hash."), + "Add raw script output to TX. " + "Optionally add the \"S\" flag to wrap the output in a " + "pay-to-script-hash.", false, OptionsCategory::COMMANDS); gArgs.AddArg( "outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS]", - _("Add Pay To n-of-m Multi-sig output to TX. n = REQUIRED, m = " - "PUBKEYS") + - ". " + - _("Optionally add the \"S\" flag to wrap the output in a " - "pay-to-script-hash."), + "Add Pay To n-of-m Multi-sig output to TX. n = REQUIRED, m = PUBKEYS. " + "Optionally add the \"S\" flag to wrap the output in a " + "pay-to-script-hash.", false, OptionsCategory::COMMANDS); gArgs.AddArg("sign=SIGHASH-FLAGS", - _("Add zero or more signatures to transaction") + ". " + - _("This command requires JSON registers:") + - _("prevtxs=JSON object") + ", " + - _("privatekeys=JSON object") + ". " + - _("See signrawtransactionwithkey docs for format of " - "sighash flags, JSON objects."), + "Add zero or more signatures to transaction. " + "This command requires JSON registers:" + "prevtxs=JSON object, " + "privatekeys=JSON object. " + "See signrawtransactionwithkey docs for format of sighash " + "flags, JSON objects.", false, OptionsCategory::COMMANDS); gArgs.AddArg("load=NAME:FILENAME", - _("Load JSON file FILENAME into register NAME"), false, + "Load JSON file FILENAME into register NAME", false, OptionsCategory::REGISTER_COMMANDS); gArgs.AddArg("set=NAME:JSON-STRING", - _("Set register NAME to given JSON-STRING"), false, + "Set register NAME to given JSON-STRING", false, OptionsCategory::REGISTER_COMMANDS); // Hidden @@ -135,7 +133,6 @@ "or: bitcoin-tx [options] -create [commands] Create " "hex-encoded bitcoin transaction\n" + "\n"; - strUsage += gArgs.GetHelpMessage(); fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -76,8 +76,8 @@ SetupServerArgs(); #if HAVE_DECL_DAEMON gArgs.AddArg("-daemon", - _("Run in the background as a daemon and accept commands"), - false, OptionsCategory::OPTIONS); + "Run in the background as a daemon and accept commands", false, + OptionsCategory::OPTIONS); #endif std::string error; if (!gArgs.ParseParameters(argc, argv, error)) { diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -20,7 +20,7 @@ "which blocks can be solved instantly. This is intended for " "regression testing tools and app development.", true, OptionsCategory::CHAINPARAMS); - gArgs.AddArg("-testnet", _("Use the test chain"), false, + gArgs.AddArg("-testnet", "Use the test chain", false, OptionsCategory::CHAINPARAMS); } diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -339,48 +339,47 @@ // alphabetical ordering. Do not translate _(...) -help-debug options, Many // technical terms, and only a very small audience, so is unnecessary stress // to translators. - gArgs.AddArg("-?", _("Print this help message and exit"), false, + gArgs.AddArg("-?", "Print this help message and exit", false, OptionsCategory::OPTIONS); - gArgs.AddArg("-version", _("Print version and exit"), false, + gArgs.AddArg("-version", "Print version and exit", false, OptionsCategory::OPTIONS); gArgs.AddArg("-alertnotify=", - _("Execute command when a relevant alert is received or we " - "see a really long fork (%s in cmd is replaced by message)"), + "Execute command when a relevant alert is received or we see " + "a really long fork (%s in cmd is replaced by message)", false, OptionsCategory::OPTIONS); gArgs.AddArg( "-assumevalid=", strprintf( - _("If this block is in the chain assume that it and its ancestors " - "are valid and potentially skip their script verification (0 to " - "verify all, default: %s, testnet: %s)"), + "If this block is in the chain assume that it and its ancestors " + "are valid and potentially skip their script verification (0 to " + "verify all, default: %s, testnet: %s)", defaultChainParams->GetConsensus().defaultAssumeValid.GetHex(), testnetChainParams->GetConsensus().defaultAssumeValid.GetHex()), false, OptionsCategory::OPTIONS); gArgs.AddArg("-blocksdir=", - _("Specify directory to hold blocks subdirectory for *.dat " - "files (default: )"), + "Specify directory to hold blocks subdirectory for *.dat " + "files (default: )", false, OptionsCategory::OPTIONS); gArgs.AddArg("-blocknotify=", - _("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)", + false, OptionsCategory::OPTIONS); + gArgs.AddArg("-blockreconstructionextratxn=", + strprintf("Extra transactions to keep in memory for compact " + "block reconstructions (default: %u)", + DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN), false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-blockreconstructionextratxn=", - strprintf(_("Extra transactions to keep in memory for compact block " - "reconstructions (default: %u)"), - DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN), - false, OptionsCategory::OPTIONS); gArgs.AddArg( "-blocksonly", - strprintf(_("Whether to operate in a blocks only mode (default: %d)"), + strprintf("Whether to operate in a blocks only mode (default: %d)", DEFAULT_BLOCKSONLY), true, OptionsCategory::OPTIONS); gArgs.AddArg("-conf=", - strprintf(_("Specify configuration file. Relative paths will " - "be prefixed by datadir location. (default: %s)"), + strprintf("Specify configuration file. Relative paths will be " + "prefixed by datadir location. (default: %s)", BITCOIN_CONF_FILENAME), false, OptionsCategory::OPTIONS); - gArgs.AddArg("-datadir=", _("Specify data directory"), false, + gArgs.AddArg("-datadir=", "Specify data directory", false, OptionsCategory::OPTIONS); gArgs.AddArg( "-dbbatchsize", @@ -390,19 +389,18 @@ gArgs.AddArg( "-dbcache=", strprintf( - _("Set database cache size in megabytes (%d to %d, default: %d)"), + "Set database cache size in megabytes (%d to %d, default: %d)", nMinDbCache, nMaxDbCache, nDefaultDbCache), false, OptionsCategory::OPTIONS); gArgs.AddArg( "-debuglogfile=", - strprintf( - _("Specify location of debug log file. Relative paths will be " - "prefixed by a net-specific datadir location. (default: %s)"), - DEFAULT_DEBUGLOGFILE), + strprintf("Specify location of debug log file. Relative paths will be " + "prefixed by a net-specific datadir location. (default: %s)", + DEFAULT_DEBUGLOGFILE), false, OptionsCategory::OPTIONS); gArgs.AddArg("-feefilter", - strprintf("Tell other nodes to filter invs to us by " - "our mempool min fee (default: %d)", + strprintf("Tell other nodes to filter invs to us by our " + "mempool min fee (default: %d)", DEFAULT_FEEFILTER), true, OptionsCategory::OPTIONS); gArgs.AddArg("-finalizationdelay=", @@ -413,31 +411,30 @@ false, OptionsCategory::OPTIONS); gArgs.AddArg( "-includeconf=", - _("Specify additional configuration file, relative to the -datadir " - "path (only useable from configuration file, not command line)"), - false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-maxreorgdepth=", - strprintf("Configure at what depth blocks are considered final " - "(default: %d). Use -1 to disable.", - DEFAULT_MAX_REORG_DEPTH), + "Specify additional configuration file, relative to the -datadir path " + "(only useable from configuration file, not command line)", false, OptionsCategory::OPTIONS); + gArgs.AddArg("-maxreorgdepth=", + strprintf("Configure at what depth blocks are considered " + "final (default: %d). Use -1 to disable.", + DEFAULT_MAX_REORG_DEPTH), + false, OptionsCategory::OPTIONS); gArgs.AddArg("-loadblock=", - _("Imports blocks from external blk000??.dat file on startup"), + "Imports blocks from external blk000??.dat file on startup", false, OptionsCategory::OPTIONS); gArgs.AddArg("-maxmempool=", - strprintf(_("Keep the transaction memory pool " - "below megabytes (default: %u)"), + strprintf("Keep the transaction memory pool below " + "megabytes (default: %u)", DEFAULT_MAX_MEMPOOL_SIZE), false, OptionsCategory::OPTIONS); gArgs.AddArg("-maxorphantx=", - strprintf(_("Keep at most unconnectable " - "transactions in memory (default: %u)"), + strprintf("Keep at most unconnectable transactions in " + "memory (default: %u)", DEFAULT_MAX_ORPHAN_TRANSACTIONS), false, OptionsCategory::OPTIONS); gArgs.AddArg("-mempoolexpiry=", - strprintf(_("Do not keep transactions in the mempool " - "longer than hours (default: %u)"), + strprintf("Do not keep transactions in the mempool longer " + "than hours (default: %u)", DEFAULT_MEMPOOL_EXPIRY), false, OptionsCategory::OPTIONS); gArgs.AddArg( @@ -450,224 +447,218 @@ true, OptionsCategory::OPTIONS); gArgs.AddArg( "-par=", - strprintf(_("Set the number of script verification threads (%u to %d, " - "0 = auto, <0 = leave that many cores free, default: %d)"), + strprintf("Set the number of script verification threads (%u to %d, 0 " + "= auto, <0 = leave that many cores free, default: %d)", -GetNumCores(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS), false, OptionsCategory::OPTIONS); gArgs.AddArg("-persistmempool", - strprintf(_("Whether to save the mempool on shutdown " - "and load on restart (default: %u)"), + strprintf("Whether to save the mempool on shutdown and load " + "on restart (default: %u)", DEFAULT_PERSIST_MEMPOOL), false, OptionsCategory::OPTIONS); #ifndef WIN32 - gArgs.AddArg( - "-pid=", - strprintf(_("Specify pid file. Relative paths will be prefixed by a " - "net-specific datadir location. (default: %s)"), - BITCOIN_PID_FILENAME), - false, OptionsCategory::OPTIONS); + gArgs.AddArg("-pid=", + strprintf("Specify pid file. Relative paths will be prefixed " + "by a net-specific datadir location. (default: %s)", + BITCOIN_PID_FILENAME), + false, OptionsCategory::OPTIONS); #endif gArgs.AddArg( "-prune=", - strprintf( - _("Reduce storage requirements by enabling pruning (deleting) of " - "old blocks. This allows the pruneblockchain RPC to be called to " - "delete specific blocks, and enables automatic pruning of old " - "blocks if a target size in MiB is provided. This mode is " - "incompatible with -txindex and -rescan. " - "Warning: Reverting this setting requires re-downloading the " - "entire blockchain. " - "(default: 0 = disable pruning blocks, 1 = allow manual pruning " - "via RPC, >%u = automatically prune block files to stay under " - "the specified target size in MiB)"), - MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024), + strprintf("Reduce storage requirements by enabling pruning (deleting) " + "of old blocks. This allows the pruneblockchain RPC to be " + "called to delete specific blocks, and enables automatic " + "pruning of old blocks if a target size in MiB is provided. " + "This mode is incompatible with -txindex and -rescan. " + "Warning: Reverting this setting requires re-downloading the " + "entire blockchain. (default: 0 = disable pruning blocks, 1 " + "= allow manual pruning via RPC, >%u = automatically prune " + "block files to stay under the specified target size in MiB)", + MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024), false, OptionsCategory::OPTIONS); gArgs.AddArg("-reindex-chainstate", - _("Rebuild chain state from the currently indexed blocks"), - false, OptionsCategory::OPTIONS); - gArgs.AddArg("-reindex", - _("Rebuild chain state and block index from the blk*.dat " - "files on disk"), - false, OptionsCategory::OPTIONS); + "Rebuild chain state from the currently indexed blocks", false, + OptionsCategory::OPTIONS); + gArgs.AddArg( + "-reindex", + "Rebuild chain state and block index from the blk*.dat files on disk", + false, OptionsCategory::OPTIONS); #ifndef WIN32 gArgs.AddArg( "-sysperms", - _("Create new files with system default permissions, instead of umask " - "077 (only effective with disabled wallet functionality)"), + "Create new files with system default permissions, instead of umask " + "077 (only effective with disabled wallet functionality)", false, OptionsCategory::OPTIONS); #endif gArgs.AddArg("-txindex", - strprintf(_("Maintain a full transaction index, used by the " - "getrawtransaction rpc call (default: %d)"), + strprintf("Maintain a full transaction index, used by the " + "getrawtransaction rpc call (default: %d)", DEFAULT_TXINDEX), false, OptionsCategory::OPTIONS); gArgs.AddArg("-usecashaddr", - _("Use Cash Address for destination encoding instead " - "of base58 (activate by default on Jan, 14)"), + "Use Cash Address for destination encoding instead of base58 " + "(activate by default on Jan, 14)", false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-addnode=", - _("Add a node to connect to and attempt to keep the connection open " - "(see the `addnode` RPC command help for more info)"), - false, OptionsCategory::CONNECTION); + gArgs.AddArg("-addnode=", + "Add a node to connect to and attempt to keep the connection " + "open (see the `addnode` RPC command help for more info)", + false, OptionsCategory::CONNECTION); gArgs.AddArg( "-banscore=", - strprintf( - _("Threshold for disconnecting misbehaving peers (default: %u)"), - DEFAULT_BANSCORE_THRESHOLD), + strprintf("Threshold for disconnecting misbehaving peers (default: %u)", + DEFAULT_BANSCORE_THRESHOLD), false, OptionsCategory::CONNECTION); gArgs.AddArg("-bantime=", - strprintf(_("Number of seconds to keep misbehaving peers from " - "reconnecting (default: %u)"), + strprintf("Number of seconds to keep misbehaving peers from " + "reconnecting (default: %u)", DEFAULT_MISBEHAVING_BANTIME), false, OptionsCategory::CONNECTION); gArgs.AddArg("-bind=", - _("Bind to given address and always listen on it. Use " - "[host]:port notation for IPv6"), - false, OptionsCategory::CONNECTION); - gArgs.AddArg("-connect=", - _("Connect only to the specified node(s); -connect=0 disables " - "automatic connections (the rules for this peer are the " - "same as for -addnode)"), + "Bind to given address and always listen on it. Use " + "[host]:port notation for IPv6", false, OptionsCategory::CONNECTION); + gArgs.AddArg( + "-connect=", + "Connect only to the specified node(s); -connect=0 disables automatic " + "connections (the rules for this peer are the same as for -addnode)", + false, OptionsCategory::CONNECTION); gArgs.AddArg("-discover", - _("Discover own IP addresses (default: 1 when listening and " - "no -externalip or -proxy)"), + "Discover own IP addresses (default: 1 when listening and no " + "-externalip or -proxy)", false, OptionsCategory::CONNECTION); gArgs.AddArg("-dns", - _("Allow DNS lookups for -addnode, -seednode and -connect") + - " " + strprintf(_("(default: %d)"), DEFAULT_NAME_LOOKUP), + strprintf("Allow DNS lookups for -addnode, -seednode and " + "-connect (default: %d)", + DEFAULT_NAME_LOOKUP), false, OptionsCategory::CONNECTION); gArgs.AddArg("-dnsseed", - _("Query for peer addresses via DNS lookup, if low on " - "addresses (default: 1 unless -connect used)"), + "Query for peer addresses via DNS lookup, if low on addresses " + "(default: 1 unless -connect used)", false, OptionsCategory::CONNECTION); gArgs.AddArg("-enablebip61", - strprintf(_("Send reject messages per BIP61 (default: %u)"), + strprintf("Send reject messages per BIP61 (default: %u)", DEFAULT_ENABLE_BIP61), false, OptionsCategory::CONNECTION); - gArgs.AddArg("-externalip=", _("Specify your own public address"), - false, OptionsCategory::CONNECTION); + gArgs.AddArg("-externalip=", "Specify your own public address", false, + OptionsCategory::CONNECTION); gArgs.AddArg( "-forcednsseed", strprintf( - _("Always query for peer addresses via DNS lookup (default: %d)"), + "Always query for peer addresses via DNS lookup (default: %d)", DEFAULT_FORCEDNSSEED), false, OptionsCategory::CONNECTION); - gArgs.AddArg("-listen", - _("Accept connections from outside (default: 1 if no -proxy " - "or -connect)"), - false, OptionsCategory::CONNECTION); + gArgs.AddArg( + "-listen", + "Accept connections from outside (default: 1 if no -proxy or -connect)", + false, OptionsCategory::CONNECTION); gArgs.AddArg( "-listenonion", - strprintf(_("Automatically create Tor hidden service (default: %d)"), + strprintf("Automatically create Tor hidden service (default: %d)", DEFAULT_LISTEN_ONION), false, OptionsCategory::CONNECTION); gArgs.AddArg( "-maxconnections=", - strprintf(_("Maintain at most connections to peers (default: %u)"), + strprintf("Maintain at most connections to peers (default: %u)", DEFAULT_MAX_PEER_CONNECTIONS), false, OptionsCategory::CONNECTION); gArgs.AddArg("-maxreceivebuffer=", - strprintf(_("Maximum per-connection receive buffer, *1000 " - "bytes (default: %u)"), + strprintf("Maximum per-connection receive buffer, *1000 " + "bytes (default: %u)", DEFAULT_MAXRECEIVEBUFFER), false, OptionsCategory::CONNECTION); - gArgs.AddArg("-maxsendbuffer=", - strprintf(_("Maximum per-connection send buffer, *1000 " - "bytes (default: %u)"), - DEFAULT_MAXSENDBUFFER), - false, OptionsCategory::CONNECTION); + gArgs.AddArg( + "-maxsendbuffer=", + strprintf( + "Maximum per-connection send buffer, *1000 bytes (default: %u)", + DEFAULT_MAXSENDBUFFER), + false, OptionsCategory::CONNECTION); gArgs.AddArg( "-maxtimeadjustment", - strprintf(_("Maximum allowed median peer time offset adjustment. Local " - "perspective of time may be influenced by peers forward or " - "backward by this amount. (default: %u seconds)"), + strprintf("Maximum allowed median peer time offset adjustment. Local " + "perspective of time may be influenced by peers forward or " + "backward by this amount. (default: %u seconds)", DEFAULT_MAX_TIME_ADJUSTMENT), false, OptionsCategory::CONNECTION); gArgs.AddArg("-onion=", - strprintf(_("Use separate SOCKS5 proxy to reach peers via Tor " - "hidden services (default: %s)"), + strprintf("Use separate SOCKS5 proxy to reach peers via Tor " + "hidden services (default: %s)", "-proxy"), false, OptionsCategory::CONNECTION); - gArgs.AddArg( - "-onlynet=", - _("Only connect to nodes in network (ipv4, ipv6 or onion)"), - false, OptionsCategory::CONNECTION); + gArgs.AddArg("-onlynet=", + "Only connect to nodes in network (ipv4, ipv6 or onion)", + false, OptionsCategory::CONNECTION); gArgs.AddArg("-peerbloomfilters", - strprintf(_("Support filtering of blocks and transaction with " - "bloom filters (default: %d)"), + strprintf("Support filtering of blocks and transaction with " + "bloom filters (default: %d)", DEFAULT_PEERBLOOMFILTERS), false, OptionsCategory::CONNECTION); gArgs.AddArg("-permitbaremultisig", - strprintf(_("Relay non-P2SH multisig (default: %d)"), + strprintf("Relay non-P2SH multisig (default: %d)", DEFAULT_PERMIT_BAREMULTISIG), false, OptionsCategory::CONNECTION); gArgs.AddArg( "-port=", strprintf( - _("Listen for connections on (default: %u or testnet: %u)"), + "Listen for connections on (default: %u or testnet: %u)", defaultChainParams->GetDefaultPort(), testnetChainParams->GetDefaultPort()), false, OptionsCategory::CONNECTION); gArgs.AddArg("-proxy=", _("Connect through SOCKS5 proxy"), false, OptionsCategory::CONNECTION); - gArgs.AddArg( - "-proxyrandomize", - strprintf(_("Randomize credentials for every proxy connection. This " - "enables Tor stream isolation (default: %d)"), - DEFAULT_PROXYRANDOMIZE), - false, OptionsCategory::CONNECTION); - gArgs.AddArg( - "-seednode=", - _("Connect to a node to retrieve peer addresses, and disconnect"), - false, OptionsCategory::CONNECTION); + gArgs.AddArg("-proxyrandomize", + strprintf("Randomize credentials for every proxy connection. " + "This enables Tor stream isolation (default: %d)", + DEFAULT_PROXYRANDOMIZE), + false, OptionsCategory::CONNECTION); + gArgs.AddArg("-seednode=", + "Connect to a node to retrieve peer addresses, and disconnect", + false, OptionsCategory::CONNECTION); gArgs.AddArg("-timeout=", - strprintf(_("Specify connection timeout in milliseconds " - "(minimum: 1, default: %d)"), + strprintf("Specify connection timeout in milliseconds " + "(minimum: 1, default: %d)", DEFAULT_CONNECT_TIMEOUT), false, OptionsCategory::CONNECTION); - gArgs.AddArg("-torcontrol=:", - strprintf(_("Tor control port to use if onion listening " - "enabled (default: %s)"), - DEFAULT_TOR_CONTROL), - false, OptionsCategory::CONNECTION); + gArgs.AddArg( + "-torcontrol=:", + strprintf( + "Tor control port to use if onion listening enabled (default: %s)", + DEFAULT_TOR_CONTROL), + false, OptionsCategory::CONNECTION); gArgs.AddArg("-torpassword=", - _("Tor control port password (default: empty)"), false, + "Tor control port password (default: empty)", false, OptionsCategory::CONNECTION); #ifdef USE_UPNP #if USE_UPNP gArgs.AddArg("-upnp", - _("Use UPnP to map the listening port (default: 1 when " - "listening and no -proxy)"), + "Use UPnP to map the listening port (default: 1 when " + "listening and no -proxy)", false, OptionsCategory::CONNECTION); #else gArgs.AddArg( "-upnp", - strprintf(_("Use UPnP to map the listening port (default: %u)"), 0), - false, OptionsCategory::CONNECTION); + strprintf("Use UPnP to map the listening port (default: %u)", 0), false, + OptionsCategory::CONNECTION); #endif #endif gArgs.AddArg("-whitebind=", - _("Bind to given address and whitelist peers connecting to " - "it. Use [host]:port notation for IPv6"), + "Bind to given address and whitelist peers connecting to it. " + "Use [host]:port notation for IPv6", false, OptionsCategory::CONNECTION); gArgs.AddArg("-whitelist=", - _("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.") + - " " + - _("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"), + "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. " + "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", false, OptionsCategory::CONNECTION); gArgs.AddArg( "-maxuploadtarget=", - strprintf(_("Tries to keep outbound traffic under the given target (in " - "MiB per 24h), 0 = no limit (default: %d)"), + strprintf("Tries to keep outbound traffic under the given target (in " + "MiB per 24h), 0 = no limit (default: %d)", DEFAULT_MAX_UPLOAD_TARGET), false, OptionsCategory::CONNECTION); @@ -675,37 +666,35 @@ #if ENABLE_ZMQ gArgs.AddArg("-zmqpubhashblock=
", - _("Enable publish hash block in
"), false, + "Enable publish hash block in
", false, OptionsCategory::ZMQ); gArgs.AddArg("-zmqpubhashtx=
", - _("Enable publish hash transaction in
"), false, + "Enable publish hash transaction in
", false, OptionsCategory::ZMQ); gArgs.AddArg("-zmqpubrawblock=
", - _("Enable publish raw block in
"), false, + "Enable publish raw block in
", false, OptionsCategory::ZMQ); gArgs.AddArg("-zmqpubrawtx=
", - _("Enable publish raw transaction in
"), false, + "Enable publish raw transaction in
", false, OptionsCategory::ZMQ); #endif gArgs.AddArg( "-checkblocks=", - strprintf( - _("How many blocks to check at startup (default: %u, 0 = all)"), - DEFAULT_CHECKBLOCKS), + strprintf("How many blocks to check at startup (default: %u, 0 = all)", + DEFAULT_CHECKBLOCKS), true, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-checklevel=", - strprintf(_("How thorough the block verification of " - "-checkblocks is (0-4, default: %u)"), + strprintf("How thorough the block verification of " + "-checkblocks is (0-4, default: %u)", DEFAULT_CHECKLEVEL), true, OptionsCategory::DEBUG_TEST); - gArgs.AddArg( - "-checkblockindex", - strprintf("Do a full consistency check for mapBlockIndex, " - "setBlockIndexCandidates, chainActive and mapBlocksUnlinked " - "occasionally. (default: %u)", - defaultChainParams->DefaultConsistencyChecks()), - true, OptionsCategory::DEBUG_TEST); + gArgs.AddArg("-checkblockindex", + strprintf("Do a full consistency check for mapBlockIndex, " + "setBlockIndexCandidates, chainActive and " + "mapBlocksUnlinked occasionally. (default: %u)", + defaultChainParams->DefaultConsistencyChecks()), + true, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-checkmempool=", strprintf("Run checks every transactions (default: %u)", defaultChainParams->DefaultConsistencyChecks()), @@ -758,33 +747,32 @@ true, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-debug=", - strprintf(_("Output debugging information (default: %u, " - "supplying is optional)"), + strprintf("Output debugging information (default: %u, " + "supplying is optional)", 0) + ". " + - _("If is not supplied or if = 1, " - "output all debugging information.") + - _(" can be:") + " " + ListLogCategories() + ".", + "If is not supplied or if = 1, " + "output all debugging information." + " can be: " + + ListLogCategories() + ".", false, OptionsCategory::DEBUG_TEST); gArgs.AddArg( "-debugexclude=", - strprintf(_("Exclude debugging information for a category. Can be used " - "in conjunction with -debug=1 to output debug logs for all " - "categories except one or more specified categories.")), + strprintf("Exclude debugging information for a category. Can be used " + "in conjunction with -debug=1 to output debug logs for all " + "categories except one or more specified categories."), false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-help-debug", - _("Show all debugging options (usage: --help -help-debug)"), + "Show all debugging options (usage: --help -help-debug)", + false, OptionsCategory::DEBUG_TEST); + gArgs.AddArg("-logips", + strprintf("Include IP addresses in debug output (default: %d)", + DEFAULT_LOGIPS), + false, OptionsCategory::DEBUG_TEST); + gArgs.AddArg("-logtimestamps", + strprintf("Prepend debug output with timestamp (default: %d)", + DEFAULT_LOGTIMESTAMPS), false, OptionsCategory::DEBUG_TEST); - gArgs.AddArg( - "-logips", - strprintf(_("Include IP addresses in debug output (default: %d)"), - DEFAULT_LOGIPS), - false, OptionsCategory::DEBUG_TEST); - gArgs.AddArg( - "-logtimestamps", - strprintf(_("Prepend debug output with timestamp (default: %d)"), - DEFAULT_LOGTIMESTAMPS), - false, OptionsCategory::DEBUG_TEST); gArgs.AddArg( "-logtimemicros", @@ -811,23 +799,21 @@ DEFAULT_MAX_TIP_AGE), true, OptionsCategory::DEBUG_TEST); - gArgs.AddArg( - "-printtoconsole", - _("Send trace/debug info to console instead of debug.log file"), false, - OptionsCategory::DEBUG_TEST); + gArgs.AddArg("-printtoconsole", + "Send trace/debug info to console instead of debug.log file", + false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-printpriority", strprintf("Log transaction priority and fee per kB when " "mining blocks (default: %d)", DEFAULT_PRINTPRIORITY), true, OptionsCategory::DEBUG_TEST); - gArgs.AddArg("-shrinkdebugfile", - _("Shrink debug.log file on client startup (default: 1 when " - "no -debug)"), - false, OptionsCategory::DEBUG_TEST); + gArgs.AddArg( + "-shrinkdebugfile", + "Shrink debug.log file on client startup (default: 1 when no -debug)", + false, OptionsCategory::DEBUG_TEST); - gArgs.AddArg("-uacomment=", - _("Append comment to the user agent string"), false, - OptionsCategory::DEBUG_TEST); + gArgs.AddArg("-uacomment=", "Append comment to the user agent string", + false, OptionsCategory::DEBUG_TEST); SetupChainParamsBaseOptions(); @@ -838,8 +824,8 @@ "testnet/regtest only; ", defaultChainParams->RequireStandard()), true, OptionsCategory::NODE_RELAY); gArgs.AddArg("-excessiveblocksize=", - strprintf(_("Do not accept blocks larger than this limit, in " - "bytes (default: %d)"), + strprintf("Do not accept blocks larger than this limit, in " + "bytes (default: %d)", DEFAULT_MAX_BLOCK_SIZE), true, OptionsCategory::NODE_RELAY); gArgs.AddArg( @@ -861,26 +847,25 @@ true, OptionsCategory::NODE_RELAY); gArgs.AddArg("-bytespersigop", - strprintf(_("Equivalent bytes per sigop in transactions for " - "relay and mining (default: %u)"), + strprintf("Equivalent bytes per sigop in transactions for " + "relay and mining (default: %u)", DEFAULT_BYTES_PER_SIGOP), false, OptionsCategory::NODE_RELAY); gArgs.AddArg( "-datacarrier", - strprintf(_("Relay and mine data carrier transactions (default: %d)"), + strprintf("Relay and mine data carrier transactions (default: %d)", DEFAULT_ACCEPT_DATACARRIER), false, OptionsCategory::NODE_RELAY); gArgs.AddArg("-datacarriersize", - strprintf(_("Maximum size of data in data carrier " - "transactions we relay and mine (default: %u)"), + strprintf("Maximum size of data in data carrier transactions " + "we relay and mine (default: %u)", MAX_OP_RETURN_RELAY), false, OptionsCategory::NODE_RELAY); gArgs.AddArg( "-minrelaytxfee=", - strprintf( - _("Fees (in %s/kB) smaller than this are considered zero fee for " - "relaying, mining and transaction creation (default: %s)"), - CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE_PER_KB)), + strprintf("Fees (in %s/kB) smaller than this are considered zero fee " + "for relaying, mining and transaction creation (default: %s)", + CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE_PER_KB)), false, OptionsCategory::NODE_RELAY); gArgs.AddArg( "-whitelistrelay", @@ -890,89 +875,86 @@ false, OptionsCategory::NODE_RELAY); gArgs.AddArg( "-whitelistforcerelay", - strprintf(_("Force relay of transactions from whitelisted peers even " - "if they violate local relay policy (default: %d)"), + strprintf("Force relay of transactions from whitelisted peers even if " + "they violate local relay policy (default: %d)", DEFAULT_WHITELISTFORCERELAY), false, OptionsCategory::NODE_RELAY); // Not sure this really belongs here, but it will do for now. // FIXME: This doesn't work anyways. gArgs.AddArg("-excessutxocharge=", - strprintf(_("Fees (in %s/kB) to charge per utxo created for " - "relaying, and mining (default: %s)"), + strprintf("Fees (in %s/kB) to charge per utxo created for " + "relaying, and mining (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_UTXO_FEE)), true, OptionsCategory::NODE_RELAY); gArgs.AddArg("-blockmaxsize=", - strprintf(_("Set maximum block size in bytes (default: %d)"), + strprintf("Set maximum block size in bytes (default: %d)", DEFAULT_MAX_GENERATED_BLOCK_SIZE), false, OptionsCategory::BLOCK_CREATION); - gArgs.AddArg( - "-blockprioritypercentage=", - strprintf(_("Set maximum percentage of a block reserved to " - "high-priority/low-fee transactions (default: %d)"), - DEFAULT_BLOCK_PRIORITY_PERCENTAGE), - false, OptionsCategory::BLOCK_CREATION); - gArgs.AddArg( - "-blockmintxfee=", - strprintf(_("Set lowest fee rate (in %s/kB) for transactions to be " - "included in block creation. (default: %s)"), - CURRENCY_UNIT, FormatMoney(DEFAULT_BLOCK_MIN_TX_FEE_PER_KB)), - false, OptionsCategory::BLOCK_CREATION); + gArgs.AddArg("-blockprioritypercentage=", + strprintf("Set maximum percentage of a block reserved to " + "high-priority/low-fee transactions (default: %d)", + DEFAULT_BLOCK_PRIORITY_PERCENTAGE), + false, OptionsCategory::BLOCK_CREATION); + gArgs.AddArg("-blockmintxfee=", + strprintf("Set lowest fee rate (in %s/kB) for transactions to " + "be included in block creation. (default: %s)", + CURRENCY_UNIT, + FormatMoney(DEFAULT_BLOCK_MIN_TX_FEE_PER_KB)), + false, OptionsCategory::BLOCK_CREATION); gArgs.AddArg("-blockversion=", "Override block version to test forking scenarios", true, OptionsCategory::BLOCK_CREATION); - gArgs.AddArg("-server", _("Accept command line and JSON-RPC commands"), - false, OptionsCategory::RPC); + gArgs.AddArg("-server", "Accept command line and JSON-RPC commands", false, + OptionsCategory::RPC); gArgs.AddArg("-rest", - strprintf(_("Accept public REST requests (default: %d)"), + strprintf("Accept public REST requests (default: %d)", DEFAULT_REST_ENABLE), false, OptionsCategory::RPC); gArgs.AddArg( "-rpcbind=[:port]", - _("Bind to given address to listen for JSON-RPC connections. This " - "option is ignored unless -rpcallowip is also passed. Port is " - "optional and overrides -rpcport. Use [host]:port notation for IPv6. " - "This option can be specified multiple times (default: 127.0.0.1 and " - "::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 " - "and :: i.e., all addresses)"), - false, OptionsCategory::RPC); - gArgs.AddArg( - "-rpccookiefile=", - _("Location of the auth cookie. Relative paths will be prefixed by a " - "net-specific datadir location. (default: data dir)"), + "Bind to given address to listen for JSON-RPC connections. This option " + "is ignored unless -rpcallowip is also passed. Port is optional and " + "overrides -rpcport. Use [host]:port notation for IPv6. This option " + "can be specified multiple times (default: 127.0.0.1 and ::1 i.e., " + "localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., " + "all addresses)", false, OptionsCategory::RPC); + gArgs.AddArg("-rpccookiefile=", + "Location of the auth cookie. Relative paths will be prefixed " + "by a net-specific datadir location. (default: data dir)", + false, OptionsCategory::RPC); gArgs.AddArg("-rpcuser=", _("Username for JSON-RPC connections"), false, OptionsCategory::RPC); gArgs.AddArg("-rpcpassword=", _("Password for JSON-RPC connections"), false, OptionsCategory::RPC); gArgs.AddArg( "-rpcauth=", - _("Username and hashed password for JSON-RPC connections. The field " - " comes in the format: :$. A canonical " - "python script is included in share/rpcuser. The client then " - "connects normally using the " - "rpcuser=/rpcpassword= pair of arguments. This " - "option can be specified multiple times"), - false, OptionsCategory::RPC); - gArgs.AddArg( - "-rpcport=", - strprintf(_("Listen for JSON-RPC connections on (default: %u or " - "testnet: %u)"), - defaultBaseParams->RPCPort(), testnetBaseParams->RPCPort()), + "Username and hashed password for JSON-RPC connections. The field " + " comes in the format: :$. A canonical " + "python script is included in share/rpcuser. The client then connects " + "normally using the rpcuser=/rpcpassword= pair of " + "arguments. This option can be specified multiple times", false, OptionsCategory::RPC); + gArgs.AddArg("-rpcport=", + strprintf("Listen for JSON-RPC connections on " + "(default: %u or testnet: %u)", + defaultBaseParams->RPCPort(), + testnetBaseParams->RPCPort()), + false, OptionsCategory::RPC); gArgs.AddArg("-rpcallowip=", - _("Allow JSON-RPC connections from specified source. Valid " - "for 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"), + "Allow JSON-RPC connections from specified source. Valid for " + " 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", false, OptionsCategory::RPC); gArgs.AddArg( "-rpcthreads=", strprintf( - _("Set the number of threads to service RPC calls (default: %d)"), + "Set the number of threads to service RPC calls (default: %d)", DEFAULT_HTTP_THREADS), false, OptionsCategory::RPC); gArgs.AddArg( diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -478,36 +478,24 @@ DEFAULT_SELFSIGNED_ROOTCERTS), true, OptionsCategory::GUI); #endif - gArgs.AddArg( - "-choosedatadir", - strprintf(QObject::tr("Choose data directory on startup (default: %d)") - .toStdString(), - DEFAULT_CHOOSE_DATADIR), - false, OptionsCategory::GUI); - gArgs.AddArg( - "-lang=", - QObject::tr( - "Set language, for example \"de_DE\" (default: system locale)") - .toStdString(), - false, OptionsCategory::GUI); - gArgs.AddArg("-min", QObject::tr("Start minimized").toStdString(), false, - OptionsCategory::GUI); + gArgs.AddArg("-choosedatadir", + strprintf("Choose data directory on startup (default: %d)", + DEFAULT_CHOOSE_DATADIR), + false, OptionsCategory::GUI); + gArgs.AddArg("-lang=", + "Set language, for example \"de_DE\" (default: system locale)", + false, OptionsCategory::GUI); + gArgs.AddArg("-min", "Start minimized", false, OptionsCategory::GUI); gArgs.AddArg( "-rootcertificates=", - QObject::tr( - "Set SSL root certificates for payment request (default: -system-)") - .toStdString(), - false, OptionsCategory::GUI); - gArgs.AddArg( - "-splash", - strprintf(QObject::tr("Show splash screen on startup (default: %d)") - .toStdString(), - DEFAULT_SPLASHSCREEN), - false, OptionsCategory::GUI); - gArgs.AddArg( - "-resetguisettings", - QObject::tr("Reset all settings changed in the GUI").toStdString(), + "Set SSL root certificates for payment request (default: -system-)", false, OptionsCategory::GUI); + gArgs.AddArg("-splash", + strprintf("Show splash screen on startup (default: %d)", + DEFAULT_SPLASHSCREEN), + false, OptionsCategory::GUI); + gArgs.AddArg("-resetguisettings", "Reset all settings changed in the GUI", + false, OptionsCategory::GUI); gArgs.AddArg("-uiplatform", strprintf("Select platform to customize UI for (one of " "windows, macosx, other; default: %s)", diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -56,92 +56,91 @@ void WalletInit::AddWalletOptions() const { gArgs.AddArg( "-avoidpartialspends", - strprintf(_("Group outputs by address, selecting all or none, instead " - "of selecting on a per-output basis. Privacy is improved " - "as an address is only used once (unless someone sends to " - "it after spending from it), but may result in slightly " - "higher fees as suboptimal coin selection may result due " - "to the added limitation (default: %u)"), + strprintf("Group outputs by address, selecting all or none, instead of " + "selecting on a per-output basis. Privacy is improved as an " + "address is only used once (unless someone sends to it after " + "spending from it), but may result in slightly higher fees " + "as suboptimal coin selection may result due to the added " + "limitation (default: %u)", DEFAULT_AVOIDPARTIALSPENDS), false, OptionsCategory::WALLET); gArgs.AddArg("-disablewallet", - _("Do not load the wallet and disable wallet RPC calls"), - false, OptionsCategory::WALLET); + "Do not load the wallet and disable wallet RPC calls", false, + OptionsCategory::WALLET); gArgs.AddArg("-fallbackfee=", - strprintf(_("A fee rate (in %s/kB) that will be used when fee " - "estimation has insufficient data (default: %s)"), + strprintf("A fee rate (in %s/kB) that will be used when fee " + "estimation has insufficient data (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_FALLBACK_FEE)), false, OptionsCategory::WALLET); gArgs.AddArg("-keypool=", - strprintf(_("Set key pool size to (default: %u)"), + strprintf("Set key pool size to (default: %u)", DEFAULT_KEYPOOL_SIZE), false, OptionsCategory::WALLET); gArgs.AddArg( "-maxtxfee=", - strprintf(_("Maximum total fees (in %s) to use in a single wallet " - "transaction or raw transaction; setting this too low may " - "abort large transactions (default: %s)"), + strprintf("Maximum total fees (in %s) to use in a single wallet " + "transaction or raw transaction; setting this too low may " + "abort large transactions (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_TRANSACTION_MAXFEE)), false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-mintxfee=", - strprintf(_("Fees (in %s/kB) smaller than this are considered " - "zero fee for transaction creation (default: %s)"), + strprintf("Fees (in %s/kB) smaller than this are considered " + "zero fee for transaction creation (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_TRANSACTION_MINFEE_PER_KB)), false, OptionsCategory::WALLET); gArgs.AddArg( "-paytxfee=", strprintf( - _("Fee (in %s/kB) to add to transactions you send (default: %s)"), + "Fee (in %s/kB) to add to transactions you send (default: %s)", CURRENCY_UNIT, FormatMoney(CFeeRate{DEFAULT_PAY_TX_FEE}.GetFeePerK())), false, OptionsCategory::WALLET); gArgs.AddArg( "-rescan", - _("Rescan the block chain for missing wallet transactions on startup"), + "Rescan the block chain for missing wallet transactions on startup", false, OptionsCategory::WALLET); gArgs.AddArg( "-salvagewallet", - _("Attempt to recover private keys from a corrupt wallet on startup"), + "Attempt to recover private keys from a corrupt wallet on startup", false, OptionsCategory::WALLET); - gArgs.AddArg("-spendzeroconfchange", - strprintf(_("Spend unconfirmed change when sending " - "transactions (default: %d)"), - DEFAULT_SPEND_ZEROCONF_CHANGE), - false, OptionsCategory::WALLET); - gArgs.AddArg("-upgradewallet", - _("Upgrade wallet to latest format on startup"), false, - OptionsCategory::WALLET); gArgs.AddArg( - "-wallet=", - _("Specify wallet database path. Can be specified multiple times to " - "load multiple wallets. Path is interpreted relative to " - "if it is not absolute, and will be created if it does not exist (as " - "a directory containing a wallet.dat file and log files). For " - "backwards compatibility this will also accept names of existing " - "data files in .)"), + "-spendzeroconfchange", + strprintf( + "Spend unconfirmed change when sending transactions (default: %d)", + DEFAULT_SPEND_ZEROCONF_CHANGE), false, OptionsCategory::WALLET); - gArgs.AddArg("-walletbroadcast", - _("Make the wallet broadcast transactions") + " " + - strprintf(_("(default: %d)"), DEFAULT_WALLETBROADCAST), + gArgs.AddArg("-upgradewallet", "Upgrade wallet to latest format on startup", + false, OptionsCategory::WALLET); + gArgs.AddArg("-wallet=", + "Specify wallet database path. Can be specified multiple " + "times to load multiple wallets. Path is interpreted relative " + "to if it is not absolute, and will be created if " + "it does not exist (as a directory containing a wallet.dat " + "file and log files). For backwards compatibility this will " + "also accept names of existing data files in .)", false, OptionsCategory::WALLET); + gArgs.AddArg( + "-walletbroadcast", + strprintf("Make the wallet broadcast transactions (default: %d)", + DEFAULT_WALLETBROADCAST), + false, OptionsCategory::WALLET); gArgs.AddArg("-walletdir=", - _("Specify directory to hold wallets (default: " - "/wallets if it exists, otherwise )"), + "Specify directory to hold wallets (default: " + "/wallets if it exists, otherwise )", false, OptionsCategory::WALLET); gArgs.AddArg("-walletnotify=", - _("Execute command when a wallet transaction changes (%s in " - "cmd is replaced by TxID)"), - false, OptionsCategory::WALLET); - gArgs.AddArg("-zapwallettxes=", - _("Delete all wallet transactions and only recover those " - "parts of the blockchain through -rescan on startup") + - " " + - _("(1 = keep tx meta data e.g. account owner and payment " - "request information, 2 = drop tx meta data)"), + "Execute command when a wallet transaction changes (%s in cmd " + "is replaced by TxID)", false, OptionsCategory::WALLET); + gArgs.AddArg( + "-zapwallettxes=", + "Delete all wallet transactions and only recover those parts of the " + "blockchain through -rescan on startup (1 = keep tx meta data e.g. " + "account owner and payment request information, 2 = drop tx meta data)", + false, OptionsCategory::WALLET); gArgs.AddArg("-dblogsize=", strprintf("Flush wallet database activity from memory to disk " @@ -159,8 +158,8 @@ DEFAULT_WALLET_PRIVDB), true, OptionsCategory::WALLET_DEBUG_TEST); gArgs.AddArg("-walletrejectlongchains", - strprintf(_("Wallet will not create transactions that violate " - "mempool chain limits (default: %d)"), + strprintf("Wallet will not create transactions that violate " + "mempool chain limits (default: %d)", DEFAULT_WALLET_REJECT_LONG_CHAINS), true, OptionsCategory::WALLET_DEBUG_TEST); }