Merge branch 'master' of taler:www

2 files changed, 40 insertions, 15 deletions

diff --git a/common/navigation.inc b/common/navigation.inc
index 526f744a..e618af16 100644
--- a/common/navigation.inc
+++ b/common/navigation.inc
@@ -7,7 +7,7 @@
       </div>
       <div class="masthead">
         <ul class="nav nav-justified">
-          <li class="active"><a href="/">Home</a></li>
+          <li class="active"><a href="/main.html">Home</a></li>
 	  <li><a href="/citizens">Citizens</a></li>
           <li><a href="/merchants">Merchants</a></li>
           <li><a href="/governments">Governments</a></li>
diff --git a/merchants.html b/merchants.html
index 203e1cde..749005b4 100644
--- a/merchants.html
+++ b/merchants.html
@@ -19,17 +19,23 @@
       <!-- Example row of columns -->
       <div class="row">
         <div class="col-lg-4">
-          <h2>Fast</h2>
-          <p>Processing transactions with Taler is fast, allowing you to confirm the transaction with
+          <h2 lang="en">Fast</h2>
+          <h2 lang="de">Schnell</h2>
+          <h2 lang="fr">Vite</h2>
+          <p lang="en">Processing transactions with Taler is fast, allowing you to confirm the transaction with
              your customer virtually immediately.  Your customers will appreciate that they do not have
              to type in credit card information and play the "verified by" game.  By making payments
              significantly more convenient for your customers, you may be able to use Taler
              for small transactions that would not work with credit card payments due to the mental
              overhead for customers.</p>
+          <p lang="de">Julian</p>
+          <p lang="fr">Cecile</p>
         </div>
         <div class="col-lg-4">
-          <h2>Secure</h2>
-          <p>You never learn sensitive customer information. You need to ensure that your website
+          <h2 lang="en">Secure</h2>
+          <h2 lang="de">Sicher</h2>
+          <h2 lang="fr">Secure</h2>
+          <p lang="en">You never learn sensitive customer information. You need to ensure that your website
              provides the correct account information for your business, and that you correctly
              validate the payment confirmations from the Taler mint.  As a result, you will have
              cryptographic proof of payment for the specific contracts you entered with your
@@ -37,37 +43,56 @@
              deposits. Taler does not require you to undergo any particular security audits,
              processes or procedures, as you never handle sensitive customer information.
              Your systems will have cryptographically signed contracts which you can use in
-             court in case of disputes.
+             court in case of disputes.</p>
+          <p lang="de">Julian</p>
+          <p lang="fr">Cecile</p>
         </div>
         <div class="col-lg-4">
-          <h2>Libre</h2>
-          <p>Taler is free software, and you can use the liberally-licensed reference code as
+          <h2 lang="en">Free Software</h2>
+          <h2 lang="de">Freie Software</h2>
+          <h2 lang="fr">Cecile</h2>
+          <p lang="en">Taler is free software, and you can use the liberally-licensed reference code as
              a starting point to integrate Taler into your services. To use Taler, you do not
              need to pay license fees, and the free software development model will ensure that
              you can select from many competent developers to help you with your integration.</p>
+          <p lang="de">Julian</p>
+          <p lang="fr">Cecile</p>
         </div>
       </div>
       <div class="row">
         <div class="col-lg-4">
-          <h2>Low Fees</h2>
-          <p>Taler is designed to minimize the work the Mint needs to perform.  Combined with
+          <h2 lang="en">Low Fees</h2>
+          <h2 lang="de">Niedrige Geb&uuml;hren</h2>
+          <h2 lang="fr">Low Fees</h2>
+          <p lang="en">Taler is designed to minimize the work the Mint needs to perform.  Combined with
              Taler's strong security which prevents fraud, mints can operate with very
              low overhead and thus low transaction fees.  Given Taler's free software mint
              reference implementation, competition among mints will ensure fair, low
-             transaction fees for merchants.</div>
+             transaction fees for merchants.</p>
+          <p lang="de">Julian</p>
+          <p lang="fr">Cecile</p>
+        </div>
         <div class="col-lg-4">
-          <h2>Flexible</h2>
-          <p>Taler can be used for different currencies (such as Euros or US Dollars) and
+          <h2 lang="en">Flexible</h2>
+          <h2 lang="de">Flexibel</h2>
+          <h2 lang="fr">Flexible</h2>
+          <p lang="en">Taler can be used for different currencies (such as Euros or US Dollars) and
              different payment models limited only by what the mint supports in its
              interactions.</p>
+          <p lang="de">Julian</p>
+          <p lang="fr">Cecile</p>
         </div>
         <div class="col-lg-4">
-          <h2>Ethical</h2>
-          <p>Taler does not support tax evasion or money laundering, and is
+          <h2 lang="en">Ethical</h2>
+          <h2 lang="de">Ethisch</h2>
+          <h2 lang="fr">Cecile</h2>
+          <p lang="en">Taler does not support tax evasion or money laundering, and is
              also not a pyramid scheme or speculative investment.  Taler's
              protocols are efficient and do not waste energy. Taler encourages
              competition by providing an open standard and free software
              reference implementations.</p>
+          <p lang="de">Julian</p>
+          <p lang="fr">Cecile</p>
         </div>
       </div>