gnewfile=common.$lang.po
if [ -f "$tcurfile" ]; then
git show "$mergebase":"$gnewfile" > "$goldfile"
- msgmerge -F -U "$tcurfile" common.pot
- msgmerge -F -U "$goldfile" common.pot
- msgmerge -F -U "$gnewfile" common.pot
+ msgmerge -N -F -U "$tcurfile" common.pot
+ msgmerge -N -F -U "$goldfile" common.pot
+ msgmerge -N -F -U "$gnewfile" common.pot
if diff -u "$goldfile" "$gnewfile" >/dev/null; then
# no change on git, changed on tx only
- msgmerge -F -U "$tcurfile" common.pot
+ msgmerge -N -F -U "$tcurfile" common.pot
cp "$tcurfile" "$gnewfile"
else
if ! diff -u "$goldfile" "$gnewfile" | patch "$tcurfile"; then
- while :; do
- vim -o "$tcurfile.rej" "$tcurfile"
- echo "OK?"
- read -r OK || exit 1
- [ x"$OK" != x"y" ] || break
- done
- rm -f "$tcurfile.rej"
+ if [ -z "$BATCH" ]; then
+ while :; do
+ vim -o "$tcurfile.rej" "$tcurfile"
+ echo "OK?"
+ read -r OK || exit 1
+ [ x"$OK" != x"y" ] || break
+ done
+ rm -f "$tcurfile.rej"
+ fi
fi
- msgmerge -F -U "$tcurfile" common.pot
+ msgmerge -N -F -U "$tcurfile" common.pot
cp "$tcurfile" "$gnewfile"
fi
rm "$goldfile"
else
- msgmerge -F -U "$gnewfile" common.pot
+ msgmerge -N -F -U "$gnewfile" common.pot
cp "$gnewfile" "$tcurfile"
fi
done