diff options
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 3 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 205 |
2 files changed, 128 insertions, 80 deletions
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index b88c7ec290..c853fd10bc 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -116,6 +116,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), +QT_TRANSLATE_NOOP("bitcoin-core", "Clear list of wallet transactions (diagnostic tool; implies -rescan)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)"), @@ -204,6 +205,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), +QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin server"), QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), @@ -234,6 +236,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), +QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."), QT_TRANSLATE_NOOP("bitcoin-core", "version"), QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), }; diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index cfbd866381..628847e030 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -38,6 +38,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -704,7 +710,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -765,7 +771,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"></translation> </message> @@ -780,7 +786,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished">Amount</translation> </message> @@ -931,7 +937,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"></translation> </message> @@ -1113,7 +1119,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -1257,7 +1263,7 @@ Address: %4 <translation>&Main</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</translation> </message> @@ -1267,7 +1273,7 @@ Address: %4 <translation>Pay transaction &fee</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Automatically start Bitcoin after logging in to the system.</translation> </message> @@ -1282,12 +1288,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished">Set database cache size in megabytes (default: 25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"></translation> </message> @@ -1302,7 +1303,12 @@ Address: %4 <translation type="unfinished">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="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"></translation> </message> @@ -1337,7 +1343,17 @@ Address: %4 <translation>&Network</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation> </message> @@ -1452,17 +1468,17 @@ Address: %4 <translation>&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>default</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"></translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirm options reset</translation> </message> @@ -1502,19 +1518,14 @@ Address: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Unconfirmed:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmed:</translation> + <source>Available:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1522,7 +1533,12 @@ Address: %4 <translation>Your current spendable balance</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <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> @@ -2686,6 +2702,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2853,7 +2874,7 @@ Address: %4 <translation>, has not been successfully broadcast yet</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation> <numerusform>Open for %n more block</numerusform> @@ -2861,7 +2882,7 @@ Address: %4 </translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>unknown</translation> </message> @@ -2902,12 +2923,12 @@ Address: %4 <translation>Amount</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation> <numerusform>Open for %n more block</numerusform> @@ -2920,23 +2941,12 @@ Address: %4 <translation>Open until %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 confirmations)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Unconfirmed (%1 of %2 confirmations)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmed (%1 confirmations)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>This block was not received by any other nodes and will probably not be accepted!</translation> </message> @@ -2946,7 +2956,27 @@ Address: %4 <translation>Generated but not accepted</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Received with</translation> </message> @@ -2976,7 +3006,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaction status. Hover over this field to show number of confirmations.</translation> </message> @@ -3242,12 +3272,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Usage:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>List commands</translation> </message> @@ -3302,12 +3332,12 @@ Address: %4 <translation>Specify your own public address</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3327,17 +3357,17 @@ Address: %4 <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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> @@ -3478,6 +3508,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Connect only to the specified node(s)</translation> </message> @@ -3688,6 +3723,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"></translation> </message> @@ -3737,12 +3777,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>You need to rebuild the database using -reindex to change -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation> </message> @@ -3762,7 +3802,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="+89"/> + <location line="+90"/> <source>Information</source> <translation>Information</translation> </message> @@ -3832,7 +3872,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Specify connection timeout in milliseconds (default: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>System error: </translation> </message> @@ -3878,6 +3918,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished">version</translation> </message> @@ -3887,32 +3932,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Set key pool size to <n> (default: 100)</translation> </message> @@ -3922,12 +3967,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Rescan the block chain for missing wallet transactions</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -3937,7 +3982,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>This help message</translation> </message> @@ -3947,12 +3992,12 @@ 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="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> @@ -3967,12 +4012,12 @@ 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="+98"/> + <location line="+99"/> <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="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> @@ -3982,7 +4027,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> @@ -3992,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -4002,7 +4047,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> @@ -4022,7 +4067,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Loading block index...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -4032,12 +4077,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -4047,7 +4092,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot write default address</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> @@ -4057,17 +4102,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Done loading</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> |