revising index and citizen's pages based on feedback from Marcello and Sva

3 files changed, 56 insertions, 47 deletions

diff --git a/citizens.html.j2 b/citizens.html.j2
index 024bdc41..af3f0e6c 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -22,7 +22,7 @@
   <!-- Example row of columns -->
   <div class="row">
     <div class="col-lg-6">
-      <h3>{{ _("Security") }}</h3>
+      <h3>{{ _("Secure") }}</h3>
 
       <p>{{ _("Taler uses modern cryptography, ensuring that there
                is no counterfeit.  Your digital wallet is safer
@@ -34,20 +34,20 @@
 
     </div>
     <div class="col-lg-6">
-      <h3>{{ _("Privacy") }}</h3>
+      <h3>{{ _("Private") }}</h3>
 
-      <p>{{ _("Your transactions are private, neither the exchange
-               nor merchant needs to learn your identity. There is
-               no need to give out credit card numbers or other
-               sensitive information. The merchant will only be
-               able to do exactly the transaction you agreed to.")
-               }}</p>
+      <p>{{ _("Your transactions are private, neither the payment
+               service provider nor merchant needs to learn your
+               identity. There is no need to give out credit card
+               numbers or other sensitive information. The merchant
+               will only be able to do exactly the transaction you
+               agreed to.")  }}</p>
 
     </div>
   </div>
   <div class="row">
     <div class="col-lg-6">
-      <h3>{{ _("Convenience") }}</h3>
+      <h3>{{ _("Convenient") }}</h3>
 
       <p>{{ _("You will be able to withdraw money to replenish the
                digital coins in your wallet using your credit card
@@ -58,7 +58,7 @@
 
     </div>
     <div class="col-lg-6">
-      <h3>{{ _("Stability") }}</h3>
+      <h3>{{ _("Stable") }}</h3>
 
       <p>{{ _("Coins in your digital wallet will be of the same
                denomination as the cash in your physical wallet.
@@ -104,30 +104,40 @@
 
     <p>{{ _("Customers interact with the Taler system using
              the Taler wallet:") }}</p>
+
     <ul>
-        <li>{{ _("To <b>withdraw</b> electronic coins, the customer transfers funds
-                  from his bank account to the Taler exchange.  The wire
-                  transfer subject must match a code generated by the customer's
-                  wallet. After the wire transfer is complete, the wallet will
-                  automatically withdraw the coins.") }}</li>
-
-        <li>{{ _("To <b>spend</b> electronic coins, a merchant must cause the wallet
-                  to display a proposal and ask for one-click confirmation.
-                  Payment is then instant.
-                  Transaction histories and digitally signed contracts can be
-                  preserved by the wallet.") }}</li>
+
+        <li>{{ _("To <b>withdraw</b> electronic coins, the customer
+                 transfers funds from his bank account to the Taler
+                 payment service provider (the exchange).  The wire
+                 transfer subject must match a code identifying the
+                 customer's wallet. After the wire transfer is
+                 complete, the wallet will automatically withdraw the
+                 coins from the exchange.") }}</li>
+
+        <li>{{ _("To <b>spend</b> electronic coins, a merchant must
+                  cause the wallet to display a proposal for some
+                  purchase.  The wallet will ask the customer for
+                  one-click confirmation.  Payment is then instant.
+                  Transaction histories and digitally signed contracts
+                  can be preserved by the wallet.") }}</li>
 
         <li>{{ _("The customer can use the wallet to <b>review</b> his
-                  balance. The wallet can contain different currencies,
-                  and may be shared across devices. Customers can make
-                  backups of the wallet to secure its contents against
-                  hardware failures.") }}</li>
-    </ul>
-  </div>
-  <div class="col-lg-6">
-    <img src="{{ url('images/citizen.svg') }}" alt="customer perspective" style="float: right; margin: 5px 5px 5px 5px;" width="100%">
-  </div>
+                  balance. The wallet can contain different
+                  currencies, and may be shared across
+                  devices. Customers can make backups of the wallet to
+                  secure its contents against hardware failures.")
+                  }}</li>
 
+      </ul>
+   </div>
 
-</div> <!-- /container -->
+   <div class="col-lg-6">
+     <img src="{{ url('images/citizen.svg') }}"
+          alt="customer perspective"
+          style="float: right; margin: 5px 5px 5px 5px;" width="100%">
+   </div>
+
+</div>
+<!-- /container -->
 {% endblock body_content %}
diff --git a/index.html.j2 b/index.html.j2
index aa171dce..293a5d9d 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -7,7 +7,7 @@
   </div>
 
   <div class="container text-center">
-    <h1>{{ _("Independent One-Click Payments!") }}</h1>
+    <h1>{{ _("One-Click Cash Payments!") }}</h1>
     <p>
       {% trans %}
       Taler is an electronic payment system under
@@ -40,18 +40,17 @@
 
       <p>
         {% trans %}
-        Taler does not introduce a new currency with
-        fluctuation risks, and instead uses a digital
-        wallet holding coins in reserve. Taler's
-        cryptographic coins correspond to existing
-        currencies, such as US Dollars, Euros or even
-        Bitcoins.
+        Taler does not introduce a new currency. Taler
+        uses a digital wallet storing coins and payment service
+        providers with escrow accounts in existing currencies.
+        Thus, Taler's cryptographic coins correspond to existing
+        currencies, such as US Dollars, Euros or even Bitcoins.
         {% endtrans %}
       </p>
 
     </div>
     <div class="col-lg-4">
-      <h3>{{ _("Security-focused") }}</h3>
+      <h3>{{ _("Secure") }}</h3>
 
       <p>
         {% trans %}
@@ -70,7 +69,7 @@
 
       <p>
         {% trans %}
-        When using Taler, merchants cannot hide their income from tax
+        When using Taler, merchant's revenue is transparent for tax
         collection authorities.  Unlike cash and most digital currencies,
         Taler helps prevent black markets.  Taler is not suitable for
         illegal activities.
@@ -79,7 +78,7 @@
 
     </div>
     <div class="col-lg-4">
-      <h3>{{ _("Privacy-friendly") }}</h3>
+      <h3>{{ _("Private") }}</h3>
       <p>
         {% trans %}
         When you pay with Taler, your identity does not
@@ -118,7 +117,7 @@
     on their device.  Before the first payment, the wallet's balance must
     be charged in the desired currency by some other means of payment.</p>
     <p>Once the wallet is charged, payments on websites take only one click,
-    are never falsely rejected by fraud detection and do not post any risk
+    are never falsely rejected by fraud detection and do not pose any risk
     of phishing or identity theft.</p>
     {% endtrans %}
     </div>
@@ -126,10 +125,10 @@
     <h2>{{ _("Receiving payments with Taler") }}</h2>
     {% trans %}
     <p>To receive Taler payments, a merchant needs a bank account
-    in the desired currency.  We provide
-    SDKs in various languages to makes the integration painless.
+    in the desired currency.  We provide supporting software
+    in various programming languages to make the integration painless.
     The merchant's backend for Taler transaction processing can run
-    on the merchant's premises or hosted.</p>
+    on the merchant's premises or be hosted by a third party.</p>
     {% endtrans %}
     </div>
   </div>
diff --git a/merchants.html.j2 b/merchants.html.j2
index f5c9b422..e2b17947 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -44,7 +44,7 @@
 
     </div>
     <div class="col-lg-4">
-      <h3>{{ _("Free Software") }}</h3>
+      <h3>{{ _("Free") }}</h3>
 
       <p>{{ _("Taler is free software, and you can use the
                liberally-licensed reference code as a starting
@@ -58,7 +58,7 @@
   </div>
   <div class="row">
     <div class="col-lg-4">
-      <h3>{{ _("Low Fees") }}</h3>
+      <h3>{{ _("Cheap") }}</h3>
 
       <p>{{ _("Taler is designed to minimize the work the exchange
                needs to perform.  Combined with Taler's strong