diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 1073b6a47..af85df202 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -103,6 +103,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Maintain a full transaction index, used by the getrawtransaction rpc call " "(default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Maximum size of data in data carrier transactions we relay and mine " +"(default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Output debugging information (default: %u, supplying is optional)"), @@ -115,8 +118,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " "leave that many cores free, default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set the processor limit for when generation is on (-1 = unlimited, default: " -"%d)"), +"Set the number of threads for coin generation if enabled (-1 = all cores, " +"default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " "mining or merchant applications"), @@ -250,6 +253,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Run a thread to flush wallet periodically (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions as zero-fee transactions if possible (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index df285441e..ad63c5c08 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1,6 +1,6 @@ - + AddressBookPage @@ -150,7 +150,7 @@ Passphrase Dialog - + Enter passphrase Enter passphrase @@ -165,7 +165,7 @@ Repeat new passphrase - + Encrypt wallet Encrypt wallet @@ -200,7 +200,7 @@ Enter the old and new passphrase to the wallet. - + Confirm wallet encryption Confirm wallet encryption @@ -232,12 +232,12 @@ Wallet encrypted - + 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>. - + 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. 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. @@ -286,7 +286,7 @@ BitcoinGUI - + Sign &message... Sign &message... @@ -296,7 +296,7 @@ Synchronizing with network... - + &Overview &Overview @@ -321,7 +321,7 @@ Browse transaction history - + E&xit E&xit @@ -392,12 +392,12 @@ Reindexing blocks on disk... - + Send coins to a Bitcoin address Send coins to a Bitcoin address - + Modify configuration options for Bitcoin Modify configuration options for Bitcoin @@ -432,7 +432,7 @@ Bitcoin - + Wallet Wallet @@ -447,7 +447,7 @@ &Receive - + Show information about Bitcoin Core @@ -497,7 +497,7 @@ Tabs toolbar - + Bitcoin Core Bitcoin Core @@ -507,7 +507,7 @@ - + &About Bitcoin Core @@ -672,7 +672,7 @@ Address: %4 ClientModel - + Network Alert Network Alert @@ -681,7 +681,7 @@ Address: %4 CoinControlDialog - Coin Control Address Selection + Coin Selection @@ -735,19 +735,24 @@ Address: %4 - + List mode - + Amount Amount - - Address - Address + + Received with label + + + + + Received with address + @@ -770,7 +775,7 @@ Address: %4 - + Copy address Copy address @@ -836,17 +841,17 @@ Address: %4 - + highest - + higher - + high @@ -856,18 +861,17 @@ Address: %4 - - + medium - + low-medium - + low @@ -877,7 +881,7 @@ Address: %4 - + lowest @@ -892,12 +896,12 @@ Address: %4 - + Can vary +/- %1 satoshi(s) per input. - + yes @@ -938,7 +942,7 @@ Address: %4 - + (no label) (no label) @@ -1224,17 +1228,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. - - - - Pay transaction &fee - Pay transaction &fee - - - + Automatically start Bitcoin after logging in to the system. Automatically start Bitcoin after logging in to the system. @@ -1259,7 +1253,7 @@ Address: %4 - + Accept connections from outside @@ -1269,17 +1263,7 @@ Address: %4 - - Connect to the Bitcoin network through a SOCKS proxy. - - - - - &Connect through SOCKS proxy (default proxy): - - - - + IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1) @@ -1315,7 +1299,7 @@ Address: %4 &Network - + (0 = auto, <0 = leave that many cores free) @@ -1325,7 +1309,7 @@ Address: %4 - + Expert @@ -1345,7 +1329,7 @@ Address: %4 - + 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. @@ -1355,7 +1339,17 @@ Address: %4 Map port using &UPnP - + + Connect to the Bitcoin network through a SOCKS5 proxy. + + + + + &Connect through SOCKS5 proxy (default proxy): + + + + Proxy &IP: Proxy &IP: @@ -1420,12 +1414,12 @@ Address: %4 Choose the default subdivision unit to show in the interface and when sending coins. - + Whether to show coin control features or not. - + &OK &OK @@ -1435,17 +1429,17 @@ Address: %4 &Cancel - + default default - + none - + Confirm options reset Confirm options reset @@ -1466,7 +1460,7 @@ Address: %4 - + The supplied proxy address is invalid. The supplied proxy address is invalid. @@ -2268,7 +2262,7 @@ Address: %4 RecentRequestsTableModel - + Date Date @@ -2307,7 +2301,7 @@ Address: %4 SendCoinsDialog - + Send Coins Send Coins @@ -2377,7 +2371,98 @@ Address: %4 - + + Transaction Fee: + + + + + Choose... + + + + + collapse fee-settings + + + + + Minimize + + + + + If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte. + + + + + per kilobyte + + + + + If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte. + + + + + total at least + + + + + + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process. + + + + + (read the tooltip) + + + + + Recommended: + + + + + Custom: + + + + + (Smart fee not initialized yet. This usually takes a few blocks...) + + + + + Confirmation time: + + + + + normal + + + + + fast + + + + + Send as zero-fee transaction if possible + + + + + (confirmation may take longer) + + + + Send to multiple recipients at once Send to multiple recipients at once @@ -2392,12 +2477,12 @@ Address: %4 - + Dust: - + Clear &All Clear &All @@ -2417,12 +2502,12 @@ Address: %4 S&end - + Confirm send coins Confirm send coins - + @@ -2430,7 +2515,7 @@ Address: %4 - + Copy quantity @@ -2465,7 +2550,7 @@ Address: %4 - + Total Amount %1 (= %2) @@ -2475,7 +2560,7 @@ Address: %4 - + The recipient address is not valid, please recheck. The recipient address is not valid, please recheck. @@ -2510,7 +2595,22 @@ Address: %4 - + + A fee higher than %1 is considered an insanely high fee. + + + + + Pay only the minimum fee of %1 + + + + + Estimated to begin confirmation within %1 block(s). + + + + Warning: Invalid Bitcoin address @@ -2525,12 +2625,12 @@ Address: %4 - + Copy dust - + Are you sure you want to send? @@ -3087,7 +3187,7 @@ Address: %4 TransactionTableModel - + Date Date @@ -3102,7 +3202,7 @@ Address: %4 Address - + Immature (%1 confirmations, will be available after %2) @@ -3418,7 +3518,7 @@ Address: %4 WalletModel - + Send Coins Send Coins @@ -3436,7 +3536,7 @@ Address: %4 Export the data in the current tab to a file - + Backup Wallet Backup Wallet @@ -3469,27 +3569,27 @@ Address: %4 bitcoin-core - + Options: Options: - + Specify data directory Specify data directory - + 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 - + Accept command line and JSON-RPC commands Accept command line and JSON-RPC commands @@ -3499,17 +3599,17 @@ Address: %4 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) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3569,7 +3669,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d) @@ -3744,7 +3844,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Rebuild block chain index from current blk000??.dat files - + Set database cache size in megabytes (%d to %d, default: %d) @@ -3794,12 +3894,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 - + 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 @@ -3864,7 +3964,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Maximum size of data in data carrier transactions we relay and mine (default: %u) + + + + Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect) @@ -3874,7 +3979,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Set the number of threads for coin generation if enabled (-1 = all cores, default: %d) + + + + 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. @@ -4003,6 +4113,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Send trace/debug info to console instead of debug.log file Send trace/debug info to console instead of debug.log file + + + Send transactions as zero-fee transactions if possible (default: %u) + + Show all debugging options (usage: --help -help-debug) @@ -4094,27 +4209,27 @@ 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 - + 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 - + Rescan the block chain for missing wallet transactions Rescan the block chain for missing wallet transactions - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections @@ -4124,7 +4239,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. This help message - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect @@ -4139,7 +4254,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error loading wallet.dat: Wallet corrupted - + (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) @@ -4169,7 +4284,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Number of seconds to keep misbehaving peers from reconnecting (default: %u) @@ -4179,12 +4294,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the processor limit for when generation is on (-1 = unlimited, default: %d) - - - - + Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -4299,7 +4409,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Server certificate file (default: %s) @@ -4364,7 +4474,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unknown network specified in -onlynet: '%s' - + Cannot resolve -bind address: '%s' Cannot resolve -bind address: '%s' @@ -4424,12 +4534,12 @@ 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