From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Apr 2021 08:23:26 +0000 (+0200)
Subject: po: use msgmerge --previous
X-Git-Tag: v2.37-rc2~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=724d844c126c0a9a0bf543d0d348df226da1bd70;p=thirdparty%2Futil-linux.git

po: use msgmerge --previous

Reported-by: Mario Blättermann <mario.blaettermann@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/po/Makevars b/po/Makevars
index 4d5629cba2..6ac83812c3 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -11,7 +11,7 @@ top_builddir = ..
 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2
 
 # This option gets passed to msgmerge.
-MSGMERGE_OPTIONS = --no-wrap
+MSGMERGE_OPTIONS = --no-wrap --previous
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding