diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-10 13:00:56 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-10 13:00:56 -0700 |
| commit | bb8bc860e3445ca22209e6cc931bc4b1c139a3a1 (patch) | |
| tree | 82dd54da711b7bbd11ecb18489fdac79f6b34c36 /src | |
| parent | 1258dde48d255f18af928b7c59c4e78394f76de6 (diff) | |
| parent | 6a270c5f8182e93f56fb866c3494a0d66ff61625 (diff) | |
Merge pull request #2487 from Diapolo/translations
translations update 2013-04-08
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 4 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 2 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 225 |
3 files changed, 63 insertions, 168 deletions
diff --git a/src/init.cpp b/src/init.cpp index 66272e8421..70a9233386 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -334,7 +334,7 @@ std::string HelpMessage() " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)") + "\n" + " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n" + " -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" + - " -rpcthreads=<n> " + _("Use this many threads to service RPC calls (default: 4)") + "\n" + + " -rpcthreads=<n> " + _("Set the number of threads to service RPC calls (default: 4)") + "\n" + " -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" + " -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n" + " -alertnotify=<cmd> " + _("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=<file> " + _("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=<n> " + _("Set the number of script verification threads (1-16, 0=auto, default: 0)") + "\n" + "\n" + _("Block creation options:") + "\n" + " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n" + diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 2c500f4fe1..4f3bb10642 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 <n> (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 c74b11d3d6..105a5c6ab2 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 <translation>Address Book</translation> </message> <message> - <location line="+22"/> + <location line="+19"/> <source>Double-click to edit address or label</source> <translation>Double-click to edit address or label</translation> </message> @@ -68,12 +68,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&New Address</translation> </message> <message> - <location line="-46"/> + <location filename="../addressbookpage.cpp" line="+59"/> <source>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.</source> <translation>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.</translation> </message> <message> - <location line="+60"/> + <location filename="../forms/addressbookpage.ui" line="+14"/> <source>&Copy Address</source> <translation>&Copy Address</translation> </message> @@ -113,7 +113,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Delete</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+66"/> + <location filename="../addressbookpage.cpp" line="-5"/> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation> + </message> + <message> + <location line="+13"/> <source>Copy &Label</source> <translation>Copy &Label</translation> </message> @@ -128,7 +133,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Send &Coins</translation> </message> <message> - <location line="+263"/> + <location line="+260"/> <source>Export Address Book Data</source> <translation>Export Address Book Data</translation> </message> @@ -310,7 +315,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+231"/> + <location filename="../bitcoingui.cpp" line="+233"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> @@ -320,7 +325,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Synchronizing with network...</translation> </message> <message> - <location line="-367"/> + <location line="-368"/> <source>&Overview</source> <translation>&Overview</translation> </message> @@ -380,7 +385,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Options...</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Encrypt Wallet...</translation> </message> @@ -410,7 +415,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Export...</translation> </message> <message> - <location line="-65"/> + <location line="-66"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -420,7 +425,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Modify configuration options for Bitcoin</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <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> @@ -450,13 +455,13 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="-162"/> - <location line="+540"/> + <location line="-163"/> + <location line="+541"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-540"/> + <location line="-541"/> <source>Wallet</source> <translation>Wallet</translation> </message> @@ -491,7 +496,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Show or hide the main Window</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Encrypt the private keys that belong to your wallet</source> <translation>Encrypt the private keys that belong to your wallet</translation> </message> @@ -679,7 +684,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+108"/> + <location filename="../bitcoin.cpp" line="+104"/> <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> @@ -687,7 +692,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+96"/> + <location filename="../clientmodel.cpp" line="+98"/> <source>Network Alert</source> <translation>Network Alert</translation> </message> @@ -763,7 +768,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+422"/> + <location filename="../guiutil.cpp" line="+424"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -1157,7 +1162,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+344"/> + <location filename="../rpcconsole.cpp" line="+339"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -2146,117 +2151,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+95"/> - <source>&Overview</source> - <translation>&Overview</translation> - </message> - <message> - <location line="+1"/> - <source>Show general overview of wallet</source> - <translation>Show general overview of wallet</translation> - </message> - <message> - <location line="+6"/> - <source>&Send coins</source> - <translation>&Send coins</translation> - </message> - <message> - <location line="+1"/> - <source>Send coins to a Bitcoin address</source> - <translation>Send coins to a Bitcoin address</translation> - </message> - <message> - <location line="+6"/> - <source>&Receive coins</source> - <translation>&Receive coins</translation> - </message> - <message> - <location line="+1"/> - <source>Show the list of addresses for receiving payments</source> - <translation>Show the list of addresses for receiving payments</translation> - </message> - <message> - <location line="+6"/> - <source>&Transactions</source> - <translation>&Transactions</translation> - </message> - <message> - <location line="+1"/> - <source>Browse transaction history</source> - <translation>Browse transaction history</translation> - </message> - <message> - <location line="+6"/> - <source>&Address Book</source> - <translation>&Address Book</translation> - </message> - <message> - <location line="+1"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Edit the list of stored addresses and labels</translation> - </message> - <message> - <location line="+12"/> - <source>&Encrypt Wallet...</source> - <translation>&Encrypt Wallet...</translation> - </message> - <message> - <location line="+1"/> - <source>Encrypt the private keys that belong to your wallet</source> - <translation>Encrypt the private keys that belong to your wallet</translation> - </message> - <message> - <location line="+2"/> - <source>&Backup Wallet...</source> - <translation>&Backup Wallet...</translation> - </message> - <message> - <location line="+1"/> - <source>Backup wallet to another location</source> - <translation>Backup wallet to another location</translation> - </message> - <message> - <location line="+1"/> - <source>&Change Passphrase...</source> - <translation>&Change Passphrase...</translation> - </message> - <message> - <location line="+1"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Change the passphrase used for wallet encryption</translation> - </message> - <message> - <location line="+1"/> - <source>Sign &message...</source> - <translation>Sign &message...</translation> - </message> - <message> - <location line="+1"/> - <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Sign messages with your Bitcoin addresses to prove you own them</translation> - </message> - <message> - <location line="+1"/> - <source>&Verify message...</source> - <translation>&Verify message...</translation> - </message> - <message> - <location line="+1"/> - <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation> - </message> - <message> - <location line="+2"/> - <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="+180"/> + <location filename="../walletview.cpp" line="+247"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> @@ -2299,7 +2194,7 @@ Address: %4 <translation>Usage:</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Send command to -server or bitcoind</source> <translation>Send command to -server or bitcoind</translation> </message> @@ -2319,7 +2214,7 @@ Address: %4 <translation>Options:</translation> </message> <message> - <location line="+22"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> @@ -2329,12 +2224,12 @@ Address: %4 <translation>Specify pid file (default: bitcoind.pid)</translation> </message> <message> - <location line="-47"/> + <location line="-48"/> <source>Generate coins</source> <translation>Generate coins</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Don't generate coins</source> <translation>Don't generate coins</translation> </message> @@ -2344,7 +2239,7 @@ Address: %4 <translation>Specify data directory</translation> </message> <message> - <location line="-7"/> + <location line="-8"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Set database cache size in megabytes (default: 25)</translation> </message> @@ -2359,7 +2254,7 @@ Address: %4 <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-48"/> <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> @@ -2394,12 +2289,12 @@ Address: %4 <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+77"/> + <location line="+76"/> <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="+32"/> + <location line="+33"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> @@ -2579,7 +2474,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error: Wallet locked, unable to create transaction!</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Error: system error: </source> <translation>Error: system error: </translation> </message> @@ -2659,7 +2554,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Rebuild block chain index from current blk000??.dat files</translation> </message> <message> - <location line="+37"/> + <location line="+16"/> + <source>Set the number of threads to service RPC calls (default: 4)</source> + <translation>Set the number of threads to service RPC calls (default: 4)</translation> + </message> + <message> + <location line="+22"/> <source>Verifying blocks...</source> <translation>Verifying blocks...</translation> </message> @@ -2669,7 +2569,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verifying wallet...</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> @@ -2754,7 +2654,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set minimum block size in bytes (default: 0)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> </message> @@ -2809,22 +2709,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-68"/> + <location line="-67"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address</translation> </message> <message> - <location line="+77"/> + <location line="+76"/> <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="-119"/> <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> @@ -2834,7 +2734,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-16"/> + <location line="-17"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Set key pool size to <n> (default: 100)</translation> </message> @@ -2844,12 +2744,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="+30"/> + <location line="+31"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-21"/> + <location line="-22"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -2859,7 +2759,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="-154"/> + <location line="-153"/> <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> @@ -2884,12 +2784,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="+57"/> + <location line="+56"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-35"/> + <location line="-34"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -2909,12 +2809,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+29"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> @@ -2934,17 +2834,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+45"/> + <location line="+44"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-24"/> - <source>Error: could not start node</source> - <translation>Error: could not start node</translation> - </message> - <message> - <location line="+25"/> + <location line="+1"/> <source>Invalid amount</source> <translation>Invalid amount</translation> </message> @@ -2959,7 +2854,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Loading block index...</translation> </message> <message> - <location line="-59"/> + <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> @@ -2969,7 +2864,7 @@ 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="+68"/> + <location line="+67"/> <source>Fee per KB to add to transactions you send</source> <translation>Fee per KB to add to transactions you send</translation> </message> @@ -2979,7 +2874,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Loading wallet...</translation> </message> <message> - <location line="-54"/> + <location line="-53"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -2994,12 +2889,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot write default address</translation> </message> <message> - <location line="+64"/> + <location line="+63"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>Done loading</source> <translation>Done loading</translation> </message> |