replacing 'escrow' on some pages, erasing gettext tags, EUROTALER --> NGI Taler

4 files changed, 28 insertions, 13 deletions

diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index 9343b7d7..4a414771 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -106,7 +106,7 @@
       <!-- deliverables -->
       <div class="col-md-4 mb-4">
         {% if conf['deliverables'] is defined and conf['deliverables'] and conf['deliverables'] != "" %}
-        <h4 class="font-weight-bold pb-2 mb-4">{{ _("Deliverables")}}</h4>
+        <h4 class="font-weight-bold pb-2 mb-4">Deliverables</h4>
         <div class="list-group ">
           {% for item in conf['deliverables'] %}
           {% set ns = namespace(symbol='images/file-cancel.svg') %}
@@ -139,7 +139,7 @@
 
   <article>
     <div class="row">
-      <h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4>
+      <h4 class="font-weight-bold pb-2 mb-4">Partners</h4>
     </div>
 
     <div class="row mb-4">
diff --git a/template/faq.html.j2 b/template/faq.html.j2
index 780d15f9..7848cc81 100644
--- a/template/faq.html.j2
+++ b/template/faq.html.j2
@@ -29,7 +29,7 @@
       {% trans %}
         Your wallet stores digital coins and thus ultimately your computer
         holds your balance. The exchange keeps funds matching all unspent
-        coins in an escrow bank account.
+        coins in a settlement account.
       {% endtrans %}
     </p>
 
@@ -53,14 +53,20 @@
     <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 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.
+        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>
 
     <h2>{{ _("Can I send money to my friends with Taler?") }}</h2>
     <p>
       {% trans %}
-        Taler supports push and pull payments between wallets (also known as peer-to-peer payments). While the payment appears to be directly between wallets, technically the operation is intermediated by the payment service provider which will typically be legally required to identify the recipient of the funds before allowing the transaction to complete.
+        Taler supports push and pull payments between wallets (also known as peer-to-peer payments). 
+        While the payment appears to be directly between wallets, technically the operation 
+        is intermediated by the payment service provider which will typically be legally required 
+        to identify the recipient of the funds before allowing the transaction to complete.
       {% endtrans %}
     </p>
 
@@ -131,9 +137,9 @@
     <p>
       {% trans %}
         The exchange would be operated by a bank or in cooperation with a bank, and that bank
-        would hold the funds in escrow. Note that this bank could be a regular bank or a central
-        bank for a centrally banked electronic currency. Regardless, the bank would fall under
-        the respective banking regulations establishing a reason why consumers would have faith
+        would hold the funds in escrow respectively on an internal settlement account. 
+        Note that this bank could be a regular bank or a central bank for a central bank digital currency. 
+        Regardless, the bank would fall under the respective financial services regulations establishing a reason why consumers can trust
         in the conversion from Taler coins into regular bank money.
       {% endtrans %}
     </p>
@@ -141,10 +147,19 @@
     <h2>{{ _("To whom would consumers complain to in case of non-conversion or non-compliance?") }}</h2>
     <p>
       {% trans %}
-        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.
+        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 platform provided by the European Commission can be called for the settlement of disputes concerning exchange services headquartered in member states of the European Union.
+        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 platform provided by the European Commission can be called for the settlement of disputes 
+        concerning exchange services headquartered in member states of the European Union.
       {% endtrans %}
     </p>
 
diff --git a/template/features.html.j2 b/template/features.html.j2
index e742c860..694664e6 100644
--- a/template/features.html.j2
+++ b/template/features.html.j2
@@ -143,7 +143,7 @@
         {% trans %}
           Taler does not introduce a new currency. Taler
           uses a digital wallet storing coins and payment service
-          providers with escrow accounts in existing currencies.
+          providers with settlement accounts in existing currencies.
           Thus, Taler&#39;s cryptographic coins correspond to existing
           currencies, such as US Dollars, Euros or even Bitcoins.
         {% endtrans %}
diff --git a/template/governments.html.j2 b/template/governments.html.j2
index 3221f9d9..8d861614 100644
--- a/template/governments.html.j2
+++ b/template/governments.html.j2
@@ -74,8 +74,8 @@
             particular, the Taler design mandates the existence of an
             independent auditor who checks cryptographic proofs that
             accumulate at the exchange to ensure that the escrow
-            account is managed honestly.  This ensures that the
-            exchange does not threaten the economy due to fraud.
+            account (or internal settlement account) is managed honestly. 
+            This ensures that the exchange does not threaten the economy due to fraud.
           {% endtrans %}
         </p>
       </div>