Merge remote-tracking branch 'origin/mrbougo/killspree_bugfix'

[xonotic/xonotic-data.pk3dir.git] / check-translations.sh

diff --git a/check-translations.sh b/check-translations.sh
index 155029cbd4bbc573b0ba7133acfaff1286787687..94a94f8e787e9a7e58fb0e4ebd5a6c9ccb63e411 100755 (executable)
--- 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,16 +68,17 @@ for VM in menu csprogs; do
                        changed=false
                        for Y in ~/check-translations/"$X".*; do
                                [ -f "$Y" ] || continue
-                               if ! msgcat "$Y" >/dev/null; then
-                                       echo "File $Y has syntax errors. Skipped."
-                                       continue
-                               fi
+                               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
@@ -136,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.
 
@@ -180,6 +188,8 @@ EOF
                                                esac
                                        done
                                fi
+                       else
+                               echo "$X is complete!"
                        fi
                done