diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 2e4000e5..e9dc6f78 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -175,10 +175,8 @@ FORMS += \
CODECFORTR = UTF-8
# for lrelease/lupdate
-TRANSLATIONS = src/qt/locale/bitcoin_de.ts \
- src/qt/locale/bitcoin_es.ts \
- src/qt/locale/bitcoin_nl.ts \
- src/qt/locale/bitcoin_ru.ts
+# also add new translations to src/qt/bitcoin.qrc under translations/
+TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
isEmpty(QMAKE_LRELEASE) {
win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index c8e33241..86ac8a02 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -118,14 +118,27 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(bitcoin);
QApplication app(argc, argv);
- // Load language file for system locale
- QString locale = QLocale::system().name();
- QTranslator qtTranslator;
- qtTranslator.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" + locale);
+ // Load language files for system locale:
+ // - First load the translator for the base language, without territory
+ // - Then load the more specific locale translator
+ QString lang_territory = QLocale::system().name(); // "en_US"
+ QString lang = lang_territory;
+ lang.truncate(lang_territory.lastIndexOf('_')); // "en"
+ QTranslator qtTranslatorBase, qtTranslator, translatorBase, translator;
+
+ qtTranslatorBase.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" + lang);
+ if (!qtTranslatorBase.isEmpty())
+ app.installTranslator(&qtTranslatorBase);
+
+ qtTranslator.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" + lang_territory);
if (!qtTranslator.isEmpty())
app.installTranslator(&qtTranslator);
- QTranslator translator;
- translator.load(":/translations/"+locale);
+
+ translatorBase.load(":/translations/"+lang);
+ if (!translatorBase.isEmpty())
+ app.installTranslator(&translatorBase);
+
+ translator.load(":/translations/"+lang_territory);
if (!translator.isEmpty())
app.installTranslator(&translator);
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 2985bb60..145574df 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -46,8 +46,11 @@
res/movies/update_spinner.mng
- locale/bitcoin_de.qm
- locale/bitcoin_nl.qm
- locale/bitcoin_ru.qm
+ locale/bitcoin_de.qm
+ locale/bitcoin_es.qm
+ locale/bitcoin_es_CL.qm
+ locale/bitcoin_nb.qm
+ locale/bitcoin_nl.qm
+ locale/bitcoin_ru.qm