taler-www

commit 59515c58e0e0a82acc3c6be456261378d13cfd59
parent 15462750bc72a5a56abda55894b635d89c35cdaa
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 25 May 2025 14:34:53 +0200

Merge branch 'master' into stable

Diffstat:
M
template/features.html.j2
 | 
8
++++----
M
template/news/2025-01.html.j2
 | 
4
++--
M
template/press.html.j2
 | 
4
++++

3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/template/features.html.j2 b/template/features.html.j2
@@ -108,7 +108,7 @@
           {% endtrans %}
         </p>
         <p>
-          <a href="https://docs.taler.net/taler-merchant-api-tutorial.html" target="_blank" rel="noopener noreferrer">
+          <a href="https://tutorials.taler.net/dev/guide" target="_blank" rel="noopener noreferrer">
             {% trans %}
               See how merchant integration works in our developer documentation!
             {% endtrans %}
@@ -196,9 +196,9 @@
 
       <p>
         {% trans %}
-          Taler provides protocols and reference implementations that, 
-          in principle, enable anyone to run their own payment infrastructure, 
-          whether they are individuals, organizations, or entire countries. 
+          Taler provides protocols and reference implementations that,
+          in principle, enable anyone to run their own payment infrastructure,
+          whether they are individuals, organizations, or entire countries.
           Since the reference implementation is a
         {% endtrans %}
         <a href="https://www.gnu.org/" target="_blank" rel="noopener noreferrer">GNU</a>
diff --git a/template/news/2025-01.html.j2 b/template/news/2025-01.html.j2
@@ -80,8 +80,8 @@ sync and bank components are distributed via the GNU FTP mirrors.
 <li><a href="http://ftpmirror.gnu.org/taler/taler-merchant-1.0.0.tar.gz.sig">http://ftpmirror.gnu.org/taler/taler-merchant-1.0.0.tar.gz.sig</a></li>
 <li><a href="http://ftpmirror.gnu.org/taler/taler-wallet-v1.0.0.tar.gz">http://ftpmirror.gnu.org/taler/taler-wallet-1.0.0.tar.gz</a></li>
 <li><a href="http://ftpmirror.gnu.org/taler/taler-wallet-v1.0.0.tar.gz.sig">http://ftpmirror.gnu.org/taler/taler-wallet-1.0.0.tar.gz.sig</a></li>
-<li><a href="http://ftpmirror.gnu.org/taler/libeufin-1.0.0-sources.tar.gz">http://ftpmirror.gnu.org/taler/libeufin-1.0.0-sources.tar.gz</a></li>
-<li><a href="http://ftpmirror.gnu.org/taler/libeufin-1.0.0-sources.tar.gz.sig">http://ftpmirror.gnu.org/taler/libeufin-1.0.0-sources.tar.gz.sig</a></li>
+<li><a href="http://ftpmirror.gnu.org/taler/libeufin-1.0.0.tar.gz">http://ftpmirror.gnu.org/taler/libeufin-1.0.0.tar.gz</a></li>
+<li><a href="http://ftpmirror.gnu.org/taler/libeufin-1.0.0.tar.gz.sig">http://ftpmirror.gnu.org/taler/libeufin-1.0.0.tar.gz.sig</a></li>
 <li><a href="http://ftpmirror.gnu.org/taler/sync-1.0.0.tar.gz">http://ftpmirror.gnu.org/taler/sync-1.0.0.tar.gz</a></li>
 <li><a href="http://ftpmirror.gnu.org/taler/sync-1.0.0.tar.gz.sig">http://ftpmirror.gnu.org/taler/sync-1.0.0.tar.gz.sig</a></li>
 <li><a href="http://ftpmirror.gnu.org/taler/taler-mdb-1.0.0.tar.gz">http://ftpmirror.gnu.org/taler/taler-mdb-1.0.0.tar.gz</a></li>
diff --git a/template/press.html.j2 b/template/press.html.j2
@@ -5,6 +5,10 @@
     <h1>{{ _("GNU Taler in the Press")}}</h1>
     <h2>{{ _("2025")}}</h2>
     <ul>
+    <li><a href="https://www.golem.de/news/gnu-taler-halbanonymes-bezahlsystem-startet-betrieb-in-der-schweiz-2505-196369.html">Halbanonymes Bezahlsystem startet Betrieb in der Schweiz</a></li>
+    <li><a href="https://prohoster.info/en/blog/novosti-interneta/vypusk-svobodnoj-platyozhnoj-sistemy-gnu-taler-1-0-gotovoj-dlya-primeneniya-v-shvejczarii">
+Release of the free payment system GNU Taler 1.0, ready for use in Switzerland</a></li>
+    <li><a href="https://www.opennet.ru/opennews/art.shtml?num=63253">Выпуск свободной платёжной системы GNU Taler 1.0, готовой для применения в Швейцарии</a></li>
     <li><a href="https://magazin.comdirect.de/finanzwissen/konto-und-karten/was-ist-gnu-taler">Was ist GNU Taler?</a></li>
     <li><a href="https://bankstil.de/ngi-taler-projekt-der-gls-bank-anonym-und-sicher-bezahlen/">NGI Taler-Projekt der GLS Bank – anonym und sicher bezahlen</a></li>
     <li><a href="https://identity-economy.de/ngi-taler-projekt-der-gls-bank-anonym-und-sicher-bezahlen">NGI Taler-Projekt der GLS Bank – anonym und sicher bezahlen</a></li>