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

1 files changed, 41 insertions, 31 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 %}