From 48253c16bfbe0eafbbc5818d86df12963c637f4e Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Tue, 19 Mar 2013 23:47:45 +0100 Subject: [PATCH 1/2] translations update 2013-03-19 (bitcoinstrings.cpp / bitcoin_en.ts) --- src/qt/bitcoinstrings.cpp | 6 +-- src/qt/locale/bitcoin_en.ts | 77 ++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 39 deletions(-) diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index dc506f049..46cb5a5d6 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -104,6 +104,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"), 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"), @@ -133,7 +134,6 @@ 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: 288, 0 = all)"), 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"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), @@ -194,8 +194,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..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet integrity..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."), 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 e05c018c2..07bb1cae5 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -123,7 +123,12 @@ This product includes software developed by the OpenSSL Project for use in the O &Edit - + + Send &Coins + Send &Coins + + + Export Address Book Data Export Address Book Data @@ -305,7 +310,7 @@ This product includes software developed by the OpenSSL Project for use in the O BitcoinGUI - + Sign &message... Sign &message... @@ -460,18 +465,18 @@ This product includes software developed by the OpenSSL Project for use in the O &Verify message... - - + + Bitcoin Bitcoin - + Wallet Wallet - + &About Bitcoin &About Bitcoin @@ -614,7 +619,7 @@ This product includes software developed by the OpenSSL Project for use in the O This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Backup Successful Backup Successful @@ -624,7 +629,7 @@ This product includes software developed by the OpenSSL Project for use in the O The wallet data was successfully saved to the new location. - + Up to date Up to date @@ -662,7 +667,7 @@ Address: %4 - + URI handling URI handling @@ -2196,12 +2201,12 @@ Address: %4 List commands - + Get help for a command Get help for a command - + Options: Options: @@ -2216,12 +2221,12 @@ Address: %4 Specify pid file (default: bitcoind.pid) - + Generate coins Generate coins - + Don't generate coins Don't generate coins @@ -2425,6 +2430,11 @@ If the file does not exist, create it with owner-readable-only file permissions. Error initializing block database Error initializing block database + + + Error initializing wallet database environment %s! + Error initializing wallet database environment %s! + Error loading block database @@ -2526,12 +2536,17 @@ If the file does not exist, create it with owner-readable-only file permissions. How thorough the block verification is (0-4, default: 3) - - Importing blocks from block database... - Importing blocks from block database... + + Verifying blocks... + Verifying blocks... + Verifying wallet... + Verifying wallet... + + + Imports blocks from external blk000??.dat file Imports blocks from external blk000??.dat file @@ -2656,12 +2671,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Username for JSON-RPC connections - - Verifying database... - Verifying database... - - - + Warning Warning @@ -2761,7 +2771,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Loading addresses... - + Error loading wallet.dat: Wallet corrupted Error loading wallet.dat: Wallet corrupted @@ -2772,21 +2782,16 @@ If the file does not exist, create it with owner-readable-only file permissions. - 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 - + Invalid -proxy address: '%s' Invalid -proxy address: '%s' @@ -2816,12 +2821,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Invalid amount for -paytxfee=<amount>: '%s' - + Error: could not start node Error: could not start node - + Invalid amount Invalid amount @@ -2846,7 +2851,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Unable to bind to %s on this computer. Bitcoin is probably already running. - + Find peers using internet relay chat (default: 0) Find peers using internet relay chat (default: 0) @@ -2856,7 +2861,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Fee per KB to add to transactions you send - + Loading wallet... Loading wallet... @@ -2891,12 +2896,12 @@ If the file does not exist, create it with owner-readable-only file permissions. To use the %s option - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. From 967125ca4a4c2386f571b2e9cb75ef8665921dca Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 21 Mar 2013 08:21:53 +0100 Subject: [PATCH 2/2] blockchain -> block chain (used everywhere else) --- src/init.cpp | 2 +- src/qt/bitcoinstrings.cpp | 2 +- src/qt/locale/bitcoin_en.ts | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 63610b17f..c34e10843 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -309,7 +309,7 @@ std::string HelpMessage() " -checklevel= " + _("How thorough the block verification is (0-4, default: 3)") + "\n" + " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n" + " -loadblock= " + _("Imports blocks from external blk000??.dat file") + "\n" + - " -reindex " + _("Rebuild blockchain index from current blk000??.dat files") + "\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" + "\n" + _("Block creation options:") + "\n" + diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 46cb5a5d6..328e3af9e 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -157,7 +157,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Output extra debugging information. Implies a QT_TRANSLATE_NOOP("bitcoin-core", "Output extra network debugging information"), QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild blockchain index from current blk000??.dat files"), +QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 07bb1cae5..806a72655 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -2536,7 +2536,12 @@ If the file does not exist, create it with owner-readable-only file permissions. How thorough the block verification is (0-4, default: 3) - + + Rebuild block chain index from current blk000??.dat files + + + + Verifying blocks... Verifying blocks... @@ -2601,12 +2606,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Prepend debug output with timestamp - - Rebuild blockchain index from current blk000??.dat files - Rebuild blockchain index from current blk000??.dat files - - - + SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL options: (see the Bitcoin Wiki for SSL setup instructions)