diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index b88c7ec29..c853fd10b 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -116,6 +116,7 @@ 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 write default address"), +QT_TRANSLATE_NOOP("bitcoin-core", "Clear list of wallet transactions (diagnostic tool; implies -rescan)"), 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 to JSON-RPC on (default: 8332 or testnet: 18332)"), @@ -204,6 +205,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), +QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin server"), QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), @@ -234,6 +236,7 @@ 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", "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", "version"), QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), }; diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index cfbd86638..628847e03 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -38,6 +38,12 @@ This product includes software developed by the OpenSSL Project for use in the O The Bitcoin Core developers + + + + (%1-bit) + + AddressBookPage @@ -704,7 +710,7 @@ Address: %4 Wallet is <b>encrypted</b> and currently <b>locked</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -765,7 +771,7 @@ Address: %4 - + (un)select all @@ -780,7 +786,7 @@ Address: %4 - + Amount Amount @@ -931,7 +937,7 @@ Address: %4 - + Dust @@ -1113,7 +1119,7 @@ Address: %4 - + Bitcoin Core Bitcoin Core @@ -1257,7 +1263,7 @@ Address: %4 &Main - + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1267,7 +1273,7 @@ Address: %4 Pay transaction &fee - + Automatically start Bitcoin after logging in to the system. Automatically start Bitcoin after logging in to the system. @@ -1282,12 +1288,7 @@ Address: %4 - - Set database cache size in megabytes (default: 25) - Set database cache size in megabytes (default: 25) - - - + MB @@ -1302,7 +1303,12 @@ Address: %4 Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) - + + &Spend unconfirmed change (experts only) + + + + Connect to the Bitcoin network through a SOCKS proxy. @@ -1337,7 +1343,17 @@ Address: %4 &Network - + + W&allet + + + + + If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed. + + + + Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. @@ -1452,17 +1468,17 @@ Address: %4 &Cancel - + default default - + none - + Confirm options reset Confirm options reset @@ -1502,19 +1518,14 @@ Address: %4 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. - - Unconfirmed: - Unconfirmed: - - - + Wallet Wallet - Confirmed: - Confirmed: + Available: + @@ -1522,7 +1533,12 @@ Address: %4 Your current spendable balance - + + Pending: + + + + Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance @@ -2686,6 +2702,11 @@ Address: %4 + conflicted + + + + %1/offline %1/offline @@ -2853,7 +2874,7 @@ Address: %4 , has not been successfully broadcast yet - + Open for %n more block(s) Open for %n more block @@ -2861,7 +2882,7 @@ Address: %4 - + unknown unknown @@ -2902,12 +2923,12 @@ Address: %4 Amount - + Immature (%1 confirmations, will be available after %2) - + Open for %n more block(s) Open for %n more block @@ -2920,23 +2941,12 @@ Address: %4 Open until %1 - - Offline (%1 confirmations) - Offline (%1 confirmations) - - - - Unconfirmed (%1 of %2 confirmations) - Unconfirmed (%1 of %2 confirmations) - - - - + Confirmed (%1 confirmations) Confirmed (%1 confirmations) - + This block was not received by any other nodes and will probably not be accepted! This block was not received by any other nodes and will probably not be accepted! @@ -2946,7 +2956,27 @@ Address: %4 Generated but not accepted - + + Offline + + + + + Unconfirmed + + + + + Confirming (%1 of %2 recommended confirmations) + + + + + Conflicted + + + + Received with Received with @@ -2976,7 +3006,7 @@ Address: %4 (n/a) - + Transaction status. Hover over this field to show number of confirmations. Transaction status. Hover over this field to show number of confirmations. @@ -3242,12 +3272,12 @@ Address: %4 bitcoin-core - + Usage: Usage: - + List commands List commands @@ -3302,12 +3332,12 @@ Address: %4 Specify your own public address - + Threshold for disconnecting misbehaving peers (default: 100) Threshold for disconnecting misbehaving peers (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Number of seconds to keep misbehaving peers from reconnecting (default: 86400) @@ -3327,17 +3357,17 @@ Address: %4 Accept command line and JSON-RPC commands - + Run in the background as a daemon and accept commands Run in the background as a daemon and accept commands - + Use the test network Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) Accept connections from outside (default: 1 if no -proxy or -connect) @@ -3478,6 +3508,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. + Clear list of wallet transactions (diagnostic tool; implies -rescan) + + + + Connect only to the specified node(s) Connect only to the specified node(s) @@ -3688,6 +3723,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. + Spend unconfirmed change when sending transactions (default: 1) + + + + Start Bitcoin server @@ -3737,12 +3777,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. You need to rebuild the database using -reindex to change -txindex - + Imports blocks from external blk000??.dat file Imports blocks from external blk000??.dat file - + Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message) Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message) @@ -3762,7 +3802,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) - + Information Information @@ -3832,7 +3872,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Specify connection timeout in milliseconds (default: 5000) - + System error: System error: @@ -3878,6 +3918,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. + Zapping all transactions from wallet... + + + + version version @@ -3887,32 +3932,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrupt, salvage failed - + Password for JSON-RPC connections Password for JSON-RPC connections - + Allow JSON-RPC connections from specified IP address Allow JSON-RPC connections from specified IP address - + Send commands to node running on <ip> (default: 127.0.0.1) Send commands to node running on <ip> (default: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) Set key pool size to <n> (default: 100) @@ -3922,12 +3967,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Rescan the block chain for missing wallet transactions - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) Server certificate file (default: server.cert) @@ -3937,7 +3982,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Server private key (default: server.pem) - + This help message This help message @@ -3947,12 +3992,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unable to bind to %s on this computer (bind returned error %d, %s) - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Loading addresses... @@ -3967,12 +4012,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat Error loading wallet.dat @@ -3982,7 +4027,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' Unknown network specified in -onlynet: '%s' @@ -3992,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unknown -socks proxy version requested: %i - + Cannot resolve -bind address: '%s' Cannot resolve -bind address: '%s' @@ -4002,7 +4047,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot resolve -externalip address: '%s' - + Invalid amount for -paytxfee=<amount>: '%s' Invalid amount for -paytxfee=<amount>: '%s' @@ -4022,7 +4067,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Loading block index... - + Add a node to connect to and attempt to keep the connection open Add a node to connect to and attempt to keep the connection open @@ -4032,12 +4077,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unable to bind to %s on this computer. Bitcoin is probably already running. - + Loading wallet... Loading wallet... - + Cannot downgrade wallet Cannot downgrade wallet @@ -4047,7 +4092,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot write default address - + Rescanning... Rescanning... @@ -4057,17 +4102,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Done loading - + To use the %s option To use the %s option - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.