Merge pull request #2181 from Diapolo/translations

update bitcoinstrings.cpp and bitcoin_en.ts (2013-01-14)
This commit is contained in:
Wladimir J. van der Laan 2013-01-16 12:23:29 -08:00
commit a1f4909e0b
2 changed files with 99 additions and 56 deletions

View file

@ -31,6 +31,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Cannot obtain a lock on data directory %s. Bitcoin is probably already " "Cannot obtain a lock on data directory %s. Bitcoin is probably already "
"running."), "running."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Corrupted block database detected. Please restart the client with -reindex."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Error initializing database environment %s! To recover, BACKUP THAT " "Error initializing database environment %s! To recover, BACKUP THAT "
"DIRECTORY, then remove everything from it except for wallet.dat."), "DIRECTORY, then remove everything from it except for wallet.dat."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
@ -96,7 +98,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses,
QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"),
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading blkindex.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"),
@ -112,7 +114,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using internet relay chat (default
QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"),
QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"),
QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 2500, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 2500, 0 = all)"),
QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-6, default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-4, default: 3)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Importing blocks from block database..."), QT_TRANSLATE_NOOP("bitcoin-core", "Importing blocks from block database..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"),
QT_TRANSLATE_NOOP("bitcoin-core", "Information"), QT_TRANSLATE_NOOP("bitcoin-core", "Information"),
@ -172,7 +174,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default:
QT_TRANSLATE_NOOP("bitcoin-core", "Use proxy to reach tor hidden services (default: same as -proxy)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use proxy to reach tor hidden services (default: same as -proxy)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"),
QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying database integrity..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying block database integrity..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet integrity..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"),

View file

