diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index acd81a6b2..ace085382 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -157,6 +157,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "The transaction amount is too small to send after the fee has been deducted"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"This is a pre-release test build - use at your own risk - do not use for " +"mining or merchant applications"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "This is the transaction fee you may pay when fee estimates are not available."), QT_TRANSLATE_NOOP("bitcoin-core", "" "This product includes software developed by the OpenSSL Project for use in " @@ -193,6 +196,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Wallet will not create transactions that violate mempool chain limits " "(default: %u)"), 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", "" @@ -200,6 +206,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "if your balance or transactions are incorrect you should restore from a " "backup."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Warning: We do not appear to fully agree with our peers! You may need to " +"upgrade, or other nodes may need to upgrade."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR " "notated network (e.g. 1.2.3.0/24). Can be specified multiple times."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -228,6 +237,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), +QT_TRANSLATE_NOOP("bitcoin-core", "Chain selection options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), @@ -350,6 +360,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use - QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -tor found, use -onion."), QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format on startup"), QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Use the test chain"), QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 984b33ffd..b9d8944ae 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -684,6 +684,11 @@ Wallet is <b>encrypted</b> and currently <b>locked</b> Wallet is <b>encrypted</b> and currently <b>locked</b> + + + A fatal error occurred. Bitcoin can no longer continue safely and will quit. + + CoinControlDialog @@ -1839,6 +1844,29 @@ %n years + + + %1 didn't yet exit safely... + + + + + QObject::QObject + + + Error: Specified data directory "%1" does not exist. + + + + + Error: Cannot parse configuration file: %1. Only use key=value syntax. + + + + + Error: %1 + + QRImageWidget @@ -3829,7 +3857,7 @@ bitcoin-core - + Options: Options: @@ -3849,12 +3877,12 @@ Specify your own public address - + Accept command line and JSON-RPC commands Accept command line and JSON-RPC commands - + Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect) @@ -3894,7 +3922,7 @@ - + Error: A fatal internal error occurred, see debug.log for details @@ -3919,7 +3947,7 @@ - + Bitcoin Core Bitcoin Core @@ -3999,7 +4027,12 @@ - + + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications + + + + Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain @@ -4014,7 +4047,17 @@ - + + Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues. + + + + + Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade. + + + + You need to rebuild the database using -reindex-chainstate to change -txindex @@ -4055,6 +4098,11 @@ + Chain selection options: + + + + Change index out of range @@ -4298,6 +4346,11 @@ Use UPnP to map the listening port (default: %u) + + + Use the test chain + + User Agent comment (%s) contains unsafe characters. @@ -4334,7 +4387,7 @@ - + Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times @@ -4404,12 +4457,12 @@ - + Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start - + Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway @@ -4434,7 +4487,7 @@ - + Connect through SOCKS5 proxy @@ -4564,7 +4617,7 @@ - + Username for JSON-RPC connections Username for JSON-RPC connections @@ -4594,27 +4647,27 @@ - + Password for JSON-RPC connections Password for JSON-RPC connections - + Execute command when the best block changes (%s in cmd is replaced by block hash) Execute command when the best block changes (%s in cmd is replaced by block hash) - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Loading addresses... - + (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) @@ -4679,7 +4732,7 @@ - + This is the transaction fee you may pay when fee estimates are not available. @@ -4719,7 +4772,7 @@ - + Warning: Unknown block versions being mined! It's possible unknown rules are in effect @@ -4729,7 +4782,7 @@ - + Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times. @@ -4749,7 +4802,7 @@ - + How many blocks to check at startup (default: %u, 0 = all) @@ -4909,17 +4962,17 @@ Loading block index... - + Add a node to connect to and attempt to keep the connection open Add a node to connect to and attempt to keep the connection open - + Loading wallet... Loading wallet... - + Cannot downgrade wallet Cannot downgrade wallet @@ -4929,7 +4982,7 @@ Cannot write default address - + Rescanning... Rescanning...