Merge lp:~jbicha/ubuntu/oneiric/yelp-xsl/fix-772176 into lp:ubuntu/oneiric/yelp-xsl

[Jeremy Bícha]

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-05 10:41:37 +0000
+++ debian/changelog	2011-05-04 14:05:58 +0000
@@ -1,3 +1,9 @@
+yelp-xsl (3.0.0-0ubuntu2) oneiric; urgency=low
+
+  * Make next and previous navigation buttons translatable, (LP: #772176)
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 04 May 2011 10:00:08 -0400
+
 yelp-xsl (3.0.0-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== added directory 'debian/patches'
=== added file 'debian/patches/01_translatable_navigation_links.patch'
--- debian/patches/01_translatable_navigation_links.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_translatable_navigation_links.patch	2011-05-04 14:05:58 +0000
@@ -0,0 +1,38 @@
+Description: Make next and previous navigations links translatable
+LP: #772176, Can be dropped with yelp-xsl 3.0.2
+http://git.gnome.org/browse/yelp-xsl/commit/?id=935d31f14c66247304796582c9c8ad217063e152
+
+Index: yelp-xsl/xslt/mallard/html/mal2html-page.xsl
+===================================================================
+--- yelp-xsl.orig/xslt/mallard/html/mal2html-page.xsl	2011-05-04 09:49:51.557451474 -0400
++++ yelp-xsl/xslt/mallard/html/mal2html-page.xsl	2011-05-04 09:54:26.774469894 -0400
+@@ -295,9 +295,11 @@
+                 <xsl:with-param name="xref" select="$prev/../../@id"/>
+               </xsl:call-template>
+             </xsl:attribute>
+-            <xsl:call-template name="l10n.gettext">
+-              <xsl:with-param name="msgid" select="'Previous'"/>
+-            </xsl:call-template>
++            <xsl:for-each select="$node">
++              <xsl:call-template name="l10n.gettext">
++                <xsl:with-param name="msgid" select="'Previous'"/>
++              </xsl:call-template>
++            </xsl:for-each>
+           </a>
+         </xsl:if>
+         <xsl:if test="$prev and $next">
+@@ -317,9 +319,11 @@
+                 <xsl:with-param name="xref" select="$next/@xref"/>
+               </xsl:call-template>
+             </xsl:attribute>
+-            <xsl:call-template name="l10n.gettext">
+-              <xsl:with-param name="msgid" select="'Next'"/>
+-            </xsl:call-template>
++            <xsl:for-each select="$node">
++              <xsl:call-template name="l10n.gettext">
++                <xsl:with-param name="msgid" select="'Next'"/>
++              </xsl:call-template>
++            </xsl:for-each>
+           </a>
+         </xsl:if>
+       </div>

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-05-04 14:05:58 +0000
@@ -0,0 +1,1 @@
+01_translatable_navigation_links.patch