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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-26 22:13:16 +0000 (Mon, 26 Nov 2007)
New Revision: 1470

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/generate_translations.mak
   upstream/trunk/man/po/Makefile.in.in
Log:
Add --expand-all-entities to the call to xml2po to avoid translating the
external entities separately.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-26 22:11:23 UTC (rev 1469)
+++ upstream/trunk/ChangeLog	2007-11-26 22:13:16 UTC (rev 1470)
@@ -1,5 +1,11 @@
 2007-11-26  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* man/generate_translations.mak, man/po/Makefile.in.in: Add
+	--expand-all-entities to the call to xml2po to avoid translating
+	the external entities separately.
+
+2007-11-26  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/login.defs.d/, man/login.defs.d/CHFN_RESTRICT.xml,
 	man/login.defs.d/MAIL_DIR.xml, man/login.defs.d/PASS_MAX_DAYS.xml,
 	man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml,

Modified: upstream/trunk/man/generate_translations.mak
===================================================================
--- upstream/trunk/man/generate_translations.mak	2007-11-26 22:11:23 UTC (rev 1469)
+++ upstream/trunk/man/generate_translations.mak	2007-11-26 22:13:16 UTC (rev 1470)
@@ -3,7 +3,7 @@
 LANG=$(notdir $(CURDIR))
 
 %.xml: ../%.xml ../po/$(LANG).po
-	xml2po -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
+	xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
 	sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@
 
 include ../generate_mans.mak

Modified: upstream/trunk/man/po/Makefile.in.in
===================================================================
--- upstream/trunk/man/po/Makefile.in.in	2007-11-26 22:11:23 UTC (rev 1469)
+++ upstream/trunk/man/po/Makefile.in.in	2007-11-26 22:13:16 UTC (rev 1470)
@@ -90,9 +90,9 @@
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	@tmpdir=`pwd`; \
 	echo -n "cd $(top_srcdir)/man && "; \
-	echo "xml2po -o $(tmpdir)/$(DOMAIN).po $(notdir $(POTFILES))"; \
+	echo "xml2po --expand-all-entities -o $(tmpdir)/$(DOMAIN).po $(notdir $(POTFILES))"; \
 	cd $(top_srcdir)/man; \
-	xml2po -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
+	xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
 	cd $$tmpdir
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \