* merged from Christians branch

diff --git a/debian/changelog b/debian/changelog
index 11524fb52832e055958c5fd96a114b299c6b61de..7ce8e78313a9ae5272da01361f1a736e980ac6f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ apt (0.6.46.2) unstable; urgency=low
     - es.po: Updated to 514t. Closes: #391661
     - da.po: Updated to 514t. Closes: #391424
     - cs.po: Updated. Closes: #391064
-
+    - es.po: Updated to 514t. Closes: #391661
+    - da.po: Updated to 514t. Closes: #391424
  --
 
 apt (0.6.46.1) unstable; urgency=low

diff --git a/doc/fr/makefile b/doc/fr/makefile
index 596de7b096bd700b25ff90e4e7333fa94294e302..c650dc03ab28cd8bf03c8156be69c4298d96030d 100644 (file)
--- a/doc/fr/makefile
+++ b/doc/fr/makefile
@@ -7,7 +7,7 @@ include ../../buildlib/defaults.mak
 
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 XSLTPROC=/usr/bin/xsltproc
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
+STYLESHEET=./style.fr.xsl
 
 
 # Man pages

diff --git a/doc/fr/style.fr.xsl b/doc/fr/style.fr.xsl
new file mode 100644 (file)
index 0000000..11593bb
--- /dev/null
+++ b/doc/fr/style.fr.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
+
+<xsl:param name="man.output.encoding" select="'ISO-8859-15'" />
+
+</xsl:stylesheet>

diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl
index 4af2d74cfbfc4a2c6c6f2898e87ecf4fc14d573b..c102f13668be5514f86206ac16cc89a602260d43 100644 (file)
--- a/doc/ja/style.ja.xsl
+++ b/doc/ja/style.ja.xsl
@@ -4,6 +4,6 @@
 
 <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
 
-<xsl:param name="chunker.output.encoding" select="'EUC-JP'" />
+<xsl:param name="man.output.encoding" select="'EUC-JP'" />
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>