@ -713,7 +713,7 @@ Address: %4
<context> <context>
<name>ClientModel</name> <name>ClientModel</name>
<message> <message>
<location filename="../clientmodel.cpp" line="+87"/> <location filename="../clientmodel.cpp" line="+86"/>
<source>Network Alert</source> <source>Network Alert</source>
<translation>Network Alert</translation> <translation>Network Alert</translation>
</message> </message>
@ -863,7 +863,17 @@ Address: %4
<translation>&amp;Start Bitcoin on system login</translation> <translation>&amp;Start Bitcoin on system login</translation>
</message> </message>
<message> <message>
<location line="+21"/> <location line="+35"/>
<source>Reset all client options to default.</source>
<translation>Reset all client options to default.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
<translation>&amp;Reset Options</translation>
</message>
<message>
<location line="+13"/>
<source>&amp;Network</source> <source>&amp;Network</source>
<translation>&amp;Network</translation> <translation>&amp;Network</translation>
</message> </message>
@ -998,7 +1008,22 @@ Address: %4
<translation>default</translation> <translation>default</translation>
</message> </message>
<message> <message>
<location line="+146"/> <location line="+130"/>
<source>Confirm options reset</source>
<translation>Confirm options reset</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
<translation>Some settings may require a client restart to take effect.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
<translation>Do you want to proceed?</translation>
</message>
<message>
<location line="+42"/>
<location line="+9"/> <location line="+9"/>
<source>Warning</source> <source>Warning</source>
<translation>Warning</translation> <translation>Warning</translation>
@ -1023,7 +1048,7 @@ Address: %4
<translation>Form</translation> <translation>Form</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+51"/>
<location line="+183"/> <location line="+183"/>
<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> <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> <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>
@ -1160,7 +1185,7 @@ Address: %4
<location line="+53"/> <location line="+53"/>
<location line="+23"/> <location line="+23"/>
<location line="+23"/> <location line="+23"/>
<location filename="../rpcconsole.cpp" line="+349"/> <location filename="../rpcconsole.cpp" line="+344"/>
<source>N/A</source> <source>N/A</source>
<translation>N/A</translation> <translation>N/A</translation>
</message> </message>
@ -1275,7 +1300,7 @@ Address: %4
<translation>Clear console</translation> <translation>Clear console</translation>
</message> </message>
<message> <message>
<location filename="../rpcconsole.cpp" line="-33"/> <location filename="../rpcconsole.cpp" line="-30"/>
<source>Welcome to the Bitcoin RPC console.</source> <source>Welcome to the Bitcoin RPC console.</source>
<translation>Welcome to the Bitcoin RPC console.</translation> <translation>Welcome to the Bitcoin RPC console.</translation>
</message> </message>
@ -1488,18 +1513,18 @@ Address: %4
</message> </message>
<message> <message>
<location line="+10"/> <location line="+10"/>
<location line="+203"/> <location line="+213"/>
<source>Choose an address from the address book</source> <source>Choose an address from the address book</source>
<translation>Choose an address from the address book</translation> <translation>Choose an address from the address book</translation>
</message> </message>
<message> <message>
<location line="-193"/> <location line="-203"/>
<location line="+203"/> <location line="+213"/>
<source>Alt+A</source> <source>Alt+A</source>
<translation>Alt+A</translation> <translation>Alt+A</translation>
</message> </message>
<message> <message>
<location line="-193"/> <location line="-203"/>
<source>Paste address from clipboard</source> <source>Paste address from clipboard</source>
<translation>Paste address from clipboard</translation> <translation>Paste address from clipboard</translation>
</message> </message>
@ -1514,7 +1539,12 @@ Address: %4
<translation>Enter the message you want to sign here</translation> <translation>Enter the message you want to sign here</translation>
</message> </message>
<message> <message>
<location line="+24"/> <location line="+7"/>
<source>Signature</source>
<translation>Signature</translation>
</message>
<message>
<location line="+27"/>
<source>Copy the current signature to the system clipboard</source> <source>Copy the current signature to the system clipboard</source>
<translation>Copy the current signature to the system clipboard</translation> <translation>Copy the current signature to the system clipboard</translation>
</message> </message>
@ -1659,16 +1689,8 @@ Address: %4
<source>Open until %1</source> <source>Open until %1</source>
<translation>Open until %1</translation> <translation>Open until %1</translation>
</message> </message>
<message numerus="yes">
<location line="-2"/>
<source>Open for %n block(s)</source>
<translation>
<numerusform>Open for %n block</numerusform>
<numerusform>Open for %n blocks</numerusform>
</translation>
</message>
<message> <message>
<location line="+8"/> <location line="+6"/>
<source>%1/offline</source> <source>%1/offline</source>
<translation>%1/offline</translation> <translation>%1/offline</translation>
</message> </message>
@ -1829,8 +1851,16 @@ Address: %4
<source>, has not been successfully broadcast yet</source> <source>, has not been successfully broadcast yet</source>
<translation>, has not been successfully broadcast yet</translation> <translation>, has not been successfully broadcast yet</translation>
</message> </message>
<message numerus="yes">
<location line="-35"/>
<source>Open for %n more block(s)</source>
<translation>
<numerusform>Open for %n more block</numerusform>
<numerusform>Open for %n more blocks</numerusform>
</translation>
</message>
<message> <message>
<location line="+35"/> <location line="+70"/>
<source>unknown</source> <source>unknown</source>
<translation>unknown</translation> <translation>unknown</translation>
</message> </message>
@ -1872,10 +1902,10 @@ Address: %4
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+57"/> <location line="+57"/>
<source>Open for %n block(s)</source> <source>Open for %n more block(s)</source>
<translation> <translation>
<numerusform>Open for %n block</numerusform> <numerusform>Open for %n more block</numerusform>
<numerusform>Open for %n blocks</numerusform> <numerusform>Open for %n more blocks</numerusform>
</translation> </translation>
</message> </message>
<message> <message>
@ -2139,7 +2169,7 @@ Address: %4
<context> <context>
<name>bitcoin-core</name> <name>bitcoin-core</name>
<message> <message>
<location filename="../bitcoinstrings.cpp" line="+86"/> <location filename="../bitcoinstrings.cpp" line="+88"/>
<source>Bitcoin version</source> <source>Bitcoin version</source>
<translation>Bitcoin version</translation> <translation>Bitcoin version</translation>
</message> </message>
@ -2229,12 +2259,12 @@ Address: %4
<translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation>
</message> </message>
<message> <message>
<location line="-26"/> <location line="-28"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <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> <translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation>
</message> </message>
<message> <message>
<location line="+24"/> <location line="+26"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source> <source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</translation> <translation>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</translation>
</message> </message>
@ -2259,7 +2289,7 @@ Address: %4
<translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
</message> </message>
<message> <message>
<location line="-72"/> <location line="-74"/>
<source>%s, you must set a rpcpassword in the configuration file: <source>%s, you must set a rpcpassword in the configuration file:
%s %s
It is recommended you use the following random password: It is recommended you use the following random password:
@ -2295,6 +2325,11 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Corrupted block database detected. Please restart the client with -reindex.</source>
<translation>Corrupted block database detected. Please restart the client with -reindex.</translation>
</message>
<message>
<location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> <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> <translation>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</translation>
</message> </message>
@ -2364,7 +2399,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Discover own IP address (default: 1 when listening and no -externalip)</translation> <translation>Discover own IP address (default: 1 when listening and no -externalip)</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+3"/>
<source>Error loading block database</source>
<translation>Error loading block database</translation>
</message>
<message>
<location line="+5"/>
<source>Error: Disk space is low!</source> <source>Error: Disk space is low!</source>
<translation>Error: Disk space is low!</translation> <translation>Error: Disk space is low!</translation>
</message> </message>
@ -2389,7 +2429,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Find peers using DNS lookup (default: 1 unless -connect)</translation> <translation>Find peers using DNS lookup (default: 1 unless -connect)</translation>
</message> </message>
<message> <message>
<location line="+6"/> <location line="+5"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>How thorough the block verification is (0-4, default: 3)</translation>
</message>
<message>
<location line="+1"/>
<source>Importing blocks from block database...</source> <source>Importing blocks from block database...</source>
<translation>Importing blocks from block database...</translation> <translation>Importing blocks from block database...</translation>
</message> </message>
@ -2509,12 +2554,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Username for JSON-RPC connections</translation> <translation>Username for JSON-RPC connections</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+4"/>
<source>Verifying database integrity...</source>
<translation>Verifying database integrity...</translation>
</message>
<message>
<location line="+2"/>
<source>Warning</source> <source>Warning</source>
<translation>Warning</translation> <translation>Warning</translation>
</message> </message>
@ -2529,7 +2569,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>wallet.dat corrupt, salvage failed</translation> <translation>wallet.dat corrupt, salvage failed</translation>
</message> </message>
<message> <message>
<location line="-42"/> <location line="-43"/>
<source>Password for JSON-RPC connections</source> <source>Password for JSON-RPC connections</source>
<translation>Password for JSON-RPC connections</translation> <translation>Password for JSON-RPC connections</translation>
</message> </message>
@ -2569,12 +2609,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>How many blocks to check at startup (default: 2500, 0 = all)</translation> <translation>How many blocks to check at startup (default: 2500, 0 = all)</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+55"/>
<source>How thorough the block verification is (0-6, default: 1)</source>
<translation>How thorough the block verification is (0-6, default: 1)</translation>
</message>
<message>
<location line="+54"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source> <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Use OpenSSL (https) for JSON-RPC connections</translation> <translation>Use OpenSSL (https) for JSON-RPC connections</translation>
</message> </message>
@ -2589,12 +2624,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Server private key (default: server.pem)</translation> <translation>Server private key (default: server.pem)</translation>
</message> </message>
<message> <message>
<location line="-131"/> <location line="-133"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <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> <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+144"/>
<source>This help message</source> <source>This help message</source>
<translation>This help message</translation> <translation>This help message</translation>
</message> </message>
@ -2619,12 +2654,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Loading addresses...</translation> <translation>Loading addresses...</translation>
</message> </message>
<message> <message>
<location line="-27"/> <location line="-25"/>
<source>Error loading blkindex.dat</source>
<translation>Error loading blkindex.dat</translation>
</message>
<message>
<location line="+2"/>
<source>Error loading wallet.dat: Wallet corrupted</source> <source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Error loading wallet.dat: Wallet corrupted</translation> <translation>Error loading wallet.dat: Wallet corrupted</translation>
</message> </message>
@ -2634,12 +2664,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation> <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation>
</message> </message>
<message> <message>
<location line="+74"/> <location line="+73"/>
<source>Verifying block database integrity...</source>
<translation>Verifying block database integrity...</translation>
</message>
<message>
<location line="+1"/>
<source>Verifying wallet integrity...</source>
<translation>Verifying wallet integrity...</translation>
</message>
<message>
<location line="+1"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation>
</message> </message>
<message> <message>
<location line="-76"/> <location line="-77"/>
<source>Error loading wallet.dat</source> <source>Error loading wallet.dat</source>
<translation>Error loading wallet.dat</translation> <translation>Error loading wallet.dat</translation>
</message> </message>