diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index dc997e96c..87736cd18 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 c6ecbc3f8..bff746907 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -59,7 +59,7 @@
&Delete
-
+
@@ -90,7 +90,7 @@
-
+
@@ -132,7 +132,7 @@
AddressTableModel
-
+
@@ -297,7 +297,7 @@
BanTableModel
-
+
@@ -315,12 +315,12 @@
Sign &message...
-
+
Synchronizing with network...
-
+
&Overview
@@ -400,12 +400,12 @@
-
+
-
+
@@ -430,12 +430,12 @@
Reindexing blocks on disk...
-
+
-
+
Send coins to a Bitcoin address
@@ -465,12 +465,7 @@
&Verify message...
-
-
- Bitcoin
-
-
-
+
&Send
@@ -505,12 +500,12 @@
Verify messages to ensure they were signed with specified Bitcoin addresses
-
+
&File
-
+
&Settings
@@ -525,7 +520,7 @@
Tabs toolbar
-
+
@@ -545,12 +540,12 @@
-
+
-
+
%n active connection to Bitcoin network
@@ -591,27 +586,27 @@
Transactions after this will not yet be visible.
-
+
Error
-
+
Warning
-
+
Information
-
+
Up to date
-
+
@@ -621,12 +616,52 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
&Window
@@ -651,7 +686,7 @@
-
+
@@ -666,7 +701,17 @@
Catching up...
-
+
+
+
+
+
+
+
+
+
+
+
@@ -737,7 +782,7 @@
Wallet is <b>encrypted</b> and currently <b>locked</b>
-
+
@@ -830,7 +875,7 @@
Confirmed
-
+
@@ -1031,7 +1076,7 @@
HelpMessageDialog
-
+
version
@@ -1120,7 +1165,7 @@
-
+
@@ -1171,7 +1216,7 @@
-
+
@@ -1207,8 +1252,8 @@
-
-
+
+
@@ -1540,12 +1585,12 @@
default
-
+
-
+
Confirm options reset
@@ -1689,7 +1734,7 @@
PaymentServer
-
+
@@ -1698,7 +1743,7 @@
-
+
@@ -1706,14 +1751,14 @@
+
-
-
+
@@ -1728,12 +1773,13 @@
-
+
+
-
+
@@ -1744,16 +1790,17 @@
+
-
+
-
+
@@ -1832,7 +1879,7 @@
PeerTableModel
-
+
@@ -1865,17 +1912,17 @@
QObject
-
+
Amount
-
+
-
+
@@ -1985,20 +2032,7 @@
-
-
-
-
-
-
-
-
-
-
-
- QObject::QObject
-
-
+
@@ -2017,11 +2051,21 @@
+
+
+
+
+
+
+
+
+
+
QRImageWidget
-
+
@@ -2030,6 +2074,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2056,7 +2115,7 @@
-
+
@@ -2078,7 +2137,7 @@
N/A
-
+
Client version
@@ -2178,7 +2237,7 @@
-
+
@@ -2206,8 +2265,8 @@
-
-
+
+
@@ -2242,13 +2301,13 @@
-
-
+
+
-
+
@@ -2263,7 +2322,7 @@
-
+
@@ -2313,7 +2372,7 @@
-
+
Last block time
@@ -2328,7 +2387,7 @@
&Console
-
+
@@ -2348,7 +2407,7 @@
-
+
Debug log file
@@ -2358,7 +2417,7 @@
Clear console
-
+
@@ -2396,7 +2455,7 @@
-
+
@@ -2513,13 +2572,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -2529,27 +2603,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
@@ -2569,7 +2628,7 @@
-
+
@@ -2612,7 +2671,7 @@
-
+
@@ -2651,16 +2710,6 @@
Wallet
-
-
-
-
-
-
-
-
-
-
RecentRequestsTableModel
@@ -2704,7 +2753,7 @@
SendCoinsDialog
-
+
Send Coins
@@ -2891,7 +2940,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
S&end
-
+
@@ -2931,10 +2980,19 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2954,12 +3012,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
-
-
-
-
-
+
@@ -2979,12 +3032,17 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
+
+
+
+
+
-
+
@@ -3179,7 +3237,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
SendConfirmationDialog
-
+
@@ -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
@@ -3640,7 +3698,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
TransactionTableModel
-
+
Date
@@ -3776,7 +3834,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
TransactionView
-
+
@@ -3975,11 +4033,29 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
UnitDisplayStatusBarControl
-
+
+
+ WalletController
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
WalletFrame
@@ -4043,7 +4119,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
@@ -4099,7 +4175,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
bitcoin-core
-
+
@@ -4119,7 +4195,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
@@ -4129,22 +4205,22 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
-
-
- Bitcoin Core
-
-
-
+
-
+
+
+
+
+
+
@@ -4199,7 +4275,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
@@ -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!
-
-
-
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?
-
+
@@ -4334,22 +4405,27 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
-
+
-
+
-
+
+
+
+
+
+
@@ -4364,7 +4440,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
@@ -4394,12 +4470,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
-
+
@@ -4419,12 +4495,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
Verifying blocks...
-
+
-
+
@@ -4439,7 +4515,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
@@ -4454,17 +4530,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
-
-
- Information
-
-
-
+
@@ -4489,7 +4560,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
+
+
+
+
+
@@ -4556,26 +4632,26 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
+
+
+
+
+
-
+
+
+
+
+
+
-
-
-
-
-
-
- Warning
-
-
-
@@ -4585,7 +4661,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
@@ -4606,11 +4682,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
-
-
-
-
@@ -4625,12 +4696,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
-
+
@@ -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'
-
+
Insufficient funds
-
-
-
-
-
-
+
@@ -4695,12 +4761,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos
-
+
-
+
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 wallet
-
+
Rescanning...
-
+
Done loading
-
-
-
- Error
-