revising gov page based on feedback from Sva and Marcello

5 files changed, 259 insertions, 169 deletions

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index a44f159c..b35cf373 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -27,7 +27,8 @@
     </div>
   </div>
   <div class="container text-center">
-    <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> {{_("and") }} Inria 2015, 2016, 2017</p>
+    <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> {{_("and") }}
+              <a href="http://inria.fr/">Inria</a> 2015, 2016, 2017</p>
     <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
   </div>
 </footer>
diff --git a/developers.html.j2 b/developers.html.j2
index e3725df4..d235c53a 100644
--- a/developers.html.j2
+++ b/developers.html.j2
@@ -13,20 +13,18 @@
 
       <p>
         {% trans %}
-               Taler is free software implementing an open
-               protocol. Anybody is welcome to inspect our code
-               and integrate our reference implementation into
-               their applications.  Different components of Taler
-               are being made available under different
-               licenses. The Affero GPLv3+ is used for the
+               GNU Taler is free software implementing an open
+               protocol. Anybody is welcome to integrate our reference
+               implementation into their applications.  Different
+               components of Taler are being made available under
+               different licenses. The Affero GPLv3+ is used for the
                exchange, the LGPLv3+ is used for reference code
-               demonstrating integration with merchant platforms,
-               and licenses like Apache/Mozilla/GPLv3+ are used
-               for wallets and related customer-facing software.
-               We are open for constructive suggestions for
-               maximizing the adoption of this libre payment
-               platform.
-        {% endtrans %}
+               demonstrating integration with merchant platforms, and
+               licenses like Apache/Mozilla/GPLv3+ are used for
+               wallets and related customer-facing software.  We are
+               open for constructive suggestions for maximizing the
+               adoption of this payment platform.
+         {% endtrans %}
       </p>
 
     </div>
@@ -46,7 +44,7 @@
                structure data, making it easy to integrate Taler
                with existing Web applications.  Taler's protocol
                is documented in
-               detail <a href="https://api.taler.net/">here</a>.
+               detail at <a href="https://api.taler.net/">api.taler.net</a>.
         {% endtrans %}
       </p>
     </div>
@@ -62,13 +60,14 @@
       <p>
         {% trans %}
                Taler is currently primarily developed by a
-               research team at Inria and GNUnet e.V. However,
+               research team at <a href="http://www.inria.fr/">Inria</a> and
+               <a href="https://gnunet.org/">GNUnet</a>. However,
                contributions from anyone are welcome.  Our Git
                repositories can be cloned using the Git and HTTP
                access methods against <tt>git.taler.net</tt> with
                the name of the respective repository. A list of
-               public repositories can be found in
-               our <a href='https://git.taler.net/'>GitWeb</a>.
+               repositories can be found in
+               our <a href="https://git.taler.net/">GitWeb</a>.
          {% endtrans %}
      </p>
     </div>
@@ -77,54 +76,64 @@
 
       <p>
         {% trans %}
-               In addition to this website,
-               the <a href="https://git.taler.net/">documented
-               code</a> and
+               In addition to this website, the <a
+               href="https://git.taler.net/">documented code</a> and
                the <a href="https://api.taler.net/">API
-               documentation</a>, we are in the process of
-               preparing a comprehensive design document which
-               will be published here soon.
+               documentation</a>.  Technical papers can be found in
+               our <a href="bibliography.html">bibliography</a>.
        {% endtrans %}
       </p>
     </div>
      <div class="col-lg-4">
       <h2>{{ _("Discussion") }}</h2>
 
