aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2020-01-08 14:04:22 +0100
committerWladimir J. van der Laan <laanwj@protonmail.com>2020-01-08 14:04:30 +0100
commit6dd982aa9eeb7f29aeb210894e1c490eef22978e (patch)
tree2d39dffc6284d57026b1d8d0f82fbc78d160780f
parentfcef6dbc15ef9630832697b9ebf80f05f20efda8 (diff)
parent63bf06afc387a9aba7e9933d7970ff88da26dc29 (diff)
Merge #17886: Restore English translation option
63bf06afc387a9aba7e9933d7970ff88da26dc29 Restore English translation option (Andrew Chow) Pull request description: It was [reported on Bitcointalk](https://bitcointalk.org/index.php?topic=5204167.msg53540137#msg53540137) that the normal English language option was lost in 0.19. This PR restores it. For some reason it was removed during the last periodic translation update. ACKs for top commit: laanwj: ACK 63bf06afc387a9aba7e9933d7970ff88da26dc29 Tree-SHA512: 94c7c7407f69e8df91fbbd8f8c5e3e8e031d308b72d775a00bcee564f2762a92f65c140029ce805faccdb767a25c0e222a396708c6ce29a5882bab939a45b772
-rw-r--r--src/Makefile.qt_locale.include1
-rw-r--r--src/qt/bitcoin_locale.qrc1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.qt_locale.include b/src/Makefile.qt_locale.include
index fad4873545..79db5cd7b4 100644
--- a/src/Makefile.qt_locale.include
+++ b/src/Makefile.qt_locale.include
@@ -10,6 +10,7 @@ QT_TS = \
qt/locale/bitcoin_de_DE.ts \
qt/locale/bitcoin_el.ts \
qt/locale/bitcoin_el_GR.ts \
+ qt/locale/bitcoin_en.ts \
qt/locale/bitcoin_en_AU.ts \
qt/locale/bitcoin_en_GB.ts \
qt/locale/bitcoin_eo.ts \
diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc
index dec3670536..c781072e9b 100644
--- a/src/qt/bitcoin_locale.qrc
+++ b/src/qt/bitcoin_locale.qrc
@@ -11,6 +11,7 @@
<file alias="de_DE">locale/bitcoin_de_DE.qm</file>
<file alias="el">locale/bitcoin_el.qm</file>
<file alias="el_GR">locale/bitcoin_el_GR.qm</file>
+ <file alias="en">locale/bitcoin_en.qm</file>
<file alias="en_AU">locale/bitcoin_en_AU.qm</file>
<file alias="en_GB">locale/bitcoin_en_GB.qm</file>
<file alias="eo">locale/bitcoin_eo.qm</file>