Skip to content

Commit d31f925

Browse files
committed
Merge #18360: Bump transifex slug and update English translations for 0.20
2a1b85f tx: Bump transifex slug to 020x (Wladimir J. van der Laan) 82dd886 qt: Periodical translations update (Wladimir J. van der Laan) Pull request description: Need to merge this so that translations for 0.20 can start. Top commit has no ACKs. Tree-SHA512: c78307eea3130b9bbc301f23790340e4c86a3f3877ab308bf67d9e1c9e977f7dda4b2cd83b96d9398b01dce616a6c962b98115123628bba35170eb0f301c4dd8
2 parents d402c1e + 2a1b85f commit d31f925

File tree

3 files changed

+292
-335
lines changed

3 files changed

+292
-335
lines changed

.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[bitcoin.qt-translation-019x]
4+
[bitcoin.qt-translation-020x]
55
file_filter = src/qt/locale/bitcoin_<lang>.ts
66
source_file = src/qt/locale/bitcoin_en.ts
77
source_lang = en

src/qt/bitcoinstrings.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
5151
"Prune: last wallet synchronisation goes beyond pruned data. You need to -"
5252
"reindex (download the whole blockchain again in case of pruned node)"),
5353
QT_TRANSLATE_NOOP("bitcoin-core", ""
54-
"Rescans are not possible in pruned mode. You will need to use -reindex which "
55-
"will download the whole blockchain again."),
56-
QT_TRANSLATE_NOOP("bitcoin-core", ""
5754
"The block database contains a block which appears to be from the future. "
5855
"This may be due to your computer's date and time being set incorrectly. Only "
5956
"rebuild the block database if you are sure that your computer's date and "
@@ -69,10 +66,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
6966
QT_TRANSLATE_NOOP("bitcoin-core", ""
7067
"This is the transaction fee you may pay when fee estimates are not available."),
7168
QT_TRANSLATE_NOOP("bitcoin-core", ""
72-
"This product includes software developed by the OpenSSL Project for use in "
73-
"the OpenSSL Toolkit %s and cryptographic software written by Eric Young and "
74-
"UPnP software written by Thomas Bernard."),
75-
QT_TRANSLATE_NOOP("bitcoin-core", ""
7669
"Total length of network version string (%i) exceeds maximum length (%i). "
7770
"Reduce the number or size of uacomments."),
7871
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -107,6 +100,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
107100
QT_TRANSLATE_NOOP("bitcoin-core", "Config setting for %s only applied on %s network when in [%s] section."),
108101
QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) %i-%i"),
109102
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
103+
QT_TRANSLATE_NOOP("bitcoin-core", "Could not find asmap file %s"),
104+
QT_TRANSLATE_NOOP("bitcoin-core", "Could not parse asmap file %s"),
110105
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
111106
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
112107
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),

0 commit comments

Comments
 (0)