From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Mon, 25 Feb 2008 21:27:31 +0000 (+0000)
Subject: Use --previous when merging PO files of the manpages.
X-Git-Tag: 4.1.1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dead78e4d9680114a2b9fb65d7dd11bb66bad322;p=shadow

Use --previous when merging PO files of the manpages.
(I need to find a way to do it for the PO files of the binaries)
---

diff --git a/ChangeLog b/ChangeLog
index 2c0bb068..5143e91c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-25  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/po/Makefile.in.in: Use --previous when merging PO files of
+	the manpages.
+
 2008-02-25  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/login.defs.d/SYS_UID_MAX.xml, man/login.defs.d/SYS_GID_MAX.xml:
diff --git a/man/po/Makefile.in.in b/man/po/Makefile.in.in
index 087ce99e..49cbe183 100644
--- a/man/po/Makefile.in.in
+++ b/man/po/Makefile.in.in
@@ -30,7 +30,7 @@ XGETTEXT_ = @XGETTEXT@
 XGETTEXT_no = @XGETTEXT@
 XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
+MSGMERGE = msgmerge --previous
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
 MSGCONV = msgconv