From 3a30f34f1adcd152fbc40e51c8e6ad0ff74a199f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 23 Oct 2011 11:20:39 +0200
Subject: [PATCH] Revert "translation fixes"

This reverts commit f86ecd4a062b7f6515208c217f6405e47fa742f5.
---
 bitcoin-qt.pro                                    | 6 ++++--
 src/qt/bitcoin.qrc                                | 9 +++------
 src/qt/locale/{bitcoin_de_DE.ts => bitcoin_de.ts} | 0
 src/qt/locale/{bitcoin_es_ES.ts => bitcoin_es.ts} | 0
 src/qt/locale/{bitcoin_nb_NO.ts => bitcoin_nb.ts} | 0
 src/qt/locale/{bitcoin_nl_NL.ts => bitcoin_nl.ts} | 0
 src/qt/locale/{bitcoin_ru_RU.ts => bitcoin_ru.ts} | 0
 7 files changed, 7 insertions(+), 8 deletions(-)
 rename src/qt/locale/{bitcoin_de_DE.ts => bitcoin_de.ts} (100%)
 rename src/qt/locale/{bitcoin_es_ES.ts => bitcoin_es.ts} (100%)
 rename src/qt/locale/{bitcoin_nb_NO.ts => bitcoin_nb.ts} (100%)
 rename src/qt/locale/{bitcoin_nl_NL.ts => bitcoin_nl.ts} (100%)
 rename src/qt/locale/{bitcoin_ru_RU.ts => bitcoin_ru.ts} (100%)

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index e9dc6f787..2e4000e52 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -175,8 +175,10 @@ FORMS += \
 CODECFORTR = UTF-8
 
 # for lrelease/lupdate
-# also add new translations to src/qt/bitcoin.qrc under translations/
-TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
+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
 
 isEmpty(QMAKE_LRELEASE) {
     win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 57addbdbe..2985bb60e 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -46,11 +46,8 @@
         <file alias="update_spinner">res/movies/update_spinner.mng</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="de_DE">locale/bitcoin_de_DE.qm</file>
-        <file alias="es_CL">locale/bitcoin_es_CL.qm</file>
-        <file alias="es_ES">locale/bitcoin_es_ES.qm</file>
-        <file alias="nb_NO">locale/bitcoin_nb_NO.qm</file>
-        <file alias="nl_NL">locale/bitcoin_nl_NL.qm</file>
-        <file alias="ru_RU">locale/bitcoin_ru_RU.qm</file>
+        <file alias="de_DE">locale/bitcoin_de.qm</file>
+        <file alias="nl_NL">locale/bitcoin_nl.qm</file>
+        <file alias="ru_RU">locale/bitcoin_ru.qm</file>
     </qresource>
 </RCC>
diff --git a/src/qt/locale/bitcoin_de_DE.ts b/src/qt/locale/bitcoin_de.ts
similarity index 100%
rename from src/qt/locale/bitcoin_de_DE.ts
rename to src/qt/locale/bitcoin_de.ts
diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es.ts
similarity index 100%
rename from src/qt/locale/bitcoin_es_ES.ts
rename to src/qt/locale/bitcoin_es.ts
diff --git a/src/qt/locale/bitcoin_nb_NO.ts b/src/qt/locale/bitcoin_nb.ts
similarity index 100%
rename from src/qt/locale/bitcoin_nb_NO.ts
rename to src/qt/locale/bitcoin_nb.ts
diff --git a/src/qt/locale/bitcoin_nl_NL.ts b/src/qt/locale/bitcoin_nl.ts
similarity index 100%
rename from src/qt/locale/bitcoin_nl_NL.ts
rename to src/qt/locale/bitcoin_nl.ts
diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru.ts
similarity index 100%
rename from src/qt/locale/bitcoin_ru_RU.ts
rename to src/qt/locale/bitcoin_ru.ts