diff --git a/src/init.cpp b/src/init.cpp index 66272e84..70a92333 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -334,7 +334,7 @@ std::string HelpMessage() " -rpcport= " + _("Listen for JSON-RPC connections on (default: 8332 or testnet: 18332)") + "\n" + " -rpcallowip= " + _("Allow JSON-RPC connections from specified IP address") + "\n" + " -rpcconnect= " + _("Send commands to node running on (default: 127.0.0.1)") + "\n" + - " -rpcthreads= " + _("Use this many threads to service RPC calls (default: 4)") + "\n" + + " -rpcthreads= " + _("Set the number of threads to service RPC calls (default: 4)") + "\n" + " -blocknotify= " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" + " -walletnotify= " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n" + " -alertnotify= " + _("Execute command when a relevant alert is received (%s in cmd is replaced by message)") + "\n" + @@ -347,7 +347,7 @@ std::string HelpMessage() " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n" + " -loadblock= " + _("Imports blocks from external blk000??.dat file") + "\n" + " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + "\n" + - " -par=N " + _("Set the number of script verification threads (1-16, 0=auto, default: 0)") + "\n" + + " -par= " + _("Set the number of script verification threads (1-16, 0=auto, default: 0)") + "\n" + "\n" + _("Block creation options:") + "\n" + " -blockminsize= " + _("Set minimum block size in bytes (default: 0)") + "\n" + diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 2c500f4f..4f3bb106 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -119,7 +119,6 @@ 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"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: system error: "), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read block info"), @@ -177,6 +176,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default 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", "Set the number of threads to service RPC calls (default: 4)"), 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 (default: 5000)"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index c74b11d3..105a5c6a 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -48,7 +48,7 @@ This product includes software developed by the OpenSSL Project for use in the O Address Book - + Double-click to edit address or label Double-click to edit address or label @@ -68,12 +68,12 @@ This product includes software developed by the OpenSSL Project for use in the O &New Address - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. - + &Copy Address &Copy Address @@ -113,7 +113,12 @@ This product includes software developed by the OpenSSL Project for use in the O &Delete - + + These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + + + Copy &Label Copy &Label @@ -128,7 +133,7 @@ This product includes software developed by the OpenSSL Project for use in the O Send &Coins - + Export Address Book Data Export Address Book Data @@ -310,7 +315,7 @@ This product includes software developed by the OpenSSL Project for use in the O BitcoinGUI - + Sign &message... Sign &message... @@ -320,7 +325,7 @@ This product includes software developed by the OpenSSL Project for use in the O Synchronizing with network... - + &Overview &Overview @@ -380,7 +385,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Options... - + &Encrypt Wallet... &Encrypt Wallet... @@ -410,7 +415,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Export... - + Send coins to a Bitcoin address Send coins to a Bitcoin address @@ -420,7 +425,7 @@ This product includes software developed by the OpenSSL Project for use in the O Modify configuration options for Bitcoin - + Export the data in the current tab to a file Export the data in the current tab to a file @@ -450,13 +455,13 @@ This product includes software developed by the OpenSSL Project for use in the O &Verify message... - - + + Bitcoin Bitcoin - + Wallet Wallet @@ -491,7 +496,7 @@ This product includes software developed by the OpenSSL Project for use in the O Show or hide the main Window - + Encrypt the private keys that belong to your wallet Encrypt the private keys that belong to your wallet @@ -679,7 +684,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. @@ -687,7 +692,7 @@ Address: %4 ClientModel - + Network Alert Network Alert @@ -763,7 +768,7 @@ Address: %4 GUIUtil::HelpMessageBox - + Bitcoin-Qt Bitcoin-Qt @@ -1157,7 +1162,7 @@ Address: %4 - + N/A N/A @@ -2146,117 +2151,7 @@ Address: %4 WalletView - - &Overview - &Overview - - - - Show general overview of wallet - Show general overview of wallet - - - - &Send coins - &Send coins - - - - Send coins to a Bitcoin address - Send coins to a Bitcoin address - - - - &Receive coins - &Receive coins - - - - Show the list of addresses for receiving payments - Show the list of addresses for receiving payments - - - - &Transactions - &Transactions - - - - Browse transaction history - Browse transaction history - - - - &Address Book - &Address Book - - - - Edit the list of stored addresses and labels - Edit the list of stored addresses and labels - - - - &Encrypt Wallet... - &Encrypt Wallet... - - - - Encrypt the private keys that belong to your wallet - Encrypt the private keys that belong to your wallet - - - - &Backup Wallet... - &Backup Wallet... - - - - Backup wallet to another location - Backup wallet to another location - - - - &Change Passphrase... - &Change Passphrase... - - - - Change the passphrase used for wallet encryption - Change the passphrase used for wallet encryption - - - - Sign &message... - Sign &message... - - - - Sign messages with your Bitcoin addresses to prove you own them - Sign messages with your Bitcoin addresses to prove you own them - - - - &Verify message... - &Verify message... - - - - Verify messages to ensure they were signed with specified Bitcoin addresses - Verify messages to ensure they were signed with specified Bitcoin addresses - - - - &Export... - &Export... - - - - Export the data in the current tab to a file - Export the data in the current tab to a file - - - + Backup Wallet Backup Wallet @@ -2299,7 +2194,7 @@ Address: %4 Usage: - + Send command to -server or bitcoind Send command to -server or bitcoind @@ -2319,7 +2214,7 @@ Address: %4 Options: - + Specify configuration file (default: bitcoin.conf) Specify configuration file (default: bitcoin.conf) @@ -2329,12 +2224,12 @@ Address: %4 Specify pid file (default: bitcoind.pid) - + Generate coins Generate coins - + Don't generate coins Don't generate coins @@ -2344,7 +2239,7 @@ Address: %4 Specify data directory - + Set database cache size in megabytes (default: 25) Set database cache size in megabytes (default: 25) @@ -2359,7 +2254,7 @@ 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 @@ -2394,12 +2289,12 @@ 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 @@ -2579,7 +2474,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Wallet locked, unable to create transaction! - + Error: system error: Error: system error: @@ -2659,7 +2554,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Rebuild block chain index from current blk000??.dat files - + + Set the number of threads to service RPC calls (default: 4) + Set the number of threads to service RPC calls (default: 4) + + + Verifying blocks... Verifying blocks... @@ -2669,7 +2569,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verifying wallet... - + Imports blocks from external blk000??.dat file Imports blocks from external blk000??.dat file @@ -2754,7 +2654,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set minimum block size in bytes (default: 0) - + Shrink debug.log file on client startup (default: 1 when no -debug) Shrink debug.log file on client startup (default: 1 when no -debug) @@ -2809,22 +2709,22 @@ 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) @@ -2834,7 +2734,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) Set key pool size to <n> (default: 100) @@ -2844,12 +2744,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) @@ -2859,7 +2759,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. 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) @@ -2884,12 +2784,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Loading addresses... - + Error loading wallet.dat: Wallet corrupted Error loading wallet.dat: Wallet corrupted @@ -2909,12 +2809,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error loading wallet.dat - + Invalid -proxy address: '%s' Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' Unknown network specified in -onlynet: '%s' @@ -2934,17 +2834,12 @@ 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' - - Error: could not start node - Error: could not start node - - - + Invalid amount Invalid amount @@ -2959,7 +2854,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 @@ -2969,7 +2864,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unable to bind to %s on this computer. Bitcoin is probably already running. - + Fee per KB to add to transactions you send Fee per KB to add to transactions you send @@ -2979,7 +2874,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Loading wallet... - + Cannot downgrade wallet Cannot downgrade wallet @@ -2994,12 +2889,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot write default address - + Rescanning... Rescanning... - + Done loading Done loading