diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index dc997e96ccd..87736cd1851 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -9,14 +9,13 @@
#define UNUSED
#endif
static const char UNUSED *bitcoin_strings[] = {
-QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core"),
QT_TRANSLATE_NOOP("bitcoin-core", "The %s developers"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"-maxtxfee is set very high! Fees this large could be paid on a single "
"transaction."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Can't generate a change-address key. Private keys are disabled for this "
-"wallet."),
+"Can't generate a change-address key. No keys in the internal keypool and "
+"can't generate any keys."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Cannot obtain a lock on data directory %s. %s is probably already running."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -88,9 +87,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: The network does not appear to fully agree! Some miners appear to "
"be experiencing issues."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Warning: Unknown block versions being mined! It's possible unknown rules are "
-"in effect"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; "
"if your balance or transactions are incorrect you should restore from a "
"backup."),
@@ -124,15 +120,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet %s. Duplicate -wallet fi
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
QT_TRANSLATE_NOOP("bitcoin-core", "Error upgrading chainstate database"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: A fatal internal error occurred, see debug.log for details"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low for %s"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is too low!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"),
QT_TRANSLATE_NOOP("bitcoin-core", "Importing..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Information"),
QT_TRANSLATE_NOOP("bitcoin-core", "Initialization sanity check failed. %s is shutting down."),
QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -onion address or hostname: '%s'"),
@@ -150,6 +144,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."),
QT_TRANSLATE_NOOP("bitcoin-core", "Prune cannot be configured with a negative value."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Prune mode is incompatible with -blockfilterindex."),
QT_TRANSLATE_NOOP("bitcoin-core", "Prune mode is incompatible with -txindex."),
QT_TRANSLATE_NOOP("bitcoin-core", "Pruning blockstore..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Reducing -maxconnections from %d to %d, because of system limitations."),
@@ -179,9 +174,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large for fee policy"),
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"),
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer. %s is probably already running."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Unable to create the PID file '%s': %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate initial keys"),
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate keys"),
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to start HTTP server. See debug log for details."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Unknown -blockfilterindex value %s."),
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported logging category %s=%s."),
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading UTXO database"),
@@ -189,9 +186,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading txindex database"),
QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside wallet directory %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart %s to complete"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: unknown new rules activated (versionbit %i)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."),
};
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index c6ecbc3f879..bff74690710 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -59,7 +59,7 @@
&Delete
-
+ Choose the address to send coins to
@@ -90,7 +90,7 @@
- These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.
+ These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
@@ -132,7 +132,7 @@
AddressTableModel
-
+ Label
@@ -297,7 +297,7 @@
BanTableModel
-
+ IP/Netmask
@@ -315,12 +315,12 @@
Sign &message...
-
+ Synchronizing with network...Synchronizing with network...
-
+ &Overview&Overview
@@ -400,12 +400,12 @@
-
+ Wallet:
-
+ Click to disable network activity.
@@ -430,12 +430,12 @@
Reindexing blocks on disk...
-
+ Proxy is <b>enabled</b>: %1
-
+ Send coins to a Bitcoin addressSend coins to a Bitcoin address
@@ -465,12 +465,7 @@
&Verify message...
-
- Bitcoin
- Bitcoin
-
-
-
+ &Send&Send
@@ -505,12 +500,12 @@
Verify messages to ensure they were signed with specified Bitcoin addresses
-
+ &File&File
-
+ &Settings&Settings
@@ -525,7 +520,7 @@
Tabs toolbar
-
+ Request payments (generates QR codes and bitcoin: URIs)
@@ -545,12 +540,12 @@
-
+ &Command-line options
-
+ %n active connection(s) to Bitcoin network%n active connection to Bitcoin network
@@ -591,27 +586,27 @@
Transactions after this will not yet be visible.
-
+ ErrorError
-
+ WarningWarning
-
+ InformationInformation
-
+ Up to dateUp to date
-
+ &Sending addresses
@@ -621,12 +616,52 @@
-
+
+ Open Wallet
+
+
+
+
+ Open a wallet
+
+
+
+
+ Close Wallet...
+
+
+
+
+ Close wallet
+
+
+
+ Show the %1 help message to get a list with possible Bitcoin command-line options
-
+
+ default wallet
+
+
+
+
+ Opening Wallet <b>%1</b>...
+
+
+
+
+ Open Wallet Failed
+
+
+
+
+ No wallets available
+
+
+
+ &Window&Window
@@ -651,7 +686,7 @@
-
+ %1 client
@@ -666,7 +701,17 @@
Catching up...
-
+
+ Error: %1
+
+
+
+
+ Warning: %1
+
+
+
+ Date: %1
@@ -737,7 +782,7 @@
Wallet is <b>encrypted</b> and currently <b>locked</b>
-
+ A fatal error occurred. Bitcoin can no longer continue safely and will quit.
@@ -830,7 +875,7 @@
Confirmed
-
+ Copy address
@@ -1031,7 +1076,7 @@
HelpMessageDialog
-
+ versionversion
@@ -1120,7 +1165,7 @@
-
+ Error: Specified data directory "%1" cannot be created.
@@ -1171,7 +1216,7 @@
-
+ Unknown...
@@ -1207,8 +1252,8 @@
-
- Unknown. Syncing Headers (%1)...
+
+ Unknown. Syncing Headers (%1, %2%)...
@@ -1540,12 +1585,12 @@
default
-
+ none
-
+ Confirm options resetConfirm options reset
@@ -1689,7 +1734,7 @@
PaymentServer
-
+
@@ -1698,7 +1743,7 @@
-
+ Cannot start bitcoin: click-to-pay handler
@@ -1706,14 +1751,14 @@
+
- URI handling
-
+ 'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.
@@ -1728,12 +1773,13 @@
-
+
+ Cannot process payment request because BIP70 support was not compiled in.
-
+ Invalid payment address %1
@@ -1744,16 +1790,17 @@
+ Payment request file handling
-
+ Payment request file cannot be read! This can be caused by an invalid payment request file.
-
+
@@ -1832,7 +1879,7 @@
PeerTableModel
-
+ User Agent
@@ -1865,17 +1912,17 @@
QObject
-
+ AmountAmount
-
+ Enter a Bitcoin address (e.g. %1)
-
+ %1 d
@@ -1985,20 +2032,7 @@
-
- %1 didn't yet exit safely...
-
-
-
-
- unknown
-
-
-
-
- QObject::QObject
-
-
+ Error parsing command line arguments: %1.
@@ -2017,11 +2051,21 @@
Error: %1
+
+
+ %1 didn't yet exit safely...
+
+
+
+
+ unknown
+
+ QRImageWidget
-
+ &Save Image...
@@ -2030,6 +2074,21 @@
&Copy Image
+
+
+ Resulting URI too long, try to reduce the text for label / message.
+
+
+
+
+ Error encoding URI into QR Code.
+
+
+
+
+ QR code support not available.
+
+ Save QR Code
@@ -2056,7 +2115,7 @@
-
+
@@ -2078,7 +2137,7 @@
N/A
-
+ Client versionClient version
@@ -2178,7 +2237,7 @@
-
+ &Reset
@@ -2206,8 +2265,8 @@
-
-
+
+ Select a peer to view detailed information.
@@ -2242,13 +2301,13 @@
-
-
+
+ User Agent
-
+ Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.
@@ -2263,7 +2322,7 @@
-
+ Services
@@ -2313,7 +2372,7 @@
-
+ Last block timeLast block time
@@ -2328,7 +2387,7 @@
&Console
-
+ &Network Traffic
@@ -2348,7 +2407,7 @@
-
+ Debug log fileDebug log file
@@ -2358,7 +2417,7 @@
Clear console
-
+ 1 &hour
@@ -2396,7 +2455,7 @@
-
+ Welcome to the %1 RPC console.
@@ -2513,13 +2572,28 @@
-
+
+ Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When checked, an address compatible with older wallets will be created instead.
+
+
+
+
+ Generate legacy address
+
+
+
+ An optional amount to request. Leave this empty or zero to not request a specific amount.
-
+
+ &Create new receiving address
+
+
+
+ Clear all fields of the form.
@@ -2529,27 +2603,12 @@
-
- Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.
-
-
-
-
- Generate native segwit (Bech32) address
-
-
-
-
+ Requested payments history
-
- &Request payment
-
-
-
-
+ Show the selected request (does the same as double clicking an entry)
@@ -2569,7 +2628,7 @@
-
+ Copy URI
@@ -2612,7 +2671,7 @@
-
+ Request payment to %1
@@ -2651,16 +2710,6 @@
WalletWallet
-
-
- Resulting URI too long, try to reduce the text for label / message.
-
-
-
-
- Error encoding URI into QR Code.
-
- RecentRequestsTableModel
@@ -2704,7 +2753,7 @@
SendCoinsDialog
-
+ Send CoinsSend Coins
@@ -2891,7 +2940,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
S&end
-
+ Copy quantity
@@ -2931,10 +2980,19 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
-
-
-
+
+ from wallet '%1'
+
+
+
+
+
+ %1 to '%2'
+
+
+
+
+ %1 to %2
@@ -2954,12 +3012,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
- from wallet %1
-
-
-
-
+ Please, review your transaction.
@@ -2979,12 +3032,17 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
+ To review recipient list click "Show Details..."
+
+
+
+ Confirm send coins
-
+ The recipient address is not valid. Please recheck.
@@ -3179,7 +3237,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
SendConfirmationDialog
-
+ Yes
@@ -3399,7 +3457,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
TransactionDesc
-
+ Open for %n more block(s)Open for %n more block
@@ -3640,7 +3698,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
TransactionTableModel
-
+ DateDate
@@ -3776,7 +3834,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
TransactionView
-
+ All
@@ -3975,11 +4033,29 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
UnitDisplayStatusBarControl
-
+ Unit to show amounts in. Click to select another unit.
+
+ WalletController
+
+
+ Close wallet
+
+
+
+
+ Are you sure you wish to close wallet <i>%1</i>?
+
+
+
+
+ Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.
+
+
+WalletFrame
@@ -4043,7 +4119,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ default wallet
@@ -4099,7 +4175,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
bitcoin-core
-
+ Distributed under the MIT software license, see the accompanying file %s or %s
@@ -4119,7 +4195,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Error: A fatal internal error occurred, see debug.log for details
@@ -4129,22 +4205,22 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Unable to start HTTP server. See debug log for details.
-
- Bitcoin Core
- Bitcoin Core
-
-
-
+ The %s developers
-
+
+ Can't generate a change-address key. No keys in the internal keypool and can't generate any keys.
+
+
+
+ Cannot obtain a lock on data directory %s. %s is probably already running.
@@ -4199,7 +4275,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.
@@ -4290,11 +4366,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
- Error: Disk space is low!
- Error: Disk space is low!
-
-
- Failed to listen on any port. Use -listen=0 if you want this.Failed to listen on any port. Use -listen=0 if you want this.
@@ -4314,7 +4385,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
Incorrect or no genesis block found. Wrong datadir for network?
-
+ Initialization sanity check failed. %s is shutting down.
@@ -4334,22 +4405,27 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Specified blocks directory "%s" does not exist.
-
+ Upgrading txindex database
-
+ Loading P2P addresses...
-
+
+ Error: Disk space is too low!
+
+
+
+ Loading banlist...
@@ -4364,7 +4440,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Prune mode is incompatible with -txindex.
@@ -4394,12 +4470,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Unable to generate keys
-
+ Unsupported logging category %s=%s.
@@ -4419,12 +4495,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
Verifying blocks...
-
+ Wallet needed to be rewritten: restart %s to complete
-
+ Error: Listening for incoming connections failed (listen returned error %s)
@@ -4439,7 +4515,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain
@@ -4454,17 +4530,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Error: Disk space is low for %s
-
- Information
- Information
-
-
-
+ Invalid -onion address or hostname: '%s'
@@ -4489,7 +4560,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
+ Prune mode is incompatible with -blockfilterindex.
+
+
+
+ Reducing -maxconnections from %d to %d, because of system limitations.
@@ -4556,26 +4632,26 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
+ Unable to create the PID file '%s': %s
+
+
+
+ Unable to generate initial keys
-
+
+ Unknown -blockfilterindex value %s.
+
+
+
+ Verifying wallet(s)...
-
-
- Wallet %s resides outside wallet directory %s
-
-
- Warning
- Warning
-
-
- Warning: unknown new rules activated (versionbit %i)
@@ -4585,7 +4661,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ -maxtxfee is set very high! Fees this large could be paid on a single transaction.
@@ -4606,11 +4682,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
- Warning: Unknown block versions being mined! It's possible unknown rules are in effect
-
-
-
- Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.
@@ -4625,12 +4696,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Keypool ran out, please call keypoolrefill first
-
+ Starting network threads...
@@ -4665,22 +4736,17 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Unknown network specified in -onlynet: '%s'Unknown network specified in -onlynet: '%s'
-
+ Insufficient fundsInsufficient funds
-
- Can't generate a change-address key. Private keys are disabled for this wallet.
-
-
-
-
+ Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.
@@ -4695,12 +4761,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+ Cannot write to data directory '%s'; check permissions.
-
+ Loading block index...Loading block index...
@@ -4710,24 +4776,19 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
Loading wallet...
-
+ Cannot downgrade walletCannot downgrade wallet
-
+ Rescanning...Rescanning...
-
+ Done loadingDone loading
-
-
- Error
- Error
-