diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-31 15:01:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-31 15:03:03 +0200 |
| commit | 84c5f77deb243a73c1c3d1b9950277e6ec99ec14 (patch) | |
| tree | 4992304e8b3458f82e241896a7d6c76af2071343 | |
| parent | b7bba43a14a641b6b64bbf48357b2987c1b05800 (diff) | |
| download | bitcoin-84c5f77deb243a73c1c3d1b9950277e6ec99ec14.tar.xz | |
English translation update
This is needed to add version 0.10.x on Transifex so that translation
can start.
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 32 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 1258 |
2 files changed, 751 insertions, 539 deletions
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index e852c468a8..9ac7f24867 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -38,6 +38,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Bind to given address and always listen on it. Use [host]:port notation for " "IPv6"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Bind to given address and whitelist peers connecting to it. Use [host]:port " +"notation for IPv6"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Bind to given address to listen for JSON-RPC connections. Use [host]:port " "notation for IPv6. This option can be specified multiple times (default: " "bind to all interfaces)"), @@ -48,6 +51,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Continuously rate-limit free transactions to <n>*1000 bytes per minute " "(default:15)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Create new files with system default permissions, instead of umask 077 (only " +"effective with disabled wallet functionality)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Delete all wallet transactions and only recover those part of the blockchain " "through -rescan on startup"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -66,6 +72,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Error: This transaction requires a transaction fee of at least %s because of " "its amount, complexity, or use of recently received funds!"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Error: Unsupported argument -socks found. Setting SOCKS version isn't " +"possible anymore, only SOCKS5 proxies are supported."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Execute command when a network tx respends wallet tx input (%s=respend TxID, " "%t=wallet TxID)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -102,6 +111,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Output debugging information (default: 0, supplying <category> is optional)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Query for peer addresses via DNS lookup, if low on addresses (default: 1 " +"unless -connect)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " @@ -141,6 +153,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as " "wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect " "you should restore from a backup."), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Whitelist peers connecting from the given netmask or ip. Can be specified " +"multiple times."), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"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"), QT_TRANSLATE_NOOP("bitcoin-core", "(default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "(default: wallet.dat)"), QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"), @@ -148,14 +166,16 @@ 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", "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: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"), +QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -whitebind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS proxy"), +QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) 2009-%i The Bitcoin Core Developers"), @@ -191,7 +211,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write to coin database"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee (in BTC/kB) to add to transactions you send (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), QT_TRANSLATE_NOOP("bitcoin-core", "Force safe mode (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), @@ -210,6 +229,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'") QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), +QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable blocks in memory (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Limit size of signature cache to <n> entries (default: 50000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"), @@ -221,6 +241,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Maintain a full transaction index (default: 0 QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: 125)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Node relay options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."), QT_TRANSLATE_NOOP("bitcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"), @@ -236,11 +257,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Randomly drop 1 of every <n> network messages QT_TRANSLATE_NOOP("bitcoin-core", "Randomly fuzz 1 of every <n> network messages"), QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"), QT_TRANSLATE_NOOP("bitcoin-core", "Relay and mine data carrier transactions (default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Relay non-P2SH multisig (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Run a thread to flush wallet periodically (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), -QT_TRANSLATE_NOOP("bitcoin-core", "Select SOCKS version for -proxy (4 or 5, default: 5)"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), @@ -251,7 +272,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)" QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"), QT_TRANSLATE_NOOP("bitcoin-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Show benchmark information (default: 0)"), 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", "Specify configuration file (default: bitcoin.conf)"), @@ -272,7 +292,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must be positive"), 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", "Unknown -socks proxy version requested: %i"), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format"), QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections"), @@ -286,8 +305,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s") QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Unsupported argument -benchmark ignored, use -debug=bench."), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Unsupported argument -debugnet ignored, use -debug=net."), 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", "on startup"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 4b541eabe9..6739ef0021 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -2,50 +2,6 @@ <!DOCTYPE TS> <TS version="2.1" language="en"> <context> - <name>AboutDialog</name> - <message> - <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin Core</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+39"/> - <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+57"/> - <source> -This is experimental software. - -Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> - <translation> -This is experimental software. - -Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation> - </message> - <message> - <location filename="../utilitydialog.cpp" line="+29"/> - <source>Copyright</source> - <translation>Copyright</translation> - </message> - <message> - <location line="+0"/> - <source>The Bitcoin Core developers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+12"/> - <location line="+2"/> - <source>(%1-bit)</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>AddressBookPage</name> <message> <location filename="../forms/addressbookpage.ui" line="+30"/> @@ -164,7 +120,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <location line="+1"/> - <source>There was an error trying to save the address list to %1.</source> + <source>There was an error trying to save the address list to %1. Please try again.</source> <translation type="unfinished"></translation> </message> </context> @@ -209,12 +165,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Repeat new passphrase</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+40"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</translation> - </message> - <message> - <location line="+1"/> + <location filename="../askpassphrasedialog.cpp" line="+41"/> <source>Encrypt wallet</source> <translation>Encrypt wallet</translation> </message> @@ -281,7 +232,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Wallet encrypted</translation> </message> <message> - <location line="-56"/> + <location line="-135"/> + <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> + </message> + <message> + <location line="+79"/> <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> <translation>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</translation> </message> @@ -330,27 +286,27 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+294"/> + <location filename="../bitcoingui.cpp" line="+300"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+335"/> + <location line="+339"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-407"/> + <location line="-411"/> <source>&Overview</source> <translation>&Overview</translation> </message> <message> - <location line="-136"/> + <location line="-142"/> <source>Node</source> <translation type="unfinished"></translation> </message> <message> - <location line="+137"/> + <location line="+143"/> <source>Show general overview of wallet</source> <translation>Show general overview of wallet</translation> </message> @@ -426,7 +382,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="+325"/> + <location line="+329"/> <source>Importing blocks from disk...</source> <translation>Importing blocks from disk...</translation> </message> @@ -436,7 +392,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-405"/> + <location line="-409"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -471,17 +427,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="+440"/> + <location line="+437"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-652"/> + <location line="-655"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+145"/> + <location line="+151"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -537,18 +493,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Tabs toolbar</translation> </message> <message> - <location line="-283"/> - <location line="+375"/> + <location line="-289"/> + <location line="+386"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-400"/> + <location line="-411"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> <message> - <location line="+162"/> + <location line="+168"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"></translation> </message> @@ -584,13 +540,13 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="+159"/> + <location line="+164"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+142"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -603,17 +559,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>No block source available...</translation> </message> <message> - <location line="+12"/> - <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation>Processed %1 of %2 (estimated) blocks of transaction history.</translation> - </message> - <message> - <location line="+4"/> + <location line="+10"/> <source>Processed %1 blocks of transaction history.</source> <translation>Processed %1 blocks of transaction history.</translation> </message> <message numerus="yes"> - <location line="+27"/> + <location line="+26"/> <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> @@ -691,7 +642,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Catching up...</translation> </message> <message> - <location line="+130"/> + <location line="+126"/> <source>Sent transaction</source> <translation>Sent transaction</translation> </message> @@ -723,16 +674,11 @@ Address: %4 <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> - <message> - <location filename="../bitcoin.cpp" line="+447"/> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation> - </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+137"/> + <location filename="../clientmodel.cpp" line="+138"/> <source>Network Alert</source> <translation>Network Alert</translation> </message> @@ -771,7 +717,7 @@ Address: %4 </message> <message> <location line="+32"/> - <source>Low Output:</source> + <source>Dust:</source> <translation type="unfinished"></translation> </message> <message> @@ -830,7 +776,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+41"/> + <location filename="../coincontroldialog.cpp" line="+43"/> <source>Copy address</source> <translation type="unfinished">Copy address</translation> </message> @@ -887,7 +833,7 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Copy low output</source> + <source>Copy dust</source> <translation type="unfinished"></translation> </message> <message> @@ -896,17 +842,17 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+332"/> + <location line="+333"/> <source>highest</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+0"/> <source>higher</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+0"/> <source>high</source> <translation type="unfinished"></translation> </message> @@ -916,17 +862,18 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+0"/> + <location line="+12"/> <source>medium</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="-11"/> <source>low-medium</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+0"/> <source>low</source> <translation type="unfinished"></translation> </message> @@ -936,27 +883,27 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+11"/> <source>lowest</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+10"/> <source>(%1 locked)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+28"/> <source>none</source> <translation type="unfinished"></translation> </message> <message> - <location line="+141"/> - <source>Dust</source> + <location line="+162"/> + <source>Can vary +/- %1 satoshi(s) per input.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+0"/> + <location line="-28"/> <source>yes</source> <translation type="unfinished"></translation> </message> @@ -966,7 +913,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> <translation type="unfinished"></translation> </message> @@ -997,23 +944,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <location line="+4"/> - <source>This means a fee of at least %1 is required.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-3"/> - <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>This label turns red, if the change is smaller than %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+43"/> + <location line="+50"/> <location line="+61"/> <source>(no label)</source> <translation type="unfinished">(no label)</translation> @@ -1128,12 +1059,7 @@ Address: %4 <context> <name>HelpMessageDialog</name> <message> - <location filename="../forms/helpmessagedialog.ui" line="+19"/> - <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../utilitydialog.cpp" line="+24"/> + <location filename="../utilitydialog.cpp" line="+29"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -1143,7 +1069,23 @@ Address: %4 <translation type="unfinished">version</translation> </message> <message> + <location line="+5"/> <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>About Bitcoin Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Command-line options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Usage:</source> <translation type="unfinished">Usage:</translation> </message> @@ -1318,6 +1260,16 @@ Address: %4 </message> <message> <location line="+160"/> + <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="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"></translation> </message> @@ -1332,7 +1284,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+194"/> + <location line="+174"/> <location line="+13"/> <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> <translation type="unfinished"></translation> @@ -1358,7 +1310,7 @@ Address: %4 <translation>&Reset Options</translation> </message> <message> - <location line="-337"/> + <location line="-327"/> <source>&Network</source> <translation>&Network</translation> </message> @@ -1403,7 +1355,7 @@ Address: %4 <translation>Map port using &UPnP</translation> </message> <message> - <location line="+19"/> + <location line="+29"/> <source>Proxy &IP:</source> <translation>Proxy &IP:</translation> </message> @@ -1418,16 +1370,6 @@ Address: %4 <translation>Port of the proxy (e.g. 9050)</translation> </message> <message> - <location line="+7"/> - <source>SOCKS &Version:</source> - <translation>SOCKS &Version:</translation> - </message> - <message> - <location line="+13"/> - <source>SOCKS version of the proxy (e.g. 5)</source> - <translation>SOCKS version of the proxy (e.g. 5)</translation> - </message> - <message> <location line="+36"/> <source>&Window</source> <translation>&Window</translation> @@ -1488,12 +1430,12 @@ Address: %4 <translation>&Display addresses in transaction list</translation> </message> <message> - <location line="-262"/> + <location line="-252"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> + <location line="+412"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1503,17 +1445,17 @@ Address: %4 <translation>&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+72"/> + <location filename="../optionsdialog.cpp" line="+68"/> <source>default</source> <translation>default</translation> </message> <message> - <location line="+61"/> + <location line="+63"/> <source>none</source> <translation type="unfinished"></translation> </message> <message> - <location line="+82"/> + <location line="+83"/> <source>Confirm options reset</source> <translation>Confirm options reset</translation> </message> @@ -1547,18 +1489,23 @@ Address: %4 <translation>Form</translation> </message> <message> - <location line="+50"/> - <location line="+231"/> + <location line="+52"/> + <location line="+394"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation> </message> <message> - <location line="-238"/> + <location line="-401"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+51"/> + <location line="+33"/> + <source>Watchonly:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+43"/> <source>Available:</source> <translation type="unfinished"></translation> </message> @@ -1583,12 +1530,12 @@ Address: %4 <translation>Immature:</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Mined balance that has not yet matured</source> <translation>Mined balance that has not yet matured</translation> </message> <message> - <location line="+16"/> + <location line="+23"/> <source>Total:</source> <translation>Total:</translation> </message> @@ -1598,12 +1545,40 @@ Address: %4 <translation>Your current total balance</translation> </message> <message> - <location line="+71"/> + <location line="+38"/> + <source>Your current balance in watchonly addresses</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <location line="+25"/> + <location line="+25"/> + <location line="+44"/> + <source>0 BTC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-72"/> + <source>Unconfirmed transactions to watchonly addresses</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+25"/> + <source>Mined balance in watchonly addresses that has not yet matured</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+44"/> + <source>Current total balance in watchonly addresses</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+67"/> <source><b>Recent transactions</b></source> <translation><b>Recent transactions</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+120"/> + <location filename="../overviewpage.cpp" line="+123"/> <location line="+1"/> <source>out of sync</source> <translation>out of sync</translation> @@ -1612,68 +1587,91 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+403"/> - <location line="+13"/> + <location filename="../paymentserver.cpp" line="+405"/> + <location line="+14"/> + <location line="+7"/> <source>URI handling</source> <translation type="unfinished">URI handling</translation> </message> <message> - <location line="+1"/> + <location line="-7"/> + <source>Invalid payment address %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> <translation type="unfinished">URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</translation> </message> <message> - <location line="+96"/> - <source>Requested payment amount of %1 is too small (considered dust).</source> + <location line="+14"/> + <source>Payment request file can not be read! This can be caused by an invalid payment request file.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-221"/> - <location line="+212"/> - <location line="+13"/> - <location line="+95"/> - <location line="+18"/> - <location line="+16"/> - <source>Payment request error</source> + <location line="+62"/> + <location line="+9"/> + <location line="+32"/> + <source>Payment request rejected</source> <translation type="unfinished"></translation> </message> <message> - <location line="-353"/> - <source>Cannot start bitcoin: click-to-pay handler</source> + <location line="-41"/> + <source>Payment request network doesn't match client network.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+58"/> - <source>Net manager warning</source> + <location line="+9"/> + <source>Payment request has expired.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> + <location line="+7"/> + <source>Payment request is not initialized.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> - <source>Payment request fetch URL is invalid: %1</source> + <location line="+34"/> + <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> - <source>Payment request file handling</source> + <location line="+113"/> + <source>Payment request can not be parsed!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source> + <location line="-366"/> + <location line="+219"/> + <location line="+34"/> + <location line="+98"/> + <location line="+14"/> + <location line="+18"/> + <source>Payment request error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-382"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+105"/> + <source>Payment request fetch URL is invalid: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <source>Payment request file handling</source> <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+105"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>Refund from %1</source> <translation type="unfinished"></translation> </message> @@ -1683,12 +1681,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+24"/> - <source>Payment request can not be parsed or processed!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+11"/> + <location line="+33"/> <source>Bad response from server %1</source> <translation type="unfinished"></translation> </message> @@ -1704,38 +1697,69 @@ Address: %4 </message> </context> <context> + <name>PeerTableModel</name> + <message> + <location filename="../peertablemodel.cpp" line="+117"/> + <source>Address</source> + <translation type="unfinished">Address</translation> + </message> + <message> + <location line="+0"/> + <source>User Agent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Start Height</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+7"/> - <location line="+13"/> - <source>Bitcoin</source> - <translation>Bitcoin</translation> + <location filename="../bitcoinunits.cpp" line="+200"/> + <source>Amount</source> + <translation type="unfinished">Amount</translation> </message> <message> - <location line="-19"/> - <source>Error: Specified data directory "%1" does not exist.</source> - <translation>Error: Specified data directory "%1" does not exist.</translation> + <location filename="../guiutil.cpp" line="+97"/> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <location line="+673"/> + <source>%1 d</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Error: Invalid combination of -regtest and -testnet.</source> + <location line="+2"/> + <source>%1 h</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 m</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> + <source>NETWORK</source> <translation type="unfinished"></translation> </message> <message> - <location line="+60"/> - <source>Bitcoin Core didn't yet exit safely...</source> + <location line="+3"/> + <source>UNKNOWN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../guiutil.cpp" line="+89"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <location line="+8"/> + <source>None</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1751,7 +1775,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+32"/> <source>Save QR Code</source> <translation type="unfinished">Save QR Code</translation> </message> @@ -1772,19 +1796,33 @@ Address: %4 <location line="+10"/> <location line="+23"/> <location line="+26"/> + <location line="+26"/> <location line="+23"/> <location line="+23"/> <location line="+36"/> <location line="+23"/> <location line="+36"/> <location line="+23"/> - <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+373"/> + <location line="+448"/> + <location line="+21"/> + <location line="+13"/> + <location line="+20"/> + <location line="+14"/> + <location line="+7"/> + <location line="+14"/> + <location line="+21"/> + <location line="+14"/> + <location line="+14"/> + <location line="+14"/> + <location line="+28"/> + <location line="+7"/> + <location line="+7"/> + <location filename="../rpcconsole.cpp" line="+633"/> <source>N/A</source> <translation>N/A</translation> </message> <message> - <location line="-223"/> + <location line="-868"/> <source>Client version</source> <translation>Client version</translation> </message> @@ -1809,6 +1847,11 @@ Address: %4 <translation>Using OpenSSL version</translation> </message> <message> + <location line="+26"/> + <source>Using BerkeleyDB version</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+49"/> <source>Startup time</source> <translation>Startup time</translation> @@ -1839,12 +1882,97 @@ Address: %4 <translation>Current number of blocks</translation> </message> <message> - <location line="+23"/> - <source>Estimated total blocks</source> - <translation>Estimated total blocks</translation> + <location line="+300"/> + <source>Received</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+23"/> + <location line="+80"/> + <source>Sent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+41"/> + <source>&Peers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Select a peer to view detailed information.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+41"/> + <source>Version:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Last Receive:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>User Agent:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Ping Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>Connection Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+21"/> + <source>Starting Height:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Bytes Sent:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Bytes Received:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Ban Score:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Direction:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Sync Node:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Last Send:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Services:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>IP Address/port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-631"/> <source>Last block time</source> <translation>Last block time</translation> </message> @@ -1874,24 +2002,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+64"/> - <location filename="../rpcconsole.cpp" line="-10"/> + <location filename="../rpcconsole.cpp" line="-236"/> <source>In:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+80"/> - <location filename="../rpcconsole.cpp" line="+1"/> + <location line="+1"/> <source>Out:</source> <translation type="unfinished"></translation> </message> <message> - <location line="-521"/> + <location filename="../forms/rpcconsole.ui" line="-354"/> <source>Build date</source> <translation>Build date</translation> </message> <message> - <location line="+206"/> + <location line="+183"/> <source>Debug log file</source> <translation>Debug log file</translation> </message> @@ -1921,7 +2047,7 @@ Address: %4 <translation>Type <b>help</b> for an overview of available commands.</translation> </message> <message> - <location line="+136"/> + <location line="+138"/> <source>%1 B</source> <translation type="unfinished"></translation> </message> @@ -1941,18 +2067,49 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>%1 m</source> + <location line="+93"/> + <source>Peer Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>%1 h</source> + <location line="+23"/> + <source>Node Detail</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <location line="+1"/> + <source>never</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>%1 secs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inbound</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Outbound</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>%1 h %2 m</source> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Fetching...</source> <translation type="unfinished"></translation> </message> </context> @@ -2085,7 +2242,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+56"/> + <location filename="../receiverequestdialog.cpp" line="+65"/> <source>Request payment to %1</source> <translation type="unfinished"></translation> </message> @@ -2148,12 +2305,12 @@ Address: %4 <translation type="unfinished">Message</translation> </message> <message> - <location line="+0"/> + <location line="+99"/> <source>Amount</source> <translation type="unfinished">Amount</translation> </message> <message> - <location line="+38"/> + <location line="-59"/> <source>(no label)</source> <translation type="unfinished">(no label)</translation> </message> @@ -2172,8 +2329,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+380"/> - <location line="+80"/> + <location filename="../sendcoinsdialog.cpp" line="+447"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -2223,12 +2379,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> - <source>Low Output:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+48"/> + <location line="+80"/> <source>After Fee:</source> <translation type="unfinished"></translation> </message> @@ -2263,7 +2414,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="-271"/> + <source>Dust:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+274"/> <source>Clear &All</source> <translation>Clear &All</translation> </message> @@ -2283,7 +2439,7 @@ Address: %4 <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-229"/> + <location filename="../sendcoinsdialog.cpp" line="-215"/> <source>Confirm send coins</source> <translation>Confirm send coins</translation> </message> @@ -2296,7 +2452,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-121"/> + <location line="-122"/> <source>Copy quantity</source> <translation type="unfinished"></translation> </message> @@ -2326,17 +2482,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Copy low output</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Copy change</source> <translation type="unfinished"></translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Total Amount %1 (= %2)</source> <translation type="unfinished"></translation> </message> @@ -2346,7 +2497,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+203"/> + <location line="+189"/> <source>The recipient address is not valid, please recheck.</source> <translation>The recipient address is not valid, please recheck.</translation> </message> @@ -2396,23 +2547,18 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-367"/> - <source>Are you sure you want to send?</source> + <location line="-504"/> + <source>Copy dust</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+171"/> - <source>Payment request expired</source> + <location line="+151"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> - <source>Invalid payment address %1</source> + <location line="+9"/> + <source>added as transaction fee</source> <translation type="unfinished"></translation> </message> </context> @@ -2431,17 +2577,12 @@ Address: %4 <translation>Pay &To:</translation> </message> <message> - <location line="+18"/> - <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Enter a label for this address to add it to your address book</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="+57"/> + <location filename="../forms/sendcoinsentry.ui" line="+75"/> <source>&Label:</source> <translation>&Label:</translation> </message> @@ -2456,7 +2597,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+33"/> + <source>The Bitcoin address to send the payment to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -2518,7 +2664,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+52"/> + <location filename="../utilitydialog.cpp" line="+51"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"></translation> </message> @@ -2547,8 +2693,8 @@ Address: %4 </message> <message> <location line="+18"/> - <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <source>The Bitcoin address to sign the message with</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> @@ -2620,8 +2766,8 @@ Address: %4 </message> <message> <location line="+21"/> - <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <source>The Bitcoin address the message was signed with</source> + <translation type="unfinished"></translation> </message> <message> <location line="+37"/> @@ -2639,17 +2785,12 @@ Address: %4 <translation>Reset all verify message fields</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+30"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="-1"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <source>Click "Sign Message" to generate signature</source> <translation>Click "Sign Message" to generate signature</translation> </message> <message> - <location line="+84"/> + <location line="+83"/> <location line="+80"/> <source>The entered address is invalid.</source> <translation>The entered address is invalid.</translation> @@ -2744,7 +2885,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+29"/> + <location filename="../transactiondesc.cpp" line="+33"/> <source>Open until %1</source> <translation>Open until %1</translation> </message> @@ -2798,39 +2939,45 @@ Address: %4 </message> <message> <location line="+5"/> - <location line="+17"/> + <location line="+13"/> + <location line="+72"/> <source>From</source> <translation>From</translation> </message> <message> - <location line="+1"/> - <location line="+22"/> - <location line="+58"/> + <location line="-71"/> + <location line="+20"/> + <location line="+69"/> <source>To</source> <translation>To</translation> </message> <message> - <location line="-77"/> - <location line="+2"/> + <location line="-87"/> <source>own address</source> <translation>own address</translation> </message> <message> - <location line="-2"/> + <location line="+0"/> + <location line="+69"/> + <source>watch-only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-67"/> <source>label</source> <translation>label</translation> </message> <message> - <location line="+37"/> + <location line="+34"/> <location line="+12"/> - <location line="+45"/> - <location line="+17"/> + <location line="+53"/> + <location line="+26"/> <location line="+53"/> <source>Credit</source> <translation>Credit</translation> </message> <message numerus="yes"> - <location line="-125"/> + <location line="-142"/> <source>matures in %n more block(s)</source> <translation> <numerusform>matures in %n more block</numerusform> @@ -2843,15 +2990,24 @@ Address: %4 <translation>not accepted</translation> </message> <message> - <location line="+44"/> - <location line="+8"/> - <location line="+15"/> + <location line="+59"/> + <location line="+25"/> <location line="+53"/> <source>Debit</source> <translation>Debit</translation> </message> <message> - <location line="-62"/> + <location line="-68"/> + <source>Total debit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Total credit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Transaction fee</source> <translation>Transaction fee</translation> </message> @@ -2908,16 +3064,18 @@ Address: %4 </message> <message> <location line="+1"/> + <location line="+1"/> <source>true</source> <translation>true</translation> </message> <message> - <location line="+0"/> + <location line="-1"/> + <location line="+1"/> <source>false</source> <translation>false</translation> </message> <message> - <location line="-230"/> + <location line="-242"/> <source>, has not been successfully broadcast yet</source> <translation>, has not been successfully broadcast yet</translation> </message> @@ -2930,7 +3088,7 @@ Address: %4 </translation> </message> <message> - <location line="+71"/> + <location line="+67"/> <source>unknown</source> <translation>unknown</translation> </message> @@ -2951,7 +3109,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+238"/> + <location filename="../transactiontablemodel.cpp" line="+237"/> <source>Date</source> <translation>Date</translation> </message> @@ -2966,12 +3124,7 @@ Address: %4 <translation>Address</translation> </message> <message> - <location line="+0"/> - <source>Amount</source> - <translation>Amount</translation> - </message> - <message> - <location line="+70"/> + <location line="+76"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"></translation> </message> @@ -3049,12 +3202,12 @@ Address: %4 <translation>Mined</translation> </message> <message> - <location line="+38"/> + <location line="+41"/> <source>(n/a)</source> <translation>(n/a)</translation> </message> <message> - <location line="+192"/> + <location line="+193"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaction status. Hover over this field to show number of confirmations.</translation> </message> @@ -3153,7 +3306,7 @@ Address: %4 <translation>Min amount</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Copy address</source> <translation>Copy address</translation> </message> @@ -3238,12 +3391,7 @@ Address: %4 <translation>Address</translation> </message> <message> - <location line="+1"/> - <source>Amount</source> - <translation>Amount</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>ID</source> <translation>ID</translation> </message> @@ -3259,6 +3407,14 @@ Address: %4 </message> </context> <context> + <name>UnitDisplayStatusBarControl</name> + <message> + <location filename="../bitcoingui.cpp" line="+101"/> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WalletFrame</name> <message> <location filename="../walletframe.cpp" line="+26"/> @@ -3269,7 +3425,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+258"/> + <location filename="../walletmodel.cpp" line="+280"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -3320,27 +3476,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+262"/> - <source>Usage:</source> - <translation>Usage:</translation> - </message> - <message> - <location line="-66"/> - <source>List commands</source> - <translation>List commands</translation> - </message> - <message> - <location line="-15"/> - <source>Get help for a command</source> - <translation>Get help for a command</translation> - </message> - <message> - <location line="+28"/> + <location filename="../bitcoinstrings.cpp" line="+249"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+32"/> + <location line="+28"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> @@ -3355,7 +3496,7 @@ Address: %4 <translation>Specify data directory</translation> </message> <message> - <location line="-46"/> + <location line="-44"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Listen for connections on <port> (default: 8333 or testnet: 18333)</translation> </message> @@ -3365,62 +3506,52 @@ Address: %4 <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-58"/> + <location line="-62"/> <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="+101"/> + <location line="+103"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-173"/> + <location line="-181"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> </message> <message> - <location line="-52"/> - <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> - <translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation> - </message> - <message> - <location line="+50"/> + <location line="-2"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+51"/> + <location line="+59"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+7"/> - <source>Bitcoin Core RPC client version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+88"/> + <location line="+99"/> <source>Run in the background as a daemon and accept commands</source> <translation>Run in the background as a daemon and accept commands</translation> </message> <message> - <location line="+43"/> + <location line="+36"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-137"/> + <location line="-134"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> </message> <message> - <location line="-117"/> + <location line="-154"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3445,42 +3576,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+12"/> + <location line="+15"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> - <translation>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <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> </message> <message> - <location line="+6"/> + <location line="+13"/> <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</translation> - </message> - <message> - <location line="+4"/> + <location line="+12"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Error: Listening for incoming connections failed (listen returned error %d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+5"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</translation> </message> @@ -3490,17 +3606,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</translation> </message> <message> - <location line="+6"/> + <location line="+12"/> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> </message> <message> - <location line="+6"/> - <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+12"/> <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> <translation type="unfinished"></translation> </message> @@ -3510,12 +3621,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+5"/> <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+15"/> <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> @@ -3530,7 +3641,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation> </message> <message> - <location line="+3"/> + <location line="+7"/> <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> <translation type="unfinished"></translation> </message> @@ -3570,7 +3681,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>(default: 1)</source> <translation type="unfinished"></translation> </message> @@ -3591,46 +3702,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Bitcoin Core Daemon</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> <source>Block creation options:</source> <translation>Block creation options:</translation> </message> <message> - <location line="+5"/> - <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Connect only to the specified node(s)</source> <translation>Connect only to the specified node(s)</translation> </message> <message> - <location line="+1"/> - <source>Connect through SOCKS proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+3"/> <source>Connection options:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Corrupted block database detected</source> <translation>Corrupted block database detected</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Debugging/Testing options:</source> <translation type="unfinished"></translation> </message> @@ -3680,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error: Disk space is low!</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Error: Wallet locked, unable to create transaction!</translation> </message> @@ -3745,22 +3836,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Failed to write undo data</translation> </message> <message> - <location line="+1"/> - <source>Fee per kB to add to transactions you send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation>Find peers using DNS lookup (default: 1 unless -connect)</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Force safe mode (default: 0)</source> <translation type="unfinished"></translation> </message> @@ -3770,7 +3846,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Generate coins (default: 0)</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>How many blocks to check at startup (default: 288, 0 = all)</translation> </message> @@ -3785,17 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>Incorrect or no genesis block found. Wrong datadir for network?</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>Invalid -onion address: '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+21"/> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> @@ -3805,22 +3881,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>RPC client options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Rebuild block chain index from current blk000??.dat files</translation> </message> <message> - <location line="+6"/> - <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+10"/> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"></translation> </message> @@ -3835,7 +3901,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set the number of threads to service RPC calls (default: 4)</translation> </message> <message> - <location line="+10"/> + <location line="+9"/> <source>Specify wallet file (within data directory)</source> <translation>Specify wallet file (within data directory)</translation> </message> @@ -3845,17 +3911,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>This is intended for regression testing tools and app development.</source> + <location line="+1"/> + <source>Stop running after importing blocks from disk (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> - <source>Usage (deprecated, use bitcoin-cli):</source> + <location line="+4"/> + <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+14"/> <source>Verifying blocks...</source> <translation>Verifying blocks...</translation> </message> @@ -3866,11 +3932,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Wait for RPC server to start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation>Wallet %s resides outside data directory %s</translation> </message> @@ -3880,12 +3941,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+5"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>You need to rebuild the database using -reindex to change -txindex</translation> </message> @@ -3895,31 +3951,166 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="-150"/> + <location line="-195"/> + <source>(default: 1, 1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <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> + <message> + <location line="+4"/> + <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+22"/> + <location line="+6"/> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Delete all wallet transactions and only recover those part of the blockchain through -rescan on startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Distributed under the MIT/X11 software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Execute command when a network tx respends wallet tx input (%s=respend TxID, %t=wallet TxID)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation> </message> <message> - <location line="+25"/> + <location line="+9"/> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for relaying (default: %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+103"/> + <location line="+11"/> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Whitelist peers connecting from the given netmask or ip. Can be specified multiple times.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <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> + <message> + <location line="+10"/> + <source>Always query for peer addresses via DNS lookup (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Cannot resolve -whitebind address: '%s'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Connect through SOCKS5 proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Could not parse -rpcbind value %s as network address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Include IP addresses in debug output (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Information</source> <translation>Information</translation> </message> <message> + <location line="+1"/> + <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Invalid amount for -minrelaytxfee=<amount>: '%s'</translation> @@ -3930,12 +4121,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid amount for -mintxfee=<amount>: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+3"/> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Limit size of signature cache to <n> entries (default: 50000)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> <translation type="unfinished"></translation> </message> @@ -3955,6 +4161,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</translation> </message> <message> + <location line="+1"/> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Node relay options:</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Only accept block chain matching built-in checkpoints (default: 1)</translation> @@ -3980,7 +4196,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>RPC server options:</source> <translation type="unfinished"></translation> </message> @@ -3995,18 +4211,18 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Run a thread to flush wallet periodically (default: 1)</source> + <location line="+2"/> + <source>Relay and mine data carrier transactions (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</translation> + <location line="+1"/> + <source>Relay non-P2SH multisig (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Send command to Bitcoin Core</source> + <location line="+3"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> <translation type="unfinished"></translation> </message> <message> @@ -4031,11 +4247,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Show benchmark information (default: 0)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> </message> @@ -4050,17 +4261,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Specify connection timeout in milliseconds (default: 5000)</translation> </message> <message> - <location line="+6"/> - <source>Start Bitcoin Core Daemon</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+7"/> <source>System error: </source> <translation>System error: </translation> </message> <message> - <location line="+5"/> + <location line="+2"/> + <source>This is experimental software.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>Transaction amount too small</source> <translation>Transaction amount too small</translation> </message> @@ -4075,7 +4286,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Transaction too large</translation> </message> <message> - <location line="+8"/> + <location line="+1"/> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Use UPnP to map the listening port (default: 0)</translation> </message> @@ -4090,29 +4306,34 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Username for JSON-RPC connections</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Warning: This version is obsolete, upgrade required!</translation> </message> <message> - <location line="+2"/> - <source>Zapping all transactions from wallet...</source> + <location line="+1"/> + <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>on startup</source> + <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Zapping all transactions from wallet...</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>version</source> - <translation type="unfinished">version</translation> + <source>on startup</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> @@ -4120,47 +4341,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-71"/> + <location line="-64"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-78"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Allow JSON-RPC connections from specified IP address</translation> - </message> - <message> - <location line="+95"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> - </message> - <message> <location line="-164"/> <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="+197"/> + <location line="+210"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Set key pool size to <n> (default: 100)</translation> </message> <message> - <location line="-12"/> + <location line="-8"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescan the block chain for missing wallet transactions</translation> </message> <message> - <location line="+43"/> + <location line="+36"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-34"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -4170,27 +4381,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="+20"/> + <location line="+19"/> <source>This help message</source> <translation>This help message</translation> </message> <message> - <location line="+7"/> - <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> - </message> - <message> - <location line="-126"/> + <location line="-118"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-40"/> + <location line="-42"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -4200,12 +4406,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation> </message> <message> - <location line="+113"/> + <location line="+110"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> </message> <message> - <location line="-115"/> + <location line="-112"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> @@ -4220,12 +4426,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unknown network specified in -onlynet: '%s'</translation> </message> <message> - <location line="-1"/> - <source>Unknown -socks proxy version requested: %i</source> - <translation>Unknown -socks proxy version requested: %i</translation> - </message> - <message> - <location line="-120"/> + <location line="-122"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -4235,7 +4436,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+54"/> + <location line="+56"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> @@ -4245,63 +4446,54 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid amount</translation> </message> <message> - <location line="-6"/> + <location line="-7"/> <source>Insufficient funds</source> <translation>Insufficient funds</translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Loading block index...</source> <translation>Loading block index...</translation> </message> <message> - <location line="-69"/> + <location line="-70"/> <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="+70"/> + <location line="+71"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-63"/> + <location line="-66"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>Cannot write default address</source> <translation>Cannot write default address</translation> </message> <message> - <location line="+81"/> + <location line="+86"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-68"/> + <location line="-73"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+100"/> + <location line="+101"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Error</source> <translation>Error</translation> </message> - <message> - <location line="-41"/> - <source>You must set rpcpassword=<password> in the configuration file: -%s -If the file does not exist, create it with owner-readable-only file permissions.</source> - <translation>You must set rpcpassword=<password> in the configuration file: -%s -If the file does not exist, create it with owner-readable-only file permissions.</translation> - </message> </context> </TS> |