From 3a2e07493b9a07f4d7f2c9d54e9a3b03593e4405 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Mon, 14 Jan 2013 22:52:52 +0100 Subject: [PATCH] update bitcoinstrings.cpp and bitcoin_en.ts (2013-01-14) --- src/qt/bitcoinstrings.cpp | 9 ++- src/qt/locale/bitcoin_en.ts | 146 +++++++++++++++++++++++------------- 2 files changed, 99 insertions(+), 56 deletions(-) diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 7fcb7acf..c41ee892 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -31,6 +31,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. Bitcoin is probably already " "running."), 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 " "DIRECTORY, then remove everything from it except for wallet.dat."), 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", "Don't generate coins"), 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: Wallet corrupted"), 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", "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", "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", "Imports blocks from external blk000??.dat file"), 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 the test network"), 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", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index cb6f982d..5a0d4a8a 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -713,7 +713,7 @@ Address: %4 ClientModel - + Network Alert Network Alert @@ -863,7 +863,17 @@ Address: %4 &Start Bitcoin on system login - + + Reset all client options to default. + Reset all client options to default. + + + + &Reset Options + &Reset Options + + + &Network &Network @@ -998,7 +1008,22 @@ Address: %4 default - + + Confirm options reset + Confirm options reset + + + + Some settings may require a client restart to take effect. + Some settings may require a client restart to take effect. + + + + Do you want to proceed? + Do you want to proceed? + + + Warning Warning @@ -1023,7 +1048,7 @@ Address: %4 Form - + 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. 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. @@ -1160,7 +1185,7 @@ Address: %4 - + N/A N/A @@ -1275,7 +1300,7 @@ Address: %4 Clear console - + Welcome to the Bitcoin RPC console. Welcome to the Bitcoin RPC console. @@ -1488,18 +1513,18 @@ Address: %4 - + Choose an address from the address book Choose an address from the address book - - + + Alt+A Alt+A - + Paste address from clipboard Paste address from clipboard @@ -1514,7 +1539,12 @@ Address: %4 Enter the message you want to sign here - + + Signature + Signature + + + Copy the current signature to the system clipboard Copy the current signature to the system clipboard @@ -1659,16 +1689,8 @@ Address: %4 Open until %1 Open until %1 - - - Open for %n block(s) - - Open for %n block - Open for %n blocks - - - + %1/offline %1/offline @@ -1829,8 +1851,16 @@ Address: %4 , has not been successfully broadcast yet , has not been successfully broadcast yet + + + Open for %n more block(s) + + Open for %n more block + Open for %n more blocks + + - + unknown unknown @@ -1872,10 +1902,10 @@ Address: %4 - Open for %n block(s) + Open for %n more block(s) - Open for %n block - Open for %n blocks + Open for %n more block + Open for %n more blocks @@ -2139,7 +2169,7 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin version @@ -2229,12 +2259,12 @@ Address: %4 Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) @@ -2259,7 +2289,7 @@ Address: %4 Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s 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. + Corrupted block database detected. Please restart the client with -reindex. + Corrupted block database detected. Please restart the client with -reindex. + + + Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. @@ -2364,7 +2399,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Discover own IP address (default: 1 when listening and no -externalip) - + + Error loading block database + Error loading block database + + + Error: Disk space is low! Error: Disk space is low! @@ -2389,7 +2429,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Find peers using DNS lookup (default: 1 unless -connect) - + + How thorough the block verification is (0-4, default: 3) + How thorough the block verification is (0-4, default: 3) + + + Importing blocks from block database... Importing blocks from block database... @@ -2509,12 +2554,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Username for JSON-RPC connections - - Verifying database integrity... - Verifying database integrity... - - - + Warning Warning @@ -2529,7 +2569,7 @@ If the file does not exist, create it with owner-readable-only file permissions. wallet.dat corrupt, salvage failed - + Password for JSON-RPC connections Password for JSON-RPC connections @@ -2569,12 +2609,7 @@ If the file does not exist, create it with owner-readable-only file permissions. How many blocks to check at startup (default: 2500, 0 = all) - - How thorough the block verification is (0-6, default: 1) - How thorough the block verification is (0-6, default: 1) - - - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections @@ -2589,12 +2624,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Server private key (default: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message This help message @@ -2619,12 +2654,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Loading addresses... - - Error loading blkindex.dat - Error loading blkindex.dat - - - + Error loading wallet.dat: Wallet corrupted Error loading wallet.dat: Wallet corrupted @@ -2634,12 +2664,22 @@ If the file does not exist, create it with owner-readable-only file permissions. Error loading wallet.dat: Wallet requires newer version of Bitcoin - + + Verifying block database integrity... + Verifying block database integrity... + + + + Verifying wallet integrity... + Verifying wallet integrity... + + + Wallet needed to be rewritten: restart Bitcoin to complete Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat Error loading wallet.dat