Revert "Rename translation files bitcoin_*.ts to novacoin_*.ts"

This reverts commit 60b15cc146db37023defd09806662e679dbebb8e.

Reverted to make future mergings easier.

diff --git a/novacoin-qt.pro b/novacoin-qt.pro
index a044cd6..51ba8b1 100644 (file)
--- a/novacoin-qt.pro
+++ b/novacoin-qt.pro
@@ -350,7 +350,7 @@ CODECFORTR = UTF-8
 
 # for lrelease/lupdate
 # also add new translations to src/qt/bitcoin.qrc under translations/
-TRANSLATIONS = $$files(src/qt/locale/novacoin_*.ts)
+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 1cdf3a1..9cbd685 100644 (file)
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -53,7 +53,7 @@
         <file alias="update_spinner">res/movies/update_spinner.mng</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="en">locale/novacoin_en.qm</file>
-        <file alias="ru">locale/novacoin_ru.qm</file>
+        <file alias="en">locale/bitcoin_en.qm</file>
+        <file alias="ru">locale/bitcoin_ru.qm</file>
     </qresource>
 </RCC>

diff --git a/src/qt/locale/novacoin_en.ts b/src/qt/locale/bitcoin_en.ts
similarity index 100%
rename from src/qt/locale/novacoin_en.ts
rename to src/qt/locale/bitcoin_en.ts

diff --git a/src/qt/locale/novacoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
similarity index 100%
rename from src/qt/locale/novacoin_ru.ts
rename to src/qt/locale/bitcoin_ru.ts

diff --git a/src/qt/locale/translations.pro b/src/qt/locale/translations.pro
index 615bd18..ada7a2f 100644 (file)
--- a/src/qt/locale/translations.pro
+++ b/src/qt/locale/translations.pro
@@ -2,7 +2,7 @@ CODECFORTR = UTF-8
 
 # for lrelease/lupdate
 # also add new translations to src/qt/bitcoin.qrc under translations/
-TRANSLATIONS = $$files(novacoin_*.ts)
+TRANSLATIONS = $$files(bitcoin_*.ts)
 
 isEmpty(QM_DIR):QM_DIR = $$PWD/src/qt/locale
 # automatically build translations, so they can be included in resource file