Merge branch 'master' into terencehill/better_dom_hud_stats

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

diff --git a/check-translations.sh b/check-translations.sh
index 297e16ef02e1672df8392a7a2c8d0931aeff99e1..fb1f68f32a64fecb6dd70b1334372defff54510c 100755 (executable)
--- a/check-translations.sh
+++ b/check-translations.sh
@@ -16,6 +16,11 @@ for VM in menu csprogs; do
        } | xgettext -LC -k_ -f- --from-code utf-8 -o "$VM".dat.pot >&2
        for X in "$VM".dat.*.po; do
                [ -f "$X" ] || continue
+               for Y in ~/check-translations/"$X".*; do
+                       [ -f "$Y" ] || continue
+                       msgcat -F --use-first "$Y" "$X" > "$X".new
+                       mv "$X".new "$X"
+               done
                msgmerge -F -U "$X" "$VM".dat.pot >&2
                msgattrib --untranslated "$X" | grep . > "$X".untranslated || rm -f "$X".untranslated
                msgattrib --fuzzy "$X"        | grep . > "$X".fuzzy        || rm -f "$X".fuzzy