boxtec
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

initwallet: Do not translate highly technical addresstype help

Browse Source
pull/12251/head
MarcoFalke 7 years ago
parent 6e3fe93609
commit fa7ecbf9f8
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
3 changed files with 20 additions and 49 deletions
Show Stats Download Patch File Download Diff File

9
src/qt/bitcoinstrings.cpp
Unescape View File

@ -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."),

52
src/qt/locale/bitcoin_en.ts
Unescape View File

@ -4025,7 +4025,7 @@
<context>
<name>bitcoin-core</name>
<message>
<location filename="../bitcoinstrings.cpp" line="+358"/>
<location filename="../bitcoinstrings.cpp" line="+351"/>
<source>Options:</source>
<translation>Options:</translation>
</message>
@ -4050,7 +4050,7 @@
<translation>Accept command line and JSON-RPC commands</translation>
</message>
<message>
<location line="-216"/>
<location line="-209"/>
<source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
<translation type="unfinished"></translation>
</message>
@ -4075,7 +4075,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+158"/>
<location line="+151"/>
<source>Error: A fatal internal error occurred, see debug.log for details</source>
<translation type="unfinished"></translation>
</message>
@ -4100,7 +4100,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="-404"/>
<location line="-397"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
@ -4265,7 +4265,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+10"/>
<location line="+3"/>
<source>Whether to save the mempool on shutdown and load on restart (default: %u)</source>
<translation type="unfinished"></translation>
</message>
@ -4565,7 +4565,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+4"/>
<source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
<translation type="unfinished"></translation>
</message>
@ -4625,7 +4625,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="-406"/>
<location line="-397"/>
<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>
@ -4685,7 +4685,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+71"/>
<location line="+64"/>
<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>
<translation type="unfinished"></translation>
</message>
@ -4870,17 +4870,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Unknown address type &apos;%s&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Unknown change type &apos;%s&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+7"/>
<source>Upgrade wallet to latest format on startup</source>
<translation type="unfinished"></translation>
</message>
@ -4930,22 +4920,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="-82"/>
<location line="-80"/>
<source>Password for JSON-RPC connections</source>
<translation>Password for JSON-RPC connections</translation>
</message>
<message>
<location line="-270"/>
<location line="-263"/>
<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="+192"/>
<location line="+185"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
</message>
<message>
<location line="-267"/>
<location line="-260"/>
<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>
@ -5085,17 +5075,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>What type of addresses to use (&quot;legacy&quot;, &quot;p2sh-segwit&quot;, or &quot;bech32&quot;, default: &quot;%s&quot;)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>What type of change to use (&quot;legacy&quot;, &quot;p2sh-segwit&quot;, or &quot;bech32&quot;). Default is same as -addresstype, except when -addresstype=p2sh-segwit a native segwit output is used when sending to a native segwit address)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+9"/>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
@ -5265,12 +5245,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+7"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
</message>
<message>
<location line="-87"/>
<location line="-85"/>
<source>Insufficient funds</source>
<translation>Insufficient funds</translation>
</message>

8
src/wallet/init.cpp
Unescape View File

@ -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=<n>", strprintf(_("Set key pool size to <n> (default: %u)"), DEFAULT_KEYPOOL_SIZE));
strUsage += HelpMessageOpt("-fallbackfee=<amt>", 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;

Write Preview
Loading…
Cancel
Save