From 6117afeeaa4ab7770a3be0938aeccc73c0c9beca Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 29 Aug 2012 19:55:15 +0200 Subject: [PATCH] Update strings for 0.7.0rc2 --- src/qt/bitcoinstrings.cpp | 1 + src/qt/locale/bitcoin_en.ts | 142 ++++++++++++++++++------------------ 2 files changed, 74 insertions(+), 69 deletions(-) diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 5fe9e5218..92b335286 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -92,6 +92,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"), 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 thorough the block verification is (0-6, default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Importing blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000?.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 849ff47a5..2ac97a532 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -15,9 +15,13 @@ - - Copyright © 2009-2012 Bitcoin Developers - + + Copyright © 2009-2012 The Bitcoin developers + + + + + This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -286,22 +290,17 @@ This product includes software developed by the OpenSSL Project for use in the O BitcoinGUI - + Sign &message... - - Show/Hide &Bitcoin - - - - + Synchronizing with network... - + &Overview @@ -376,7 +375,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Encrypt Wallet... @@ -409,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Send coins to a Bitcoin address @@ -434,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Show or hide the Bitcoin window - - - - + Export the data in the current tab to a file @@ -469,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - + Bitcoin @@ -484,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + &About Bitcoin - + + &Show / Hide + + + + &File @@ -657,7 +656,7 @@ Address: %4 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -741,7 +740,7 @@ Address: %4 GUIUtil::HelpMessageBox - + Bitcoin-Qt @@ -960,7 +959,7 @@ Address: %4 - + Warning @@ -1256,7 +1255,7 @@ Address: %4 SendCoinsDialog - + @@ -2106,7 +2105,7 @@ Address: %4 - + Usage: @@ -2121,12 +2120,12 @@ Address: %4 - + Get help for a command - + Options: @@ -2141,7 +2140,7 @@ Address: %4 - + Generate coins @@ -2151,7 +2150,7 @@ Address: %4 - + Specify data directory @@ -2181,27 +2180,27 @@ Address: %4 - + Connect to a node to retrieve peer addresses, and disconnect - + Specify your own public address - + Bind to given address. Use [host]:port notation for IPv6 - + Threshold for disconnecting misbehaving peers (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) @@ -2216,7 +2215,7 @@ Address: %4 - + Run in the background as a daemon and accept commands @@ -2226,7 +2225,7 @@ Address: %4 - + Accept connections from outside (default: 1 if no -proxy or -connect) @@ -2281,7 +2280,12 @@ Address: %4 - + + Importing blocks... + + + + Invalid -tor address: '%s' @@ -2391,22 +2395,22 @@ Address: %4 - + Allow JSON-RPC connections from specified IP address - + Send commands to node running on <ip> (default: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format @@ -2421,7 +2425,7 @@ Address: %4 - + How many blocks to check at startup (default: 2500, 0 = all) @@ -2431,7 +2435,7 @@ Address: %4 - + Imports blocks from external blk000?.dat file @@ -2451,17 +2455,17 @@ Address: %4 - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Cannot obtain a lock on data directory %s. Bitcoin is probably already running. @@ -2471,12 +2475,12 @@ Address: %4 - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy @@ -2486,12 +2490,12 @@ Address: %4 - + Loading addresses... - + Error loading blkindex.dat @@ -2506,17 +2510,17 @@ Address: %4 - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' @@ -2531,7 +2535,7 @@ Address: %4 - + Cannot resolve -bind address: '%s' @@ -2541,12 +2545,12 @@ Address: %4 - + Invalid amount for -paytxfee=<amount>: '%s' - + Error: could not start node @@ -2566,17 +2570,17 @@ Address: %4 - + Sending... - + 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. - + Invalid amount @@ -2591,7 +2595,7 @@ Address: %4 - + Add a node to connect to and attempt to keep the connection open @@ -2611,12 +2615,12 @@ Address: %4 - + Loading wallet... - + Cannot downgrade wallet @@ -2631,22 +2635,22 @@ Address: %4 - + Rescanning... - + Done loading - + To use the %s option - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: