From 6337e02d9dd8c7be92ffa168f67ab0de651664d0 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 30 Jan 2017 20:41:18 +0100
Subject: use templates instead of SSI, use relative URLs

---
 Makefile                          |   2 +-
 common/footer.inc.j2              |   7 +
 common/header.inc.j2              |  46 ------
 common/header.j2.inc              |  46 ++++++
 common/navigation.inc.j2          |  31 ----
 common/navigation.j2.inc          |  31 ++++
 index.html.j2                     |   8 +-
 locale/de/LC_MESSAGES/messages.po | 326 ++++++++++++++++++--------------------
 locale/en/LC_MESSAGES/messages.po | 313 ++++++++++++++++++------------------
 locale/es/LC_MESSAGES/messages.po | 326 ++++++++++++++++++--------------------
 locale/fr/LC_MESSAGES/messages.po | 326 ++++++++++++++++++--------------------
 locale/it/LC_MESSAGES/messages.po | 323 ++++++++++++++++++-------------------
 template.py                       |   7 +-
 template.sh                       |   8 -
 web-common                        |   2 +-
 15 files changed, 861 insertions(+), 941 deletions(-)
 create mode 100644 common/footer.inc.j2
 delete mode 100644 common/header.inc.j2
 create mode 100644 common/header.j2.inc
 delete mode 100644 common/navigation.inc.j2
 create mode 100644 common/navigation.j2.inc

diff --git a/Makefile b/Makefile
index 8e57f7e3..c73498c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: locale template
 	cd web-common && tsc
 
-locale/messages.pot: *.j2 common/*.j2
+locale/messages.pot: *.j2
 	pybabel extract -F locale/babel.map -o locale/messages.pot .
 
 locale-update: locale/messages.pot
diff --git a/common/footer.inc.j2 b/common/footer.inc.j2
new file mode 100644
index 00000000..6320e0d6
--- /dev/null
+++ b/common/footer.inc.j2
@@ -0,0 +1,7 @@
+      <div class="footer">
+        <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> and Inria 2015, 2016</p>
+        <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
+      </div>
+    <script type="text/javascript">//<![CDATA[
+      activate_menu();
+    //]]></script>
diff --git a/common/header.inc.j2 b/common/header.inc.j2
deleted file mode 100644
index b71482d9..00000000
--- a/common/header.inc.j2
+++ /dev/null
@@ -1,46 +0,0 @@
-    <script>
-        /*
-        @licstart  The following is the entire license notice for the
-        JavaScript code in this page.
-
-        Copyright (C) 2014, 2015, 2016 GNUnet e.V.
-
-        The JavaScript code in this page is free software: you can
-        redistribute it and/or modify it under the terms of the GNU
-        General Public License (GNU GPL) as published by the Free Software
-        Foundation, either version 3 of the License, or (at your option)
-        any later version.  The code is distributed WITHOUT ANY WARRANTY;
-        without even the implied warranty of MERCHANTABILITY or FITNESS
-        FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
-
-        As additional permission under GNU GPL version 3 section 7, you
-        may distribute non-source (e.g., minimized or compacted) forms of
-        that code without the copy of the GNU GPL normally required by
-        section 4, provided you include this license notice and a URL
-        through which recipients can access the Corresponding Source.
-
-        @licend  The above is the entire license notice
-        for the JavaScript code in this page.
-        */
-    </script>
-
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="author" content="">
-    <!--    <link rel="icon" href="../../favicon.ico"> -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Custom styles for this template -->
-    <link href="/justified-nav.css" rel="stylesheet">
-    <link href="/styles.css" rel="stylesheet">
-
-    <script src="/menu.js"></script>
-    <script src="/dist/js/jquery-1.11.1.min.js"></script>
-    <script src="/dist/js/bootstrap.min.js"></script>
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
diff --git a/common/header.j2.inc b/common/header.j2.inc
new file mode 100644
index 00000000..b71482d9
--- /dev/null
+++ b/common/header.j2.inc
@@ -0,0 +1,46 @@
+    <script>
+        /*
+        @licstart  The following is the entire license notice for the
+        JavaScript code in this page.
+
+        Copyright (C) 2014, 2015, 2016 GNUnet e.V.
+
+        The JavaScript code in this page is free software: you can
+        redistribute it and/or modify it under the terms of the GNU
+        General Public License (GNU GPL) as published by the Free Software
+        Foundation, either version 3 of the License, or (at your option)
+        any later version.  The code is distributed WITHOUT ANY WARRANTY;
+        without even the implied warranty of MERCHANTABILITY or FITNESS
+        FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+        As additional permission under GNU GPL version 3 section 7, you
+        may distribute non-source (e.g., minimized or compacted) forms of
+        that code without the copy of the GNU GPL normally required by
+        section 4, provided you include this license notice and a URL
+        through which recipients can access the Corresponding Source.
+
+        @licend  The above is the entire license notice
+        for the JavaScript code in this page.
+        */
+    </script>
+
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="author" content="">
+    <!--    <link rel="icon" href="../../favicon.ico"> -->
+
+    <!-- Bootstrap core CSS -->
+    <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Custom styles for this template -->
+    <link href="/justified-nav.css" rel="stylesheet">
+    <link href="/styles.css" rel="stylesheet">
+
+    <script src="/menu.js"></script>
+    <script src="/dist/js/jquery-1.11.1.min.js"></script>
+    <script src="/dist/js/bootstrap.min.js"></script>
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
diff --git a/common/navigation.inc.j2 b/common/navigation.inc.j2
deleted file mode 100644
index 90c328a5..00000000
--- a/common/navigation.inc.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar">
-            <span class="sr-only">Toggle navigation</span>
-      	    <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-        </div>
-        <div class="collapse navbar-collapse" id="main-navbar">
-          <ul class="nav nav-justified">
-            <li class="m_index"><a href=".">{{ _("Home") }}</a></li>
-            <li class="m_demo btn btn-outline-success"><a href="https://demo.taler.net/" target="_blank">{{ _("Demo") }}</a></li>
-	    <li class="m_citizens"><a href='citizens'>{{ _("Citizens") }}</a></li>
-            <li class="m_merchants"><a href='merchants'>{{ _("Merchants") }}</a></li>
-            <li class="m_governments"><a href='governments'>{{ _("Governments") }}</a></li>
-            <li class="m_investors"><a href='investors'>{{ _("Operators") }}</a></li>
-            <li class="m_developers"><a href='developers'>{{ _("Developers") }}</a></li>
-            <li class="m_about"><a href='about'>{{ _("About&nbsp;us") }}</a></li>
-          </ul>
-        </div>
-      </div>
-       <div class="navbar navbar-default navbar-fixed-bottom" role="navigation">
-         <div class="container lang-slector">
-           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/en')"><img src="/images/gb.png" height="15" width="23" alt="English"></a>
-           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/de')"><img src="/images/de.png" height="15" width="25" alt="Deutsch"></a>
-           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/fr')"><img src="/images/fr.png" height="15" width="22" alt="Français"></a>
-           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/it')"><img src="/images/it.png" height="15" width="22" alt="Italiano"></a>
-           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/es')"><img src="/images/es.png" height="15" width="23" alt="Español"></a>
-         </div>
-       </div>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
new file mode 100644
index 00000000..90c328a5
--- /dev/null
+++ b/common/navigation.j2.inc
@@ -0,0 +1,31 @@
+      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar">
+            <span class="sr-only">Toggle navigation</span>
+      	    <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+        </div>
+        <div class="collapse navbar-collapse" id="main-navbar">
+          <ul class="nav nav-justified">
+            <li class="m_index"><a href=".">{{ _("Home") }}</a></li>
+            <li class="m_demo btn btn-outline-success"><a href="https://demo.taler.net/" target="_blank">{{ _("Demo") }}</a></li>
+	    <li class="m_citizens"><a href='citizens'>{{ _("Citizens") }}</a></li>
+            <li class="m_merchants"><a href='merchants'>{{ _("Merchants") }}</a></li>
+            <li class="m_governments"><a href='governments'>{{ _("Governments") }}</a></li>
+            <li class="m_investors"><a href='investors'>{{ _("Operators") }}</a></li>
+            <li class="m_developers"><a href='developers'>{{ _("Developers") }}</a></li>
+            <li class="m_about"><a href='about'>{{ _("About&nbsp;us") }}</a></li>
+          </ul>
+        </div>
+      </div>
+       <div class="navbar navbar-default navbar-fixed-bottom" role="navigation">
+         <div class="container lang-slector">
+           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/en')"><img src="/images/gb.png" height="15" width="23" alt="English"></a>
+           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/de')"><img src="/images/de.png" height="15" width="25" alt="Deutsch"></a>
+           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/fr')"><img src="/images/fr.png" height="15" width="22" alt="Français"></a>
+           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/it')"><img src="/images/it.png" height="15" width="22" alt="Italiano"></a>
+           <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/es')"><img src="/images/es.png" height="15" width="23" alt="Español"></a>
+         </div>
+       </div>
diff --git a/index.html.j2 b/index.html.j2
index de8437ca..34c30d3b 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -4,14 +4,14 @@
     <meta charset="UTF-8"/>
     <title>{{ _("GNU Taler") }}</title>
     <meta name="description" content="Anonymous electronic payments for civil society"/>
-      <!--# include file="common/header.{{ _("en") }}.inc" -->
+      {% include "common/header.j2.inc" %}
   </head>
   <body>
     <div class="container">
-      <!--# include file="common/navigation.{{ _("en") }}.inc" -->
+      {% include "common/navigation.j2.inc" %}
       <!-- Jumbotron -->
       <div class="jumbotron">
-        <img align="middle" alt="Taler logo" width="33%" src="/images/logo-2015-medium.png" style="margin: 0px 0px -120px 0px;">
+        <img align="middle" alt="Taler logo" width="33%" src="{{ url('images/logo-2015-medium.png') }}" style="margin: 0px 0px -120px 0px;">
       </div>
       <div class="jumbotron">
          <h1>{{ _("Electronic payments for a liberal society!") }}</h1>
@@ -79,7 +79,7 @@
            for transactions and the ability to give change.
          ") }}</p>
        </div>
-       <!--# include file="common/footer.{{ _("en") }}.inc" -->
+      {% include "common/footer.j2.inc" %}
     </div> <!-- /container -->
   </body>
 </html>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index dba4b75f..da39dca1 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 20:35+0100\n"
+"POT-Creation-Date: 2017-01-30 19:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -14,31 +14,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
-#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
-#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
-#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
-#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
-#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
-#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
-#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
-#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
-#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118
+#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11
+#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7
+#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7
+#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2
+#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101
+#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11
+#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7
+#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7
+#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7
 #: wallet.html.j2:112 wallet.html.j2:194
 msgid "en"
 msgstr "de"
 
-#: about.html.j2:3 citizens.html.j2:3 developers.html.j2:3
-#: financial-news.html.j2:5 governments.html.j2:3 index.html.j2:3
-#: investors.html.j2:3 merchants.html.j2:3 news.html.j2:3 wallet.html.j2:5
+#: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
+#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
+#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
-#: about.html.j2:3 about.html.j2:12
+#: about.html.j2:5 about.html.j2:14
 msgid "About us"
 msgstr "Über uns"
 
-#: about.html.j2:20
+#: about.html.j2:22
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
@@ -46,95 +46,95 @@ msgstr ""
 "GNU maintainer. Forscht zu Netzwerksicherheit &amp; Privatsphäre. "
 "Softwarearchitect."
 
-#: about.html.j2:25
+#: about.html.j2:27
 #, fuzzy
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
 " industries, …."
 msgstr ""
 
-#: about.html.j2:30
+#: about.html.j2:32
 #, fuzzy
 msgid "CFO"
 msgstr "CFO"
 
-#: about.html.j2:37
+#: about.html.j2:39
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Mathematiker"
 
-#: about.html.j2:42
+#: about.html.j2:44
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Theoretisch tötlich"
 
-#: about.html.j2:47
+#: about.html.j2:49
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Begründer des GNU Projektes. Ethikberatung und Lizenzrecht."
 
-#: about.html.j2:54
+#: about.html.j2:56
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Doktorand, TU München. Hält Vorlesung."
 
-#: about.html.j2:59
+#: about.html.j2:61
 msgid "PhD Student, Inria.."
 msgstr "Doktorand, Inria."
 
-#: about.html.j2:64 about.html.j2:79
+#: about.html.j2:66 about.html.j2:81
 #, fuzzy
 msgid "Software engineer."
 msgstr ""
 
-#: about.html.j2:71
+#: about.html.j2:73
 #, fuzzy
 msgid "Sustainable business development."
 msgstr "Des Grundes wegen"
 
-#: about.html.j2:75
+#: about.html.j2:77
 #, fuzzy
 msgid "Software engineer. Works on libebics."
 msgstr "EBICS."
 
-#: about.html.j2:85
+#: about.html.j2:87
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Übersetzer"
 
-#: about.html.j2:89 about.html.j2:93
+#: about.html.j2:91 about.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Übersetzer"
 
-#: about.html.j2:99
+#: about.html.j2:101
 msgid "Hardware security module"
 msgstr "Hardwaresicherheitsmodul"
 
-#: about.html.j2:103
+#: about.html.j2:105
 msgid "Risk management"
 msgstr "Risikomanagement"
 
-#: about.html.j2:107
+#: about.html.j2:109
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Doktorand, TU München. Currently teaching."
 
-#: about.html.j2:113
+#: about.html.j2:115
 #, fuzzy
 msgid "Software engineer. Works on Android wallet."
 msgstr "Android Geldbörse"
 
-#: citizens.html.j2:3 common/navigation.inc.j2:14
+#: citizens.html.j2:5
 msgid "Citizens"
 msgstr "Bürger"
 
-#: citizens.html.j2:12
+#: citizens.html.j2:14
 msgid "Advantages for citizens"
 msgstr "Vorteile für Bürger"
 
-#: citizens.html.j2:19
+#: citizens.html.j2:21
 msgid "Security"
 msgstr "Sicherheit"
 
-#: citizens.html.j2:21
+#: citizens.html.j2:23
 msgid ""
 "Taler is the electronic equivalent of cash, except harder to fake.\n"
 "             If your digital wallet is lost -- say because\n"
@@ -162,11 +162,11 @@ msgstr ""
 "\t     sich online befindet und dass das lästige Münzenzählen\n"
 "\t     bis auf Weiteres entfällt."
 
-#: citizens.html.j2:30
+#: citizens.html.j2:32
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: citizens.html.j2:32
+#: citizens.html.j2:34
 msgid ""
 "Your transactions are private, neither the exchange nor merchant needs to"
 "\n"
@@ -184,11 +184,11 @@ msgstr ""
 "\t     Händler ist in der Lage, einzig von Ihnen bestätigte\n"
 "\t     Transaktionen durchzuführen."
 
-#: citizens.html.j2:40
+#: citizens.html.j2:42
 msgid "Convenience"
 msgstr "Bequeme Einrichtung"
 
-#: citizens.html.j2:42
+#: citizens.html.j2:44
 msgid ""
 "You will be able to withdraw digital coins to replenish your wallet using"
 "\n"
@@ -201,11 +201,11 @@ msgstr ""
 "alternativ\n"
 "\t     eine SEPA-Überweisung."
 
-#: citizens.html.j2:47
+#: citizens.html.j2:49
 msgid "Stability "
 msgstr "Stabilität"
 
-#: citizens.html.j2:49
+#: citizens.html.j2:51
 msgid ""
 "Coins in your digital wallet will be of the same denomination as the\n"
 "             cash in your physical wallet. So you will not have to worry "
@@ -223,11 +223,11 @@ msgstr ""
 "\t     echten Leben können Sie digitale Münzen verschiedener\n"
 "\t     Währungen in Ihrer digitalen Geldbörse mit sich führen."
 
-#: citizens.html.j2:57
+#: citizens.html.j2:59
 msgid "Taler as seen by customers"
 msgstr "Taler aus Kundensicht"
 
-#: citizens.html.j2:59
+#: citizens.html.j2:61
 msgid ""
 "Customers interact with the Taler system mostly using\n"
 "          a free wallet implementation, which may be an extension or "
@@ -240,7 +240,7 @@ msgstr ""
 "Browsererweiterung oder eigenständige Anwendung auf dem Kundencomputer "
 "läuft.  Typische Schritte die Kunden durchfüren sind:"
 
-#: citizens.html.j2:68
+#: citizens.html.j2:70
 msgid ""
 "The customer selects an exchange (i.e. by visiting the\n"
 "              respective website or selecting from a list of exchanges in"
@@ -266,7 +266,7 @@ msgstr ""
 "Zugangscode\n"
 "              im Betreff der Überweisung stehen muss."
 
-#: citizens.html.j2:77
+#: citizens.html.j2:79
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange "
@@ -277,7 +277,7 @@ msgstr ""
 "               Bank an, den entsprechenden Geldtransfer auf Basis dieser\n"
 "               Instruktionen zu veranlassen."
 
-#: citizens.html.j2:81
+#: citizens.html.j2:83
 msgid ""
 "Once the funds have arrived, the wallet will\n"
 "               automatically withdraw the electronic coins.  The\n"
@@ -295,7 +295,7 @@ msgstr ""
 "               ist auch möglich, die Daten aus der Geldbörse\n"
 "               per Backup zu sichern."
 
-#: citizens.html.j2:87
+#: citizens.html.j2:89
 msgid ""
 "When visiting a merchant that supports Taler,\n"
 "               an additional payment option for Taler is enabled in the "
@@ -322,19 +322,19 @@ msgstr ""
 "               Geldbörse lokal gespeichert werden, unter anderem zur\n"
 "               spätern Durchsetzung von Verträgen vor Gericht."
 
-#: common/navigation.inc.j2:18 developers.html.j2:3
+#: developers.html.j2:5
 msgid "Developers"
 msgstr "Entwickler"
 
-#: developers.html.j2:12
+#: developers.html.j2:14
 msgid "Taler for developers"
 msgstr "Taler für Entwickler"
 
-#: developers.html.j2:18
+#: developers.html.j2:20
 msgid "Free"
 msgstr "Frei"
 
-#: developers.html.j2:20
+#: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
 "            protocol. Anybody is welcome to inspect our code and\n"
@@ -365,11 +365,11 @@ msgstr ""
 "\t    Bezahlplattform führen.\n"
 "          "
 
-#: developers.html.j2:34
+#: developers.html.j2:36
 msgid "RESTful"
 msgstr "REST-basiert"
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
 "\t    ensure that Taler payments can work with restrictive\n"
@@ -400,11 +400,11 @@ msgstr ""
 "\t    dokumentiert.\n"
 "          "
 
-#: developers.html.j2:51
+#: developers.html.j2:53
 msgid "Code"
 msgstr "Code"
 
-#: developers.html.j2:53
+#: developers.html.j2:55
 msgid ""
 "Taler is currently primarily developed by a\n"
 "\t    research team at Inria and TU Munich. However,\n"
@@ -427,11 +427,11 @@ msgstr ""
 "\t    <a href='https://git.taler.net/'>GitWeb</a> zu finden.\n"
 "          "
 
-#: developers.html.j2:64
+#: developers.html.j2:66
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: developers.html.j2:66
+#: developers.html.j2:68
 msgid ""
 "In addition to this website,\n"
 "            the <a href='https://git.taler.net/'>documented\n"
@@ -449,11 +449,11 @@ msgstr ""
 "            in Kürze hier verfügbar sein wird.\n"
 "          "
 
-#: developers.html.j2:75
+#: developers.html.j2:77
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: developers.html.j2:77
+#: developers.html.j2:79
 msgid ""
 "We have a mailinglist for developer discussions.\n"
 "            You can subscribe to it or read the list archive at\n"
@@ -466,11 +466,11 @@ msgstr ""
 "            <a "
 "href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:85
+#: developers.html.j2:87
 msgid "Regression Testing"
 msgstr "Regressionstests"
 
