From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 10 May 2019 16:38:08 +0000 (+0200)
Subject: Use msgmerge --previous when merging po files.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6837ae9b7a72e131a2cde00004f424d640439fda;p=pspp

Use msgmerge --previous when merging po files.
---

diff --git a/po/automake.mk b/po/automake.mk
index f980cfb1e2..53e01fd36a 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -61,7 +61,7 @@ $(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES) src/ui/gui/gen-dot-desktop.sh
 	$(AM_V_at)$(SED) -e '/^"POT-Creation-Date: .*/d' $@,tmp > $@
 
 $(LOCALPOFILED) $(POFILES): $(POTFILE)
-	$(AM_V_GEN)$(MSGMERGE) --quiet $(top_srcdir)/$@ $? -o $@,tmp
+	$(AM_V_GEN)$(MSGMERGE) --previous --quiet $(top_srcdir)/$@ $? -o $@,tmp
 	$(AM_V_at)if test -e $(top_srcdir)/$@,aux ; then \
 	         touch $@,tmp ; \
 		 msgcat --use-first $(top_srcdir)/$@,aux $@,tmp -o $@,tmp; \