diff options
author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2013-06-03 15:18:41 +0200 |
---|---|---|
committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2013-06-03 15:18:41 +0200 |
commit | 39fe9de6b2b255969971beca8fa25a33ad2e5750 (patch) | |
tree | 6686041f6b801d0ea5185b026a480a5be61510e6 /src/qt/locale/bitcoin_en.ts | |
parent | f679b2900a3a9f863f888cfb0b1a5e593628e37b (diff) | |
parent | fa9e5adddda0bee5adc040b957cf3f1a6a470802 (diff) | |
download | bitcoin-39fe9de6b2b255969971beca8fa25a33ad2e5750.tar.xz |
Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFix
Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
Conflicts:
bitcoin-qt.pro
Diffstat (limited to 'src/qt/locale/bitcoin_en.ts')
-rw-r--r-- | src/qt/locale/bitcoin_en.ts | 232 |
1 files changed, 130 insertions, 102 deletions
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 557d0d0275..2006a5296b 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -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="+232"/> + <location filename="../bitcoingui.cpp" line="+233"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+279"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-348"/> + <location line="-349"/> <source>&Overview</source> <translation>&Overview</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="+284"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importing blocks from disk...</translation> </message> @@ -420,7 +420,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-346"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -455,18 +455,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="-164"/> - <location line="+528"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-528"/> + <location line="-530"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+100"/> + <location line="+101"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -542,7 +542,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -684,7 +684,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+107"/> + <location filename="../bitcoin.cpp" line="+111"/> <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> @@ -823,8 +823,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</translation> + <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> <message> <location line="+15"/> @@ -2162,14 +2162,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Send Coins</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Export</translation> + </message> + <message> + <location line="+1"/> <source>Export the data in the current tab to a file</source> <translation>Export the data in the current tab to a file</translation> </message> <message> - <location line="+198"/> + <location line="+193"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> @@ -2202,37 +2215,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin version</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Usage:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Send command to -server or bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>List commands</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Get help for a command</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> @@ -2242,27 +2255,17 @@ Address: %4 <translation>Specify pid file (default: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generate coins</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Don't generate coins</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Specify data directory</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Set database cache size in megabytes (default: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Listen for connections on <port> (default: 8333 or testnet: 18333)</translation> </message> @@ -2277,7 +2280,7 @@ Address: %4 <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> @@ -2287,22 +2290,22 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <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="-32"/> + <location line="-29"/> <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="+30"/> + <location line="+27"/> <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> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> @@ -2312,17 +2315,17 @@ Address: %4 <translation>Run in the background as a daemon and accept commands</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <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="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2363,11 +2366,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <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> @@ -2392,12 +2390,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Set the number of script verification threads (1-16, 0=auto, default: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation> </message> @@ -2437,7 +2430,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Block creation options:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Connect only to the specified node(s)</translation> </message> @@ -2457,7 +2450,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Do you want to rebuild the block database now?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Error initializing block database</translation> </message> @@ -2483,11 +2476,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Error: Transaction creation failed!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Error: Wallet locked, unable to create transaction!</translation> </message> @@ -2557,7 +2545,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Find peers using DNS lookup (default: 1 unless -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Generate coins (default: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>How many blocks to check at startup (default: 288, 0 = all)</translation> </message> @@ -2567,7 +2560,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="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Not enough file descriptors available.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Rebuild block chain index from current blk000??.dat files</translation> </message> @@ -2577,7 +2575,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set the number of threads to service RPC calls (default: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verifying blocks...</translation> </message> @@ -2587,12 +2585,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verifying wallet...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <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"/> <source>Information</source> <translation>Information</translation> </message> @@ -2602,6 +2605,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid -tor address: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Invalid amount for -minrelaytxfee=<amount>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Invalid amount for -mintxfee=<amount>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Maintain a full transaction index (default: 0)</translation> @@ -2617,7 +2630,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Only accept block chain matching built-in checkpoints (default: 1)</translation> </message> @@ -2677,6 +2690,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Signing transaction failed</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Specify connection timeout in milliseconds (default: 5000)</translation> @@ -2687,7 +2705,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>System error: </translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Transaction amount too small</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Transaction amounts must be positive</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transaction too large</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Use UPnP to map the listening port (default: 0)</translation> </message> @@ -2727,7 +2760,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> @@ -2742,17 +2775,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <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="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Set key pool size to <n> (default: 100)</translation> </message> @@ -2762,12 +2795,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="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -2777,37 +2810,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <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="+166"/> + <location line="+165"/> <source>This help message</source> <translation>This help message</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Connect through socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -2817,22 +2850,22 @@ 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="+87"/> + <location line="+93"/> <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="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> @@ -2842,7 +2875,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -2862,17 +2895,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid amount</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Insufficient funds</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Loading block index...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <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> @@ -2882,52 +2915,47 @@ 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="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Cannot initialize keypool</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Cannot write default address</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <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> |