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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-02-25 21:27:31 +0000 (Mon, 25 Feb 2008)
New Revision: 1864

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/po/Makefile.in.in
Log:
Use --previous when merging PO files of the manpages.
(I need to find a way to do it for the PO files of the binaries)


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-02-25 21:17:18 UTC (rev 1863)
+++ upstream/trunk/ChangeLog	2008-02-25 21:27:31 UTC (rev 1864)
@@ -1,5 +1,10 @@
 2008-02-25  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* man/po/Makefile.in.in: Use --previous when merging PO files of
+	the manpages.
+
+2008-02-25  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/login.defs.d/SYS_UID_MAX.xml, man/login.defs.d/SYS_GID_MAX.xml:
 	Document new variables.
 	* man/newusers.8.xml, man/login.defs.5.xml,

Modified: upstream/trunk/man/po/Makefile.in.in
===================================================================
--- upstream/trunk/man/po/Makefile.in.in	2008-02-25 21:17:18 UTC (rev 1863)
+++ upstream/trunk/man/po/Makefile.in.in	2008-02-25 21:27:31 UTC (rev 1864)
@@ -30,7 +30,7 @@
 XGETTEXT_no = @XGETTEXT@
 XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
+MSGMERGE = msgmerge --previous
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
 MSGCONV = msgconv