-#: developers.html.j2:87
+#: developers.html.j2:89
 msgid ""
 "We\n"
 "            have <a href='https://buildbot.net/'>Buildbot</a>\n"
@@ -488,11 +488,11 @@ msgstr ""
 "zu finden.\n"
 "          "
 
-#: developers.html.j2:95
+#: developers.html.j2:97
 msgid "Code Coverage Analysis"
 msgstr "Testabdeckungsanalyse"
 
-#: developers.html.j2:97
+#: developers.html.j2:99
 #, fuzzy
 msgid ""
 "We\n"
@@ -512,11 +512,11 @@ msgstr ""
 "finden.\n"
 "          "
 
-#: developers.html.j2:105
+#: developers.html.j2:107
 msgid "Performance Analysis"
 msgstr "Performanzanalyse"
 
-#: developers.html.j2:107
+#: developers.html.j2:109
 msgid ""
 "We\n"
 "            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
@@ -532,11 +532,11 @@ msgstr ""
 "href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:116
+#: developers.html.j2:118
 msgid "Taler system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:118
+#: developers.html.j2:120
 msgid ""
 "The Taler system consists of protocols executed\n"
 "          among a number of actors with the help\n"
@@ -553,7 +553,7 @@ msgstr ""
 "          Durchführung einer Transaktion typischen Schritte:\n"
 "        "
 
-#: developers.html.j2:127
+#: developers.html.j2:129
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange\n"
@@ -572,7 +572,7 @@ msgstr ""
 "               Reserve bei der Wechselstube an.\n"
 "             "
 
-#: developers.html.j2:135
+#: developers.html.j2:137
 #, fuzzy
 msgid ""
 "Once the exchange has received the\n"
@@ -607,7 +607,7 @@ msgstr ""
 "               Dienste verlangen könnte).\n"
 "             "
 
-#: developers.html.j2:148
+#: developers.html.j2:150
 msgid ""
 "Once the customer has the digital coins in\n"
 "               his wallet, the wallet can be used to <b>spend</b> the\n"
@@ -645,7 +645,7 @@ msgstr ""
 "               Kunde wenn nötig Wechselgelt erhält).\n"
 "             "
 
-#: developers.html.j2:165
+#: developers.html.j2:167
 #, fuzzy
 msgid ""
 "Merchants receiving digital\n"
@@ -684,7 +684,7 @@ msgstr ""
 "               ahnden).\n"
 "             "
 
-#: developers.html.j2:182
+#: developers.html.j2:184
 msgid ""
 "Finally, the exchange transfers funds\n"
 "               corresponding to the digital coins redeemed by the\n"
@@ -707,7 +707,7 @@ msgstr ""
 "               Depotvorgängen zu erhalten.\n"
 "             "
 
-#: developers.html.j2:192
+#: developers.html.j2:194
 msgid ""
 "Most importantly, the exchange keeps\n"
 "               cryptographic proofs that allow it to demonstrate that\n"
@@ -729,7 +729,7 @@ msgstr ""
 "               besitzt.\n"
 "             "
 
-#: developers.html.j2:202
+#: developers.html.j2:204
 msgid ""
 "Without the auditor, the exchange operators\n"
 "               could embezzle funds they are holding in\n"
@@ -754,20 +754,20 @@ msgstr ""
 msgid "Financial News"
 msgstr ""
 
-#: common/navigation.inc.j2:16 governments.html.j2:3
+#: governments.html.j2:5
 msgid "Governments"
 msgstr "Regierungen"
 
-#: governments.html.j2:12
+#: governments.html.j2:14
 msgid "Advantages for governments"
 msgstr "Vorteile für Regierungen"
 
-#: governments.html.j2:19 index.html.j2:23
+#: governments.html.j2:21 index.html.j2:25
 #, fuzzy
 msgid "Taxable"
 msgstr "Taxierbar"
 
-#: governments.html.j2:21
+#: governments.html.j2:23
 msgid ""
 "Taler is an electronic payment system that was built with the goal of "
 "supporting taxation.\n"
@@ -792,11 +792,11 @@ msgstr ""
 "Steuervermeidungen sowie den\n"
 "\t     Schwarzmarkthandel."
 
-#: governments.html.j2:28 investors.html.j2:26 merchants.html.j2:27
+#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
 msgid "Secure"
 msgstr "Sicher"
 
-#: governments.html.j2:30
+#: governments.html.j2:32
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, "
 "merchants and\n"
@@ -825,12 +825,12 @@ msgstr ""
 "Systems\n"
 "\t     auszuschließen."
 
-#: governments.html.j2:40 index.html.j2:37
+#: governments.html.j2:42 index.html.j2:39
 #, fuzzy
 msgid "Libre"
 msgstr "Liberal"
 
-#: governments.html.j2:42
+#: governments.html.j2:44
 msgid ""
 "Taler is free software implementing an open protocol standard.  Thus, "
 "Taler will\n"
@@ -845,11 +845,11 @@ msgstr ""
 "\t     Zahlungssystemen, welche heute in globalem Ausmaß die politische\n"
 "\t     sowie aber auch die finanzielle Stabilität bedroht."
 
-#: governments.html.j2:47 investors.html.j2:16
+#: governments.html.j2:49 investors.html.j2:18
 msgid "Efficient"
 msgstr "Effizient"
 
-#: governments.html.j2:49
+#: governments.html.j2:51
 msgid ""
 "Taler is designed to be efficient.  Unlike timeline-based payment systems"
 " like\n"
@@ -862,11 +862,11 @@ msgstr ""
 "\t     nicht die Verfügbarkeit nationaler Energieversorgungsnetze und\n"
 "\t     wird auch nicht (signifikant) zur Umweltverschmutzung beitragen."
 
-#: governments.html.j2:55
+#: governments.html.j2:57
 msgid "Taler as seen by governments"
 msgstr "Taler aus Regierungsperspektive"
 
-#: governments.html.j2:57
+#: governments.html.j2:59
 #, fuzzy
 msgid ""
 "Governments can observe traditional wire\n"
@@ -888,7 +888,7 @@ msgstr ""
 "          weitere Informationen bereistellen.  Informationen die der\n"
 "          Regierung bereitgestellt werden können sind:"
 
-#: governments.html.j2:69
+#: governments.html.j2:71
 msgid ""
 "From the banking system:\n"
 "              The total amount of digital currency\n"
@@ -902,7 +902,7 @@ msgstr ""
 "              Betrag digitaler Münzen den ein Kunde in einem\n"
 "              bestimmten Zeitraum abheben kann beschränken."
 
-#: governments.html.j2:75
+#: governments.html.j2:77
 msgid ""
 "From the banking system:\n"
 "               The total amount of income received\n"
@@ -912,7 +912,7 @@ msgstr ""
 "               Das Gesamteinkommen jedes Händlers\n"
 "               welches durch Taler vermittelt wurde."
 
-#: governments.html.j2:79
+#: governments.html.j2:81
 msgid ""
 "From auditing the exchange:\n"
 "               The amounts of digital coins legitimately withdrawn by\n"
@@ -933,7 +933,7 @@ msgstr ""
 "               Wechselstubenbetreibers aus Transaktionsgebühren.\n"
 "               "
 
-#: governments.html.j2:86
+#: governments.html.j2:88
 #, fuzzy
 msgid ""
 "From auditing merchants:\n"
@@ -961,27 +961,21 @@ msgstr ""
 "               den Kunden nicht allein auf Grundlage der von Taler\n"
 "               gesammelten Informationen ermitteln."
 
-#: index.html.j2:15
+#: index.html.j2:17
 msgid "Electronic payments for a liberal society!"
 msgstr "Elektronisches Bezahlen für eine freiheitliche Gesellschaft!"
 
-#: index.html.j2:16
+#: index.html.j2:18
 msgid ""
 "Taler is a new electronic payment system under development\n"
-"\t    at <a href='http://www.inria.fr/'>Inria</a>.  Today, this website "
+"\t   at <a href=\"http://www.inria.fr/\">Inria</a>.  Today, this website "
 "only\n"
 "\t    presents the advantages our system is expected to provide.  We "
 "expect to\n"
 "\t    make the payment system operational in 2017."
 msgstr ""
-"Taler ist ein neues elektronisches Zahlungssystem, welches\n"
-"\t    bei <a href='http://www.inria.fr/'>Inria</a> entwickelt wird. Zum\n"
-"\t    heutigen Tag zeigt diese Seite die Vorteile unseres Systems auf.\n"
-"            Voraussichtlicher Startpunkt des\n"
-"\t    Zahlungssystems ist das Jahr\n"
-"\t    2017."
 
-#: index.html.j2:24
+#: index.html.j2:26
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
 "\t     governments can learn their citizen's total income and thus "
@@ -998,11 +992,11 @@ msgstr ""
 "\t     erhoben werden. Taler richtet sich daher an die reguläre\n"
 "\t     Wirtschaft und ist zur Verwendung auf dem Schwarzmarkt ungeeignet."
 
-#: index.html.j2:30
+#: index.html.j2:32
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: index.html.j2:31
+#: index.html.j2:33
 msgid ""
 "When you pay with Taler, your identity does not have to\n"
 "\t     be revealed to the merchant. The bank, government and exchange "
@@ -1019,25 +1013,20 @@ msgstr ""
 "\t     der Lage, die von ihnen durchgeführten Transaktionen im Falle\n"
 "\t     eines Gerichtsprozesses kryptographisch nachzuweisen."
 
-#: index.html.j2:38
+#: index.html.j2:40
 msgid ""
-"Taler is free software from <a href='http://www.gnu.org/'>GNU</a> "
-"implementing an open protocol.\n"
+"Taler is free software from <a href=\"http://www.gnu.org/\">the GNU "
+"project</a> implementing an open protocol.\n"
 "\t     Anybody is welcome to inspect our code and integrate our reference"
 "\n"
 "\t     implementation into their applications."
 msgstr ""
-"Taler ist freie Software des <a href='http://www.gnu.org/'>GNU "
-"Projektes</a>, welche ein offenes Protokoll\n"
-"\t     implementiert. Der Code ist frei verfügbar und jeder ist\n"
-"\t     eingeladen, die Referenzimplementierung in eigene Projekte zu\n"
-"\t     übernehmen."
 
-#: index.html.j2:45
+#: index.html.j2:47
 msgid "Electronic"
 msgstr "Elektronisch"
 
-#: index.html.j2:46
+#: index.html.j2:48
 msgid ""
 "Taler is designed to work on the Internet. Using a\n"
 "\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
@@ -1047,11 +1036,11 @@ msgstr ""
 "\t    Einsatz eines REST-basierten Protokolls über HTTP oder HTTPS ist\n"
 "\t    Taler einfach in existierende Webapplikationen einzubinden."
 
-#: index.html.j2:51
+#: index.html.j2:53
 msgid "Reserves"
 msgstr "Reserven"
 
-#: index.html.j2:52
+#: index.html.j2:54
 msgid ""
 "Taler uses an electronic exchange holding financial\n"
 "             reserves in existing currencies. This means that Taler is "
@@ -1069,23 +1058,23 @@ msgstr ""
 "\t     Währungen, wie zum Beispiel Euro, US-Dollar oder auch BitCoin.\n"
 "          "
 
-#: index.html.j2:59 news.html.j2:3 news.html.j2:12
+#: index.html.j2:61 news.html.j2:5 news.html.j2:14
 msgid "News"
 msgstr ""
 
-#: index.html.j2:60
+#: index.html.j2:62
 msgid "Taler Web payments paper published."
 msgstr "Taler Web Bezahldienste Publikation erschienen."
 
-#: index.html.j2:61
+#: index.html.j2:63
 msgid "More news »"
 msgstr "Mehr Neuigkeiten »"
 
-#: index.html.j2:65
+#: index.html.j2:67
 msgid "Taler technology: About taxability, change and privacy"
 msgstr "Die Technologie hinter Technik: Steuern, Wechselgeld und Privatsphäre"
 
-#: index.html.j2:66
+#: index.html.j2:68
 msgid ""
 "One of the key goals of Taler is to provide anonymity for\n"
 "           citizens buying goods and services, while ensuring that the "
@@ -1117,7 +1106,7 @@ msgstr ""
 "\t   explizit keine Einsicht nehmen darf.\n"
 "\t "
 
-#: index.html.j2:75
+#: index.html.j2:77
 msgid ""
 "As a result, Taler does not intrude into the\n"
 "           personal economic domain, offers good privacy, taxability\n"
@@ -1132,15 +1121,15 @@ msgstr ""
 "\t   ermöglicht.\n"
 "\t "
 
-#: investors.html.j2:3
+#: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
-#: investors.html.j2:12
+#: investors.html.j2:14
 msgid "Operate a Taler exchange!"
 msgstr "Betreiben Sie eine Taler Wechelstube!"
 
-#: investors.html.j2:18
+#: investors.html.j2:20
 msgid ""
 "Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
 "             EdDSA) and is thus expected to be able to handle large "
@@ -1164,7 +1153,7 @@ msgstr ""
 "\t     Bruchteilen eines Cents betrieben wird (entsprechendes\n"
 "\t     Transaktionsvolumen vorausgesetzt)."
 
-#: investors.html.j2:28
+#: investors.html.j2:30
 msgid ""
 "All transactions in Taler are secured using modern cryptography and\n"
 "             trust in all parties is minimized. Financial damage is "
@@ -1188,11 +1177,11 @@ msgstr ""
 "\t     alternativ aufzeigt, ob Veruntreuungen durch die Systemteilnehmer\n"
 "\t     stattgefunden haben."
 
-#: investors.html.j2:37
+#: investors.html.j2:39
 msgid "Business model"
 msgstr "Geschäftsmodell"
 
-#: investors.html.j2:39
+#: investors.html.j2:41
 msgid ""
 "The basic business model for Taler is the operation of an exchange.  An "
 "exchange converts money from traditional payment systems (Mastercard,\n"
@@ -1217,11 +1206,11 @@ msgstr ""
 "\t     Wecheslstube gegen Geld der traditionellen Bezahlungssysteme\n"
 "\t     einlösen. "
 
-#: investors.html.j2:48
+#: investors.html.j2:50
 msgid "Taler as seen by the exchange operator"
 msgstr "Taler aus Betreiberperspektive"
 
-#: investors.html.j2:50
+#: investors.html.j2:52
 msgid ""
 "The exchange operator primarily operates a Web service\n"
 "          portal and keeps databases with transaction details and\n"
@@ -1243,7 +1232,7 @@ msgstr ""
 "          für die verschiedenen Interaktionen verlangen kann.  Die\n"
 "          wesentlichen Interaktionen der Wechselstube sind:"
 
-#: investors.html.j2:62
+#: investors.html.j2:64
 msgid ""
 "Create a <b>reserve</b> based on an incoming\n"
 "              wire transfer from a customer."
@@ -1251,7 +1240,7 @@ msgstr ""
 "Erzeuge eine Währungsreserve auf Grundlage einer eingehenden "
 "Banküberweisung eines Kunden."
 
-#: investors.html.j2:65
+#: investors.html.j2:67
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
 "               digital coins from their reserve."
@@ -1259,11 +1248,11 @@ msgstr ""
 "Ermögliche es Kunden digitale Münzen von ihrer Wärungsreserve\n"
 "               abzuheben bzw. bestehende Münzen aufzufrischen."
 
-#: investors.html.j2:68
+#: investors.html.j2:70
 msgid "Accept and validate deposits from merchants."
 msgstr "Annahme und Validierung von Einzahlungen durch Händler."
 
-#: investors.html.j2:70
+#: investors.html.j2:72
 msgid ""
 "Execute wire transfers to merchants in\n"
 "               response to validated deposits."
@@ -1271,7 +1260,7 @@ msgstr ""
 "Durchführung von Banküberweisungen an Händler auf Basis der validierten "
 "Einzahlungen"
 
-#: investors.html.j2:73
+#: investors.html.j2:75
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
 "               correct operation for audits by financial regulators."
@@ -1280,19 +1269,19 @@ msgstr ""
 "              zum korrekten Verhalten der Wechselstube zwecks\n"
 "              Überprüfung durch die Finanzaufsicht."
 
-#: common/navigation.inc.j2:15 merchants.html.j2:3
+#: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Händler"
 
-#: merchants.html.j2:12
+#: merchants.html.j2:14
 msgid "Advantages for merchants"
 msgstr "Vorteile für Händler"
 
-#: merchants.html.j2:16
+#: merchants.html.j2:18
 msgid "Fast"
 msgstr "Schnell"
 
-#: merchants.html.j2:18
+#: merchants.html.j2:20
 msgid ""
 "Processing transactions with Taler is fast, allowing you\n"
 "\t     to confirm the transaction with your customer virtually "
@@ -1319,7 +1308,7 @@ msgstr ""
 "\t     Kreditkarten aufgrund psychologischen Mehraufwands auf Seiten des\n"
 "\t     Kunden kaum durchführbar wären."
 
-#: merchants.html.j2:29
+#: merchants.html.j2:31
 msgid ""
 "You never learn sensitive customer information. You need\n"
 "\t     to ensure that your website provides the correct account "
@@ -1358,11 +1347,11 @@ msgstr ""
 "\t     kryptographisch signierten Verträgen, welche im Falle von\n"
 "\t     Streitigkeiten vor Gericht geltend gemacht werden können."
 
-#: merchants.html.j2:42
+#: merchants.html.j2:44
 msgid "Free Software"
 msgstr "Freie Software"
 
-#: merchants.html.j2:44
+#: merchants.html.j2:46
 msgid ""
 "Taler is free software, and you can use the\n"
 "\t     liberally-licensed reference code as a starting point to integrate"
@@ -1383,11 +1372,11 @@ msgstr ""
 "\t     ziehen können, welche Ihnen beim Integrationsvorgang zur\n"
 "\t     Seite stehen."
 
-#: merchants.html.j2:54
+#: merchants.html.j2:56
 msgid "Low Fees"
 msgstr "Niedrige Gebühren"
 
-#: merchants.html.j2:56
+#: merchants.html.j2:58
 msgid ""
 "Taler is designed to minimize the work the exchange needs to\n"
 "\t     perform.  Combined with Taler's strong security which prevents "
@@ -1410,11 +1399,11 @@ msgstr ""
 "\t     Münzanstalt sorgt der Wettbewerb für faire, niedrige\n"
 "\t     Transaktionsgebühren gegenüber Händlern."
 
-#: merchants.html.j2:64
+#: merchants.html.j2:66
 msgid "Flexible"
 msgstr "Flexibel"
 
-#: merchants.html.j2:66
+#: merchants.html.j2:68
 msgid ""
 "Taler can be used for different currencies (such as Euros\n"
 "\t     or US Dollars) and different payment models limited only by what "
@@ -1426,11 +1415,11 @@ msgstr ""
 "\t     Bezahlmodellen eingesetzt werden. Die einzige Beschränkung\n"
 "\t     stellt hierbei der Interaktionsreichtum der Münzanstalt dar."
 
-#: merchants.html.j2:71
+#: merchants.html.j2:73
 msgid "Ethical"
 msgstr "Ethisch"
 
-#: merchants.html.j2:73
+#: merchants.html.j2:75
 msgid ""
 "Taler does not support tax evasion or money laundering, and is\n"
 "             also not a pyramid scheme or speculative investment.  "
@@ -1451,11 +1440,11 @@ msgstr ""
 "\n"
 "\t     Software-Lizenz."
 
-#: merchants.html.j2:81
+#: merchants.html.j2:83
 msgid "Taler as seen by merchants"
 msgstr "Taler aus Händlerperspektive"
 
-#: merchants.html.j2:83
+#: merchants.html.j2:85
 msgid ""
 "Merchants supporting the Taler system need to integrate\n"
 "          some relatively simple logic into their transaction processing\n"
@@ -1470,7 +1459,7 @@ msgstr ""
 "die\n"
 "          ein Händler bei Taler durchfüren muss sind:"
 
-#: merchants.html.j2:92
+#: merchants.html.j2:94
 msgid ""
 "The new logic detects when a customer's system\n"
 "              supports Taler and then needs to send a cryptographically "
@@ -1492,7 +1481,7 @@ msgstr ""
 "              Händler unterstützten Münzanstalten beinhalten.\n"
 "              "
 
-#: merchants.html.j2:100
+#: merchants.html.j2:102
 msgid ""
 "The customer sends a signed response which states\n"
 "               that certain digital coins now belong to the merchant to "
@@ -1508,7 +1497,7 @@ msgstr ""
 "               die Akzeptanz des Vertrages als auch die\n"
 "               Bezahlung der Rechnung immer gleichzeitig (unten)."
 
-#: merchants.html.j2:105
+#: merchants.html.j2:107
 msgid ""
 "The merchant then forwards the signed messages\n"
 "               received from the customer to the exchange, together with "
@@ -1533,7 +1522,7 @@ msgstr ""
 "               Signatur, schickt eine Bestätigung an den Kunden und\n"
 "               führt seine vertragsspezifische Geschäftslogik aus."
 
-#: merchants.html.j2:113
+#: merchants.html.j2:115
 msgid ""
 "The exchange performs wire transfers corresponding to\n"
 "               the claims deposited by the merchant. Note that the "
@@ -1553,7 +1542,7 @@ msgstr ""
 "               einschränken können, z.B. durch Angabe einer Obergrenze\n"
 "               für die Transaktionskosten."
 
-#: merchants.html.j2:123
+#: merchants.html.j2:125
 msgid "Manuals for merchants"
 msgstr "Handbücher für Händler"
 
@@ -1561,27 +1550,18 @@ msgstr "Handbücher für Händler"
 msgid "Wallet"
 msgstr ""
 
-#: common/footer.inc.j2:3
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free "
-"Software</a> only."
-msgstr ""
-"Diese Seite wurde allein durch Einsatz von <a "
-"href='https://www.gnu.org/'>Freier Software</a> erstellt."
+#~ msgid ""
+#~ msgstr ""
 
-#: common/navigation.inc.j2:12
-msgid "Home"
-msgstr "Home"
+#~ msgid "Home"
+#~ msgstr "Home"
 
-#: common/navigation.inc.j2:13
-msgid "Demo"
-msgstr "Demo"
+#~ msgid "Demo"
+#~ msgstr "Demo"
 
-#: common/navigation.inc.j2:17
-msgid "Operators"
-msgstr "Betreiber"
+#~ msgid "Operators"
+#~ msgstr "Betreiber"
 
-#: common/navigation.inc.j2:19
-msgid "About&nbsp;us"
-msgstr "Über uns"
+#~ msgid "About&nbsp;us"
+#~ msgstr "Über uns"
 
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 06ca337e..1837f597 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 20:35+0100\n"
+"POT-Creation-Date: 2017-01-30 19:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -14,115 +14,115 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
-#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
-#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
-#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
-#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
-#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
-#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
-#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
-#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
-#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118
+#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11
+#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7
+#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7
+#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2
+#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101
+#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11
+#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7
+#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7
+#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7
 #: wallet.html.j2:112 wallet.html.j2:194
 msgid "en"
 msgstr ""
 
-#: about.html.j2:3 citizens.html.j2:3 developers.html.j2:3
-#: financial-news.html.j2:5 governments.html.j2:3 index.html.j2:3
-#: investors.html.j2:3 merchants.html.j2:3 news.html.j2:3 wallet.html.j2:5
+#: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
+#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
+#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
-#: about.html.j2:3 about.html.j2:12
+#: about.html.j2:5 about.html.j2:14
 msgid "About us"
 msgstr ""
 
-#: about.html.j2:20
+#: about.html.j2:22
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
 
-#: about.html.j2:25
+#: about.html.j2:27
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
 " industries, …."
 msgstr ""
 
-#: about.html.j2:30
+#: about.html.j2:32
 msgid "CFO"
 msgstr ""
 
-#: about.html.j2:37
+#: about.html.j2:39
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr ""
 
-#: about.html.j2:42
+#: about.html.j2:44
 msgid "Theoretical foundations."
 msgstr ""
 
-#: about.html.j2:47
+#: about.html.j2:49
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
-#: about.html.j2:54
+#: about.html.j2:56
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:59
+#: about.html.j2:61
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:64 about.html.j2:79
+#: about.html.j2:66 about.html.j2:81
 msgid "Software engineer."
 msgstr ""
 
-#: about.html.j2:71
+#: about.html.j2:73
 msgid "Sustainable business development."
 msgstr ""
 
-#: about.html.j2:75
+#: about.html.j2:77
 msgid "Software engineer. Works on libebics."
 msgstr ""
 
-#: about.html.j2:85
+#: about.html.j2:87
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: about.html.j2:89 about.html.j2:93
+#: about.html.j2:91 about.html.j2:95
 msgid "Translator (Italian)"
 msgstr ""
 
-#: about.html.j2:99
+#: about.html.j2:101
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:103
+#: about.html.j2:105
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:107
+#: about.html.j2:109
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:113
+#: about.html.j2:115
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
-#: citizens.html.j2:3 common/navigation.inc.j2:14
+#: citizens.html.j2:5
 msgid "Citizens"
 msgstr ""
 
-#: citizens.html.j2:12
+#: citizens.html.j2:14
 msgid "Advantages for citizens"
 msgstr ""
 
-#: citizens.html.j2:19
+#: citizens.html.j2:21
 msgid "Security"
 msgstr ""
 
-#: citizens.html.j2:21
+#: citizens.html.j2:23
 msgid ""
 "Taler is the electronic equivalent of cash, except harder to fake.\n"
 "             If your digital wallet is lost -- say because\n"
@@ -137,11 +137,11 @@ msgid ""
 "manually count coins."
 msgstr ""
 
-#: citizens.html.j2:30
+#: citizens.html.j2:32
 msgid "Privacy"
 msgstr ""
 
-#: citizens.html.j2:32
+#: citizens.html.j2:34
 msgid ""
 "Your transactions are private, neither the exchange nor merchant needs to"
 "\n"
@@ -153,11 +153,11 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: citizens.html.j2:40
+#: citizens.html.j2:42
 msgid "Convenience"
 msgstr ""
 
-#: citizens.html.j2:42
+#: citizens.html.j2:44
 msgid ""
 "You will be able to withdraw digital coins to replenish your wallet using"
 "\n"
@@ -166,11 +166,11 @@ msgid ""
 "             cash today."
 msgstr ""
 
-#: citizens.html.j2:47
+#: citizens.html.j2:49
 msgid "Stability "
 msgstr ""
 
-#: citizens.html.j2:49
+#: citizens.html.j2:51
 msgid ""
 "Coins in your digital wallet will be of the same denomination as the\n"
 "             cash in your physical wallet. So you will not have to worry "
@@ -182,11 +182,11 @@ msgid ""
 "             wallet at the same time."
 msgstr ""
 
-#: citizens.html.j2:57
+#: citizens.html.j2:59
 msgid "Taler as seen by customers"
 msgstr ""
 
-#: citizens.html.j2:59
+#: citizens.html.j2:61
 msgid ""
 "Customers interact with the Taler system mostly using\n"
 "          a free wallet implementation, which may be an extension or "
@@ -196,7 +196,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: citizens.html.j2:68
+#: citizens.html.j2:70
 msgid ""
 "The customer selects an exchange (i.e. by visiting the\n"
 "              respective website or selecting from a list of exchanges in"
@@ -211,7 +211,7 @@ msgid ""
 "              a SEPA account number)."
 msgstr ""
 
-#: citizens.html.j2:77
+#: citizens.html.j2:79
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange "
@@ -219,7 +219,7 @@ msgid ""
 "               these instructions provided by the wallet (top left)."
 msgstr ""
 
-#: citizens.html.j2:81
+#: citizens.html.j2:83
 msgid ""
 "Once the funds have arrived, the wallet will\n"
 "               automatically withdraw the electronic coins.  The\n"
@@ -230,7 +230,7 @@ msgid ""
 "               coins against hardware failures."
 msgstr ""
 
-#: citizens.html.j2:87
+#: citizens.html.j2:89
 msgid ""
 "When visiting a merchant that supports Taler,\n"
 "               an additional payment option for Taler is enabled in the "
@@ -245,19 +245,19 @@ msgid ""
 "               review by the customer, or even use in court."
 msgstr ""
 
-#: common/navigation.inc.j2:18 developers.html.j2:3
+#: developers.html.j2:5
 msgid "Developers"
 msgstr ""
 
-#: developers.html.j2:12
+#: developers.html.j2:14
 msgid "Taler for developers"
 msgstr ""
 
-#: developers.html.j2:18
+#: developers.html.j2:20
 msgid "Free"
 msgstr ""
 
-#: developers.html.j2:20
+#: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
 "            protocol. Anybody is welcome to inspect our code and\n"
@@ -273,11 +273,11 @@ msgid ""
 "          "
 msgstr ""
 
-#: developers.html.j2:34
+#: developers.html.j2:36
 msgid "RESTful"
 msgstr ""
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
 "\t    ensure that Taler payments can work with restrictive\n"
@@ -292,11 +292,11 @@ msgid ""
 "          "
 msgstr ""
 
-#: developers.html.j2:51
+#: developers.html.j2:53
 msgid "Code"
 msgstr ""
 
-#: developers.html.j2:53
+#: developers.html.j2:55
 msgid ""
 "Taler is currently primarily developed by a\n"
 "\t    research team at Inria and TU Munich. However,\n"
@@ -309,11 +309,11 @@ msgid ""
 "          "
 msgstr ""
 
-#: developers.html.j2:64
+#: developers.html.j2:66
 msgid "Documentation"
 msgstr ""
 
-#: developers.html.j2:66
+#: developers.html.j2:68
 msgid ""
 "In addition to this website,\n"
 "            the <a href='https://git.taler.net/'>documented\n"
@@ -324,11 +324,11 @@ msgid ""
 "          "
 msgstr ""
 
-#: developers.html.j2:75
+#: developers.html.j2:77
 msgid "Discussion"
 msgstr ""
 
-#: developers.html.j2:77
+#: developers.html.j2:79
 msgid ""
 "We have a mailinglist for developer discussions.\n"
 "            You can subscribe to it or read the list archive at\n"
@@ -336,11 +336,11 @@ msgid ""
 "href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgstr ""
 
-#: developers.html.j2:85
+#: developers.html.j2:87
 msgid "Regression Testing"
 msgstr ""
 
-#: developers.html.j2:87
+#: developers.html.j2:89
 msgid ""
 "We\n"
 "            have <a href='https://buildbot.net/'>Buildbot</a>\n"
@@ -351,11 +351,11 @@ msgid ""
 "          "
 msgstr ""
 
-#: developers.html.j2:95
+#: developers.html.j2:97
 msgid "Code Coverage Analysis"
 msgstr ""
 
-#: developers.html.j2:97
+#: developers.html.j2:99
 msgid ""
 "We\n"
 "            use <a "
@@ -366,11 +366,11 @@ msgid ""
 "          "
 msgstr ""
 
-#: developers.html.j2:105
+#: developers.html.j2:107
 msgid "Performance Analysis"
 msgstr ""
 
-#: developers.html.j2:107
+#: developers.html.j2:109
 msgid ""
 "We\n"
 "            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
@@ -379,11 +379,11 @@ msgid ""
 "          "
 msgstr ""
 
-#: developers.html.j2:116
+#: developers.html.j2:118
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:118
+#: developers.html.j2:120
 msgid ""
 "The Taler system consists of protocols executed\n"
 "          among a number of actors with the help\n"
@@ -393,7 +393,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: developers.html.j2:127
+#: developers.html.j2:129
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange\n"
@@ -404,7 +404,7 @@ msgid ""
 "             "
 msgstr ""
 
-#: developers.html.j2:135
+#: developers.html.j2:137
 msgid ""
 "Once the exchange has received the\n"
 "               transfer, it allows the customer's electronic wallet\n"
@@ -421,7 +421,7 @@ msgid ""
 "             "
 msgstr ""
 
-#: developers.html.j2:148
+#: developers.html.j2:150
 msgid ""
 "Once the customer has the digital coins in\n"
 "               his wallet, the wallet can be used to <b>spend</b> the\n"
@@ -441,7 +441,7 @@ msgid ""
 "             "
 msgstr ""
 
-#: developers.html.j2:165
+#: developers.html.j2:167
 msgid ""
 "Merchants receiving digital\n"
 "               coins <b>deposit</b> the respective receipts that\n"
@@ -461,7 +461,7 @@ msgid ""
 "             "
 msgstr ""
 
-#: developers.html.j2:182
+#: developers.html.j2:184
 msgid ""
 "Finally, the exchange transfers funds\n"
 "               corresponding to the digital coins redeemed by the\n"
@@ -474,7 +474,7 @@ msgid ""
 "             "
 msgstr ""
 
-#: developers.html.j2:192
+#: developers.html.j2:194
 msgid ""
 "Most importantly, the exchange keeps\n"
 "               cryptographic proofs that allow it to demonstrate that\n"
@@ -487,7 +487,7 @@ msgid ""
 "             "
 msgstr ""
 
-#: developers.html.j2:202
+#: developers.html.j2:204
 msgid ""
 "Without the auditor, the exchange operators\n"
 "               could embezzle funds they are holding in\n"
@@ -504,19 +504,19 @@ msgstr ""
 msgid "Financial News"
 msgstr ""
 
-#: common/navigation.inc.j2:16 governments.html.j2:3
+#: governments.html.j2:5
 msgid "Governments"
 msgstr ""
 
-#: governments.html.j2:12
+#: governments.html.j2:14
 msgid "Advantages for governments"
 msgstr ""
 
-#: governments.html.j2:19 index.html.j2:23
+#: governments.html.j2:21 index.html.j2:25
 msgid "Taxable"
 msgstr ""
 
-#: governments.html.j2:21
+#: governments.html.j2:23
 msgid ""
 "Taler is an electronic payment system that was built with the goal of "
 "supporting taxation.\n"
@@ -530,11 +530,11 @@ msgid ""
 "             black markets less viable."
 msgstr ""
 
-#: governments.html.j2:28 investors.html.j2:26 merchants.html.j2:27
+#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
 msgid "Secure"
 msgstr ""
 
-#: governments.html.j2:30
+#: governments.html.j2:32
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, "
 "merchants and\n"
@@ -550,11 +550,11 @@ msgid ""
 "to fraud."
 msgstr ""
 
-#: governments.html.j2:40 index.html.j2:37
+#: governments.html.j2:42 index.html.j2:39
 msgid "Libre"
 msgstr ""
 
-#: governments.html.j2:42
+#: governments.html.j2:44
 msgid ""
 "Taler is free software implementing an open protocol standard.  Thus, "
 "Taler will\n"
@@ -563,11 +563,11 @@ msgid ""
 "             global political and financial stability today."
 msgstr ""
 
-#: governments.html.j2:47 investors.html.j2:16
+#: governments.html.j2:49 investors.html.j2:18
 msgid "Efficient"
 msgstr ""
 
-#: governments.html.j2:49
+#: governments.html.j2:51
 msgid ""
 "Taler is designed to be efficient.  Unlike timeline-based payment systems"
 " like\n"
@@ -576,11 +576,11 @@ msgid ""
 "             (significantly) contribute to environmental pollution."
 msgstr ""
 
-#: governments.html.j2:55
+#: governments.html.j2:57
 msgid "Taler as seen by governments"
 msgstr ""
 
-#: governments.html.j2:57
+#: governments.html.j2:59
 msgid ""
 "Governments can observe traditional wire\n"
 "          transfers entering and leaving the Taler system, and\n"
@@ -593,7 +593,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: governments.html.j2:69
+#: governments.html.j2:71
 msgid ""
 "From the banking system:\n"
 "              The total amount of digital currency\n"
@@ -602,14 +602,14 @@ msgid ""
 "              withdraw within a given timeframe."
 msgstr ""
 
-#: governments.html.j2:75
+#: governments.html.j2:77
 msgid ""
 "From the banking system:\n"
 "               The total amount of income received\n"
 "               by any merchant via the Taler system."
 msgstr ""
 
-#: governments.html.j2:79
+#: governments.html.j2:81
 msgid ""
 "From auditing the exchange:\n"
 "               The amounts of digital coins legitimately withdrawn by\n"
@@ -622,7 +622,7 @@ msgid ""
 "               the income of the exchange from transaction fees."
 msgstr ""
 
-#: governments.html.j2:86
+#: governments.html.j2:88
 msgid ""
 "From auditing merchants:\n"
 "               For each deposit operation, the exact details of the\n"
@@ -638,21 +638,21 @@ msgid ""
 "               identity from the information that Taler collects."
 msgstr ""
 
-#: index.html.j2:15
+#: index.html.j2:17
 msgid "Electronic payments for a liberal society!"
 msgstr ""
 
-#: index.html.j2:16
+#: index.html.j2:18
 msgid ""
 "Taler is a new electronic payment system under development\n"
-"\t    at <a href='http://www.inria.fr/'>Inria</a>.  Today, this website "
+"\t   at <a href=\"http://www.inria.fr/\">Inria</a>.  Today, this website "
 "only\n"
 "\t    presents the advantages our system is expected to provide.  We "
 "expect to\n"
 "\t    make the payment system operational in 2017."
 msgstr ""
 
-#: index.html.j2:24
+#: index.html.j2:26
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
 "\t     governments can learn their citizen's total income and thus "
@@ -662,11 +662,11 @@ msgid ""
 "\t     mainstream economy, and not the black market."
 msgstr ""
 
-#: index.html.j2:30
+#: index.html.j2:32
 msgid "Anonymous"
 msgstr ""
 
-#: index.html.j2:31
+#: index.html.j2:33
 msgid ""
 "When you pay with Taler, your identity does not have to\n"
 "\t     be revealed to the merchant. The bank, government and exchange "
@@ -675,31 +675,31 @@ msgid ""
 "\t     prove that you paid in court if necessary."
 msgstr ""
 
-#: index.html.j2:38
+#: index.html.j2:40
 msgid ""
-"Taler is free software from <a href='http://www.gnu.org/'>GNU</a> "
-"implementing an open protocol.\n"
+"Taler is free software from <a href=\"http://www.gnu.org/\">the GNU "
+"project</a> implementing an open protocol.\n"
 "\t     Anybody is welcome to inspect our code and integrate our reference"
 "\n"
 "\t     implementation into their applications."
 msgstr ""
 
-#: index.html.j2:45
+#: index.html.j2:47
 msgid "Electronic"
 msgstr ""
 
-#: index.html.j2:46
+#: index.html.j2:48
 msgid ""
 "Taler is designed to work on the Internet. Using a\n"
 "\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
 "\t    integrate with existing Web applications."
 msgstr ""
 
-#: index.html.j2:51
+#: index.html.j2:53
 msgid "Reserves"
 msgstr ""
 
-#: index.html.j2:52
+#: index.html.j2:54
 msgid ""
 "Taler uses an electronic exchange holding financial\n"
 "             reserves in existing currencies. This means that Taler is "
@@ -710,23 +710,23 @@ msgid ""
 "\t     US Dollars, Euros or even BitCoins."
 msgstr ""
 
-#: index.html.j2:59 news.html.j2:3 news.html.j2:12
+#: index.html.j2:61 news.html.j2:5 news.html.j2:14
 msgid "News"
 msgstr ""
 
-#: index.html.j2:60
+#: index.html.j2:62
 msgid "Taler Web payments paper published."
 msgstr ""
 
-#: index.html.j2:61
+#: index.html.j2:63
 msgid "More news »"
 msgstr ""
 
-#: index.html.j2:65
+#: index.html.j2:67
 msgid "Taler technology: About taxability, change and privacy"
 msgstr ""
 
-#: index.html.j2:66
+#: index.html.j2:68
 msgid ""
 "One of the key goals of Taler is to provide anonymity for\n"
 "           citizens buying goods and services, while ensuring that the "
@@ -743,7 +743,7 @@ msgid ""
 "         "
 msgstr ""
 
-#: index.html.j2:75
+#: index.html.j2:77
 msgid ""
 "As a result, Taler does not intrude into the\n"
 "           personal economic domain, offers good privacy, taxability\n"
@@ -751,15 +751,15 @@ msgid ""
 "         "
 msgstr ""
 
-#: investors.html.j2:3
+#: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
-#: investors.html.j2:12
+#: investors.html.j2:14
 msgid "Operate a Taler exchange!"
 msgstr ""
 
-#: investors.html.j2:18
+#: investors.html.j2:20
 msgid ""
 "Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
 "             EdDSA) and is thus expected to be able to handle large "
@@ -773,7 +773,7 @@ msgid ""
 "             transaction volume)."
 msgstr ""
 
-#: investors.html.j2:28
+#: investors.html.j2:30
 msgid ""
 "All transactions in Taler are secured using modern cryptography and\n"
 "             trust in all parties is minimized. Financial damage is "
@@ -787,11 +787,11 @@ msgid ""
 "             participants were honest."
 msgstr ""
 
-#: investors.html.j2:37
+#: investors.html.j2:39
 msgid "Business model"
 msgstr ""
 
-#: investors.html.j2:39
+#: investors.html.j2:41
 msgid ""
 "The basic business model for Taler is the operation of an exchange.  An "
 "exchange converts money from traditional payment systems (Mastercard,\n"
@@ -807,11 +807,11 @@ msgid ""
 "transactions."
 msgstr ""
 
-#: investors.html.j2:48
+#: investors.html.j2:50
 msgid "Taler as seen by the exchange operator"
 msgstr ""
 
-#: investors.html.j2:50
+#: investors.html.j2:52
 msgid ""
 "The exchange operator primarily operates a Web service\n"
 "          portal and keeps databases with transaction details and\n"
@@ -824,47 +824,47 @@ msgid ""
 "        "
 msgstr ""
 
-#: investors.html.j2:62
+#: investors.html.j2:64
 msgid ""
 "Create a <b>reserve</b> based on an incoming\n"
 "              wire transfer from a customer."
 msgstr ""
 
-#: investors.html.j2:65
+#: investors.html.j2:67
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
 "               digital coins from their reserve."
 msgstr ""
 
-#: investors.html.j2:68
+#: investors.html.j2:70
 msgid "Accept and validate deposits from merchants."
 msgstr ""
 
-#: investors.html.j2:70
+#: investors.html.j2:72
 msgid ""
 "Execute wire transfers to merchants in\n"
 "               response to validated deposits."
 msgstr ""
 
-#: investors.html.j2:73
+#: investors.html.j2:75
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
 "               correct operation for audits by financial regulators."
 msgstr ""
 
-#: common/navigation.inc.j2:15 merchants.html.j2:3
+#: merchants.html.j2:5
 msgid "Merchants"
 msgstr ""
 
-#: merchants.html.j2:12
+#: merchants.html.j2:14
 msgid "Advantages for merchants"
 msgstr ""
 
-#: merchants.html.j2:16
+#: merchants.html.j2:18
 msgid "Fast"
 msgstr ""
 
-#: merchants.html.j2:18
+#: merchants.html.j2:20
 msgid ""
 "Processing transactions with Taler is fast, allowing you\n"
 "\t     to confirm the transaction with your customer virtually "
@@ -880,7 +880,7 @@ msgid ""
 "\t     payments due to the mental overhead for customers."
 msgstr ""
 
-#: merchants.html.j2:29
+#: merchants.html.j2:31
 msgid ""
 "You never learn sensitive customer information. You need\n"
 "\t     to ensure that your website provides the correct account "
@@ -903,11 +903,11 @@ msgid ""
 "\t     case of disputes."
 msgstr ""
 
-#: merchants.html.j2:42
+#: merchants.html.j2:44
 msgid "Free Software"
 msgstr ""
 
-#: merchants.html.j2:44
+#: merchants.html.j2:46
 msgid ""
 "Taler is free software, and you can use the\n"
 "\t     liberally-licensed reference code as a starting point to integrate"
@@ -920,11 +920,11 @@ msgid ""
 "\t     integration."
 msgstr ""
 
-#: merchants.html.j2:54
+#: merchants.html.j2:56
 msgid "Low Fees"
 msgstr ""
 
-#: merchants.html.j2:56
+#: merchants.html.j2:58
 msgid ""
 "Taler is designed to minimize the work the exchange needs to\n"
 "\t     perform.  Combined with Taler's strong security which prevents "
@@ -938,11 +938,11 @@ msgid ""
 "\t     merchants."
 msgstr ""
 
-#: merchants.html.j2:64
+#: merchants.html.j2:66
 msgid "Flexible"
 msgstr ""
 
-#: merchants.html.j2:66
+#: merchants.html.j2:68
 msgid ""
 "Taler can be used for different currencies (such as Euros\n"
 "\t     or US Dollars) and different payment models limited only by what "
@@ -950,11 +950,11 @@ msgid ""
 "\t     exchange supports in its interactions."
 msgstr ""
 
-#: merchants.html.j2:71
+#: merchants.html.j2:73
 msgid "Ethical"
 msgstr ""
 
-#: merchants.html.j2:73
+#: merchants.html.j2:75
 msgid ""
 "Taler does not support tax evasion or money laundering, and is\n"
 "             also not a pyramid scheme or speculative investment.  "
@@ -965,11 +965,11 @@ msgid ""
 "             reference implementations."
 msgstr ""
 
-#: merchants.html.j2:81
+#: merchants.html.j2:83
 msgid "Taler as seen by merchants"
 msgstr ""
 
-#: merchants.html.j2:83
+#: merchants.html.j2:85
 msgid ""
 "Merchants supporting the Taler system need to integrate\n"
 "          some relatively simple logic into their transaction processing\n"
@@ -978,7 +978,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: merchants.html.j2:92
+#: merchants.html.j2:94
 msgid ""
 "The new logic detects when a customer's system\n"
 "              supports Taler and then needs to send a cryptographically "
@@ -992,7 +992,7 @@ msgid ""
 "              the merchant is willing to deal with."
 msgstr ""
 
-#: merchants.html.j2:100
+#: merchants.html.j2:102
 msgid ""
 "The customer sends a signed response which states\n"
 "               that certain digital coins now belong to the merchant to "
@@ -1002,7 +1002,7 @@ msgid ""
 "               amount (bottom)."
 msgstr ""
 
-#: merchants.html.j2:105
+#: merchants.html.j2:107
 msgid ""
 "The merchant then forwards the signed messages\n"
 "               received from the customer to the exchange, together with "
@@ -1016,7 +1016,7 @@ msgid ""
 "               customer and executes the contract-specific business logic."
 msgstr ""
 
-#: merchants.html.j2:113
+#: merchants.html.j2:115
 msgid ""
 "The exchange performs wire transfers corresponding to\n"
 "               the claims deposited by the merchant. Note that the "
@@ -1029,7 +1029,7 @@ msgid ""
 "               deposit fees."
 msgstr ""
 
-#: merchants.html.j2:123
+#: merchants.html.j2:125
 msgid "Manuals for merchants"
 msgstr ""
 
@@ -1037,25 +1037,18 @@ msgstr ""
 msgid "Wallet"
 msgstr ""
 
-#: common/footer.inc.j2:3
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free "
-"Software</a> only."
-msgstr ""
+#~ msgid ""
+#~ msgstr ""
 
-#: common/navigation.inc.j2:12
-msgid "Home"
-msgstr ""
+#~ msgid "Home"
+#~ msgstr ""
 
-#: common/navigation.inc.j2:13
-msgid "Demo"
-msgstr ""
+#~ msgid "Demo"
+#~ msgstr ""
 
-#: common/navigation.inc.j2:17
-msgid "Operators"
-msgstr ""
+#~ msgid "Operators"
+#~ msgstr ""
 
-#: common/navigation.inc.j2:19
-msgid "About&nbsp;us"
-msgstr ""
+#~ msgid "About&nbsp;us"
+#~ msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 561240c2..84a36c3c 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 20:35+0100\n"
+"POT-Creation-Date: 2017-01-30 19:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: es\n"
@@ -14,31 +14,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
-#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
-#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
-#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
-#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
-#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
-#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
-#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
-#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
-#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118
+#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11
+#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7
+#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7
+#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2
+#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101
+#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11
+#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7
+#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7
+#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7
 #: wallet.html.j2:112 wallet.html.j2:194
 msgid "en"
 msgstr "es"
 
-#: about.html.j2:3 citizens.html.j2:3 developers.html.j2:3
-#: financial-news.html.j2:5 governments.html.j2:3 index.html.j2:3
-#: investors.html.j2:3 merchants.html.j2:3 news.html.j2:3 wallet.html.j2:5
+#: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
+#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
+#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
-#: about.html.j2:3 about.html.j2:12
+#: about.html.j2:5 about.html.j2:14
 msgid "About us"
 msgstr "Quiénes somos"
 
-#: about.html.j2:20
+#: about.html.j2:22
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
@@ -47,101 +47,101 @@ msgstr ""
 "Megalómano local. Es decir, ¿quién querría crear un nuevo sistema de "
 "pagos y un nuevo Internet?"
 
-#: about.html.j2:25
+#: about.html.j2:27
 #, fuzzy
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
 " industries, …."
 msgstr ""
 
-#: about.html.j2:30
+#: about.html.j2:32
 #, fuzzy
 msgid "CFO"
 msgstr "CFO"
 
-#: about.html.j2:37
+#: about.html.j2:39
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Matemático"
 
-#: about.html.j2:42
+#: about.html.j2:44
 msgid "Theoretical foundations."
 msgstr "Teóricamente mortal"
 
-#: about.html.j2:47
+#: about.html.j2:49
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Entusiasta de la ética"
 
-#: about.html.j2:54
+#: about.html.j2:56
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Mayormente inofensivo"
 
-#: about.html.j2:59
+#: about.html.j2:61
 #, fuzzy
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:64 about.html.j2:79
+#: about.html.j2:66 about.html.j2:81
 #, fuzzy
 msgid "Software engineer."
 msgstr ""
 
-#: about.html.j2:71
+#: about.html.j2:73
 msgid "Sustainable business development."
 msgstr "Concretando pensamiento profundo"
 
-#: about.html.j2:75
+#: about.html.j2:77
 #, fuzzy
 msgid "Software engineer. Works on libebics."
 msgstr "EBICS."
 
-#: about.html.j2:85
+#: about.html.j2:87
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traductoras"
 
-#: about.html.j2:89 about.html.j2:93
+#: about.html.j2:91 about.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traductoras"
 
-#: about.html.j2:99
+#: about.html.j2:101
 #, fuzzy
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:103
+#: about.html.j2:105
 #, fuzzy
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:107
+#: about.html.j2:109
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 "Linux, FreeBSD, sitios web y el gobierno en las sombras, en su tiempo "
 "libre."
 
-#: about.html.j2:113
+#: about.html.j2:115
 #, fuzzy
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
-#: citizens.html.j2:3 common/navigation.inc.j2:14
+#: citizens.html.j2:5
 msgid "Citizens"
 msgstr "Ciudadanos"
 
-#: citizens.html.j2:12
+#: citizens.html.j2:14
 msgid "Advantages for citizens"
 msgstr "Ventajas para los ciudadanos"
 
-#: citizens.html.j2:19
+#: citizens.html.j2:21
 msgid "Security"
 msgstr "Seguridad"
 
-#: citizens.html.j2:21
+#: citizens.html.j2:23
 msgid ""
 "Taler is the electronic equivalent of cash, except harder to fake.\n"
 "             If your digital wallet is lost -- say because\n"
@@ -170,11 +170,11 @@ msgstr ""
 " contar a mano las monedas.\n"
 "          "
 
-#: citizens.html.j2:30
+#: citizens.html.j2:32
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: citizens.html.j2:32
+#: citizens.html.j2:34
 msgid ""
 "Your transactions are private, neither the exchange nor merchant needs to"
 "\n"
@@ -194,11 +194,11 @@ msgstr ""
 "transacción que\n"
 "             confirmaste usando tu billetera electrónica."
 
-#: citizens.html.j2:40
+#: citizens.html.j2:42
 msgid "Convenience"
 msgstr "Conveniencia"
 
-#: citizens.html.j2:42
+#: citizens.html.j2:44
 msgid ""
 "You will be able to withdraw digital coins to replenish your wallet using"
 "\n"
@@ -211,11 +211,11 @@ msgstr ""
 "europeas),\n"
 "       similar a como pagas o retiras efectivo hoy en día."
 
-#: citizens.html.j2:47
+#: citizens.html.j2:49
 msgid "Stability "
 msgstr "Estabilidad"
 
-#: citizens.html.j2:49
+#: citizens.html.j2:51
 msgid ""
 "Coins in your digital wallet will be of the same denomination as the\n"
 "             cash in your physical wallet. So you will not have to worry "
@@ -234,11 +234,11 @@ msgstr ""
 " dinero\n"
 "       de diferentes tipos de moneda al mismo tiempo."
 
-#: citizens.html.j2:57
+#: citizens.html.j2:59
 msgid "Taler as seen by customers"
 msgstr "Taler visto por sus clientes"
 
-#: citizens.html.j2:59
+#: citizens.html.j2:61
 msgid ""
 "Customers interact with the Taler system mostly using\n"
 "          a free wallet implementation, which may be an extension or "
@@ -256,7 +256,7 @@ msgstr ""
 "          Los pasos típicos que realizan los clientes son:\n"
 "        "
 
-#: citizens.html.j2:68
+#: citizens.html.j2:70
 msgid ""
 "The customer selects an exchange (i.e. by visiting the\n"
 "              respective website or selecting from a list of exchanges in"
@@ -282,7 +282,7 @@ msgstr ""
 " detalles\n"
 "      de la emisión (por ej. un número de cuenta SEPA, o CBU)."
 
-#: citizens.html.j2:77
+#: citizens.html.j2:79
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange "
@@ -294,7 +294,7 @@ msgstr ""
 "               con las instrucciones provistas por la billetera (arriba a"
 " la izquierda)."
 
-#: citizens.html.j2:81
+#: citizens.html.j2:83
 msgid ""
 "Once the funds have arrived, the wallet will\n"
 "               automatically withdraw the electronic coins.  The\n"
@@ -313,7 +313,7 @@ msgstr ""
 "electrónico\n"
 "               previendo fallas de hardware."
 
-#: citizens.html.j2:87
+#: citizens.html.j2:89
 msgid ""
 "When visiting a merchant that supports Taler,\n"
 "               an additional payment option for Taler is enabled in the "
@@ -340,19 +340,19 @@ msgstr ""
 "       billetera para una revisión posterior del cliente, o incluso ante "
 "la Justicia."
 
-#: common/navigation.inc.j2:18 developers.html.j2:3
+#: developers.html.j2:5
 msgid "Developers"
 msgstr "Programadores"
 
-#: developers.html.j2:12
+#: developers.html.j2:14
 msgid "Taler for developers"
 msgstr "Taler para programadores"
 
-#: developers.html.j2:18
+#: developers.html.j2:20
 msgid "Free"
 msgstr "Libre"
 
-#: developers.html.j2:20
+#: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
 "            protocol. Anybody is welcome to inspect our code and\n"
@@ -384,11 +384,11 @@ msgstr ""
 "            plataforma de pagos libre.\n"
 "          "
 
-#: developers.html.j2:34
+#: developers.html.j2:36
 msgid "RESTful"
 msgstr " Basado en REST"
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
 "\t    ensure that Taler payments can work with restrictive\n"
@@ -416,11 +416,11 @@ msgstr ""
 "            detalladamente <a href='https://api.taler.net/'>aquí</a>.\n"
 "          "
 
-#: developers.html.j2:51
+#: developers.html.j2:53
 msgid "Code"
 msgstr "Código"
 
-#: developers.html.j2:53
+#: developers.html.j2:55
 msgid ""
 "Taler is currently primarily developed by a\n"
 "\t    research team at Inria and TU Munich. However,\n"
@@ -442,11 +442,11 @@ msgstr ""
 "\t    en <a href='https://git.taler.net/'>GitWeb</a>.\n"
 "          "
 
-#: developers.html.j2:64
+#: developers.html.j2:66
 msgid "Documentation"
 msgstr "Documentación"
 
-#: developers.html.j2:66
+#: developers.html.j2:68
 msgid ""
 "In addition to this website,\n"
 "            the <a href='https://git.taler.net/'>documented\n"
@@ -465,11 +465,11 @@ msgstr ""
 "            próximamente.\n"
 "          "
 
-#: developers.html.j2:75
+#: developers.html.j2:77
 msgid "Discussion"
 msgstr "Debates"
 
-#: developers.html.j2:77
+#: developers.html.j2:79
 msgid ""
 "We have a mailinglist for developer discussions.\n"
 "            You can subscribe to it or read the list archive at\n"
@@ -481,11 +481,11 @@ msgstr ""
 "            <a "
 "href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:85
+#: developers.html.j2:87
 msgid "Regression Testing"
 msgstr "Pruebas de regresión"
 
-#: developers.html.j2:87
+#: developers.html.j2:89
 msgid ""
 "We\n"
 "            have <a href='https://buildbot.net/'>Buildbot</a>\n"
@@ -502,11 +502,11 @@ msgstr ""
 "\n"
 "          "
 
-#: developers.html.j2:95
+#: developers.html.j2:97
 msgid "Code Coverage Analysis"
 msgstr "Análisis de cobertura de código"
 
-#: developers.html.j2:97
+#: developers.html.j2:99
 msgid ""
 "We\n"
 "            use <a "
@@ -522,11 +522,11 @@ msgstr ""
 "            <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:105
+#: developers.html.j2:107
 msgid "Performance Analysis"
 msgstr "Performance"
 
-#: developers.html.j2:107
+#: developers.html.j2:109
 msgid ""
 "We\n"
 "            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
@@ -540,11 +540,11 @@ msgstr ""
 "            <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:116
+#: developers.html.j2:118
 msgid "Taler system overview"
 msgstr "Diagrama general del sistema Taler"
 
-#: developers.html.j2:118
+#: developers.html.j2:120
 msgid ""
 "The Taler system consists of protocols executed\n"
 "          among a number of actors with the help\n"
@@ -560,7 +560,7 @@ msgstr ""
 "          consisten de los siguientes pasos:\n"
 "        "
 
-#: developers.html.j2:127
+#: developers.html.j2:129
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange\n"
@@ -579,7 +579,7 @@ msgstr ""
 "               cambio.\n"
 "             "
 
-#: developers.html.j2:135
+#: developers.html.j2:137
 msgid ""
 "Once the exchange has received the\n"
 "               transfer, it allows the customer's electronic wallet\n"
@@ -611,7 +611,7 @@ msgstr ""
 "               servicio).\n"
 "             "
 
-#: developers.html.j2:148
+#: developers.html.j2:150
 msgid ""
 "Once the customer has the digital coins in\n"
 "               his wallet, the wallet can be used to <b>spend</b> the\n"
@@ -648,7 +648,7 @@ msgstr ""
 "               se ocupa del proceso de obtener cambio).\n"
 "             "
 
-#: developers.html.j2:165
+#: developers.html.j2:167
 msgid ""
 "Merchants receiving digital\n"
 "               coins <b>deposit</b> the respective receipts that\n"
@@ -684,7 +684,7 @@ msgstr ""
 "               revisar que los contratos no sean ilegales).\n"
 "             "
 
-#: developers.html.j2:182
+#: developers.html.j2:184
 msgid ""
 "Finally, the exchange transfers funds\n"
 "               corresponding to the digital coins redeemed by the\n"
@@ -707,7 +707,7 @@ msgstr ""
 "               que se depositaron.\n"
 "             "
 
