diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 2c3d859c8..dc506f049 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -31,8 +31,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. Bitcoin is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Corrupted block database detected. Please restart the client with -reindex."), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Error initializing database environment %s! To recover, BACKUP THAT " "DIRECTORY, then remove everything from it except for wallet.dat."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -43,6 +41,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", "" +"Execute command when a wallet transaction changes (%s in cmd is replaced by " +"TxID)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -97,7 +98,9 @@ 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 to a node to retrieve peer addresses, and disconnect"), +QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), @@ -105,6 +108,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Transaction creation failed!"), @@ -190,7 +194,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: QT_TRANSLATE_NOOP("bitcoin-core", "Use proxy to reach tor hidden services (default: same as -proxy)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), -QT_TRANSLATE_NOOP("bitcoin-core", "Verifying block database integrity..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Verifying database..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet integrity..."), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 39062d0a2..e05c018c2 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -414,16 +414,8 @@ This product includes software developed by the OpenSSL Project for use in the O Reindexing blocks on disk... Reindexing blocks on disk... - - - ~%n block(s) remaining - - ~%n block remaining - ~%n blocks remaining - - - + &Export... &Export... @@ -469,12 +461,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Bitcoin Bitcoin - + Wallet Wallet @@ -553,17 +545,56 @@ This product includes software developed by the OpenSSL Project for use in the O - - Processed %1 of %2 blocks of transaction history (%3% done). - Processed %1 of %2 blocks of transaction history (%3% done). + + Processed %1 of %2 (estimated) blocks of transaction history. + Processed %1 of %2 (estimated) blocks of transaction history. - + Processed %1 blocks of transaction history. Processed %1 blocks of transaction history. + + + %n hour(s) + + %n hour + %n hours + + + + + %n day(s) + + %n day + %n days + + + + + %n week(s) + + %n week + %n weeks + + - + + %1 behind + %1 behind + + + + Last received block was generated %1 ago. + Last received block was generated %1 ago. + + + + Transactions after this will not yet be visible. + Transactions after this will not yet be visible. + + + Error Error @@ -578,7 +609,7 @@ This product includes software developed by the OpenSSL Project for use in the O Information - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? @@ -592,55 +623,18 @@ This product includes software developed by the OpenSSL Project for use in the O The wallet data was successfully saved to the new location. The wallet data was successfully saved to the new location. - - - %n second(s) ago - - %n second ago - %n seconds ago - - - - - %n minute(s) ago - - %n minute ago - %n minutes ago - - - - - %n hour(s) ago - - %n hour ago - %n hours ago - - - - - %n day(s) ago - - %n day ago - %n days ago - - - + Up to date Up to date - + Catching up... Catching up... - - Last received block was generated %1. - Last received block was generated %1. - - - + Confirm transaction fee Confirm transaction fee @@ -710,7 +704,7 @@ Address: %4 There was an error trying to save the wallet data to the new location. - + 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. @@ -718,7 +712,7 @@ Address: %4 ClientModel - + Network Alert Network Alert @@ -751,7 +745,7 @@ Address: %4 The address associated with this address book entry. This can only be modified for sending addresses. - + New receiving address New receiving address @@ -794,7 +788,7 @@ Address: %4 GUIUtil::HelpMessageBox - + Bitcoin-Qt Bitcoin-Qt @@ -1008,7 +1002,7 @@ Address: %4 &Apply - + default default @@ -1115,6 +1109,14 @@ Address: %4 out of sync + + PaymentServer + + + Cannot start bitcoin: click-to-pay handler + Cannot start bitcoin: click-to-pay handler + + QRCodeDialog @@ -1454,7 +1456,7 @@ Address: %4 - + Enter a label for this address to add it to your address book Enter a label for this address to add it to your address book @@ -1690,7 +1692,7 @@ Address: %4 TransactionDesc - + Open until %1 Open until %1 @@ -1886,7 +1888,7 @@ Address: %4 TransactionTableModel - + Date Date @@ -2010,7 +2012,7 @@ Address: %4 TransactionView - + All All @@ -2106,7 +2108,7 @@ Address: %4 Show transaction details - + Export Transaction Data Export Transaction Data @@ -2174,12 +2176,12 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin version - + Usage: Usage: @@ -2219,12 +2221,12 @@ Address: %4 Generate coins - + Don't generate coins Don't generate coins - + Specify data directory Specify data directory @@ -2244,12 +2246,12 @@ Address: %4 Maintain at most <n> connections to peers (default: 125) - + Connect to a node to retrieve peer addresses, and disconnect Connect to a node to retrieve peer addresses, and disconnect - + Specify your own public address Specify your own public address @@ -2259,17 +2261,17 @@ Address: %4 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) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) @@ -2279,7 +2281,7 @@ 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 @@ -2289,12 +2291,12 @@ Address: %4 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) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2330,11 +2332,6 @@ If the file does not exist, create it with owner-readable-only file permissions. - Corrupted block database detected. Please restart the client with -reindex. - Corrupted block database detected. Please restart the client with -reindex. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. @@ -2348,6 +2345,11 @@ If the file does not exist, create it with owner-readable-only file permissions. Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds! Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds! + + + Execute command when a wallet transaction changes (%s in cmd is replaced by TxID) + Execute command when a wallet transaction changes (%s in cmd is replaced by TxID) + Set maximum size of high-priority/low-fee transactions in bytes (default: 27000) @@ -2405,9 +2407,19 @@ If the file does not exist, create it with owner-readable-only file permissions. + Corrupted block database detected + Corrupted block database detected + + + Discover own IP address (default: 1 when listening and no -externalip) Discover own IP address (default: 1 when listening and no -externalip) + + + Do you want to rebuild the block database now? + Do you want to rebuild the block database now? + Error initializing block database @@ -2419,7 +2431,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Error loading block database - + + Error opening block database + Error opening block database + + + Error: Disk space is low! Error: Disk space is low! @@ -2639,7 +2656,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Username for JSON-RPC connections - + + Verifying database... + Verifying database... + + + Warning Warning @@ -2664,22 +2686,22 @@ If the file does not exist, create it with owner-readable-only file permissions. 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 @@ -2709,12 +2731,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Server private key (default: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message This help message @@ -2724,7 +2746,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy Connect through socks proxy @@ -2734,12 +2756,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Loading addresses... - + Error loading wallet.dat: Wallet corrupted Error loading wallet.dat: Wallet corrupted @@ -2749,12 +2771,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Error loading wallet.dat: Wallet requires newer version of Bitcoin - - Verifying block database integrity... - Verifying block database integrity... - - - + Verifying wallet integrity... Verifying wallet integrity... @@ -2764,12 +2781,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat Error loading wallet.dat - + Invalid -proxy address: '%s' Invalid -proxy address: '%s' @@ -2784,7 +2801,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Unknown -socks proxy version requested: %i - + Cannot resolve -bind address: '%s' Cannot resolve -bind address: '%s' @@ -2794,7 +2811,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Cannot resolve -externalip address: '%s' - + Invalid amount for -paytxfee=<amount>: '%s' Invalid amount for -paytxfee=<amount>: '%s' @@ -2819,7 +2836,7 @@ If the file does not exist, create it with owner-readable-only file permissions. 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 @@ -2829,7 +2846,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Unable to bind to %s on this computer. Bitcoin is probably already running. - + Find peers using internet relay chat (default: 0) Find peers using internet relay chat (default: 0) @@ -2844,7 +2861,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Loading wallet... - + Cannot downgrade wallet Cannot downgrade wallet @@ -2859,17 +2876,17 @@ If the file does not exist, create it with owner-readable-only file permissions. Cannot write default address - + Rescanning... Rescanning... - + Done loading Done loading - + To use the %s option To use the %s option @@ -2879,7 +2896,7 @@ If the file does not exist, create it with owner-readable-only file permissions. 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.