diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 219397db..5fe9e521 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -37,30 +37,34 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " "86400)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Set maximum size of high-priority/low-fee transactions in bytes (default: " +"27000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Unable to bind to %s on this computer. Bitcoin is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Warning: -paytxfee is set very high. This is the transaction fee you will " +"Warning: -paytxfee is set very high! This is the transaction fee you will " "pay if you send a transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Warning: Please check that your computer's date and time are correct. If " +"Warning: Displayed transactions may not be correct! You may need to upgrade, " +"or other nodes may need to upgrade."), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Warning: Please check that your computer's date and time are correct! If " "your clock is wrong Bitcoin will not work properly."), QT_TRANSLATE_NOOP("bitcoin-core", "" "You must set rpcpassword= in the configuration file:\n" "%s\n" "If the file does not exist, create it with owner-readable-only file " "permissions."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), 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", "Allow JSON-RPC connections from specified IP address"), -QT_TRANSLATE_NOOP("bitcoin-core", "An error occured while setting up the RPC port %i for listening: %s"), +QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred while setting up the RPC port %i for listening: %s"), QT_TRANSLATE_NOOP("bitcoin-core", "Bind to given address. Use [host]:port notation for IPv6"), 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"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), @@ -112,6 +116,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"), 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 in the background as a daemon and accept commands"), +QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "Select the version of socks proxy to use (4-5, default: 5)"), 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)"), @@ -123,6 +128,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database disk log size in megabytes (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to (default: 100)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: 250000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), @@ -143,6 +151,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use proxy to reach tor hidden services (defau QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), 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: this version is obsolete, upgrade required"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low!"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), }; \ No newline at end of file diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index c6baca2d..849ff47a 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -216,12 +216,22 @@ This product includes software developed by the OpenSSL Project for use in the O - WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet? + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! - + + Are you sure you wish to encrypt your wallet? + + + + + + Warning: The Caps Lock key is on! + + + + Wallet encrypted @@ -232,13 +242,7 @@ Are you sure you wish to encrypt your wallet? - - - Warning: The Caps Lock key is on. - - - - + @@ -292,12 +296,12 @@ Are you sure you wish to encrypt your wallet? - + Synchronizing with network... - + &Overview @@ -387,7 +391,7 @@ Are you sure you wish to encrypt your wallet? - + ~%n block(s) remaining ~%n block remaining @@ -395,12 +399,12 @@ Are you sure you wish to encrypt your wallet? - + Downloaded %1 of %2 blocks of transaction history (%3% done). - + &Export... @@ -530,12 +534,12 @@ Are you sure you wish to encrypt your wallet? - + Downloaded %1 blocks of transaction history. - + %n second(s) ago %n second ago @@ -661,7 +665,7 @@ Address: %4 ClientModel - + Network Alert @@ -951,12 +955,12 @@ Address: %4 - + default - + Warning @@ -968,7 +972,7 @@ Address: %4 - + The supplied proxy address is invalid. @@ -1557,7 +1561,7 @@ Address: %4 - Wallet unlock was canceled. + Wallet unlock was cancelled. @@ -2097,22 +2101,22 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands @@ -2127,7 +2131,7 @@ Address: %4 - + Specify configuration file (default: bitcoin.conf) @@ -2137,7 +2141,7 @@ Address: %4 - + Generate coins @@ -2147,12 +2151,12 @@ Address: %4 - + Specify data directory - + Set database cache size in megabytes (default: 25) @@ -2162,12 +2166,12 @@ Address: %4 - + Specify connection timeout (in milliseconds) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2182,22 +2186,22 @@ Address: %4 - + Specify your own public address - + Bind to given address. Use [host]:port notation for IPv6 - + Threshold for disconnecting misbehaving peers (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) @@ -2207,27 +2211,57 @@ Address: %4 - + Accept command line and JSON-RPC commands - + Run in the background as a daemon and accept commands - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) + + + Set maximum size of high-priority/low-fee transactions in bytes (default: 27000) + + + + + Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. + + + + + Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade. + + + + + Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly. + + + An error occurred while setting up the RPC port %i for listening: %s + + + + + Block creation options: + + + + Connect only to the specified node(s) @@ -2283,6 +2317,11 @@ Address: %4 + SSL options: (see the Bitcoin Wiki for SSL setup instructions) + + + + Select the version of socks proxy to use (4-5, default: 5) @@ -2297,7 +2336,22 @@ Address: %4 - + + Set maximum block size in bytes (default: 250000) + + + + + Set minimum block size in bytes (default: 0) + + + + + Shrink debug.log file on client startup (default: 1 when no -debug) + + + + Use UPnP to map the listening port (default: 0) @@ -2317,12 +2371,17 @@ Address: %4 - - Warning: this version is obsolete, upgrade required + + Warning: Disk space is low! - + + Warning: This version is obsolete, upgrade required! + + + + Password for JSON-RPC connections @@ -2332,32 +2391,32 @@ Address: %4 - + Allow JSON-RPC connections from specified IP address - + 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) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) - + Rescan the block chain for missing wallet transactions @@ -2377,18 +2436,12 @@ Address: %4 - - -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - - - - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2398,47 +2451,42 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - - Warning: Disk space is low - - - - + This help message - + Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - + Bitcoin - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... @@ -2458,12 +2506,12 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat @@ -2473,7 +2521,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Unknown network specified in -onlynet: '%s' @@ -2483,7 +2531,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Cannot resolve -bind address: '%s' @@ -2508,27 +2556,27 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds - + Error: Transaction creation failed - + Sending... - + 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. - + Invalid amount @@ -2543,7 +2591,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Add a node to connect to and attempt to keep the connection open @@ -2553,7 +2601,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Find peers using internet relay chat (default: 0) @@ -2563,12 +2611,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - - Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction. - - - - + Loading wallet... @@ -2598,12 +2641,12 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + To use the %s option - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2615,26 +2658,16 @@ If the file does not exist, create it with owner-readable-only file permissions. - + Error - - An error occured while setting up the RPC port %i for listening: %s - - - - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. - - - Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly. - -