From dcb13a0ab687b23465a046e35ca75a432427b833 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 24 May 2018 16:46:20 -0400 Subject: [PATCH] qt: Update translations pre-rc1 --- src/qt/bitcoinstrings.cpp | 2 -- 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 adf001c96..d6f4e7100 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 2b712b431..3c78d7d25 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -635,7 +635,7 @@ Catching up... - + Date: %1 @@ -695,7 +695,7 @@ Wallet is <b>encrypted</b> and currently <b>locked</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -788,7 +788,7 @@ Confirmed - + Copy address @@ -874,7 +874,7 @@ - + (no label) @@ -2453,27 +2453,27 @@ - - Requested payments history + + 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. - - &Request payment + + Generate native segwit (Bech32) address - - 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. + + Requested payments history - - Generate Bech32 address + + &Request payment - + Show the selected request (does the same as double clicking an entry) @@ -4025,7 +4025,7 @@ bitcoin-core - + Options: Options: @@ -4050,7 +4050,7 @@ Accept command line and JSON-RPC commands - + Distributed under the MIT software license, see the accompanying file %s or %s @@ -4075,7 +4075,7 @@ - + Error: A fatal internal error occurred, see debug.log for details @@ -4100,7 +4100,7 @@ - + Bitcoin Core Bitcoin Core @@ -4210,7 +4210,7 @@ - + Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d) @@ -4625,7 +4625,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 @@ -4680,7 +4680,7 @@ - + The transaction amount is too small to send after the fee has been deducted @@ -4925,17 +4925,17 @@ 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 - + (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) @@ -5000,12 +5000,7 @@ - - Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight - - - - + Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)