-#: developers.html.j2:192
+#: developers.html.j2:194
 msgid ""
 "Most importantly, the exchange keeps\n"
 "               cryptographic proofs that allow it to demonstrate that\n"
@@ -730,7 +730,7 @@ msgstr ""
 "               circulación.\n"
 "             "
 
-#: developers.html.j2:202
+#: developers.html.j2:204
 msgid ""
 "Without the auditor, the exchange operators\n"
 "               could embezzle funds they are holding in\n"
@@ -756,19 +756,19 @@ msgstr ""
 msgid "Financial News"
 msgstr ""
 
-#: common/navigation.inc.j2:16 governments.html.j2:3
+#: governments.html.j2:5
 msgid "Governments"
 msgstr "Gobiernos"
 
-#: governments.html.j2:12
+#: governments.html.j2:14
 msgid "Advantages for governments"
 msgstr "Ventajas para los gobiernos"
 
-#: governments.html.j2:19 index.html.j2:23
+#: governments.html.j2:21 index.html.j2:25
 msgid "Taxable"
 msgstr "Imponible"
 
-#: governments.html.j2:21
+#: governments.html.j2:23
 msgid ""
 "Taler is an electronic payment system that was built with the goal of "
 "supporting taxation.\n"
@@ -792,11 +792,11 @@ msgstr ""
 "       haciendo que la evasión impositiva y los mercados negros sean "
 "menos viables."
 
-#: governments.html.j2:28 investors.html.j2:26 merchants.html.j2:27
+#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
 msgid "Secure"
 msgstr "Seguro"
 
-#: governments.html.j2:30
+#: governments.html.j2:32
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, "
 "merchants and\n"
@@ -823,11 +823,11 @@ msgstr ""
 "Taler, que pueda amenazar la economía\n"
 "       debido al fraude."
 
-#: governments.html.j2:40 index.html.j2:37
+#: governments.html.j2:42 index.html.j2:39
 msgid "Libre"
 msgstr "Libre"
 
-#: governments.html.j2:42
+#: governments.html.j2:44
 msgid ""
 "Taler is free software implementing an open protocol standard.  Thus, "
 "Taler will\n"
@@ -841,11 +841,11 @@ msgstr ""
 "que amenaza la estabilidad política y\n"
 "       financiera global hoy día."
 
-#: governments.html.j2:47 investors.html.j2:16
+#: governments.html.j2:49 investors.html.j2:18
 msgid "Efficient"
 msgstr "Eficiente"
 
-#: governments.html.j2:49
+#: governments.html.j2:51
 msgid ""
 "Taler is designed to be efficient.  Unlike timeline-based payment systems"
 " like\n"
@@ -859,11 +859,11 @@ msgstr ""
 "redes eléctricas nacionales ni\n"
 "       contribuye (significativamente) a la contaminación ambiental."
 
-#: governments.html.j2:55
+#: governments.html.j2:57
 msgid "Taler as seen by governments"
 msgstr "Taler desde el punto de vista del gobierno"
 
-#: governments.html.j2:57
+#: governments.html.j2:59
 msgid ""
 "Governments can observe traditional wire\n"
 "          transfers entering and leaving the Taler system, and\n"
@@ -888,7 +888,7 @@ msgstr ""
 "          La información disponible para el gobierno incluye:\n"
 "        "
 
-#: governments.html.j2:69
+#: governments.html.j2:71
 msgid ""
 "From the banking system:\n"
 "              The total amount of digital currency\n"
@@ -902,7 +902,7 @@ msgstr ""
 "       límites a la cantidad de dinero digital que un cliente puede "
 "retirar en un periodo determinado."
 
-#: governments.html.j2:75
+#: governments.html.j2:77
 msgid ""
 "From the banking system:\n"
 "               The total amount of income received\n"
@@ -913,7 +913,7 @@ msgstr ""
 "comerciante\n"
 "               a través del sistema Taler."
 
-#: governments.html.j2:79
+#: governments.html.j2:81
 msgid ""
 "From auditing the exchange:\n"
 "               The amounts of digital coins legitimately withdrawn by\n"
@@ -936,7 +936,7 @@ msgstr ""
 "casa de cambio por\n"
 "       las tasas de transacción realizadas."
 
-#: governments.html.j2:86
+#: governments.html.j2:88
 msgid ""
 "From auditing merchants:\n"
 "               For each deposit operation, the exact details of the\n"
@@ -968,27 +968,21 @@ msgstr ""
 "información que\n"
 "       recolecta Taler."
 
-#: index.html.j2:15
+#: index.html.j2:17
 msgid "Electronic payments for a liberal society!"
 msgstr "¡Pagos electrónicos para una sociedad libre!"
 
-#: index.html.j2:16
+#: index.html.j2:18
 msgid ""
 "Taler is a new electronic payment system under development\n"
-"\t    at <a href='http://www.inria.fr/'>Inria</a>.  Today, this website "
+"\t   at <a href=\"http://www.inria.fr/\">Inria</a>.  Today, this website "
 "only\n"
 "\t    presents the advantages our system is expected to provide.  We "
 "expect to\n"
 "\t    make the payment system operational in 2017."
 msgstr ""
-"Taler es un nuevo sistema de pagos electrónicos en desarrollo\n"
-"\t    en <a href='http://www.inria.fr/'>Inria</a>.  Hoy, este sitio web "
-"sólo\n"
-"\t    presenta las ventajas que nuestro sistema espera ofrecer.  "
-"Estimamos tener operational\n"
-"\t    el sistema en 2017."
 
-#: index.html.j2:24
+#: index.html.j2:26
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
 "\t     governments can learn their citizen's total income and thus "
@@ -1005,11 +999,11 @@ msgstr ""
 "\t     por lo tanto una moneda para la economía oficial y no para el "
 "mercado negro."
 
-#: index.html.j2:30
+#: index.html.j2:32
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: index.html.j2:31
+#: index.html.j2:33
 msgid ""
 "When you pay with Taler, your identity does not have to\n"
 "\t     be revealed to the merchant. The bank, government and exchange "
@@ -1024,25 +1018,20 @@ msgstr ""
 "pagaste,\n"
 "\t     ante la Justicia, si fuera necesario."
 
-#: index.html.j2:38
+#: index.html.j2:40
 msgid ""
-"Taler is free software from <a href='http://www.gnu.org/'>GNU</a> "
-"implementing an open protocol.\n"
+"Taler is free software from <a href=\"http://www.gnu.org/\">the GNU "
+"project</a> implementing an open protocol.\n"
 "\t     Anybody is welcome to inspect our code and integrate our reference"
 "\n"
 "\t     implementation into their applications."
 msgstr ""
-"Taler es software libre de <a href='http://www.gnu.org/'>GNU</a> que "
-"implementa un protocolo abierto.\n"
-"\t     Quien quiera es bienvenido a inspeccionar nuestro código fuente e "
-"integrar nuestra implementación de referencia\n"
-"\t     en sus aplicaciones."
 
-#: index.html.j2:45
+#: index.html.j2:47
 msgid "Electronic"
 msgstr "Electrónico"
 
-#: index.html.j2:46
+#: index.html.j2:48
 msgid ""
 "Taler is designed to work on the Internet. Using a\n"
 "\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
@@ -1053,11 +1042,11 @@ msgstr ""
 "\t    sobre HTTP o HTTPS, Taler es fácil de integrar con las aplicaciones"
 " web existentes."
 
-#: index.html.j2:51
+#: index.html.j2:53
 msgid "Reserves"
 msgstr "Reservas"
 
-#: index.html.j2:52
+#: index.html.j2:54
 msgid ""
 "Taler uses an electronic exchange holding financial\n"
 "             reserves in existing currencies. This means that Taler is "
@@ -1075,23 +1064,23 @@ msgstr ""
 "corresponden con otras monedas\n"
 "\t     existentes hoy en día, como dólares, euros o incluso bitcoins."
 
-#: index.html.j2:59 news.html.j2:3 news.html.j2:12
+#: index.html.j2:61 news.html.j2:5 news.html.j2:14
 msgid "News"
 msgstr ""
 
-#: index.html.j2:60
+#: index.html.j2:62
 msgid "Taler Web payments paper published."
 msgstr "Taler 0.0.0."
 
-#: index.html.j2:61
+#: index.html.j2:63
 msgid "More news »"
 msgstr "Ver más »"
 
-#: index.html.j2:65
+#: index.html.j2:67
 msgid "Taler technology: About taxability, change and privacy"
 msgstr "La tecnología Taler: soporte impositivo, dar cambio y privacidad"
 
-#: index.html.j2:66
+#: index.html.j2:68
 msgid ""
 "One of the key goals of Taler is to provide anonymity for\n"
 "           citizens buying goods and services, while ensuring that the "
@@ -1123,7 +1112,7 @@ msgstr ""
 "           una revisión estatal.\n"
 "         "
 
-#: index.html.j2:75
+#: index.html.j2:77
 msgid ""
 "As a result, Taler does not intrude into the\n"
 "           personal economic domain, offers good privacy, taxability\n"
@@ -1136,15 +1125,15 @@ msgstr ""
 "           para transacciones y la capacidad de dar cambio.\n"
 "         "
 
-#: investors.html.j2:3
+#: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
-#: investors.html.j2:12
+#: investors.html.j2:14
 msgid "Operate a Taler exchange!"
 msgstr "¡Opere una Casa de Cambio Taler!"
 
-#: investors.html.j2:18
+#: investors.html.j2:20
 msgid ""
 "Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
 "             EdDSA) and is thus expected to be able to handle large "
@@ -1167,7 +1156,7 @@ msgstr ""
 "             muy bajas (menores a 1 centavo, con volúmenes de transacción"
 " apropiados)."
 
-#: investors.html.j2:28
+#: investors.html.j2:30
 msgid ""
 "All transactions in Taler are secured using modern cryptography and\n"
 "             trust in all parties is minimized. Financial damage is "
@@ -1192,11 +1181,11 @@ msgstr ""
 "             sistemas comprometidos o en la demostración de que los "
 "participantes actuaron honestamente."
 
-#: investors.html.j2:37
+#: investors.html.j2:39
 msgid "Business model"
 msgstr "Modelo de negocios"
 
-#: investors.html.j2:39
+#: investors.html.j2:41
 msgid ""
 "The basic business model for Taler is the operation of an exchange.  An "
 "exchange converts money from traditional payment systems (Mastercard,\n"
@@ -1225,11 +1214,11 @@ msgstr ""
 "             (al cliente, al comerciante o a ambos) para facilitar las "
 "transacciones."
 
-#: investors.html.j2:48
+#: investors.html.j2:50
 msgid "Taler as seen by the exchange operator"
 msgstr "Taler desde el punto de vista del operador de casa de cambio"
 
-#: investors.html.j2:50
+#: investors.html.j2:52
 msgid ""
 "The exchange operator primarily operates a Web service\n"
 "          portal and keeps databases with transaction details and\n"
@@ -1254,13 +1243,13 @@ msgstr ""
 "          Las interacciones principales de la casa de cambio incluyen:\n"
 "        "
 
-#: investors.html.j2:62
+#: investors.html.j2:64
 msgid ""
 "Create a <b>reserve</b> based on an incoming\n"
 "              wire transfer from a customer."
 msgstr "Crear <b>reservas</b> basadas en un giro o transferencia desde un cliente."
 
-#: investors.html.j2:65
+#: investors.html.j2:67
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
 "               digital coins from their reserve."
@@ -1268,11 +1257,11 @@ msgstr ""
 "Permitir a los clientes retirar (y obtener nuevas) monedas electrónicas "
 "de sus reservas."
 
-#: investors.html.j2:68
+#: investors.html.j2:70
 msgid "Accept and validate deposits from merchants."
 msgstr "Aceptar y validar depósitos de los comerciantes."
 
-#: investors.html.j2:70
+#: investors.html.j2:72
 msgid ""
 "Execute wire transfers to merchants in\n"
 "               response to validated deposits."
@@ -1280,7 +1269,7 @@ msgstr ""
 "Realizar transferencias a los comerciantes en respuesta a sus depósitos "
 "validados."
 
-#: investors.html.j2:73
+#: investors.html.j2:75
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
 "               correct operation for audits by financial regulators."
@@ -1288,19 +1277,19 @@ msgstr ""
 "Preservar y proveer pruebas criptográficas de su correcta operación para\n"
 "            ser auditados por reguladores financieros."
 
-#: common/navigation.inc.j2:15 merchants.html.j2:3
+#: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Comerciantes"
 
-#: merchants.html.j2:12
+#: merchants.html.j2:14
 msgid "Advantages for merchants"
 msgstr "Ventajas para comerciantes"
 
-#: merchants.html.j2:16
+#: merchants.html.j2:18
 msgid "Fast"
 msgstr "Rápido"
 
-#: merchants.html.j2:18
+#: merchants.html.j2:20
 msgid ""
 "Processing transactions with Taler is fast, allowing you\n"
 "\t     to confirm the transaction with your customer virtually "
@@ -1327,7 +1316,7 @@ msgstr ""
 "tarjetas de crédito\n"
 "             debido a la complicación que representaría para los clientes."
 
-#: merchants.html.j2:29
+#: merchants.html.j2:31
 msgid ""
 "You never learn sensitive customer information. You need\n"
 "\t     to ensure that your website provides the correct account "
@@ -1366,11 +1355,11 @@ msgstr ""
 " puede usar en la Justicia en caso de\n"
 "             disputas."
 
-#: merchants.html.j2:42
+#: merchants.html.j2:44
 msgid "Free Software"
 msgstr "Software Libre"
 
-#: merchants.html.j2:44
+#: merchants.html.j2:46
 msgid ""
 "Taler is free software, and you can use the\n"
 "\t     liberally-licensed reference code as a starting point to integrate"
@@ -1392,11 +1381,11 @@ msgstr ""
 "programadores competentes\n"
 "             que ayuden con su integración."
 
-#: merchants.html.j2:54
+#: merchants.html.j2:56
 msgid "Low Fees"
 msgstr "Bajo costo"
 
-#: merchants.html.j2:56
+#: merchants.html.j2:58
 msgid ""
 "Taler is designed to minimize the work the exchange needs to\n"
 "\t     perform.  Combined with Taler's strong security which prevents "
@@ -1420,11 +1409,11 @@ msgstr ""
 "moneda para ofrecer\n"
 "             bajos cargos por el servicio a los comerciantes."
 
-#: merchants.html.j2:64
+#: merchants.html.j2:66
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:66
+#: merchants.html.j2:68
 msgid ""
 "Taler can be used for different currencies (such as Euros\n"
 "\t     or US Dollars) and different payment models limited only by what "
@@ -1436,11 +1425,11 @@ msgstr ""
 "interacciones a las que dé soporte\n"
 "             la casa de moneda elegida."
 
-#: merchants.html.j2:71
+#: merchants.html.j2:73
 msgid "Ethical"
 msgstr "Ético"
 
-#: merchants.html.j2:73
+#: merchants.html.j2:75
 msgid ""
 "Taler does not support tax evasion or money laundering, and is\n"
 "             also not a pyramid scheme or speculative investment.  "
@@ -1458,11 +1447,11 @@ msgstr ""
 "competencia proveyendo\n"
 "             un estándar abierto e implementaciones de software libre."
 
-#: merchants.html.j2:81
+#: merchants.html.j2:83
 msgid "Taler as seen by merchants"
 msgstr "Taler desde el punto de vista del comerciante"
 
-#: merchants.html.j2:83
+#: merchants.html.j2:85
 msgid ""
 "Merchants supporting the Taler system need to integrate\n"
 "          some relatively simple logic into their transaction processing\n"
@@ -1476,7 +1465,7 @@ msgstr ""
 "          Los pasos típicos que realiza el comerciante son:\n"
 "        "
 
-#: merchants.html.j2:92
+#: merchants.html.j2:94
 msgid ""
 "The new logic detects when a customer's system\n"
 "              supports Taler and then needs to send a cryptographically "
@@ -1499,7 +1488,7 @@ msgstr ""
 "moneda con la que\n"
 "              desea operar el comerciante."
 
-#: merchants.html.j2:100
+#: merchants.html.j2:102
 msgid ""
 "The customer sends a signed response which states\n"
 "               that certain digital coins now belong to the merchant to "
@@ -1515,7 +1504,7 @@ msgstr ""
 " de\n"
 "               pago por el monto respectivo (abajo)."
 
-#: merchants.html.j2:105
+#: merchants.html.j2:107
 msgid ""
 "The merchant then forwards the signed messages\n"
 "               received from the customer to the exchange, together with "
@@ -1539,7 +1528,7 @@ msgstr ""
 "               envía confirmación al cliente y ejecuta la lógica de "
 "negocio específica del contrato."
 
-#: merchants.html.j2:113
+#: merchants.html.j2:115
 msgid ""
 "The exchange performs wire transfers corresponding to\n"
 "               the claims deposited by the merchant. Note that the "
@@ -1562,7 +1551,7 @@ msgstr ""
 "por ejemplo definiendo\n"
 "               un límite máximo a las comisiones por depósito."
 
-#: merchants.html.j2:123
+#: merchants.html.j2:125
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
@@ -1571,27 +1560,18 @@ msgstr "Documentation"
 msgid "Wallet"
 msgstr ""
 
-#: common/footer.inc.j2:3
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free "
-"Software</a> only."
-msgstr ""
-"Este sitio fue creado usando <a href='https://www.gnu.org/'>Software "
-"Libre</a> only."
+#~ msgid ""
+#~ msgstr ""
 
-#: common/navigation.inc.j2:12
-msgid "Home"
-msgstr "Inicio"
+#~ msgid "Home"
+#~ msgstr "Inicio"
 
-#: common/navigation.inc.j2:13
-msgid "Demo"
-msgstr "Demo"
+#~ msgid "Demo"
+#~ msgstr "Demo"
 
-#: common/navigation.inc.j2:17
-msgid "Operators"
-msgstr "Inversores"
+#~ msgid "Operators"
+#~ msgstr "Inversores"
 
-#: common/navigation.inc.j2:19
-msgid "About&nbsp;us"
-msgstr "Quiénes somos"
+#~ msgid "About&nbsp;us"
+#~ msgstr "Quiénes somos"
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 357eeb0d..f5ef49d4 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 20:35+0100\n"
+"POT-Creation-Date: 2017-01-30 19:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -14,31 +14,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
-#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
-#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
-#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
-#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
-#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
-#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
-#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
-#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
-#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118
+#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11
+#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7
+#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7
+#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2
+#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101
+#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11
+#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7
+#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7
+#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7
 #: wallet.html.j2:112 wallet.html.j2:194
 msgid "en"
 msgstr "fr"
 
-#: about.html.j2:3 citizens.html.j2:3 developers.html.j2:3
-#: financial-news.html.j2:5 governments.html.j2:3 index.html.j2:3
-#: investors.html.j2:3 merchants.html.j2:3 news.html.j2:3 wallet.html.j2:5
+#: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
+#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
+#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
-#: about.html.j2:3 about.html.j2:12
+#: about.html.j2:5 about.html.j2:14
 msgid "About us"
 msgstr "À&nbsp;propos"
 
-#: about.html.j2:20
+#: about.html.j2:22
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
@@ -47,99 +47,99 @@ msgstr ""
 "Mégalomane local, C'est à dire, qui voudrait créer un nouveau système de "
 "paiement et un nouvel Internet ?"
 
-#: about.html.j2:25
+#: about.html.j2:27
 #, fuzzy
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
 " industries, …."
 msgstr ""
 
-#: about.html.j2:30
+#: about.html.j2:32
 #, fuzzy
 msgid "CFO"
 msgstr "CFO"
 
-#: about.html.j2:37
+#: about.html.j2:39
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "mathématicien"
 
-#: about.html.j2:42
+#: about.html.j2:44
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Fatale (en théorie)"
 
-#: about.html.j2:47
+#: about.html.j2:49
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Enthousiaste Ethique"
 
-#: about.html.j2:54
+#: about.html.j2:56
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Principalement inoffensif"
 
-#: about.html.j2:59
+#: about.html.j2:61
 #, fuzzy
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:64 about.html.j2:79
+#: about.html.j2:66 about.html.j2:81
 msgid "Software engineer."
 msgstr ""
 
-#: about.html.j2:71
+#: about.html.j2:73
 #, fuzzy
 msgid "Sustainable business development."
 msgstr "Basse fréquence"
 
-#: about.html.j2:75
+#: about.html.j2:77
 msgid "Software engineer. Works on libebics."
 msgstr "EBICS."
 
-#: about.html.j2:85
+#: about.html.j2:87
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traductrice"
 
-#: about.html.j2:89 about.html.j2:93
+#: about.html.j2:91 about.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traductrice"
 
-#: about.html.j2:99
+#: about.html.j2:101
 #, fuzzy
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:103
+#: about.html.j2:105
 #, fuzzy
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:107
+#: about.html.j2:109
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
 
-#: about.html.j2:113
+#: about.html.j2:115
 #, fuzzy
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
-#: citizens.html.j2:3 common/navigation.inc.j2:14
+#: citizens.html.j2:5
 msgid "Citizens"
 msgstr "Citoyens"
 
-#: citizens.html.j2:12
+#: citizens.html.j2:14
 msgid "Advantages for citizens"
 msgstr "Avantages pour les citoyens"
 
-#: citizens.html.j2:19
+#: citizens.html.j2:21
 msgid "Security"
 msgstr "Sécurité"
 
-#: citizens.html.j2:21
+#: citizens.html.j2:23
 msgid ""
 "Taler is the electronic equivalent of cash, except harder to fake.\n"
 "             If your digital wallet is lost -- say because\n"
@@ -168,11 +168,11 @@ msgstr ""
 "classique, mais en\n"
 "             ligne et sans avoir à compter manuellement votre monnaie. "
 
-#: citizens.html.j2:30
+#: citizens.html.j2:32
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: citizens.html.j2:32
+#: citizens.html.j2:34
 msgid ""
 "Your transactions are private, neither the exchange nor merchant needs to"
 "\n"
@@ -193,11 +193,11 @@ msgstr ""
 "portefeuille\n"
 "\t     numérique."
 
-#: citizens.html.j2:40
+#: citizens.html.j2:42
 msgid "Convenience"
 msgstr "Avantage"
 
-#: citizens.html.j2:42
+#: citizens.html.j2:44
 msgid ""
 "You will be able to withdraw digital coins to replenish your wallet using"
 "\n"
@@ -212,11 +212,11 @@ msgstr ""
 "\n"
 "\t     liquide aujourd'hui."
 
-#: citizens.html.j2:47
+#: citizens.html.j2:49
 msgid "Stability "
 msgstr "Stabilité"
 
-#: citizens.html.j2:49
+#: citizens.html.j2:51
 msgid ""
 "Coins in your digital wallet will be of the same denomination as the\n"
 "             cash in your physical wallet. So you will not have to worry "
@@ -237,11 +237,11 @@ msgstr ""
 "devises\n"
 "\t     dans votre portefeuille numérique."
 
-#: citizens.html.j2:57
+#: citizens.html.j2:59
 msgid "Taler as seen by customers"
 msgstr "Taler du point de vu des clients"
 
-#: citizens.html.j2:59
+#: citizens.html.j2:61
 msgid ""
 "Customers interact with the Taler system mostly using\n"
 "          a free wallet implementation, which may be an extension or "
@@ -255,7 +255,7 @@ msgstr ""
 "plugin ou extension pour navigateur\n"
 "        ou une application dédiée sur leur ordinateur."
 
-#: citizens.html.j2:68
+#: citizens.html.j2:70
 msgid ""
 "The customer selects an exchange (i.e. by visiting the\n"
 "              respective website or selecting from a list of exchanges in"
@@ -281,7 +281,7 @@ msgstr ""
 " détails du\n"
 "             virement du bureau de change."
 
-#: citizens.html.j2:77
+#: citizens.html.j2:79
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange "
@@ -294,7 +294,7 @@ msgstr ""
 "             les informations fournies par le porte-monnaie (en haur à "
 "gauche)."
 
-#: citizens.html.j2:81
+#: citizens.html.j2:83
 msgid ""
 "Once the funds have arrived, the wallet will\n"
 "               automatically withdraw the electronic coins.  The\n"
@@ -310,7 +310,7 @@ msgstr ""
 "               utiliser le porte-monnaie à tout moment pour connaitre son"
 " contenu."
 
-#: citizens.html.j2:87
+#: citizens.html.j2:89
 msgid ""
 "When visiting a merchant that supports Taler,\n"
 "               an additional payment option for Taler is enabled in the "
@@ -339,19 +339,19 @@ msgstr ""
 "               être revu par le client plus tard, ou même dans un "
 "tribunal."
 
-#: common/navigation.inc.j2:18 developers.html.j2:3
+#: developers.html.j2:5
 msgid "Developers"
 msgstr "Développeurs"
 
-#: developers.html.j2:12
+#: developers.html.j2:14
 msgid "Taler for developers"
 msgstr "Taler pour les développeurs"
 
-#: developers.html.j2:18
+#: developers.html.j2:20
 msgid "Free"
 msgstr "Libre"
 
-#: developers.html.j2:20
+#: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
 "            protocol. Anybody is welcome to inspect our code and\n"
@@ -380,11 +380,11 @@ msgstr ""
 "\t    plateforme de paiement libre.\n"
 "          "
 
-#: developers.html.j2:34
+#: developers.html.j2:36
 msgid "RESTful"
 msgstr "Avec REST"
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
 "\t    ensure that Taler payments can work with restrictive\n"
@@ -412,11 +412,11 @@ msgstr ""
 "\t    détail <a href='https://api.taler.net/'>ici</a>.\n"
 "          "
 
-#: developers.html.j2:51
+#: developers.html.j2:53
 msgid "Code"
 msgstr "Code"
 
-#: developers.html.j2:53
+#: developers.html.j2:55
 msgid ""
 "Taler is currently primarily developed by a\n"
 "\t    research team at Inria and TU Munich. However,\n"
@@ -439,11 +439,11 @@ msgstr ""
 "\t    notre <a href='https://git.taler.net/'>GitWeb</a>.\n"
 "          "
 
-#: developers.html.j2:64
+#: developers.html.j2:66
 msgid "Documentation"
 msgstr "Documentation"
 
-#: developers.html.j2:66
+#: developers.html.j2:68
 msgid ""
 "In addition to this website,\n"
 "            the <a href='https://git.taler.net/'>documented\n"
@@ -460,11 +460,11 @@ msgstr ""
 "\t    prochainement.\n"
 "          "
 
-#: developers.html.j2:75
+#: developers.html.j2:77
 msgid "Discussion"
 msgstr "Discussion"
 
-#: developers.html.j2:77
+#: developers.html.j2:79
 msgid ""
 "We have a mailinglist for developer discussions.\n"
 "            You can subscribe to it or read the list archive at\n"
@@ -476,11 +476,11 @@ msgstr ""
 "            <a "
 "href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:85
+#: developers.html.j2:87
 msgid "Regression Testing"
 msgstr "Tests de régression"
 
-#: developers.html.j2:87
+#: developers.html.j2:89
 msgid ""
 "We\n"
 "            have <a href='https://buildbot.net/'>Buildbot</a>\n"
@@ -497,11 +497,11 @@ msgstr ""
 "\n"
 "          "
 
-#: developers.html.j2:95
+#: developers.html.j2:97
 msgid "Code Coverage Analysis"
 msgstr "Mesure de couverture du code"
 
-#: developers.html.j2:97
+#: developers.html.j2:99
 msgid ""
 "We\n"
 "            use <a "
@@ -518,11 +518,11 @@ msgstr ""
 "            <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:105
+#: developers.html.j2:107
 msgid "Performance Analysis"
 msgstr "Analyse de performances"
 
-#: developers.html.j2:107
+#: developers.html.j2:109
 msgid ""
 "We\n"
 "            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
@@ -538,11 +538,11 @@ msgstr ""
 "            à <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:116
+#: developers.html.j2:118
 msgid "Taler system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:118
+#: developers.html.j2:120
 msgid ""
 "The Taler system consists of protocols executed\n"
 "          among a number of actors with the help\n"
@@ -557,7 +557,7 @@ msgstr ""
 "          transaction typique comporte les étapes suivantes :\n"
 "        "
 
-#: developers.html.j2:127
+#: developers.html.j2:129
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange\n"
@@ -576,7 +576,7 @@ msgstr ""
 "               crée une réserve dans le bureau de change.\n"
 "             "
 
-#: developers.html.j2:135
+#: developers.html.j2:137
 msgid ""
 "Once the exchange has received the\n"
 "               transfer, it allows the customer's electronic wallet\n"
@@ -607,7 +607,7 @@ msgstr ""
 "               prendre comme son service).\n"
 "             "
 
-#: developers.html.j2:148
+#: developers.html.j2:150
 msgid ""
 "Once the customer has the digital coins in\n"
 "               his wallet, the wallet can be used to <b>spend</b> the\n"
@@ -644,7 +644,7 @@ msgstr ""
 "               système se chargant de rendre la monnaie).\n"
 "             "
 
-#: developers.html.j2:165
+#: developers.html.j2:167
 msgid ""
 "Merchants receiving digital\n"
 "               coins <b>deposit</b> the respective receipts that\n"
@@ -682,7 +682,7 @@ msgstr ""
 "               s'engagent pas dans des activités illégales).\n"
 "             "
 
-#: developers.html.j2:182
+#: developers.html.j2:184
 msgid ""
 "Finally, the exchange transfers funds\n"
 "               corresponding to the digital coins redeemed by the\n"
@@ -704,7 +704,7 @@ msgstr ""
 "               individuels effectués.\n"
 "             "
 
-#: developers.html.j2:192
+#: developers.html.j2:194
 msgid ""
 "Most importantly, the exchange keeps\n"
 "               cryptographic proofs that allow it to demonstrate that\n"
@@ -727,7 +727,7 @@ msgstr ""
 "               pièces en circulation.\n"
 "             "
 
-#: developers.html.j2:202
+#: developers.html.j2:204
 msgid ""
 "Without the auditor, the exchange operators\n"
 "               could embezzle funds they are holding in\n"
@@ -753,19 +753,19 @@ msgstr ""
 msgid "Financial News"
 msgstr ""
 
-#: common/navigation.inc.j2:16 governments.html.j2:3
+#: governments.html.j2:5
 msgid "Governments"
 msgstr "Gouvernements"
 
-#: governments.html.j2:12
+#: governments.html.j2:14
 msgid "Advantages for governments"
 msgstr "Avantage pour les gouvernements"
 
-#: governments.html.j2:19 index.html.j2:23
+#: governments.html.j2:21 index.html.j2:25
 msgid "Taxable"
 msgstr "Taxable"
 
-#: governments.html.j2:21
+#: governments.html.j2:23
 msgid ""
 "Taler is an electronic payment system that was built with the goal of "
 "supporting taxation.\n"
@@ -786,11 +786,11 @@ msgstr ""
 " sur leurs revenus, permettant ainsi de diminuer l'évasion fiscale et le "
 "marché noir."
 
-#: governments.html.j2:28 investors.html.j2:26 merchants.html.j2:27
+#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
 msgid "Secure"
 msgstr "Sûr"
 
-#: governments.html.j2:30
+#: governments.html.j2:32
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, "
 "merchants and\n"
@@ -814,11 +814,11 @@ msgstr ""
 " a pas de &quot;fausse monnaie&quot; à l'intérieur du système Taler qui "
 "pourrait menacer l'économie en raison de fraude."
 
-#: governments.html.j2:40 index.html.j2:37
+#: governments.html.j2:42 index.html.j2:39
 msgid "Libre"
 msgstr "Libre"
 
-#: governments.html.j2:42
+#: governments.html.j2:44
 msgid ""
 "Taler is free software implementing an open protocol standard.  Thus, "
 "Taler will\n"
@@ -831,11 +831,11 @@ msgstr ""
 "paiement qui menace la stabilité politique et financière globale "
 "actuellement."
 
-#: governments.html.j2:47 investors.html.j2:16
+#: governments.html.j2:49 investors.html.j2:18
 msgid "Efficient"
 msgstr "Efficace"
 
-#: governments.html.j2:49
+#: governments.html.j2:51
 msgid ""
 "Taler is designed to be efficient.  Unlike timeline-based payment systems"
 " like\n"
@@ -848,11 +848,11 @@ msgstr ""
 "disponibilité des réseaux électriques nationaux ou (de manière "
 "siginifcative) ne participera pas à la pollution environnementale."
 
-#: governments.html.j2:55
+#: governments.html.j2:57
 msgid "Taler as seen by governments"
 msgstr "Taler, du point de vu des gouvernements"
 
-#: governments.html.j2:57
+#: governments.html.j2:59
 msgid ""
 "Governments can observe traditional wire\n"
 "          transfers entering and leaving the Taler system, and\n"
@@ -877,7 +877,7 @@ msgstr ""
 "          Les informations disponibles aux gouvernements incluent :\n"
 "        "
 
-#: governments.html.j2:69
+#: governments.html.j2:71
 msgid ""
 "From the banking system:\n"
 "              The total amount of digital currency\n"
@@ -894,7 +894,7 @@ msgstr ""
 "certain délais.\n"
 "             "
 
-#: governments.html.j2:75
+#: governments.html.j2:77
 msgid ""
 "From the banking system:\n"
 "               The total amount of income received\n"
@@ -904,7 +904,7 @@ msgstr ""
 "               Le montant total reçu par chaque marchant via le système "
 "Taler"
 
-#: governments.html.j2:79
+#: governments.html.j2:81
 msgid ""
 "From auditing the exchange:\n"
 "               The amounts of digital coins legitimately withdrawn by\n"
@@ -925,7 +925,7 @@ msgstr ""
 "correspondants.\n"
 "             "
 
-#: governments.html.j2:86
+#: governments.html.j2:88
 msgid ""
 "From auditing merchants:\n"
 "               For each deposit operation, the exact details of the\n"
@@ -957,28 +957,21 @@ msgstr ""
 "client via les\n"
 "               données collectées par Taler. "
 
-#: index.html.j2:15
+#: index.html.j2:17
 msgid "Electronic payments for a liberal society!"
 msgstr "Paiements électroniques pour une société libre!"
 
-#: index.html.j2:16
+#: index.html.j2:18
 msgid ""
 "Taler is a new electronic payment system under development\n"
-"\t    at <a href='http://www.inria.fr/'>Inria</a>.  Today, this website "
+"\t   at <a href=\"http://www.inria.fr/\">Inria</a>.  Today, this website "
 "only\n"
 "\t    presents the advantages our system is expected to provide.  We "
 "expect to\n"
 "\t    make the payment system operational in 2017."
 msgstr ""
-"Taler est nouveau système de paiement électronique en\n"
-"\t    développement à <a href='http://www.inria.fr/'>Inria</a>. Ce site "
-"web\n"
-"\t    présente aujourd'hui seulement les avantages que notre système doit"
-"\n"
-"\t    fournir. Nous estimons pouvoir rendre le système de\n"
-"\t    paiement operationel en 2017."
 
-#: index.html.j2:24
+#: index.html.j2:26
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
 "\t     governments can learn their citizen's total income and thus "
@@ -995,11 +988,11 @@ msgstr ""
 "\t     impots sur le revenu. Taler est donc une devise pour l'économie\n"
 "\t     dominante officielle et non pour le marché noir."
 
-#: index.html.j2:30
+#: index.html.j2:32
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: index.html.j2:31
+#: index.html.j2:33
 msgid ""
 "When you pay with Taler, your identity does not have to\n"
 "\t     be revealed to the merchant. The bank, government and exchange "
@@ -1016,25 +1009,20 @@ msgstr ""
 "\n"
 "\t     payé par voie légale si nécessaire."
 
-#: index.html.j2:38
+#: index.html.j2:40
 msgid ""
-"Taler is free software from <a href='http://www.gnu.org/'>GNU</a> "
-"implementing an open protocol.\n"
+"Taler is free software from <a href=\"http://www.gnu.org/\">the GNU "
+"project</a> implementing an open protocol.\n"
 "\t     Anybody is welcome to inspect our code and integrate our reference"
 "\n"
 "\t     implementation into their applications."
 msgstr ""
-"Taler est un logiciel libre du <a href='http://www.gnu.org/'>GNU</a> "
-"exécutant un protocole\n"
-"\t     ouvert. Vous pouvez tous inspecter notre code et intégrer notre "
-"mise\n"
-"\t     en oeuvre de référence dans vos applications."
 
-#: index.html.j2:45
+#: index.html.j2:47
 msgid "Electronic"
 msgstr "Électronique"
 
-#: index.html.j2:46
+#: index.html.j2:48
 msgid ""
 "Taler is designed to work on the Internet. Using a\n"
 "\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
@@ -1045,11 +1033,11 @@ msgstr ""
 "à\n"
 "\t    intégrer avec des application Web existantes.."
 
-#: index.html.j2:51
+#: index.html.j2:53
 msgid "Reserves"
 msgstr "Réserve"
 
-#: index.html.j2:52
+#: index.html.j2:54
 msgid ""
 "Taler uses an electronic exchange holding financial\n"
 "             reserves in existing currencies. This means that Taler is "
@@ -1067,24 +1055,24 @@ msgstr ""
 "\t     monnaies existantes, comme le dollar Américain, l'Euro ou même le\n"
 "\t     BitCoin."
 
-#: index.html.j2:59 news.html.j2:3 news.html.j2:12
+#: index.html.j2:61 news.html.j2:5 news.html.j2:14
 msgid "News"
 msgstr ""
 
-#: index.html.j2:60
+#: index.html.j2:62
 #, fuzzy
 msgid "Taler Web payments paper published."
 msgstr "Taler 0.0.0."
 
-#: index.html.j2:61
+#: index.html.j2:63
 msgid "More news »"
 msgstr "En savoir plus »"
 
-#: index.html.j2:65
+#: index.html.j2:67
 msgid "Taler technology: About taxability, change and privacy"
 msgstr "La technologie de Taler: Taxabilité, rendu de monnaie et vie privée"
 
-#: index.html.j2:66
+#: index.html.j2:68
 msgid ""
 "One of the key goals of Taler is to provide anonymity for\n"
 "           citizens buying goods and services, while ensuring that the "
@@ -1116,7 +1104,7 @@ msgstr ""
 "étatique.\n"
 "         "
 
-#: index.html.j2:75
+#: index.html.j2:77
 msgid ""
 "As a result, Taler does not intrude into the\n"
 "           personal economic domain, offers good privacy, taxability\n"
@@ -1128,16 +1116,16 @@ msgstr ""
 "taxabilité\n"
 "         des transactions et la possibilité de rendre la monnaie."
 
-#: investors.html.j2:3
+#: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
-#: investors.html.j2:12
+#: investors.html.j2:14
 #, fuzzy
 msgid "Operate a Taler exchange!"
 msgstr "Investissez dans Taler !"
 
-#: investors.html.j2:18
+#: investors.html.j2:20
 msgid ""
 "Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
 "             EdDSA) and is thus expected to be able to handle large "
@@ -1156,7 +1144,7 @@ msgstr ""
 "\t     transaction importants, seulement limités par les capacités\n"
 "\t     entrée/sortie de la base de donnée."
 
-#: investors.html.j2:28
+#: investors.html.j2:30
 msgid ""
 "All transactions in Taler are secured using modern cryptography and\n"
 "             trust in all parties is minimized. Financial damage is "
@@ -1183,11 +1171,11 @@ msgstr ""
 "les\n"
 "\t     participants sont honnêtes."
 
-#: investors.html.j2:37
+#: investors.html.j2:39
 msgid "Business model"
 msgstr "Business model"
 
-#: investors.html.j2:39
+#: investors.html.j2:41
 msgid ""
 "The basic business model for Taler is the operation of an exchange.  An "
 "exchange converts money from traditional payment systems (Mastercard,\n"
@@ -1217,11 +1205,11 @@ msgstr ""
 "ajouter des frais (au\n"
 "\t     client, commerçant ou au deux) pour faciliter la transaction."
 
-#: investors.html.j2:48
+#: investors.html.j2:50
 msgid "Taler as seen by the exchange operator"
 msgstr "Taler du point de vu de l'exploitant"
 
-#: investors.html.j2:50
+#: investors.html.j2:52
 msgid ""
 "The exchange operator primarily operates a Web service\n"
 "          portal and keeps databases with transaction details and\n"
@@ -1246,13 +1234,13 @@ msgstr ""
 "Les opérations\n"
 "          clées du bureau de change incluent:"
 
-#: investors.html.j2:62
+#: investors.html.j2:64
 msgid ""
 "Create a <b>reserve</b> based on an incoming\n"
 "              wire transfer from a customer."
 msgstr "Création d'une <b>réserve</b> basé sur un transfère banquaire d'un client."
 
-#: investors.html.j2:65
+#: investors.html.j2:67
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
 "               digital coins from their reserve."
@@ -1260,11 +1248,11 @@ msgstr ""
 "Permetre aux utilisateurs de <b>retirer</b> (et rafraichir) des\n"
 "               pièces numériques de leur réserve."
 
-#: investors.html.j2:68
+#: investors.html.j2:70
 msgid "Accept and validate deposits from merchants."
 msgstr "Accepter et valider les dépos de marchands."
 
-#: investors.html.j2:70
+#: investors.html.j2:72
 msgid ""
 "Execute wire transfers to merchants in\n"
 "               response to validated deposits."
@@ -1272,7 +1260,7 @@ msgstr ""
 "Exection des transfères banquaires\n"
 "              vers les marchands en réponse aux dépos validés."
 
-#: investors.html.j2:73
+#: investors.html.j2:75
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
 "               correct operation for audits by financial regulators."
@@ -1281,19 +1269,19 @@ msgstr ""
 "              des opérations requises pour les audits pes les authorités "
 "financières."
 
-#: common/navigation.inc.j2:15 merchants.html.j2:3
+#: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Commerçants"
 
-#: merchants.html.j2:12
+#: merchants.html.j2:14
 msgid "Advantages for merchants"
 msgstr "Avantages pour les marchandes"
 
-#: merchants.html.j2:16
+#: merchants.html.j2:18
 msgid "Fast"
 msgstr "Rapide"
 
-#: merchants.html.j2:18
+#: merchants.html.j2:20
 msgid ""
 "Processing transactions with Taler is fast, allowing you\n"
 "\t     to confirm the transaction with your customer virtually "
@@ -1321,7 +1309,7 @@ msgstr ""
 "\n"
 "\t     pour des raisons culturelles ou sociologiques pour vos clients."
 
-#: merchants.html.j2:29
+#: merchants.html.j2:31
 msgid ""
 "You never learn sensitive customer information. You need\n"
 "\t     to ensure that your website provides the correct account "
@@ -1362,11 +1350,11 @@ msgstr ""
 "pourrez\n"
 "\t     utiliser en cas de litige auprès d'un tribunal."
 
-#: merchants.html.j2:42
+#: merchants.html.j2:44
 msgid "Free Software"
 msgstr "Logiciel Libre"
 
-#: merchants.html.j2:44
+#: merchants.html.j2:46
 msgid ""
 "Taler is free software, and you can use the\n"
 "\t     liberally-licensed reference code as a starting point to integrate"
@@ -1389,11 +1377,11 @@ msgstr ""
 "pour\n"
 "\t     vous aider dans l'intégration."
 
-#: merchants.html.j2:54
+#: merchants.html.j2:56
 msgid "Low Fees"
 msgstr "Faible Coût "
 
-#: merchants.html.j2:56
+#: merchants.html.j2:58
 msgid ""
 "Taler is designed to minimize the work the exchange needs to\n"
 "\t     perform.  Combined with Taler's strong security which prevents "
@@ -1416,11 +1404,11 @@ msgstr ""
 "coûts de\n"
 "\t     transactions honnêtes et faibles pour les commerçants."
 
-#: merchants.html.j2:64
+#: merchants.html.j2:66
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:66
+#: merchants.html.j2:68
 msgid ""
 "Taler can be used for different currencies (such as Euros\n"
 "\t     or US Dollars) and different payment models limited only by what "
@@ -1437,11 +1425,11 @@ msgstr ""
 "coûts de\n"
 "\t     transactions honnêtes et faibles pour les commerçants."
 
-#: merchants.html.j2:71
+#: merchants.html.j2:73
 msgid "Ethical"
 msgstr "Ethique"
 
-#: merchants.html.j2:73
+#: merchants.html.j2:75
 msgid ""
 "Taler does not support tax evasion or money laundering, and is\n"
 "             also not a pyramid scheme or speculative investment.  "
@@ -1460,11 +1448,11 @@ msgstr ""
 "standard\n"
 "\t     ouvert et des références d'installations de logiciels libres."
 
-#: merchants.html.j2:81
+#: merchants.html.j2:83
 msgid "Taler as seen by merchants"
 msgstr "Taler du poit de vu des marchants"
 
-#: merchants.html.j2:83
+#: merchants.html.j2:85
 #, fuzzy
 msgid ""
 "Merchants supporting the Taler system need to integrate\n"
@@ -1474,7 +1462,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: merchants.html.j2:92
+#: merchants.html.j2:94
 #, fuzzy
 msgid ""
 "The new logic detects when a customer's system\n"
@@ -1489,7 +1477,7 @@ msgid ""
 "              the merchant is willing to deal with."
 msgstr ""
 
-#: merchants.html.j2:100
+#: merchants.html.j2:102
 msgid ""
 "The customer sends a signed response which states\n"
 "               that certain digital coins now belong to the merchant to "
@@ -1505,7 +1493,7 @@ msgstr ""
 "validation\n"
 "               du contrat."
 
-#: merchants.html.j2:105
+#: merchants.html.j2:107
 msgid ""
 "The merchant then forwards the signed messages\n"
 "               received from the customer to the exchange, together with "
@@ -1527,7 +1515,7 @@ msgstr ""
 "exchange est valide, envoi\n"
 "               la confirmation au client et execute le contrat."
 
-#: merchants.html.j2:113
+#: merchants.html.j2:115
 msgid ""
 "The exchange performs wire transfers corresponding to\n"
 "               the claims deposited by the merchant. Note that the "
@@ -1549,7 +1537,7 @@ msgstr ""
 "               par exemple en imposant des limites sur les frais qu'ils "
 "acceptent."
 
-#: merchants.html.j2:123
+#: merchants.html.j2:125
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
@@ -1558,26 +1546,18 @@ msgstr "Documentation"
 msgid "Wallet"
 msgstr ""
 
-#: common/footer.inc.j2:3
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free "
-"Software</a> only."
-msgstr ""
+#~ msgid ""
+#~ msgstr ""
 
-#: common/navigation.inc.j2:12
-msgid "Home"
-msgstr "Accueil"
+#~ msgid "Home"
+#~ msgstr "Accueil"
 
-#: common/navigation.inc.j2:13
-msgid "Demo"
-msgstr "Démo"
+#~ msgid "Demo"
+#~ msgstr "Démo"
 
-#: common/navigation.inc.j2:17
-#, fuzzy
-msgid "Operators"
-msgstr "Investisseurs"
+#~ msgid "Operators"
+#~ msgstr "Investisseurs"
 
-#: common/navigation.inc.j2:19
-msgid "About&nbsp;us"
-msgstr "À&nbsp;propos"
+#~ msgid "About&nbsp;us"
+#~ msgstr "À&nbsp;propos"
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 2cce3331..88ee03e4 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 20:35+0100\n"
+"POT-Creation-Date: 2017-01-30 19:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: it\n"
@@ -14,31 +14,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
-#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
-#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
-#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
-#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
-#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
-#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
-#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
-#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
-#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118
+#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11
+#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7
+#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7
+#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2
+#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101
+#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11
+#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7
+#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7
+#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7
 #: wallet.html.j2:112 wallet.html.j2:194
 msgid "en"
 msgstr "it"
 
-#: about.html.j2:3 citizens.html.j2:3 developers.html.j2:3
-#: financial-news.html.j2:5 governments.html.j2:3 index.html.j2:3
-#: investors.html.j2:3 merchants.html.j2:3 news.html.j2:3 wallet.html.j2:5
+#: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
+#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
+#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
-#: about.html.j2:3 about.html.j2:12
+#: about.html.j2:5 about.html.j2:14
 msgid "About us"
 msgstr "Chi siamo"
 
-#: about.html.j2:20
+#: about.html.j2:22
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
@@ -47,100 +47,100 @@ msgstr ""
 "Megalomane locale. Intendo, chi creerebbe un nuovo sistema di pagamento e"
 " una nuova Internet?"
 
-#: about.html.j2:25
+#: about.html.j2:27
 #, fuzzy
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
 " industries, …."
 msgstr ""
 
-#: about.html.j2:30
+#: about.html.j2:32
 #, fuzzy
 msgid "CFO"
 msgstr "CFO"
 
-#: about.html.j2:37
+#: about.html.j2:39
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Matematico"
 
-#: about.html.j2:42
+#: about.html.j2:44
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Teoricamente mortale"
 
-#: about.html.j2:47
+#: about.html.j2:49
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Entusiasta di etica"
 
-#: about.html.j2:54
+#: about.html.j2:56
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Principalmente inoffensivo"
 
-#: about.html.j2:59
+#: about.html.j2:61
 #, fuzzy
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:64 about.html.j2:79
+#: about.html.j2:66 about.html.j2:81
 #, fuzzy
 msgid "Software engineer."
 msgstr ""
 
-#: about.html.j2:71
+#: about.html.j2:73
 msgid "Sustainable business development."
 msgstr "Realizzando pensieri profondi"
 
-#: about.html.j2:75
+#: about.html.j2:77
 #, fuzzy
 msgid "Software engineer. Works on libebics."
 msgstr "EBICS."
 
-#: about.html.j2:85
+#: about.html.j2:87
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traduttrici"
 
-#: about.html.j2:89 about.html.j2:93
+#: about.html.j2:91 about.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traduttrici"
 
-#: about.html.j2:99
+#: about.html.j2:101
 #, fuzzy
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:103
+#: about.html.j2:105
 #, fuzzy
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:107
+#: about.html.j2:109
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Linux, FreeBSD, siti web e il deep state nel tempo libero."
 
-#: about.html.j2:113
+#: about.html.j2:115
 #, fuzzy
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
-#: citizens.html.j2:3 common/navigation.inc.j2:14
+#: citizens.html.j2:5
 msgid "Citizens"
 msgstr "Cittadini"
 
-#: citizens.html.j2:12
+#: citizens.html.j2:14
 msgid "Advantages for citizens"
 msgstr "Vantaggi per i cittadini"
 
-#: citizens.html.j2:19
+#: citizens.html.j2:21
 msgid "Security"
 msgstr "Sicurezza"
 
-#: citizens.html.j2:21
+#: citizens.html.j2:23
 msgid ""
 "Taler is the electronic equivalent of cash, except harder to fake.\n"
 "             If your digital wallet is lost -- say because\n"
@@ -170,11 +170,11 @@ msgstr ""
 "             fatto che sia online ed eviti di contare manualmente le "
 "monete."
 
-#: citizens.html.j2:30
+#: citizens.html.j2:32
 msgid "Privacy"
 msgstr "Privacy"
 
-#: citizens.html.j2:32
+#: citizens.html.j2:34
 msgid ""
 "Your transactions are private, neither the exchange nor merchant needs to"
 "\n"
@@ -194,11 +194,11 @@ msgstr ""
 "usando il tuo\n"
 "\t     portafoglio digitale."
 
-#: citizens.html.j2:40
+#: citizens.html.j2:42
 msgid "Convenience"
 msgstr "Convenienza"
 
-#: citizens.html.j2:42
+#: citizens.html.j2:44
 msgid ""
 "You will be able to withdraw digital coins to replenish your wallet using"
 "\n"
@@ -211,11 +211,11 @@ msgstr ""
 "cui paghi o\n"
 "\t     prelevi contanti normalmente al giorno d'oggi."
 
-#: citizens.html.j2:47
+#: citizens.html.j2:49
 msgid "Stability "
 msgstr "Stabilità"
 
-#: citizens.html.j2:49
+#: citizens.html.j2:51
 msgid ""
 "Coins in your digital wallet will be of the same denomination as the\n"
 "             cash in your physical wallet. So you will not have to worry "
@@ -235,11 +235,11 @@ msgstr ""
 "di diverse\n"
 "\t     valute nel tuo portafoglio digitale."
 
-#: citizens.html.j2:57
+#: citizens.html.j2:59
 msgid "Taler as seen by customers"
 msgstr "Come i clienti vedono Taler"
 
-#: citizens.html.j2:59
+#: citizens.html.j2:61
 msgid ""
 "Customers interact with the Taler system mostly using\n"
 "          a free wallet implementation, which may be an extension or "
@@ -253,7 +253,7 @@ msgstr ""
 "\testensione per il loro browser, sia come una applicazione dedicata.\n"
 "\tLe tipiche operazioni fatte da un cliente sono:"
 
-#: citizens.html.j2:68
+#: citizens.html.j2:70
 msgid ""
 "The customer selects an exchange (i.e. by visiting the\n"
 "              respective website or selecting from a list of exchanges in"
@@ -280,7 +280,7 @@ msgstr ""
 "ufficio cambi\n"
 "\t     (che sarà un conto compatibile con SEPA)."
 
-#: citizens.html.j2:77
+#: citizens.html.j2:79
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange "
@@ -292,7 +292,7 @@ msgstr ""
 "utilizzando\n"
 "\t     le istruzioni create dal suo portafoglio (in alto a sinistra)."
 
-#: citizens.html.j2:81
+#: citizens.html.j2:83
 msgid ""
 "Once the funds have arrived, the wallet will\n"
 "               automatically withdraw the electronic coins.  The\n"
@@ -310,7 +310,7 @@ msgstr ""
 "\t     il suo bilancio. Può anche effettuare copie di sicurezza come\n"
 "\t     prevenzione verso malfunzionamenti o danni alla sua macchina."
 
-#: citizens.html.j2:87
+#: citizens.html.j2:89
 msgid ""
 "When visiting a merchant that supports Taler,\n"
 "               an additional payment option for Taler is enabled in the "
@@ -333,19 +333,19 @@ msgstr ""
 "\t     essere mantenuti nel portafoglio per future revisioni da parte\n"
 "\t     del cliente o persino per essere mostrati durante una causa."
 
-#: common/navigation.inc.j2:18 developers.html.j2:3
+#: developers.html.j2:5
 msgid "Developers"
 msgstr "Sviluppatori"
 
-#: developers.html.j2:12
+#: developers.html.j2:14
 msgid "Taler for developers"
 msgstr "Taler per programmatori"
 
-#: developers.html.j2:18
+#: developers.html.j2:20
 msgid "Free"
 msgstr "Free"
 
-#: developers.html.j2:20
+#: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
 "            protocol. Anybody is welcome to inspect our code and\n"
@@ -374,11 +374,11 @@ msgstr ""
 "\t    questa piattaforma di pagamento free.\n"
 "          "
 
-#: developers.html.j2:34
+#: developers.html.j2:36
 msgid "RESTful"
 msgstr "RESTful"
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
 "\t    ensure that Taler payments can work with restrictive\n"
@@ -406,11 +406,11 @@ msgstr ""
 "\t    dettaglio <a href='https://api.taler.net/'>qui</a>.\n"
 "          "
 
-#: developers.html.j2:51
+#: developers.html.j2:53
 msgid "Code"
 msgstr "Codice"
 
-#: developers.html.j2:53
+#: developers.html.j2:55
 msgid ""
 "Taler is currently primarily developed by a\n"
 "\t    research team at Inria and TU Munich. However,\n"
@@ -433,11 +433,11 @@ msgstr ""
 "\t    <a href='https://git.taler.net/'>GitWeb</a>.\n"
 "          "
 
-#: developers.html.j2:64
+#: developers.html.j2:66
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: developers.html.j2:66
+#: developers.html.j2:68
 msgid ""
 "In addition to this website,\n"
 "            the <a href='https://git.taler.net/'>documented\n"
@@ -455,11 +455,11 @@ msgstr ""
 "\t    che sarà presto pubblicato qui.\n"
 "          "
 
-#: developers.html.j2:75
+#: developers.html.j2:77
 msgid "Discussion"
 msgstr "Discussione"
 
-#: developers.html.j2:77
+#: developers.html.j2:79
 msgid ""
 "We have a mailinglist for developer discussions.\n"
 "            You can subscribe to it or read the list archive at\n"
@@ -471,11 +471,11 @@ msgstr ""
 "            <a "
 "href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:85
+#: developers.html.j2:87
 msgid "Regression Testing"
 msgstr "Test delle regressioni"
 
-#: developers.html.j2:87
+#: developers.html.j2:89
 msgid ""
 "We\n"
 "            have <a href='https://buildbot.net/'>Buildbot</a>\n"
@@ -493,11 +493,11 @@ msgstr ""
 "href='https://buildbot.taler.net/'>buildbot.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:95
+#: developers.html.j2:97
 msgid "Code Coverage Analysis"
 msgstr "Analisi della copertura del codice"
 
-#: developers.html.j2:97
+#: developers.html.j2:99
 msgid ""
 "We\n"
 "            use <a "
@@ -515,11 +515,11 @@ msgstr ""
 "\t    pagina <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:105
+#: developers.html.j2:107
 msgid "Performance Analysis"
 msgstr "Analisi delle prestazioni"
 
-#: developers.html.j2:107
+#: developers.html.j2:109
 msgid ""
 "We\n"
 "            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
@@ -533,11 +533,11 @@ msgstr ""
 "\t    <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
 "          "
 
-#: developers.html.j2:116
+#: developers.html.j2:118
 msgid "Taler system overview"
 msgstr "Schema generale del sistema Taler"
 
-#: developers.html.j2:118
+#: developers.html.j2:120
 msgid ""
 "The Taler system consists of protocols executed\n"
 "          among a number of actors with the help\n"
@@ -553,7 +553,7 @@ msgstr ""
 "\t  compone dei seguenti passaggi:\n"
 "        "
 
-#: developers.html.j2:127
+#: developers.html.j2:129
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
 "               transfer funds from his account to the Taler exchange\n"
@@ -575,7 +575,7 @@ msgstr ""
 "\t       che il cliente ha creato una riserva.\n"
 "             "
 
-#: developers.html.j2:135
+#: developers.html.j2:137
 msgid ""
 "Once the exchange has received the\n"
 "               transfer, it allows the customer's electronic wallet\n"
@@ -607,7 +607,7 @@ msgstr ""
 "\t       sottrazione da questa della tariffa del servizio.\n"
 "             "
 
-#: developers.html.j2:148
+#: developers.html.j2:150
 msgid ""
 "Once the customer has the digital coins in\n"
 "               his wallet, the wallet can be used to <b>spend</b> the\n"
@@ -648,7 +648,7 @@ msgstr ""
 "\t       il cambio.\n"
 "\t     "
 
-#: developers.html.j2:165
+#: developers.html.j2:167
 msgid ""
 "Merchants receiving digital\n"
 "               coins <b>deposit</b> the respective receipts that\n"
@@ -681,7 +681,7 @@ msgstr ""
 "\t       processo.\n"
 "             "
 
-#: developers.html.j2:182
+#: developers.html.j2:184
 msgid ""
 "Finally, the exchange transfers funds\n"
 "               corresponding to the digital coins redeemed by the\n"
