Bug #1330 & many other small fixes

1 files changed, 3 insertions, 3 deletions

diff --git a/language/update.sh b/language/update.sh
index 28aa39f7d..73de65c01 100755
--- a/language/update.sh
+++ b/language/update.sh
@@ -1,20 +1,20 @@
 #!/bin/bash
 
-rm anope.pot
+rm -f anope.pot
 touch anope.pot
 
 cd ..
 FILES=`find ./ -name *.cpp -o -name *.h | grep -v /modules/third/`
 for f in $FILES
 do
-	xgettext -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword --keyword=_ $f
+	xgettext -E -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword --keyword=_ $f
 done
 
 cd -
 
 for f in *.po
 do
-	msgmerge -v -s -U $f `echo $f | cut -d'.' -f1`.pot
+	msgmerge -E -v -s -U $f `echo $f | cut -d'.' -f1`.pot
 done
 
 rm -f *~