Skip to content

Commit c07287d

Browse files
committed
Merge bitcoin/bitcoin#24438: qt: English (source) translations update
38020c4 qt: English (source) translations update (laanwj) Pull request description: Last-minute update for bitcoin/bitcoin#24434 and bitcoin/bitcoin#24401. ACKs for top commit: jonatack: Light review ACK 38020c4 fanquake: ACK 38020c4 Tree-SHA512: 6729700316364cbe78d5b026b0dde7e46fa0df811d7a7ae55d480cc9d2187e9173f3edcc2d7d643022beb6292d9aa6e10b05e6c07a80c95f3814bf23820d272f
2 parents 37637be + 38020c4 commit c07287d

File tree

3 files changed

+336
-324
lines changed

3 files changed

+336
-324
lines changed

src/qt/bitcoinstrings.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
2323
"Cannot obtain a lock on data directory %s. %s is probably already running."),
2424
QT_TRANSLATE_NOOP("bitcoin-core", ""
2525
"Cannot provide specific connections and have addrman find outgoing "
26-
"connections at the same."),
26+
"connections at the same time."),
2727
QT_TRANSLATE_NOOP("bitcoin-core", ""
2828
"Cannot upgrade a non HD split wallet from version %i to version %i without "
2929
"upgrading to support pre-split keypool. Please use version %i or no version "
@@ -32,6 +32,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
3232
"Distributed under the MIT software license, see the accompanying file %s or "
3333
"%s"),
3434
QT_TRANSLATE_NOOP("bitcoin-core", ""
35+
"Error loading %s: External signer wallet being loaded without external "
36+
"signer support compiled"),
37+
QT_TRANSLATE_NOOP("bitcoin-core", ""
3538
"Error reading %s! All keys read correctly, but transaction data or address "
3639
"book entries might be missing or incorrect."),
3740
QT_TRANSLATE_NOOP("bitcoin-core", ""

src/qt/locale/bitcoin_en.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5075,12 +5075,7 @@ Go to File > Open Wallet to load a wallet.
50755075
<translation type="unfinished"></translation>
50765076
</message>
50775077
<message>
5078-
<location line="+2"/>
5079-
<source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
5080-
<translation type="unfinished"></translation>
5081-
</message>
5082-
<message>
5083-
<location line="+3"/>
5078+
<location line="+5"/>
50845079
<source>Cannot upgrade a non HD split wallet from version %i to version %i without upgrading to support pre-split keypool. Please use version %i or no version specified.</source>
50855080
<translation type="unfinished"></translation>
50865081
</message>
@@ -5090,7 +5085,7 @@ Go to File &gt; Open Wallet to load a wallet.
50905085
<translation type="unfinished"></translation>
50915086
</message>
50925087
<message>
5093-
<location line="+3"/>
5088+
<location line="+6"/>
50945089
<source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
50955090
<translation type="unfinished"></translation>
50965091
</message>
@@ -5310,7 +5305,17 @@ Go to File &gt; Open Wallet to load a wallet.
53105305
<translation type="unfinished"></translation>
53115306
</message>
53125307
<message>
5313-
<location line="+59"/>
5308+
<location line="-69"/>
5309+
<source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
5310+
<translation type="unfinished"></translation>
5311+
</message>
5312+
<message>
5313+
<location line="+10"/>
5314+
<source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
5315+
<translation type="unfinished"></translation>
5316+
</message>
5317+
<message>
5318+
<location line="+118"/>
53145319
<source>Config setting for %s only applied on %s network when in [%s] section.</source>
53155320
<translation type="unfinished"></translation>
53165321
</message>

0 commit comments

Comments
 (0)