Add a batch mode for transifex sync (don't call out to vim but just ignore anything...

diff --git a/common.ast.po b/common.ast.po
index b7d36a76dda307da245017df709b176630f6aa0f..3ae974f4414c781a9a4e39a321a8c64a181ca3e5 100644 (file)
--- a/common.ast.po
+++ b/common.ast.po
@@ -2886,7 +2886,7 @@ msgstr "^BG%s%s^K1 comió'l cohete de ^BG%s^K1%s%s"
 
 #: qcsrc/common/notifications/all.inc:463
 #, c-format
-msgid "^BG%s%s^K1 got too close ^BG%s^K1's rocket%s%s"
+msgid "^BG%s%s^K1 got too close to ^BG%s^K1's rocket%s%s"
 msgstr ""
 
 #: qcsrc/common/notifications/all.inc:464

diff --git a/tx.sh b/tx.sh
index c2e9f3a5f5d00a5e41bbccd9db190182f785d70f..271f1cc75a82f1dbfbe48cbddd75a1c363fc8547 100644 (file)
--- a/tx.sh
+++ b/tx.sh
@@ -63,13 +63,15 @@ if $sync_po; then
                                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 -N -F -U "$tcurfile" common.pot
                                cp "$tcurfile" "$gnewfile"