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

diff --git a/Makefile b/Makefile
index 1eb5e431b2016b714adf0e9260f5cf5fa7f5d744..4fd8eaeaad15a26065f12ceecddb7717c4272779 100644 (file)
--- 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 a13992fb48fead105dc1e494e10cc7131d486d42..6c7c303488a2da18e753f4a834882822ce795326 100644 (file)
--- 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 9cee28102062b3c7c4aaa65f88b6b093e31a7eda..9b9d8e1aa55c88f1ded4bbcaeeeddfe74c170feb 100644 (file)
--- 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 cfbbafd5828a4e80368074eb3f62ca7835f94eaa..475198488a4237aa5067907de11754906b06cff8 100644 (file)
--- 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 5d43c4a9c21b266c8b40ed18181dac865f69c9f6..329450ccb346e609aa243cba432ca06966402e5d 100644 (file)
--- 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 5248692529f00ec2e7c256771b6830045d321088..f0399e5ca90ecf7b755ff3362616808c8d836074 100644 (file)
--- 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 \