diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/key.cpp | 2 | ||||
| -rw-r--r-- | src/key.h | 2 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 36 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 623 | ||||
| -rw-r--r-- | src/wallet/init.cpp | 8 | ||||
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 20 |
6 files changed, 388 insertions, 303 deletions
diff --git a/src/key.cpp b/src/key.cpp index f8136f88b5..e998e3db6e 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -233,7 +233,7 @@ bool CKey::SignCompact(const uint256 &hash, std::vector<unsigned char>& vchSig) return true; } -bool CKey::Load(CPrivKey &privkey, CPubKey &vchPubKey, bool fSkipCheck=false) { +bool CKey::Load(const CPrivKey &privkey, const CPubKey &vchPubKey, bool fSkipCheck=false) { if (!ec_privkey_import_der(secp256k1_context_sign, (unsigned char*)begin(), privkey.data(), privkey.size())) return false; fCompressed = vchPubKey.IsCompressed(); @@ -135,7 +135,7 @@ public: bool VerifyPubKey(const CPubKey& vchPubKey) const; //! Load private key and check that public key matches. - bool Load(CPrivKey& privkey, CPubKey& vchPubKey, bool fSkipCheck); + bool Load(const CPrivKey& privkey, const CPubKey& vchPubKey, bool fSkipCheck); }; struct CExtKey { diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 9f798ccf62..adf001c968 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -24,6 +24,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Accept relayed transactions received from whitelisted peers even when not " "relaying transactions (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Add a node to connect to and attempt to keep the connection open (see the " +"`addnode` RPC command help for more info)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "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"), @@ -42,8 +45,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. %s is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Cannot provide specific connections and have addrman find outgoing " +"connections at the same."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Connect only to the specified node(s); -connect=0 disables automatic " -"connections"), +"connections (the rules for this peer are the same as for -addnode)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Create new files with system default permissions, instead of umask 077 (only " "effective with disabled wallet functionality)"), @@ -160,12 +166,20 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Set lowest fee rate (in %s/kB) for transactions to be included in block " "creation. (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " "leave that many cores free, default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Sets the serialization of raw transaction or block hex returned in non-" "verbose mode, non-segwit(0) or segwit(1) (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Specify directory to hold wallets (default: <datadir>/wallets if it exists, " +"otherwise <datadir>)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Specify location of debug log file: this can be an absolute path or a path " +"relative to the data directory (default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Support filtering of blocks and transaction with bloom filters (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "The block database contains a block which appears to be from the future. " @@ -212,9 +226,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Use UPnP to map the listening port (default: 1 when listening and no -proxy)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Use hierarchical deterministic key generation (HD) after BIP32. Only has " -"effect during wallet creation/first start"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: " "%s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -250,20 +261,16 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "You need to rebuild the database using -reindex to go back to unpruned " "mode. This will redownload the entire blockchain"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"You need to rebuild the database using -reindex-chainstate to change -txindex"), QT_TRANSLATE_NOOP("bitcoin-core", "%d of last 100 blocks have unexpected version"), QT_TRANSLATE_NOOP("bitcoin-core", "%s corrupt, salvage failed"), QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high!"), QT_TRANSLATE_NOOP("bitcoin-core", "(default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "(default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "(press q to shutdown and continue later)"), QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"), QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"), 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", "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", "Always query for peer addresses via DNS lookup (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Append comment to the user agent string"), @@ -272,7 +279,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Automatically create Tor hidden service (defa QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), QT_TRANSLATE_NOOP("bitcoin-core", "Chain selection options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"), @@ -289,6 +295,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash transaction in <address>" QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw block in <address>"), QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw transaction in <address>"), QT_TRANSLATE_NOOP("bitcoin-core", "Enable transaction replacement in the memory pool (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error creating %s: You can't create non-HD wallets with this version."), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s"), @@ -306,6 +313,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: A fatal internal error occurred, see debug.log for details"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."), +QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee (in %s/kB) to add to transactions you send (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: %u, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "Importing..."), @@ -360,15 +368,17 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Rewinding blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions with full-RBF opt-in enabled (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions with full-RBF opt-in enabled (RPC only, default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum BIP141 block weight (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (minimum: 1, default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), @@ -395,6 +405,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large for fee policy"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"), 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 network specified in -onlynet: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -benchmark ignored, use -debug=bench."), @@ -409,13 +420,14 @@ QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe chara QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"), +QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside wallet directory %s"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet debugging/testing options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart %s to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: unknown new rules activated (versionbit %i)"), QT_TRANSLATE_NOOP("bitcoin-core", "Whether to operate in a blocks only mode (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."), QT_TRANSLATE_NOOP("bitcoin-core", "ZeroMQ notification options:"), }; diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 821be8987e..2b712b4317 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -165,6 +165,11 @@ <translation>Repeat new passphrase</translation> </message> <message> + <location line="+14"/> + <source>Show password</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="+46"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation type="unfinished"></translation> @@ -205,7 +210,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+44"/> + <location line="+45"/> <source>Confirm wallet encryption</source> <translation type="unfinished"></translation> </message> @@ -278,7 +283,7 @@ </message> <message> <location line="+47"/> - <location line="+24"/> + <location line="+33"/> <source>Warning: The Caps Lock key is on!</source> <translation type="unfinished"></translation> </message> @@ -299,27 +304,27 @@ <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+357"/> + <location filename="../bitcoingui.cpp" line="+358"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+429"/> + <location line="+430"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-507"/> + <location line="-508"/> <source>&Overview</source> <translation>&Overview</translation> </message> <message> - <location line="-143"/> + <location line="-144"/> <source>Node</source> <translation type="unfinished"></translation> </message> <message> - <location line="+144"/> + <location line="+145"/> <source>Show general overview of wallet</source> <translation>Show general overview of wallet</translation> </message> @@ -404,7 +409,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+359"/> + <location line="+360"/> <source>Click to disable network activity.</source> <translation type="unfinished"></translation> </message> @@ -429,7 +434,7 @@ <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-510"/> + <location line="-511"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -459,17 +464,17 @@ <translation>&Verify message...</translation> </message> <message> - <location line="+516"/> + <location line="+517"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-741"/> + <location line="-743"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+152"/> + <location line="+153"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -549,7 +554,7 @@ <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+356"/> + <location line="+357"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -610,12 +615,12 @@ <translation>Up to date</translation> </message> <message> - <location line="-440"/> + <location line="-441"/> <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> <translation type="unfinished"></translation> </message> <message> - <location line="+199"/> + <location line="+200"/> <source>%1 client</source> <translation type="unfinished"></translation> </message> @@ -783,7 +788,7 @@ <translation type="unfinished">Confirmed</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+54"/> + <location filename="../coincontroldialog.cpp" line="+53"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> @@ -913,7 +918,7 @@ <translation>&Address</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+28"/> + <location filename="../editaddressdialog.cpp" line="+30"/> <source>New receiving address</source> <translation type="unfinished"></translation> </message> @@ -933,7 +938,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> <translation type="unfinished"></translation> </message> @@ -1118,7 +1123,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+70"/> + <location line="+73"/> <source>Error: Specified data directory "%1" cannot be created.</source> <translation type="unfinished"></translation> </message> @@ -1169,7 +1174,7 @@ <message> <location line="+7"/> <location line="+26"/> - <location filename="../modaloverlay.cpp" line="+138"/> + <location filename="../modaloverlay.cpp" line="+140"/> <source>Unknown...</source> <translation type="unfinished"></translation> </message> @@ -1276,17 +1281,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+114"/> - <source>Accept connections from outside</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Allow incoming connections</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+44"/> + <location line="+161"/> <location line="+187"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> <translation type="unfinished"></translation> @@ -1299,7 +1294,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+166"/> + <location line="+38"/> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+108"/> + <source>Hide the icon from the system tray.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>&Hide tray icon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation type="unfinished"></translation> </message> @@ -1310,12 +1320,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-10"/> - <source>Third party transaction URLs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+41"/> + <location line="+31"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"></translation> </message> @@ -1385,7 +1390,17 @@ <translation>Map port using &UPnP</translation> </message> <message> - <location line="+17"/> + <location line="+7"/> + <source>Accept connections from outside.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Allow incomin&g connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation type="unfinished"></translation> </message> @@ -1438,27 +1453,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+102"/> + <location line="+105"/> <source>&Window</source> <translation>&Window</translation> </message> <message> - <location line="+6"/> - <source>&Hide the icon from the system tray.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Hide tray icon</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="+16"/> <source>Show only a tray icon after minimizing the window.</source> <translation>Show only a tray icon after minimizing the window.</translation> </message> @@ -1503,7 +1503,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+646"/> + <location line="+464"/> + <source>&Third party transaction URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+182"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1513,7 +1518,7 @@ <translation>&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+84"/> + <location filename="../optionsdialog.cpp" line="+82"/> <source>default</source> <translation>default</translation> </message> @@ -1666,34 +1671,34 @@ <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+328"/> - <location line="+216"/> + <location filename="../paymentserver.cpp" line="+326"/> + <location line="+214"/> <location line="+42"/> - <location line="+113"/> + <location line="+111"/> <location line="+14"/> <location line="+18"/> <source>Payment request error</source> <translation type="unfinished"></translation> </message> <message> - <location line="-402"/> + <location line="-398"/> <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"></translation> </message> <message> - <location line="+103"/> - <location line="+14"/> + <location line="+102"/> + <location line="+13"/> <location line="+7"/> <source>URI handling</source> <translation type="unfinished"></translation> </message> <message> - <location line="-20"/> + <location line="-19"/> <source>Payment request fetch URL is invalid: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> + <location line="+12"/> <source>Invalid payment address %1</source> <translation type="unfinished"></translation> </message> @@ -1718,12 +1723,12 @@ <location line="+31"/> <location line="+10"/> <location line="+17"/> - <location line="+88"/> + <location line="+86"/> <source>Payment request rejected</source> <translation type="unfinished"></translation> </message> <message> - <location line="-155"/> + <location line="-153"/> <source>Payment request network doesn't match client network.</source> <translation type="unfinished"></translation> </message> @@ -1759,7 +1764,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+44"/> + <location line="+42"/> <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> <translation type="unfinished"></translation> </message> @@ -1792,7 +1797,7 @@ <context> <name>PeerTableModel</name> <message> - <location filename="../peertablemodel.cpp" line="+117"/> + <location filename="../peertablemodel.cpp" line="+121"/> <source>User Agent</source> <translation type="unfinished"></translation> </message> @@ -1811,11 +1816,21 @@ <source>Ping</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+0"/> + <source>Sent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Received</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QObject</name> <message> - <location filename="../bitcoinunits.cpp" line="+176"/> + <location filename="../bitcoinunits.cpp" line="+185"/> <source>Amount</source> <translation type="unfinished">Amount</translation> </message> @@ -1825,7 +1840,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+766"/> + <location line="+760"/> <source>%1 d</source> <translation type="unfinished"></translation> </message> @@ -1915,15 +1930,40 @@ </translation> </message> <message> + <location line="+8"/> + <source>%1 B</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 KB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 MB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 GB</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoin.cpp" line="+178"/> <source>%1 didn't yet exit safely...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../modaloverlay.cpp" line="-29"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QObject::QObject</name> <message> - <location line="-86"/> + <location filename="../bitcoin.cpp" line="-86"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"></translation> </message> @@ -1941,7 +1981,7 @@ <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+36"/> + <location filename="../receiverequestdialog.cpp" line="+35"/> <source>&Save Image...</source> <translation type="unfinished"></translation> </message> @@ -2100,8 +2140,8 @@ </message> <message> <location line="+60"/> - <location filename="../rpcconsole.cpp" line="+467"/> - <location line="+728"/> + <location filename="../rpcconsole.cpp" line="+496"/> + <location line="+718"/> <source>Select a peer to view detailed information.</source> <translation type="unfinished"></translation> </message> @@ -2232,7 +2272,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-413"/> + <location filename="../rpcconsole.cpp" line="-401"/> <source>In:</source> <translation type="unfinished"></translation> </message> @@ -2252,7 +2292,7 @@ <translation>Clear console</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-223"/> + <location filename="../rpcconsole.cpp" line="-225"/> <source>1 &hour</source> <translation type="unfinished"></translation> </message> @@ -2290,52 +2330,37 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+135"/> + <location line="+136"/> <source>Welcome to the %1 RPC console.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Type <b>help</b> for an overview of available commands.</source> - <translation>Type <b>help</b> for an overview of available commands.</translation> - </message> - <message> - <location line="-1"/> + <location line="+1"/> <source>Use up and down arrows to navigate history, and %1 to clear screen.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+36"/> - <source>Network activity disabled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+150"/> - <source>%1 B</source> + <location line="+1"/> + <source>Type %1 for an overview of available commands.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>%1 KB</source> + <location line="+1"/> + <source>For more information on using this console type %1.</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>%1 MB</source> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>%1 GB</source> + <location line="+36"/> + <source>Network activity disabled</source> <translation type="unfinished"></translation> </message> <message> - <location line="+99"/> + <location line="+243"/> <source>(node id: %1)</source> <translation type="unfinished"></translation> </message> @@ -2380,39 +2405,29 @@ <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+107"/> + <location filename="../forms/receivecoinsdialog.ui" line="+37"/> <source>&Amount:</source> <translation type="unfinished"></translation> </message> <message> - <location line="-16"/> + <location line="+46"/> <source>&Label:</source> <translation type="unfinished">&Label:</translation> </message> <message> - <location line="-37"/> + <location line="-30"/> <source>&Message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="-20"/> - <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>R&euse an existing receiving address (not recommended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+14"/> - <location line="+23"/> + <location line="-3"/> + <location line="+46"/> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-7"/> - <location line="+21"/> + <location line="-30"/> + <location line="+14"/> <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"></translation> </message> @@ -2422,13 +2437,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+23"/> - <location line="+22"/> + <location line="-39"/> + <location line="+153"/> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="-59"/> <source>Clear all fields of the form.</source> <translation type="unfinished"></translation> </message> @@ -2438,17 +2453,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+75"/> + <location line="+142"/> <source>Requested payments history</source> <translation type="unfinished"></translation> </message> <message> - <location line="-95"/> + <location line="-162"/> <source>&Request payment</source> <translation type="unfinished"></translation> </message> <message> - <location line="+120"/> + <location line="+98"/> + <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Generate Bech32 address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+86"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"></translation> </message> @@ -2598,7 +2623,7 @@ <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+586"/> + <location filename="../sendcoinsdialog.cpp" line="+578"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -2703,7 +2728,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+84"/> + <location line="+78"/> <location line="+13"/> <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> <translation type="unfinished"></translation> @@ -2729,17 +2754,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+103"/> - <source>Request Replace-By-Fee</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Indicates that the sender may wish to replace this transaction with a new one paying higher fees (prior to being confirmed).</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+79"/> + <location line="+185"/> <source>Send to multiple recipients at once</source> <translation>Send to multiple recipients at once</translation> </message> @@ -2754,17 +2769,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-839"/> + <location line="-833"/> <source>Dust:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+700"/> + <location line="+694"/> <source>Confirmation time target:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+142"/> + <location line="+74"/> + <source>Enable Replace-By-Fee</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>Clear &All</source> <translation>Clear &All</translation> </message> @@ -2784,7 +2809,7 @@ <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-499"/> + <location filename="../sendcoinsdialog.cpp" line="-494"/> <source>Copy quantity</source> <translation type="unfinished"></translation> </message> @@ -2819,12 +2844,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+82"/> + <location line="+76"/> <source>%1 (%2 blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+129"/> + <location line="+127"/> <location line="+5"/> <location line="+5"/> <location line="+4"/> @@ -2852,17 +2877,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>This transaction signals replaceability (optin-RBF).</source> + <location line="+4"/> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Confirm send coins</source> <translation type="unfinished"></translation> </message> <message> - <location line="+191"/> + <location line="+192"/> <source>The recipient address is not valid. Please recheck.</source> <translation type="unfinished"></translation> </message> @@ -2907,7 +2937,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+68"/> + <location line="+91"/> <source>Pay only the required fee of %1</source> <translation type="unfinished"></translation> </message> @@ -2925,7 +2955,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+5"/> <source>Warning: Unknown change address</source> <translation type="unfinished"></translation> </message> @@ -2949,13 +2979,13 @@ <name>SendCoinsEntry</name> <message> <location filename="../forms/sendcoinsentry.ui" line="+155"/> - <location line="+539"/> + <location line="+546"/> <location line="+533"/> <source>A&mount:</source> <translation>A&mount:</translation> </message> <message> - <location line="-1185"/> + <location line="-1192"/> <source>Pay &To:</source> <translation>Pay &To:</translation> </message> @@ -2996,13 +3026,13 @@ </message> <message> <location line="+7"/> - <location line="+548"/> + <location line="+555"/> <location line="+533"/> <source>Remove this entry</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1021"/> + <location line="-1028"/> <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> <translation type="unfinished"></translation> </message> @@ -3012,6 +3042,11 @@ <translation type="unfinished"></translation> </message> <message> + <location line="+7"/> + <source>Use available balance</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+9"/> <source>Message:</source> <translation type="unfinished"></translation> @@ -3027,12 +3062,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1009"/> + <location line="-1016"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"></translation> </message> <message> - <location line="+47"/> + <location line="+54"/> <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> <translation type="unfinished"></translation> </message> @@ -3049,7 +3084,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+37"/> + <location filename="../sendcoinsentry.cpp" line="+36"/> <source>Enter a label for this address to add it to your address book</source> <translation type="unfinished"></translation> </message> @@ -3192,27 +3227,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+83"/> - <location line="+80"/> + <location line="+82"/> + <location line="+78"/> <source>The entered address is invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-80"/> - <location line="+8"/> - <location line="+72"/> - <location line="+8"/> + <location line="-78"/> + <location line="+7"/> + <location line="+71"/> + <location line="+6"/> <source>Please check the address and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-80"/> - <location line="+80"/> + <location line="-77"/> + <location line="+77"/> <source>The entered address does not refer to a key.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-72"/> + <location line="-69"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"></translation> </message> @@ -3232,7 +3267,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+58"/> + <location line="+55"/> <source>The signature could not be decoded.</source> <translation type="unfinished"></translation> </message> @@ -3248,7 +3283,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Message verification failed.</source> <translation type="unfinished"></translation> </message> @@ -3364,7 +3399,7 @@ </message> <message> <location line="+5"/> - <location line="+13"/> + <location line="+12"/> <location line="+72"/> <source>From</source> <translation type="unfinished"></translation> @@ -3739,7 +3774,7 @@ </message> <message> <location line="+6"/> - <source>Enter address or label to search</source> + <source>Enter address, transaction id, or label to search</source> <translation type="unfinished"></translation> </message> <message> @@ -3748,7 +3783,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+37"/> + <location line="+48"/> <source>Abandon transaction</source> <translation type="unfinished"></translation> </message> @@ -3798,7 +3833,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+193"/> + <location line="+194"/> <source>Export Transaction History</source> <translation type="unfinished"></translation> </message> @@ -3884,7 +3919,7 @@ <context> <name>WalletFrame</name> <message> - <location filename="../walletframe.cpp" line="+27"/> + <location filename="../walletframe.cpp" line="+28"/> <source>No wallet has been loaded.</source> <translation type="unfinished"></translation> </message> @@ -3892,19 +3927,19 @@ <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+291"/> + <location filename="../walletmodel.cpp" line="+290"/> <source>Send Coins</source> <translation type="unfinished">Send Coins</translation> </message> <message> - <location line="+387"/> - <location line="+46"/> - <location line="+9"/> + <location line="+384"/> + <location line="+39"/> + <location line="+6"/> <source>Fee bump error</source> <translation type="unfinished"></translation> </message> <message> - <location line="-55"/> + <location line="-45"/> <source>Increasing transaction fee failed</source> <translation type="unfinished"></translation> </message> @@ -3914,7 +3949,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+4"/> <source>Current fee:</source> <translation type="unfinished"></translation> </message> @@ -3934,12 +3969,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+22"/> + <location line="+17"/> <source>Can't sign transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>Could not commit transaction</source> <translation type="unfinished"></translation> </message> @@ -3990,32 +4025,32 @@ <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+343"/> + <location filename="../bitcoinstrings.cpp" line="+351"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+31"/> + <location line="+33"/> <source>Specify data directory</source> <translation>Specify data directory</translation> </message> <message> - <location line="-95"/> + <location line="-99"/> <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="+98"/> + <location line="+102"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> <message> - <location line="-114"/> + <location line="-116"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="-207"/> + <location line="-209"/> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation type="unfinished"></translation> </message> @@ -4040,12 +4075,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+150"/> + <location line="+151"/> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> <translation type="unfinished"></translation> </message> @@ -4060,12 +4095,12 @@ <translation>Run in the background as a daemon and accept commands</translation> </message> <message> - <location line="+37"/> + <location line="+40"/> <source>Unable to start HTTP server. See debug log for details.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-386"/> + <location line="-397"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -4085,6 +4120,11 @@ <translation type="unfinished"></translation> </message> <message> + <location line="+3"/> + <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <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> @@ -4095,7 +4135,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+2"/> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation type="unfinished"></translation> </message> @@ -4160,12 +4210,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+5"/> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+14"/> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation type="unfinished"></translation> </message> @@ -4195,7 +4245,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+5"/> <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> <translation type="unfinished"></translation> </message> @@ -4221,11 +4271,6 @@ </message> <message> <location line="+11"/> - <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> <source>%d of last 100 blocks have unexpected version</source> <translation type="unfinished"></translation> </message> @@ -4236,11 +4281,6 @@ </message> <message> <location line="+4"/> - <source>(press q to shutdown and continue later)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>-maxmempool must be at least %d MB</source> <translation type="unfinished"></translation> </message> @@ -4255,7 +4295,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>Append comment to the user agent string</source> <translation type="unfinished"></translation> </message> @@ -4275,7 +4315,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Chain selection options:</source> <translation type="unfinished"></translation> </message> @@ -4341,6 +4381,11 @@ </message> <message> <location line="+1"/> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Error initializing block database</source> <translation>Error initializing block database</translation> </message> @@ -4385,6 +4430,11 @@ <translation>Failed to listen on any port. Use -listen=0 if you want this.</translation> </message> <message> + <location line="+1"/> + <source>Failed to rescan the wallet during initialization</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+3"/> <source>Importing...</source> <translation type="unfinished"></translation> @@ -4485,17 +4535,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <location line="+3"/> + <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Set maximum block size in bytes (default: %d)</source> + <location line="+1"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+14"/> <source>Specify wallet file (within data directory)</source> <translation>Specify wallet file (within data directory)</translation> </message> @@ -4515,7 +4565,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation type="unfinished"></translation> </message> @@ -4560,12 +4610,7 @@ <translation>Verifying blocks...</translation> </message> <message> - <location line="+2"/> - <source>Wallet %s resides outside data directory %s</source> - <translation>Wallet %s resides outside data directory %s</translation> - </message> - <message> - <location line="+1"/> + <location line="+3"/> <source>Wallet debugging/testing options:</source> <translation type="unfinished"></translation> </message> @@ -4580,7 +4625,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-389"/> + <location line="-397"/> <source>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</source> <translation type="unfinished"></translation> </message> @@ -4590,7 +4635,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+14"/> + <location line="+17"/> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation type="unfinished"></translation> </message> @@ -4635,17 +4680,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+36"/> + <location line="+44"/> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation type="unfinished"></translation> </message> <message> - <location line="+34"/> - <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+33"/> + <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> @@ -4655,27 +4695,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+7"/> <source>(default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Accept public REST requests (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Automatically create Tor hidden service (default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Connect through SOCKS5 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation type="unfinished"></translation> </message> @@ -4690,7 +4730,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Imports blocks from external blk000??.dat file on startup</source> <translation type="unfinished"></translation> </message> @@ -4755,7 +4795,7 @@ <translation>Send trace/debug info to console instead of debug.log file</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Show all debugging options (usage: --help -help-debug)</source> <translation type="unfinished"></translation> </message> @@ -4770,6 +4810,21 @@ <translation>Signing transaction failed</translation> </message> <message> + <location line="+1"/> + <source>Specified -walletdir "%s" does not exist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Specified -walletdir "%s" is a relative path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Specified -walletdir "%s" is not a directory</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+10"/> <source>The transaction amount is too small to pay the fee</source> <translation type="unfinished"></translation> @@ -4810,7 +4865,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+2"/> + <source>Unable to generate initial keys</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> <source>Upgrade wallet to latest format on startup</source> <translation type="unfinished"></translation> </message> @@ -4825,7 +4885,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+1"/> + <source>Wallet %s resides outside wallet directory %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -4841,6 +4906,11 @@ </message> <message> <location line="+1"/> + <source>You need to rebuild the database using -reindex to change -txindex</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Zapping all transactions from wallet...</source> <translation type="unfinished"></translation> </message> @@ -4850,22 +4920,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-76"/> + <location line="-80"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-261"/> + <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="+184"/> + <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="-253"/> + <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> @@ -4875,17 +4945,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>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)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> + <location line="+26"/> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4935,12 +5000,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+37"/> + <location line="+34"/> + <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> + <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4980,7 +5060,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+5"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> <translation type="unfinished"></translation> </message> @@ -5000,7 +5080,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> + <location line="+11"/> <source>%s is set very high!</source> <translation type="unfinished"></translation> </message> @@ -5010,7 +5090,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+8"/> <source>Always query for peer addresses via DNS lookup (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -5030,7 +5110,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>How many blocks to check at startup (default: %u, 0 = all)</source> <translation type="unfinished"></translation> </message> @@ -5090,12 +5170,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+9"/> <source>Set key pool size to <n> (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -5105,12 +5180,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+7"/> <source>Specify configuration file (default: %s)</source> <translation type="unfinished"></translation> </message> @@ -5170,12 +5245,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> <message> - <location line="-82"/> + <location line="-85"/> <source>Insufficient funds</source> <translation>Insufficient funds</translation> </message> @@ -5185,37 +5260,27 @@ <translation>Loading block index...</translation> </message> <message> - <location line="-66"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Add a node to connect to and attempt to keep the connection open</translation> - </message> - <message> - <location line="+67"/> + <location line="+1"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> <message> - <location line="+2"/> - <source>Cannot write default address</source> - <translation>Cannot write default address</translation> - </message> - <message> - <location line="+84"/> + <location line="+87"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-73"/> + <location line="-75"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index c7f19bc90a..ace95204b8 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=<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; diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index ae4525751d..fcee22a14a 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1169,9 +1169,8 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) return NullUniValue; } - if (request.fHelp || request.params.size() < 2 || request.params.size() > 3) - { - std::string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" + if (request.fHelp || request.params.size() < 2 || request.params.size() > 4) { + std::string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" \"address_type\" )\n" "\nAdd a nrequired-to-sign multisignature address to the wallet. Requires a new wallet backup.\n" "Each key is a Bitcoin address or hex-encoded public key.\n" "This functionality is only intended for use with non-watchonly addresses.\n" @@ -1186,6 +1185,7 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) " ...,\n" " ]\n" "3. \"account\" (string, optional) DEPRECATED. An account to assign the addresses to.\n" + "4. \"address_type\" (string, optional) The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\". Default is set by -addresstype.\n" "\nResult:\n" "{\n" @@ -1224,10 +1224,18 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) } } + OutputType output_type = g_address_type; + if (!request.params[3].isNull()) { + output_type = ParseOutputType(request.params[3].get_str(), output_type); + if (output_type == OUTPUT_TYPE_NONE) { + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Unknown address type '%s'", request.params[3].get_str())); + } + } + // Construct using pay-to-script-hash: CScript inner = CreateMultisigRedeemscript(required, pubkeys); pwallet->AddCScript(inner); - CTxDestination dest = pwallet->AddAndGetDestinationForScript(inner, g_address_type); + CTxDestination dest = pwallet->AddAndGetDestinationForScript(inner, output_type); pwallet->SetAddressBook(dest, strAccount, "send"); // Return old style interface @@ -3078,7 +3086,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) " for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n" "3. iswitness (boolean, optional) Whether the transaction hex is a serialized witness transaction \n" " If iswitness is not present, heuristic tests will be used in decoding\n" - + "\nResult:\n" "{\n" " \"hex\": \"value\", (string) The resulting raw transaction (hex-encoded string)\n" @@ -3531,7 +3539,7 @@ static const CRPCCommand commands[] = { "hidden", "resendwallettransactions", &resendwallettransactions, {} }, { "wallet", "abandontransaction", &abandontransaction, {"txid"} }, { "wallet", "abortrescan", &abortrescan, {} }, - { "wallet", "addmultisigaddress", &addmultisigaddress, {"nrequired","keys","account"} }, + { "wallet", "addmultisigaddress", &addmultisigaddress, {"nrequired","keys","account","address_type"} }, { "hidden", "addwitnessaddress", &addwitnessaddress, {"address","p2sh"} }, { "wallet", "backupwallet", &backupwallet, {"destination"} }, { "wallet", "bumpfee", &bumpfee, {"txid", "options"} }, |