taler-www

commit 0e8b1e4b98684826d1352d38fb0722ace491d5fe
parent f46f08467fccac6a9936e70fd1856ce5b6baa729
Author: Stefan Kügel <skuegel@web.de>
Date:   Fri, 13 Jan 2023 22:51:14 +0100

Merge branch 'master' into stable

Diffstat:
M
common/footer.j2.inc
 | 
2
+-
M
locale/messages.pot
 | 
6
+++---
M
static/taler-systems.gpg.key
 | 
22
+++++++++++-----------

3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
@@ -34,7 +34,7 @@
       <div class="col-md-4 col-sm-20">
       <h4>{% trans %}Legal Information{% endtrans %}</h4>
         <ul class="footer-list">
-          <li>&copy; 2015-2022 <a href="https://gnunet.org/en/ev.html" target="_blank" rel="noopener noreferrer">GNUnet e.V.</a> &amp; 
+          <li>&copy; 2015-2023 <a href="https://gnunet.org/en/ev.html" target="_blank" rel="noopener noreferrer">GNUnet e.V.</a> &amp; 
           <a href="https://www.taler-systems.com/" target="_blank" rel="noopener noreferrer">Taler Systems SA</a>.</li>
           <li>{% trans %}GNU Taler is developed as part of the 
           <a href="https://www.gnu.org/" target="_blank" rel="noopener noreferrer">GNU project</a> 
diff --git a/locale/messages.pot b/locale/messages.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
+# Copyright (C) 2023 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-12-26 23:57+0100\n"
+"POT-Creation-Date: 2023-01-04 19:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/static/taler-systems.gpg.key b/static/taler-systems.gpg.key
@@ -9,16 +9,16 @@ G8XciXFoiNBexwTL9ve+8e9omsQ6MnHOEw/d4jlOLp7gMDTIq54/OvrQQmFcagb7
 R4WiC8C78EXEwRxq7f3Jb3pNs1atWurJa7YXkqdJNgcGM6d/Do90RIDPFxVkwokV
 0glnNPmeX2v5Xt77as35tpvE7WiItKDMiOrZ4epwhjrxhJPBYYs9ruTQxmancTSA
 YHHLOckuj/jDY+8AEQEAAbQkVGFsZXIgU3lzdGVtcyBTQSA8Y29udGFjdEB0YWxl
-ci5uZXQ+iQHUBBMBCgA+FiEEAISZPCxs30cafX79JuVGpf5+AmYFAl/uHpACGwMF
-CQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQJuVGpf5+AmYYgQwAngdY
-msJf8NlKqM2uYh1woi7T3BCfHbdehhhLQHNIuZtLt41ZugPYZNYzQNkaxIiGHAUr
-TPvWTiGOHDH5i4ra5gIuuCqv7Cu9zTbcFvgcp6TKcN4M/eAWtbQ/CKUjbKnYOSf4
-h0M4w78v1nX0SzhwyF/3t+MwEUhmc6ERbtboVl4UskVPfrbUaYvez/W11kmd3ViU
-LqKLuhat3KsjCkX2GbOAGS/rYvkrjUopu5Isoeq+dWgy8Pf4i0Y9VmDUyq7fJYZI
-+dSVzxFsnX8h7V404wZcsNm4TBgJLm5umzYjDYJRSvgkBiPdsF5W6piAgvXHKt93
-cmVkOXhaGNFX7Vjp2/CYlW+CweWV3bgpeCeP+ikoqQf8BMTE+KdgY69yVRfJZAf2
-3K712TvnOW0XOSpcU4Zds+4B9kOkYtsGs1NYd5EyhyL7xin+Xh4u751mRdtEOavE
-6gBcie/PBnqyy2CC1Cz67fIcXfNcsIMy31A65Lfbc2zuWEavEU1yU9WtnNjluQGN
+ci5uZXQ+iQHUBBMBCgA+AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEAISZ
+PCxs30cafX79JuVGpf5+AmYFAmO+xYQFCQeTDfQACgkQJuVGpf5+AmYRkwv9EqoJ
+seVYM5D6yg9Ffv+n6Ql7dJsjgMJWPixc8OiT5HbyE6HiTsDdVLxlAZz8MoRN6r8v
+XpTkKS7UhDhl6nzsq4sy+MjvKJVMznCfxqo0NbyCAzoCUqzWv6enqfr9JisGVSlC
+xH1C1dD6HjkIVzPtWL/+MUcUvICP6wSdTjrchIOuICrLHjKvgKQatGU+r5IvPo7W
+u9JoaK4im+jn7JlVj9zt5egfx2VQzsQIxYJS0EvDPMe56kR8gALvw719Ef4w+2do
+XF2rL8KxlvtksK5rrnkrURFGVyIPos0yMg9MWlDPTd76FyLz1ngXJEUyZjtNkk4O
+vtPBI0J+44RTjlI3Pu7EMemBvwtmwb60uWxKHRXYujEdCVZ7pwX4sgxS3CRIK3Ej
+nGYFEmQ9wVORJSRHxSr7a50eBGAq/OByDAogzeRxVdAEd6j9TiWHPx9rbpUthZuD
+dBlIxsv5U8xkm5fOaOzCQAL7464UzxMN2wK//trPsH73q1SWBycXWAGk58/PuQGN
 BF/uHpABDAC04B19Mlu7CKn1Xd2j9UGJdcTsE4Dl3dIw4wWwGx9RNau7uG2ov2Mr
 gvglW9EfJnCqD6QaDjqzi0bKqN1o1e8rEP67T4Zc/EyXIYWaSfeB2Okfry06BJV+
 lf5wc4BnQTAKIkE+zrD+4pKMfugotItCBxXSI5K7BBjTHFdtHTkM4ehJnWPu24Nc
@@ -37,5 +37,5 @@ SCbzvun4WkBHf1L6XnUf2de+0Om2FXx5HAbR4Gl87GOP/OggCErJXnstsHiifYe/
 CyQ0Gfn9xwzGblPChrjQCyu9cTZb71Lio3qZpc84xPK/xi6LtCJfQrWAVHaXH9XG
 Wxh819zslZ4SsVSHZSYgPlnwDQ9xdmjdxA+xlcFpuT7v8p49ZmrimOouAn0/12E1
 H4p6tTVrJ0X8GPAs9cgCzkFVp3ZUh1zoJl2Z3A==
-=uVVb
+=NcXU
 -----END PGP PUBLIC KEY BLOCK-----