[Pkg-shadow-commits] r2009 - in upstream/trunk: . man/po po

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-05-24 22:58:21 +0000 (Sat, 24 May 2008)
New Revision: 2009

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/po/Makefile.in.in
   upstream/trunk/po/Makevars
Log:
Run msgmerge with --previous. (This requires gettext >= 0.16)


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-05-24 19:20:33 UTC (rev 2008)
+++ upstream/trunk/ChangeLog	2008-05-24 22:58:21 UTC (rev 2009)
@@ -1,3 +1,8 @@
+2008-05-25  Nicolas François  <nicolas.francois at 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 at centraliens.net>
 
 	* libmisc/copydir.c (remove_tree): As we always use remove_tree

Modified: upstream/trunk/man/po/Makefile.in.in
===================================================================
--- upstream/trunk/man/po/Makefile.in.in	2008-05-24 19:20:33 UTC (rev 2008)
+++ upstream/trunk/man/po/Makefile.in.in	2008-05-24 22:58:21 UTC (rev 2009)
@@ -31,7 +31,7 @@
 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

Modified: upstream/trunk/po/Makevars
===================================================================
--- upstream/trunk/po/Makevars	2008-05-24 19:20:33 UTC (rev 2008)
+++ upstream/trunk/po/Makevars	2008-05-24 22:58:21 UTC (rev 2009)
@@ -25,3 +25,7 @@
 EXTRA_LOCALE_CATEGORIES =
 
 MSGID_BUGS_ADDRESS = pkg-shadow-devel at lists.alioth.debian.org
+
+MSGMERGE += --previous
+MSGMERGE_UPDATE += --previous
+