From: nekral-guest Date: Sat, 24 May 2008 22:58:21 +0000 (+0000) Subject: Run msgmerge with --previous. (This requires gettext >= 0.16) X-Git-Tag: 4.1.2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a665e829ae1d500b7430d1e8a8028b094513763f;p=shadow Run msgmerge with --previous. (This requires gettext >= 0.16) --- diff --git a/ChangeLog b/ChangeLog index 4773f9a1..2304b790 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-25 Nicolas François + + * po/Makevars, man/po/Makefile.in.in: Run msgmerge with + --previous. (This requires gettext >= 0.16) + 2008-05-24 Nicolas François * libmisc/copydir.c (remove_tree): As we always use remove_tree diff --git a/man/po/Makefile.in.in b/man/po/Makefile.in.in index 49cbe183..9de17f05 100644 --- a/man/po/Makefile.in.in +++ b/man/po/Makefile.in.in @@ -31,7 +31,7 @@ XGETTEXT_no = @XGETTEXT@ XGETTEXT_yes = @XGETTEXT_015@ XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) MSGMERGE = msgmerge --previous -MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGMERGE_UPDATE = @MSGMERGE@ --update --previous MSGINIT = msginit MSGCONV = msgconv MSGFILTER = msgfilter diff --git a/po/Makevars b/po/Makevars index 0cc56075..c2b35f88 100644 --- a/po/Makevars +++ b/po/Makevars @@ -25,3 +25,7 @@ COPYRIGHT_HOLDER = Free Software Foundation, Inc. EXTRA_LOCALE_CATEGORIES = MSGID_BUGS_ADDRESS = pkg-shadow-devel@lists.alioth.debian.org + +MSGMERGE += --previous +MSGMERGE_UPDATE += --previous +