diff --git a/ChangeLog b/ChangeLog index 2c0bb068..5143e91c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-25 Nicolas François + + * man/po/Makefile.in.in: Use --previous when merging PO files of + the manpages. + 2008-02-25 Nicolas François * 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