1 files changed, 153 insertions, 160 deletions

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 ""