[yelp-xsl: 4/4] Merge branch 'master' into jbicha/yelp-xsl-bye-intltool

[Shaun McCance <shaunm src gnome org>]

commit 4bf368da207fa1855ef08f99f0db036e71df5b09
Merge: 750548d7 0d744827
Author: Shaun McCance <shaunm redhat com>
Date:   Thu May 23 11:47:27 2019 -0400

    Merge branch 'master' into jbicha/yelp-xsl-bye-intltool

 NEWS                                               |  23 ++
 configure.ac                                       |   2 +-
 doc/yelp-xsl/C/color.blue.page                     |   2 +-
 doc/yelp-xsl/C/color.gray.page                     |   2 +-
 doc/yelp-xsl/C/color.green.page                    |   2 +-
 doc/yelp-xsl/C/color.orange.page                   |   2 +-
 doc/yelp-xsl/C/color.purple.page                   |   2 +-
 doc/yelp-xsl/C/color.red.page                      |   2 +-
 doc/yelp-xsl/C/color.yellow.page                   |   2 +-
 doc/yelp-xsl/C/mal-cache.page                      |   6 +
 doc/yelp-xsl/C/mal2html-inline.page                |  16 ++
 doc/yelp-xsl/C/mal2html-page.page                  |  18 ++
 doc/yelp-xsl/C/mal2html.editor.badge.page          |   9 +
 doc/yelp-xsl/C/mal2html.editor.banner.page         |   9 +
 doc/yelp-xsl/C/mal2html.links.prevnext.page        |   6 +-
 doc/yelp-xsl/C/mal2html.links.series.next.page     |   4 +-
 doc/yelp-xsl/C/mal2html.page.about.page            |   9 +
 doc/yelp-xsl/C/mal2html.page.linktrails.empty.page |   9 +
 doc/yelp-xsl/C/mal2html.page.linktrails.link.page  |   9 +
 doc/yelp-xsl/C/mal2html.page.linktrails.page       |   9 +
 doc/yelp-xsl/C/mal2html.page.linktrails.trail.page |   9 +
 .../C/mal2html.page.linktrails.trail.prefix.page   |   9 +
 doc/yelp-xsl/C/mal2html.section.page               |   9 +
 doc/yelp-xsl/Makefile.am                           |  12 +-
 po/is.po                                           | 166 ++++++------
 po/nl.po                                           | 295 +++++++++------------
 po/zh_CN.po                                        | 195 +++++++-------
 xslt/common/color.xsl                              |  14 +-
 xslt/mallard/html/mal2xhtml.xsl                    |   1 +
 29 files changed, 488 insertions(+), 365 deletions(-)
---
diff --cc configure.ac
index 2c7d5a81,90704034..2f13c496
--- a/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  # Do not split AC_INIT across multiple lines without making localbuild.sh smarter
- AC_INIT([yelp-xsl],[3.30.0],[https://gitlab.gnome.org/gnome/yelp-xsl/issues])
 -AC_INIT([yelp-xsl],[3.32.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp-xsl])
++AC_INIT([yelp-xsl],[3.32.1],[https://gitlab.gnome.org/gnome/yelp-xsl/issues])
  
  AC_CONFIG_MACRO_DIR([m4])