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 2c0bb0689f28797326fe97fa4671b3c03c645b8f..5143e91c2329ed99778e3c7978be86e1d1a8a164 100644 (file)
--- 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 087ce99efc1570f8d9098c7d9600481d41653624..49cbe183a3c92df0f5002bba97c0ec76e31084ee 100644 (file)
--- 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