Use msgmerge --previous when merging po files.
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 10 May 2019 16:38:08 +0000 (18:38 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 22 May 2019 10:37:31 +0000 (12:37 +0200)
po/automake.mk

index f980cfb1e2488eff04e169cebcc5b076970fb34f..53e01fd36adfdcfc813023802be34669764c6fad 100644 (file)
@@ -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; \