Merge branch 'matthiaskrgr/nadecountdown_nopicmip' into 'master'

[xonotic/xonotic-data.pk3dir.git] / tx.sh

diff --git a/tx.sh b/tx.sh
index 19568c991e826c196db8714bcf25ed9b9bbcc358..c2e9f3a5f5d00a5e41bbccd9db190182f785d70f 100644 (file)
--- a/tx.sh
+++ b/tx.sh
@@ -54,12 +54,12 @@ if $sync_po; then
                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
@@ -71,12 +71,12 @@ if $sync_po; then
                                        done
                                        rm -f "$tcurfile.rej"
                                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