diff --git a/utils/update-schema-translations.sh b/utils/update-schema-translations.sh
index 663f5a9a2..d76fb03a4 100755
--- a/utils/update-schema-translations.sh
+++ b/utils/update-schema-translations.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+LC_ALL=C
+LANG=C
+LANGUAGE=C
+
 BASENAME=`basename $0`
 TMPFILE="/tmp/$BASENAME-$$.tmp"
 OUTFILE="include/localized_schema.php"
diff --git a/utils/update-translations.sh b/utils/update-translations.sh
index 25e0e7568..087c3c228 100755
--- a/utils/update-translations.sh
+++ b/utils/update-translations.sh
@@ -3,18 +3,14 @@ TEMPLATE=messages.pot
 
 ./utils/update-schema-translations.sh
 
-xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php mobile/*.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
+xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
 
 xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
 
 update_lang() {
 	if [ -f $1.po ]; then
-		TMPFILE=/tmp/update-translations.$$
-	
-		msgmerge -o $TMPFILE $1.po $TEMPLATE
-		mv $TMPFILE $1.po
-		msgfmt --statistics $1.po
-		msgfmt -o $1.mo $1.po
+		msgmerge --no-wrap --width 1 -U $1.po $TEMPLATE
+		msgfmt --statistics $1.po -o $1.mo
 	else
 		echo "Usage: $0 [-p|<basename>]"
 	fi