From 3d73fa7137b88f9fe03fb04a99ed953c89f26a4e Mon Sep 17 00:00:00 2001
From: Kostas <Kostas@noemail.net>
Date: Wed, 26 Aug 2015 19:45:48 +0000
Subject: [PATCH] Translation conversion is now automatically called from the
 project file Improved the translation converion script on Windows

FossilOrigin-Name: e574454625a7701da9d1959fa72e54036d5ab7c3
---
 fuel.pro         |  1 +
 intl/convert.bat | 21 +++++++++------------
 manifest         | 14 +++++++-------
 manifest.uuid    |  2 +-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/fuel.pro b/fuel.pro
index 3a95040..c370ac3 100644
--- a/fuel.pro
+++ b/fuel.pro
@@ -15,6 +15,7 @@ TEMPLATE = app
 win32 {
 	RC_FILE = rsrc/fuel.rc
 	LIBS += -luser32 -lshell32 -luuid
+	system(intl\convert.bat)
 }
 
 macx {
diff --git a/intl/convert.bat b/intl/convert.bat
index 79003d2..8b5860c 100755
--- a/intl/convert.bat
+++ b/intl/convert.bat
@@ -1,23 +1,20 @@
 @echo off
 setlocal EnableDelayedExpansion
-set SCRIPTDIR=%CD%
-set PRJDIR=%SCRIPTDIR%\..
-set QTPATH=C:\Qt\5.4\mingw491_32
+set SCRIPTDIR=%~dp0%
+set PRJDIR=%SCRIPTDIR%..
+set QTPATH=C:\Qt\5.5\mingw492_32
 
+if NOT "%QTDIR%"=="" set QTPATH=%QTDIR%
+
+echo Using QT at %QTDIR%
 echo Converting localizations
 del /q %PRJDIR%\rsrc\intl\*
 if not exist %PRJDIR%\rsrc\intl\ mkdir %PRJDIR%\rsrc\intl\
 
 REM Convert all except the en_US which is the original text in the code
 
-%QTPATH%\bin\lrelease de_DE.ts -qm ..\rsrc\intl\de_DE.qm
-%QTPATH%\bin\lrelease el_GR.ts -qm ..\rsrc\intl\el_GR.qm
-%QTPATH%\bin\lrelease es_ES.ts -qm ..\rsrc\intl\es_ES.qm
-%QTPATH%\bin\lrelease fr_FR.ts -qm ..\rsrc\intl\fr_FR.qm
-%QTPATH%\bin\lrelease ru_RU.ts -qm ..\rsrc\intl\ru_RU.qm
-%QTPATH%\bin\lrelease pt_PT.ts -qm ..\rsrc\intl\pt_PT.qm
-%QTPATH%\bin\lrelease it_IT.ts -qm ..\rsrc\intl\it_IT.qm
-%QTPATH%\bin\lrelease nl_NL.ts -qm ..\rsrc\intl\nl_NL.qm
-%QTPATH%\bin\lrelease ko_KR.ts -qm ..\rsrc\intl\ko_KR.qm
+for %%i in (de_DE el_GR es_ES fr_FR ru_RU pt_PT it_IT nl_NL ko_KR) do (
+	%QTPATH%\bin\lrelease %PRJDIR%\intl\%%i.ts -qm %PRJDIR%\rsrc\intl\%%i.qm
+)
 
 endlocal
diff --git a/manifest b/manifest
index c473562..2f5aba3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\sbuild\srevision\sinformation\sand\sclickable\slinks\sto\sabout\sbox
-D 2015-08-26T09:58:28.636
+C Translation\sconversion\sis\snow\sautomatically\scalled\sfrom\sthe\sproject\sfile\nImproved\sthe\stranslation\sconverion\sscript\son\sWindows\n
+D 2015-08-26T19:45:48.220
 F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
@@ -38,8 +38,8 @@ F ext/qtkeychain/qkeychain_export.h d756528188ef9bf3c4461ecc80048f06c362b54b
 F ext/qtkeychain/testclient.cpp cb1290a9584b627306a7bfdf1c02a8bbae503f5f
 F ext/qtkeychain/translations/qtkeychain_de.ts 0a70c8205c066c30ed8172f0670942de1fc5eede
 F ext/qtkeychain/translations/qtkeychain_ro.ts f16939382fd1a047b0692426bc82847347f14b32
-F fuel.pro 2de14a4a6bd3e5af9d9e7c78f870453fedb38577
-F intl/convert.bat 357d461ee8c6a7be6d2f60ac77c3232678ffb513 x
+F fuel.pro e753acacfb6a7e2b7ff33586e872269e6febda90
+F intl/convert.bat ce14bb3b45b162186a73d1cfa6f2a8e832cdeddc x
 F intl/convert.sh ac6edc8d99b575601cf9c6b85b18c9e25875b6e0 x
 F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
 F intl/el_GR.ts 1b805ee57309d02059d9e3e4cb49d945f9d9ac82
@@ -261,7 +261,7 @@ F ui/MainWindow.ui e2a18caa7482b3ee0dff477592cdc9574b35fe4f
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
-P 3490f7140197453a7a45fea01b93281cf0c8ca3d
-R 8a6e79d50e33c1e363a9a88f9991f593
+P 6c585dffad9f240a390a241dd71f5f2f95f46d49
+R 74bc60d098b0e582b722a041e2be3ea0
 U Kostas
-Z c023957da1ec26362f32c34c0fd943d2
+Z 9d833293ef52078267928ccc7382a4eb
diff --git a/manifest.uuid b/manifest.uuid
index d5f22c9..b73cbaf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c585dffad9f240a390a241dd71f5f2f95f46d49
\ No newline at end of file
+e574454625a7701da9d1959fa72e54036d5ab7c3
\ No newline at end of file