X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=rosetta-merge;h=2e8c1dab1e8f1ec88bb7c6e5b9de0fb60fb982d9;hp=58bb1fab38fe2d90b810d0fafb148e12904ed563;hb=cdb79bca0737bc6c9e39cad2076d392387bc0ff0;hpb=1ddf5a972595fcf9b788bb5ef479b36554958ee3

diff --git a/rosetta-merge b/rosetta-merge
index 58bb1fa..2e8c1da 100755
--- a/rosetta-merge
+++ b/rosetta-merge
@@ -16,4 +16,14 @@ case $2 in
 esac
 
 [ -e $1/$ROSETTA_LANG.po ] || exit
-msgmerge -q -N <(msgconv -t UTF-8 $1/$ROSETTA_LANG.po | msgattrib --no-obsolete -) *.pot | msgattrib --no-obsolete $MSGATTRIB_OPTS - | msgmerge -q -N - <(msgconv -t UTF-8 $2.po | msgattrib --no-obsolete -) | msgattrib --no-obsolete - | if $APPLY; then sponge $2.po; else diff -u --label $2.po <(msgconv -t UTF-8 $2.po) -; fi
+msgmerge -q -N <(msgconv -t UTF-8 $1/$ROSETTA_LANG.po | msgattrib --no-obsolete -) *.pot | msgattrib --no-obsolete $MSGATTRIB_OPTS - | \
+	if [ -e $2.po ]; then
+		msgmerge -q -N - <(msgconv -t UTF-8 $2.po | msgattrib --no-obsolete -) | msgattrib --no-obsolete -
+	else
+		cat
+	fi | \
+	if $APPLY; then
+		sponge $2.po
+	else
+		diff -u --label $2.po <(msgconv -t UTF-8 $2.po) -
+	fi