twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2283 from Diapolo/translations 

translations update (bitcoinstrings.cpp + bitcoin_en.ts)
miguelfreitas
Wladimir J. van der Laan 12 years ago
parent
2f0fa79db2 f561f3f37f
commit
5258fbe492
2 changed files with 31 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/qt/bitcoinstrings.cpp
  2. 55
      src/qt/locale/bitcoin_en.ts

1
src/qt/bitcoinstrings.cpp
Unescape View File

@ -100,6 +100,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 initializing block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), 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"),

55
src/qt/locale/bitcoin_en.ts
Unescape View File

@ -2179,7 +2179,7 @@ Address: %4
<translation>Bitcoin version</translation> <translation>Bitcoin version</translation>
</message> </message>
<message> <message>
<location line="+95"/> <location line="+96"/>
<source>Usage:</source> <source>Usage:</source>
<translation>Usage:</translation> <translation>Usage:</translation>
</message> </message>
@ -2219,12 +2219,12 @@ Address: %4
<translation>Generate coins</translation> <translation>Generate coins</translation>
</message> </message>
<message> <message>
<location line="-26"/> <location line="-27"/>
<source>Don&apos;t generate coins</source> <source>Don&apos;t generate coins</source>
<translation>Don&apos;t generate coins</translation> <translation>Don&apos;t generate coins</translation>
</message> </message>
<message> <message>
<location line="+73"/> <location line="+74"/>
<source>Specify data directory</source> <source>Specify data directory</source>
<translation>Specify data directory</translation> <translation>Specify data directory</translation>
</message> </message>
@ -2244,12 +2244,12 @@ Address: %4
<translation>Maintain at most &lt;n&gt; connections to peers (default: 125)</translation> <translation>Maintain at most &lt;n&gt; connections to peers (default: 125)</translation>
</message> </message>
<message> <message>
<location line="-46"/> <location line="-47"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source> <source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Connect to a node to retrieve peer addresses, and disconnect</translation> <translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
</message> </message>
<message> <message>
<location line="+77"/> <location line="+78"/>
<source>Specify your own public address</source> <source>Specify your own public address</source>
<translation>Specify your own public address</translation> <translation>Specify your own public address</translation>
</message> </message>
@ -2259,7 +2259,7 @@ Address: %4
<translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation>
</message> </message>
<message> <message>
<location line="-129"/> <location line="-130"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <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> <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation>
</message> </message>
@ -2279,7 +2279,7 @@ Address: %4
<translation>Accept command line and JSON-RPC commands</translation> <translation>Accept command line and JSON-RPC commands</translation>
</message> </message>
<message> <message>
<location line="+74"/> <location line="+75"/>
<source>Run in the background as a daemon and accept commands</source> <source>Run in the background as a daemon and accept commands</source>
<translation>Run in the background as a daemon and accept commands</translation> <translation>Run in the background as a daemon and accept commands</translation>
</message> </message>
@ -2289,7 +2289,7 @@ Address: %4
<translation>Use the test network</translation> <translation>Use the test network</translation>
</message> </message>
<message> <message>
<location line="-105"/> <location line="-106"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <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> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
</message> </message>
@ -2410,6 +2410,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>Error initializing block database</source>
<translation>Error initializing block database</translation>
</message>
<message>
<location line="+1"/>
<source>Error loading block database</source> <source>Error loading block database</source>
<translation>Error loading block database</translation> <translation>Error loading block database</translation>
</message> </message>
@ -2659,22 +2664,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Password for JSON-RPC connections</translation> <translation>Password for JSON-RPC connections</translation>
</message> </message>
<message> <message>
<location line="-65"/> <location line="-66"/>
<source>Allow JSON-RPC connections from specified IP address</source> <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Allow JSON-RPC connections from specified IP address</translation> <translation>Allow JSON-RPC connections from specified IP address</translation>
</message> </message>
<message> <message>
<location line="+74"/> <location line="+75"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source> <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</translation> <translation>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</translation>
</message> </message>
<message> <message>
<location line="-117"/> <location line="-118"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <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> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
</message> </message>
<message> <message>
<location line="+139"/> <location line="+140"/>
<source>Upgrade wallet to latest format</source> <source>Upgrade wallet to latest format</source>
<translation>Upgrade wallet to latest format</translation> <translation>Upgrade wallet to latest format</translation>
</message> </message>
@ -2704,12 +2709,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="-147"/> <location line="-148"/>
<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="+159"/> <location line="+160"/>
<source>This help message</source> <source>This help message</source>
<translation>This help message</translation> <translation>This help message</translation>
</message> </message>
@ -2719,7 +2724,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation>
</message> </message>
<message> <message>
<location line="-83"/> <location line="-84"/>
<source>Connect through socks proxy</source> <source>Connect through socks proxy</source>
<translation>Connect through socks proxy</translation> <translation>Connect through socks proxy</translation>
</message> </message>
@ -2729,7 +2734,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
</message> </message>
<message> <message>
<location line="+54"/> <location line="+55"/>
<source>Loading addresses...</source> <source>Loading addresses...</source>
<translation>Loading addresses...</translation> <translation>Loading addresses...</translation>
</message> </message>
@ -2779,7 +2784,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Unknown -socks proxy version requested: %i</translation> <translation>Unknown -socks proxy version requested: %i</translation>
</message> </message>
<message> <message>
<location line="-88"/> <location line="-89"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source> <source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Cannot resolve -bind address: &apos;%s&apos;</translation> <translation>Cannot resolve -bind address: &apos;%s&apos;</translation>
</message> </message>
@ -2789,7 +2794,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Cannot resolve -externalip address: &apos;%s&apos;</translation> <translation>Cannot resolve -externalip address: &apos;%s&apos;</translation>
</message> </message>
<message> <message>
<location line="+42"/> <location line="+43"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source> <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation> <translation>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message> </message>
@ -2814,7 +2819,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Loading block index...</translation> <translation>Loading block index...</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Add a node to connect to and attempt to keep the connection open</source> <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> <translation>Add a node to connect to and attempt to keep the connection open</translation>
</message> </message>
@ -2824,7 +2829,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation> <translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation>
</message> </message>
<message> <message>
<location line="+65"/> <location line="+66"/>
<source>Find peers using internet relay chat (default: 0)</source> <source>Find peers using internet relay chat (default: 0)</source>
<translation>Find peers using internet relay chat (default: 0)</translation> <translation>Find peers using internet relay chat (default: 0)</translation>
</message> </message>
@ -2839,7 +2844,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Loading wallet...</translation> <translation>Loading wallet...</translation>
</message> </message>
<message> <message>
<location line="-51"/> <location line="-52"/>
<source>Cannot downgrade wallet</source> <source>Cannot downgrade wallet</source>
<translation>Cannot downgrade wallet</translation> <translation>Cannot downgrade wallet</translation>
</message> </message>
@ -2854,17 +2859,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Cannot write default address</translation> <translation>Cannot write default address</translation>
</message> </message>
<message> <message>
<location line="+61"/> <location line="+62"/>
<source>Rescanning...</source> <source>Rescanning...</source>
<translation>Rescanning...</translation> <translation>Rescanning...</translation>
</message> </message>
<message> <message>
<location line="-55"/> <location line="-56"/>
<source>Done loading</source> <source>Done loading</source>
<translation>Done loading</translation> <translation>Done loading</translation>
</message> </message>
<message> <message>
<location line="+78"/> <location line="+79"/>
<source>To use the %s option</source> <source>To use the %s option</source>
<translation>To use the %s option</translation> <translation>To use the %s option</translation>
</message> </message>
@ -2874,7 +2879,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Error</translation> <translation>Error</translation>
</message> </message>
<message> <message>
<location line="-28"/> <location line="-29"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file: <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s %s
If the file does not exist, create it with owner-readable-only file permissions.</source> If the file does not exist, create it with owner-readable-only file permissions.</source>

Write Preview
Loading…
Cancel
Save