From f86ecd4a062b7f6515208c217f6405e47fa742f5 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sun, 23 Oct 2011 10:08:44 +0200 Subject: [PATCH] translation fixes - use wildcard for TRANSLATIONS in bitcoin-qt.pro to automatically build all translations present in src/qt/locale (thanks @tcatm) - rename language files to the usual _ - include recently added language files for es_ES and nb_NO --- bitcoin-qt.pro | 6 ++---- src/qt/bitcoin.qrc | 9 ++++++--- src/qt/locale/{bitcoin_de.ts => bitcoin_de_DE.ts} | 0 src/qt/locale/{bitcoin_es.ts => bitcoin_es_ES.ts} | 0 src/qt/locale/{bitcoin_nb.ts => bitcoin_nb_NO.ts} | 0 src/qt/locale/{bitcoin_nl.ts => bitcoin_nl_NL.ts} | 0 src/qt/locale/{bitcoin_ru.ts => bitcoin_ru_RU.ts} | 0 7 files changed, 8 insertions(+), 7 deletions(-) rename src/qt/locale/{bitcoin_de.ts => bitcoin_de_DE.ts} (100%) rename src/qt/locale/{bitcoin_es.ts => bitcoin_es_ES.ts} (100%) rename src/qt/locale/{bitcoin_nb.ts => bitcoin_nb_NO.ts} (100%) rename src/qt/locale/{bitcoin_nl.ts => bitcoin_nl_NL.ts} (100%) rename src/qt/locale/{bitcoin_ru.ts => bitcoin_ru_RU.ts} (100%) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 2e4000e52..e9dc6f787 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.qrc b/src/qt/bitcoin.qrc index 2985bb60e..57addbdbe 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_DE.qm + locale/bitcoin_es_CL.qm + locale/bitcoin_es_ES.qm + locale/bitcoin_nb_NO.qm + locale/bitcoin_nl_NL.qm + locale/bitcoin_ru_RU.qm diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de_DE.ts similarity index 100% rename from src/qt/locale/bitcoin_de.ts rename to src/qt/locale/bitcoin_de_DE.ts diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es_ES.ts similarity index 100% rename from src/qt/locale/bitcoin_es.ts rename to src/qt/locale/bitcoin_es_ES.ts diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb_NO.ts similarity index 100% rename from src/qt/locale/bitcoin_nb.ts rename to src/qt/locale/bitcoin_nb_NO.ts diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl_NL.ts similarity index 100% rename from src/qt/locale/bitcoin_nl.ts rename to src/qt/locale/bitcoin_nl_NL.ts diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru_RU.ts similarity index 100% rename from src/qt/locale/bitcoin_ru.ts rename to src/qt/locale/bitcoin_ru_RU.ts