-      <p>{{ _("We have a mailing list for developer discussions.
-               You can subscribe to it or read the list archive at
-               <a href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>.") }}</p>
+      <p>
+        {% trans %}
+               We have a mailing list for developer discussions.
+               You can subscribe to or read the list archive at
+               <a href="http://lists.gnu.org/mailman/listinfo/taler">http://lists.gnu.org/mailman/listinfo/taler</a>.
+        {% endtrans %}
+      </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-4">
       <h2>{{ _("Regression Testing") }}</h2>
 
-      <p>{{ _("We have
-               <a href='https://buildbot.net/'>Buildbot</a>
-               automation tests to detect regressions and check
-               for portability at
-        <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.
-      ") }}</p>
+      <p>
+         {% trans %}
+               We have <a href="https://buildbot.net/">Buildbot</a>
+               automation tests to detect regressions and check for
+               portability at <a
+               href="https://buildbot.taler.net/">buildbot.taler.net</a>.
+        {% endtrans %}
+       </p>
     </div>
     <div class="col-lg-4" note="not yet operational">
       <h2>{{ _("Code Coverage Analysis") }}</h2>
 
-      <p>{{ _("We use
-               <a href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>
+      <p>
+         {% trans %}
+               We use
+               <a href="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</a>
                to analyze the code coverage of our tests, the
                results are available
-               at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.
-               ") }}</p>
+               at <a href="https://lcov.taler.net/">lcov.taler.net</a>.
+        {% endtrans %}
+      </p>
     </div>
     <div class="col-lg-4">
       <h2>{{ _("Performance Analysis") }}</h2>
 
-      <p>{{ _("We
-               use <a href='https://gnunet.org/gauger'>Gauger</a>
+      <p>
+         {% trans %}
+               We
+               use <a href="https://gnunet.org/gauger">Gauger</a>
                for performance regression analysis of the exchange
                backend
-               at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.
-               ") }}</p>
+               at <a href="https://gauger.taler.net/">gauger.taler.net</a>.
+        {% endtrans %}
+      </p>
     </div>
   </div>
 </div>
@@ -135,24 +144,31 @@
   <div class="col-lg-12">
     <h2 id="overview">{{ _("Taler system overview") }}</h2>
 
-    <p>{{ _("The Taler system consists of protocols executed among
-             a number of actors with the help
-             of <a href='https://www.fsf.org/'>Free Software</a>
-             as illustrated in the illustration on the right.
-             Typical transactions involve the following steps: ")
-             }}</p>
+    <p>
+        {% trans %}
+             The Taler system consists of protocols executed among
+             a number of actors as illustrated in the illustration on the right.
+             Typical transactions involve the following steps:
+        {% endtrans %}
+     </p>
 
       <img src="{{ url('images/system.svg') }}" alt="system overview" style="float: right; margin: 50px 5px 5px 5px;" width="50%">
       <ol>
-         <li>{{ _("A customer instructs his <b>bank</b> to
+         <li>
+               {% trans %}
+                   A customer instructs his <b>bank</b> to
                    transfer funds from his account to the Taler
                    exchange (top left).  In the subject of the
                    transaction, he includes an authentication
                    token from his electronic <b>wallet</b>. In
                    Taler terminology, the customer creates a
-                   reserve at the exchange.  ") }}</li>
+                   reserve at the exchange.
+               {% endtrans %}
+            </li>
 
-         <li>{{ _("Once the exchange has received the wire
+         <li>
+               {% trans %}
+                   Once the exchange has received the wire
                    transfer, it allows the customer's electronic
                    wallet to <b>withdraw</b> electronic coins.
                    The electronic coins are digital
@@ -164,10 +180,13 @@
                    purchased what at which merchant.  The use of
                    Taler does not change the currency or the total
                    value of the funds (except for fees which the
-                   exchange may charge for the service).  ")
-                   }}</li>
+                   exchange may charge for the service).
+               {% endtrans %}
+            </li>
 
-         <li>{{ _("Once the customer has the digital coins in his
+         <li>
+               {% trans %}
+                   Once the customer has the digital coins in his
                    wallet, the wallet can be used to <b>spend</b>
                    the coins with merchant portals that support
                    the Taler payment system and accept the
@@ -183,10 +202,14 @@
                    merchant to learn the identity of the
                    customer. Naturally, the customer can spend any
                    fraction of his digital coins (the system takes
-                   care of customers getting change).  ") }}</li>
+                   care of customers getting change).
+               {% endtrans %}
+            </li>
 
-         <li>{{ _("Merchants receiving digital
-                   coins <b>deposit</b> the respective receipts
+         <li>
+               {% trans %}
+                   Merchants receiving digital
+                   coins <b>deposit</b> the respective claims
                    that resulted from the contract signing with
                    the customer at the exchange to redeem the
                    coins.  The deposit step does not reveal the
@@ -202,9 +225,13 @@
                    the customer. Thus, the exchange's database
                    allows the state to enforce that merchants pay
                    applicable taxes (and do not engage in illegal
-                   contracts).  ") }}</li>
+                   contracts).
+               {% endtrans %}
+            </li>
 
-         <li>{{ _("Finally, the exchange transfers funds
+         <li>
+               {% trans %}
+                   Finally, the exchange transfers funds
                    corresponding to the digital coins redeemed by
                    the merchants to the merchant's <b>bank</b>
                    account. The exchange may combine multiple
@@ -212,9 +239,13 @@
                    transfer.  The merchant can query the exchange
                    about the relationship between the bank
                    transfers and the individual claims that were
-                   deposited.  ") }}</li>
+                   deposited.
+               {% endtrans %}
+            </li>
 
-         <li>{{ _("Most importantly, the exchange keeps
+         <li>
+               {% trans %}
+                   Most importantly, the exchange keeps
                    cryptographic proofs that allow it to
                    demonstrate that it is operating correctly to
                    third parties.  The system requires an
@@ -223,9 +254,13 @@
                    to frequently verify the exchange's databases
                    and check that its bank balance matches the
                    total value of the remaining coins in
-                   circulation.  ") }}</li>
+                   circulation.
+               {% endtrans %}
+            </li>
 
-         <li>{{ _("Without the auditor, the exchange operators
+         <li>
+               {% trans %}
+                   Without the auditor, the exchange operators
                    could embezzle funds they are holding in
                    reserve. Customers and merchants cannot cheat
                    each other or the exchange. If any party's
@@ -233,7 +268,9 @@
                    is limited to the respective party and
                    proportional to the funds they have in
                    circulation during the period of the
-                   compromise.  ") }}</li>
+                   compromise.
+               {% endtrans %}
+            </li>
       </ol>
     <p></p>
   </div>
diff --git a/faq.html.j2 b/faq.html.j2
index e6183be4..edf3da60 100644
--- a/faq.html.j2
+++ b/faq.html.j2
@@ -7,43 +7,47 @@
 <p>Taler does not use any Blockchain technology or Bitcoin directly.
 Taler is not based on proof-of-work or any other distributed consensus
 mechanism.  Instead Taler is based on blind signatures.</p>
-
-<p>It would be possible, however, to withdraw Bitcoins into a Taler
-wallet (with an appropriate exchange), which would give some benefits
-over plain Bitcoin, such as instant confirmation times.</p>
+{% endtrans %}
+{% trans %}
+<p>It would be possible, however, to withdraw coins denominated in
+Bitcoin into a Taler wallet (with an appropriate exchange), which
+would give some benefits over plain Bitcoin, such as instant
+confirmation times.</p>
 {% endtrans %}
 
 <h2>{{ _("Where is the balance in my wallet stored?") }}</h2>
 {% trans %}
-<p>Your wallet stores digital coins that were blindly signed by an
-exchange, and thus ultimately your computer holds your balance.  The
-exchange keeps funds matching all unspent coins in an escrow bank
-account.</p>
+<p>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.</p>
 {% endtrans %}
 
-
 <h2>{{ _("What if my wallet is lost?") }}</h2>
 {% trans %}
 <p>Since the digital coins of value in your wallet are anonymized, the
 exchange can not assist you in recovering a lost or stolen wallet.
 Just like with a physical wallet for cash, you are responsible for
 keeping it safe.</p>
-
+{% endtrans %}
+{% trans %}
 <p>The risk of losing a wallet can be mitigated by making backups or
 keeping the balance reasonably low.</p>
-
-<p>In case of a compromise of one of your devices, an attacker that
-spends coins on your behalf will allow you to detect that your device
-has been compromised.</p>
 {% endtrans %}
 
+<h2>{{ _("What if my computer is hacked?") }}</h2>
+{% trans %}
+<p>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.</p>
+{% endtrans %}
 
 <h2>{{ _("Can I send money to my friend with Taler?") }}</h2>
 {% trans %}
 <p>If your friend provides goods or services for you in exchange for a
 payment, they can easily set up a Taler merchant and receive the
 payment in their bank account.</p>
-
+{% endtrans %}
+{% trans %}
 <p>Future versions of the Taler wallet may allow exchanging coins
 among friends directly as well.</p>
 {% endtrans %}
@@ -53,10 +57,21 @@ among friends directly as well.</p>
 {% trans %}
 <p>Taler wallets can store digital coins corresponding to multiple
 different currencies such as the Euro, US Dollars or Bitcoins.</p>
-
+{% endtrans %}
+{% trans %}
 <p>Taler currently does not offer conversion between currencies.</p>
 {% endtrans %}
 
+<h2>{{ _("How does Taler protect my privacy?") }}</h2>
+{% trans %}
+
+<p>Your wallet stores digital coins that are <a
+href="https://en.wikipedia.org/wiki/Blind_signature">blindly
+signed</a> by an exchange.  The use of a blind signature protects your
+privacy as it prevents the exchange from knowing which coin it signed
+for which customer.</p>
+
+{% endtrans %}
 
 </div>
 {% endblock body_content %}
diff --git a/governments.html.j2 b/governments.html.j2
index ec46cf2f..be7ce52a 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -4,15 +4,17 @@
 <div class="jumbotron">
   <div class="container text-center">
   <h1>{{ _("Advantages for Governments") }}</h1>
-    <p>{{ _("Taler provides accountability to ensure business
-             accepting payments operate legally, while also
-             respecting civil liberties of citizens spending
-             digital cash.  Taler is a commons, a payment system
-             based on open standards and free software.  Taler
-             needs governments to set a financial framework and
-             to act as trusted regulators.  Taler contributes to
-             digital sovereignty in the critical financial
-             infrastructure.") }}</p>
+    <p>
+        {% trans %}
+             Taler provides accountability to ensure business operate
+             legally, while also respecting civil liberties of
+             citizens.  Taler is a payment system based on
+             open standards and free software.  Taler needs
+             governments as they set a financial framework and act as
+             trusted regulators.  Taler contributes to digital
+             sovereignty in the critical financial infrastructure.
+         {% endtrans %}
+      </p>
   </div>
 </div>
 
@@ -22,72 +24,91 @@
   <div class="col-lg-6">
     <h3>{{ _("Taxable") }}</h3>
 
-    <p>{{ _("Taler was
-             built with the goal of fighting corruption and supporting taxation.
-             With Taler, the receiver of any form of payment is
-             easily identified by the government, and the merchant
-             can be compelled to provide the contract that was accepted
-             by the customer.  Governments can use this data to
-             tax businesses and individuals based on their
-             income, making tax evasion and black markets less
-             viable.") }}</p>
-
-    <p>{{ _("Thus, despite offering anonymity for citizens
-             spending digital cash to buy goods and services,
-             Taler also ensures that the state can observe
-             incoming funds. This can be used to ensure
-             businesses engage only in legal activities, and do
-             not evade income tax, sales tax or value-added tax.
-             However, this observational capability does not
-             extend to the immediate personal domain.  In
-             particular, sharing access to funds within a family
-             or synchronizing wallets across multiple devices is not
-             subject to monitoring.")  }}</p>
+    <p>
+        {% trans %}
+             Taler was built with the goal of fighting corruption and
+             supporting taxation.  With Taler, the receiver of any
+             form of payment is easily identified by the government,
+             and the merchant can be compelled to provide the contract
+             that was accepted by the customer.  Governments can use
+             this data to tax businesses and individuals based on
+             their income, making tax evasion and black markets less
+             viable.
+        {% endtrans %}
+      </p>
+
+    <p>
+        {% trans %}
+             Thus, despite offering anonymity for citizens spending
+             digital cash to buy goods and services, Taler also
+             ensures that the state can observe incoming funds. This
+             can be used to ensure businesses engage only in legal
+             activities, and do not evade income tax, sales tax or
+             value-added tax.  However, this observational capability
+             does not extend to the immediate personal domain.  In
+             particular, monitoring does not cover shared access to
+             funds with trusted friends and family, or synchronizing
+             wallets across multiple devices.
+        {% endtrans %}
+      </p>
+
+    </p>
   </div>
   <div class="col-lg-6">
     <h3>{{ _("Secure") }}</h3>
 
-    <p>{{ _("Taler's payments are cryptographically
-             secured. Thus, customers, merchants and the
-             exchange can mathematically demonstrate their
-             lawful behavior in court in case of
+    <p>
+        {% trans %}
+             Taler's payments are cryptographically secured. Thus,
+             customers, merchants and the Taler payment service provider
+             (the exchange) can mathematically
+             demonstrate their lawful behavior in court in case of
              disputes. Financial damages are strictly limited,
-             improving economic security for individuals,
-             merchants, the exchange and the state.") }}
-
-    <p>{{ _("By design, the Taler payment service provider is
-             subject to financial regulation. Financial
-             regulation and regular audits are critical to
-             establish trust. In particular, the Taler design
-             mandates the existence of an independent auditor
-             who checks cryptographic proofs that accumulate at
-             the payment service provider to ensure that the
-             escrow account is managed honestly.  This ensures
-             that the payment service provider does not threaten
-             the economy due to fraud.") }}</p>
+             improving economic security for individuals, merchants,
+             the exchange and the state.
+        {% endtrans %}
+      </p>
+
+    <p>
+        {% trans %}
+             As a payment service provider, the Taler exchange is
+             subject to financial regulation. Financial regulation and
+             regular audits are critical to establish trust. In
+             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.
+        {% endtrans %}
+      </p>
   </div>
  </div>
  <div class="row">
   <div class="col-lg-6">
     <h3>{{ _("Libre") }}</h3>
 
-    <p>{{ _("Taler is free software implementing an open
-             protocol standard.  Thus, Taler will enable
-             competition and avoid the monopolization of payment
-             systems that threatens global political and
-             financial stability today.") }}</p>
-
+    <p>
+        {% trans %}
+             Taler is free software implementing an open protocol
+             standard.  Thus, Taler will enable competition and avoid
+             the monopolization of payment systems that threatens
+             global political and financial stability today.
+        {% endtrans %}
+     </p>
 
   </div>
   <div class="col-lg-6">
     <h3>{{ _("Efficient") }}</h3>
 
-    <p>{{ _("Taler has an efficient design.  Unlike
-             timeline-based payment systems, such as Bitcoin,
+    <p>
+        {% trans %}
+             Taler has an efficient design.  Unlike
+             Blockchain-based payment systems, such as Bitcoin,
              Taler will not threaten the availability of
              national electric grids or (significantly)
-             contribute to environmental pollution.") }}</p>
-
+             contribute to environmental pollution.
+        {% endtrans %}
+    </p>
   </div>
  </div>
 </div>
@@ -98,14 +119,14 @@
   <div class="container">
     <h2 id="documentation">{{ _("Taler and regulation") }}</h2>
     <dl>
-      <dt>{{ _("Anti-money laundering (AML)")}}</dt>
+      <dt>{{ _("Anti money laundering (AML)")}}</dt>
       <dd>{{ _("With Taler, income is visible and can be tied to the contract signed by both parties.") }}</li>
-      <dt>{{ _("Know-your-customer (KYC)")}}</dt>
+      <dt>{{ _("Know your customer (KYC)")}}</dt>
       <dd>{{ _("In Taler, payer and payee are known by their bank accounts when withdrawing or depositing coins respectively") }}</dd>
-      <dt>{{ _("Privacy-by-design (GDPR)")}}</dt>
+      <dt>{{ _("General Data Protection Regulation (GDPR)")}}</dt>
       <dd>{{ _("Taler cryptographically protects citizen's privacy, and by design implements data minimization and privacy by default.") }}</dd>
-      <dt>{{ _("Competitive banking (PSD2)")}}</dt>
-      <dd>{{ _("Taler provides an open standard with public APIs contributing to a level playing field.") }}</dt>
+      <dt>{{ _("Payment Services Directive (PSD2)")}}</dt>
+      <dd>{{ _("Taler provides an open standard with public APIs contributing to a competitive banking sector.") }}</dt>
     </dl>
   </div>
 </div>
@@ -115,36 +136,52 @@
 <div class="col-lg-12">
   <h2 id="overview">{{ _("Taler provides privacy and accountability") }}</h2>
 
-  <p>{{ _("Taler assumes governments can observe traditional wire transfers
+  <p>
+      {% trans %}
+           Taler assumes governments can observe traditional wire transfers
            entering and leaving the Taler payment system.  Starting with the
-           wire transfers, governments can obtain: ") }}</p>
-  <ul>
+           wire transfers, governments can obtain:
+      {% endtrans %}
+      <ul>
 
-      <li>{{ _("The total amount of digital currency withdrawn by a
+      <li>
+         {% trans %}
+                The total amount of digital currency withdrawn by a
                 customer. The government can impose limits on how much
                 digital cash a customer can withdraw within a
-                given time frame.") }}</li>
-
-       <li>{{ _("The income received by any merchant via the Taler
-                 system.") }}</li>
-
-      <li>{{ _("The exact details of the underlying
-                contract that was signed between customer and
-                merchant.  However, this information would
-                typically not include the identity of the
-                customer.") }}</li>
-
-       <li>{{ _("The amounts of
-                 digital coins legitimately withdrawn by
-                 customers from the exchange, the value of
-                 non-redeemed digital coins in customer's
-                 wallets, the value and corresponding wire
-                 details of deposit operations performed by
-                 merchants with the exchange, and the income of
-                 the exchange from transaction fees.") }}</li>
-
+                given time frame.
+         {% endtrans %}
+       </li>
+
+       <li>
+         {% trans %}
+                 The income received by any merchant via the Taler
+                 system.
+         {% endtrans %}
+      </li>
+
+       <li>
+          {% trans %}
+
+                The exact details of the underlying contract that was
+                signed between customer and merchant.  However, this
+                information would typically not include the identity
+                of the customer.
+        {% endtrans %}
+       </li>
+
+       <li>
+         {% trans %}
+                 The amounts of digital coins legitimately withdrawn
+                 by customers from the exchange, the value of
+                 non-redeemed digital coins in customer's wallets, the
+                 value and corresponding wire details of deposit
+                 operations performed by merchants with the exchange,
+                 and the income of the exchange from transaction fees.
+        {% endtrans %}
+       </li>
     </ul>
-  <p></p>
+  </p>
 </div>
 </div>
 
diff --git a/investors.html.j2 b/investors.html.j2
index 31e0e979..551d938e 100644
--- a/investors.html.j2
+++ b/investors.html.j2
@@ -35,9 +35,9 @@
 
     <p>
         {% trans %}
-             We are currently supported by Inria, the French
+             We are currently supported by <a href="http://www.inria.fr/">Inria</a>, the French
              national institute for research in informatics and
-             automation, and the Renewable Freedom Foundation.
+             automation, and the <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>.
         {% endtrans %}
     </p>
   </div>
@@ -66,7 +66,7 @@
         {% trans %}
              The scalable business model for Taler is the operation
              of the payment service provider, which converts money from
-             traditional payment systems (MasterCard, SEPA,
+             traditional payment systems (MasterCard, SEPA, UPI,
              Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous
              electronic coins in the same currency. The customer
              can then redeem the electronic coins at a merchant,