diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/qt/bitcoinstrings.cpp | 2 | ||||
-rw-r--r-- | src/qt/locale/bitcoin_en.ts | 53 |
2 files changed, 24 insertions, 31 deletions
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index adf001c968..d6f4e7100f 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -166,8 +166,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Set lowest fee rate (in %s/kB) for transactions to be included in block " "creation. (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " "leave that many cores free, default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 2b712b4317..3c78d7d250 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -635,7 +635,7 @@ <translation>Catching up...</translation> </message> <message> - <location line="+145"/> + <location line="+150"/> <source>Date: %1 </source> <translation type="unfinished"></translation> @@ -695,7 +695,7 @@ <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+534"/> + <location filename="../bitcoin.cpp" line="+531"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -788,7 +788,7 @@ <translation type="unfinished">Confirmed</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+53"/> + <location filename="../coincontroldialog.cpp" line="+52"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> @@ -874,7 +874,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+48"/> <location line="+52"/> <source>(no label)</source> <translation type="unfinished"></translation> @@ -2453,27 +2453,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+142"/> - <source>Requested payments history</source> + <location line="+78"/> + <source>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.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-162"/> - <source>&Request payment</source> + <location line="+3"/> + <source>Generate native segwit (Bech32) address</source> <translation type="unfinished"></translation> </message> <message> - <location line="+98"/> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> + <location line="+61"/> + <source>Requested payments history</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Generate Bech32 address</source> + <location line="-162"/> + <source>&Request payment</source> <translation type="unfinished"></translation> </message> <message> - <location line="+86"/> + <location line="+187"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"></translation> </message> @@ -4025,7 +4025,7 @@ <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+351"/> + <location filename="../bitcoinstrings.cpp" line="+349"/> <source>Options:</source> <translation>Options:</translation> </message> @@ -4050,7 +4050,7 @@ <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="-209"/> + <location line="-207"/> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation type="unfinished"></translation> </message> @@ -4075,7 +4075,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+151"/> + <location line="+149"/> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation type="unfinished"></translation> </message> @@ -4100,7 +4100,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-397"/> + <location line="-395"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -4210,7 +4210,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation type="unfinished"></translation> </message> @@ -4625,7 +4625,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-397"/> + <location line="-395"/> <source>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</source> <translation type="unfinished"></translation> </message> @@ -4680,7 +4680,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+44"/> + <location line="+42"/> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation type="unfinished"></translation> </message> @@ -4925,17 +4925,17 @@ <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-263"/> + <location line="-261"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+185"/> + <location line="+183"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="-260"/> + <location line="-258"/> <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> <translation type="unfinished"></translation> </message> @@ -5000,12 +5000,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+34"/> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> + <location line="+37"/> <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> <translation type="unfinished"></translation> </message> |