From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 10 Oct 2014 14:17:20 +0000 (-0500)
Subject: Prep for next revision, fix for non-English locales.
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=virtualjaguar;a=commitdiff_plain;h=b0f761fa19300142af97a4bb9df44db74d168aeb

Prep for next revision, fix for non-English locales.
---

diff --git a/Makefile b/Makefile
index 1eb5e43..4fd8eae 100644
--- a/Makefile
+++ b/Makefile
@@ -53,11 +53,11 @@ obj:
 
 prepare: obj
 	@echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m"
-	@echo "#define VJ_RELEASE_VERSION \"v2.1.2\"" > src/version.h
-	@echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
-	@echo "#define VJ_REMOVE_DEV_CODE" >> src/version.h
-#	@echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h
-#	@echo "#define VJ_RELEASE_SUBVERSION \"2.1.2 Prerelease\"" >> src/version.h
+#	@echo "#define VJ_RELEASE_VERSION \"v2.1.3\"" > src/version.h
+#	@echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
+#	@echo "#define VJ_REMOVE_DEV_CODE" >> src/version.h
+	@echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h
+	@echo "#define VJ_RELEASE_SUBVERSION \"2.1.3 Prerelease\"" >> src/version.h
 
 virtualjaguar: sources libs makefile-qt
 	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"
diff --git a/docs/INSTALL b/docs/INSTALL
index a13992f..6c7c303 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -1,5 +1,5 @@
 ----------------------------------------
-Virtual Jaguar v2.1.2 Qt release INSTALL
+Virtual Jaguar v2.1.3 Qt release INSTALL
 ----------------------------------------
 
 
diff --git a/docs/README b/docs/README
index 9cee281..9b9d8e1 100644
--- a/docs/README
+++ b/docs/README
@@ -1,5 +1,5 @@
 -------------------------------------------
-Virtual Jaguar v2.1.2 GCC/Qt release README
+Virtual Jaguar v2.1.3 GCC/Qt release README
 -------------------------------------------
 
 --------------
diff --git a/docs/WHATSNEW b/docs/WHATSNEW
index cfbbafd..4751984 100644
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,8 +1,15 @@
+Virtual Jaguar v2.1.3 GCC/Qt
+----------------------------
+
+* Nothing yet. ;-) [Shamus]
+
+
 Virtual Jaguar v2.1.2 GCC/Qt
 ----------------------------
 
 * Bugfix for catastrophic failure in Controller config dialog. Thanks to ggn for
   reporting this! [Shamus]
+* Bugfix for non-English locales. Thanks to SCPCD for reporting! [Shamus]
 
 
 Virtual Jaguar v2.1.1 GCC/Qt
diff --git a/src/gui/virtualjaguar.qrc b/src/gui/virtualjaguar.qrc
index 5d43c4a..329450c 100644
--- a/src/gui/virtualjaguar.qrc
+++ b/src/gui/virtualjaguar.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource lang="en">
+<qresource>
 	<file>../../res/vj-icon.png</file>
 	<file>../../res/power-off.png</file>
 	<file>../../res/power-on-red.png</file>
@@ -38,10 +38,4 @@
 	<file>../../res/test-pattern-pal.jpg</file>
 	<file>../../res/help.html</file>
 </qresource>
-<qresource lang="fr">
-	<file alias="/res/help.html">../../res/help_fr.html</file>
-</qresource>
-<qresource lang="gr">
-	<file alias="/res/help.html">../../res/help_gr.html</file>
-</qresource>
 </RCC>
diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 5248692..f0399e5 100644
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -54,9 +54,11 @@ QMAKE_CXXFLAGS += `$(CROSS)sdl-config --cflags`
 
 # Translations. NB: Nobody has stepped up to do any :-P so these are dummy
 # translations
-TRANSLATIONS = \
-	virtualjaguar_fr.ts \
-	virtualjaguar_gr.ts
+# Removed for now, they interfere with proper running in non-English locales for
+# some reason. :-/
+#TRANSLATIONS = \
+#	virtualjaguar_fr.ts \
+#	virtualjaguar_gr.ts
 
 INCLUDEPATH += \
 	src \