[taler-www] branch master updated: Text updates: GNUnet-->GNU Taler on News page; enhanced answers on FAQ page for two questions

[gnunet]

This is an automated email from the git hooks/post-receive script.

skuegel pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new 59679c9  Text updates: GNUnet-->GNU Taler on News page; enhanced 
answers on FAQ page for two questions
59679c9 is described below

commit 59679c9b4e5941f3a86267bfc504204bc9b4995c
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Wed Apr 20 08:24:09 2022 +0200

    Text updates: GNUnet-->GNU Taler on News page; enhanced answers on FAQ page 
for two questions
    
    Signed-off-by: Stefan Kügel <skuegel@web.de>
---
 template/faq.html.j2        | 13 +++++--------
 template/news/index.html.j2 |  5 +----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/template/faq.html.j2 b/template/faq.html.j2
index 7a5245c..703ad12 100644
--- a/template/faq.html.j2
+++ b/template/faq.html.j2
@@ -52,9 +52,7 @@
     <h2>{{ _("What if my computer is hacked?") }}</h2>
     <p>
       {% trans %}
-        In case of a compromise of one of your devices, an attacker can
-        spend coins from your wallet. Checking your balance might reveal
-        to you that your device has been compromised.
+        In case of a compromise of one of your devices, an attacker can spend 
coins from your wallet. Checking your balance might reveal to you whether your 
device has eventually been compromised. If a coin has been spent, this coin 
cannot be spent a second time. The Exchange examines every coin whether it has 
been spent and thus makes double spending impossible.
       {% endtrans %}
     </p>
 
@@ -150,11 +148,10 @@
     <h2>{{ _("To whom would consumers complain to in case of non-conversion or 
non-compliance?") }}</h2>
     <p>
       {% trans %}
-        Any exchange should be audited by one or more independent auditors.  
Merchants and
-        consumer wallets will report certain issues automatically to the 
auditors, but auditors
-        may also provide a method for manual submission of issues.  The 
auditors are expected
-        to make their reports available to the respective regulatory 
authorities, or even
-        the general public.
+        From a technical point of view, any exchange is audited by one or more 
independent auditors. Merchants and consumer wallets will report certain issues 
automatically to the auditors, but auditors may also provide a method for 
manual submission of issues. The auditors are expected to make their reports 
available to the respective regulatory authorities, or even the general public.
+    </p>
+    <p>
+        From a legal point of view, users can always turn to their national 
authority responsible for settling disputes concerning the management of 
exchange services. For exchange services conducting business in Germany, this 
would be the general authority in charge of disputes (<a 
href="https://www.verbraucher-schlichter.de";>Universalschlichtungsstelle des 
Bundes</a>). In addition to this, the European Online Dispute Resolution (see 
<a href="http://ec.europa.eu/odr";>ODR</a>) as a platf [...]
       {% endtrans %}
     </p>
 
diff --git a/template/news/index.html.j2 b/template/news/index.html.j2
index 5c5cf28..f98468c 100644
--- a/template/news/index.html.j2
+++ b/template/news/index.html.j2
@@ -8,10 +8,7 @@
             <h1>{{ _("News") }}<a name="news"></a></h1>
             <section>
               <p>
-                {% trans %}
-                News posts about changes related to
-                GNUnet such as releases and events
-                {% endtrans %}
+                {% trans %}News posts about changes related to GNU Taler such 
as releases and events{% endtrans %}
                 &#8211;
                 <a href="{{ url_localized('rss.xml') }}">{{ _("subscribe to 
our RSS feed") }}</a>
               </p>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.