diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 5 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 210 |
2 files changed, 123 insertions, 92 deletions
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 1afce2eb7c..cb09e93e76 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 2006a5296b..7628b39bd3 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 <translation>Send &Coins</translation> </message> <message> - <location line="+260"/> + <location line="+265"/> <source>Export Address Book Data</source> <translation>Export Address Book Data</translation> </message> @@ -325,17 +325,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+233"/> + <location filename="../bitcoingui.cpp" line="+257"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+280"/> + <location line="+268"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-349"/> + <location line="-343"/> <source>&Overview</source> <translation>&Overview</translation> </message> @@ -375,7 +375,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Quit application</translation> </message> <message> - <location line="+4"/> + <location line="+7"/> <source>Show information about Bitcoin</source> <translation>Show information about Bitcoin</translation> </message> @@ -395,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Options...</translation> </message> <message> - <location line="+6"/> + <location line="+9"/> <source>&Encrypt Wallet...</source> <translation>&Encrypt Wallet...</translation> </message> @@ -410,7 +410,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Change Passphrase...</translation> </message> <message> - <location line="+285"/> + <location line="+273"/> <source>Importing blocks from disk...</source> <translation>Importing blocks from disk...</translation> </message> @@ -420,17 +420,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-347"/> + <location line="-341"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> <message> - <location line="+49"/> + <location line="+52"/> <source>Modify configuration options for Bitcoin</source> <translation>Modify configuration options for Bitcoin</translation> </message> <message> - <location line="+9"/> + <location line="+12"/> <source>Backup wallet to another location</source> <translation>Backup wallet to another location</translation> </message> @@ -455,18 +455,20 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="-165"/> + <location line="-183"/> + <location line="+6"/> <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-530"/> + <location line="-536"/> + <location line="+6"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+101"/> + <location line="+107"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -481,12 +483,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Addresses</translation> </message> <message> - <location line="+22"/> + <location line="+23"/> + <location line="+2"/> <source>&About Bitcoin</source> <translation>&About Bitcoin</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> + <location line="+2"/> <source>&Show / Hide</source> <translation>&Show / Hide</translation> </message> @@ -531,18 +535,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Tabs toolbar</translation> </message> <message> - <location line="+17"/> - <location line="+10"/> + <location line="-228"/> + <location line="+288"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="+47"/> + <location line="-5"/> + <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+141"/> + <location line="+143"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -684,7 +689,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+111"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation> </message> @@ -692,7 +697,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+104"/> + <location filename="../clientmodel.cpp" line="+105"/> <source>Network Alert</source> <translation>Network Alert</translation> </message> @@ -768,7 +773,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+424"/> + <location filename="../guiutil.cpp" line="+493"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -982,7 +987,7 @@ Address: %4 <translation>&Apply</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+53"/> + <location filename="../optionsdialog.cpp" line="+54"/> <source>default</source> <translation>default</translation> </message> @@ -1028,17 +1033,12 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+166"/> + <location line="+202"/> <source>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.</source> <translation>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.</translation> </message> <message> - <location line="-124"/> - <source>Balance:</source> - <translation>Balance:</translation> - </message> - <message> - <location line="+29"/> + <location line="-131"/> <source>Unconfirmed:</source> <translation>Unconfirmed:</translation> </message> @@ -1048,7 +1048,22 @@ Address: %4 <translation>Wallet</translation> </message> <message> - <location line="+107"/> + <location line="+49"/> + <source>Confirmed:</source> + <translation>Confirmed:</translation> + </message> + <message> + <location line="+16"/> + <source>Your current spendable balance</source> + <translation>Your current spendable balance</translation> + </message> + <message> + <location line="+29"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</translation> + </message> + <message> + <location line="+13"/> <source>Immature:</source> <translation>Immature:</translation> </message> @@ -1058,19 +1073,19 @@ Address: %4 <translation>Mined balance that has not yet matured</translation> </message> <message> - <location line="+46"/> - <source><b>Recent transactions</b></source> - <translation><b>Recent transactions</b></translation> + <location line="+13"/> + <source>Total:</source> + <translation>Total:</translation> </message> <message> - <location line="-101"/> - <source>Your current balance</source> - <translation>Your current balance</translation> + <location line="+16"/> + <source>Your current total balance</source> + <translation>Your current total balance</translation> </message> <message> - <location line="+29"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</translation> + <location line="+53"/> + <source><b>Recent transactions</b></source> + <translation><b>Recent transactions</b></translation> </message> <message> <location filename="../overviewpage.cpp" line="+116"/> @@ -1082,7 +1097,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+107"/> + <location filename="../paymentserver.cpp" line="+109"/> <source>Cannot start bitcoin: click-to-pay handler</source> <translation>Cannot start bitcoin: click-to-pay handler</translation> </message> @@ -1120,7 +1135,7 @@ Address: %4 <translation>&Save As...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="+62"/> + <location filename="../qrcodedialog.cpp" line="+64"/> <source>Error encoding URI into QR Code.</source> <translation>Error encoding URI into QR Code.</translation> </message> @@ -1162,7 +1177,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+339"/> + <location filename="../rpcconsole.cpp" line="+343"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1296,7 +1311,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+124"/> + <location filename="../sendcoinsdialog.cpp" line="+128"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1347,12 +1362,13 @@ Address: %4 <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-59"/> + <location filename="../sendcoinsdialog.cpp" line="-62"/> + <location line="+2"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> to %2 (%3)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Confirm send coins</source> <translation>Confirm send coins</translation> </message> @@ -1662,7 +1678,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+22"/> + <location filename="../splashscreen.cpp" line="+23"/> <source>The Bitcoin developers</source> <translation>The Bitcoin developers</translation> </message> @@ -2096,7 +2112,7 @@ Address: %4 <translation>Show transaction details</translation> </message> <message> - <location line="+139"/> + <location line="+143"/> <source>Export Transaction Data</source> <translation>Export Transaction Data</translation> </message> @@ -2172,7 +2188,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+42"/> + <location filename="../walletview.cpp" line="+46"/> <source>&Export</source> <translation>&Export</translation> </message> @@ -2182,7 +2198,7 @@ Address: %4 <translation>Export the data in the current tab to a file</translation> </message> <message> - <location line="+193"/> + <location line="+197"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> @@ -2215,12 +2231,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+94"/> + <location filename="../bitcoinstrings.cpp" line="+98"/> <source>Bitcoin version</source> <translation>Bitcoin version</translation> </message> <message> - <location line="+102"/> + <location line="+103"/> <source>Usage:</source> <translation>Usage:</translation> </message> @@ -2235,12 +2251,12 @@ Address: %4 <translation>List commands</translation> </message> <message> - <location line="-12"/> + <location line="-13"/> <source>Get help for a command</source> <translation>Get help for a command</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>Options:</source> <translation>Options:</translation> </message> @@ -2275,12 +2291,12 @@ Address: %4 <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-48"/> + <location line="-49"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> </message> <message> - <location line="+82"/> + <location line="+83"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> @@ -2290,17 +2306,17 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-134"/> + <location line="-135"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> </message> <message> - <location line="-29"/> + <location line="-33"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation> </message> <message> - <location line="+27"/> + <location line="+31"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</translation> </message> @@ -2310,7 +2326,7 @@ Address: %4 <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Run in the background as a daemon and accept commands</source> <translation>Run in the background as a daemon and accept commands</translation> </message> @@ -2320,12 +2336,12 @@ Address: %4 <translation>Use the test network</translation> </message> <message> - <location line="-112"/> + <location line="-113"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> </message> <message> - <location line="-80"/> + <location line="-84"/> <source>%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. </message> <message> <location line="+3"/> + <source>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.</source> + <translation>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.</translation> + </message> + <message> + <location line="+4"/> <source>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.</source> <translation>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.</translation> </message> @@ -2560,7 +2581,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>How thorough the block verification is (0-4, default: 3)</translation> </message> <message> - <location line="+19"/> + <location line="+2"/> + <source>Incorrect or no genesis block found. Wrong datadir for network?</source> + <translation>Incorrect or no genesis block found. Wrong datadir for network?</translation> + </message> + <message> + <location line="+18"/> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> @@ -2585,7 +2611,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verifying wallet...</translation> </message> <message> - <location line="-69"/> + <location line="+4"/> + <source>You need to rebuild the database using -reindex to change -txindex</source> + <translation>You need to rebuild the database using -reindex to change -txindex</translation> + </message> + <message> + <location line="-74"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> @@ -2595,7 +2626,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</translation> </message> <message> - <location line="+77"/> + <location line="+78"/> <source>Information</source> <translation>Information</translation> </message> @@ -2750,12 +2781,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Warning: This version is obsolete, upgrade required!</translation> </message> <message> - <location line="+1"/> - <source>You need to rebuild the databases using -reindex to change -txindex</source> - <translation>You need to rebuild the databases using -reindex to change -txindex</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrupt, salvage failed</translation> </message> @@ -2765,22 +2791,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-67"/> + <location line="-68"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-120"/> + <location line="-121"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+147"/> + <location line="+148"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> @@ -2810,12 +2836,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="-151"/> + <location line="-156"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+165"/> + <location line="+170"/> <source>This help message</source> <translation>This help message</translation> </message> @@ -2825,7 +2851,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-91"/> + <location line="-92"/> <source>Connect through socks proxy</source> <translation>Connect through socks proxy</translation> </message> @@ -2835,12 +2861,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+55"/> + <location line="+56"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -2850,17 +2876,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation> </message> <message> - <location line="+93"/> + <location line="+94"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> </message> <message> - <location line="-95"/> + <location line="-96"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> @@ -2875,7 +2901,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-96"/> + <location line="-97"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -2885,7 +2911,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+44"/> + <location line="+45"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> @@ -2905,7 +2931,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Loading block index...</translation> </message> <message> - <location line="-57"/> + <location line="-58"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Add a node to connect to and attempt to keep the connection open</translation> </message> @@ -2920,12 +2946,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-52"/> + <location line="-53"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -2935,22 +2961,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot write default address</translation> </message> <message> - <location line="+64"/> + <location line="+65"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-57"/> + <location line="-58"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+82"/> + <location line="+83"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Error</source> <translation>Error</translation> </message> |