From e71c3750cbd5277bae6ded299c0bcc482b030eec Mon Sep 17 00:00:00 2001
From: kostas <kostas@noemail.net>
Date: Fri, 29 May 2015 20:26:33 +0000
Subject: [PATCH] Fixed localization conversion script for environments without
 Bash. Thanks Russell

FossilOrigin-Name: 9a06e230f398a3c93247382ba8f37d29201268f8
---
 intl/convert.sh | 10 ++++++----
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/intl/convert.sh b/intl/convert.sh
index 1b2ff33..526dfc9 100755
--- a/intl/convert.sh
+++ b/intl/convert.sh
@@ -1,12 +1,14 @@
-#!/bin/bash
-SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+#!/bin/sh
+SCRIPTDIR="$( cd "$( dirname "$0" )" && pwd )"
 PRJDIR=$SCRIPTDIR/..
 INTLDIR=$SCRIPTDIR
 
 # Detect lrelease tool
-if hash lrelease-qt5 2>/dev/null; then
+if which lrelease-qt5 2>/dev/null; then
 	LRELEASE="lrelease-qt5"
-elif hash lrelease 2>/dev/null; then
+elif which lrelease4 2>/dev/null; then
+	LRELEASE="lrelease4"
+elif which lrelease 2>/dev/null; then
 	LRELEASE="lrelease"
 else
 	echo "lrelease not found"
diff --git a/manifest b/manifest
index 3e784ec..ec53f56 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ported\snew\sfeatures\sto\sQT4\n
-D 2015-05-29T20:23:48.938
+C Fixed\slocalization\sconversion\sscript\sfor\senvironments\swithout\sBash.\sThanks\sRussell\n
+D 2015-05-29T20:26:33.541
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -39,7 +39,7 @@ F ext/qtkeychain/translations/qtkeychain_de.ts 0a70c8205c066c30ed8172f0670942de1
 F ext/qtkeychain/translations/qtkeychain_ro.ts f16939382fd1a047b0692426bc82847347f14b32
 F fuel.pro d67b78b5257d5d39bf4d0c2a4b9fbba1dbdd7005
 F intl/convert.bat 4222ae403418381452b843929d15259ea9850ab1 x
-F intl/convert.sh 2ca2179ff53e727f241925b75e19182607883c45 x
+F intl/convert.sh ac6edc8d99b575601cf9c6b85b18c9e25875b6e0 x
 F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
 F intl/el_GR.ts 1b805ee57309d02059d9e3e4cb49d945f9d9ac82
 F intl/en_US.ts 7917816efedf35d5f4f798d18896d7aa0cb3c71b
@@ -252,7 +252,7 @@ F ui/MainWindow.ui 5857b45ed96fb027b6159e44742e9afaa3e89cfb
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 4c480cd595a32664d01c85bf74845c4282fc0068
-P 4c246e5290d2cb3b1a90127fe953bffbbf77ea53
-R 52684848c41da7b7626f93250ca32a33
+P 28087b899e38a3881855cf1e7272da3fb13b3462
+R 71dc66119bd6197ccc43c2f63bcb6903
 U kostas
-Z a1601d791125dc1b8e40de27ecbad01e
+Z a0035a9ebb38ddec4dd5c9d8986c6e6d
diff --git a/manifest.uuid b/manifest.uuid
index fa72a38..0e6d3fc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-28087b899e38a3881855cf1e7272da3fb13b3462
\ No newline at end of file
+9a06e230f398a3c93247382ba8f37d29201268f8
\ No newline at end of file