X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=check-translations.sh;h=94a94f8e787e9a7e58fb0e4ebd5a6c9ccb63e411;hp=dccc1e8553845c67e4cd05b215e59ba6e4273db0;hb=cfaacd5aff51c88ae76519d019aa6427ba1c5bc0;hpb=6df8b35164ef0da9c08cbafdf019faa13ca32f82

diff --git a/check-translations.sh b/check-translations.sh
index dccc1e855..94a94f8e7 100755
--- a/check-translations.sh
+++ b/check-translations.sh
@@ -54,6 +54,10 @@ for VM in menu csprogs; do
 				if [ x"${X#*.dat.}" != x"$language.po" ]; then
 					continue
 				fi
+			else
+				if [ x"${X#*.dat.}" = x"en.po" ]; then
+					continue
+				fi
 			fi
 			msgmerge -F -U "$X" "$VM".dat.pot >&2
 			msgattrib --untranslated "$X" | grep . > "$X".untranslated || rm -f "$X".untranslated
@@ -64,12 +68,17 @@ for VM in menu csprogs; do
 			changed=false
 			for Y in ~/check-translations/"$X".*; do
 				[ -f "$Y" ] || continue
+				echo "Merging $Y..."
 				vim -E "$Y" <<EOF
 set fileencoding=utf-8
 set nobomb
 w
 q
 EOF
+				if ! msgcat "$Y" >/dev/null; then
+					echo "File $Y has syntax errors. Skipped."
+					continue
+				fi
 				msgcat -F --use-first "$Y" "$X" > "$X".new
 				mv "$X".new "$X"
 				changed=true
@@ -132,6 +141,9 @@ as you provided us with translations in the past, we kindly ask you
 to update the translation to match changes in the Xonotic source. Can
 you please work on them and provide updates to us?
 
+For reference, the current version of the translation file is at:
+http://git.xonotic.org/?p=xonotic/xonotic-data.pk3dir.git;a=blob;f=$X
+
 If you do not wish to be contacted for translation updates any more,
 please tell us in a reply to this message.
 
@@ -176,6 +188,8 @@ EOF
 						esac
 					done
 				fi
+			else
+				echo "$X is complete!"
 			fi
 		done