Run msgmerge with --previous. (This requires gettext >= 0.16)

This commit is contained in:
nekral-guest 2008-05-24 22:58:21 +00:00
parent 6124b59aff
commit a665e829ae
3 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2008-05-25 Nicolas François <nicolas.francois@centraliens.net>
* po/Makevars, man/po/Makefile.in.in: Run msgmerge with
--previous. (This requires gettext >= 0.16)
2008-05-24 Nicolas François <nicolas.francois@centraliens.net> 2008-05-24 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/copydir.c (remove_tree): As we always use remove_tree * libmisc/copydir.c (remove_tree): As we always use remove_tree

View File

@ -31,7 +31,7 @@ XGETTEXT_no = @XGETTEXT@
XGETTEXT_yes = @XGETTEXT_015@ XGETTEXT_yes = @XGETTEXT_015@
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
MSGMERGE = msgmerge --previous MSGMERGE = msgmerge --previous
MSGMERGE_UPDATE = @MSGMERGE@ --update MSGMERGE_UPDATE = @MSGMERGE@ --update --previous
MSGINIT = msginit MSGINIT = msginit
MSGCONV = msgconv MSGCONV = msgconv
MSGFILTER = msgfilter MSGFILTER = msgfilter

View File

@ -25,3 +25,7 @@ COPYRIGHT_HOLDER = Free Software Foundation, Inc.
EXTRA_LOCALE_CATEGORIES = EXTRA_LOCALE_CATEGORIES =
MSGID_BUGS_ADDRESS = pkg-shadow-devel@lists.alioth.debian.org MSGID_BUGS_ADDRESS = pkg-shadow-devel@lists.alioth.debian.org
MSGMERGE += --previous
MSGMERGE_UPDATE += --previous