@@ -703,7 +703,7 @@ msgstr ""
 "\t       che egli ha diritto a ricevere.\n"
 "\t     "
 
-#: developers.html.j2:192
+#: developers.html.j2:194
 msgid ""
 "Most importantly, the exchange keeps\n"
 "               cryptographic proofs that allow it to demonstrate that\n"
@@ -726,7 +726,7 @@ msgstr ""
 "\t       quantità di gettoni ancora in circolazione.\n"
 "             "
 
-#: developers.html.j2:202
+#: developers.html.j2:204
 msgid ""
 "Without the auditor, the exchange operators\n"
 "               could embezzle funds they are holding in\n"
@@ -753,19 +753,19 @@ msgstr ""
 msgid "Financial News"
 msgstr ""
 
-#: common/navigation.inc.j2:16 governments.html.j2:3
+#: governments.html.j2:5
 msgid "Governments"
 msgstr "Governi"
 
-#: governments.html.j2:12
+#: governments.html.j2:14
 msgid "Advantages for governments"
 msgstr "Vantaggi per i governi"
 
-#: governments.html.j2:19 index.html.j2:23
+#: governments.html.j2:21 index.html.j2:25
 msgid "Taxable"
 msgstr "Tassabile"
 
-#: governments.html.j2:21
+#: governments.html.j2:23
 msgid ""
 "Taler is an electronic payment system that was built with the goal of "
 "supporting taxation.\n"
@@ -788,11 +788,11 @@ msgstr ""
 "reddito, così da rendere evasione fiscale\n"
 "\t     e mercato nero meno usufruibili."
 
-#: governments.html.j2:28 investors.html.j2:26 merchants.html.j2:27
+#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
 msgid "Secure"
 msgstr "Sicuro"
 
-#: governments.html.j2:30
+#: governments.html.j2:32
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, "
 "merchants and\n"
@@ -820,12 +820,12 @@ msgstr ""
 "\t     del sistema di Taler che potrebbe minacciare l'economia attraverso"
 " frodi fiscali."
 
-#: governments.html.j2:40 index.html.j2:37
+#: governments.html.j2:42 index.html.j2:39
 #, fuzzy
 msgid "Libre"
 msgstr "Libero"
 
-#: governments.html.j2:42
+#: governments.html.j2:44
 msgid ""
 "Taler is free software implementing an open protocol standard.  Thus, "
 "Taler will\n"
@@ -839,11 +839,11 @@ msgstr ""
 "sistemi di pagamento che oggigiorno\n"
 "\t     minacciano la politica globale e la stabilità finanziaria."
 
-#: governments.html.j2:47 investors.html.j2:16
+#: governments.html.j2:49 investors.html.j2:18
 msgid "Efficient"
 msgstr "Efficiente"
 
-#: governments.html.j2:49
+#: governments.html.j2:51
 msgid ""
 "Taler is designed to be efficient.  Unlike timeline-based payment systems"
 " like\n"
@@ -857,11 +857,11 @@ msgstr ""
 " nazionale o contribuirà ad incrementare\n"
 "\t     (in modo significativo) l'inquinamento."
 
-#: governments.html.j2:55
+#: governments.html.j2:57
 msgid "Taler as seen by governments"
 msgstr "Taler dal punto di vista dai governi"
 
-#: governments.html.j2:57
+#: governments.html.j2:59
 msgid ""
 "Governments can observe traditional wire\n"
 "          transfers entering and leaving the Taler system, and\n"
@@ -883,7 +883,7 @@ msgstr ""
 "\n"
 "\tLe informazini disponibili ai governi includono:"
 
-#: governments.html.j2:69
+#: governments.html.j2:71
 msgid ""
 "From the banking system:\n"
 "              The total amount of digital currency\n"
@@ -897,7 +897,7 @@ msgstr ""
 "\t     alla quantità di moneta digitale che un cliente può ritirare\n"
 "\t     in un certo lasso di tempo."
 
-#: governments.html.j2:75
+#: governments.html.j2:77
 msgid ""
 "From the banking system:\n"
 "               The total amount of income received\n"
@@ -907,7 +907,7 @@ msgstr ""
 "\t     La somma totale delle entrate di un negoziante attraverso\n"
 "\t     Taler."
 
-#: governments.html.j2:79
+#: governments.html.j2:81
 msgid ""
 "From auditing the exchange:\n"
 "               The amounts of digital coins legitimately withdrawn by\n"
@@ -933,7 +933,7 @@ msgstr ""
 "entrate\n"
 "\t     della ufficio cambi dovute alle tariffe applicate ai suoi servizi"
 
-#: governments.html.j2:86
+#: governments.html.j2:88
 msgid ""
 "From auditing merchants:\n"
 "               For each deposit operation, the exact details of the\n"
@@ -961,27 +961,21 @@ msgstr ""
 "\t     e ispettore fiscale non possono risalire a tale informazione\n"
 "\t     sulla sola base dei dati raccoli da Taler."
 
-#: index.html.j2:15
+#: index.html.j2:17
 msgid "Electronic payments for a liberal society!"
 msgstr "Pagamenti elettronici per una società libera!"
 
-#: index.html.j2:16
+#: index.html.j2:18
 msgid ""
 "Taler is a new electronic payment system under development\n"
-"\t    at <a href='http://www.inria.fr/'>Inria</a>.  Today, this website "
+"\t   at <a href=\"http://www.inria.fr/\">Inria</a>.  Today, this website "
 "only\n"
 "\t    presents the advantages our system is expected to provide.  We "
 "expect to\n"
 "\t    make the payment system operational in 2017."
 msgstr ""
-"Taler è un nuovo sistema di pagamento elettronico in fase di\n"
-"\t    sviluppo presso Inria. Oggi questo sito presenta solo i vantaggi "
-"che\n"
-"\t    ci si aspetta il nostro sistema fornisca. Riteniamo di poter "
-"rendere il\n"
-"\t    sistema di pagamento operational nel 2017."
 
-#: index.html.j2:24
+#: index.html.j2:26
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
 "\t     governments can learn their citizen's total income and thus "
@@ -997,11 +991,11 @@ msgstr ""
 "è quindi\n"
 "\t     una valuta per un'economia tradizionale, e non per il mercato nero."
 
-#: index.html.j2:30
+#: index.html.j2:32
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: index.html.j2:31
+#: index.html.j2:33
 msgid ""
 "When you pay with Taler, your identity does not have to\n"
 "\t     be revealed to the merchant. The bank, government and exchange "
@@ -1016,24 +1010,20 @@ msgstr ""
 "possibile\n"
 "\t     dimostrante durante un processo di aver pagato."
 
-#: index.html.j2:38
+#: index.html.j2:40
 msgid ""
-"Taler is free software from <a href='http://www.gnu.org/'>GNU</a> "
-"implementing an open protocol.\n"
+"Taler is free software from <a href=\"http://www.gnu.org/\">the GNU "
+"project</a> implementing an open protocol.\n"
 "\t     Anybody is welcome to inspect our code and integrate our reference"
 "\n"
 "\t     implementation into their applications."
 msgstr ""
-"Taler è un free software che utilizza un protocollo aperto. Chiunque\n"
-"\t     è benaccetto per esaminare il nostro codice e integrare le nostre "
-"implementazioni\n"
-"\t     di riferimento nelle loro applicazioni."
 
-#: index.html.j2:45
+#: index.html.j2:47
 msgid "Electronic"
 msgstr "Elettronico"
 
-#: index.html.j2:46
+#: index.html.j2:48
 msgid ""
 "Taler is designed to work on the Internet. Using a\n"
 "\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
@@ -1044,11 +1034,11 @@ msgstr ""
 " applicazioni\n"
 "\t    web già esistenti."
 
-#: index.html.j2:51
+#: index.html.j2:53
 msgid "Reserves"
 msgstr "Riserva"
 
-#: index.html.j2:52
+#: index.html.j2:54
 msgid ""
 "Taler uses an electronic exchange holding financial\n"
 "             reserves in existing currencies. This means that Taler is "
@@ -1067,24 +1057,24 @@ msgstr ""
 "valute come Euro, Dollaro\n"
 "\t     Americano o anche Bitcoin."
 
-#: index.html.j2:59 news.html.j2:3 news.html.j2:12
+#: index.html.j2:61 news.html.j2:5 news.html.j2:14
 msgid "News"
 msgstr ""
 
-#: index.html.j2:60
+#: index.html.j2:62
 #, fuzzy
 msgid "Taler Web payments paper published."
 msgstr "Taler 0.0.0."
 
-#: index.html.j2:61
+#: index.html.j2:63
 msgid "More news »"
 msgstr "Scopri di più »"
 
-#: index.html.j2:65
+#: index.html.j2:67
 msgid "Taler technology: About taxability, change and privacy"
 msgstr "La tecnologia Taler: tassabilità, cambio e privacy"
 
-#: index.html.j2:66
+#: index.html.j2:68
 msgid ""
 "One of the key goals of Taler is to provide anonymity for\n"
 "           citizens buying goods and services, while ensuring that the "
@@ -1115,7 +1105,7 @@ msgstr ""
 "monitoraggio statale.\n"
 "\t "
 
-#: index.html.j2:75
+#: index.html.j2:77
 msgid ""
 "As a result, Taler does not intrude into the\n"
 "           personal economic domain, offers good privacy, taxability\n"
@@ -1127,16 +1117,16 @@ msgstr ""
 "possibilità di dare\n"
 "\t il cambio"
 
-#: investors.html.j2:3
+#: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
-#: investors.html.j2:12
+#: investors.html.j2:14
 #, fuzzy
 msgid "Operate a Taler exchange!"
 msgstr "Investi in Taler!"
 
-#: investors.html.j2:18
+#: investors.html.j2:20
 msgid ""
 "Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
 "             EdDSA) and is thus expected to be able to handle large "
@@ -1158,7 +1148,7 @@ msgstr ""
 "transazione molto basso\n"
 "\t     (meno di 1 cent) in relazione al volume di transazione appropriato."
 
-#: investors.html.j2:28
+#: investors.html.j2:30
 msgid ""
 "All transactions in Taler are secured using modern cryptography and\n"
 "             trust in all parties is minimized. Financial damage is "
@@ -1184,11 +1174,11 @@ msgstr ""
 " partecipanti sono stati\n"
 "\t     onesti."
 
-#: investors.html.j2:37
+#: investors.html.j2:39
 msgid "Business model"
 msgstr "Modello business"
 
-#: investors.html.j2:39
+#: investors.html.j2:41
 msgid ""
 "The basic business model for Taler is the operation of an exchange.  An "
 "exchange converts money from traditional payment systems (Mastercard,\n"
@@ -1217,11 +1207,11 @@ msgstr ""
 "cliente, il mercante\n"
 "\t     o entrambi) per facilitare le transazioni."
 
-#: investors.html.j2:48
+#: investors.html.j2:50
 msgid "Taler as seen by the exchange operator"
 msgstr "Come opera la ufficio cambi di Taler"
 
-#: investors.html.j2:50
+#: investors.html.j2:52
 msgid ""
 "The exchange operator primarily operates a Web service\n"
 "          portal and keeps databases with transaction details and\n"
@@ -1245,7 +1235,7 @@ msgstr ""
 "\tvarie operazioni offerte. Tali operazioni offerte comprendono:\n"
 "\t"
 
-#: investors.html.j2:62
+#: investors.html.j2:64
 msgid ""
 "Create a <b>reserve</b> based on an incoming\n"
 "              wire transfer from a customer."
@@ -1253,7 +1243,7 @@ msgstr ""
 "Creazione di una <b>riserva</b> in seguito\n"
 "\t    alla ricezione di un bonifico bancario da parte di un cliente"
 
-#: investors.html.j2:65
+#: investors.html.j2:67
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
 "               digital coins from their reserve."
@@ -1263,13 +1253,13 @@ msgstr ""
 "<b>refresh</b>)\n"
 "\t    i gettoni digitali dalla loro riserva."
 
-#: investors.html.j2:68
+#: investors.html.j2:70
 msgid "Accept and validate deposits from merchants."
 msgstr ""
 "Accettare e validare depositi di gettoni elettronici\n"
 "\t    da parte dei venditori."
 
-#: investors.html.j2:70
+#: investors.html.j2:72
 msgid ""
 "Execute wire transfers to merchants in\n"
 "               response to validated deposits."
@@ -1277,7 +1267,7 @@ msgstr ""
 "Eseguire bonifici verso i conti dei venditori in seguito\n"
 "\t    a depositi (di gettoni elettronici) andati a buon fine"
 
-#: investors.html.j2:73
+#: investors.html.j2:75
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
 "               correct operation for audits by financial regulators."
@@ -1287,19 +1277,19 @@ msgstr ""
 "\n"
 "\t    finanziari"
 
-#: common/navigation.inc.j2:15 merchants.html.j2:3
+#: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Venditori"
 
-#: merchants.html.j2:12
+#: merchants.html.j2:14
 msgid "Advantages for merchants"
 msgstr "Vantaggi per i mercanti"
 
-#: merchants.html.j2:16
+#: merchants.html.j2:18
 msgid "Fast"
 msgstr "Veloce"
 
-#: merchants.html.j2:18
+#: merchants.html.j2:20
 msgid ""
 "Processing transactions with Taler is fast, allowing you\n"
 "\t     to confirm the transaction with your customer virtually "
@@ -1326,7 +1316,7 @@ msgstr ""
 "di credito, a causa\n"
 "\t     del sovraccarico mentale per i clienti."
 
-#: merchants.html.j2:29
+#: merchants.html.j2:31
 msgid ""
 "You never learn sensitive customer information. You need\n"
 "\t     to ensure that your website provides the correct account "
@@ -1365,11 +1355,11 @@ msgstr ""
 "potrai usare in tribunale\n"
 "\t     in caso di controversie."
 
-#: merchants.html.j2:42
+#: merchants.html.j2:44
 msgid "Free Software"
 msgstr "Free Software"
 
-#: merchants.html.j2:44
+#: merchants.html.j2:46
 msgid ""
 "Taler is free software, and you can use the\n"
 "\t     liberally-licensed reference code as a starting point to integrate"
@@ -1391,11 +1381,11 @@ msgstr ""
 "\t     selezionare molti sviluppatori compententi per aiutarti con "
 "l'implementazione."
 
-#: merchants.html.j2:54
+#: merchants.html.j2:56
 msgid "Low Fees"
 msgstr "Prezzi bassi"
 
-#: merchants.html.j2:56
+#: merchants.html.j2:58
 msgid ""
 "Taler is designed to minimize the work the exchange needs to\n"
 "\t     perform.  Combined with Taler's strong security which prevents "
@@ -1420,11 +1410,11 @@ msgstr ""
 " di transazione giusti e bassi per\n"
 "\t     i mercanti."
 
-#: merchants.html.j2:64
+#: merchants.html.j2:66
 msgid "Flexible"
 msgstr "Flessibile"
 
-#: merchants.html.j2:66
+#: merchants.html.j2:68
 msgid ""
 "Taler can be used for different currencies (such as Euros\n"
 "\t     or US Dollars) and different payment models limited only by what "
@@ -1437,11 +1427,11 @@ msgstr ""
 " &quot;banca&quot; (exchange)\n"
 "\t     supporta nelle sue interazioni."
 
-#: merchants.html.j2:71
+#: merchants.html.j2:73
 msgid "Ethical"
 msgstr "Etico"
 
-#: merchants.html.j2:73
+#: merchants.html.j2:75
 msgid ""
 "Taler does not support tax evasion or money laundering, and is\n"
 "             also not a pyramid scheme or speculative investment.  "
@@ -1459,11 +1449,11 @@ msgstr ""
 "\t     fornendo standard aperti e implementazioni di riferimento in free-"
 "software."
 
-#: merchants.html.j2:81
+#: merchants.html.j2:83
 msgid "Taler as seen by merchants"
 msgstr "Come i negozianti vedono Taler"
 
-#: merchants.html.j2:83
+#: merchants.html.j2:85
 msgid ""
 "Merchants supporting the Taler system need to integrate\n"
 "          some relatively simple logic into their transaction processing\n"
@@ -1476,7 +1466,7 @@ msgstr ""
 "ricezione\n"
 "\tdei pagamenti"
 
-#: merchants.html.j2:92
+#: merchants.html.j2:94
 msgid ""
 "The new logic detects when a customer's system\n"
 "              supports Taler and then needs to send a cryptographically "
@@ -1498,7 +1488,7 @@ msgstr ""
 "nonché la\n"
 "\t     lista delle zecche con cui il negoziante è disposto a trattare."
 
-#: merchants.html.j2:100
+#: merchants.html.j2:102
 msgid ""
 "The customer sends a signed response which states\n"
 "               that certain digital coins now belong to the merchant to "
@@ -1513,7 +1503,7 @@ msgstr ""
 "\t     a pagare il prezzo dovuto (in basso).\n"
 "\t     "
 
-#: merchants.html.j2:105
+#: merchants.html.j2:107
 msgid ""
 "The merchant then forwards the signed messages\n"
 "               received from the customer to the exchange, together with "
@@ -1539,7 +1529,7 @@ msgstr ""
 "cliente,\n"
 "\t     e procede ad assolvere quanto indicato nel contratto."
 
-#: merchants.html.j2:113
+#: merchants.html.j2:115
 msgid ""
 "The exchange performs wire transfers corresponding to\n"
 "               the claims deposited by the merchant. Note that the "
@@ -1559,7 +1549,7 @@ msgstr ""
 "\t     mercanti impongano delle restrizioni su quali siano le zecche\n"
 "\t     con cui essi vogliano trattare."
 
-#: merchants.html.j2:123
+#: merchants.html.j2:125
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
@@ -1568,25 +1558,18 @@ msgstr "Documentation"
 msgid "Wallet"
 msgstr ""
 
-#: common/footer.inc.j2:3
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free "
-"Software</a> only."
-msgstr ""
+#~ msgid ""
+#~ msgstr ""
 
-#: common/navigation.inc.j2:12
-msgid "Home"
-msgstr "Home"
+#~ msgid "Home"
+#~ msgstr "Home"
 
-#: common/navigation.inc.j2:13
-msgid "Demo"
-msgstr "Demo"
+#~ msgid "Demo"
+#~ msgstr "Demo"
 
-#: common/navigation.inc.j2:17
-msgid "Operators"
-msgstr "Investitori"
+#~ msgid "Operators"
+#~ msgstr "Investitori"
 
-#: common/navigation.inc.j2:19
-msgid "About&nbsp;us"
-msgstr "Chi siamo"
+#~ msgid "About&nbsp;us"
+#~ msgstr "Chi siamo"
 
diff --git a/template.py b/template.py
index 86516bb6..aab6fddd 100755
--- a/template.py
+++ b/template.py
@@ -23,7 +23,12 @@ env.install_gettext_translations(tr, newstyle=True)
 
 tmpl = env.get_template(in_file)
 
+def url(x):
+    # TODO: look at the app root environment variable
+    # TODO: check if file exists
+    return x
+
 import codecs
 f = codecs.open(out_file, "w", "utf-8")
-f.write(tmpl.render())
+f.write(tmpl.render(lang=locale, url=url))
 f.close()
diff --git a/template.sh b/template.sh
index 54dc1709..bc63b943 100755
--- a/template.sh
+++ b/template.sh
@@ -7,11 +7,3 @@ for f in $(git ls-files *.j2); do
 	python template.py $f $l $(dirname $f)/$(basename $f .html.j2).$l.html
     done
 done
-
-for f in $(git ls-files common/*.j2); do
-    for ld in locale/*/; do
-	l=$(basename $ld)
-	echo "$f: $l"
-	python template.py $f $l $(dirname $f)/$(basename $f .inc.j2).$l.inc
-    done
-done
diff --git a/web-common b/web-common
index dfa82524..dc9d5ab2 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit dfa825243b718e222013d35a58b2dd8ec0ef05ac
+Subproject commit dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bfb
-- 
cgit v1.2.3