diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 497c0597..7fcb7acf 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -84,7 +84,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot initialize keypool"), @@ -102,6 +101,7 @@ 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"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Transaction creation failed!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: could not start node"), @@ -114,7 +114,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 2500, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-6, default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Importing blocks from block database..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000?.dat file"), +QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"), +QT_TRANSLATE_NOOP("bitcoin-core", "Information"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -tor address: '%s'"), @@ -128,6 +129,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most connections to peers (default: 125)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, *1000 bytes (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, *1000 bytes (default: 1000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network (IPv4, IPv6 or Tor)"), QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Output extra debugging information. Implies all other -debug* options"), @@ -144,7 +146,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind"), QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on (default: 127.0.0.1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to debugger"), -QT_TRANSLATE_NOOP("bitcoin-core", "Sending..."), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"), @@ -173,7 +174,7 @@ 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 database integrity..."), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low!"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), }; \ No newline at end of file diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index c70ea652..cb6f982d 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -300,17 +300,17 @@ This product includes software developed by the OpenSSL Project for use in the O BitcoinGUI - + Sign &message... Sign &message... - + Synchronizing with network... Synchronizing with network... - + &Overview &Overview @@ -400,7 +400,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Change Passphrase... - + Importing blocks from disk... Importing blocks from disk... @@ -418,7 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Export... &Export... @@ -464,11 +464,12 @@ This product includes software developed by the OpenSSL Project for use in the O + Bitcoin Bitcoin - + Wallet Wallet @@ -534,12 +535,12 @@ This product includes software developed by the OpenSSL Project for use in the O [testnet] - + Bitcoin client Bitcoin client - + %n active connection(s) to Bitcoin network %n active connection to Bitcoin network @@ -557,12 +558,37 @@ This product includes software developed by the OpenSSL Project for use in the O Processed %1 blocks of transaction history. - + + Error + Error + + + + Warning + Warning + + + + Information + 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? + + + Backup Successful + Backup Successful + + + + 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 @@ -609,17 +635,17 @@ This product includes software developed by the OpenSSL Project for use in the O Last received block was generated %1. - + Confirm transaction fee Confirm transaction fee - + Sent transaction Sent transaction - + Incoming transaction Incoming transaction @@ -637,19 +663,19 @@ Address: %4 - - + + URI handling URI handling - - + + URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters. URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters. - + Wallet is <b>encrypted</b> and currently <b>unlocked</b> Wallet is <b>encrypted</b> and currently <b>unlocked</b> @@ -1447,12 +1473,11 @@ Address: %4 - &Sign Message &Sign Message - + You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. @@ -1499,7 +1524,12 @@ Address: %4 Sign the message to prove you own this Bitcoin address - + + Sign &Message + Sign &Message + + + Reset all sign message fields Reset all sign message fields @@ -1511,12 +1541,11 @@ Address: %4 - &Verify Message &Verify Message - + Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. @@ -1531,7 +1560,12 @@ Address: %4 Verify the message to ensure it was signed with the specified Bitcoin address - + + Verify &Message + Verify &Message + + + Reset all verify message fields Reset all verify message fields @@ -2102,14 +2136,6 @@ Address: %4 to - - WalletModel - - - Sending... - Sending... - - bitcoin-core @@ -2118,32 +2144,32 @@ Address: %4 Bitcoin version - + Usage: Usage: - + Send command to -server or bitcoind Send command to -server or bitcoind - + List commands List commands - + Get help for a command Get help for a command - + Options: Options: - + Specify configuration file (default: bitcoin.conf) Specify configuration file (default: bitcoin.conf) @@ -2153,17 +2179,17 @@ Address: %4 Specify pid file (default: bitcoind.pid) - + Generate coins Generate coins - + Don't generate coins Don't generate coins - + Specify data directory Specify data directory @@ -2183,12 +2209,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 @@ -2198,7 +2224,7 @@ 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) @@ -2218,17 +2244,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) @@ -2323,7 +2349,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Attempt to recover private keys from a corrupt wallet.dat - + Block creation options: Block creation options: @@ -2339,6 +2365,11 @@ If the file does not exist, create it with owner-readable-only file permissions. + Error: Disk space is low! + Error: Disk space is low! + + + Error: Transaction creation failed! Error: Transaction creation failed! @@ -2363,7 +2394,17 @@ If the file does not exist, create it with owner-readable-only file permissions. Importing blocks from block database... - + + Imports blocks from external blk000??.dat file + Imports blocks from external blk000??.dat file + + + + Information + Information + + + Invalid -tor address: '%s' Invalid -tor address: '%s' @@ -2377,6 +2418,11 @@ If the file does not exist, create it with owner-readable-only file permissions. Maximum per-connection send buffer, <n>*1000 bytes (default: 1000) Maximum per-connection send buffer, <n>*1000 bytes (default: 1000) + + + Only accept block chain matching built-in checkpoints (default: 1) + Only accept block chain matching built-in checkpoints (default: 1) + Only connect to nodes in network <net> (IPv4, IPv6 or Tor) @@ -2423,7 +2469,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Send trace/debug info to debugger - + Set maximum block size in bytes (default: 250000) Set maximum block size in bytes (default: 250000) @@ -2469,8 +2515,8 @@ If the file does not exist, create it with owner-readable-only file permissions. - Warning: Disk space is low! - Warning: Disk space is low! + Warning + Warning @@ -2483,27 +2529,27 @@ If the file does not exist, create it with owner-readable-only file permissions. 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 @@ -2513,12 +2559,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Set key pool size to <n> (default: 100) - + Rescan the block chain for missing wallet transactions Rescan the block chain for missing wallet transactions - + How many blocks to check at startup (default: 2500, 0 = all) How many blocks to check at startup (default: 2500, 0 = all) @@ -2528,12 +2574,7 @@ If the file does not exist, create it with owner-readable-only file permissions. How thorough the block verification is (0-6, default: 1) - - Imports blocks from external blk000?.dat file - Imports blocks from external blk000?.dat file - - - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections @@ -2548,42 +2589,37 @@ 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 - - Bitcoin - Bitcoin - - - + Unable to bind to %s on this computer (bind returned error %d, %s) Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Loading addresses... - + Error loading blkindex.dat Error loading blkindex.dat @@ -2598,17 +2634,17 @@ If the file does not exist, create it with owner-readable-only file permissions. 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 - + Invalid -proxy address: '%s' Invalid -proxy address: '%s' @@ -2623,7 +2659,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' @@ -2633,22 +2669,17 @@ 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' - + Error: could not start node Error: could not start node - - Sending... - Sending... - - - + Invalid amount Invalid amount @@ -2663,7 +2694,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 @@ -2683,12 +2714,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Fee per KB to add to transactions you send - + Loading wallet... Loading wallet... - + Cannot downgrade wallet Cannot downgrade wallet @@ -2703,27 +2734,27 @@ 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 - + 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.