diff options
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 6 | ||||
| -rw-r--r-- | 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 dc506f0497..46cb5a5d61 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 e05c018c27..07bb1cae5a 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 <translation>&Edit</translation> </message> <message> - <location line="+248"/> + <location line="+1"/> + <source>Send &Coins</source> + <translation>Send &Coins</translation> + </message> + <message> + <location line="+263"/> <source>Export Address Book Data</source> <translation>Export Address Book Data</translation> </message> @@ -305,7 +310,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+267"/> + <location filename="../bitcoingui.cpp" line="+269"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> @@ -460,18 +465,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="-196"/> - <location line="+529"/> + <location line="-198"/> + <location line="+531"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-529"/> + <location line="-531"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+176"/> + <location line="+178"/> <source>&About Bitcoin</source> <translation>&About Bitcoin</translation> </message> @@ -614,7 +619,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>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?</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>Backup Successful</source> <translation>Backup Successful</translation> </message> @@ -624,7 +629,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>The wallet data was successfully saved to the new location.</translation> </message> <message> - <location line="-348"/> + <location line="-351"/> <source>Up to date</source> <translation>Up to date</translation> </message> @@ -662,7 +667,7 @@ Address: %4 </translation> </message> <message> - <location line="+99"/> + <location line="+102"/> <location line="+28"/> <source>URI handling</source> <translation>URI handling</translation> @@ -2196,12 +2201,12 @@ Address: %4 <translation>List commands</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Get help for a command</translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Options:</source> <translation>Options:</translation> </message> @@ -2216,12 +2221,12 @@ Address: %4 <translation>Specify pid file (default: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generate coins</translation> </message> <message> - <location line="-28"/> + <location line="-29"/> <source>Don't generate coins</source> <translation>Don't generate coins</translation> </message> @@ -2427,6 +2432,11 @@ If the file does not exist, create it with owner-readable-only file permissions. </message> <message> <location line="+1"/> + <source>Error initializing wallet database environment %s!</source> + <translation>Error initializing wallet database environment %s!</translation> + </message> + <message> + <location line="+1"/> <source>Error loading block database</source> <translation>Error loading block database</translation> </message> @@ -2526,12 +2536,17 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>How thorough the block verification is (0-4, default: 3)</translation> </message> <message> - <location line="+1"/> - <source>Importing blocks from block database...</source> - <translation>Importing blocks from block database...</translation> + <location line="+61"/> + <source>Verifying blocks...</source> + <translation>Verifying blocks...</translation> </message> <message> <location line="+1"/> + <source>Verifying wallet...</source> + <translation>Verifying wallet...</translation> + </message> + <message> + <location line="-61"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> @@ -2656,12 +2671,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Username for JSON-RPC connections</translation> </message> <message> - <location line="+1"/> - <source>Verifying database...</source> - <translation>Verifying database...</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -2761,7 +2771,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Loading addresses...</translation> </message> <message> - <location line="-37"/> + <location line="-36"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -2772,21 +2782,16 @@ If the file does not exist, create it with owner-readable-only file permissions. </message> <message> <location line="+88"/> - <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> <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> </message> <message> - <location line="-91"/> + <location line="-90"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> @@ -2816,12 +2821,12 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-26"/> + <location line="-25"/> <source>Error: could not start node</source> <translation>Error: could not start node</translation> </message> <message> - <location line="+27"/> + <location line="+26"/> <source>Invalid amount</source> <translation>Invalid amount</translation> </message> @@ -2846,7 +2851,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> </message> <message> - <location line="+69"/> + <location line="+70"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>Find peers using internet relay chat (default: 0)</translation> </message> @@ -2856,7 +2861,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location line="+19"/> + <location line="+18"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> @@ -2891,12 +2896,12 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>To use the %s option</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> |