From fa7ecbf9f892352b1528016999090e02a0fdcf40 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 23 Jan 2018 16:10:50 -0500 Subject: [PATCH] initwallet: Do not translate highly technical addresstype help --- src/qt/bitcoinstrings.cpp | 9 ------- src/qt/locale/bitcoin_en.ts | 52 ++++++++++++------------------------- src/wallet/init.cpp | 8 +++--- 3 files changed, 20 insertions(+), 49 deletions(-) diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 03aceb4d9e9..adf001c9685 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -251,13 +251,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: We do not appear to fully agree with our peers! You may need to " "upgrade, or other nodes may need to upgrade."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"What type of addresses to use (\"legacy\", \"p2sh-segwit\", or \"bech32\", " -"default: \"%s\")"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"What type of change to use (\"legacy\", \"p2sh-segwit\", or \"bech32\"). " -"Default is same as -addresstype, except when -addresstype=p2sh-segwit a " -"native segwit output is used when sending to a native segwit address)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Whether to save the mempool on shutdown and load on restart (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR " @@ -414,8 +407,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind r QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer. %s is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate initial keys"), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to start HTTP server. See debug log for details."), -QT_TRANSLATE_NOOP("bitcoin-core", "Unknown address type '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Unknown change type '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -benchmark ignored, use -debug=bench."), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use -debug=net."), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index a892da4cbd6..2b712b4317d 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -4025,7 +4025,7 @@ bitcoin-core - + Options: Options: @@ -4050,7 +4050,7 @@ Accept command line and JSON-RPC commands - + Distributed under the MIT software license, see the accompanying file %s or %s @@ -4075,7 +4075,7 @@ - + Error: A fatal internal error occurred, see debug.log for details @@ -4100,7 +4100,7 @@ - + Bitcoin Core Bitcoin Core @@ -4265,7 +4265,7 @@ - + Whether to save the mempool on shutdown and load on restart (default: %u) @@ -4565,7 +4565,7 @@ - + Unsupported argument -benchmark ignored, use -debug=bench. @@ -4625,7 +4625,7 @@ - + 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 @@ -4685,7 +4685,7 @@ - + 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 @@ -4870,17 +4870,7 @@ - - Unknown address type '%s' - - - - - Unknown change type '%s' - - - - + Upgrade wallet to latest format on startup @@ -4930,22 +4920,22 @@ - + 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) - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect - + (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) @@ -5085,17 +5075,7 @@ - - What type of addresses to use ("legacy", "p2sh-segwit", or "bech32", default: "%s") - - - - - What type of change to use ("legacy", "p2sh-segwit", or "bech32"). Default is same as -addresstype, except when -addresstype=p2sh-segwit a native segwit output is used when sending to a native segwit address) - - - - + 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. @@ -5265,12 +5245,12 @@ - + Unknown network specified in -onlynet: '%s' Unknown network specified in -onlynet: '%s' - + Insufficient funds Insufficient funds diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index c7f19bc90a2..ace95204b88 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -16,8 +16,8 @@ std::string GetWalletHelpString(bool showDebug) { std::string strUsage = HelpMessageGroup(_("Wallet options:")); - strUsage += HelpMessageOpt("-addresstype", strprintf(_("What type of addresses to use (\"legacy\", \"p2sh-segwit\", or \"bech32\", default: \"%s\")"), FormatOutputType(OUTPUT_TYPE_DEFAULT))); - strUsage += HelpMessageOpt("-changetype", _("What type of change to use (\"legacy\", \"p2sh-segwit\", or \"bech32\"). Default is same as -addresstype, except when -addresstype=p2sh-segwit a native segwit output is used when sending to a native segwit address)")); + strUsage += HelpMessageOpt("-addresstype", strprintf("What type of addresses to use (\"legacy\", \"p2sh-segwit\", or \"bech32\", default: \"%s\")", FormatOutputType(OUTPUT_TYPE_DEFAULT))); + strUsage += HelpMessageOpt("-changetype", "What type of change to use (\"legacy\", \"p2sh-segwit\", or \"bech32\"). Default is same as -addresstype, except when -addresstype=p2sh-segwit a native segwit output is used when sending to a native segwit address)"); strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls")); strUsage += HelpMessageOpt("-keypool=", strprintf(_("Set key pool size to (default: %u)"), DEFAULT_KEYPOOL_SIZE)); strUsage += HelpMessageOpt("-fallbackfee=", strprintf(_("A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)"), @@ -179,14 +179,14 @@ bool WalletParameterInteraction() g_address_type = ParseOutputType(gArgs.GetArg("-addresstype", "")); if (g_address_type == OUTPUT_TYPE_NONE) { - return InitError(strprintf(_("Unknown address type '%s'"), gArgs.GetArg("-addresstype", ""))); + return InitError(strprintf("Unknown address type '%s'", gArgs.GetArg("-addresstype", ""))); } // If changetype is set in config file or parameter, check that it's valid. // Default to OUTPUT_TYPE_NONE if not set. g_change_type = ParseOutputType(gArgs.GetArg("-changetype", ""), OUTPUT_TYPE_NONE); if (g_change_type == OUTPUT_TYPE_NONE && !gArgs.GetArg("-changetype", "").empty()) { - return InitError(strprintf(_("Unknown change type '%s'"), gArgs.GetArg("-changetype", ""))); + return InitError(strprintf("Unknown change type '%s'", gArgs.GetArg("-changetype", ""))); } return true;