summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Kirsch <kirschju@sec.in.tum.de>2014-11-19 11:26:18 +0100
committerJulian Kirsch <kirschju@sec.in.tum.de>2014-11-19 11:26:18 +0100
commit5c63d3138bb741983756c8ff3f62e1db3b4c4424 (patch)
treebedc9545594bb8edb5cc510581b3622eb347695e
parent86b6b7270c114251e134e76c6c926e674d4e76b1 (diff)
downloadwww-5c63d3138bb741983756c8ff3f62e1db3b4c4424.tar.gz
www-5c63d3138bb741983756c8ff3f62e1db3b4c4424.tar.bz2
www-5c63d3138bb741983756c8ff3f62e1db3b4c4424.zip
Incorporate Cecile's Bugfixes
-rw-r--r--common/navigation.inc6
-rw-r--r--merchants.html4
2 files changed, 6 insertions, 4 deletions
diff --git a/common/navigation.inc b/common/navigation.inc
index 0ef0ae1..8952e85 100644
--- a/common/navigation.inc
+++ b/common/navigation.inc
@@ -7,7 +7,9 @@
</div>
<div class="masthead">
<ul class="nav nav-justified">
- <li class="m_main"><a href="/main.html">Home</a></li>
+ <li lang="en" class="m_main"><a href="/main.html">Home</a></li>
+ <li lang="de" class="m_main"><a href="/main.html">Home</a></li>
+ <li lang="fr" class="m_main"><a href="/main.html">Accueil</a></li>
<li lang="en" class="m_citizens"><a href="/citizens">Citizens</a></li>
<li lang="de" class="m_citizens"><a href="/citizens">B&uuml;rger</a></li>
<li lang="fr" class="m_citizens"><a href="/citizens">Citoyens</a></li>
@@ -22,7 +24,7 @@
<li lang="fr" class="m_developers"><a href="/developers">Développeurs</a></li>
<li lang="en" class="m_investors"><a href="/investors">Investors</a></li>
<li lang="de" class="m_investors"><a href="/investors">Investoren</a></li>
- <li lang="fr" class="m_investors"><a href="/investors">Invéstisseurs</a></li>
+ <li lang="fr" class="m_investors"><a href="/investors">Investisseurs</a></li>
<li lang="en" class="m_about"><a href="/about">About Us</a></li>
<li lang="de" class="m_about"><a href="/about">&Uuml;ber Uns</a></li>
<li lang="fr" class="m_about"><a href="/about">À propos</a></li>
diff --git a/merchants.html b/merchants.html
index 30c583e..eddec44 100644
--- a/merchants.html
+++ b/merchants.html
@@ -19,7 +19,7 @@
<div class="col-lg-4">
<h2 lang="en">Fast</h2>
<h2 lang="de">Schnell</h2>
- <h2 lang="fr">Vite</h2>
+ <h2 lang="fr">Rapide</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
@@ -49,7 +49,7 @@
<div class="col-lg-4">
<h2 lang="en">Secure</h2>
<h2 lang="de">Sicher</h2>
- <h2 lang="fr">Secure</h2>
+ <h2 lang="fr">Sûr</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