diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 1afce2eb..cb09e93e 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -33,6 +33,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. Bitcoin is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Enter regression test mode, which uses a special chain in which blocks can " +"be solved instantly. This is intended for regression testing tools and app " +"development."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "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."), @@ -133,6 +137,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-4, default: 3)"), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"), +QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"), QT_TRANSLATE_NOOP("bitcoin-core", "Information"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 2006a529..7628b39b 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -143,7 +143,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 @@ -325,17 +325,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 @@ -375,7 +375,7 @@ This product includes software developed by the OpenSSL Project for use in the O Quit application - + Show information about Bitcoin Show information about Bitcoin @@ -395,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Options... - + &Encrypt Wallet... &Encrypt Wallet... @@ -410,7 +410,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... @@ -420,17 +420,17 @@ This product includes software developed by the OpenSSL Project for use in the O 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 - + Backup wallet to another location Backup wallet to another location @@ -455,18 +455,20 @@ This product includes software developed by the OpenSSL Project for use in the O &Verify message... - + + Bitcoin Bitcoin - + + Wallet Wallet - + &Send &Send @@ -481,12 +483,14 @@ This product includes software developed by the OpenSSL Project for use in the O &Addresses - + + &About Bitcoin &About Bitcoin - + + &Show / Hide &Show / Hide @@ -531,18 +535,19 @@ This product includes software developed by the OpenSSL Project for use in the O Tabs toolbar - - + + [testnet] [testnet] - + + Bitcoin client Bitcoin client - + %n active connection(s) to Bitcoin network %n active connection to Bitcoin network @@ -684,7 +689,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. @@ -692,7 +697,7 @@ Address: %4 ClientModel - + Network Alert Network Alert @@ -768,7 +773,7 @@ Address: %4 GUIUtil::HelpMessageBox - + Bitcoin-Qt Bitcoin-Qt @@ -982,7 +987,7 @@ Address: %4 &Apply - + default default @@ -1028,17 +1033,12 @@ Address: %4 - + The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. - - Balance: - Balance: - - - + Unconfirmed: Unconfirmed: @@ -1048,7 +1048,22 @@ Address: %4 Wallet - + + Confirmed: + Confirmed: + + + + Your current spendable balance + Your current spendable balance + + + + Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance + Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance + + + Immature: Immature: @@ -1058,19 +1073,19 @@ Address: %4 Mined balance that has not yet matured - - <b>Recent transactions</b> - <b>Recent transactions</b> + + Total: + Total: - - Your current balance - Your current balance + + Your current total balance + Your current total balance - - Total of transactions that have yet to be confirmed, and do not yet count toward the current balance - Total of transactions that have yet to be confirmed, and do not yet count toward the current balance + + <b>Recent transactions</b> + <b>Recent transactions</b> @@ -1082,7 +1097,7 @@ Address: %4 PaymentServer - + Cannot start bitcoin: click-to-pay handler Cannot start bitcoin: click-to-pay handler @@ -1120,7 +1135,7 @@ Address: %4 &Save As... - + Error encoding URI into QR Code. Error encoding URI into QR Code. @@ -1162,7 +1177,7 @@ Address: %4 - + N/A N/A @@ -1296,7 +1311,7 @@ Address: %4 SendCoinsDialog - + @@ -1347,12 +1362,13 @@ Address: %4 S&end - + + <b>%1</b> to %2 (%3) <b>%1</b> to %2 (%3) - + Confirm send coins Confirm send coins @@ -1662,7 +1678,7 @@ Address: %4 SplashScreen - + The Bitcoin developers The Bitcoin developers @@ -2096,7 +2112,7 @@ Address: %4 Show transaction details - + Export Transaction Data Export Transaction Data @@ -2172,7 +2188,7 @@ Address: %4 WalletView - + &Export &Export @@ -2182,7 +2198,7 @@ Address: %4 Export the data in the current tab to a file - + Backup Wallet Backup Wallet @@ -2215,12 +2231,12 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin version - + Usage: Usage: @@ -2235,12 +2251,12 @@ Address: %4 List commands - + Get help for a command Get help for a command - + Options: Options: @@ -2275,12 +2291,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 @@ -2290,17 +2306,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) @@ -2310,7 +2326,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 @@ -2320,12 +2336,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: @@ -2366,6 +2382,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. + Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development. + Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development. + + + 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. 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. @@ -2560,7 +2581,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. How thorough the block verification is (0-4, default: 3) - + + Incorrect or no genesis block found. Wrong datadir for network? + Incorrect or no genesis block found. Wrong datadir for network? + + + Not enough file descriptors available. Not enough file descriptors available. @@ -2585,7 +2611,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verifying wallet... - + + You need to rebuild the database using -reindex to change -txindex + 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 @@ -2595,7 +2626,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) - + Information Information @@ -2750,12 +2781,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Warning: This version is obsolete, upgrade required! - - You need to rebuild the databases using -reindex to change -txindex - You need to rebuild the databases using -reindex to change -txindex - - - + wallet.dat corrupt, salvage failed wallet.dat corrupt, salvage failed @@ -2765,22 +2791,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. 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 @@ -2810,12 +2836,12 @@ 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) - + This help message This help message @@ -2825,7 +2851,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy Connect through socks proxy @@ -2835,12 +2861,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 @@ -2850,17 +2876,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. 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' @@ -2875,7 +2901,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unknown -socks proxy version requested: %i - + Cannot resolve -bind address: '%s' Cannot resolve -bind address: '%s' @@ -2885,7 +2911,7 @@ 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' @@ -2905,7 +2931,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 @@ -2920,12 +2946,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Fee per KB to add to transactions you send - + Loading wallet... Loading wallet... - + Cannot downgrade wallet Cannot downgrade wallet @@ -2935,22 +2961,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot write default address - + Rescanning... Rescanning... - + Done loading Done loading - + To use the %s option To use the %s option - + Error Error