emo
/
shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
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>
* libmisc/copydir.c (remove_tree): As we always use remove_tree

2
man/po/Makefile.in.in
View File

@ -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

4
po/Makevars
View File

@ -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