[yelp/41-settings-revamp: 6/6] Merge remote-tracking branch 'origin/master' into 41-settings-revamp

[Shaun McCance <shaunm src gnome org>]

commit cb6ccd49470f74b3dcdf6abaedc0c7eff900bb92
Merge: 24835985 b061af69
Author: Shaun McCance <shaunm gnome org>
Date:   Sat Jul 24 11:10:25 2021 -0400

    Merge remote-tracking branch 'origin/master' into 41-settings-revamp

 README                     |   5 +-
 configure.ac               |   6 +-
 libyelp/yelp-uri-builder.c |  64 +++---
 libyelp/yelp-uri-builder.h |   3 +-
 libyelp/yelp-uri.h         |   1 +
 libyelp/yelp-view.c        |  28 ++-
 po/oc.po                   | 490 ++++++++++++++++++++++-----------------------
 7 files changed, 308 insertions(+), 289 deletions(-)
---
diff --cc configure.ac
index d9b3211b,f6d5a402..037fdaa2
--- a/configure.ac
+++ b/configure.ac
@@@ -34,8 -34,8 +34,8 @@@ PKG_CHECK_MODULES(YELP
        libxslt >= 1.1.4
        libexslt >= 0.8.1
        sqlite3
-       webkit2gtk-4.0 >= 2.19.2
+       webkit2gtk-4.1
 -      yelp-xsl >= 3.27.1
 +      yelp-xsl >= 40.0
  ])
  AC_SUBST([YELP_CFLAGS])
  AC_SUBST([YELP_LIBS])