(bank) · electronic money

LASTNAME@taler.net
contact AT taler.net
ceo AT taler.net
git.taler.net
invest@taler."
 "net
LASTNAME@taler.net
contact AT taler.net
ceo AT taler.net."
 msgstr ""
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr ""
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:8
 msgid ""
 "
Contributors to GNU Taler with Git access must sign the copyright assignment to ensure that the  of the GNUnet and GNU Taler projects is satisfied.
"
 msgstr ""
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:17
 msgid ""
 "The agreements ensure that the code will continue to be made available "
 "under free software licenses, but gives developers the freedom to move code "
@@ -114,7 +164,7 @@ msgid ""
 "stores that are hostile to free software)."
 msgstr ""
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:25
 msgid ""
 "Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -122,15 +172,15 @@ msgid ""
 "sufficient, but snail mail is preferred."
 msgstr ""
 
-#: developers.html.j2:5
+#: template/developers.html.j2:5
 msgid "Taler for developers"
 msgstr ""
 
-#: developers.html.j2:12 merchants.html.j2:58
+#: template/developers.html.j2:12 template/merchants.html.j2:58
 msgid "Free"
 msgstr ""
 
-#: developers.html.j2:15
+#: template/developers.html.j2:15
 msgid ""
 "GNU Taler is free software implementing an open protocol. Anybody is welcome "
 "to integrate our reference implementation into their applications. Different "
@@ -142,11 +192,11 @@ msgid ""
 "payment platform."
 msgstr ""
 
-#: developers.html.j2:32
+#: template/developers.html.j2:32
 msgid "RESTful"
 msgstr ""
 
-#: developers.html.j2:35
+#: template/developers.html.j2:35
 msgid ""
 "Taler is designed to work on the Internet. To ensure that Taler payments can "
 "work with restrictive network setups, Taler uses a RESTful protocol over "
@@ -158,11 +208,11 @@ msgid ""
 "docs.taler.net/\">docs.taler.net."
 msgstr ""
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58
 msgid "Code"
 msgstr ""
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
 msgid ""
 "Taler is currently primarily developed by a research team at Inria and ."
 msgstr ""
 
-#: developers.html.j2:75
+#: template/developers.html.j2:75
 msgid "Documentation"
 msgstr ""
 
-#: developers.html.j2:78
+#: template/developers.html.j2:78
 msgid ""
 "In addition to this website, the documented code and the API "
@@ -185,63 +235,63 @@ msgid ""
 "\"bibliography.html\">bibliography."
 msgstr ""
 
-#: developers.html.j2:88
+#: template/developers.html.j2:88
 msgid "Discussion"
 msgstr ""
 
-#: developers.html.j2:91
+#: template/developers.html.j2:91
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
 "read the list archive at http://lists.gnu.org/mailman/listinfo/taler."
 msgstr ""
 
-#: developers.html.j2:101
+#: template/developers.html.j2:101
 msgid "Regression Testing"
 msgstr ""
 
-#: developers.html.j2:104
+#: template/developers.html.j2:104
 msgid ""
 "We have Buildbot automation tests to "
 "detect regressions and check for portability at buildbot.taler.net."
 msgstr ""
 
-#: developers.html.j2:113
+#: template/developers.html.j2:113
 msgid "Code Coverage Analysis"
 msgstr ""
 
-#: developers.html.j2:116
+#: template/developers.html.j2:116
 msgid ""
 "We use LCOV to "
 "analyze the code coverage of our tests, the results are available at lcov.taler.net."
 msgstr ""
 
-#: developers.html.j2:131
+#: template/developers.html.j2:131
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:134 template/investors.html.j2:88
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:150
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:155
+#: template/developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
 "the following steps:"
 msgstr ""
 
-#: developers.html.j2:162
+#: template/developers.html.j2:162
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:165
+#: template/developers.html.j2:165
 msgid ""
 "A customer instructs his bank to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -249,7 +299,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:177
+#: template/developers.html.j2:177
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to withdraw electronic coins. The electronic coins "
@@ -261,7 +311,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:195
+#: template/developers.html.j2:195
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to spend the coins with merchant portals that support the Taler "
@@ -276,7 +326,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:217
+#: template/developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins deposit the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -290,7 +340,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:240
+#: template/developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's bank account. The "
@@ -299,7 +349,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:254
+#: template/developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -309,7 +359,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:269
+#: template/developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -318,80 +368,80 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:37
+#: template/docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:38
+#: template/docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:44
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:46
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:144
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:152
+#: template/docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
-#: faq.html.j2:5
+#: template/faq.html.j2:5
 msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr ""
 
-#: faq.html.j2:6
+#: template/faq.html.j2:6
 msgid ""
 "Taler does not require any Blockchain technology, and is also not based "
 "on proof-of-work or any other distributed consensus mechanism. Instead, "
@@ -399,88 +449,88 @@ msgid ""
 "combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 
-#: faq.html.j2:13
+#: template/faq.html.j2:13
 msgid ""
 "It would be possible, however, to withdraw coins denominated in Bitcoin "
 "into a Taler wallet (with an appropriate exchange), which would give some "
 "benefits over plain Bitcoin, such as instant confirmation times."
 msgstr ""
 
-#: faq.html.j2:20
+#: template/faq.html.j2:20
 msgid "Where is the balance in my wallet stored?"
 msgstr ""
 
-#: faq.html.j2:21
+#: template/faq.html.j2:21
 msgid ""
 "Your wallet stores digital coins and thus ultimately your computer holds "
 "your balance. The exchange keeps funds matching all unspent coins in an "
 "escrow bank account."
 msgstr ""
 
-#: faq.html.j2:27
+#: template/faq.html.j2:27
 msgid "What if my wallet is lost?"
 msgstr ""
 
-#: faq.html.j2:28
+#: template/faq.html.j2:28
 msgid ""
 "Since the digital coins of value in your wallet are anonymized, the "
 "exchange can not assist you in recovering a lost or stolen wallet. Just like "
 "with a physical wallet for cash, you are responsible for keeping it safe."
 msgstr ""
 
-#: faq.html.j2:34
+#: template/faq.html.j2:34
 msgid ""
 "The risk of losing a wallet can be mitigated by making backups or keeping "
 "the balance reasonably low."
 msgstr ""
 
-#: faq.html.j2:39
+#: template/faq.html.j2:39
 msgid "What if my computer is hacked?"
 msgstr ""
 
-#: faq.html.j2:40
+#: template/faq.html.j2:40
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend "
 "coins from your wallet. Checking your balance might reveal to you that your "
 "device has been compromised."
 msgstr ""
 
-#: faq.html.j2:46
+#: template/faq.html.j2:46
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 
-#: faq.html.j2:47
+#: template/faq.html.j2:47
 msgid ""
 "If your friend provides goods or services for you in exchange for a "
 "payment, they can easily set up a Taler merchant and receive the payment in "
 "their bank account."
 msgstr ""
 
-#: faq.html.j2:52
+#: template/faq.html.j2:52
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among "
 "friends directly as well."
 msgstr ""
 
-#: faq.html.j2:58
+#: template/faq.html.j2:58
 msgid "How does Taler handle payments in different currencies?"
 msgstr ""
 
-#: faq.html.j2:59
+#: template/faq.html.j2:59
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 
-#: faq.html.j2:63
+#: template/faq.html.j2:63
 msgid "Taler currently does not offer conversion between currencies."
 msgstr ""
 
-#: faq.html.j2:67
+#: template/faq.html.j2:67
 msgid "How does Taler protect my privacy?"
 msgstr ""
 
-#: faq.html.j2:68
+#: template/faq.html.j2:68
 msgid ""
 "Your wallet stores digital coins that are blindly signed by an exchange. The use of a "
@@ -488,11 +538,11 @@ msgid ""
 "knowing which coin it signed for which customer."
 msgstr ""
 
-#: faq.html.j2:79
+#: template/faq.html.j2:79
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:80
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -505,11 +555,11 @@ msgid ""
 "regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:95
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:96
 msgid ""
 "Taler's wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -520,24 +570,24 @@ msgid ""
 "future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:109
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:110
 msgid ""
 "We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
 "have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:118
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: faq.html.j2:119
+#: template/faq.html.j2:119
 msgid ""
 "The exchange would be operated by a bank or in cooperation with a bank, "
 "and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -547,13 +597,13 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:129
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:130
 msgid ""
 "Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -562,11 +612,11 @@ msgid ""
 "respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:140
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:141
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -576,11 +626,11 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:153
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:155
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -597,7 +647,7 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:15
 msgid ""
 "GNU Taler is a privacy-preserving payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -605,28 +655,28 @@ msgid ""
 "evasion and money laundering
."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is payments; it "
 "is not meant as a store of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:30
 msgid ""
 "Payment are made after exchanging existing money "
 "into electronic money with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:37
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments without making their customers register on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:44
 msgid ""
 "GNU Taler is immune against many types of fraud, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -634,33 +684,33 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:60
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:62
+#: template/features.html.j2:62
 msgid ""
 "To pay with Taler, customers install an electronic wallet on their device. "
 "Before the first payment, the desired currency must be added to the wallet's "
 "balance by some other means of payment."
 msgstr ""
 
-#: features.html.j2:70
+#: template/features.html.j2:70
 msgid ""
 "Once the wallet is charged, payments on websites take only one click, are "
 "never falsely rejected by fraud detection and do not pose any risk of "
 "phishing or identity theft."
 msgstr ""
 
-#: features.html.j2:77
+#: template/features.html.j2:77
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:85
+#: template/features.html.j2:85
 msgid ""
 "To receive Taler payments, a merchant needs a bank account in the desired "
 "currency. We provide supporting software in various programming languages to "
@@ -668,32 +718,32 @@ msgid ""
 "processing can run on the merchant's premises or be hosted by a third party."
 msgstr ""
 
-#: features.html.j2:94
+#: template/features.html.j2:94
 msgid ""
 "Merchant integration is simple, and customers can pay for products without "
 "even having to register an account."
 msgstr ""
 
-#: features.html.j2:99
+#: template/features.html.j2:99
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:113
 msgid "Practical"
 msgstr ""
 
-#: features.html.j2:116
+#: template/features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
 "extremely low transaction costs."
 msgstr ""
 
-#: features.html.j2:126
+#: template/features.html.j2:126
 msgid "Stable"
 msgstr ""
 
-#: features.html.j2:129
+#: template/features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -701,44 +751,45 @@ msgid ""
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 
-#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
+#: template/features.html.j2:140 template/governments.html.j2:58
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr ""
 
-#: features.html.j2:143
+#: template/features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
 "rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
-#: features.html.j2:155 governments.html.j2:25
+#: template/features.html.j2:155 template/governments.html.j2:25
 msgid "Taxable"
 msgstr ""
 
-#: features.html.j2:158
+#: template/features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
 
-#: features.html.j2:168
+#: template/features.html.j2:168
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:170
+#: template/features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
 "money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:181 template/governments.html.j2:88
 msgid "Libre"
 msgstr ""
 
-#: features.html.j2:184
+#: template/features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -747,108 +798,108 @@ msgid ""
 "software."
 msgstr ""
 
-#: financial-news.html.j2:6
+#: template/financial-news.html.j2:6
 msgid "Financial News"
 msgstr ""
 
-#: financial-news.html.j2:9
+#: template/financial-news.html.j2:9
 msgid ""
 "This page explains (only in English) how Taler can change ongoing "
 "developments in the financial industry."
 msgstr ""
 
-#: glossary.html.j2:6
+#: template/glossary.html.j2:6
 msgid "auditor"
 msgstr ""
 
-#: glossary.html.j2:8
+#: template/glossary.html.j2:8
 msgid ""
 "trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
-#: glossary.html.j2:12
+#: template/glossary.html.j2:12
 msgid "bank"
 msgstr ""
 
-#: glossary.html.j2:14
+#: template/glossary.html.j2:14
 msgid ""
 "traditional financial service provider who offers wire `transfers` between "
 "accounts"
 msgstr ""
 
-#: glossary.html.j2:18
+#: template/glossary.html.j2:18
 msgid "coin"
 msgstr ""
 
-#: glossary.html.j2:20
+#: template/glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
 "known as the `denomination` of the coin"
 msgstr ""
 
-#: glossary.html.j2:24
+#: template/glossary.html.j2:24
 msgid "contract"
 msgstr ""
 
-#: glossary.html.j2:26
+#: template/glossary.html.j2:26
 msgid "the proposal signed by the wallet."
 msgstr ""
 
-#: glossary.html.j2:30
+#: template/glossary.html.j2:30
 msgid "denomination"
 msgstr ""
 
-#: glossary.html.j2:32
+#: template/glossary.html.j2:32
 msgid ""
 "unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
-#: glossary.html.j2:36
+#: template/glossary.html.j2:36
 msgid "denomination key"
 msgstr ""
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:38
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
 msgstr ""
 
-#: glossary.html.j2:42
+#: template/glossary.html.j2:42
 msgid "deposit"
 msgstr ""
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
 "exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
-#: glossary.html.j2:48
+#: template/glossary.html.j2:48
 msgid "dirty"
 msgstr ""
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:50
 msgid ""
 "a `coin` is dirty if its public key may be known to an entity other than the "
 "customer, thereby creating the danger of some entity being able to link "
 "multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
-#: glossary.html.j2:54
+#: template/glossary.html.j2:54
 msgid "exchange"
 msgstr ""
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:56
 msgid ""
 "Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:60
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:62
 msgid ""
 "Various operations come with time limits. In particular, `denomination keys` "
 "come with strict time limits for the various operations involving the `coin` "
@@ -861,45 +912,45 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:74
 msgid "extension"
 msgstr ""
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:80
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:86
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:92
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:98
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -909,80 +960,80 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:109
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
-#: glossary.html.j2:115
+#: template/glossary.html.j2:115
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:117
 msgid ""
 "operation by which an exchange returns the value of coins affected by a "
 "`revocation` to their `owner`, either by allowing the owner to withdraw new "
 "coins or wiring funds back to the bank account of the `owner`"
 msgstr ""
 
-#: glossary.html.j2:123
+#: template/glossary.html.j2:123
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:129
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:135
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
 "account to cover obligations from coins in circulation"
 msgstr ""
 
-#: glossary.html.j2:141
+#: template/glossary.html.j2:141
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:147
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
 "the customer"
 msgstr ""
 
-#: glossary.html.j2:153
+#: template/glossary.html.j2:153
 msgid "revocation"
 msgstr ""
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:155
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -990,101 +1041,101 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:159
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
-#: glossary.html.j2:165
+#: template/glossary.html.j2:165
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:167
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:171
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
 msgstr ""
 
-#: glossary.html.j2:177
+#: template/glossary.html.j2:177
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:183
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:189
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:195
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:201
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:203
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:213
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:219
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:221
 msgid ""
 "a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
 "`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
@@ -1095,11 +1146,11 @@ msgid ""
 "past the legal data retention requirement)."
 msgstr ""
 
-#: governments.html.j2:6
+#: template/governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
 
-#: governments.html.j2:8
+#: template/governments.html.j2:8
 msgid ""
 "Taler provides accountability to ensure business operate legally, while also "
 "respecting civil liberties of citizens. Taler is a payment system based on "
@@ -1108,7 +1159,7 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:28
+#: template/governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
 "taxation. With Taler, the receiver of any form of payment is easily "
@@ -1118,7 +1169,7 @@ msgid ""
 "evasion and black markets less viable."
 msgstr ""
 
-#: governments.html.j2:41
+#: template/governments.html.j2:41
 msgid ""
 "Thus, despite offering anonymity for citizens spending digital cash to buy "
 "goods and services, Taler also ensures that the state can observe incoming "
@@ -1130,7 +1181,7 @@ msgid ""
 "multiple devices."
 msgstr ""
 
-#: governments.html.j2:61
+#: template/governments.html.j2:61
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1139,7 +1190,7 @@ msgid ""
 "merchants, the exchange and the state."
 msgstr ""
 
-#: governments.html.j2:73
+#: template/governments.html.j2:73
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1149,98 +1200,98 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:91
+#: template/governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
 "will enable competition and avoid the monopolization of payment systems that "
 "threatens global political and financial stability today."
 msgstr ""
 
-#: governments.html.j2:101
+#: template/governments.html.j2:101
 msgid "Efficient"
 msgstr ""
 
-#: governments.html.j2:104
+#: template/governments.html.j2:104
 msgid ""
 "Taler has an efficient design. Unlike Blockchain-based payment systems, such "
 "as Bitcoin, Taler will not threaten the availability of national electric "
 "grids or (significantly) contribute to environmental pollution."
 msgstr ""
 
-#: governments.html.j2:120
+#: template/governments.html.j2:120
 msgid "Taler and regulation"
 msgstr ""
 
-#: governments.html.j2:122
+#: template/governments.html.j2:122
 msgid "Anti money laundering (AML)"
 msgstr ""
 
-#: governments.html.j2:123
+#: template/governments.html.j2:123
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
 msgstr ""
 
-#: governments.html.j2:124
+#: template/governments.html.j2:124
 msgid "Know your customer (KYC)"
 msgstr ""
 
-#: governments.html.j2:125
+#: template/governments.html.j2:125
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
 msgstr ""
 
-#: governments.html.j2:126
+#: template/governments.html.j2:126
 msgid "General Data Protection Regulation (GDPR)"
 msgstr ""
 
-#: governments.html.j2:127
+#: template/governments.html.j2:127
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
 msgstr ""
 
-#: governments.html.j2:128
+#: template/governments.html.j2:128
 msgid "Payment Services Directive (PSD2)"
 msgstr ""
 
-#: governments.html.j2:129
+#: template/governments.html.j2:129
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
 msgstr ""
 
-#: governments.html.j2:137
+#: template/governments.html.j2:137
 msgid "Taler provides privacy and accountability"
 msgstr ""
 
-#: governments.html.j2:140
+#: template/governments.html.j2:140
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
 "governments can obtain:"
 msgstr ""
 
-#: governments.html.j2:148
+#: template/governments.html.j2:148
 msgid ""
 "The total amount of digital currency withdrawn by a customer. The government "
 "can impose limits on how much digital cash a customer can withdraw within a "
 "given time frame."
 msgstr ""
 
-#: governments.html.j2:157
+#: template/governments.html.j2:157
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
-#: governments.html.j2:164
+#: template/governments.html.j2:164
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
 "the identity of the customer."
 msgstr ""
 
-#: governments.html.j2:174
+#: template/governments.html.j2:174
 msgid ""
 "The amounts of digital coins legitimately withdrawn by customers from the "
 "exchange, the value of non-redeemed digital coins in customer's wallets, the "
@@ -1249,21 +1300,21 @@ msgid ""
 "fees."
 msgstr ""
 
-#: gsoc-codeless.html.j2:5
+#: template/gsoc-codeless.html.j2:5
 msgid "GSoC 2018: Codeless Payment"
 msgstr ""
 
-#: gsoc-codeless.html.j2:6
+#: template/gsoc-codeless.html.j2:6
 msgid ""
 "Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and "
 "guidance of Florian Dold."
 msgstr ""
 
-#: gsoc-codeless.html.j2:12
+#: template/gsoc-codeless.html.j2:12
 msgid "Overview"
 msgstr ""
 
-#: gsoc-codeless.html.j2:14
+#: template/gsoc-codeless.html.j2:14
 msgid ""
 "Codeless payment is a component that sits between the seller's frontend and "
 "the GNU Taler merchant backend. This component has a web interface, where "
@@ -1273,15 +1324,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:23
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:24
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:28
 msgid ""
 "The primary use case is the registration of the merchant. The codeless "
 "payment backend provides a secure django authenticated login to the "
@@ -1292,19 +1343,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:33
 msgid ""
 "A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:38
+#: template/gsoc-codeless.html.j2:38
 msgid ""
 "The merchant can upload digital inventory (like a PDF or HTML page) via the "
 "codeless payments frontend and the user can then purchase it and view the "
 "version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:43
+#: template/gsoc-codeless.html.j2:43
 msgid ""
 "The merchant can add any physical inventory available in his stocks. While "
 "adding these inventory, the seller is prompted to add minimum quantity of "
@@ -1313,7 +1364,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1323,7 +1374,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1331,31 +1382,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1364,7 +1415,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1372,7 +1423,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1384,7 +1435,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1392,7 +1443,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1402,25 +1453,25 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr ""
 
-#: investors.html.j2:9
+#: template/investors.html.j2:9
 msgid ""
 "We have created a company, Taler Systems SA in Luxembourg.
 Please "
 "contact invest@taler.net if you want to invest in Taler."
 msgstr ""
 
-#: investors.html.j2:24
+#: template/investors.html.j2:24
 msgid "The Team"
 msgstr ""
 
-#: investors.html.j2:27
+#: template/investors.html.j2:27
 msgid ""
 "Our team combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1428,7 +1479,7 @@ msgid ""
 "this vision upon the world."
 msgstr ""
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
 msgid ""
 "We are currently supported by Inria, "
 "the French national institute for research in informatics and automation, "
@@ -1436,11 +1487,11 @@ msgid ""
 "Foundation."
 msgstr ""
 
-#: investors.html.j2:45
+#: template/investors.html.j2:45
 msgid "The Technology"
 msgstr ""
 
-#: investors.html.j2:48
+#: template/investors.html.j2:48
 msgid ""
 "All transactions in Taler are secured using modern cryptography and trust in all parties is minimized. Financial "
@@ -1451,11 +1502,11 @@ msgid ""
 "transaction costs are fractions of a cent."
 msgstr ""
 
-#: investors.html.j2:63
+#: template/investors.html.j2:63
 msgid "The Business"
 msgstr ""
 
-#: investors.html.j2:66
+#: template/investors.html.j2:66
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1466,22 +1517,22 @@ msgid ""
 "to facilitate the transactions."
 msgstr ""
 
-#: investors.html.j2:85
+#: template/investors.html.j2:85
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:91
+#: template/investors.html.j2:91
 msgid ""
 "Our financial news page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:114
 msgid "Running a Taler payment service operator"
 msgstr ""
 
-#: investors.html.j2:117
+#: template/investors.html.j2:117
 msgid ""
 "The payment service operator runs the Taler exchange. The exchange "
 "charges transaction fees to customers or merchants. Its operational "
@@ -1489,37 +1540,37 @@ msgid ""
 "of the computing infrastructure."
 msgstr ""
 
-#: investors.html.j2:127
+#: template/investors.html.j2:127
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
 msgstr ""
 
-#: investors.html.j2:129
+#: template/investors.html.j2:129
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
 msgstr ""
 
-#: investors.html.j2:131
+#: template/investors.html.j2:131
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
 msgstr ""
 
-#: investors.html.j2:133
+#: template/investors.html.j2:133
 msgid "Partnership with banks establishes consumer trust."
 msgstr ""
 
-#: investors.html.j2:135
+#: template/investors.html.j2:135
 msgid "Partnership with free software community enables rapid deployment."
 msgstr ""
 
-#: merchants.html.j2:5
+#: template/merchants.html.j2:5
 msgid "Advantages for Merchants"
 msgstr ""
 
-#: merchants.html.j2:8
+#: template/merchants.html.j2:8
 msgid ""
 "Taler is a cost-effective electronic payment system which provides you with "
 "cryptographic proof that the payment worked correctly within milliseconds. "
@@ -1527,11 +1578,11 @@ msgid ""
 "risk of fraud."
 msgstr ""
 
-#: merchants.html.j2:22
+#: template/merchants.html.j2:22
 msgid "Fast"
 msgstr ""
 
-#: merchants.html.j2:25
+#: template/merchants.html.j2:25
 msgid ""
 "Processing transactions with Taler is fast, allowing you to confirm the "
 "transaction with your customer virtually immediately. Your customers will "
@@ -1542,7 +1593,7 @@ msgid ""
 "overhead for customers."
 msgstr ""
 
-#: merchants.html.j2:44
+#: template/merchants.html.j2:44
 msgid ""
 "You will have cryptographic proof of payment from the Taler payment service "
 "provider. With Taler you never handle sensitive customer account information "
@@ -1551,7 +1602,7 @@ msgid ""
 "for all transactions which you can use in court in case of disputes."
 msgstr ""
 
-#: merchants.html.j2:61
+#: template/merchants.html.j2:61
 msgid ""
 "Taler is free software, and you can use the liberally-licensed reference "
 "code as a starting point to integrate Taler into your services. To use "
@@ -1560,11 +1611,11 @@ msgid ""
 "integrators for support."
 msgstr ""
 
-#: merchants.html.j2:76
+#: template/merchants.html.j2:76
 msgid "Cheap"
 msgstr ""
 
-#: merchants.html.j2:79
+#: template/merchants.html.j2:79
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1572,22 +1623,22 @@ msgid ""
 "overhead and thus offer low transaction fees."
 msgstr ""
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:89
 msgid "Flexible"
 msgstr ""
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:92
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
 "Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 
-#: merchants.html.j2:101
+#: template/merchants.html.j2:101
 msgid "Ethical"
 msgstr ""
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:104
 msgid ""
 "Taler prevents tax evasion and money laundering. Taler's protocols are "
 "efficient and do not use wasteful proof-of-work calculations. Taler "
@@ -1595,38 +1646,38 @@ msgid ""
 "reference implementations."
 msgstr ""
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:119
 msgid "Manuals for merchants"
 msgstr ""
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:122
 msgid "The GNU Taler merchant backend operator manual"
 msgstr ""
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr ""
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:128
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr ""
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:140
 msgid "The GNU Taler Merchant Backend"
 msgstr ""
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:142
 msgid "Merchants process payments using the Taler backend:"
 msgstr ""
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:147
 msgid ""
 "The backend signs and stores the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
 "give the customer's order in a JSON format to the backend."
 msgstr ""
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:156
 msgid ""
 "The backend validates payments received from the wallet and "
 "executes them with the Taler payment service provider (the exchange). "
@@ -1634,52 +1685,52 @@ msgid ""
 "the Taler backend and check the HTTP status code that is returned."
 msgstr ""
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:167
 msgid ""
 "The backend can list completed transactions and map wire "
 "transfers to sets of business transactions, including the exact terms of "
 "each contract."
 msgstr ""
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:183
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:16
 msgid "More news"
 msgstr ""
 
-#: old-news.html.j2:6
+#: template/old-news.html.j2:6
 msgid "Older News"
 msgstr ""
 
-#: old-news.html.j2:9
+#: template/old-news.html.j2:9
 msgid "This page documents the GNU Taler history."
 msgstr ""
 
-#: press.html.j2:4
+#: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
 
-#: principles.html.j2:22
+#: template/principles.html.j2:22
 msgid "GNU Taler: Design Principles"
 msgstr ""
 
-#: principles.html.j2:29
+#: template/principles.html.j2:29
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:36
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:40
 msgid ""
 "... in the are of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:42
 msgid ""
 "GNU Taler must be Free Software. For merchants, our Free Software reference "
@@ -1688,22 +1739,22 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:51
 msgid ""
 "Customers benefit from Free Software as the wallet software can be made to "
 "run on a variety of platforms, and the absence of user-hostile features such "
 "as tracking or telemetry can easily be assured."
 msgstr ""
 
-#: principles.html.j2:63
+#: template/principles.html.j2:63
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:68
 msgid "You deserve some privacy"
 msgstr ""
 
-#: principles.html.j2:70
+#: template/principles.html.j2:70
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -1711,7 +1762,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:78
 msgid ""
 "In legislations with data protection regulations (such as the recently "
 "introduced GDPR in Europe), merchants benefit from this as well, as no data "
@@ -1721,49 +1772,49 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:92
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:97
 msgid "Money laundering"
 msgstr ""
 
-#: principles.html.j2:99
+#: template/principles.html.j2:99
 msgid ""
 "As a payment system must still be legal to operate and use, it must comply "
 "with these requirements. Furthermore, we consider levying of taxes as "
 "beneficial to society."
 msgstr ""
 
-#: principles.html.j2:110
+#: template/principles.html.j2:110
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:115
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:117
 msgid ""
 "This imposes requirements on the security of the system, as well as on the "
 "general design, as payment fraud can also happen through misleading user "
 "interface design or the lack of cryptographic evidence for certain processes."
 msgstr ""
 
-#: principles.html.j2:128
+#: template/principles.html.j2:128
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:132
 msgid ""
 "Privacy by design, privacy by default, General Data Protection Regulation "
 "(GDPR) compliant"
 msgstr ""
 
-#: principles.html.j2:134
+#: template/principles.html.j2:134
 msgid ""
 "The reason behind this goal is similar to (2). The privacy of buyers is "
 "given priority, but other parties such as merchants still benefit from it, "
@@ -1771,15 +1822,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:144
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:148
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:150
 msgid ""
 "Specifically it must be usable for non-expert customers. Usability also "
 "applies to the integration with merchants, and informs choices about the "
@@ -1787,29 +1838,29 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:162
 msgid "7. Be efficient"
 msgstr ""
 
-#: principles.html.j2:166
+#: template/principles.html.j2:166
 msgid "Energy efficiency"
 msgstr ""
 
-#: principles.html.j2:168
+#: template/principles.html.j2:168
 msgid ""
 "Approaches such as proof-of-work are ruled out by this requirement. "
 "Efficiency is necessary for GNU Taler to be used for micropayments."
 msgstr ""
 
-#: principles.html.j2:177
+#: template/principles.html.j2:177
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:181
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:183
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -1817,15 +1868,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:195
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:199
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:201
 msgid ""
 "It must be relatively easy for competitors to join the systems. While the "
 "barriers for this in traditional financial systems are rather high, the "
@@ -1835,131 +1886,84 @@ msgid ""
 "instead of having one completely monolithic system."
 msgstr ""
 
-#: schemafuzz.html.j2:6
+#: template/schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
 
-#: team.html.j2:16
+#: template/team.html.j2:16
 msgid ""
 "GNU maintainer. Network security & privacy researcher. Software "
 "architect."
 msgstr ""
 
-#: team.html.j2:21
+#: template/team.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
 msgstr ""
 
-#: team.html.j2:26
+#: template/team.html.j2:26
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
+#: template/team.html.j2:33
 msgid "GNU mainatiner, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:38
 msgid "Applied cryptography. Contact to W3c & Tor."
 msgstr ""
 
-#: team.html.j2:43
+#: template/team.html.j2:43
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
-#: team.html.j2:50
+#: template/team.html.j2:50
 msgid "Software engineer."
 msgstr ""
 
-#: team.html.j2:55
+#: template/team.html.j2:55
 msgid "Sustainable business development."
 msgstr ""
 
-#: team.html.j2:60
+#: template/team.html.j2:60
 msgid "Theoretical foundations."
 msgstr ""
 
-#: team.html.j2:66
+#: template/team.html.j2:66
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:73 template/team.html.j2:77 template/team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:87 template/team.html.j2:91 template/team.html.j2:95
 msgid "Translator (Italian)"
 msgstr ""
 
-#: team.html.j2:99
+#: template/team.html.j2:99
 msgid "Translator (German)"
 msgstr ""
 
-#: team.html.j2:106
+#: template/team.html.j2:106
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:110
+#: template/team.html.j2:110
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:118
+#: template/team.html.j2:118
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:122
+#: template/team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
-#: team.html.j2:146
+#: template/team.html.j2:128 template/team.html.j2:132
+#: template/team.html.j2:136 template/team.html.j2:142
+#: template/team.html.j2:146
 msgid "Free software developer."
 msgstr ""
-
-#: common/base.j2:5
-msgid "GNU Taler"
-msgstr ""
-
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr ""
-
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-msgid "Team"
-msgstr ""
-
-#: common/footer.j2.inc:16
-msgid "Contact"
-msgstr ""
-
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr ""
-
-#: common/footer.j2.inc:26
-msgid "Bibliography"
-msgstr ""
-
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by BFH"
-msgstr ""
-
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using Free Software "
-"only."
-msgstr ""
-
-#: common/navigation.j2.inc:21
-msgid "Features"
-msgstr ""
-
-#: common/navigation.j2.inc:22
-msgid "Principles"
-msgstr ""
-
-#: common/navigation.j2.inc:23
-msgid "Docs"
-msgstr ""

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index dcd2ca49..da046b29 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,49 +2,103 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-01 18:07+0200\n"
+"POT-Creation-Date: 2019-09-02 09:39+0000\n"
 "PO-Revision-Date: 2017-08-10 06:24+0200\n"
 "Last-Translator: \n"
 "Language-Team: es \n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Generated-By: Babel 2.3.4\n"
 "X-Generator: Poedit 2.0.2\n"
 
-#: architecture.html.j2:6
+#: common/base.j2:5
+msgid "GNU Taler"
+msgstr "GNU Taler"
+
+#: common/base.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr "Reservas Electrónicas Gravales, Anónimas y Libres"
+
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "El Equipo"
+
+#: common/footer.j2.inc:16
+msgid "Contact"
+msgstr "Contacto"
+
+#: common/footer.j2.inc:21
+msgid "FAQ"
+msgstr "Preguntas frecuentes"
+
+#: common/footer.j2.inc:26
+msgid "Bibliography"
+msgstr "Bibliografía"
+
+#: common/footer.j2.inc:32 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
+msgid "and"
+msgstr "y"
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by BFH"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using Free Software "
+"only."
+msgstr ""
+"Está página fue creada usando únicamente software libre"
+
+#: common/navigation.j2.inc:21
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:22
+msgid "Principles"
+msgstr ""
+
+#: common/navigation.j2.inc:23
+msgid "Docs"
+msgstr ""
+
+#: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Arquitectura del Sistema Taler"
 
-#: bibliography.html.j2:4
+#: template/bibliography.html.j2:4
 msgid "GNU Taler Bibliography"
 msgstr "Bibliografía de GNU Taler"
 
-#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:30 bibliography.html.j2:36
+#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
 msgid "by"
 msgstr "por"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
-#: bibliography.html.j2:36 common/footer.j2.inc:32
-msgid "and"
-msgstr "y"
-
-#: bibliography.html.j2:37
+#: template/bibliography.html.j2:37
 msgid "available upon request"
 msgstr "disponible bajo petición"
 
-#: contact.html.j2:6
+#: template/contact.html.j2:6
 msgid "Contact information"
 msgstr "Contacto"
 
-#: contact.html.j2:13
+#: template/contact.html.j2:13
 msgid "The mailing list"
 msgstr "Lista de correo"
 
-#: contact.html.j2:15
+#: template/contact.html.j2:15
 msgid ""
 "An archived, public mailing list for GNU Taler is hosted at https://lists.gnu.org/"
@@ -56,11 +110,11 @@ msgstr ""
 "mailman/listinfo/taler. Puede enviar mensajes a la lista taler@gnu.org."
 
-#: contact.html.j2:25
+#: template/contact.html.j2:25
 msgid "Contacting individuals"
 msgstr "Contacto con los miembros del equipo"
 
-#: contact.html.j2:27
+#: template/contact.html.j2:27
 msgid ""
 "Team members are generally reachable at LASTNAME@taler.net. All of "
 "us support receiving GnuPG encrypted e-mails."
@@ -69,21 +123,21 @@ msgstr ""
 "siguiente formato: APELLIDO@taler.net. Todos aceptamos correos "
 "electrónicos cifrados con GnuPG."
 
-#: contact.html.j2:36
+#: template/contact.html.j2:36
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:38
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "contact AT taler.net."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:46
 msgid "Reporting bugs"
 msgstr "Reportar errores"
 
-#: contact.html.j2:48
+#: template/contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our Bug tracker, which is shared with the GNUnet project. You can "
@@ -94,11 +148,11 @@ msgstr ""
 "a>, que se comparte con el proyecto GNUnet. También puede reportar bugs o "
 "solicitudes a través de la lista de correo."
 
-#: contact.html.j2:59
+#: template/contact.html.j2:59
 msgid "Executive team"
 msgstr "Comité Ejecutivo"
 
-#: contact.html.j2:61
+#: template/contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact ceo AT taler.net."
@@ -106,11 +160,11 @@ msgstr ""
 "Para solicitudes comerciales que no sean técnicas, póngase en contacto con "
 "ceo AT taler.net."
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr "Asignación de derechos de autor"
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:8
 msgid ""
 "Contributors to GNU Taler with Git access must sign the copyright assignment to ensure that the  de los proyectos GNUnet y GNU Taler "
 "sean respetados.
"
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:17
 msgid ""
 "The agreements ensure that the code will continue to be made available "
 "under free software licenses, but gives developers the freedom to move code "
@@ -140,7 +194,7 @@ msgstr ""
 "para que podamos distribuir a través de las App-stores que son hostiles al "
 "software libre)."
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:25
 msgid ""
 "Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -153,15 +207,15 @@ msgstr ""
 "elegido. Copias escaneadas son suficientes, pero preferimos que sean "
 "enviadas a nuestra dirección de correo postal."
 
-#: developers.html.j2:5
+#: template/developers.html.j2:5
 msgid "Taler for developers"
 msgstr "Taler para programadores"
 
-#: developers.html.j2:12 merchants.html.j2:58
+#: template/developers.html.j2:12 template/merchants.html.j2:58
 msgid "Free"
 msgstr "Libre"
 
-#: developers.html.j2:15
+#: template/developers.html.j2:15
 msgid ""
 "GNU Taler is free software implementing an open protocol. Anybody is welcome "
 "to integrate our reference implementation into their applications. Different "
@@ -182,11 +236,11 @@ msgstr ""
 "Estamos abiertos a sugerencias constructivas para maximizar la adopción de "
 "esta plataforma de pago."
 
-#: developers.html.j2:32
+#: template/developers.html.j2:32
 msgid "RESTful"
 msgstr "Basado en REST"
 
-#: developers.html.j2:35
+#: template/developers.html.j2:35
 msgid ""
 "Taler is designed to work on the Internet. To ensure that Taler payments can "
 "work with restrictive network setups, Taler uses a RESTful protocol over "
@@ -207,11 +261,11 @@ msgstr ""
 "aplicaciones web existentes. El protocolo de Taler está documentado en "
 "detalle en docs.taler.net."
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58
 msgid "Code"
 msgstr "Código"
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
 msgid ""
 "Taler is currently primarily developed by a research team at Inria and  con el nombre del repositorio respectivo. Puede encontrar una lista "
 "de repositorios en nuestro GitWeb."
 
-#: developers.html.j2:75
+#: template/developers.html.j2:75
 msgid "Documentation"
 msgstr "Documentación"
 
-#: developers.html.j2:78
+#: template/developers.html.j2:78
 msgid ""
 "In addition to this website, the documented code and the API "
@@ -246,11 +300,11 @@ msgstr ""
 "técnicos se pueden encontrar en nuestra bibliografía."
 
-#: developers.html.j2:88
+#: template/developers.html.j2:88
 msgid "Discussion"
 msgstr "Debates"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:91
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
 "read the list archive at http://lists.gnu.org/mailman/listinfo/"
 "taler."
 
-#: developers.html.j2:101
+#: template/developers.html.j2:101
 msgid "Regression Testing"
 msgstr "Pruebas de regresión"
 
-#: developers.html.j2:104
+#: template/developers.html.j2:104
 msgid ""
 "We have Buildbot automation tests to "
 "detect regressions and check for portability at Buildbot para detectar regresiones y comprobar su portabilidad en buildbot.taler.net."
 
-#: developers.html.j2:113
+#: template/developers.html.j2:113
 msgid "Code Coverage Analysis"
 msgstr "Análisis de cobertura de código"
 
-#: developers.html.j2:116
+#: template/developers.html.j2:116
 msgid ""
 "We use LCOV to "
 "analyze the code coverage of our tests, the results are available at lcov.taler.net."
 
-#: developers.html.j2:131
+#: template/developers.html.j2:131
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:134 template/investors.html.j2:88
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Diagrama general del sistema Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -311,11 +365,11 @@ msgstr ""
 "tal como se ilustra en la imagen en la derecha. Las transacciones típicas "
 "involucran los siguientes pasos:"
 
-#: developers.html.j2:162
+#: template/developers.html.j2:162
 msgid "system overview"
 msgstr "Diagrama general del sistema"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:165
 msgid ""
 "A customer instructs his bank to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -328,7 +382,7 @@ msgstr ""
 "billetera electrónica. En la termonología de Taler, el cliente crea "
 "una reserva en la plataforma de intercambio."
 
-#: developers.html.j2:177
+#: template/developers.html.j2:177
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to withdraw electronic coins. The electronic coins "
@@ -349,7 +403,7 @@ msgstr ""
 "Taler no modifica el valor total de la moneda o de los fondos (excepto por "
 "los cargos que la plataforma de intercambio pueda cobrar por el servicio)."
 
-#: developers.html.j2:195
+#: template/developers.html.j2:195
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to spend the coins with merchant portals that support the Taler "
@@ -376,7 +430,7 @@ msgstr ""
 "gastar cualquier fracción de sus monedas electrónicas (el sistema se encarga "
 "de que los clientes obtengan su cambio)."
 
-#: developers.html.j2:217
+#: template/developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins deposit the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -403,7 +457,7 @@ msgstr ""
 "comerciantes el pago de los impuestos aplicables (y que éstos no se incurran "
 "en contratos ilegales)."
 
-#: developers.html.j2:240
+#: template/developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's bank account. The "
@@ -420,7 +474,7 @@ msgstr ""
 "bancarias y las monedas (y derechos a cobrar) individuales que fueron "
 "depositadas."
 
-#: developers.html.j2:254
+#: template/developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -437,7 +491,7 @@ msgstr ""
 "que su saldo bancario coincida con el valor total de las monedas que "
 "permanecen en circulación."
 
-#: developers.html.j2:269
+#: template/developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -453,82 +507,82 @@ msgstr ""
 "proporcional a los fondos que tuviesen en circulación durante el período en "
 "que la computadora estuviese comprometida."
 
-#: docs.html.j2:37
+#: template/docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:38
+#: template/docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:44
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:46
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:144
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "Lista de correo"
 
-#: docs.html.j2:152
+#: template/docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
-#: faq.html.j2:5
+#: template/faq.html.j2:5
 msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr "¿Cómo se relaciona Taler con Bitcoin o blockchains?"
 
-#: faq.html.j2:6
+#: template/faq.html.j2:6
 #, fuzzy
 #| msgid ""
 #| "Taler does not use any Blockchain technology or Bitcoin directly. "
@@ -545,7 +599,7 @@ msgstr ""
 "consenso distribuido. A diferencia de ellos,Taler se basa en firmas ciegas."
 
-#: faq.html.j2:13
+#: template/faq.html.j2:13
 msgid ""
 "
It would be possible, however, to withdraw coins denominated in Bitcoin "
 "into a Taler wallet (with an appropriate exchange), which would give some "
@@ -556,11 +610,11 @@ msgstr ""
 "que lo permita), lo que otorgaría algunas ventajas sobre Bitcoin simple, "
 "como por ejemplo, tiempos de confirmación instantánea."
 
-#: faq.html.j2:20
+#: template/faq.html.j2:20
 msgid "Where is the balance in my wallet stored?"
 msgstr "¿Dónde está almacenado el saldo de mi billetera electrónica?"
 
-#: faq.html.j2:21
+#: template/faq.html.j2:21
 msgid ""
 "Your wallet stores digital coins and thus ultimately your computer holds "
 "your balance. The exchange keeps funds matching all unspent coins in an "
@@ -571,11 +625,11 @@ msgstr ""
 "equivalentes a las monedas no gastadas en una cuenta bancaria de fondos en "
 "custodia."
 
-#: faq.html.j2:27
+#: template/faq.html.j2:27
 msgid "What if my wallet is lost?"
 msgstr "¿Qué pasa si mi billetera se pierde?"
 
-#: faq.html.j2:28
+#: template/faq.html.j2:28
 msgid ""
 "Since the digital coins of value in your wallet are anonymized, the "
 "exchange can not assist you in recovering a lost or stolen wallet. Just like "
@@ -586,7 +640,7 @@ msgstr ""
 "billetera perdida o robada. Al igual que con una billetera física con dinero "
 "en efectivo, usted es responsable de velar por su seguridad."
 
-#: faq.html.j2:34
+#: template/faq.html.j2:34
 msgid ""
 "The risk of losing a wallet can be mitigated by making backups or keeping "
 "the balance reasonably low."
@@ -594,11 +648,11 @@ msgstr ""
 "El riesgo de perder una billetera puede mitigarse haciendo copias de "
 "seguridad o manteniendo el saldo razonablemente bajo."
 
-#: faq.html.j2:39
+#: template/faq.html.j2:39
 msgid "What if my computer is hacked?"
 msgstr "¿Qué pasa si mi computadora es hackeada?"
 
-#: faq.html.j2:40
+#: template/faq.html.j2:40
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend "
 "coins from your wallet. Checking your balance might reveal to you that your "
@@ -608,11 +662,11 @@ msgstr ""
 "gastar monedas de su billetera. La verificación de su saldo puede indicarle "
 "que uno de sus dispositivos ha sido comprometido."
 
-#: faq.html.j2:46
+#: template/faq.html.j2:46
 msgid "Can I send money to my friend with Taler?"
 msgstr "¿Puedo enviar dinero a un amigo con Taler?"
 
-#: faq.html.j2:47
+#: template/faq.html.j2:47
 msgid ""
 "If your friend provides goods or services for you in exchange for a "
 "payment, they can easily set up a Taler merchant and receive the payment in "
@@ -622,7 +676,7 @@ msgstr ""
 "puede habilitar fácilmente como un comerciante Taler y recibir el pago a su "
 "cuenta bancaria."
 
-#: faq.html.j2:52
+#: template/faq.html.j2:52
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among "
 "friends directly as well."
@@ -630,11 +684,11 @@ msgstr ""
 "Versiones futuras de la billetera Taler pueden permitir también el "
 "intercambio de monedas directamente entre amigos."
 
-#: faq.html.j2:58
+#: template/faq.html.j2:58
 msgid "How does Taler handle payments in different currencies?"
 msgstr "¿Cómo maneja Taler los pagos en diferentes monedas?"
 
-#: faq.html.j2:59
+#: template/faq.html.j2:59
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
@@ -642,15 +696,15 @@ msgstr ""
 "Las carpetas de Taler pueden almacenar monedas electrónicas "
 "correspondientes a monedas diferentes, como euros, dólares o bitcoins."
 
-#: faq.html.j2:63
+#: template/faq.html.j2:63
 msgid "Taler currently does not offer conversion between currencies."
 msgstr "Actualmente Taler no ofrece conversiones entre monedas."
 
-#: faq.html.j2:67
+#: template/faq.html.j2:67
 msgid "How does Taler protect my privacy?"
 msgstr "¿De qué manera Taler protege mi privacidad?"
 
-#: faq.html.j2:68
+#: template/faq.html.j2:68
 msgid ""
 "Your wallet stores digital coins that are blindly signed by an exchange. The use of a "
@@ -663,11 +717,11 @@ msgstr ""
 "ya que impide que se conozcan las monedas utilizadas o los clientes "
 "involucrados."
 
-#: faq.html.j2:79
+#: template/faq.html.j2:79
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:80
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -680,11 +734,11 @@ msgid ""
 "regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:95
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:96
 msgid ""
 "Taler's wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -695,24 +749,24 @@ msgid ""
 "future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:109
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:110
 msgid ""
 "We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
 "have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:118
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: faq.html.j2:119
+#: template/faq.html.j2:119
 msgid ""
 "The exchange would be operated by a bank or in cooperation with a bank, "
 "and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -722,13 +776,13 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:129
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:130
 msgid ""
 "Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -737,11 +791,11 @@ msgid ""
 "respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:140
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:141
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -751,11 +805,11 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:153
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:155
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -772,7 +826,7 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:15
 msgid ""
 "GNU Taler is a privacy-preserving payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -780,28 +834,28 @@ msgid ""
 "evasion and money laundering."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is payments; it "
 "is not meant as a store of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:30
 msgid ""
 "Payment are made after exchanging existing money "
 "into electronic money with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:37
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments without making their customers register on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:44
 msgid ""
 "GNU Taler is immune against many types of fraud, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -809,11 +863,11 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:60
 msgid "Paying with Taler"
 msgstr "Pagando con Taler"
 
-#: features.html.j2:62
+#: template/features.html.j2:62
 #, fuzzy
 #| msgid ""
 #| "To pay with Taler, customers install an electronic wallet on their "
@@ -834,7 +888,7 @@ msgstr ""
 "clic, nunca son rechazados equivocadamente por detección de fraude, y no "
 "representan ningún riesgo de phishing o robo de identidad."
 
-#: features.html.j2:70
+#: template/features.html.j2:70
 #, fuzzy
 #| msgid ""
 #| "To pay with Taler, customers install an electronic wallet on their "
@@ -855,15 +909,15 @@ msgstr ""
 "clic, nunca son rechazados equivocadamente por detección de fraude, y no "
 "representan ningún riesgo de phishing o robo de identidad."
 
-#: features.html.j2:77
+#: template/features.html.j2:77
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr "Recibiendo pagos con Taler"
 
-#: features.html.j2:85
+#: template/features.html.j2:85
 #, fuzzy
 #| msgid ""
 #| "To receive Taler payments, a merchant needs a bank account in the "
@@ -884,21 +938,21 @@ msgstr ""
 "puede ejecutarse en el hardware del comerciante, o puede estar alojado por "
 "un tercero. "
 
-#: features.html.j2:94
+#: template/features.html.j2:94
 msgid ""
 "Merchant integration is simple, and customers can pay for products without "
 "even having to register an account."
 msgstr ""
 
-#: features.html.j2:99
+#: template/features.html.j2:99
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:113
 msgid "Practical"
 msgstr "Práctico"
 
-#: features.html.j2:116
+#: template/features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -908,11 +962,11 @@ msgstr ""
 "asegurados criptográficamente y se confirman en milisegundos con costos de "
 "transacción extremadamente bajos."
 
-#: features.html.j2:126
+#: template/features.html.j2:126
 msgid "Stable"
 msgstr "Estable"
 
-#: features.html.j2:129
+#: template/features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -925,11 +979,12 @@ msgstr ""
 "corresponden a monedas existentes, tales como dólares estadounidenses, euros "
 "o incluso bitcoins."
 
-#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
+#: template/features.html.j2:140 template/governments.html.j2:58
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Seguro"
 
-#: features.html.j2:143
+#: template/features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -940,11 +995,11 @@ msgstr ""
 "rechaza a un cliente legítimo debido a un falso positivo en la detección de "
 "fraude."
 
-#: features.html.j2:155 governments.html.j2:25
+#: template/features.html.j2:155 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Imponible"
 
-#: features.html.j2:158
+#: template/features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -955,11 +1010,11 @@ msgstr ""
 "mayoría de las monedas electrónicas, Taler ayuda a prevenir los mercados "
 "negros. Taler no es adecuado para actividades ilegales."
 
-#: features.html.j2:168
+#: template/features.html.j2:168
 msgid "Private"
 msgstr "Privado"
 
-#: features.html.j2:170
+#: template/features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
@@ -969,11 +1024,11 @@ msgstr ""
 "pagos en efectivo, nadie puede rastrear cómo gasta su dinero electrónico. "
 "Sin embargo, obtiene una prueba de pago legalmente válida."
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:181 template/governments.html.j2:88
 msgid "Libre"
 msgstr "Libre"
 
-#: features.html.j2:184
+#: template/features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -987,32 +1042,32 @@ msgstr ""
 "referencia es un paquete GNU, siempre "
 "permanecerá como software libre."
 
-#: financial-news.html.j2:6
+#: template/financial-news.html.j2:6
 msgid "Financial News"
 msgstr "Noticias Financieras"
 
-#: financial-news.html.j2:9
+#: template/financial-news.html.j2:9
 msgid ""
 "This page explains (only in English) how Taler can change ongoing "
 "developments in the financial industry."
 msgstr ""
 
-#: glossary.html.j2:6
+#: template/glossary.html.j2:6
 msgid "auditor"
 msgstr "Auditor"
 
-#: glossary.html.j2:8
+#: template/glossary.html.j2:8
 msgid ""
 "trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 "Tercero de confianza que verifica que la `plataforma de intercambio` está "
 "funcionando correctamente"
 
-#: glossary.html.j2:12
+#: template/glossary.html.j2:12
 msgid "bank"
 msgstr "Banco"
 
-#: glossary.html.j2:14
+#: template/glossary.html.j2:14
 msgid ""
 "traditional financial service provider who offers wire `transfers` between "
 "accounts"
@@ -1020,11 +1075,11 @@ msgstr ""
 "Proveedor tradicional de servicios financieros que ofrece `transferencias` "
 "bancarias entre cuentas"
 
-#: glossary.html.j2:18
+#: template/glossary.html.j2:18
 msgid "coin"
 msgstr "Moneda"
 
-#: glossary.html.j2:20
+#: template/glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
 "known as the `denomination` of the coin"
@@ -1032,30 +1087,30 @@ msgstr ""
 "Las monedas son fichas individuales que representan una cierta cantidad de "
 "valor, también conocida como la `denominación` de la moneda"
 
-#: glossary.html.j2:24
+#: template/glossary.html.j2:24
 msgid "contract"
 msgstr "Contrato"
 
-#: glossary.html.j2:26
+#: template/glossary.html.j2:26
 msgid "the proposal signed by the wallet."
 msgstr "La propuesta firmada por la billetera"
 
-#: glossary.html.j2:30
+#: template/glossary.html.j2:30
 msgid "denomination"
 msgstr "Denominación"
 
-#: glossary.html.j2:32
+#: template/glossary.html.j2:32
 msgid ""
 "unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 "Unidad de moneda, especifica tanto la divisa como el valor nominal de una "
 "`moneda`"
 
-#: glossary.html.j2:36
+#: template/glossary.html.j2:36
 msgid "denomination key"
 msgstr "Clave de denominación o 'denomination key'"
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:38
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
@@ -1063,11 +1118,11 @@ msgstr ""
 "Clave RSA utilizada por la plataforma de intercambio para certificar que una "
 "determinada `moneda` es válida y de una determinada `denominación`"
 
-#: glossary.html.j2:42
+#: template/glossary.html.j2:42
 msgid "deposit"
 msgstr "Depósito"
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
 "exchange to credit his `bank` account in the future using a wire `transfer`"
@@ -1076,11 +1131,11 @@ msgstr ""
 "intercambio, esperando que éste acredite su cuenta del `banco` en el futuro "
 "mediante una transferencia bancaria."
 
-#: glossary.html.j2:48
+#: template/glossary.html.j2:48
 msgid "dirty"
 msgstr "Moneda sucia"
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:50
 msgid ""
 "a `coin` is dirty if its public key may be known to an entity other than the "
 "customer, thereby creating the danger of some entity being able to link "
@@ -1091,11 +1146,11 @@ msgstr ""
 "fuese capaz de vincular múltiples transacciones con el propietario de esa "
 "moneda, en caso de que la moneda no hubiera sido previamente actualizada."
 
-#: glossary.html.j2:54
+#: template/glossary.html.j2:54
 msgid "exchange"
 msgstr "Plataforma de intercambio"
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:56
 #, fuzzy
 #| msgid ""
 #| "Taler's payment service provider. Issues eletronic `coins` during "
@@ -1108,11 +1163,11 @@ msgstr ""
 "durante el `retiro` y las recupera cuando son `depositadas` por los "
 "comerciantes."
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:60
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:62
 msgid ""
 "Various operations come with time limits. In particular, `denomination keys` "
 "come with strict time limits for the various operations involving the `coin` "
@@ -1125,28 +1180,28 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:74
 msgid "extension"
 msgstr "Extensión"
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr "Implementación de una `billetera` para navegadores web"
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:80
 msgid "fresh coin"
 msgstr "Moneda fresca"
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 "Una `moneda` es fresca si su clave pública sólo es conocida por el cliente"
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:86
 msgid "master key"
 msgstr "Clave maestra o 'master key'"
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1154,21 +1209,21 @@ msgstr ""
 "La clave offline utilizada por la plataforma de intercambio para certificar "
 "claves de denominación y claves de firma de mensajes"
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:92
 msgid "message signing key"
 msgstr "Clave de firma de mensajes"
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 "Clave utilizada por la plataforma de intercambio para firmar mensajes en "
 "línea, que no sean monedas"
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:98
 msgid "offer"
 msgstr "Oferta"
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1184,52 +1239,52 @@ msgstr ""
 "otras palabras, una vez que el backend agrega la información que falta a la "
 "oferta y la firma, la convierte en una propuesta."
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:109
 msgid "owner"
 msgstr "Propiedad"
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 "Una `moneda` es propiedad de la entidad que conoce la clave privada de la "
 "moneda."
 
-#: glossary.html.j2:115
+#: template/glossary.html.j2:115
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:117
 msgid ""
 "operation by which an exchange returns the value of coins affected by a "
 "`revocation` to their `owner`, either by allowing the owner to withdraw new "
 "coins or wiring funds back to the bank account of the `owner`"
 msgstr ""
 
-#: glossary.html.j2:123
+#: template/glossary.html.j2:123
 msgid "proof"
 msgstr "Prueba"
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 "Mensaje que demuestra criptográficamente que una afirmación es correcta"
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:129
 msgid "proposal"
 msgstr "Propuesta"
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 "Una oferta que ha sido completada y firmado por el backend del comerciante."
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:135
 msgid "reserve"
 msgstr "Reserva"
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
@@ -1239,11 +1294,11 @@ msgstr ""
 "plataforma de intercambio listo para un «retiro», o los fondos previstos en "
 "la cuenta bancaria para cubrir las obligaciones de las monedas en circulación"
 
-#: glossary.html.j2:141
+#: template/glossary.html.j2:141
 msgid "refreshing"
 msgstr "Renovación de moneda"
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1251,11 +1306,11 @@ msgstr ""
 "Operación mediante la cual se convierte una `moneda` `sucia` en una o más "
 "monedas `frescas`"
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:147
 msgid "refund"
 msgstr "Reembolso"
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1265,13 +1320,13 @@ msgstr ""
 "obtuvo de una operación de `depósito', dando nuevamente al cliente el "
 "derecho a estos fondos"
 
-#: glossary.html.j2:153
+#: template/glossary.html.j2:153
 #, fuzzy
 #| msgid "denomination"
 msgid "revocation"
 msgstr "Denominación"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:155
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1279,11 +1334,11 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:159
 msgid "sharing"
 msgstr "Compartir"
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
@@ -1292,19 +1347,19 @@ msgstr ""
 "acceso a la clave privada de la moneda, lo que permite a todos los "
 "copropietarios gastar la moneda en cualquier momento."
 
-#: glossary.html.j2:165
+#: template/glossary.html.j2:165
 msgid "signing key"
 msgstr "Clave de firmado"
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:167
 msgid "see message signing key."
 msgstr "Ver clave de firma de mensajes"
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:171
 msgid "spending"
 msgstr "Gasto"
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1312,19 +1367,19 @@ msgstr ""
 "Operación mediante la cual un cliente concede a un comerciante el derecho de "
 "`depositar` monedas a cambio de mercancía"
 
-#: glossary.html.j2:177
+#: template/glossary.html.j2:177
 msgid "transfer"
 msgstr "Transferencia"
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr "Método de envío de fondos entre cuentas `bancarias`"
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:183
 msgid "transaction"
 msgstr "Transacción"
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1332,38 +1387,38 @@ msgstr ""
 "Método mediante el cual la propiedad se transfiere exclusivamente de una "
 "entidad a otra"
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:189
 msgid "transaction id"
 msgstr "Identificador de la transacción o `transaction id`"
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr "Número único por el cual un comerciante identifica una `transacción`"
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:195
 msgid "wallet"
 msgstr "Billetera "
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 "Software que opera en la computadora de un cliente; que retira, almacena y "
 "gasta monedas"
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:201
 msgid "wire transfer"
 msgstr "Transferencia bancaria"
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:203
 msgid "see `transfer`"
 msgstr "Ver 'transferencia'"
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr "Identificador de transferencias bancarias"
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1371,22 +1426,22 @@ msgstr ""
 "Asunto de una `transferencia` bancaria; generalmente una serie aleatoria "
 "para identificar de forma única la `transferencia`"
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:213
 msgid "withdrawal"
 msgstr "Retiro"
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 "Operación mediante la cual una `billetera` puede convertir fondos de una "
 "reserva en monedas nuevas"
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:219
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:221
 msgid ""
 "a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
 "`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
@@ -1397,11 +1452,11 @@ msgid ""
 "past the legal data retention requirement)."
 msgstr ""
 
-#: governments.html.j2:6
+#: template/governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Ventajas para los gobiernos"
 
-#: governments.html.j2:8
+#: template/governments.html.j2:8
 msgid ""
 "Taler provides accountability to ensure business operate legally, while also "
 "respecting civil liberties of citizens. Taler is a payment system based on "
@@ -1416,7 +1471,7 @@ msgstr ""
 "como reguladores de confianza. Taler contribuye a la soberanía digital en la "
 "infraestructura financiera crítica."
 
-#: governments.html.j2:28
+#: template/governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
 "taxation. With Taler, the receiver of any form of payment is easily "
@@ -1433,7 +1488,7 @@ msgstr ""
 "individuos sobre la base de sus ingresos, haciendo menos viable la evasión "
 "de impuestos y los mercados negros."
 
-#: governments.html.j2:41
+#: template/governments.html.j2:41
 msgid ""
 "Thus, despite offering anonymity for citizens spending digital cash to buy "
 "goods and services, Taler also ensures that the state can observe incoming "
@@ -1454,7 +1509,7 @@ msgstr ""
 "compartido a fondos con amigos y familiares de confianza, ni la "
 "sincronización de billeteras a través de múltiples dispositivos."
 
-#: governments.html.j2:61
+#: template/governments.html.j2:61
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1469,7 +1524,7 @@ msgstr ""
 "limitados, mejorando la seguridad económica para las personas, los "
 "comerciantes, la plataforma de intercambio y el Estado."
 
-#: governments.html.j2:73
+#: template/governments.html.j2:73
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1487,7 +1542,7 @@ msgstr ""
 "garantía se gestiona honestamente. Esto asegura que la plataforma de "
 "intercambio no amenace la economía mediante el fraude."
 
-#: governments.html.j2:91
+#: template/governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
 "will enable competition and avoid the monopolization of payment systems that "
@@ -1498,11 +1553,11 @@ msgstr ""
 "los sistemas de pago que amenaza la estabilidad política y financiera "
 "mundial hoy en día."
 
-#: governments.html.j2:101
+#: template/governments.html.j2:101
 msgid "Efficient"
 msgstr "Eficiente"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:104
 msgid ""
 "Taler has an efficient design. Unlike Blockchain-based payment systems, such "
 "as Bitcoin, Taler will not threaten the availability of national electric "
@@ -1513,15 +1568,15 @@ msgstr ""
 "disponibilidad de redes eléctricas nacionales ni contribuirá "
 "(significativamente) a la contaminación ambiental."
 
-#: governments.html.j2:120
+#: template/governments.html.j2:120
 msgid "Taler and regulation"
 msgstr "Taler y la regulación vigente"
 
-#: governments.html.j2:122
+#: template/governments.html.j2:122
 msgid "Anti money laundering (AML)"
 msgstr "Anti Lavado de dinero o 'Anti money laundering' (AML)"
 
-#: governments.html.j2:123
+#: template/governments.html.j2:123
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1529,11 +1584,11 @@ msgstr ""
 "Con Taler, los ingresos son visibles y pueden estar vinculados al contrato "
 "firmado por ambas partes."
 
-#: governments.html.j2:124
+#: template/governments.html.j2:124
 msgid "Know your customer (KYC)"
 msgstr "Conoce a tu cliente (KYC)"
 
-#: governments.html.j2:125
+#: template/governments.html.j2:125
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
@@ -1541,11 +1596,11 @@ msgstr ""
 "En Taler, quien paga y quien recibe el pago se conocen por sus cuentas "
 "bancarias al momento de retirar o depositar monedas respectivamente"
 
-#: governments.html.j2:126
+#: template/governments.html.j2:126
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "Regulación General de Protección de Datos (GDPR)"
 
-#: governments.html.j2:127
+#: template/governments.html.j2:127
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
@@ -1554,11 +1609,11 @@ msgstr ""
 "diseño, implementa la minimización de datos y privacidad de forma "
 "predeterminada."
 
-#: governments.html.j2:128
+#: template/governments.html.j2:128
 msgid "Payment Services Directive (PSD2)"
 msgstr "Directriz de Servicios de Pago (PSD2)"
 
-#: governments.html.j2:129
+#: template/governments.html.j2:129
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
@@ -1566,11 +1621,11 @@ msgstr ""
 "Taler provee un estándar abierto con API (Interfaz de Programación de "
 "Aplicaciones) públicas, que contribuye a un sector bancario competitivo."
 
-#: governments.html.j2:137
+#: template/governments.html.j2:137
 msgid "Taler provides privacy and accountability"
 msgstr "Taler provee privacidad y responsabilidad"
 
-#: governments.html.j2:140
+#: template/governments.html.j2:140
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
@@ -1580,7 +1635,7 @@ msgstr ""
 "tradicionales que entran y salen del sistema de pago de Taler. A partir de "
 "las transferencias electrónicas, los gobiernos pueden obtener:"
 
-#: governments.html.j2:148
+#: template/governments.html.j2:148
 msgid ""
 "The total amount of digital currency withdrawn by a customer. The government "
 "can impose limits on how much digital cash a customer can withdraw within a "
@@ -1590,12 +1645,12 @@ msgstr ""
 "puede imponer límites a la cantidad de efectivo electrónico que un cliente "
 "puede retirar dentro de un plazo determinado."
 
-#: governments.html.j2:157
+#: template/governments.html.j2:157
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 "El ingreso recibido por cualquier comerciante a través del sistema de Taler."
 
-#: governments.html.j2:164
+#: template/governments.html.j2:164
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
@@ -1605,7 +1660,7 @@ msgstr ""
 "el comerciante. Sin embargo, esta información normalmente no incluye la "
 "identidad del cliente."
 
-#: governments.html.j2:174
+#: template/governments.html.j2:174
 msgid ""
 "The amounts of digital coins legitimately withdrawn by customers from the "
 "exchange, the value of non-redeemed digital coins in customer's wallets, the "
@@ -1619,23 +1674,23 @@ msgstr ""
 "detalles de las operaciones de depósito realizadas por los comerciantes con "
 "la plataforma de intercambio."
 
-#: gsoc-codeless.html.j2:5
+#: template/gsoc-codeless.html.j2:5
 msgid "GSoC 2018: Codeless Payment"
 msgstr ""
 
-#: gsoc-codeless.html.j2:6
+#: template/gsoc-codeless.html.j2:6
 msgid ""
 "Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and "
 "guidance of Florian Dold."
 msgstr ""
 
-#: gsoc-codeless.html.j2:12
+#: template/gsoc-codeless.html.j2:12
 #, fuzzy
 #| msgid "system overview"
 msgid "Overview"
 msgstr "Diagrama general del sistema"
 
-#: gsoc-codeless.html.j2:14
+#: template/gsoc-codeless.html.j2:14
 msgid ""
 "Codeless payment is a component that sits between the seller's frontend and "
 "the GNU Taler merchant backend. This component has a web interface, where "
@@ -1645,15 +1700,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:23
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:24
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:28
 msgid ""
 "The primary use case is the registration of the merchant. The codeless "
 "payment backend provides a secure django authenticated login to the "
@@ -1664,19 +1719,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:33
 msgid ""
 "A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:38
+#: template/gsoc-codeless.html.j2:38
 msgid ""
 "The merchant can upload digital inventory (like a PDF or HTML page) via the "
 "codeless payments frontend and the user can then purchase it and view the "
 "version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:43
+#: template/gsoc-codeless.html.j2:43
 msgid ""
 "The merchant can add any physical inventory available in his stocks. While "
 "adding these inventory, the seller is prompted to add minimum quantity of "
@@ -1685,7 +1740,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1695,7 +1750,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1703,31 +1758,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1736,7 +1791,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1744,7 +1799,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1756,7 +1811,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1764,7 +1819,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1774,15 +1829,15 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "¡Invierta en Taler!"
 
-#: investors.html.j2:9
+#: template/investors.html.j2:9
 msgid ""
 "We have created a company, Taler Systems SA in Luxembourg.
 Please "
 "contact invest@taler.net if you want to invest in Taler."
@@ -1791,11 +1846,11 @@ msgstr ""
 "invertir en Taler puede contactarse al correo electrónico invest@taler."
 "net"
 
-#: investors.html.j2:24
+#: template/investors.html.j2:24
 msgid "The Team"
 msgstr "El Equipo"
 
-#: investors.html.j2:27
+#: template/investors.html.j2:27
 msgid ""
 "Our team combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1807,7 +1862,7 @@ msgstr ""
 "civiles, y académicos. Estamos unidos por una visión de cómo deberían "
 "funcionar los pagos y nuestra meta es imponer esta visión sobre el mundo."
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
 msgid ""
 "We are currently supported by Inria, "
 "the French national institute for research in informatics and automation, "
@@ -1818,11 +1873,11 @@ msgstr ""
 "Instituto Nacional de Investigación en Informática y Automatización, y la Fundación Libertad Renovable."
 
-#: investors.html.j2:45
+#: template/investors.html.j2:45
 msgid "The Technology"
 msgstr "La Tecnología"
 
-#: investors.html.j2:48
+#: template/investors.html.j2:48
 msgid ""
 "All transactions in Taler are secured using modern cryptography and trust in all parties is minimized. Financial "
@@ -1842,11 +1897,11 @@ msgstr ""
 "puesta en evidencia de la honestidad de los participantes. Los costos reales "
 "de las transacciones son fracciones de un centavo."
 
-#: investors.html.j2:63
+#: template/investors.html.j2:63
 msgid "The Business"
 msgstr "El Negocio"
 
-#: investors.html.j2:66
+#: template/investors.html.j2:66
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1865,22 +1920,22 @@ msgstr ""
 "pago tradicionales en la plataforma de intercambio. La plataforma de "
 "intercambio cobra una comisión para facilitar las transacciones."
 
-#: investors.html.j2:85
+#: template/investors.html.j2:85
 msgid "The Business Case"
 msgstr "El Caso de los Negocios"
 
-#: investors.html.j2:91
+#: template/investors.html.j2:91
 msgid ""
 "Our financial news page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:114
 msgid "Running a Taler payment service operator"
 msgstr "Operar una plataforma de servicio de pago de Taler"
 
-#: investors.html.j2:117
+#: template/investors.html.j2:117
 msgid ""
 "The payment service operator runs the Taler exchange. The exchange "
 "charges transaction fees to customers or merchants. Its operational "
@@ -1893,7 +1948,7 @@ msgstr ""
 "transferencias electrónicas y del funcionamiento de la infraestructura "
 "informática."
 
-#: investors.html.j2:127
+#: template/investors.html.j2:127
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
@@ -1901,7 +1956,7 @@ msgstr ""
 "Las operaciones criptográficas, el ancho de banda y los costes de "
 "almacenamiento son inferiores a 0.01 centavos por transacción."
 
-#: investors.html.j2:129
+#: template/investors.html.j2:129
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
@@ -1910,7 +1965,7 @@ msgstr ""
 "electrónicas más grandes de los comerciantes para reducir al mínimo los "
 "costes de la transferencia bancaria."
 
-#: investors.html.j2:131
+#: template/investors.html.j2:131
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -1919,21 +1974,21 @@ msgstr ""
 "cualquier operación que tenga un coste (retirar, depositar, actualizar, "
 "reembolsar o realizar transferencias electrónicas agrupadas)."
 
-#: investors.html.j2:133
+#: template/investors.html.j2:133
 msgid "Partnership with banks establishes consumer trust."
 msgstr "La asociación con bancos consolida la confianza del consumidor."
 
-#: investors.html.j2:135
+#: template/investors.html.j2:135
 msgid "Partnership with free software community enables rapid deployment."
 msgstr ""
 "La asociación con la comunidad de software libre permite un despliegue "
 "rápido."
 
-#: merchants.html.j2:5
+#: template/merchants.html.j2:5
 msgid "Advantages for Merchants"
 msgstr "Ventajas para los comerciantes"
 
-#: merchants.html.j2:8
+#: template/merchants.html.j2:8
 msgid ""
 "Taler is a cost-effective electronic payment system which provides you with "
 "cryptographic proof that the payment worked correctly within milliseconds. "
@@ -1945,11 +2000,11 @@ msgstr ""
 "milisegundos. Sus clientes web pagan con niveles de comodidad antes "
 "desconocidos sin riesgo de fraude."
 
-#: merchants.html.j2:22
+#: template/merchants.html.j2:22
 msgid "Fast"
 msgstr "Rápido"
 
-#: merchants.html.j2:25
+#: template/merchants.html.j2:25
 msgid ""
 "Processing transactions with Taler is fast, allowing you to confirm the "
 "transaction with your customer virtually immediately. Your customers will "
@@ -1967,7 +2022,7 @@ msgstr ""
 "transacciones pequeñas para las que no vale la pena usar la tarjeta de "
 "crédito debido a la sobrecarga mental que esto representa para sus clientes."
 
-#: merchants.html.j2:44
+#: template/merchants.html.j2:44
 msgid ""
 "You will have cryptographic proof of payment from the Taler payment service "
 "provider. With Taler you never handle sensitive customer account information "
@@ -1983,7 +2038,7 @@ msgstr ""
 "transacciones, usted puede usar estos contratos ante los tribunales en caso "
 "de disputas."
 
-#: merchants.html.j2:61
+#: template/merchants.html.j2:61
 msgid ""
 "Taler is free software, and you can use the liberally-licensed reference "
 "code as a starting point to integrate Taler into your services. To use "
@@ -1997,11 +2052,11 @@ msgstr ""
 "desarrollo de software libre asegurará de que pueda seleccionar entre muchos "
 "integradores competentes."
 
-#: merchants.html.j2:76
+#: template/merchants.html.j2:76
 msgid "Cheap"
 msgstr "Barato"
 
-#: merchants.html.j2:79
+#: template/merchants.html.j2:79
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -2014,11 +2069,11 @@ msgstr ""
 "de Taler pueden operar con gastos muy bajos y, por lo tanto, ofrecen tarifas "
 "de transacción asequibles."
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:89
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:92
 #, fuzzy
 #| msgid ""
 #| "Taler can be used for different currencies (such as Euros, US Dollars or "
@@ -2034,11 +2089,11 @@ msgstr ""
 "únicamente por las regulaciones aplicables y por los valores que el "
 "proveedor de servicios de pago admita."
 
-#: merchants.html.j2:101
+#: template/merchants.html.j2:101
 msgid "Ethical"
 msgstr "Ético"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:104
 msgid ""
 "Taler prevents tax evasion and money laundering. Taler's protocols are "
 "efficient and do not use wasteful proof-of-work calculations. Taler "
@@ -2050,31 +2105,31 @@ msgstr ""
 "la transparencia proporcionando un estándar abierto e implementaciones de "
 "referencia de software libre."
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:119
 msgid "Manuals for merchants"
 msgstr "Manual para comerciantes"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:122
 msgid "The GNU Taler merchant backend operator manual"
 msgstr "Manual de operaciones del comerciante de GNU Taler [en]"
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr "Tutorial de integración de la tienda web GNU Taler (PHP) [en]"
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:128
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr "Tutorial de integración de la tienda web GNU Taler (Python) [en]"
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:140
 msgid "The GNU Taler Merchant Backend"
 msgstr "Backend del comerciante de GNU Taler"
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:142
 msgid "Merchants process payments using the Taler backend:"
 msgstr "Proceso de pagos del comerciante usando el backend de Taler:"
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:147
 msgid ""
 "The backend signs and stores the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
@@ -2085,7 +2140,7 @@ msgstr ""
 "comerciante necesita dar la orden del cliente al backend en un formato de "
 "JSON."
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:156
 msgid ""
 "The backend validates payments received from the wallet and "
 "executes them with the Taler payment service provider (the exchange). "
@@ -2098,7 +2153,7 @@ msgstr ""
 "solicitud de pago a través del backend de Taler y comprobar el estado del "
 "protocolo HTTP que retorna."
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:167
 msgid ""
 "The backend can list completed transactions and map wire "
 "transfers to sets of business transactions, including the exact terms of "
@@ -2108,49 +2163,49 @@ msgstr ""
 "relacionar las transferencias bancarias con los pagos electrónicos "
 "correspondientes, incluyendo los términos exactos de cada contrato."
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:183
 msgid "customer perspective"
 msgstr "Perspectiva del consumidor"
 
-#: news.html.j2:16
+#: template/news.html.j2:16
 msgid "More news"
 msgstr ""
 
-#: old-news.html.j2:6
+#: template/old-news.html.j2:6
 #, fuzzy
 #| msgid "Taler News"
 msgid "Older News"
 msgstr "Noticias de Taler"
 
-#: old-news.html.j2:9
+#: template/old-news.html.j2:9
 msgid "This page documents the GNU Taler history."
 msgstr ""
 
-#: press.html.j2:4
+#: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler en la Prensa"
 
-#: principles.html.j2:22
+#: template/principles.html.j2:22
 #, fuzzy
 #| msgid "GNU Taler in the Press"
 msgid "GNU Taler: Design Principles"
 msgstr "GNU Taler en la Prensa"
 
-#: principles.html.j2:29
+#: template/principles.html.j2:29
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:36
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:40
 msgid ""
 "... in the are of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:42
 msgid ""
 "GNU Taler must be Free Software. For merchants, our Free Software reference "
@@ -2159,24 +2214,24 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:51
 msgid ""
 "Customers benefit from Free Software as the wallet software can be made to "
 "run on a variety of platforms, and the absence of user-hostile features such "
 "as tracking or telemetry can easily be assured."
 msgstr ""
 
-#: principles.html.j2:63
+#: template/principles.html.j2:63
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:68
 #, fuzzy
 #| msgid "How does Taler protect my privacy?"
 msgid "You deserve some privacy"
 msgstr "¿De qué manera Taler protege mi privacidad?"
 
-#: principles.html.j2:70
+#: template/principles.html.j2:70
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -2184,7 +2239,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:78
 msgid ""
 "In legislations with data protection regulations (such as the recently "
 "introduced GDPR in Europe), merchants benefit from this as well, as no data "
@@ -2194,45 +2249,45 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:92
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:97
 #, fuzzy
 #| msgid "Anti money laundering (AML)"
 msgid "Money laundering"
 msgstr "Anti Lavado de dinero o 'Anti money laundering' (AML)"
 
-#: principles.html.j2:99
+#: template/principles.html.j2:99
 msgid ""
 "As a payment system must still be legal to operate and use, it must comply "
 "with these requirements. Furthermore, we consider levying of taxes as "
 "beneficial to society."
 msgstr ""
 
-#: principles.html.j2:110
+#: template/principles.html.j2:110
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:115
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:117
 msgid ""
 "This imposes requirements on the security of the system, as well as on the "
 "general design, as payment fraud can also happen through misleading user "
 "interface design or the lack of cryptographic evidence for certain processes."
 msgstr ""
 
-#: principles.html.j2:128
+#: template/principles.html.j2:128
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:132
 #, fuzzy
 #| msgid "General Data Protection Regulation (GDPR)"
 msgid ""
@@ -2240,7 +2295,7 @@ msgid ""
 "(GDPR) compliant"
 msgstr "Regulación General de Protección de Datos (GDPR)"
 
-#: principles.html.j2:134
+#: template/principles.html.j2:134
 msgid ""
 "The reason behind this goal is similar to (2). The privacy of buyers is "
 "given priority, but other parties such as merchants still benefit from it, "
@@ -2248,15 +2303,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:144
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:148
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:150
 msgid ""
 "Specifically it must be usable for non-expert customers. Usability also "
 "applies to the integration with merchants, and informs choices about the "
@@ -2264,33 +2319,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:162
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Eficiente"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:166
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Eficiente"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:168
 msgid ""
 "Approaches such as proof-of-work are ruled out by this requirement. "
 "Efficiency is necessary for GNU Taler to be used for micropayments."
 msgstr ""
 
-#: principles.html.j2:177
+#: template/principles.html.j2:177
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:181
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:183
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -2298,15 +2353,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:195
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:199
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:201
 msgid ""
 "It must be relatively easy for competitors to join the systems. While the "
 "barriers for this in traditional financial systems are rather high, the "
@@ -2316,11 +2371,11 @@ msgid ""
 "instead of having one completely monolithic system."
 msgstr ""
 
-#: schemafuzz.html.j2:6
+#: template/schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
 
-#: team.html.j2:16
+#: template/team.html.j2:16
 msgid ""
 "GNU maintainer. Network security & privacy researcher. Software "
 "architect."
@@ -2328,7 +2383,7 @@ msgstr ""
 "Responsable del mantenimiento de GNU. Especialista en seguridad de redes. "
 "Investigador en privacidad informática. Arquitecto de Software."
 
-#: team.html.j2:21
+#: template/team.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
@@ -2336,125 +2391,74 @@ msgstr ""
 "Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
 "de TI en diferentes industrias."
 
-#: team.html.j2:26
+#: template/team.html.j2:26
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
+#: template/team.html.j2:33
 msgid "GNU mainatiner, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:38
 msgid "Applied cryptography. Contact to W3c & Tor."
 msgstr "Criptografía aplicada. Contacto para W3C & Tor."
 
-#: team.html.j2:43
+#: template/team.html.j2:43
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fundador del proyecto GNU. Orientación ética y licencias."
 
-#: team.html.j2:50
+#: template/team.html.j2:50
 msgid "Software engineer."
 msgstr "Ingeniero de Software."
 
-#: team.html.j2:55
+#: template/team.html.j2:55
 msgid "Sustainable business development."
 msgstr "Desarrollo de negocios sostenibles."
 
-#: team.html.j2:60
+#: template/team.html.j2:60
 msgid "Theoretical foundations."
 msgstr "Fundamentos teóricos."
 
-#: team.html.j2:66
+#: template/team.html.j2:66
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:73 template/team.html.j2:77 template/team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr "Traductor (español)"
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:87 template/team.html.j2:91 template/team.html.j2:95
 msgid "Translator (Italian)"
 msgstr "Traductora (italiano)"
 
-#: team.html.j2:99
+#: template/team.html.j2:99
 msgid "Translator (German)"
 msgstr "Traductor (alemán)"
 
-#: team.html.j2:106
+#: template/team.html.j2:106
 msgid "Hardware security module"
 msgstr "Módulo de seguridad de hardware"
 
-#: team.html.j2:110
+#: template/team.html.j2:110
 msgid "Risk management"
 msgstr "Gestión de riesgos"
 
-#: team.html.j2:118
+#: template/team.html.j2:118
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
 
-#: team.html.j2:122
+#: template/team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
 
-#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
-#: team.html.j2:146
+#: template/team.html.j2:128 template/team.html.j2:132
+#: template/team.html.j2:136 template/team.html.j2:142
+#: template/team.html.j2:146
 #, fuzzy
 #| msgid "Taler for developers"
 msgid "Free software developer."
 msgstr "Taler para programadores"
 
-#: common/base.j2:5
-msgid "GNU Taler"
-msgstr "GNU Taler"
-
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr "Reservas Electrónicas Gravales, Anónimas y Libres"
-
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "El Equipo"
-
-#: common/footer.j2.inc:16
-msgid "Contact"
-msgstr "Contacto"
-
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr "Preguntas frecuentes"
-
-#: common/footer.j2.inc:26
-msgid "Bibliography"
-msgstr "Bibliografía"
-
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by BFH"
-msgstr ""
-
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using Free Software "
-"only."
-msgstr ""
-"Está página fue creada usando únicamente software libre"
-
-#: common/navigation.j2.inc:21
-msgid "Features"
-msgstr ""
-
-#: common/navigation.j2.inc:22
-msgid "Principles"
-msgstr ""
-
-#: common/navigation.j2.inc:23
-msgid "Docs"
-msgstr ""
-
 #, fuzzy
 #~| msgid "exchange"
 #~ msgid "Code (Exchange)"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 3f96de28..4a86c3df 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,50 +2,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-01 18:07+0200\n"
+"POT-Creation-Date: 2019-09-02 09:39+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: fr \n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: architecture.html.j2:6
+#: common/base.j2:5
+msgid "GNU Taler"
+msgstr ""
+
+#: common/base.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr ""
+
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
+msgid "Team"
+msgstr ""
+
+#: common/footer.j2.inc:16
+msgid "Contact"
+msgstr ""
+
+#: common/footer.j2.inc:21
+msgid "FAQ"
+msgstr ""
+
+#: common/footer.j2.inc:26
+msgid "Bibliography"
+msgstr ""
+
+#: common/footer.j2.inc:32 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
+msgid "and"
+msgstr ""
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by BFH"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using Free Software "
+"only."
+msgstr ""
+
+#: common/navigation.j2.inc:21
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:22
+msgid "Principles"
+msgstr ""
+
+#: common/navigation.j2.inc:23
+msgid "Docs"
+msgstr ""
+
+#: template/architecture.html.j2:6
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "Taler System Architecture"
 msgstr "Vue d'ensemble de Taler"
 
-#: bibliography.html.j2:4
+#: template/bibliography.html.j2:4
 msgid "GNU Taler Bibliography"
 msgstr ""
 
-#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:30 bibliography.html.j2:36
+#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
 msgid "by"
 msgstr ""
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
-#: bibliography.html.j2:36 common/footer.j2.inc:32
-msgid "and"
-msgstr ""
-
-#: bibliography.html.j2:37
+#: template/bibliography.html.j2:37
 msgid "available upon request"
 msgstr ""
 
-#: contact.html.j2:6
+#: template/contact.html.j2:6
 msgid "Contact information"
 msgstr ""
 
-#: contact.html.j2:13
+#: template/contact.html.j2:13
 msgid "The mailing list"
 msgstr ""
 
-#: contact.html.j2:15
+#: template/contact.html.j2:15
 msgid ""
 "An archived, public mailing list for GNU Taler is hosted at https://lists.gnu.org/"
@@ -53,52 +103,52 @@ msgid ""
 "\"mailto:taler@gnu.org\">taler@gnu.org."
 msgstr ""
 
-#: contact.html.j2:25
+#: template/contact.html.j2:25
 msgid "Contacting individuals"
 msgstr ""
 
-#: contact.html.j2:27
+#: template/contact.html.j2:27
 msgid ""
 "Team members are generally reachable at LASTNAME@taler.net. All of "
 "us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
-#: contact.html.j2:36
+#: template/contact.html.j2:36
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:38
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "contact AT taler.net."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:46
 msgid "Reporting bugs"
 msgstr ""
 
-#: contact.html.j2:48
+#: template/contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our Bug tracker, which is shared with the GNUnet project. You can "
 "also report bugs or feature requests to the mailing list."
 msgstr ""
 
-#: contact.html.j2:59
+#: template/contact.html.j2:59
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:61
+#: template/contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact ceo AT taler.net."
 msgstr ""
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr ""
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:8
 msgid ""
 "
Contributors to GNU Taler with Git access must sign the copyright assignment to ensure that the  of the GNUnet and GNU Taler projects is satisfied.
"
 msgstr ""
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:17
 msgid ""
 "The agreements ensure that the code will continue to be made available "
 "under free software licenses, but gives developers the freedom to move code "
@@ -116,7 +166,7 @@ msgid ""
 "stores that are hostile to free software)."
 msgstr ""
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:25
 msgid ""
 "Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -124,15 +174,15 @@ msgid ""
 "sufficient, but snail mail is preferred."
 msgstr ""
 
-#: developers.html.j2:5
+#: template/developers.html.j2:5
 msgid "Taler for developers"
 msgstr "Taler pour les développeurs"
 
-#: developers.html.j2:12 merchants.html.j2:58
+#: template/developers.html.j2:12 template/merchants.html.j2:58
 msgid "Free"
 msgstr "Libre"
 
-#: developers.html.j2:15
+#: template/developers.html.j2:15
 msgid ""
 "GNU Taler is free software implementing an open protocol. Anybody is welcome "
 "to integrate our reference implementation into their applications. Different "
@@ -144,11 +194,11 @@ msgid ""
 "payment platform."
 msgstr ""
 
-#: developers.html.j2:32
+#: template/developers.html.j2:32
 msgid "RESTful"
 msgstr "Avec REST"
 
-#: developers.html.j2:35
+#: template/developers.html.j2:35
 msgid ""
 "Taler is designed to work on the Internet. To ensure that Taler payments can "
 "work with restrictive network setups, Taler uses a RESTful protocol over "
@@ -160,11 +210,11 @@ msgid ""
 "docs.taler.net/\">docs.taler.net."
 msgstr ""
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58
 msgid "Code"
 msgstr "Code"
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
 msgid ""
 "Taler is currently primarily developed by a research team at Inria and ."
 msgstr ""
 
-#: developers.html.j2:75
+#: template/developers.html.j2:75
 msgid "Documentation"
 msgstr "Documentation"
 
-#: developers.html.j2:78
+#: template/developers.html.j2:78
 msgid ""
 "In addition to this website, the documented code and the API "
@@ -187,65 +237,65 @@ msgid ""
 "\"bibliography.html\">bibliography."
 msgstr ""
 
-#: developers.html.j2:88
+#: template/developers.html.j2:88
 msgid "Discussion"
 msgstr "Discussion"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:91
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
 "read the list archive at http://lists.gnu.org/mailman/listinfo/taler."
 msgstr ""
 
-#: developers.html.j2:101
+#: template/developers.html.j2:101
 msgid "Regression Testing"
 msgstr "Tests de régression"
 
-#: developers.html.j2:104
+#: template/developers.html.j2:104
 msgid ""
 "We have Buildbot automation tests to "
 "detect regressions and check for portability at buildbot.taler.net."
 msgstr ""
 
-#: developers.html.j2:113
+#: template/developers.html.j2:113
 msgid "Code Coverage Analysis"
 msgstr "Mesure de couverture du code"
 
-#: developers.html.j2:116
+#: template/developers.html.j2:116
 msgid ""
 "We use LCOV to "
 "analyze the code coverage of our tests, the results are available at lcov.taler.net."
 msgstr ""
 
-#: developers.html.j2:131
+#: template/developers.html.j2:131
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:134 template/investors.html.j2:88
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
 "the following steps:"
 msgstr ""
 
-#: developers.html.j2:162
+#: template/developers.html.j2:162
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:165
 msgid ""
 "A customer instructs his bank to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -253,7 +303,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:177
+#: template/developers.html.j2:177
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to withdraw electronic coins. The electronic coins "
@@ -265,7 +315,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:195
+#: template/developers.html.j2:195
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to spend the coins with merchant portals that support the Taler "
@@ -280,7 +330,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:217
+#: template/developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins deposit the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -294,7 +344,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:240
+#: template/developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's bank account. The "
@@ -303,7 +353,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:254
+#: template/developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -313,7 +363,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:269
+#: template/developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -322,80 +372,80 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:37
+#: template/docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:38
+#: template/docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:44
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:46
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:144
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:152
+#: template/docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
-#: faq.html.j2:5
+#: template/faq.html.j2:5
 msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr ""
 
-#: faq.html.j2:6
+#: template/faq.html.j2:6
 msgid ""
 "Taler does not require any Blockchain technology, and is also not based "
 "on proof-of-work or any other distributed consensus mechanism. Instead, "
@@ -403,88 +453,88 @@ msgid ""
 "combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 
-#: faq.html.j2:13
+#: template/faq.html.j2:13
 msgid ""
 "It would be possible, however, to withdraw coins denominated in Bitcoin "
 "into a Taler wallet (with an appropriate exchange), which would give some "
 "benefits over plain Bitcoin, such as instant confirmation times."
 msgstr ""
 
-#: faq.html.j2:20
+#: template/faq.html.j2:20
 msgid "Where is the balance in my wallet stored?"
 msgstr ""
 
-#: faq.html.j2:21
+#: template/faq.html.j2:21
 msgid ""
 "Your wallet stores digital coins and thus ultimately your computer holds "
 "your balance. The exchange keeps funds matching all unspent coins in an "
 "escrow bank account."
 msgstr ""
 
-#: faq.html.j2:27
+#: template/faq.html.j2:27
 msgid "What if my wallet is lost?"
 msgstr ""
 
-#: faq.html.j2:28
+#: template/faq.html.j2:28
 msgid ""
 "Since the digital coins of value in your wallet are anonymized, the "
 "exchange can not assist you in recovering a lost or stolen wallet. Just like "
 "with a physical wallet for cash, you are responsible for keeping it safe."
 msgstr ""
 
-#: faq.html.j2:34
+#: template/faq.html.j2:34
 msgid ""
 "The risk of losing a wallet can be mitigated by making backups or keeping "
 "the balance reasonably low."
 msgstr ""
 
-#: faq.html.j2:39
+#: template/faq.html.j2:39
 msgid "What if my computer is hacked?"
 msgstr ""
 
-#: faq.html.j2:40
+#: template/faq.html.j2:40
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend "
 "coins from your wallet. Checking your balance might reveal to you that your "
 "device has been compromised."
 msgstr ""
 
-#: faq.html.j2:46
+#: template/faq.html.j2:46
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 
-#: faq.html.j2:47
+#: template/faq.html.j2:47
 msgid ""
 "If your friend provides goods or services for you in exchange for a "
 "payment, they can easily set up a Taler merchant and receive the payment in "
 "their bank account."
 msgstr ""
 
-#: faq.html.j2:52
+#: template/faq.html.j2:52
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among "
 "friends directly as well."
 msgstr ""
 
-#: faq.html.j2:58
+#: template/faq.html.j2:58
 msgid "How does Taler handle payments in different currencies?"
 msgstr ""
 
-#: faq.html.j2:59
+#: template/faq.html.j2:59
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 
-#: faq.html.j2:63
+#: template/faq.html.j2:63
 msgid "Taler currently does not offer conversion between currencies."
 msgstr ""
 
-#: faq.html.j2:67
+#: template/faq.html.j2:67
 msgid "How does Taler protect my privacy?"
 msgstr ""
 
-#: faq.html.j2:68
+#: template/faq.html.j2:68
 msgid ""
 "Your wallet stores digital coins that are blindly signed by an exchange. The use of a "
@@ -492,11 +542,11 @@ msgid ""
 "knowing which coin it signed for which customer."
 msgstr ""
 
-#: faq.html.j2:79
+#: template/faq.html.j2:79
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:80
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -509,11 +559,11 @@ msgid ""
 "regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:95
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:96
 msgid ""
 "Taler's wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -524,24 +574,24 @@ msgid ""
 "future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:109
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:110
 msgid ""
 "We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
 "have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:118
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: faq.html.j2:119
+#: template/faq.html.j2:119
 msgid ""
 "The exchange would be operated by a bank or in cooperation with a bank, "
 "and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -551,13 +601,13 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:129
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:130
 msgid ""
 "Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -566,11 +616,11 @@ msgid ""
 "respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:140
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:141
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -580,11 +630,11 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:153
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:155
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -601,7 +651,7 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:15
 msgid ""
 "GNU Taler is a privacy-preserving payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -609,28 +659,28 @@ msgid ""
 "evasion and money laundering."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is payments; it "
 "is not meant as a store of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:30
 msgid ""
 "Payment are made after exchanging existing money "
 "into electronic money with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:37
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments without making their customers register on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:44
 msgid ""
 "GNU Taler is immune against many types of fraud, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -638,33 +688,33 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:60
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:62
+#: template/features.html.j2:62
 msgid ""
 "To pay with Taler, customers install an electronic wallet on their device. "
 "Before the first payment, the desired currency must be added to the wallet's "
 "balance by some other means of payment."
 msgstr ""
 
-#: features.html.j2:70
+#: template/features.html.j2:70
 msgid ""
 "Once the wallet is charged, payments on websites take only one click, are "
 "never falsely rejected by fraud detection and do not pose any risk of "
 "phishing or identity theft."
 msgstr ""
 
-#: features.html.j2:77
+#: template/features.html.j2:77
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:85
+#: template/features.html.j2:85
 msgid ""
 "To receive Taler payments, a merchant needs a bank account in the desired "
 "currency. We provide supporting software in various programming languages to "
@@ -672,36 +722,36 @@ msgid ""
 "processing can run on the merchant's premises or be hosted by a third party."
 msgstr ""
 
-#: features.html.j2:94
+#: template/features.html.j2:94
 msgid ""
 "Merchant integration is simple, and customers can pay for products without "
 "even having to register an account."
 msgstr ""
 
-#: features.html.j2:99
+#: template/features.html.j2:99
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:113
 #, fuzzy
 #| msgid "Ethical"
 msgid "Practical"
 msgstr "Ethique"
 
-#: features.html.j2:116
+#: template/features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
 "extremely low transaction costs."
 msgstr ""
 
-#: features.html.j2:126
+#: template/features.html.j2:126
 #, fuzzy
 #| msgid "Taxable"
 msgid "Stable"
 msgstr "Taxable"
 
-#: features.html.j2:129
+#: template/features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -709,44 +759,45 @@ msgid ""
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 
-#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
+#: template/features.html.j2:140 template/governments.html.j2:58
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Sûr"
 
-#: features.html.j2:143
+#: template/features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
 "rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
-#: features.html.j2:155 governments.html.j2:25
+#: template/features.html.j2:155 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Taxable"
 
-#: features.html.j2:158
+#: template/features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
 
-#: features.html.j2:168
+#: template/features.html.j2:168
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:170
+#: template/features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
 "money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:181 template/governments.html.j2:88
 msgid "Libre"
 msgstr "Libre"
 
-#: features.html.j2:184
+#: template/features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -755,110 +806,110 @@ msgid ""
 "software."
 msgstr ""
 
-#: financial-news.html.j2:6
+#: template/financial-news.html.j2:6
 msgid "Financial News"
 msgstr ""
 
-#: financial-news.html.j2:9
+#: template/financial-news.html.j2:9
 msgid ""
 "This page explains (only in English) how Taler can change ongoing "
 "developments in the financial industry."
 msgstr ""
 
-#: glossary.html.j2:6
+#: template/glossary.html.j2:6
 msgid "auditor"
 msgstr ""
 
-#: glossary.html.j2:8
+#: template/glossary.html.j2:8
 msgid ""
 "trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
-#: glossary.html.j2:12
+#: template/glossary.html.j2:12
 msgid "bank"
 msgstr ""
 
-#: glossary.html.j2:14
+#: template/glossary.html.j2:14
 msgid ""
 "traditional financial service provider who offers wire `transfers` between "
 "accounts"
 msgstr ""
 
-#: glossary.html.j2:18
+#: template/glossary.html.j2:18
 msgid "coin"
 msgstr ""
 
-#: glossary.html.j2:20
+#: template/glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
 "known as the `denomination` of the coin"
 msgstr ""
 
-#: glossary.html.j2:24
+#: template/glossary.html.j2:24
 msgid "contract"
 msgstr ""
 
-#: glossary.html.j2:26
+#: template/glossary.html.j2:26
 msgid "the proposal signed by the wallet."
 msgstr ""
 
-#: glossary.html.j2:30
+#: template/glossary.html.j2:30
 #, fuzzy
 #| msgid "Documentation"
 msgid "denomination"
 msgstr "Documentation"
 
-#: glossary.html.j2:32
+#: template/glossary.html.j2:32
 msgid ""
 "unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
-#: glossary.html.j2:36
+#: template/glossary.html.j2:36
 msgid "denomination key"
 msgstr ""
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:38
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
 msgstr ""
 
-#: glossary.html.j2:42
+#: template/glossary.html.j2:42
 msgid "deposit"
 msgstr ""
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
 "exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
-#: glossary.html.j2:48
+#: template/glossary.html.j2:48
 msgid "dirty"
 msgstr ""
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:50
 msgid ""
 "a `coin` is dirty if its public key may be known to an entity other than the "
 "customer, thereby creating the danger of some entity being able to link "
 "multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
-#: glossary.html.j2:54
+#: template/glossary.html.j2:54
 msgid "exchange"
 msgstr ""
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:56
 msgid ""
 "Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:60
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:62
 msgid ""
 "Various operations come with time limits. In particular, `denomination keys` "
 "come with strict time limits for the various operations involving the `coin` "
@@ -871,45 +922,45 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:74
 msgid "extension"
 msgstr ""
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:80
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:86
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:92
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:98
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -919,82 +970,82 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:109
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
-#: glossary.html.j2:115
+#: template/glossary.html.j2:115
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:117
 msgid ""
 "operation by which an exchange returns the value of coins affected by a "
 "`revocation` to their `owner`, either by allowing the owner to withdraw new "
 "coins or wiring funds back to the bank account of the `owner`"
 msgstr ""
 
-#: glossary.html.j2:123
+#: template/glossary.html.j2:123
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:129
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:135
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
 "account to cover obligations from coins in circulation"
 msgstr ""
 
-#: glossary.html.j2:141
+#: template/glossary.html.j2:141
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:147
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
 "the customer"
 msgstr ""
 
-#: glossary.html.j2:153
+#: template/glossary.html.j2:153
 #, fuzzy
 #| msgid "Documentation"
 msgid "revocation"
 msgstr "Documentation"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:155
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1002,101 +1053,101 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:159
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
-#: glossary.html.j2:165
+#: template/glossary.html.j2:165
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:167
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:171
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
 msgstr ""
 
-#: glossary.html.j2:177
+#: template/glossary.html.j2:177
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:183
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:189
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:195
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:201
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:203
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:213
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:219
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:221
 msgid ""
 "a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
 "`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
@@ -1107,11 +1158,11 @@ msgid ""
 "past the legal data retention requirement)."
 msgstr ""
 
-#: governments.html.j2:6
+#: template/governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
 
-#: governments.html.j2:8
+#: template/governments.html.j2:8
 msgid ""
 "Taler provides accountability to ensure business operate legally, while also "
 "respecting civil liberties of citizens. Taler is a payment system based on "
@@ -1120,7 +1171,7 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:28
+#: template/governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
 "taxation. With Taler, the receiver of any form of payment is easily "
@@ -1130,7 +1181,7 @@ msgid ""
 "evasion and black markets less viable."
 msgstr ""
 
-#: governments.html.j2:41
+#: template/governments.html.j2:41
 msgid ""
 "Thus, despite offering anonymity for citizens spending digital cash to buy "
 "goods and services, Taler also ensures that the state can observe incoming "
@@ -1142,7 +1193,7 @@ msgid ""
 "multiple devices."
 msgstr ""
 
-#: governments.html.j2:61
+#: template/governments.html.j2:61
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1151,7 +1202,7 @@ msgid ""
 "merchants, the exchange and the state."
 msgstr ""
 
-#: governments.html.j2:73
+#: template/governments.html.j2:73
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1161,98 +1212,98 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:91
+#: template/governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
 "will enable competition and avoid the monopolization of payment systems that "
 "threatens global political and financial stability today."
 msgstr ""
 
-#: governments.html.j2:101
+#: template/governments.html.j2:101
 msgid "Efficient"
 msgstr "Efficace"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:104
 msgid ""
 "Taler has an efficient design. Unlike Blockchain-based payment systems, such "
 "as Bitcoin, Taler will not threaten the availability of national electric "
 "grids or (significantly) contribute to environmental pollution."
 msgstr ""
 
-#: governments.html.j2:120
+#: template/governments.html.j2:120
 msgid "Taler and regulation"
 msgstr ""
 
-#: governments.html.j2:122
+#: template/governments.html.j2:122
 msgid "Anti money laundering (AML)"
 msgstr ""
 
-#: governments.html.j2:123
+#: template/governments.html.j2:123
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
 msgstr ""
 
-#: governments.html.j2:124
+#: template/governments.html.j2:124
 msgid "Know your customer (KYC)"
 msgstr ""
 
-#: governments.html.j2:125
+#: template/governments.html.j2:125
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
 msgstr ""
 
-#: governments.html.j2:126
+#: template/governments.html.j2:126
 msgid "General Data Protection Regulation (GDPR)"
 msgstr ""
 
-#: governments.html.j2:127
+#: template/governments.html.j2:127
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
 msgstr ""
 
-#: governments.html.j2:128
+#: template/governments.html.j2:128
 msgid "Payment Services Directive (PSD2)"
 msgstr ""
 
-#: governments.html.j2:129
+#: template/governments.html.j2:129
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
 msgstr ""
 
-#: governments.html.j2:137
+#: template/governments.html.j2:137
 msgid "Taler provides privacy and accountability"
 msgstr ""
 
-#: governments.html.j2:140
+#: template/governments.html.j2:140
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
 "governments can obtain:"
 msgstr ""
 
-#: governments.html.j2:148
+#: template/governments.html.j2:148
 msgid ""
 "The total amount of digital currency withdrawn by a customer. The government "
 "can impose limits on how much digital cash a customer can withdraw within a "
 "given time frame."
 msgstr ""
 
-#: governments.html.j2:157
+#: template/governments.html.j2:157
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
-#: governments.html.j2:164
+#: template/governments.html.j2:164
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
 "the identity of the customer."
 msgstr ""
 
-#: governments.html.j2:174
+#: template/governments.html.j2:174
 msgid ""
 "The amounts of digital coins legitimately withdrawn by customers from the "
 "exchange, the value of non-redeemed digital coins in customer's wallets, the "
@@ -1261,23 +1312,23 @@ msgid ""
 "fees."
 msgstr ""
 
-#: gsoc-codeless.html.j2:5
+#: template/gsoc-codeless.html.j2:5
 msgid "GSoC 2018: Codeless Payment"
 msgstr ""
 
-#: gsoc-codeless.html.j2:6
+#: template/gsoc-codeless.html.j2:6
 msgid ""
 "Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and "
 "guidance of Florian Dold."
 msgstr ""
 
-#: gsoc-codeless.html.j2:12
+#: template/gsoc-codeless.html.j2:12
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "Overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: gsoc-codeless.html.j2:14
+#: template/gsoc-codeless.html.j2:14
 msgid ""
 "Codeless payment is a component that sits between the seller's frontend and "
 "the GNU Taler merchant backend. This component has a web interface, where "
@@ -1287,15 +1338,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:23
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:24
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:28
 msgid ""
 "The primary use case is the registration of the merchant. The codeless "
 "payment backend provides a secure django authenticated login to the "
@@ -1306,19 +1357,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:33
 msgid ""
 "A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:38
+#: template/gsoc-codeless.html.j2:38
 msgid ""
 "The merchant can upload digital inventory (like a PDF or HTML page) via the "
 "codeless payments frontend and the user can then purchase it and view the "
 "version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:43
+#: template/gsoc-codeless.html.j2:43
 msgid ""
 "The merchant can add any physical inventory available in his stocks. While "
 "adding these inventory, the seller is prompted to add minimum quantity of "
@@ -1327,7 +1378,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1337,7 +1388,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1345,31 +1396,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1378,7 +1429,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1386,7 +1437,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1398,7 +1449,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1406,7 +1457,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1416,25 +1467,25 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr ""
 
-#: investors.html.j2:9
+#: template/investors.html.j2:9
 msgid ""
 "We have created a company, Taler Systems SA in Luxembourg.
 Please "
 "contact invest@taler.net if you want to invest in Taler."
 msgstr ""
 
-#: investors.html.j2:24
+#: template/investors.html.j2:24
 msgid "The Team"
 msgstr ""
 
-#: investors.html.j2:27
+#: template/investors.html.j2:27
 msgid ""
 "Our team combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1442,7 +1493,7 @@ msgid ""
 "this vision upon the world."
 msgstr ""
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
 msgid ""
 "We are currently supported by Inria, "
 "the French national institute for research in informatics and automation, "
@@ -1450,11 +1501,11 @@ msgid ""
 "Foundation."
 msgstr ""
 
-#: investors.html.j2:45
+#: template/investors.html.j2:45
 msgid "The Technology"
 msgstr ""
 
-#: investors.html.j2:48
+#: template/investors.html.j2:48
 msgid ""
 "All transactions in Taler are secured using modern cryptography and trust in all parties is minimized. Financial "
@@ -1465,11 +1516,11 @@ msgid ""
 "transaction costs are fractions of a cent."
 msgstr ""
 
-#: investors.html.j2:63
+#: template/investors.html.j2:63
 msgid "The Business"
 msgstr ""
 
-#: investors.html.j2:66
+#: template/investors.html.j2:66
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1480,22 +1531,22 @@ msgid ""
 "to facilitate the transactions."
 msgstr ""
 
-#: investors.html.j2:85
+#: template/investors.html.j2:85
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:91
+#: template/investors.html.j2:91
 msgid ""
 "Our financial news page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:114
 msgid "Running a Taler payment service operator"
 msgstr ""
 
-#: investors.html.j2:117
+#: template/investors.html.j2:117
 msgid ""
 "The payment service operator runs the Taler exchange. The exchange "
 "charges transaction fees to customers or merchants. Its operational "
@@ -1503,38 +1554,38 @@ msgid ""
 "of the computing infrastructure."
 msgstr ""
 
-#: investors.html.j2:127
+#: template/investors.html.j2:127
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
 msgstr ""
 
-#: investors.html.j2:129
+#: template/investors.html.j2:129
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
 msgstr ""
 
-#: investors.html.j2:131
+#: template/investors.html.j2:131
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
 msgstr ""
 
-#: investors.html.j2:133
+#: template/investors.html.j2:133
 msgid "Partnership with banks establishes consumer trust."
 msgstr ""
 
-#: investors.html.j2:135
+#: template/investors.html.j2:135
 msgid "Partnership with free software community enables rapid deployment."
 msgstr ""
 
-#: merchants.html.j2:5
+#: template/merchants.html.j2:5
 #, fuzzy
 msgid "Advantages for Merchants"
 msgstr "Documentation"
 
-#: merchants.html.j2:8
+#: template/merchants.html.j2:8
 msgid ""
 "Taler is a cost-effective electronic payment system which provides you with "
 "cryptographic proof that the payment worked correctly within milliseconds. "
@@ -1542,11 +1593,11 @@ msgid ""
 "risk of fraud."
 msgstr ""
 
-#: merchants.html.j2:22
+#: template/merchants.html.j2:22
 msgid "Fast"
 msgstr "Rapide"
 
-#: merchants.html.j2:25
+#: template/merchants.html.j2:25
 msgid ""
 "Processing transactions with Taler is fast, allowing you to confirm the "
 "transaction with your customer virtually immediately. Your customers will "
@@ -1557,7 +1608,7 @@ msgid ""
 "overhead for customers."
 msgstr ""
 
-#: merchants.html.j2:44
+#: template/merchants.html.j2:44
 msgid ""
 "You will have cryptographic proof of payment from the Taler payment service "
 "provider. With Taler you never handle sensitive customer account information "
@@ -1566,7 +1617,7 @@ msgid ""
 "for all transactions which you can use in court in case of disputes."
 msgstr ""
 
-#: merchants.html.j2:61
+#: template/merchants.html.j2:61
 msgid ""
 "Taler is free software, and you can use the liberally-licensed reference "
 "code as a starting point to integrate Taler into your services. To use "
@@ -1575,11 +1626,11 @@ msgid ""
 "integrators for support."
 msgstr ""
 
-#: merchants.html.j2:76
+#: template/merchants.html.j2:76
 msgid "Cheap"
 msgstr ""
 
-#: merchants.html.j2:79
+#: template/merchants.html.j2:79
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1587,22 +1638,22 @@ msgid ""
 "overhead and thus offer low transaction fees."
 msgstr ""
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:89
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:92
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
 "Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 
-#: merchants.html.j2:101
+#: template/merchants.html.j2:101
 msgid "Ethical"
 msgstr "Ethique"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:104
 msgid ""
 "Taler prevents tax evasion and money laundering. Taler's protocols are "
 "efficient and do not use wasteful proof-of-work calculations. Taler "
@@ -1610,39 +1661,39 @@ msgid ""
 "reference implementations."
 msgstr ""
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:119
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:122
 msgid "The GNU Taler merchant backend operator manual"
 msgstr ""
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr ""
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:128
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr ""
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:140
 msgid "The GNU Taler Merchant Backend"
 msgstr ""
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:142
 msgid "Merchants process payments using the Taler backend:"
 msgstr ""
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:147
 msgid ""
 "The backend signs and stores the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
 "give the customer's order in a JSON format to the backend."
 msgstr ""
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:156
 msgid ""
 "The backend validates payments received from the wallet and "
 "executes them with the Taler payment service provider (the exchange). "
@@ -1650,52 +1701,52 @@ msgid ""
 "the Taler backend and check the HTTP status code that is returned."
 msgstr ""
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:167
 msgid ""
 "The backend can list completed transactions and map wire "
 "transfers to sets of business transactions, including the exact terms of "
 "each contract."
 msgstr ""
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:183
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:16
 msgid "More news"
 msgstr ""
 
-#: old-news.html.j2:6
+#: template/old-news.html.j2:6
 msgid "Older News"
 msgstr ""
 
-#: old-news.html.j2:9
+#: template/old-news.html.j2:9
 msgid "This page documents the GNU Taler history."
 msgstr ""
 
-#: press.html.j2:4
+#: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
 
-#: principles.html.j2:22
+#: template/principles.html.j2:22
 msgid "GNU Taler: Design Principles"
 msgstr ""
 
-#: principles.html.j2:29
+#: template/principles.html.j2:29
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:36
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:40
 msgid ""
 "... in the are of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:42
 msgid ""
 "GNU Taler must be Free Software. For merchants, our Free Software reference "
@@ -1704,22 +1755,22 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:51
 msgid ""
 "Customers benefit from Free Software as the wallet software can be made to "
 "run on a variety of platforms, and the absence of user-hostile features such "
 "as tracking or telemetry can easily be assured."
 msgstr ""
 
-#: principles.html.j2:63
+#: template/principles.html.j2:63
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:68
 msgid "You deserve some privacy"
 msgstr ""
 
-#: principles.html.j2:70
+#: template/principles.html.j2:70
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -1727,7 +1778,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:78
 msgid ""
 "In legislations with data protection regulations (such as the recently "
 "introduced GDPR in Europe), merchants benefit from this as well, as no data "
@@ -1737,49 +1788,49 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:92
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:97
 msgid "Money laundering"
 msgstr ""
 
-#: principles.html.j2:99
+#: template/principles.html.j2:99
 msgid ""
 "As a payment system must still be legal to operate and use, it must comply "
 "with these requirements. Furthermore, we consider levying of taxes as "
 "beneficial to society."
 msgstr ""
 
-#: principles.html.j2:110
+#: template/principles.html.j2:110
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:115
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:117
 msgid ""
 "This imposes requirements on the security of the system, as well as on the "
 "general design, as payment fraud can also happen through misleading user "
 "interface design or the lack of cryptographic evidence for certain processes."
 msgstr ""
 
-#: principles.html.j2:128
+#: template/principles.html.j2:128
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:132
 msgid ""
 "Privacy by design, privacy by default, General Data Protection Regulation "
 "(GDPR) compliant"
 msgstr ""
 
-#: principles.html.j2:134
+#: template/principles.html.j2:134
 msgid ""
 "The reason behind this goal is similar to (2). The privacy of buyers is "
 "given priority, but other parties such as merchants still benefit from it, "
@@ -1787,15 +1838,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:144
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:148
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:150
 msgid ""
 "Specifically it must be usable for non-expert customers. Usability also "
 "applies to the integration with merchants, and informs choices about the "
@@ -1803,33 +1854,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:162
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Efficace"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:166
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Efficace"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:168
 msgid ""
 "Approaches such as proof-of-work are ruled out by this requirement. "
 "Efficiency is necessary for GNU Taler to be used for micropayments."
 msgstr ""
 
-#: principles.html.j2:177
+#: template/principles.html.j2:177
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:181
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:183
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -1837,15 +1888,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:195
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:199
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:201
 msgid ""
 "It must be relatively easy for competitors to join the systems. While the "
 "barriers for this in traditional financial systems are rather high, the "
@@ -1855,11 +1906,11 @@ msgid ""
 "instead of having one completely monolithic system."
 msgstr ""
 
-#: schemafuzz.html.j2:6
+#: template/schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
 
-#: team.html.j2:16
+#: template/team.html.j2:16
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security & privacy researcher. Software "
@@ -1868,138 +1919,91 @@ msgstr ""
 "Mégalomane local, C'est à dire, qui voudrait créer un nouveau système de "
 "paiement et un nouvel Internet ?"
 
-#: team.html.j2:21
+#: template/team.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
 msgstr ""
 
-#: team.html.j2:26
+#: template/team.html.j2:26
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
+#: template/team.html.j2:33
 msgid "GNU mainatiner, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:38
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c & Tor."
 msgstr "mathématicien"
 
-#: team.html.j2:43
+#: template/team.html.j2:43
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Enthousiaste Ethique"
 
-#: team.html.j2:50
+#: template/team.html.j2:50
 #, fuzzy
 #| msgid "Software engineer. Works on libebics."
 msgid "Software engineer."
 msgstr "EBICS."
 
-#: team.html.j2:55
+#: template/team.html.j2:55
 #, fuzzy
 msgid "Sustainable business development."
 msgstr "Basse fréquence"
 
-#: team.html.j2:60
+#: template/team.html.j2:60
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Fatale (en théorie)"
 
-#: team.html.j2:66
+#: template/team.html.j2:66
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:73 template/team.html.j2:77 template/team.html.j2:81
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traductrice"
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:87 template/team.html.j2:91 template/team.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traductrice"
 
-#: team.html.j2:99
+#: template/team.html.j2:99
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traductrice"
 
-#: team.html.j2:106
+#: template/team.html.j2:106
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:110
+#: template/team.html.j2:110
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:118
+#: template/team.html.j2:118
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Principalement inoffensif"
 
-#: team.html.j2:122
+#: template/team.html.j2:122
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
 
-#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
-#: team.html.j2:146
+#: template/team.html.j2:128 template/team.html.j2:132
+#: template/team.html.j2:136 template/team.html.j2:142
+#: template/team.html.j2:146
 #, fuzzy
 #| msgid "Taler for developers"
 msgid "Free software developer."
 msgstr "Taler pour les développeurs"
 
-#: common/base.j2:5
-msgid "GNU Taler"
-msgstr ""
-
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr ""
-
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-msgid "Team"
-msgstr ""
-
-#: common/footer.j2.inc:16
-msgid "Contact"
-msgstr ""
-
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr ""
-
-#: common/footer.j2.inc:26
-msgid "Bibliography"
-msgstr ""
-
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by BFH"
-msgstr ""
-
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using Free Software "
-"only."
-msgstr ""
-
-#: common/navigation.j2.inc:21
-msgid "Features"
-msgstr ""
-
-#: common/navigation.j2.inc:22
-msgid "Principles"
-msgstr ""
-
-#: common/navigation.j2.inc:23
-msgid "Docs"
-msgstr ""
-
 #~ msgid "Software engineer. Works on libebics."
 #~ msgstr "EBICS."
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 2f95135c..e50336d6 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,48 +2,104 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-01 18:07+0200\n"
+"POT-Creation-Date: 2019-09-02 09:39+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: it \n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: architecture.html.j2:6
+#: common/base.j2:5
+msgid "GNU Taler"
+msgstr "GNU Taler"
+
+#: common/base.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr "Tassabili Anonime Libere Elettroniche Riserve"
+
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "La Squadra"
+
+#: common/footer.j2.inc:16
+msgid "Contact"
+msgstr "Contatti"
+
+#: common/footer.j2.inc:21
+msgid "FAQ"
+msgstr "FAQ"
+
+#: common/footer.j2.inc:26
+#, fuzzy
+#| msgid "GNU Taler Bibliography"
+msgid "Bibliography"
+msgstr "Bibliografia"
+
+#: common/footer.j2.inc:32 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
+msgid "and"
+msgstr "e"
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by BFH"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using Free Software "
+"only."
+msgstr ""
+"Questa pagina è stata creata utilizzando solo Software Libero. "
+
+#: common/navigation.j2.inc:21
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:22
+msgid "Principles"
+msgstr ""
+
+#: common/navigation.j2.inc:23
+msgid "Docs"
+msgstr ""
+
+#: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Architettura Taler"
 
-#: bibliography.html.j2:4
+#: template/bibliography.html.j2:4
 msgid "GNU Taler Bibliography"
 msgstr "Bibliografia GNU Taler"
 
-#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:30 bibliography.html.j2:36
+#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
 msgid "by"
 msgstr "di"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
-#: bibliography.html.j2:36 common/footer.j2.inc:32
-msgid "and"
-msgstr "e"
-
-#: bibliography.html.j2:37
+#: template/bibliography.html.j2:37
 msgid "available upon request"
 msgstr "disponibile su richiesta"
 
-#: contact.html.j2:6
+#: template/contact.html.j2:6
 msgid "Contact information"
 msgstr "Contatti"
 
-#: contact.html.j2:13
+#: template/contact.html.j2:13
 msgid "The mailing list"
 msgstr "La mailing list"
 
-#: contact.html.j2:15
+#: template/contact.html.j2:15
 msgid ""
 "An archived, public mailing list for GNU Taler is hosted at https://lists.gnu.org/"
@@ -55,11 +111,11 @@ msgstr ""
 "mailman/listinfo/taler. I messaggi per la lista vanno inviati a taler@gnu.org."
 
-#: contact.html.j2:25
+#: template/contact.html.j2:25
 msgid "Contacting individuals"
 msgstr "Contattare membri del gruppo"
 
-#: contact.html.j2:27
+#: template/contact.html.j2:27
 msgid ""
 "Team members are generally reachable at LASTNAME@taler.net. All of "
 "us support receiving GnuPG encrypted e-mails."
@@ -67,21 +123,21 @@ msgstr ""
 "Ogni membro è generalmente raggiungibile all'indirizzo LASTNAME@taler."
 "net Sono particolarmente gradite e-mail criptate via GnuPG."
 
-#: contact.html.j2:36
+#: template/contact.html.j2:36
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:38
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "contact AT taler.net."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:46
 msgid "Reporting bugs"
 msgstr "Riporta un bug"
 
-#: contact.html.j2:48
+#: template/contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our Bug tracker, which is shared with the GNUnet project. You can "
@@ -92,11 +148,11 @@ msgstr ""
 "GNUnet. Bugs e nuove funzionalità possono essere riportate anche nella "
 "mailing-list."
 
-#: contact.html.j2:59
+#: template/contact.html.j2:59
 msgid "Executive team"
 msgstr "Dirigenza"
 
-#: contact.html.j2:61
+#: template/contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact ceo AT taler.net."
@@ -104,11 +160,11 @@ msgstr ""
 "Per richieste di natura commerciale, si prega di contattare ceo AT taler."
 "net."
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr "Diritti d'autore"
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:8
 msgid ""
 "Contributors to GNU Taler with Git access must sign the copyright assignment to ensure that the accordo GNUnet e.V. --- Taler Systems Sa sulle licenze e lo sviluppo "
 "collaborativo dei progetti GNUnet e GNU Taler sia soddisfatto."
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:17
 msgid ""
 "The agreements ensure that the code will continue to be made available "
 "under free software licenses, but gives developers the freedom to move code "
@@ -136,7 +192,7 @@ msgstr ""
 "alla società la capacità di doppia licenza (ad esempio, in modo da poter "
 "distribuire attraverso App-store ostili al software libero)."
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:25
 msgid ""
 "Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -149,15 +205,15 @@ msgstr ""
 "l'accordo con il tuo pseudonimo. Sono sufficienti copie scansionate, ma è "
 "preferibile attraverso posta ordinaria."
 
-#: developers.html.j2:5
+#: template/developers.html.j2:5
 msgid "Taler for developers"
 msgstr "Taler per programmatori"
 
-#: developers.html.j2:12 merchants.html.j2:58
+#: template/developers.html.j2:12 template/merchants.html.j2:58
 msgid "Free"
 msgstr "Libero"
 
-#: developers.html.j2:15
+#: template/developers.html.j2:15
 msgid ""
 "GNU Taler is free software implementing an open protocol. Anybody is welcome "
 "to integrate our reference implementation into their applications. Different "
@@ -178,11 +234,11 @@ msgstr ""
 "a suggerimenti costruttivi per massimizzare l'adozione di questa piattaforma "
 "di pagamento."
 
-#: developers.html.j2:32
+#: template/developers.html.j2:32
 msgid "RESTful"
 msgstr "RESTful"
 
-#: developers.html.j2:35
+#: template/developers.html.j2:35
 msgid ""
 "Taler is designed to work on the Internet. To ensure that Taler payments can "
 "work with restrictive network setups, Taler uses a RESTful protocol over "
@@ -204,11 +260,11 @@ msgstr ""
 "Taler è documentato in dettaglio sul sito docs.taler.net."
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58
 msgid "Code"
 msgstr "Codice"
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
 msgid ""
 "Taler is currently primarily developed by a research team at Inria and GitWeb."
 
-#: developers.html.j2:75
+#: template/developers.html.j2:75
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: developers.html.j2:78
+#: template/developers.html.j2:78
 msgid ""
 "In addition to this website, the documented code and the API "
@@ -242,11 +298,11 @@ msgstr ""
 "a>. Si possono trovare i documenti tecnici nella nostra bibliografia."
 
-#: developers.html.j2:88
+#: template/developers.html.j2:88
 msgid "Discussion"
 msgstr "Discussione"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:91
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
 "read the list archive at http://lists.gnu.org/mailman/listinfo/taler."
 
-#: developers.html.j2:101
+#: template/developers.html.j2:101
 msgid "Regression Testing"
 msgstr "Test delle regressioni"
 
-#: developers.html.j2:104
+#: template/developers.html.j2:104
 msgid ""
 "We have Buildbot automation tests to "
 "detect regressions and check for portability at Buildbot per rilevare regressioni e verificare la portabilità al "
 "seguente link buildbot.taler.net."
 
-#: developers.html.j2:113
+#: template/developers.html.j2:113
 msgid "Code Coverage Analysis"
 msgstr "Analisi della copertura del codice"
 
-#: developers.html.j2:116
+#: template/developers.html.j2:116
 msgid ""
 "We use LCOV to "
 "analyze the code coverage of our tests, the results are available at lcov.taler."
 "net."
 
-#: developers.html.j2:131
+#: template/developers.html.j2:131
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:134 template/investors.html.j2:88
 msgid "Download"
 msgstr "Scarica"
 
-#: developers.html.j2:150
+#: template/developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Panoramica del sistema Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -308,13 +364,13 @@ msgstr ""
 "mostrato nell'illustrazione a destra. Le transazioni tipiche comportano le "
 "seguenti operazioni:"
 
-#: developers.html.j2:162
+#: template/developers.html.j2:162
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Panoramica del sistema"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:165
 msgid ""
 "A customer instructs his bank to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -326,7 +382,7 @@ msgstr ""
 "include un token di autenticazione dal suo portafoglio elettronico. "
 "Nella terminologia di Taler, il cliente crea una riserva al cambio."
 
-#: developers.html.j2:177
+#: template/developers.html.j2:177
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to withdraw electronic coins. The electronic coins "
@@ -347,7 +403,7 @@ msgstr ""
 "valore totale dei fondi (ad eccezione delle commissioni che il cambio può "
 "addebitare per il servizio)."
 
-#: developers.html.j2:195
+#: template/developers.html.j2:195
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to spend the coins with merchant portals that support the Taler "
@@ -374,7 +430,7 @@ msgstr ""
 "piccola parte delle sue monete digitali (il sistema pensa ai clienti che "
 "ricevono del resto)."
 
-#: developers.html.j2:217
+#: template/developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins deposit the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -399,7 +455,7 @@ msgstr ""
 "database del cambio consente allo Stato di far rispettare ai commercianti di "
 "pagare le imposte vigenti (e di non impegnarsi in contratti illegali)."
 
-#: developers.html.j2:240
+#: template/developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's bank account. The "
@@ -414,7 +470,7 @@ msgstr ""
 "relazione tra i trasferimenti bancari e le singole richieste di risarcimento "
 "che erano state depositate."
 
-#: developers.html.j2:254
+#: template/developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -430,7 +486,7 @@ msgstr ""
 "frequentemente i database del cambio e controllare che il suo saldo bancario "
 "corrisponda al valore totale delle monete restanti in circolazione."
 
-#: developers.html.j2:269
+#: template/developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -444,82 +500,82 @@ msgstr ""
 "sono compromessi, il danno finanziario è limitato alla rispettiva parte ed è "
 "proporzionale ai fondi in circolazione durante quel periodo."
 
-#: docs.html.j2:37
+#: template/docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:38
+#: template/docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:44
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:46
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:144
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "La mailing list"
 
-#: docs.html.j2:152
+#: template/docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
-#: faq.html.j2:5
+#: template/faq.html.j2:5
 msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr "Com'è correlato Taler a Bitcoin o Blockchains?"
 
-#: faq.html.j2:6
+#: template/faq.html.j2:6
 #, fuzzy
 #| msgid ""
 #| "Taler does not use any Blockchain technology or Bitcoin directly. "
@@ -536,7 +592,7 @@ msgstr ""
 "consenso distribuito. Al contrario, esso è basato sulle firme cieche (blind "
 "signatures)."
 
-#: faq.html.j2:13
+#: template/faq.html.j2:13
 msgid ""
 "It would be possible, however, to withdraw coins denominated in Bitcoin "
 "into a Taler wallet (with an appropriate exchange), which would give some "
@@ -547,11 +603,11 @@ msgstr ""
 "vantaggi rispetto al semplice Bitcoin, come ad esempio i tempi di conferma "
 "immediati."
 
-#: faq.html.j2:20
+#: template/faq.html.j2:20
 msgid "Where is the balance in my wallet stored?"
 msgstr "Dov'è conservato il saldo nel mio portafoglio?"
 
-#: faq.html.j2:21
+#: template/faq.html.j2:21
 msgid ""
 "Your wallet stores digital coins and thus ultimately your computer holds "
 "your balance. The exchange keeps funds matching all unspent coins in an "
@@ -562,11 +618,11 @@ msgstr ""
 "corrispondono a tutte le monete non spese in un conto bancario di garanzia."
 
-#: faq.html.j2:27
+#: template/faq.html.j2:27
 msgid "What if my wallet is lost?"
 msgstr "Cosa accade se il mio portafoglio si perde? "
 
-#: faq.html.j2:28
+#: template/faq.html.j2:28
 msgid ""
 "
Since the digital coins of value in your wallet are anonymized, the "
 "exchange can not assist you in recovering a lost or stolen wallet. Just like "
@@ -577,7 +633,7 @@ msgstr ""
 "rubato. Proprio come accade con un portafoglio materiale per denaro "
 "contante, sei tu responsabile per tenerlo al sicuro."
 
-#: faq.html.j2:34
+#: template/faq.html.j2:34
 msgid ""
 "The risk of losing a wallet can be mitigated by making backups or keeping "
 "the balance reasonably low."
@@ -585,11 +641,11 @@ msgstr ""
 "Il rischio di perdere un portafoglio puà essere ridotto facendo backup o "
 "mantenendo il saldo ragionevolmente basso. "
 
-#: faq.html.j2:39
+#: template/faq.html.j2:39
 msgid "What if my computer is hacked?"
 msgstr "Cosa accade se il mio computer viene attaccato?"
 
-#: faq.html.j2:40
+#: template/faq.html.j2:40
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend "
 "coins from your wallet. Checking your balance might reveal to you that your "
@@ -599,11 +655,11 @@ msgstr ""
 "spendere le monete del tuo portafoglio. Controllare il tuo saldo potrebbe "
 "rivelarti se il tuo dispositivo è stato compromesso."
 
-#: faq.html.j2:46
+#: template/faq.html.j2:46
 msgid "Can I send money to my friend with Taler?"
 msgstr "Posso inviare denaro ai miei amici con Taler?"
 
-#: faq.html.j2:47
+#: template/faq.html.j2:47
 msgid ""
 "If your friend provides goods or services for you in exchange for a "
 "payment, they can easily set up a Taler merchant and receive the payment in "
@@ -613,7 +669,7 @@ msgstr ""
 "possono facilmente creare un commerciante Taler e ricevere il pagamento nel "
 "loro conto bancario."
 
-#: faq.html.j2:52
+#: template/faq.html.j2:52
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among "
 "friends directly as well."
@@ -621,11 +677,11 @@ msgstr ""
 "Le versioni future del portafoglio Taler potranno consentire lo scambio "
 "di monete anche direttamente tra amici."
 
-#: faq.html.j2:58
+#: template/faq.html.j2:58
 msgid "How does Taler handle payments in different currencies?"
 msgstr "Come gestisce Taler i pagamenti in valute diverse?"
 
-#: faq.html.j2:59
+#: template/faq.html.j2:59
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
@@ -633,15 +689,15 @@ msgstr ""
 "I portafogli Taler possono contenere monete digitali corrispondenti a più "
 "valute diverse, come l'Euro, il Dollaro americano o i Bitcoin. "
 
-#: faq.html.j2:63
+#: template/faq.html.j2:63
 msgid "Taler currently does not offer conversion between currencies."
 msgstr "Al momento Taler non offre la conversione tra le valute. "
 
-#: faq.html.j2:67
+#: template/faq.html.j2:67
 msgid "How does Taler protect my privacy?"
 msgstr "Come protegge Taler la mia privacy?"
 
-#: faq.html.j2:68
+#: template/faq.html.j2:68
 msgid ""
 "Your wallet stores digital coins that are blindly signed by an exchange. The use of a "
@@ -653,11 +709,11 @@ msgstr ""
 "L'uso della blind signature protegge la tua privacy in quanto impedisce al "
 "cambio di sapere quale moneta ha firmato e per quale cliente. "
 
-#: faq.html.j2:79
+#: template/faq.html.j2:79
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:80
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -670,11 +726,11 @@ msgid ""
 "regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:95
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:96
 msgid ""
 "Taler's wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -685,24 +741,24 @@ msgid ""
 "future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:109
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:110
 msgid ""
 "We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
 "have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:118
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: faq.html.j2:119
+#: template/faq.html.j2:119
 msgid ""
 "The exchange would be operated by a bank or in cooperation with a bank, "
 "and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -712,13 +768,13 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:129
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:130
 msgid ""
 "Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -727,11 +783,11 @@ msgid ""
 "respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:140
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:141
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -741,11 +797,11 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:153
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:155
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -762,7 +818,7 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:15
 msgid ""
 "GNU Taler is a privacy-preserving payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -770,28 +826,28 @@ msgid ""
 "evasion and money laundering."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is payments; it "
 "is not meant as a store of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:30
 msgid ""
 "Payment are made after exchanging existing money "
 "into electronic money with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:37
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments without making their customers register on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:44
 msgid ""
 "GNU Taler is immune against many types of fraud, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -799,11 +855,11 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:60
 msgid "Paying with Taler"
 msgstr "Pagare con Taler"
 
-#: features.html.j2:62
+#: template/features.html.j2:62
 #, fuzzy
 #| msgid ""
 #| "To pay with Taler, customers install an electronic wallet on their "
@@ -825,7 +881,7 @@ msgstr ""
 "intercettazione di frodi e non presentano alcun rischio di phishing o furto "
 "di identità. "
 
-#: features.html.j2:70
+#: template/features.html.j2:70
 #, fuzzy
 #| msgid ""
 #| "To pay with Taler, customers install an electronic wallet on their "
@@ -847,15 +903,15 @@ msgstr ""
 "intercettazione di frodi e non presentano alcun rischio di phishing o furto "
 "di identità. "
 
-#: features.html.j2:77
+#: template/features.html.j2:77
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr "Ricevere pagamenti con Taler"
 
-#: features.html.j2:85
+#: template/features.html.j2:85
 #, fuzzy
 #| msgid ""
 #| "To receive Taler payments, a merchant needs a bank account in the "
@@ -875,21 +931,21 @@ msgstr ""
 "backend del commerciante per l'elaborazione della transazione di Taler può "
 "essere eseguito nella sede del commerciante o essere ospitato da terzi. "
 
-#: features.html.j2:94
+#: template/features.html.j2:94
 msgid ""
 "Merchant integration is simple, and customers can pay for products without "
 "even having to register an account."
 msgstr ""
 
-#: features.html.j2:99
+#: template/features.html.j2:99
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:113
 msgid "Practical"
 msgstr "Pratico"
 
-#: features.html.j2:116
+#: template/features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -899,11 +955,11 @@ msgstr ""
 "sono protetti da crittografia e vengono confermati entro pochi millisecondi "
 "con costi di transazione estremamente bassi. "
 
-#: features.html.j2:126
+#: template/features.html.j2:126
 msgid "Stable"
 msgstr "Stabile"
 
-#: features.html.j2:129
+#: template/features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -916,11 +972,12 @@ msgstr ""
 "corrispondono a valute attuali, come i dollari USA, gli Euro o perfino i "
 "Bitcoins. "
 
-#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
+#: template/features.html.j2:140 template/governments.html.j2:58
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Sicuro"
 
-#: features.html.j2:143
+#: template/features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -931,11 +988,11 @@ msgstr ""
 "sue misure di sicurezza, Taler non respinge mai un cliente legittimo a causa "
 "di un falso positivo in intercettazione di frode. "
 
-#: features.html.j2:155 governments.html.j2:25
+#: template/features.html.j2:155 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Tassabile"
 
-#: features.html.j2:158
+#: template/features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -946,11 +1003,11 @@ msgstr ""
 "parte delle valute digitali, Taler aiuta a prevenire il mercato nero. Taler "
 "non è adatto ad attività illegali. "
 
-#: features.html.j2:168
+#: template/features.html.j2:168
 msgid "Private"
 msgstr "Privato"
 
-#: features.html.j2:170
+#: template/features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
@@ -961,12 +1018,12 @@ msgstr ""
 "moneta elettronica. Tuttavia, si ottiene una conferma di pagamento "
 "legalmentevalida. "
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:181 template/governments.html.j2:88
 #, fuzzy
 msgid "Libre"
 msgstr "Libero"
 
-#: features.html.j2:184
+#: template/features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -980,32 +1037,32 @@ msgstr ""
 "momento che l'implementazione di riferimento è un pacchetto , rimarrà sempre software libero. "
 
-#: financial-news.html.j2:6
+#: template/financial-news.html.j2:6
 msgid "Financial News"
 msgstr ""
 
-#: financial-news.html.j2:9
+#: template/financial-news.html.j2:9
 msgid ""
 "This page explains (only in English) how Taler can change ongoing "
 "developments in the financial industry."
 msgstr ""
 
-#: glossary.html.j2:6
+#: template/glossary.html.j2:6
 msgid "auditor"
 msgstr "revisore"
 
-#: glossary.html.j2:8
+#: template/glossary.html.j2:8
 msgid ""
 "trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 "affidabile terza parte che verifica che il 'cambio' stia operando "
 "correttamente "
 
-#: glossary.html.j2:12
+#: template/glossary.html.j2:12
 msgid "bank"
 msgstr "banca"
 
-#: glossary.html.j2:14
+#: template/glossary.html.j2:14
 msgid ""
 "traditional financial service provider who offers wire `transfers` between "
 "accounts"
@@ -1013,11 +1070,11 @@ msgstr ""
 "tradizionale fornitore di servizi finanziari che consente 'bonifici' tra "
 "conti"
 
-#: glossary.html.j2:18
+#: template/glossary.html.j2:18
 msgid "coin"
 msgstr "moneta"
 
-#: glossary.html.j2:20
+#: template/glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
 "known as the `denomination` of the coin"
@@ -1025,30 +1082,30 @@ msgstr ""
 "le monete sono un token individuale che rappresenta una certa quantità di "
 "valore, nota anche come 'denominazione' della moneta "
 
-#: glossary.html.j2:24
+#: template/glossary.html.j2:24
 msgid "contract"
 msgstr "contratto"
 
-#: glossary.html.j2:26
+#: template/glossary.html.j2:26
 msgid "the proposal signed by the wallet."
 msgstr "la proposta firmata dal portafoglio"
 
-#: glossary.html.j2:30
+#: template/glossary.html.j2:30
 msgid "denomination"
 msgstr "denominazione"
 
-#: glossary.html.j2:32
+#: template/glossary.html.j2:32
 msgid ""
 "unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 "unità di valuta, specifica sia la valuta che il valore nominale di una "
 "'moneta' "
 
-#: glossary.html.j2:36
+#: template/glossary.html.j2:36
 msgid "denomination key"
 msgstr "chiave di denominazione"
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:38
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
@@ -1056,11 +1113,11 @@ msgstr ""
 "chiave RSA usata dal cambio per certificare che una data 'moneta' sia valida "
 "e sia di una particolare 'denominazione' "
 
-#: glossary.html.j2:42
+#: template/glossary.html.j2:42
 msgid "deposit"
 msgstr "deposito"
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
 "exchange to credit his `bank` account in the future using a wire `transfer`"
@@ -1069,11 +1126,11 @@ msgstr ""
 "cambio, prevedendo che il cambio possa accreditare in futuro il conto della "
 "sua 'banca' utilizzando un 'bonifico' "
 
-#: glossary.html.j2:48
+#: template/glossary.html.j2:48
 msgid "dirty"
 msgstr "sporco"
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:50
 msgid ""
 "a `coin` is dirty if its public key may be known to an entity other than the "
 "customer, thereby creating the danger of some entity being able to link "
@@ -1084,11 +1141,11 @@ msgstr ""
 "non viene aggiornata prima, una certa entità sia in grado di collegare più "
 "transazioni del possessore della moneta "
 
-#: glossary.html.j2:54
+#: template/glossary.html.j2:54
 msgid "exchange"
 msgstr "cambio"
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:56
 #, fuzzy
 #| msgid ""
 #| "Taler's payment service provider. Issues eletronic `coins` during "
@@ -1101,11 +1158,11 @@ msgstr ""
 "elettroniche durante il 'prelievo' e le riscatta quando vengono  "
 "'depositate' dai commercianti"
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:60
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:62
 msgid ""
 "Various operations come with time limits. In particular, `denomination keys` "
 "come with strict time limits for the various operations involving the `coin` "
@@ -1118,29 +1175,29 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:74
 msgid "extension"
 msgstr "estensione"
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr "implementazione di un 'portafoglio' per i browsers"
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:80
 msgid "fresh coin"
 msgstr "moneta fresca"
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 "la 'moneta' è fresca se la sua chiave pubblica è conosciuta soltanto dal "
 "cliente"
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:86
 msgid "master key"
 msgstr "chiave master"
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1148,21 +1205,21 @@ msgstr ""
 "chiave offline utilizzata dal cambio per certificare le chiavi di "
 "denominazione e le chiavi di firma dei messaggi "
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:92
 msgid "message signing key"
 msgstr "chiave di firma del messaggio"
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 "chiave utilizzata dal cambio per firmare messaggi online, diversi dalle "
 "monete "
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:98
 msgid "offer"
 msgstr "offerta"
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1178,32 +1235,32 @@ msgstr ""
 "altre parole, dopo che il backend aggiunge le informazioni mancanti "
 "all'offerta e la firma, essa diventa una proposta."
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:109
 msgid "owner"
 msgstr "possessore"
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 "la 'moneta' è di proprietà dell'entità che conosce la chiave privata della "
 "moneta"
 
-#: glossary.html.j2:115
+#: template/glossary.html.j2:115
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:117
 msgid ""
 "operation by which an exchange returns the value of coins affected by a "
 "`revocation` to their `owner`, either by allowing the owner to withdraw new "
 "coins or wiring funds back to the bank account of the `owner`"
 msgstr ""
 
-#: glossary.html.j2:123
+#: template/glossary.html.j2:123
 msgid "proof"
 msgstr "prova"
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
@@ -1211,19 +1268,19 @@ msgstr ""
 "messaggio che dimostra crittograficamente che una particolare richiesta di "
 "risarchimento è corretta "
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:129
 msgid "proposal"
 msgstr "proposta"
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr "una bozza completata e firmata dal backend del commerciante"
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:135
 msgid "reserve"
 msgstr "riserva"
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
@@ -1233,11 +1290,11 @@ msgstr ""
 "per il 'prelievo', sia i fondi conservati sul conto bancario del cambio per "
 "coprire gli obblighi derivanti dalle monete in circolazione "
 
-#: glossary.html.j2:141
+#: template/glossary.html.j2:141
 msgid "refreshing"
 msgstr "aggiornamento"
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1245,11 +1302,11 @@ msgstr ""
 "operazione mediante la quale una moneta 'sporca' viene convertita in una o "
 "più monete 'fresche' "
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:147
 msgid "refund"
 msgstr "rimborso"
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1259,13 +1316,13 @@ msgstr ""
 "ottenere i fondi da un operazione di 'deposito', resitituendo il diritto ai "
 "fondi al cliente"
 
-#: glossary.html.j2:153
+#: template/glossary.html.j2:153
 #, fuzzy
 #| msgid "denomination"
 msgid "revocation"
 msgstr "denominazione"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:155
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1273,11 +1330,11 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:159
 msgid "sharing"
 msgstr "condivisione"
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
@@ -1286,19 +1343,19 @@ msgstr ""
 "l'accesso alla chiave privata della moneta, consentendo così a tutti i co-"
 "possessori di spendere la moneta in qualsiasi momento"
 
-#: glossary.html.j2:165
+#: template/glossary.html.j2:165
 msgid "signing key"
 msgstr "chiave di firma"
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:167
 msgid "see message signing key."
 msgstr "vedi 'chiave di firma del messaggio' "
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:171
 msgid "spending"
 msgstr "spesa"
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1306,19 +1363,19 @@ msgstr ""
 "operazione mediante la quale un cliente dà ad un commerciante il diritto di "
 "'depositare le monete in cambio di merce"
 
-#: glossary.html.j2:177
+#: template/glossary.html.j2:177
 msgid "transfer"
 msgstr "trasferimento"
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr "metodo per l'invio di fondi tra conti 'bancari' "
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:183
 msgid "transaction"
 msgstr "transazione"
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1326,39 +1383,39 @@ msgstr ""
 "metodo in base al quale la proprietà è trasferita esclusivamente da "
 "un'entità ad un'altra "
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:189
 msgid "transaction id"
 msgstr "ID di transazione"
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 "numero univoco con il quale un commerciante identifica una  'transazione' "
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:195
 msgid "wallet"
 msgstr "portafoglio"
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 "software in esecuzione sul computer di un cliente; prelieva, conserva e "
 "spende monete"
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:201
 msgid "wire transfer"
 msgstr "bonifico bancario"
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:203
 msgid "see `transfer`"
 msgstr "vedi 'trasferimento' "
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr "identificatore del bonifico bancario"
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1366,22 +1423,22 @@ msgstr ""
 "oggetto di un 'bonifico bancario'; solitamente una stringa casuale per "
 "identificare in modo univoco il 'trasferimento' "
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:213
 msgid "withdrawal"
 msgstr "prelievo"
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 "operazione mediante la quale un 'portafoglio' può convertire i fondi da una "
 "riserva a monete fresche"
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:219
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:221
 msgid ""
 "a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
 "`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
@@ -1392,11 +1449,11 @@ msgid ""
 "past the legal data retention requirement)."
 msgstr ""
 
-#: governments.html.j2:6
+#: template/governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Vantaggi per le Pubbliche Amministrazioni"
 
-#: governments.html.j2:8
+#: template/governments.html.j2:8
 msgid ""
 "Taler provides accountability to ensure business operate legally, while also "
 "respecting civil liberties of citizens. Taler is a payment system based on "
@@ -1411,7 +1468,7 @@ msgstr ""
 "autorità di controllo di fiducia. Taler contribuisce alla sovranità digitale "
 "nella critica infrastruttura finanziaria. "
 
-#: governments.html.j2:28
+#: template/governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
 "taxation. With Taler, the receiver of any form of payment is easily "
@@ -1428,7 +1485,7 @@ msgstr ""
 "gli individui in base al loro reddito, rendendo meno sostenibili l'evasione "
 "fiscale e i mercati neri. "
 
-#: governments.html.j2:41
+#: template/governments.html.j2:41
 msgid ""
 "Thus, despite offering anonymity for citizens spending digital cash to buy "
 "goods and services, Taler also ensures that the state can observe incoming "
@@ -1449,7 +1506,7 @@ msgstr ""
 "l'accesso condiviso ai fondi con amici fidati e familiari, o la "
 "sincronizzazione dei portafogli tra più dispositivi. "
 
-#: governments.html.j2:61
+#: template/governments.html.j2:61
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1464,7 +1521,7 @@ msgstr ""
 "migliorando la sicurezza economica per gli individui, i commercianti, il "
 "cambio e lo Stato. "
 
-#: governments.html.j2:73
+#: template/governments.html.j2:73
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1481,7 +1538,7 @@ msgstr ""
 "conto di garanzia sia gestito onestamente. Ciò garantisce che il cambio non "
 "minacci l'economia per via fraudolenta. "
 
-#: governments.html.j2:91
+#: template/governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
 "will enable competition and avoid the monopolization of payment systems that "
@@ -1492,11 +1549,11 @@ msgstr ""
 "dei sistemi di pagamento che oggi minaccia la stabilità politica e "
 "finanziaria globale. "
 
-#: governments.html.j2:101
+#: template/governments.html.j2:101
 msgid "Efficient"
 msgstr "Efficiente"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:104
 msgid ""
 "Taler has an efficient design. Unlike Blockchain-based payment systems, such "
 "as Bitcoin, Taler will not threaten the availability of national electric "
@@ -1507,15 +1564,15 @@ msgstr ""
 "disponibilità di reti elettriche nazionali e non contribuirà (in modo "
 "significativo) all'inquinamento ambientale. "
 
-#: governments.html.j2:120
+#: template/governments.html.j2:120
 msgid "Taler and regulation"
 msgstr "Taler e la regolamentazione"
 
-#: governments.html.j2:122
+#: template/governments.html.j2:122
 msgid "Anti money laundering (AML)"
 msgstr "Antiriciclaggio (AML) "
 
-#: governments.html.j2:123
+#: template/governments.html.j2:123
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1523,11 +1580,11 @@ msgstr ""
 "Con Taler, il reddito è visibile e può essere collegato al contratto firmato "
 "da entrambe le parti. "
 
-#: governments.html.j2:124
+#: template/governments.html.j2:124
 msgid "Know your customer (KYC)"
 msgstr "Conosci il tuo cliente (KYC) "
 
-#: governments.html.j2:125
+#: template/governments.html.j2:125
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
@@ -1535,11 +1592,11 @@ msgstr ""
 "In Taler, il pagatore e il beneficiario sono conosciuti dai loro conti "
 "bancari quando rispettivamente prelevano o depositano monete. "
 
-#: governments.html.j2:126
+#: template/governments.html.j2:126
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "Regolamento generale sulla protezione dei dati (GDPR) "
 
-#: governments.html.j2:127
+#: template/governments.html.j2:127
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
@@ -1548,11 +1605,11 @@ msgstr ""
 "progettazione implementa la minimizzazione dei dati e la privacy per "
 "impostazione predefinita. "
 
-#: governments.html.j2:128
+#: template/governments.html.j2:128
 msgid "Payment Services Directive (PSD2)"
 msgstr "Direttiva sui servizi di pagamento (PSD2) "
 
-#: governments.html.j2:129
+#: template/governments.html.j2:129
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
@@ -1560,11 +1617,11 @@ msgstr ""
 "Taler fornisce uno standard aperto con API pubbliche che contribuiscono a un "
 "settore bancario competitivo. "
 
-#: governments.html.j2:137
+#: template/governments.html.j2:137
 msgid "Taler provides privacy and accountability"
 msgstr "Taler offre privacy e responsabilità "
 
-#: governments.html.j2:140
+#: template/governments.html.j2:140
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
@@ -1574,7 +1631,7 @@ msgstr ""
 "tradizionali bonifici bancari che entrano ed escono dal sistema di pagamento "
 "di Taler. A partire dai bonifici, i Governi possono ottenere: "
 
-#: governments.html.j2:148
+#: template/governments.html.j2:148
 msgid ""
 "The total amount of digital currency withdrawn by a customer. The government "
 "can impose limits on how much digital cash a customer can withdraw within a "
@@ -1584,12 +1641,12 @@ msgstr ""
 "può imporre dei limiti su quanto denaro digitale un cliente può prelevare "
 "entro un determinato intervallo di tempo. "
 
-#: governments.html.j2:157
+#: template/governments.html.j2:157
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 "Il reddito ricevuto da qualsiasi commerciante attraverso il sistema Taler. "
 
-#: governments.html.j2:164
+#: template/governments.html.j2:164
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
@@ -1599,7 +1656,7 @@ msgstr ""
 "commerciante. Tuttavia, queste informazioni non includono solitamente "
 "l'identità del cliente. "
 
-#: governments.html.j2:174
+#: template/governments.html.j2:174
 msgid ""
 "The amounts of digital coins legitimately withdrawn by customers from the "
 "exchange, the value of non-redeemed digital coins in customer's wallets, the "
@@ -1613,23 +1670,23 @@ msgstr ""
 "operazioni di deposito effettuate dai commercianti con il cambio, e il "
 "profitto del cambio dalle spese di transazione. "
 
-#: gsoc-codeless.html.j2:5
+#: template/gsoc-codeless.html.j2:5
 msgid "GSoC 2018: Codeless Payment"
 msgstr ""
 
-#: gsoc-codeless.html.j2:6
+#: template/gsoc-codeless.html.j2:6
 msgid ""
 "Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and "
 "guidance of Florian Dold."
 msgstr ""
 
-#: gsoc-codeless.html.j2:12
+#: template/gsoc-codeless.html.j2:12
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "Overview"
 msgstr "Panoramica del sistema"
 
-#: gsoc-codeless.html.j2:14
+#: template/gsoc-codeless.html.j2:14
 msgid ""
 "Codeless payment is a component that sits between the seller's frontend and "
 "the GNU Taler merchant backend. This component has a web interface, where "
@@ -1639,15 +1696,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:23
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:24
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:28
 msgid ""
 "The primary use case is the registration of the merchant. The codeless "
 "payment backend provides a secure django authenticated login to the "
@@ -1658,19 +1715,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:33
 msgid ""
 "A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:38
+#: template/gsoc-codeless.html.j2:38
 msgid ""
 "The merchant can upload digital inventory (like a PDF or HTML page) via the "
 "codeless payments frontend and the user can then purchase it and view the "
 "version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:43
+#: template/gsoc-codeless.html.j2:43
 msgid ""
 "The merchant can add any physical inventory available in his stocks. While "
 "adding these inventory, the seller is prompted to add minimum quantity of "
@@ -1679,7 +1736,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1689,7 +1746,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1697,31 +1754,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1730,7 +1787,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1738,7 +1795,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1750,7 +1807,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1758,7 +1815,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1768,15 +1825,15 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "Investi in Taler! "
 
-#: investors.html.j2:9
+#: template/investors.html.j2:9
 msgid ""
 "We have created a company, Taler Systems SA in Luxembourg.
 Please "
 "contact invest@taler.net if you want to invest in Taler."
@@ -1785,11 +1842,11 @@ msgstr ""
 "desideri investire in Taler ti preghiamo di contattare invest@taler.net "
 
-#: investors.html.j2:24
+#: template/investors.html.j2:24
 msgid "The Team"
 msgstr "La Squadra"
 
-#: investors.html.j2:27
+#: template/investors.html.j2:27
 msgid ""
 "Our team combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1802,7 +1859,7 @@ msgstr ""
 "cui i pagamenti dovrebbero realizzarsi e l'obiettivo di imporre questa "
 "visione al mondo. "
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
 msgid ""
 "We are currently supported by Inria, "
 "the French national institute for research in informatics and automation, "
@@ -1814,11 +1871,11 @@ msgstr ""
 "dalla . "
 
-#: investors.html.j2:45
+#: template/investors.html.j2:45
 msgid "The Technology"
 msgstr "La Tecnologia"
 
-#: investors.html.j2:48
+#: template/investors.html.j2:48
 msgid ""
 "All transactions in Taler are secured using modern cryptography and trust in all parties is minimized. Financial "
@@ -1837,11 +1894,11 @@ msgstr ""
 "dimostrano che i partecipanti sono stati onesti. I costi effettivi di "
 "transazione sono frazioni di un centesimo. "
 
-#: investors.html.j2:63
+#: template/investors.html.j2:63
 msgid "The Business"
 msgstr "Il Business"
 
-#: investors.html.j2:66
+#: template/investors.html.j2:66
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1859,11 +1916,11 @@ msgstr ""
 "scambiarle per denaro al cambio utilizzando i sistemi di pagamento "
 "tradizionali. Il cambio addebita delle spese per facilitare le transazioni. "
 
-#: investors.html.j2:85
+#: template/investors.html.j2:85
 msgid "The Business Case"
 msgstr "Il Caso Aziendale"
 
-#: investors.html.j2:91
+#: template/investors.html.j2:91
 msgid ""
 "Our financial news page explains in "
 "English how Taler can impact current developments in the global payment "
@@ -1873,11 +1930,11 @@ msgstr ""
 "chiarisce in inglese come Taler può influenzare gli sviluppi attuali nel "
 "mercato dei pagamenti globali. "
 
-#: investors.html.j2:114
+#: template/investors.html.j2:114
 msgid "Running a Taler payment service operator"
 msgstr "Funzionamento di un operatore dei servizi di pagamento Taler "
 
-#: investors.html.j2:117
+#: template/investors.html.j2:117
 msgid ""
 "The payment service operator runs the Taler exchange. The exchange "
 "charges transaction fees to customers or merchants. Its operational "
@@ -1890,7 +1947,7 @@ msgstr ""
 "bonifici con il sistema bancario e al funzionamento dell'infrastruttura di "
 "calcolo. "
 
-#: investors.html.j2:127
+#: template/investors.html.j2:127
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
@@ -1898,7 +1955,7 @@ msgstr ""
 "Le operazioni di crittografia, la larghezza di banda e i costi di "
 "archiviazione sono inferiori a 0,01 centesimi per transazione. "
 
-#: investors.html.j2:129
+#: template/investors.html.j2:129
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
@@ -1907,7 +1964,7 @@ msgstr ""
 "di denaro più grandi ai commercianti per ridurre al minimo i costi dei "
 "bonifici bancari."
 
-#: investors.html.j2:131
+#: template/investors.html.j2:131
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -1916,21 +1973,21 @@ msgstr ""
 "operazione costosa (prelievo, deposito, aggiornamento, rimborso o bonifici "
 "bancari aggregati. "
 
-#: investors.html.j2:133
+#: template/investors.html.j2:133
 msgid "Partnership with banks establishes consumer trust."
 msgstr "La partnership con le banche instaura fiducia nei consumatori. "
 
-#: investors.html.j2:135
+#: template/investors.html.j2:135
 msgid "Partnership with free software community enables rapid deployment."
 msgstr ""
 "La partnership con la comunità del software libero consente una rapida "
 "implementazione. "
 
-#: merchants.html.j2:5
+#: template/merchants.html.j2:5
 msgid "Advantages for Merchants"
 msgstr "Vantaggi per i Commercianti"
 
-#: merchants.html.j2:8
+#: template/merchants.html.j2:8
 msgid ""
 "Taler is a cost-effective electronic payment system which provides you with "
 "cryptographic proof that the payment worked correctly within milliseconds. "
@@ -1942,11 +1999,11 @@ msgstr ""
 "millisecondi. I tuoi clienti Web pagano con livelli di comodità "
 "precedentemente sconosciuti senza rischio di frode. "
 
-#: merchants.html.j2:22
+#: template/merchants.html.j2:22
 msgid "Fast"
 msgstr "Veloce"
 
-#: merchants.html.j2:25
+#: template/merchants.html.j2:25
 msgid ""
 "Processing transactions with Taler is fast, allowing you to confirm the "
 "transaction with your customer virtually immediately. Your customers will "
@@ -1965,7 +2022,7 @@ msgstr ""
 "con pagamenti con carta di credito a causa del sovraccarico mentale per i "
 "clienti. "
 
-#: merchants.html.j2:44
+#: template/merchants.html.j2:44
 msgid ""
 "You will have cryptographic proof of payment from the Taler payment service "
 "provider. With Taler you never handle sensitive customer account information "
@@ -1980,7 +2037,7 @@ msgstr ""
 "avranno contratti con i clienti con firme qualificate per tutte le "
 "transazioni, che potrai utilizzare in tribunale in caso di controversie. "
 
-#: merchants.html.j2:61
+#: template/merchants.html.j2:61
 msgid ""
 "Taler is free software, and you can use the liberally-licensed reference "
 "code as a starting point to integrate Taler into your services. To use "
@@ -1994,11 +2051,11 @@ msgstr ""
 "licenza, e il modello di sviluppo del software libero garantirà la "
 "possibilità di scegliere tra molti integratori concorrenti per assistenza. "
 
-#: merchants.html.j2:76
+#: template/merchants.html.j2:76
 msgid "Cheap"
 msgstr "Conveniente"
 
-#: merchants.html.j2:79
+#: template/merchants.html.j2:79
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -2011,11 +2068,11 @@ msgstr ""
 "pagamento di Taler possono operare a costi molto bassi ed offrire così spese "
 "di transazione modeste. "
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:89
 msgid "Flexible"
 msgstr "Flessibile"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:92
 #, fuzzy
 #| msgid ""
 #| "Taler can be used for different currencies (such as Euros, US Dollars or "
@@ -2030,11 +2087,11 @@ msgstr ""
 "Bitcoins) e per qualsiasi importo, limitato soltanto dalla normativa valida "
 "e dalle denominazioni che il fornitore dei servizi di pagamento supporta. "
 
-#: merchants.html.j2:101
+#: template/merchants.html.j2:101
 msgid "Ethical"
 msgstr "Etico"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:104
 msgid ""
 "Taler prevents tax evasion and money laundering. Taler's protocols are "
 "efficient and do not use wasteful proof-of-work calculations. Taler "
@@ -2046,32 +2103,32 @@ msgstr ""
 "Taler incoraggia la trasparenza fornendo uno standard aperto ed "
 "implementazioni di riferimento del software libero. "
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:119
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Manuali per i commercianti"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:122
 msgid "The GNU Taler merchant backend operator manual"
 msgstr "Il manuale dell'operatore del backend del commerciante GNU Taler "
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr "Il tutorial di integrazione del negozio Web GNU Taler (PHP) "
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:128
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr "Il tutorial di integrazione del negozio Web GNU Taler (Python) "
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:140
 msgid "The GNU Taler Merchant Backend"
 msgstr "Il backend del commerciante GNU Taler"
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:142
 msgid "Merchants process payments using the Taler backend:"
 msgstr "I commercianti effettuano pagamenti utilizzando il backend di Taler: "
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:147
 msgid ""
 "The backend signs and stores the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
@@ -2081,7 +2138,7 @@ msgstr ""
 "offerte fatte dal commerciante ai clienti. Per questo, il frontend del "
 "commerciante deve dare l'ordine del cliente al backend in un formato JSON. "
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:156
 msgid ""
 "The backend validates payments received from the wallet and "
 "executes them with the Taler payment service provider (the exchange). "
@@ -2094,7 +2151,7 @@ msgstr ""
 "pagamento al backend di Taler e controllare il codice di stato HTTP che "
 "viene restituito. "
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:167
 msgid ""
 "The backend can list completed transactions and map wire "
 "transfers to sets of business transactions, including the exact terms of "
@@ -2104,47 +2161,47 @@ msgstr ""
 "bonifici a set di transazioni commerciali, includendo i termini esatti di "
 "ogni contratto. "
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:183
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:16
 msgid "More news"
 msgstr "Altre notizie"
 
-#: old-news.html.j2:6
+#: template/old-news.html.j2:6
 msgid "Older News"
 msgstr "Notizie precedenti"
 
-#: old-news.html.j2:9
+#: template/old-news.html.j2:9
 msgid "This page documents the GNU Taler history."
 msgstr "Questa pagina documenta la storia di GNU Taler. "
 
-#: press.html.j2:4
+#: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler nella Stampa"
 
-#: principles.html.j2:22
+#: template/principles.html.j2:22
 #, fuzzy
 #| msgid "GNU Taler in the Press"
 msgid "GNU Taler: Design Principles"
 msgstr "GNU Taler nella Stampa"
 
-#: principles.html.j2:29
+#: template/principles.html.j2:29
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:36
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:40
 msgid ""
 "... in the are of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:42
 msgid ""
 "GNU Taler must be Free Software. For merchants, our Free Software reference "
@@ -2153,24 +2210,24 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:51
 msgid ""
 "Customers benefit from Free Software as the wallet software can be made to "
 "run on a variety of platforms, and the absence of user-hostile features such "
 "as tracking or telemetry can easily be assured."
 msgstr ""
 
-#: principles.html.j2:63
+#: template/principles.html.j2:63
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:68
 #, fuzzy
 #| msgid "How does Taler protect my privacy?"
 msgid "You deserve some privacy"
 msgstr "Come protegge Taler la mia privacy?"
 
-#: principles.html.j2:70
+#: template/principles.html.j2:70
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -2178,7 +2235,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:78
 msgid ""
 "In legislations with data protection regulations (such as the recently "
 "introduced GDPR in Europe), merchants benefit from this as well, as no data "
@@ -2188,45 +2245,45 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:92
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:97
 #, fuzzy
 #| msgid "Anti money laundering (AML)"
 msgid "Money laundering"
 msgstr "Antiriciclaggio (AML) "
 
-#: principles.html.j2:99
+#: template/principles.html.j2:99
 msgid ""
 "As a payment system must still be legal to operate and use, it must comply "
 "with these requirements. Furthermore, we consider levying of taxes as "
 "beneficial to society."
 msgstr ""
 
-#: principles.html.j2:110
+#: template/principles.html.j2:110
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:115
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:117
 msgid ""
 "This imposes requirements on the security of the system, as well as on the "
 "general design, as payment fraud can also happen through misleading user "
 "interface design or the lack of cryptographic evidence for certain processes."
 msgstr ""
 
-#: principles.html.j2:128
+#: template/principles.html.j2:128
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:132
 #, fuzzy
 #| msgid "General Data Protection Regulation (GDPR)"
 msgid ""
@@ -2234,7 +2291,7 @@ msgid ""
 "(GDPR) compliant"
 msgstr "Regolamento generale sulla protezione dei dati (GDPR) "
 
-#: principles.html.j2:134
+#: template/principles.html.j2:134
 msgid ""
 "The reason behind this goal is similar to (2). The privacy of buyers is "
 "given priority, but other parties such as merchants still benefit from it, "
@@ -2242,15 +2299,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:144
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:148
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:150
 msgid ""
 "Specifically it must be usable for non-expert customers. Usability also "
 "applies to the integration with merchants, and informs choices about the "
@@ -2258,33 +2315,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:162
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Efficiente"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:166
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Efficiente"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:168
 msgid ""
 "Approaches such as proof-of-work are ruled out by this requirement. "
 "Efficiency is necessary for GNU Taler to be used for micropayments."
 msgstr ""
 
-#: principles.html.j2:177
+#: template/principles.html.j2:177
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:181
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:183
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -2292,15 +2349,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:195
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:199
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:201
 msgid ""
 "It must be relatively easy for competitors to join the systems. While the "
 "barriers for this in traditional financial systems are rather high, the "
@@ -2310,11 +2367,11 @@ msgid ""
 "instead of having one completely monolithic system."
 msgstr ""
 
-#: schemafuzz.html.j2:6
+#: template/schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
 
-#: team.html.j2:16
+#: template/team.html.j2:16
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security & privacy researcher. Software "
@@ -2323,7 +2380,7 @@ msgstr ""
 "Ricercatore in reti e sicurezza, ingegnere del software; autore di software "
 "GNU"
 
-#: team.html.j2:21
+#: template/team.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
@@ -2331,137 +2388,84 @@ msgstr ""
 "Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
 "diversi settori"
 
-#: team.html.j2:26
+#: template/team.html.j2:26
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
+#: template/team.html.j2:33
 msgid "GNU mainatiner, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:38
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c & Tor."
 msgstr "Matematico e crittografo. Attivo nel W3C & Tor"
 
-#: team.html.j2:43
+#: template/team.html.j2:43
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
 
-#: team.html.j2:50
+#: template/team.html.j2:50
 msgid "Software engineer."
 msgstr "Programmatore."
 
-#: team.html.j2:55
+#: template/team.html.j2:55
 msgid "Sustainable business development."
 msgstr "Sviluppo di business sostenibile."
 
-#: team.html.j2:60
+#: template/team.html.j2:60
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Teorica della sicurezza dei protocolli"
 
-#: team.html.j2:66
+#: template/team.html.j2:66
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:73 template/team.html.j2:77 template/team.html.j2:81
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traduttore per lo spagnolo."
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:87 template/team.html.j2:91 template/team.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traduttrice per l'italiano."
 
-#: team.html.j2:99
+#: template/team.html.j2:99
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traduttore per lo spagnolo."
 
-#: team.html.j2:106
+#: template/team.html.j2:106
 msgid "Hardware security module"
 msgstr "Sicurezza hardware."
 
-#: team.html.j2:110
+#: template/team.html.j2:110
 msgid "Risk management"
 msgstr "Gestione del rischio."
 
-#: team.html.j2:118
+#: template/team.html.j2:118
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
 
-#: team.html.j2:122
+#: template/team.html.j2:122
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 "Dottorando alla TU di Monaco di Baviera. Linux, FreeBSD, siti web e il deep "
 "state nel tempo libero."
 
-#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
-#: team.html.j2:146
+#: template/team.html.j2:128 template/team.html.j2:132
+#: template/team.html.j2:136 template/team.html.j2:142
+#: template/team.html.j2:146
 #, fuzzy
 #| msgid "Taler for developers"
 msgid "Free software developer."
 msgstr "Taler per programmatori"
 
-#: common/base.j2:5
-msgid "GNU Taler"
-msgstr "GNU Taler"
-
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr "Tassabili Anonime Libere Elettroniche Riserve"
-
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "La Squadra"
-
-#: common/footer.j2.inc:16
-msgid "Contact"
-msgstr "Contatti"
-
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr "FAQ"
-
-#: common/footer.j2.inc:26
-#, fuzzy
-#| msgid "GNU Taler Bibliography"
-msgid "Bibliography"
-msgstr "Bibliografia"
-
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by BFH"
-msgstr ""
-
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using Free Software "
-"only."
-msgstr ""
-"Questa pagina è stata creata utilizzando solo Software Libero. "
-
-#: common/navigation.j2.inc:21
-msgid "Features"
-msgstr ""
-
-#: common/navigation.j2.inc:22
-msgid "Principles"
-msgstr ""
-
-#: common/navigation.j2.inc:23
-msgid "Docs"
-msgstr ""
-
 #, fuzzy
 #~| msgid "exchange"
 #~ msgid "Code (Exchange)"
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 323028c7..5e2021a3 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,49 +6,103 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU taler master\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-01 18:07+0200\n"
+"POT-Creation-Date: 2019-09-02 09:39+0000\n"
 "PO-Revision-Date: 2018-01-28 15:27-0200\n"
 "Last-Translator: Rafael Fontenelle \n"
 "Language-Team: Brazilian Portuguese\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "Generated-By: Babel 2.5.3\n"
 
-#: architecture.html.j2:6
+#: common/base.j2:5
+msgid "GNU Taler"
+msgstr "GNU Taler"
+
+#: common/base.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr "Reservas eletrônicas livres, anônimas, tributáveis"
+
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "A equipe"
+
+#: common/footer.j2.inc:16
+msgid "Contact"
+msgstr "Contato"
+
+#: common/footer.j2.inc:21
+msgid "FAQ"
+msgstr "FAQ"
+
+#: common/footer.j2.inc:26
+msgid "Bibliography"
+msgstr "Bibliografia"
+
+#: common/footer.j2.inc:32 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
+msgid "and"
+msgstr "e"
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by BFH"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using Free Software "
+"only."
+msgstr ""
+"Essa página foi criada usando apenas software "
+"livre."
+
+#: common/navigation.j2.inc:21
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:22
+msgid "Principles"
+msgstr ""
+
+#: common/navigation.j2.inc:23
+msgid "Docs"
+msgstr ""
+
+#: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Arquitetura do sistema Taler"
 
-#: bibliography.html.j2:4
+#: template/bibliography.html.j2:4
 msgid "GNU Taler Bibliography"
 msgstr "Bibliografia do GNU Taler"
 
-#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:30 bibliography.html.j2:36
+#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
 msgid "by"
 msgstr "por"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
-#: bibliography.html.j2:36 common/footer.j2.inc:32
-msgid "and"
-msgstr "e"
-
-#: bibliography.html.j2:37
+#: template/bibliography.html.j2:37
 msgid "available upon request"
 msgstr "disponível mediante solicitação"
 
-#: contact.html.j2:6
+#: template/contact.html.j2:6
 msgid "Contact information"
 msgstr "Informações de contato"
 
-#: contact.html.j2:13
+#: template/contact.html.j2:13
 msgid "The mailing list"
 msgstr "A lista de discussão"
 
-#: contact.html.j2:15
+#: template/contact.html.j2:15
 msgid ""
 "An archived, public mailing list for GNU Taler is hosted at https://lists.gnu.org/"
@@ -60,11 +114,11 @@ msgstr ""
 "mailman/listinfo/taler. Você pode enviar mensagens para a lista em taler@gnu.org."
 
-#: contact.html.j2:25
+#: template/contact.html.j2:25
 msgid "Contacting individuals"
 msgstr "Contatando indivíduos"
 
-#: contact.html.j2:27
+#: template/contact.html.j2:27
 msgid ""
 "Team members are generally reachable at LASTNAME@taler.net. All of "
 "us support receiving GnuPG encrypted e-mails."
@@ -72,21 +126,21 @@ msgstr ""
 "Os membros da equipe geralmente são acessíveis em SOBRENOME@taler.net. Todos nós apoiamos o recebimento de e-mails criptografados pelo GnuPG."
 
-#: contact.html.j2:36
+#: template/contact.html.j2:36
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:38
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "contact AT taler.net."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:46
 msgid "Reporting bugs"
 msgstr "Relatando bugs"
 
-#: contact.html.j2:48
+#: template/contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our Bug tracker, which is shared with the GNUnet project. You can "
@@ -97,11 +151,11 @@ msgstr ""
 "o projeto GNUnet. Você também pode relatar bugs ou solicitações de recursos "
 "para a lista de discussões."
 
-#: contact.html.j2:59
+#: template/contact.html.j2:59
 msgid "Executive team"
 msgstr "Equipe executiva"
 
-#: contact.html.j2:61
+#: template/contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact ceo AT taler.net."
@@ -109,11 +163,11 @@ msgstr ""
 "Para pedidos comerciais não técnicos, por favor contate ceo AT taler."
 "net."
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr "Atribuição de direitos autorais"
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:8
 msgid ""
 "Contributors to GNU Taler with Git access must sign the copyright assignment to ensure that the  dos projetos GNUnet e GNU Taler esteja "
 "satisfeito.
"
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:17
 msgid ""
 "The agreements ensure that the code will continue to be made available "
 "under free software licenses, but gives developers the freedom to move code "
@@ -143,7 +197,7 @@ msgstr ""
 "distribuir através de lojas de aplicativos (“App stores”) que sejam hostis "
 "ao software livre)."
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:25
 msgid ""
 "Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -155,15 +209,15 @@ msgstr ""
 "aceitas, neste caso, basta assinar o acordo com seu pseudônimo. As cópias "
 "digitalizadas são suficientes, mas correio normal é preferido."
 
-#: developers.html.j2:5
+#: template/developers.html.j2:5
 msgid "Taler for developers"
 msgstr "Taler para desenvolvedores"
 
-#: developers.html.j2:12 merchants.html.j2:58
+#: template/developers.html.j2:12 template/merchants.html.j2:58
 msgid "Free"
 msgstr "Livre"
 
-#: developers.html.j2:15
+#: template/developers.html.j2:15
 msgid ""
 "GNU Taler is free software implementing an open protocol. Anybody is welcome "
 "to integrate our reference implementation into their applications. Different "
@@ -183,11 +237,11 @@ msgstr ""
 "relacionado para o cliente. Estamos abertos a sugestões construtivas para "
 "maximizar a adoção desta plataforma de pagamento."
 
-#: developers.html.j2:32
+#: template/developers.html.j2:32
 msgid "RESTful"
 msgstr "RESTful"
 
-#: developers.html.j2:35
+#: template/developers.html.j2:35
 msgid ""
 "Taler is designed to work on the Internet. To ensure that Taler payments can "
 "work with restrictive network setups, Taler uses a RESTful protocol over "
@@ -208,11 +262,11 @@ msgstr ""
 "Web existentes. O protocolo do Taler é documentado em detalhes em docs.taler.net."
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58
 msgid "Code"
 msgstr "Código"
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
 msgid ""
 "Taler is currently primarily developed by a research team at Inria and GitWeb."
 
-#: developers.html.j2:75
+#: template/developers.html.j2:75
 msgid "Documentation"
 msgstr "Documentação"
 
-#: developers.html.j2:78
+#: template/developers.html.j2:78
 msgid ""
 "In addition to this website, the documented code and the API "
@@ -246,11 +300,11 @@ msgstr ""
 "técnicos podem ser encontrados em nossa bibliografia."
 
-#: developers.html.j2:88
+#: template/developers.html.j2:88
 msgid "Discussion"
 msgstr "Discussão"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:91
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
 "read the list archive at http://lists.gnu.org/mailman/listinfo/taler."
 
-#: developers.html.j2:101
+#: template/developers.html.j2:101
 msgid "Regression Testing"
 msgstr "Teste de regressão"
 
-#: developers.html.j2:104
+#: template/developers.html.j2:104
 msgid ""
 "We have Buildbot automation tests to "
 "detect regressions and check for portability at Buildbot para detectar regressões e verificar a portabilidade em buildbot.taler.net."
 
-#: developers.html.j2:113
+#: template/developers.html.j2:113
 msgid "Code Coverage Analysis"
 msgstr "Análise de cobertura de código"
 
-#: developers.html.j2:116
+#: template/developers.html.j2:116
 msgid ""
 "We use LCOV to "
 "analyze the code coverage of our tests, the results are available at lcov.taler.net."
 
-#: developers.html.j2:131
+#: template/developers.html.j2:131
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:134 template/investors.html.j2:88
 msgid "Download"
 msgstr "Baixar"
 
-#: developers.html.j2:150
+#: template/developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Visão geral do sistema Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -310,11 +364,11 @@ msgstr ""
 "ilustrado na ilustração à direita. As transações típicas envolvem as "
 "seguintes etapas:"
 
-#: developers.html.j2:162
+#: template/developers.html.j2:162
 msgid "system overview"
 msgstr "visão geral do sistema"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:165
 msgid ""
 "A customer instructs his bank to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -326,7 +380,7 @@ msgstr ""
 "inclui um token de autenticação de sua carteira eletrônica. Na "
 "terminologia do Taler, o cliente cria uma reserva no câmbio."
 
-#: developers.html.j2:177
+#: template/developers.html.j2:177
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to withdraw electronic coins. The electronic coins "
@@ -346,7 +400,7 @@ msgstr ""
 "moeda ou o valor total dos fundos (exceto as taxas que a bolsa pode cobrar "
 "pelo serviço)."
 
-#: developers.html.j2:195
+#: template/developers.html.j2:195
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to spend the coins with merchant portals that support the Taler "
@@ -372,7 +426,7 @@ msgstr ""
 "gastar qualquer fração de suas moedas digitais (o sistema cuida dos clientes "
 "obtendo troco)."
 
-#: developers.html.j2:217
+#: template/developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins deposit the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -397,7 +451,7 @@ msgstr ""
 "que o Estado imponha que os comerciantes paguem tributos aplicáveis (e não "
 "se envolvam em contratos ilegais)."
 
-#: developers.html.j2:240
+#: template/developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's bank account. The "
@@ -412,7 +466,7 @@ msgstr ""
 "entre as transferências bancárias e as reivindicações individuais que foram "
 "depositadas."
 
-#: developers.html.j2:254
+#: template/developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -428,7 +482,7 @@ msgstr ""
 "câmbio e verificar se o saldo bancário corresponde ao valor total das moedas "
 "restantes em circulação."
 
-#: developers.html.j2:269
+#: template/developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -442,82 +496,82 @@ msgstr ""
 "comprometidos, o dano financeiro é limitado à respectiva parte e "
 "proporcional aos fundos em circulação durante o período do comprometimento."
 
-#: docs.html.j2:37
+#: template/docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:38
+#: template/docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:44
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:46
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:144
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "A lista de discussão"
 
-#: docs.html.j2:152
+#: template/docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
-#: faq.html.j2:5
+#: template/faq.html.j2:5
 msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr "Como o Taler está relacionado com Bitcoin ou Blockchains?"
 
-#: faq.html.j2:6
+#: template/faq.html.j2:6
 #, fuzzy
 #| msgid ""
 #| "Taler does not use any Blockchain technology or Bitcoin directly. "
@@ -534,7 +588,7 @@ msgstr ""
 "consenso distribuído. Em vez disso, o Taler é baseado em assinaturas cegas."
 
-#: faq.html.j2:13
+#: template/faq.html.j2:13
 msgid ""
 "
It would be possible, however, to withdraw coins denominated in Bitcoin "
 "into a Taler wallet (with an appropriate exchange), which would give some "
@@ -544,11 +598,11 @@ msgstr ""
 "carteira do Taler (com um câmbio apropriado), o que daria alguns benefícios "
 "sobre o Bitcoin simples, como os tempos de confirmação instantânea."
 
-#: faq.html.j2:20
+#: template/faq.html.j2:20
 msgid "Where is the balance in my wallet stored?"
 msgstr "Onde é armazenado o saldo da minha carteira?"
 
-#: faq.html.j2:21
+#: template/faq.html.j2:21
 msgid ""
 "Your wallet stores digital coins and thus ultimately your computer holds "
 "your balance. The exchange keeps funds matching all unspent coins in an "
@@ -558,11 +612,11 @@ msgstr ""
 "mantém seu saldo. O câmbio mantém os fundos correspondentes a todas as "
 "moedas não gastadas em uma conta bancária em depósito."
 
-#: faq.html.j2:27
+#: template/faq.html.j2:27
 msgid "What if my wallet is lost?"
 msgstr "E se minha carteira for perdida?"
 
-#: faq.html.j2:28
+#: template/faq.html.j2:28
 msgid ""
 "Since the digital coins of value in your wallet are anonymized, the "
 "exchange can not assist you in recovering a lost or stolen wallet. Just like "
@@ -573,7 +627,7 @@ msgstr ""
 "como com uma carteira física para dinheiro, você é responsável por mantê-lo "
 "seguro."
 
-#: faq.html.j2:34
+#: template/faq.html.j2:34
 msgid ""
 "The risk of losing a wallet can be mitigated by making backups or keeping "
 "the balance reasonably low."
@@ -581,11 +635,11 @@ msgstr ""
 "O risco de perder uma carteira pode ser mitigado fazendo backups ou "
 "mantendo o saldo razoavelmente baixo."
 
-#: faq.html.j2:39
+#: template/faq.html.j2:39
 msgid "What if my computer is hacked?"
 msgstr "E se meu computador for hackeado?"
 
-#: faq.html.j2:40
+#: template/faq.html.j2:40
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend "
 "coins from your wallet. Checking your balance might reveal to you that your "
@@ -595,11 +649,11 @@ msgstr ""
 "pode gastar moedas da sua carteira. Verificar seu equilíbrio pode revelar "
 "que seu dispositivo foi comprometido."
 
-#: faq.html.j2:46
+#: template/faq.html.j2:46
 msgid "Can I send money to my friend with Taler?"
 msgstr "Posso enviar moeda para meu amigo com Taler?"
 
-#: faq.html.j2:47
+#: template/faq.html.j2:47
 msgid ""
 "If your friend provides goods or services for you in exchange for a "
 "payment, they can easily set up a Taler merchant and receive the payment in "
@@ -609,7 +663,7 @@ msgstr ""
 "pagamento, eles podem configurar facilmente um comerciante no Taler e "
 "receber o pagamento em sua conta bancária."
 
-#: faq.html.j2:52
+#: template/faq.html.j2:52
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among "
 "friends directly as well."
@@ -617,11 +671,11 @@ msgstr ""
 "As versões futuras da carteira do Taler podem permitir também trocar "
 "moedas entre amigos."
 
-#: faq.html.j2:58
+#: template/faq.html.j2:58
 msgid "How does Taler handle payments in different currencies?"
 msgstr "Como o Taler lida com pagamentos em diferentes moedas?"
 
-#: faq.html.j2:59
+#: template/faq.html.j2:59
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
@@ -629,15 +683,15 @@ msgstr ""
 "As carteiras do Taler podem armazenar moedas digitais correspondentes a "
 "várias moedas diferentes, como o Euro, Dólares dos EUA ou Bitcoins."
 
-#: faq.html.j2:63
+#: template/faq.html.j2:63
 msgid "Taler currently does not offer conversion between currencies."
 msgstr "O Taler atualmente não oferece conversão entre moedas."
 
-#: faq.html.j2:67
+#: template/faq.html.j2:67
 msgid "How does Taler protect my privacy?"
 msgstr "Como o Taler protege minha privacidade?"
 
-#: faq.html.j2:68
+#: template/faq.html.j2:68
 msgid ""
 "Your wallet stores digital coins that are blindly signed by an exchange. The use of a "
@@ -649,11 +703,11 @@ msgstr ""
 "O uso de uma assinatura cega protege sua privacidade, pois impede o câmbio "
 "de saber qual moeda assinou para qual cliente."
 
-#: faq.html.j2:79
+#: template/faq.html.j2:79
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:80
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -666,11 +720,11 @@ msgid ""
 "regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:95
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:96
 msgid ""
 "Taler's wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -681,24 +735,24 @@ msgid ""
 "future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:109
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:110
 msgid ""
 "We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
 "have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:118
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: faq.html.j2:119
+#: template/faq.html.j2:119
 msgid ""
 "The exchange would be operated by a bank or in cooperation with a bank, "
 "and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -708,13 +762,13 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:129
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:130
 msgid ""
 "Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -723,11 +777,11 @@ msgid ""
 "respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:140
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:141
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -737,11 +791,11 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:153
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:155
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -758,7 +812,7 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:15
 msgid ""
 "GNU Taler is a privacy-preserving payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -766,28 +820,28 @@ msgid ""
 "evasion and money laundering."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is payments; it "
 "is not meant as a store of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:30
 msgid ""
 "Payment are made after exchanging existing money "
 "into electronic money with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:37
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments without making their customers register on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:44
 msgid ""
 "GNU Taler is immune against many types of fraud, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -795,11 +849,11 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:60
 msgid "Paying with Taler"
 msgstr "Pagando com o Taler"
 
-#: features.html.j2:62
+#: template/features.html.j2:62
 #, fuzzy
 #| msgid ""
 #| "To pay with Taler, customers install an electronic wallet on their "
@@ -820,7 +874,7 @@ msgstr ""
 "nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
 "risco de phishing ou roubo de identidade."
 
-#: features.html.j2:70
+#: template/features.html.j2:70
 #, fuzzy
 #| msgid ""
 #| "To pay with Taler, customers install an electronic wallet on their "
@@ -841,15 +895,15 @@ msgstr ""
 "nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
 "risco de phishing ou roubo de identidade."
 
-#: features.html.j2:77
+#: template/features.html.j2:77
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr "Recebendo pagamentos com o Taler"
 
-#: features.html.j2:85
+#: template/features.html.j2:85
 #, fuzzy
 #| msgid ""
 #| "To receive Taler payments, a merchant needs a bank account in the "
@@ -869,21 +923,21 @@ msgstr ""
 "comerciante para o processamento de transações da Taler pode ser executado "
 "nas instalações do comerciante ou ser hospedado por um terceiro."
 
-#: features.html.j2:94
+#: template/features.html.j2:94
 msgid ""
 "Merchant integration is simple, and customers can pay for products without "
 "even having to register an account."
 msgstr ""
 
-#: features.html.j2:99
+#: template/features.html.j2:99
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:113
 msgid "Practical"
 msgstr "Prático"
 
-#: features.html.j2:116
+#: template/features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -893,11 +947,11 @@ msgstr ""
 "são protegidos criptograficamente e são confirmados em milissegundos com "
 "custos de transação extremamente baixos."
 
-#: features.html.j2:126
+#: template/features.html.j2:126
 msgid "Stable"
 msgstr "Estável"
 
-#: features.html.j2:129
+#: template/features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -910,11 +964,12 @@ msgstr ""
 "correspondem às moedas existentes, como Dólares dos EUA, Euros ou até "
 "Bitcoins."
 
-#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
+#: template/features.html.j2:140 template/governments.html.j2:58
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Seguro"
 
-#: features.html.j2:143
+#: template/features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -925,11 +980,11 @@ msgstr ""
 "o Taler nunca rejeita um cliente legítimo devido a um falso positivo de "
 "detecção de fraude."
 
-#: features.html.j2:155 governments.html.j2:25
+#: template/features.html.j2:155 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Tributável"
 
-#: features.html.j2:158
+#: template/features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -940,11 +995,11 @@ msgstr ""
 "digitais, o Taler ajuda a evitar os mercados negros. O Taler não é adequado "
 "para atividades ilegais."
 
-#: features.html.j2:168
+#: template/features.html.j2:168
 msgid "Private"
 msgstr "Privado"
 
-#: features.html.j2:170
+#: template/features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
@@ -955,11 +1010,11 @@ msgstr ""
 "gastou seu dinheiro eletrônico. No entanto, você obtém uma prova de "
 "pagamento legalmente válida."
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:181 template/governments.html.j2:88
 msgid "Libre"
 msgstr "Livre"
 
-#: features.html.j2:184
+#: template/features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -973,11 +1028,11 @@ msgstr ""
 "implementação de referência é um pacote GNU, ele sempre permanecerá como software livre."
 
-#: financial-news.html.j2:6
+#: template/financial-news.html.j2:6
 msgid "Financial News"
 msgstr "Notícias financeiras"
 
-#: financial-news.html.j2:9
+#: template/financial-news.html.j2:9
 msgid ""
 "This page explains (only in English) how Taler can change ongoing "
 "developments in the financial industry."
@@ -985,21 +1040,21 @@ msgstr ""
 "Esta página explica (apenas em inglês) como o Taler pode mudar os "
 "desenvolvimentos em andamento no setor financeiro."
 
-#: glossary.html.j2:6
+#: template/glossary.html.j2:6
 msgid "auditor"
 msgstr "auditor"
 
-#: glossary.html.j2:8
+#: template/glossary.html.j2:8
 msgid ""
 "trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 "terceiro confiável que verifica se o “câmbio” está funcionando corretamente."
 
-#: glossary.html.j2:12
+#: template/glossary.html.j2:12
 msgid "bank"
 msgstr "banco (bank)"
 
-#: glossary.html.j2:14
+#: template/glossary.html.j2:14
 msgid ""
 "traditional financial service provider who offers wire `transfers` between "
 "accounts"
@@ -1007,11 +1062,11 @@ msgstr ""
 "prestador de serviços financeiros tradicionais que oferece “transferências” "
 "entre contas."
 
-#: glossary.html.j2:18
+#: template/glossary.html.j2:18
 msgid "coin"
 msgstr "moeda (coin)"
 
-#: glossary.html.j2:20
+#: template/glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
 "known as the `denomination` of the coin"
@@ -1019,30 +1074,30 @@ msgstr ""
 "moedas são token individual que representam uma certa quantidade de valor, "
 "também conhecida como a “denominação” da moeda."
 
-#: glossary.html.j2:24
+#: template/glossary.html.j2:24
 msgid "contract"
 msgstr "contrato (contract)"
 
-#: glossary.html.j2:26
+#: template/glossary.html.j2:26
 msgid "the proposal signed by the wallet."
 msgstr "a proposta assinada pela carteira."
 
-#: glossary.html.j2:30
+#: template/glossary.html.j2:30
 msgid "denomination"
 msgstr "denominação (denomination)"
 
-#: glossary.html.j2:32
+#: template/glossary.html.j2:32
 msgid ""
 "unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 "unidade de moeda, especifica tanto a moeda como o valor nominal de uma "
 "“moeda”."
 
-#: glossary.html.j2:36
+#: template/glossary.html.j2:36
 msgid "denomination key"
 msgstr "chave de denominação (denomination key)"
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:38
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
@@ -1050,11 +1105,11 @@ msgstr ""
 "chave RSA usada pelo câmbio para certificar que uma determinada moeda é "
 "válida e de uma “denominação” específica."
 
-#: glossary.html.j2:42
+#: template/glossary.html.j2:42
 msgid "deposit"
 msgstr "depósito (deposit)"
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
 "exchange to credit his `bank` account in the future using a wire `transfer`"
@@ -1063,11 +1118,11 @@ msgstr ""
 "que o câmbio credite sua conta no “banco” no futuro usando uma "
 "“transferência” bancária."
 
-#: glossary.html.j2:48
+#: template/glossary.html.j2:48
 msgid "dirty"
 msgstr "suja (dirty)"
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:50
 msgid ""
 "a `coin` is dirty if its public key may be known to an entity other than the "
 "customer, thereby creating the danger of some entity being able to link "
@@ -1078,11 +1133,11 @@ msgstr ""
 "poder vincular múltiplas transações do proprietário da moeda se a moeda não "
 "for atualizada primeiro."
 
-#: glossary.html.j2:54
+#: template/glossary.html.j2:54
 msgid "exchange"
 msgstr "câmbio (exchange)"
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:56
 msgid ""
 "Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
@@ -1090,11 +1145,11 @@ msgstr ""
 "provedor de serviços de pagamento do Taler. Emite “moedas” eletrônicas "
 "durante o “saque” e as resgata quando são “depositadas” pelos comerciantes."
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:60
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:62
 msgid ""
 "Various operations come with time limits. In particular, `denomination keys` "
 "come with strict time limits for the various operations involving the `coin` "
@@ -1107,29 +1162,29 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:74
 msgid "extension"
 msgstr "extensão (extension)"
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr "implementação de uma “carteira” para navegadores."
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:80
 msgid "fresh coin"
 msgstr "moeda nova (fresh coin)"
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 "uma “moeda” é nova se a sua chave pública só for conhecida apenas pelo "
 "cliente."
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:86
 msgid "master key"
 msgstr "chave mestre (master key)"
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1137,19 +1192,19 @@ msgstr ""
 "chave offline usada pelo câmbio para certificar chaves de denominação e "
 "chaves de assinatura de mensagem."
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:92
 msgid "message signing key"
 msgstr "chave de assinatura de mensagem (message signing key)"
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr "chave usada pelo câmbio para assinar mensagens online, além de moedas."
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:98
 msgid "offer"
 msgstr "oferta (offer)"
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1165,32 +1220,32 @@ msgstr ""
 "após o backend adicionar a informação faltando à oferta e a assiná-la, torna-"
 "se uma proposta."
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:109
 msgid "owner"
 msgstr "proprietário (owner)"
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 "uma “moeda” é de propriedade da entidade que conhece a chave privada da "
 "moeda."
 
-#: glossary.html.j2:115
+#: template/glossary.html.j2:115
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:117
 msgid ""
 "operation by which an exchange returns the value of coins affected by a "
 "`revocation` to their `owner`, either by allowing the owner to withdraw new "
 "coins or wiring funds back to the bank account of the `owner`"
 msgstr ""
 
-#: glossary.html.j2:123
+#: template/glossary.html.j2:123
 msgid "proof"
 msgstr "prova (proof)"
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
@@ -1198,19 +1253,19 @@ msgstr ""
 "mensagem que demonstra criptograficamente que uma reivindicação particular "
 "é .correta"
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:129
 msgid "proposal"
 msgstr "proposta (proposal)"
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr "um esboço que foi concluído e assinado pelo backend do comerciante."
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:135
 msgid "reserve"
 msgstr "reserva (reserve)"
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
@@ -1220,11 +1275,11 @@ msgstr ""
 "para “saque”, ou os fundos mantidos na conta bancária do câmbio para cobrir "
 "obrigações de moedas em circulação."
 
-#: glossary.html.j2:141
+#: template/glossary.html.j2:141
 msgid "refreshing"
 msgstr "renovação (refreshing)"
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1232,11 +1287,11 @@ msgstr ""
 "operação através da qual uma moeda “suja” é convertida em uma ou mais moedas "
 "“frescas”."
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:147
 msgid "refund"
 msgstr "restituição (refund)"
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1246,13 +1301,13 @@ msgstr ""
 "de uma operação de “depósito”, dando o direito aos fundos de volta ao "
 "cliente."
 
-#: glossary.html.j2:153
+#: template/glossary.html.j2:153
 #, fuzzy
 #| msgid "denomination"
 msgid "revocation"
 msgstr "denominação (denomination)"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:155
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1260,11 +1315,11 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:159
 msgid "sharing"
 msgstr "compartilhamento (sharing)"
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
@@ -1273,19 +1328,19 @@ msgstr ""
 "acesso à chave privada da moeda, permitindo que todos os coproprietários "
 "gastem a moeda a qualquer momento."
 
-#: glossary.html.j2:165
+#: template/glossary.html.j2:165
 msgid "signing key"
 msgstr "chave de assinatura (signing key)"
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:167
 msgid "see message signing key."
 msgstr "ver chave de assinatura de mensagem."
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:171
 msgid "spending"
 msgstr "gasto (spending)"
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1293,19 +1348,19 @@ msgstr ""
 "operação pela qual um cliente dá a um comerciante o direito de “depositar” "
 "moedas em troca de mercadorias."
 
-#: glossary.html.j2:177
+#: template/glossary.html.j2:177
 msgid "transfer"
 msgstr "transferência (transfer)"
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr "método de envio de fundos entre contas de “banco”."
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:183
 msgid "transaction"
 msgstr "transação (transaction)"
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1313,39 +1368,39 @@ msgstr ""
 "método pelo qual a propriedade é transferida exclusivamente de uma entidade "
 "para outra."
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:189
 msgid "transaction id"
 msgstr "id de transação (transaction id)"
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr "número único pelo qual um comerciante identifica uma “transação”."
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:195
 msgid "wallet"
 msgstr "carteira (wallet)"
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 "software sendo executado no computador de um cliente; saca, armazena e gasta "
 "moedas."
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:201
 msgid "wire transfer"
 msgstr "transferência eletrônica (wire transfer)"
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:203
 msgid "see `transfer`"
 msgstr "veja “transferência”."
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 "identificador de transferência eletrônica (wire transfer identifier)"
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1353,22 +1408,22 @@ msgstr ""
 "assunto de uma “transferência” bancária; geralmente, uma string aleatória "
 "para identificar de forma única a “transferência”."
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:213
 msgid "withdrawal"
 msgstr "saque (withdrawal)"
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 "operação através da qual uma “carteira” pode converter fundos de uma reserva "
 "para moedas novas."
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:219
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:221
 msgid ""
 "a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
 "`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
@@ -1379,11 +1434,11 @@ msgid ""
 "past the legal data retention requirement)."
 msgstr ""
 
-#: governments.html.j2:6
+#: template/governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Vantagens para governos"
 
-#: governments.html.j2:8
+#: template/governments.html.j2:8
 msgid ""
 "Taler provides accountability to ensure business operate legally, while also "
 "respecting civil liberties of citizens. Taler is a payment system based on "
@@ -1398,7 +1453,7 @@ msgstr ""
 "estrutura financeira e agem como reguladores confiáveis. O Taler contribui "
 "para a soberania digital na infraestrutura financeira crítica."
 
-#: governments.html.j2:28
+#: template/governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
 "taxation. With Taler, the receiver of any form of payment is easily "
@@ -1414,7 +1469,7 @@ msgstr ""
 "esses dados para tributar empresas e indivíduos com base em seus "
 "rendimentos, tornando a evasão fiscal e os mercados negros menos viáveis."
 
-#: governments.html.j2:41
+#: template/governments.html.j2:41
 msgid ""
 "Thus, despite offering anonymity for citizens spending digital cash to buy "
 "goods and services, Taler also ensures that the state can observe incoming "
@@ -1435,7 +1490,7 @@ msgstr ""
 "a fundos com amigos e familiares confiáveis, ou sincronização de carteiras "
 "em vários dispositivos."
 
-#: governments.html.j2:61
+#: template/governments.html.j2:61
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1449,7 +1504,7 @@ msgstr ""
 "disputa. Os danos financeiros são estritamente limitados, melhorando a "
 "segurança econômica para indivíduos, comerciantes, câmbio e o estado."
 
-#: governments.html.j2:73
+#: template/governments.html.j2:73
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1466,7 +1521,7 @@ msgstr ""
 "de depósito seja gerenciada com honestidade. Isso garante que o câmbio não "
 "ameace a economia devido à fraude."
 
-#: governments.html.j2:91
+#: template/governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
 "will enable competition and avoid the monopolization of payment systems that "
@@ -1476,11 +1531,11 @@ msgstr ""
 "Assim, Taler permitirá a concorrência e evitará a monopolização dos sistemas "
 "de pagamento que hoje ameaçam a estabilidade política e financeira global."
 
-#: governments.html.j2:101
+#: template/governments.html.j2:101
 msgid "Efficient"
 msgstr "Eficiente"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:104
 msgid ""
 "Taler has an efficient design. Unlike Blockchain-based payment systems, such "
 "as Bitcoin, Taler will not threaten the availability of national electric "
@@ -1491,15 +1546,15 @@ msgstr ""
 "disponibilidade de redes elétricas nacionais nem contribuirá "
 "(significativamente) para a poluição ambiental."
 
-#: governments.html.j2:120
+#: template/governments.html.j2:120
 msgid "Taler and regulation"
 msgstr "Taler e regulação"
 
-#: governments.html.j2:122
+#: template/governments.html.j2:122
 msgid "Anti money laundering (AML)"
 msgstr "Antilavagem de dinheiro (AML)"
 
-#: governments.html.j2:123
+#: template/governments.html.j2:123
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1507,11 +1562,11 @@ msgstr ""
 "Com o Taler, a renda é visível e pode ser vinculada ao contrato assinado por "
 "ambas as partes."
 
-#: governments.html.j2:124
+#: template/governments.html.j2:124
 msgid "Know your customer (KYC)"
 msgstr "Conheça seu cliente (KYC)"
 
-#: governments.html.j2:125
+#: template/governments.html.j2:125
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
@@ -1519,11 +1574,11 @@ msgstr ""
 "No Taler, o pagador e o beneficiário são conhecidos pelas suas contas "
 "bancárias ao sacar ou depositar moedas, respectivamente"
 
-#: governments.html.j2:126
+#: template/governments.html.j2:126
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "Regulação de Proteção de Dados Pessoais (GDPR)"
 
-#: governments.html.j2:127
+#: template/governments.html.j2:127
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
@@ -1531,11 +1586,11 @@ msgstr ""
 "O Taler protege criptograficamente a privacidade do cidadão e, por design, "
 "implementa a minimização de dados e a privacidade por padrão."
 
-#: governments.html.j2:128
+#: template/governments.html.j2:128
 msgid "Payment Services Directive (PSD2)"
 msgstr "Diretiva de Serviços de Pagamento (PSD2)"
 
-#: governments.html.j2:129
+#: template/governments.html.j2:129
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
@@ -1543,11 +1598,11 @@ msgstr ""
 "O Taler fornece um padrão aberto com APIs públicas que contribuem para um "
 "setor bancário competitivo."
 
-#: governments.html.j2:137
+#: template/governments.html.j2:137
 msgid "Taler provides privacy and accountability"
 msgstr "Taler fornece privacidade e responsabilidade"
 
-#: governments.html.j2:140
+#: template/governments.html.j2:140
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
@@ -1557,7 +1612,7 @@ msgstr ""
 "tradicionais que entram e saem do sistema de pagamento do Taler. Começando "
 "com as transferências eletrônicas, os governos podem obter:"
 
-#: governments.html.j2:148
+#: template/governments.html.j2:148
 msgid ""
 "The total amount of digital currency withdrawn by a customer. The government "
 "can impose limits on how much digital cash a customer can withdraw within a "
@@ -1567,12 +1622,12 @@ msgstr ""
 "impor limites quanto ao dinheiro digital que um cliente pode sacar dentro de "
 "um determinado período de tempo."
 
-#: governments.html.j2:157
+#: template/governments.html.j2:157
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 "A receita recebida por qualquer comerciante através do sistema do Taler."
 
-#: governments.html.j2:164
+#: template/governments.html.j2:164
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
@@ -1582,7 +1637,7 @@ msgstr ""
 "comerciante. No entanto, esta informação normalmente não inclui a identidade "
 "do cliente."
 
-#: governments.html.j2:174
+#: template/governments.html.j2:174
 msgid ""
 "The amounts of digital coins legitimately withdrawn by customers from the "
 "exchange, the value of non-redeemed digital coins in customer's wallets, the "
@@ -1596,23 +1651,23 @@ msgstr ""
 "depósito realizadas pelos comerciantes com o câmbio e a renda do câmbio de "
 "taxas de transação."
 
-#: gsoc-codeless.html.j2:5
+#: template/gsoc-codeless.html.j2:5
 msgid "GSoC 2018: Codeless Payment"
 msgstr ""
 
-#: gsoc-codeless.html.j2:6
+#: template/gsoc-codeless.html.j2:6
 msgid ""
 "Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and "
 "guidance of Florian Dold."
 msgstr ""
 
-#: gsoc-codeless.html.j2:12
+#: template/gsoc-codeless.html.j2:12
 #, fuzzy
 #| msgid "system overview"
 msgid "Overview"
 msgstr "visão geral do sistema"
 
-#: gsoc-codeless.html.j2:14
+#: template/gsoc-codeless.html.j2:14
 msgid ""
 "Codeless payment is a component that sits between the seller's frontend and "
 "the GNU Taler merchant backend. This component has a web interface, where "
@@ -1622,15 +1677,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:23
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:24
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:28
 msgid ""
 "The primary use case is the registration of the merchant. The codeless "
 "payment backend provides a secure django authenticated login to the "
@@ -1641,19 +1696,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:33
 msgid ""
 "A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:38
+#: template/gsoc-codeless.html.j2:38
 msgid ""
 "The merchant can upload digital inventory (like a PDF or HTML page) via the "
 "codeless payments frontend and the user can then purchase it and view the "
 "version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:43
+#: template/gsoc-codeless.html.j2:43
 msgid ""
 "The merchant can add any physical inventory available in his stocks. While "
 "adding these inventory, the seller is prompted to add minimum quantity of "
@@ -1662,7 +1717,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1672,7 +1727,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1680,31 +1735,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1713,7 +1768,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1721,7 +1776,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1733,7 +1788,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1741,7 +1796,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1751,15 +1806,15 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "Invista no Taler!"
 
-#: investors.html.j2:9
+#: template/investors.html.j2:9
 msgid ""
 "We have created a company, Taler Systems SA in Luxembourg.
 Please "
 "contact invest@taler.net if you want to invest in Taler."
@@ -1767,11 +1822,11 @@ msgstr ""
 "Nós criamos uma empresa, Taler Systems SA em Luxemburgo.
 Por favor, "
 "contate invest@taler.net se você quiser investir no Taler."
 
-#: investors.html.j2:24
+#: template/investors.html.j2:24
 msgid "The Team"
 msgstr "A equipe"
 
-#: investors.html.j2:27
+#: template/investors.html.j2:27
 msgid ""
 "Our team combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1783,7 +1838,7 @@ msgstr ""
 "civis e acadêmicos. Estamos unidos por uma visão de como os pagamentos "
 "deveriam funcionar e o objetivo de impor essa visão ao mundo."
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
 msgid ""
 "We are currently supported by Inria, "
 "the French national institute for research in informatics and automation, "
@@ -1794,11 +1849,11 @@ msgstr ""
 "o instituto nacional francês de pesquisa em informática e automação, e Renewable Freedom Foundation."
 
-#: investors.html.j2:45
+#: template/investors.html.j2:45
 msgid "The Technology"
 msgstr "A tecnologia"
 
-#: investors.html.j2:48
+#: template/investors.html.j2:48
 msgid ""
 "All transactions in Taler are secured using modern cryptography and trust in all parties is minimized. Financial "
@@ -1817,11 +1872,11 @@ msgstr ""
 "demonstração de que os participantes eram honestos. Os custos reais de "
 "transação são frações de um centavo."
 
-#: investors.html.j2:63
+#: template/investors.html.j2:63
 msgid "The Business"
 msgstr "Os negócios"
 
-#: investors.html.j2:66
+#: template/investors.html.j2:66
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1839,11 +1894,11 @@ msgstr ""
 "representado usando sistemas de pagamento tradicionais no câmbio. O câmbio "
 "cobra taxas para facilitar as transações."
 
-#: investors.html.j2:85
+#: template/investors.html.j2:85
 msgid "The Business Case"
 msgstr "O caso de negócio"
 
-#: investors.html.j2:91
+#: template/investors.html.j2:91
 msgid ""
 "Our financial news page explains in "
 "English how Taler can impact current developments in the global payment "
@@ -1853,11 +1908,11 @@ msgstr ""
 "explica, em inglês, como o Taler pode afetar os atuais desenvolvimentos no "
 "mercado de pagamento global."
 
-#: investors.html.j2:114
+#: template/investors.html.j2:114
 msgid "Running a Taler payment service operator"
 msgstr "Executando um operador de serviço de pagamento do Taler"
 
-#: investors.html.j2:117
+#: template/investors.html.j2:117
 msgid ""
 "The payment service operator runs the Taler exchange. The exchange "
 "charges transaction fees to customers or merchants. Its operational "
@@ -1869,7 +1924,7 @@ msgstr ""
 "despesas operacionais são de transferências bancárias com o sistema bancário "
 "e a operação da infraestrutura informática."
 
-#: investors.html.j2:127
+#: template/investors.html.j2:127
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
@@ -1877,7 +1932,7 @@ msgstr ""
 "As operações criptográficas, a largura de banda e os custos de armazenamento "
 "são inferiores a 0,01 centavos por transação."
 
-#: investors.html.j2:129
+#: template/investors.html.j2:129
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
@@ -1886,7 +1941,7 @@ msgstr ""
 "bancárias maiores para os comerciantes minimizarem os custos de "
 "transferência eletrônica."
 
-#: investors.html.j2:131
+#: template/investors.html.j2:131
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -1894,20 +1949,20 @@ msgstr ""
 "O protocolo permite o câmbio cobrar taxas por qualquer operação cara (saque, "
 "depósito, renovação, reembolso ou transferências bancárias agregadas)."
 
-#: investors.html.j2:133
+#: template/investors.html.j2:133
 msgid "Partnership with banks establishes consumer trust."
 msgstr "A parceria com os bancos estabelece a confiança do cliente."
 
-#: investors.html.j2:135
+#: template/investors.html.j2:135
 msgid "Partnership with free software community enables rapid deployment."
 msgstr ""
 "A parceria com a comunidade de software livre permite uma implantação rápida."
 
-#: merchants.html.j2:5
+#: template/merchants.html.j2:5
 msgid "Advantages for Merchants"
 msgstr "Vantagens para comerciantes"
 
-#: merchants.html.j2:8
+#: template/merchants.html.j2:8
 msgid ""
 "Taler is a cost-effective electronic payment system which provides you with "
 "cryptographic proof that the payment worked correctly within milliseconds. "
@@ -1919,11 +1974,11 @@ msgstr ""
 "seus clientes web pagam níveis de conveniência previamente desconhecidos sem "
 "risco de fraude."
 
-#: merchants.html.j2:22
+#: template/merchants.html.j2:22
 msgid "Fast"
 msgstr "Rápido"
 
-#: merchants.html.j2:25
+#: template/merchants.html.j2:25
 msgid ""
 "Processing transactions with Taler is fast, allowing you to confirm the "
 "transaction with your customer virtually immediately. Your customers will "
@@ -1941,7 +1996,7 @@ msgstr ""
 "transações que não funcionariam com os pagamentos com cartão de crédito "
 "devido aos gastos gerais mentais para os clientes."
 
-#: merchants.html.j2:44
+#: template/merchants.html.j2:44
 msgid ""
 "You will have cryptographic proof of payment from the Taler payment service "
 "provider. With Taler you never handle sensitive customer account information "
@@ -1956,7 +2011,7 @@ msgstr ""
 "terão contratos de clientes com assinaturas qualificadas para todas as "
 "transações que você pode usar no tribunal em caso de disputa."
 
-#: merchants.html.j2:61
+#: template/merchants.html.j2:61
 msgid ""
 "Taler is free software, and you can use the liberally-licensed reference "
 "code as a starting point to integrate Taler into your services. To use "
@@ -1970,11 +2025,11 @@ msgstr ""
 "modelo de desenvolvimento de software livre assegurará que você possa "
 "selecionar de vários integradores concorrentes para suporte."
 
-#: merchants.html.j2:76
+#: template/merchants.html.j2:76
 msgid "Cheap"
 msgstr "Barato"
 
-#: merchants.html.j2:79
+#: template/merchants.html.j2:79
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1987,11 +2042,11 @@ msgstr ""
 "do Taler podem operar com despesas gerais muito baixas e, portanto, oferecem "
 "baixas taxas de transação."
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:89
 msgid "Flexible"
 msgstr "Flexível"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:92
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
 "Bitcoins) and any amount, limited only by applicable regulation and what "
@@ -2001,11 +2056,11 @@ msgstr ""
 "ou Bitcoins) e qualquer montante, limitado apenas pela regulação aplicável e "
 "quais as denominações que o provedor de serviços de pagamento suporta."
 
-#: merchants.html.j2:101
+#: template/merchants.html.j2:101
 msgid "Ethical"
 msgstr "Ético"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:104
 msgid ""
 "Taler prevents tax evasion and money laundering. Taler's protocols are "
 "efficient and do not use wasteful proof-of-work calculations. Taler "
@@ -2017,31 +2072,31 @@ msgstr ""
 "O Taler incentiva a transparência, fornecendo implementações de referência "
 "de padrão aberto e de software livre."
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:119
 msgid "Manuals for merchants"
 msgstr "Manuais para comerciantes"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:122
 msgid "The GNU Taler merchant backend operator manual"
 msgstr "O manual do operador de backend do comerciante do GNU Taler"
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr "O tutorial de integração da loja web do GNU Taler (PHP)"
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:128
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr "O tutorial de integração da loja web do GNU Taler (Python)"
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:140
 msgid "The GNU Taler Merchant Backend"
 msgstr "O backend de comerciante do GNU Taler"
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:142
 msgid "Merchants process payments using the Taler backend:"
 msgstr "Os comerciantes processam pagamentos usando o backend do Taler:"
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:147
 msgid ""
 "The backend signs and stores the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
@@ -2051,7 +2106,7 @@ msgstr ""
 "feitas pelo comerciante aos clientes. Para isso, o frontend do comerciante "
 "precisa dar a ordem do cliente em um formato JSON para o backend."
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:156
 msgid ""
 "The backend validates payments received from the wallet and "
 "executes them with the Taler payment service provider (the exchange). "
@@ -2063,7 +2118,7 @@ msgstr ""
 "frontend do comerciante deve passar o pedido de pagamento até o backend do "
 "Taler e verificar o código de status HTTP que é retornado."
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:167
 msgid ""
 "The backend can list completed transactions and map wire "
 "transfers to sets of business transactions, including the exact terms of "
@@ -2073,47 +2128,47 @@ msgstr ""
 "transferências eletrônicas para conjuntos de transações comerciais, "
 "incluindo os termos exatos de cada contrato."
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:183
 msgid "customer perspective"
 msgstr "perspectiva do cliente"
 
-#: news.html.j2:16
+#: template/news.html.j2:16
 msgid "More news"
 msgstr "Mais notícias"
 
-#: old-news.html.j2:6
+#: template/old-news.html.j2:6
 msgid "Older News"
 msgstr "Notícias mais antigas"
 
-#: old-news.html.j2:9
+#: template/old-news.html.j2:9
 msgid "This page documents the GNU Taler history."
 msgstr "Essa página documenta o histórico do GNU Taler."
 
-#: press.html.j2:4
+#: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler na imprensa"
 
-#: principles.html.j2:22
+#: template/principles.html.j2:22
 #, fuzzy
 #| msgid "GNU Taler in the Press"
 msgid "GNU Taler: Design Principles"
 msgstr "GNU Taler na imprensa"
 
-#: principles.html.j2:29
+#: template/principles.html.j2:29
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:36
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:40
 msgid ""
 "... in the are of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:42
 msgid ""
 "GNU Taler must be Free Software. For merchants, our Free Software reference "
@@ -2122,24 +2177,24 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:51
 msgid ""
 "Customers benefit from Free Software as the wallet software can be made to "
 "run on a variety of platforms, and the absence of user-hostile features such "
 "as tracking or telemetry can easily be assured."
 msgstr ""
 
-#: principles.html.j2:63
+#: template/principles.html.j2:63
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:68
 #, fuzzy
 #| msgid "How does Taler protect my privacy?"
 msgid "You deserve some privacy"
 msgstr "Como o Taler protege minha privacidade?"
 
-#: principles.html.j2:70
+#: template/principles.html.j2:70
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -2147,7 +2202,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:78
 msgid ""
 "In legislations with data protection regulations (such as the recently "
 "introduced GDPR in Europe), merchants benefit from this as well, as no data "
@@ -2157,45 +2212,45 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:92
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:97
 #, fuzzy
 #| msgid "Anti money laundering (AML)"
 msgid "Money laundering"
 msgstr "Antilavagem de dinheiro (AML)"
 
-#: principles.html.j2:99
+#: template/principles.html.j2:99
 msgid ""
 "As a payment system must still be legal to operate and use, it must comply "
 "with these requirements. Furthermore, we consider levying of taxes as "
 "beneficial to society."
 msgstr ""
 
-#: principles.html.j2:110
+#: template/principles.html.j2:110
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:115
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:117
 msgid ""
 "This imposes requirements on the security of the system, as well as on the "
 "general design, as payment fraud can also happen through misleading user "
 "interface design or the lack of cryptographic evidence for certain processes."
 msgstr ""
 
-#: principles.html.j2:128
+#: template/principles.html.j2:128
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:132
 #, fuzzy
 #| msgid "General Data Protection Regulation (GDPR)"
 msgid ""
@@ -2203,7 +2258,7 @@ msgid ""
 "(GDPR) compliant"
 msgstr "Regulação de Proteção de Dados Pessoais (GDPR)"
 
-#: principles.html.j2:134
+#: template/principles.html.j2:134
 msgid ""
 "The reason behind this goal is similar to (2). The privacy of buyers is "
 "given priority, but other parties such as merchants still benefit from it, "
@@ -2211,15 +2266,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:144
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:148
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:150
 msgid ""
 "Specifically it must be usable for non-expert customers. Usability also "
 "applies to the integration with merchants, and informs choices about the "
@@ -2227,33 +2282,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:162
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Eficiente"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:166
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Eficiente"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:168
 msgid ""
 "Approaches such as proof-of-work are ruled out by this requirement. "
 "Efficiency is necessary for GNU Taler to be used for micropayments."
 msgstr ""
 
-#: principles.html.j2:177
+#: template/principles.html.j2:177
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:181
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:183
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -2261,15 +2316,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:195
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:199
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:201
 msgid ""
 "It must be relatively easy for competitors to join the systems. While the "
 "barriers for this in traditional financial systems are rather high, the "
@@ -2279,11 +2334,11 @@ msgid ""
 "instead of having one completely monolithic system."
 msgstr ""
 
-#: schemafuzz.html.j2:6
+#: template/schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
 
-#: team.html.j2:16
+#: template/team.html.j2:16
 msgid ""
 "GNU maintainer. Network security & privacy researcher. Software "
 "architect."
@@ -2291,7 +2346,7 @@ msgstr ""
 "Mantenedor do GNU. Pesquisador de segurança de rede & privacidade. "
 "Arquiteto de software."
 
-#: team.html.j2:21
+#: template/team.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
@@ -2299,126 +2354,75 @@ msgstr ""
 "Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
 "diferentes indústrias, …."
 
-#: team.html.j2:26
+#: template/team.html.j2:26
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
+#: template/team.html.j2:33
 msgid "GNU mainatiner, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:38
 msgid "Applied cryptography. Contact to W3c & Tor."
 msgstr "Criptografia aplicada. Contato para W3c & Tor."
 
-#: team.html.j2:43
+#: template/team.html.j2:43
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fundador do projeto GNU. Orientação ética e licenciamento."
 
-#: team.html.j2:50
+#: template/team.html.j2:50
 msgid "Software engineer."
 msgstr "Engenheiro de software."
 
-#: team.html.j2:55
+#: template/team.html.j2:55
 msgid "Sustainable business development."
 msgstr "Desenvolvimento empresarial sustentável."
 
-#: team.html.j2:60
+#: template/team.html.j2:60
 msgid "Theoretical foundations."
 msgstr "Fundações teóricas."
 
-#: team.html.j2:66
+#: template/team.html.j2:66
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:73 template/team.html.j2:77 template/team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr "Tradutor (Espanhol)"
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:87 template/team.html.j2:91 template/team.html.j2:95
 msgid "Translator (Italian)"
 msgstr "Tradutor (Italiano)"
 
-#: team.html.j2:99
+#: template/team.html.j2:99
 msgid "Translator (German)"
 msgstr "Tradutor (Alemão)"
 
-#: team.html.j2:106
+#: template/team.html.j2:106
 msgid "Hardware security module"
 msgstr "Módulo de segurança de hardware"
 
-#: team.html.j2:110
+#: template/team.html.j2:110
 msgid "Risk management"
 msgstr "Gerenciamento de risco"
 
-#: team.html.j2:118
+#: template/team.html.j2:118
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 "Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
 
-#: team.html.j2:122
+#: template/team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudante PhD, Universidade Técnica de Munique. Atualmente lecionando."
 
-#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
-#: team.html.j2:146
+#: template/team.html.j2:128 template/team.html.j2:132
+#: template/team.html.j2:136 template/team.html.j2:142
+#: template/team.html.j2:146
 #, fuzzy
 #| msgid "Taler for developers"
 msgid "Free software developer."
 msgstr "Taler para desenvolvedores"
 
-#: common/base.j2:5
-msgid "GNU Taler"
-msgstr "GNU Taler"
-
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr "Reservas eletrônicas livres, anônimas, tributáveis"
-
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "A equipe"
-
-#: common/footer.j2.inc:16
-msgid "Contact"
-msgstr "Contato"
-
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr "FAQ"
-
-#: common/footer.j2.inc:26
-msgid "Bibliography"
-msgstr "Bibliografia"
-
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by BFH"
-msgstr ""
-
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using Free Software "
-"only."
-msgstr ""
-"Essa página foi criada usando apenas software "
-"livre."
-
-#: common/navigation.j2.inc:21
-msgid "Features"
-msgstr ""
-
-#: common/navigation.j2.inc:22
-msgid "Principles"
-msgstr ""
-
-#: common/navigation.j2.inc:23
-msgid "Docs"
-msgstr ""
-
 #, fuzzy
 #~| msgid "exchange"
 #~ msgid "Code (Exchange)"
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index d4b81e22..49fa5450 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,49 +7,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-01 18:07+0200\n"
+"POT-Creation-Date: 2019-09-02 09:39+0000\n"
 "PO-Revision-Date: 2017-12-29 11:14+0100\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: ru \n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: architecture.html.j2:6
-msgid "Taler System Architecture"
+#: common/base.j2:5
+msgid "GNU Taler"
 msgstr ""
 
-#: bibliography.html.j2:4
-msgid "GNU Taler Bibliography"
+#: common/base.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
 
-#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:30 bibliography.html.j2:36
-msgid "by"
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
+msgid "Team"
+msgstr ""
+
+#: common/footer.j2.inc:16
+msgid "Contact"
 msgstr ""
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
-#: bibliography.html.j2:36 common/footer.j2.inc:32
+#: common/footer.j2.inc:21
+msgid "FAQ"
+msgstr ""
+
+#: common/footer.j2.inc:26
+msgid "Bibliography"
+msgstr ""
+
+#: common/footer.j2.inc:32 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
 msgid "and"
 msgstr ""
 
-#: bibliography.html.j2:37
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by BFH"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using Free Software "
+"only."
+msgstr ""
+
+#: common/navigation.j2.inc:21
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:22
+msgid "Principles"
+msgstr ""
+
+#: common/navigation.j2.inc:23
+msgid "Docs"
+msgstr ""
+
+#: template/architecture.html.j2:6
+msgid "Taler System Architecture"
+msgstr ""
+
+#: template/bibliography.html.j2:4
+msgid "GNU Taler Bibliography"
+msgstr ""
+
+#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
+#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
+#: template/bibliography.html.j2:36
+msgid "by"
+msgstr ""
+
+#: template/bibliography.html.j2:37
 msgid "available upon request"
 msgstr ""
 
-#: contact.html.j2:6
+#: template/contact.html.j2:6
 msgid "Contact information"
 msgstr ""
 
-#: contact.html.j2:13
+#: template/contact.html.j2:13
 msgid "The mailing list"
 msgstr ""
 
-#: contact.html.j2:15
+#: template/contact.html.j2:15
 msgid ""
 "An archived, public mailing list for GNU Taler is hosted at https://lists.gnu.org/"
@@ -57,52 +107,52 @@ msgid ""
 "\"mailto:taler@gnu.org\">taler@gnu.org."
 msgstr ""
 
-#: contact.html.j2:25
+#: template/contact.html.j2:25
 msgid "Contacting individuals"
 msgstr ""
 
-#: contact.html.j2:27
+#: template/contact.html.j2:27
 msgid ""
 "Team members are generally reachable at LASTNAME@taler.net. All of "
 "us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
-#: contact.html.j2:36
+#: template/contact.html.j2:36
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:38
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "contact AT taler.net."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:46
 msgid "Reporting bugs"
 msgstr ""
 
-#: contact.html.j2:48
+#: template/contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our Bug tracker, which is shared with the GNUnet project. You can "
 "also report bugs or feature requests to the mailing list."
 msgstr ""
 
-#: contact.html.j2:59
+#: template/contact.html.j2:59
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:61
+#: template/contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact ceo AT taler.net."
 msgstr ""
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr ""
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:8
 msgid ""
 "Contributors to GNU Taler with Git access must sign the copyright assignment to ensure that the  of the GNUnet and GNU Taler projects is satisfied.
"
 msgstr ""
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:17
 msgid ""
 "The agreements ensure that the code will continue to be made available "
 "under free software licenses, but gives developers the freedom to move code "
@@ -120,7 +170,7 @@ msgid ""
 "stores that are hostile to free software)."
 msgstr ""
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:25
 msgid ""
 "Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -128,15 +178,15 @@ msgid ""
 "sufficient, but snail mail is preferred."
 msgstr ""
 
-#: developers.html.j2:5
+#: template/developers.html.j2:5
 msgid "Taler for developers"
 msgstr ""
 
-#: developers.html.j2:12 merchants.html.j2:58
+#: template/developers.html.j2:12 template/merchants.html.j2:58
 msgid "Free"
 msgstr ""
 
-#: developers.html.j2:15
+#: template/developers.html.j2:15
 msgid ""
 "GNU Taler is free software implementing an open protocol. Anybody is welcome "
 "to integrate our reference implementation into their applications. Different "
@@ -148,11 +198,11 @@ msgid ""
 "payment platform."
 msgstr ""
 
-#: developers.html.j2:32
+#: template/developers.html.j2:32
 msgid "RESTful"
 msgstr ""
 
-#: developers.html.j2:35
+#: template/developers.html.j2:35
 msgid ""
 "Taler is designed to work on the Internet. To ensure that Taler payments can "
 "work with restrictive network setups, Taler uses a RESTful protocol over "
@@ -164,11 +214,11 @@ msgid ""
 "docs.taler.net/\">docs.taler.net."
 msgstr ""
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58
 msgid "Code"
 msgstr ""
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
 msgid ""
 "Taler is currently primarily developed by a research team at Inria and ."
 msgstr ""
 
-#: developers.html.j2:75
+#: template/developers.html.j2:75
 msgid "Documentation"
 msgstr ""
 
-#: developers.html.j2:78
+#: template/developers.html.j2:78
 msgid ""
 "In addition to this website, the documented code and the API "
@@ -191,63 +241,63 @@ msgid ""
 "\"bibliography.html\">bibliography."
 msgstr ""
 
-#: developers.html.j2:88
+#: template/developers.html.j2:88
 msgid "Discussion"
 msgstr ""
 
-#: developers.html.j2:91
+#: template/developers.html.j2:91
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
 "read the list archive at http://lists.gnu.org/mailman/listinfo/taler."
 msgstr ""
 
-#: developers.html.j2:101
+#: template/developers.html.j2:101
 msgid "Regression Testing"
 msgstr ""
 
-#: developers.html.j2:104
+#: template/developers.html.j2:104
 msgid ""
 "We have Buildbot automation tests to "
 "detect regressions and check for portability at buildbot.taler.net."
 msgstr ""
 
-#: developers.html.j2:113
+#: template/developers.html.j2:113
 msgid "Code Coverage Analysis"
 msgstr ""
 
-#: developers.html.j2:116
+#: template/developers.html.j2:116
 msgid ""
 "We use LCOV to "
 "analyze the code coverage of our tests, the results are available at lcov.taler.net."
 msgstr ""
 
-#: developers.html.j2:131
+#: template/developers.html.j2:131
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:134 template/investors.html.j2:88
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:150
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:155
+#: template/developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
 "the following steps:"
 msgstr ""
 
-#: developers.html.j2:162
+#: template/developers.html.j2:162
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:165
+#: template/developers.html.j2:165
 msgid ""
 "A customer instructs his bank to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -255,7 +305,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:177
+#: template/developers.html.j2:177
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to withdraw electronic coins. The electronic coins "
@@ -267,7 +317,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:195
+#: template/developers.html.j2:195
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to spend the coins with merchant portals that support the Taler "
@@ -282,7 +332,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:217
+#: template/developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins deposit the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -296,7 +346,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:240
+#: template/developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's bank account. The "
@@ -305,7 +355,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:254
+#: template/developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -315,7 +365,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:269
+#: template/developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -324,80 +374,80 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:37
+#: template/docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:38
+#: template/docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:44
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:46
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:144
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:152
+#: template/docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
-#: faq.html.j2:5
+#: template/faq.html.j2:5
 msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr ""
 
-#: faq.html.j2:6
+#: template/faq.html.j2:6
 msgid ""
 "Taler does not require any Blockchain technology, and is also not based "
 "on proof-of-work or any other distributed consensus mechanism. Instead, "
@@ -405,88 +455,88 @@ msgid ""
 "combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 
-#: faq.html.j2:13
+#: template/faq.html.j2:13
 msgid ""
 "It would be possible, however, to withdraw coins denominated in Bitcoin "
 "into a Taler wallet (with an appropriate exchange), which would give some "
 "benefits over plain Bitcoin, such as instant confirmation times."
 msgstr ""
 
-#: faq.html.j2:20
+#: template/faq.html.j2:20
 msgid "Where is the balance in my wallet stored?"
 msgstr ""
 
-#: faq.html.j2:21
+#: template/faq.html.j2:21
 msgid ""
 "Your wallet stores digital coins and thus ultimately your computer holds "
 "your balance. The exchange keeps funds matching all unspent coins in an "
 "escrow bank account."
 msgstr ""
 
-#: faq.html.j2:27
+#: template/faq.html.j2:27
 msgid "What if my wallet is lost?"
 msgstr ""
 
-#: faq.html.j2:28
+#: template/faq.html.j2:28
 msgid ""
 "Since the digital coins of value in your wallet are anonymized, the "
 "exchange can not assist you in recovering a lost or stolen wallet. Just like "
 "with a physical wallet for cash, you are responsible for keeping it safe."
 msgstr ""
 
-#: faq.html.j2:34
+#: template/faq.html.j2:34
 msgid ""
 "The risk of losing a wallet can be mitigated by making backups or keeping "
 "the balance reasonably low."
 msgstr ""
 
-#: faq.html.j2:39
+#: template/faq.html.j2:39
 msgid "What if my computer is hacked?"
 msgstr ""
 
-#: faq.html.j2:40
+#: template/faq.html.j2:40
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend "
 "coins from your wallet. Checking your balance might reveal to you that your "
 "device has been compromised."
 msgstr ""
 
-#: faq.html.j2:46
+#: template/faq.html.j2:46
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 
-#: faq.html.j2:47
+#: template/faq.html.j2:47
 msgid ""
 "If your friend provides goods or services for you in exchange for a "
 "payment, they can easily set up a Taler merchant and receive the payment in "
 "their bank account."
 msgstr ""
 
-#: faq.html.j2:52
+#: template/faq.html.j2:52
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among "
 "friends directly as well."
 msgstr ""
 
-#: faq.html.j2:58
+#: template/faq.html.j2:58
 msgid "How does Taler handle payments in different currencies?"
 msgstr ""
 
-#: faq.html.j2:59
+#: template/faq.html.j2:59
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 
-#: faq.html.j2:63
+#: template/faq.html.j2:63
 msgid "Taler currently does not offer conversion between currencies."
 msgstr ""
 
-#: faq.html.j2:67
+#: template/faq.html.j2:67
 msgid "How does Taler protect my privacy?"
 msgstr ""
 
-#: faq.html.j2:68
+#: template/faq.html.j2:68
 msgid ""
 "Your wallet stores digital coins that are blindly signed by an exchange. The use of a "
@@ -494,11 +544,11 @@ msgid ""
 "knowing which coin it signed for which customer."
 msgstr ""
 
-#: faq.html.j2:79
+#: template/faq.html.j2:79
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:80
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -511,11 +561,11 @@ msgid ""
 "regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:95
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:96
 msgid ""
 "Taler's wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -526,24 +576,24 @@ msgid ""
 "future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:109
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:110
 msgid ""
 "We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
 "have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:118
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: faq.html.j2:119
+#: template/faq.html.j2:119
 msgid ""
 "The exchange would be operated by a bank or in cooperation with a bank, "
 "and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -553,13 +603,13 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:129
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:130
 msgid ""
 "Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -568,11 +618,11 @@ msgid ""
 "respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:140
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:141
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -582,11 +632,11 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:153
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:155
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -603,7 +653,7 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:15
 msgid ""
 "GNU Taler is a privacy-preserving payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -611,28 +661,28 @@ msgid ""
 "evasion and money laundering."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is payments; it "
 "is not meant as a store of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:30
 msgid ""
 "Payment are made after exchanging existing money "
 "into electronic money with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:37
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments without making their customers register on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:44
 msgid ""
 "GNU Taler is immune against many types of fraud, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -640,33 +690,33 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:60
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:62
+#: template/features.html.j2:62
 msgid ""
 "To pay with Taler, customers install an electronic wallet on their device. "
 "Before the first payment, the desired currency must be added to the wallet's "
 "balance by some other means of payment."
 msgstr ""
 
-#: features.html.j2:70
+#: template/features.html.j2:70
 msgid ""
 "Once the wallet is charged, payments on websites take only one click, are "
 "never falsely rejected by fraud detection and do not pose any risk of "
 "phishing or identity theft."
 msgstr ""
 
-#: features.html.j2:77
+#: template/features.html.j2:77
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:85
+#: template/features.html.j2:85
 msgid ""
 "To receive Taler payments, a merchant needs a bank account in the desired "
 "currency. We provide supporting software in various programming languages to "
@@ -674,32 +724,32 @@ msgid ""
 "processing can run on the merchant's premises or be hosted by a third party."
 msgstr ""
 
-#: features.html.j2:94
+#: template/features.html.j2:94
 msgid ""
 "Merchant integration is simple, and customers can pay for products without "
 "even having to register an account."
 msgstr ""
 
-#: features.html.j2:99
+#: template/features.html.j2:99
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:113
 msgid "Practical"
 msgstr ""
 
-#: features.html.j2:116
+#: template/features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
 "extremely low transaction costs."
 msgstr ""
 
-#: features.html.j2:126
+#: template/features.html.j2:126
 msgid "Stable"
 msgstr ""
 
-#: features.html.j2:129
+#: template/features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -707,44 +757,45 @@ msgid ""
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 
-#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
+#: template/features.html.j2:140 template/governments.html.j2:58
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr ""
 
-#: features.html.j2:143
+#: template/features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
 "rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
-#: features.html.j2:155 governments.html.j2:25
+#: template/features.html.j2:155 template/governments.html.j2:25
 msgid "Taxable"
 msgstr ""
 
-#: features.html.j2:158
+#: template/features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
 
-#: features.html.j2:168
+#: template/features.html.j2:168
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:170
+#: template/features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
 "money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:181 template/governments.html.j2:88
 msgid "Libre"
 msgstr ""
 
-#: features.html.j2:184
+#: template/features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -753,108 +804,108 @@ msgid ""
 "software."
 msgstr ""
 
-#: financial-news.html.j2:6
+#: template/financial-news.html.j2:6
 msgid "Financial News"
 msgstr ""
 
-#: financial-news.html.j2:9
+#: template/financial-news.html.j2:9
 msgid ""
 "This page explains (only in English) how Taler can change ongoing "
 "developments in the financial industry."
 msgstr ""
 
-#: glossary.html.j2:6
+#: template/glossary.html.j2:6
 msgid "auditor"
 msgstr ""
 
-#: glossary.html.j2:8
+#: template/glossary.html.j2:8
 msgid ""
 "trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
-#: glossary.html.j2:12
+#: template/glossary.html.j2:12
 msgid "bank"
 msgstr ""
 
-#: glossary.html.j2:14
+#: template/glossary.html.j2:14
 msgid ""
 "traditional financial service provider who offers wire `transfers` between "
 "accounts"
 msgstr ""
 
-#: glossary.html.j2:18
+#: template/glossary.html.j2:18
 msgid "coin"
 msgstr ""
 
-#: glossary.html.j2:20
+#: template/glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
 "known as the `denomination` of the coin"
 msgstr ""
 
-#: glossary.html.j2:24
+#: template/glossary.html.j2:24
 msgid "contract"
 msgstr ""
 
-#: glossary.html.j2:26
+#: template/glossary.html.j2:26
 msgid "the proposal signed by the wallet."
 msgstr ""
 
-#: glossary.html.j2:30
+#: template/glossary.html.j2:30
 msgid "denomination"
 msgstr ""
 
-#: glossary.html.j2:32
+#: template/glossary.html.j2:32
 msgid ""
 "unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
-#: glossary.html.j2:36
+#: template/glossary.html.j2:36
 msgid "denomination key"
 msgstr ""
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:38
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
 msgstr ""
 
-#: glossary.html.j2:42
+#: template/glossary.html.j2:42
 msgid "deposit"
 msgstr ""
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
 "exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
-#: glossary.html.j2:48
+#: template/glossary.html.j2:48
 msgid "dirty"
 msgstr ""
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:50
 msgid ""
 "a `coin` is dirty if its public key may be known to an entity other than the "
 "customer, thereby creating the danger of some entity being able to link "
 "multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
-#: glossary.html.j2:54
+#: template/glossary.html.j2:54
 msgid "exchange"
 msgstr ""
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:56
 msgid ""
 "Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:60
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:62
 msgid ""
 "Various operations come with time limits. In particular, `denomination keys` "
 "come with strict time limits for the various operations involving the `coin` "
@@ -867,45 +918,45 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:74
 msgid "extension"
 msgstr ""
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:80
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:86
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:92
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:98
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -915,80 +966,80 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:109
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
-#: glossary.html.j2:115
+#: template/glossary.html.j2:115
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:117
 msgid ""
 "operation by which an exchange returns the value of coins affected by a "
 "`revocation` to their `owner`, either by allowing the owner to withdraw new "
 "coins or wiring funds back to the bank account of the `owner`"
 msgstr ""
 
-#: glossary.html.j2:123
+#: template/glossary.html.j2:123
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:129
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:135
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
 "account to cover obligations from coins in circulation"
 msgstr ""
 
-#: glossary.html.j2:141
+#: template/glossary.html.j2:141
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:147
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
 "the customer"
 msgstr ""
 
-#: glossary.html.j2:153
+#: template/glossary.html.j2:153
 msgid "revocation"
 msgstr ""
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:155
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -996,101 +1047,101 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:159
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
-#: glossary.html.j2:165
+#: template/glossary.html.j2:165
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:167
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:171
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
 msgstr ""
 
-#: glossary.html.j2:177
+#: template/glossary.html.j2:177
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:183
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:189
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:195
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:201
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:203
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:213
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:219
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:221
 msgid ""
 "a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
 "`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
@@ -1101,11 +1152,11 @@ msgid ""
 "past the legal data retention requirement)."
 msgstr ""
 
-#: governments.html.j2:6
+#: template/governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
 
-#: governments.html.j2:8
+#: template/governments.html.j2:8
 msgid ""
 "Taler provides accountability to ensure business operate legally, while also "
 "respecting civil liberties of citizens. Taler is a payment system based on "
@@ -1114,7 +1165,7 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:28
+#: template/governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
 "taxation. With Taler, the receiver of any form of payment is easily "
@@ -1124,7 +1175,7 @@ msgid ""
 "evasion and black markets less viable."
 msgstr ""
 
-#: governments.html.j2:41
+#: template/governments.html.j2:41
 msgid ""
 "Thus, despite offering anonymity for citizens spending digital cash to buy "
 "goods and services, Taler also ensures that the state can observe incoming "
@@ -1136,7 +1187,7 @@ msgid ""
 "multiple devices."
 msgstr ""
 
-#: governments.html.j2:61
+#: template/governments.html.j2:61
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1145,7 +1196,7 @@ msgid ""
 "merchants, the exchange and the state."
 msgstr ""
 
-#: governments.html.j2:73
+#: template/governments.html.j2:73
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1155,98 +1206,98 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:91
+#: template/governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
 "will enable competition and avoid the monopolization of payment systems that "
 "threatens global political and financial stability today."
 msgstr ""
 
-#: governments.html.j2:101
+#: template/governments.html.j2:101
 msgid "Efficient"
 msgstr ""
 
-#: governments.html.j2:104
+#: template/governments.html.j2:104
 msgid ""
 "Taler has an efficient design. Unlike Blockchain-based payment systems, such "
 "as Bitcoin, Taler will not threaten the availability of national electric "
 "grids or (significantly) contribute to environmental pollution."
 msgstr ""
 
-#: governments.html.j2:120
+#: template/governments.html.j2:120
 msgid "Taler and regulation"
 msgstr ""
 
-#: governments.html.j2:122
+#: template/governments.html.j2:122
 msgid "Anti money laundering (AML)"
 msgstr ""
 
-#: governments.html.j2:123
+#: template/governments.html.j2:123
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
 msgstr ""
 
-#: governments.html.j2:124
+#: template/governments.html.j2:124
 msgid "Know your customer (KYC)"
 msgstr ""
 
-#: governments.html.j2:125
+#: template/governments.html.j2:125
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
 msgstr ""
 
-#: governments.html.j2:126
+#: template/governments.html.j2:126
 msgid "General Data Protection Regulation (GDPR)"
 msgstr ""
 
-#: governments.html.j2:127
+#: template/governments.html.j2:127
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
 msgstr ""
 
-#: governments.html.j2:128
+#: template/governments.html.j2:128
 msgid "Payment Services Directive (PSD2)"
 msgstr ""
 
-#: governments.html.j2:129
+#: template/governments.html.j2:129
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
 msgstr ""
 
-#: governments.html.j2:137
+#: template/governments.html.j2:137
 msgid "Taler provides privacy and accountability"
 msgstr ""
 
-#: governments.html.j2:140
+#: template/governments.html.j2:140
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
 "governments can obtain:"
 msgstr ""
 
-#: governments.html.j2:148
+#: template/governments.html.j2:148
 msgid ""
 "The total amount of digital currency withdrawn by a customer. The government "
 "can impose limits on how much digital cash a customer can withdraw within a "
 "given time frame."
 msgstr ""
 
-#: governments.html.j2:157
+#: template/governments.html.j2:157
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
-#: governments.html.j2:164
+#: template/governments.html.j2:164
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
 "the identity of the customer."
 msgstr ""
 
-#: governments.html.j2:174
+#: template/governments.html.j2:174
 msgid ""
 "The amounts of digital coins legitimately withdrawn by customers from the "
 "exchange, the value of non-redeemed digital coins in customer's wallets, the "
@@ -1255,21 +1306,21 @@ msgid ""
 "fees."
 msgstr ""
 
-#: gsoc-codeless.html.j2:5
+#: template/gsoc-codeless.html.j2:5
 msgid "GSoC 2018: Codeless Payment"
 msgstr ""
 
-#: gsoc-codeless.html.j2:6
+#: template/gsoc-codeless.html.j2:6
 msgid ""
 "Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and "
 "guidance of Florian Dold."
 msgstr ""
 
-#: gsoc-codeless.html.j2:12
+#: template/gsoc-codeless.html.j2:12
 msgid "Overview"
 msgstr ""
 
-#: gsoc-codeless.html.j2:14
+#: template/gsoc-codeless.html.j2:14
 msgid ""
 "Codeless payment is a component that sits between the seller's frontend and "
 "the GNU Taler merchant backend. This component has a web interface, where "
@@ -1279,15 +1330,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:23
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:24
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:28
 msgid ""
 "The primary use case is the registration of the merchant. The codeless "
 "payment backend provides a secure django authenticated login to the "
@@ -1298,19 +1349,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:33
 msgid ""
 "A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:38
+#: template/gsoc-codeless.html.j2:38
 msgid ""
 "The merchant can upload digital inventory (like a PDF or HTML page) via the "
 "codeless payments frontend and the user can then purchase it and view the "
 "version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:43
+#: template/gsoc-codeless.html.j2:43
 msgid ""
 "The merchant can add any physical inventory available in his stocks. While "
 "adding these inventory, the seller is prompted to add minimum quantity of "
@@ -1319,7 +1370,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1329,7 +1380,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1337,31 +1388,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1370,7 +1421,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1378,7 +1429,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1390,7 +1441,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1398,7 +1449,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1408,25 +1459,25 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr ""
 
-#: investors.html.j2:9
+#: template/investors.html.j2:9
 msgid ""
 "We have created a company, Taler Systems SA in Luxembourg.
 Please "
 "contact invest@taler.net if you want to invest in Taler."
 msgstr ""
 
-#: investors.html.j2:24
+#: template/investors.html.j2:24
 msgid "The Team"
 msgstr ""
 
-#: investors.html.j2:27
+#: template/investors.html.j2:27
 msgid ""
 "Our team combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1434,7 +1485,7 @@ msgid ""
 "this vision upon the world."
 msgstr ""
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
 msgid ""
 "We are currently supported by Inria, "
 "the French national institute for research in informatics and automation, "
@@ -1442,11 +1493,11 @@ msgid ""
 "Foundation."
 msgstr ""
 
-#: investors.html.j2:45
+#: template/investors.html.j2:45
 msgid "The Technology"
 msgstr ""
 
-#: investors.html.j2:48
+#: template/investors.html.j2:48
 msgid ""
 "All transactions in Taler are secured using modern cryptography and trust in all parties is minimized. Financial "
@@ -1457,11 +1508,11 @@ msgid ""
 "transaction costs are fractions of a cent."
 msgstr ""
 
-#: investors.html.j2:63
+#: template/investors.html.j2:63
 msgid "The Business"
 msgstr ""
 
-#: investors.html.j2:66
+#: template/investors.html.j2:66
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1472,22 +1523,22 @@ msgid ""
 "to facilitate the transactions."
 msgstr ""
 
-#: investors.html.j2:85
+#: template/investors.html.j2:85
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:91
+#: template/investors.html.j2:91
 msgid ""
 "Our financial news page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:114
 msgid "Running a Taler payment service operator"
 msgstr ""
 
-#: investors.html.j2:117
+#: template/investors.html.j2:117
 msgid ""
 "The payment service operator runs the Taler exchange. The exchange "
 "charges transaction fees to customers or merchants. Its operational "
@@ -1495,37 +1546,37 @@ msgid ""
 "of the computing infrastructure."
 msgstr ""
 
-#: investors.html.j2:127
+#: template/investors.html.j2:127
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
 msgstr ""
 
-#: investors.html.j2:129
+#: template/investors.html.j2:129
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
 msgstr ""
 
-#: investors.html.j2:131
+#: template/investors.html.j2:131
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
 msgstr ""
 
-#: investors.html.j2:133
+#: template/investors.html.j2:133
 msgid "Partnership with banks establishes consumer trust."
 msgstr ""
 
-#: investors.html.j2:135
+#: template/investors.html.j2:135
 msgid "Partnership with free software community enables rapid deployment."
 msgstr ""
 
-#: merchants.html.j2:5
+#: template/merchants.html.j2:5
 msgid "Advantages for Merchants"
 msgstr ""
 
-#: merchants.html.j2:8
+#: template/merchants.html.j2:8
 msgid ""
 "Taler is a cost-effective electronic payment system which provides you with "
 "cryptographic proof that the payment worked correctly within milliseconds. "
@@ -1533,11 +1584,11 @@ msgid ""
 "risk of fraud."
 msgstr ""
 
-#: merchants.html.j2:22
+#: template/merchants.html.j2:22
 msgid "Fast"
 msgstr ""
 
-#: merchants.html.j2:25
+#: template/merchants.html.j2:25
 msgid ""
 "Processing transactions with Taler is fast, allowing you to confirm the "
 "transaction with your customer virtually immediately. Your customers will "
@@ -1548,7 +1599,7 @@ msgid ""
 "overhead for customers."
 msgstr ""
 
-#: merchants.html.j2:44
+#: template/merchants.html.j2:44
 msgid ""
 "You will have cryptographic proof of payment from the Taler payment service "
 "provider. With Taler you never handle sensitive customer account information "
@@ -1557,7 +1608,7 @@ msgid ""
 "for all transactions which you can use in court in case of disputes."
 msgstr ""
 
-#: merchants.html.j2:61
+#: template/merchants.html.j2:61
 msgid ""
 "Taler is free software, and you can use the liberally-licensed reference "
 "code as a starting point to integrate Taler into your services. To use "
@@ -1566,11 +1617,11 @@ msgid ""
 "integrators for support."
 msgstr ""
 
-#: merchants.html.j2:76
+#: template/merchants.html.j2:76
 msgid "Cheap"
 msgstr ""
 
-#: merchants.html.j2:79
+#: template/merchants.html.j2:79
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1578,22 +1629,22 @@ msgid ""
 "overhead and thus offer low transaction fees."
 msgstr ""
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:89
 msgid "Flexible"
 msgstr ""
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:92
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
 "Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 
-#: merchants.html.j2:101
+#: template/merchants.html.j2:101
 msgid "Ethical"
 msgstr ""
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:104
 msgid ""
 "Taler prevents tax evasion and money laundering. Taler's protocols are "
 "efficient and do not use wasteful proof-of-work calculations. Taler "
@@ -1601,38 +1652,38 @@ msgid ""
 "reference implementations."
 msgstr ""
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:119
 msgid "Manuals for merchants"
 msgstr ""
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:122
 msgid "The GNU Taler merchant backend operator manual"
 msgstr ""
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr ""
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:128
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr ""
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:140
 msgid "The GNU Taler Merchant Backend"
 msgstr ""
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:142
 msgid "Merchants process payments using the Taler backend:"
 msgstr ""
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:147
 msgid ""
 "The backend signs and stores the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
 "give the customer's order in a JSON format to the backend."
 msgstr ""
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:156
 msgid ""
 "The backend validates payments received from the wallet and "
 "executes them with the Taler payment service provider (the exchange). "
@@ -1640,52 +1691,52 @@ msgid ""
 "the Taler backend and check the HTTP status code that is returned."
 msgstr ""
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:167
 msgid ""
 "The backend can list completed transactions and map wire "
 "transfers to sets of business transactions, including the exact terms of "
 "each contract."
 msgstr ""
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:183
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:16
 msgid "More news"
 msgstr ""
 
-#: old-news.html.j2:6
+#: template/old-news.html.j2:6
 msgid "Older News"
 msgstr ""
 
-#: old-news.html.j2:9
+#: template/old-news.html.j2:9
 msgid "This page documents the GNU Taler history."
 msgstr ""
 
-#: press.html.j2:4
+#: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
 
-#: principles.html.j2:22
+#: template/principles.html.j2:22
 msgid "GNU Taler: Design Principles"
 msgstr ""
 
-#: principles.html.j2:29
+#: template/principles.html.j2:29
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:36
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:40
 msgid ""
 "... in the are of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:42
 msgid ""
 "GNU Taler must be Free Software. For merchants, our Free Software reference "
@@ -1694,22 +1745,22 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:51
 msgid ""
 "Customers benefit from Free Software as the wallet software can be made to "
 "run on a variety of platforms, and the absence of user-hostile features such "
 "as tracking or telemetry can easily be assured."
 msgstr ""
 
-#: principles.html.j2:63
+#: template/principles.html.j2:63
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:68
 msgid "You deserve some privacy"
 msgstr ""
 
-#: principles.html.j2:70
+#: template/principles.html.j2:70
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -1717,7 +1768,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:78
 msgid ""
 "In legislations with data protection regulations (such as the recently "
 "introduced GDPR in Europe), merchants benefit from this as well, as no data "
@@ -1727,49 +1778,49 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:92
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:97
 msgid "Money laundering"
 msgstr ""
 
-#: principles.html.j2:99
+#: template/principles.html.j2:99
 msgid ""
 "As a payment system must still be legal to operate and use, it must comply "
 "with these requirements. Furthermore, we consider levying of taxes as "
 "beneficial to society."
 msgstr ""
 
-#: principles.html.j2:110
+#: template/principles.html.j2:110
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:115
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:117
 msgid ""
 "This imposes requirements on the security of the system, as well as on the "
 "general design, as payment fraud can also happen through misleading user "
 "interface design or the lack of cryptographic evidence for certain processes."
 msgstr ""
 
-#: principles.html.j2:128
+#: template/principles.html.j2:128
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:132
 msgid ""
 "Privacy by design, privacy by default, General Data Protection Regulation "
 "(GDPR) compliant"
 msgstr ""
 
-#: principles.html.j2:134
+#: template/principles.html.j2:134
 msgid ""
 "The reason behind this goal is similar to (2). The privacy of buyers is "
 "given priority, but other parties such as merchants still benefit from it, "
@@ -1777,15 +1828,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:144
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:148
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:150
 msgid ""
 "Specifically it must be usable for non-expert customers. Usability also "
 "applies to the integration with merchants, and informs choices about the "
@@ -1793,29 +1844,29 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:162
 msgid "7. Be efficient"
 msgstr ""
 
-#: principles.html.j2:166
+#: template/principles.html.j2:166
 msgid "Energy efficiency"
 msgstr ""
 
-#: principles.html.j2:168
+#: template/principles.html.j2:168
 msgid ""
 "Approaches such as proof-of-work are ruled out by this requirement. "
 "Efficiency is necessary for GNU Taler to be used for micropayments."
 msgstr ""
 
-#: principles.html.j2:177
+#: template/principles.html.j2:177
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:181
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:183
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -1823,15 +1874,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:195
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:199
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:201
 msgid ""
 "It must be relatively easy for competitors to join the systems. While the "
 "barriers for this in traditional financial systems are rather high, the "
@@ -1841,131 +1892,84 @@ msgid ""
 "instead of having one completely monolithic system."
 msgstr ""
 
-#: schemafuzz.html.j2:6
+#: template/schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
 
-#: team.html.j2:16
+#: template/team.html.j2:16
 msgid ""
 "GNU maintainer. Network security & privacy researcher. Software "
 "architect."
 msgstr ""
 
-#: team.html.j2:21
+#: template/team.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
 msgstr ""
 
-#: team.html.j2:26
+#: template/team.html.j2:26
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
+#: template/team.html.j2:33
 msgid "GNU mainatiner, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:38
 msgid "Applied cryptography. Contact to W3c & Tor."
 msgstr ""
 
-#: team.html.j2:43
+#: template/team.html.j2:43
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
-#: team.html.j2:50
+#: template/team.html.j2:50
 msgid "Software engineer."
 msgstr ""
 
-#: team.html.j2:55
+#: template/team.html.j2:55
 msgid "Sustainable business development."
 msgstr ""
 
-#: team.html.j2:60
+#: template/team.html.j2:60
 msgid "Theoretical foundations."
 msgstr ""
 
-#: team.html.j2:66
+#: template/team.html.j2:66
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:73 template/team.html.j2:77 template/team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:87 template/team.html.j2:91 template/team.html.j2:95
 msgid "Translator (Italian)"
 msgstr ""
 
-#: team.html.j2:99
+#: template/team.html.j2:99
 msgid "Translator (German)"
 msgstr ""
 
-#: team.html.j2:106
+#: template/team.html.j2:106
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:110
+#: template/team.html.j2:110
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:118
+#: template/team.html.j2:118
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:122
+#: template/team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
-#: team.html.j2:146
+#: template/team.html.j2:128 template/team.html.j2:132
+#: template/team.html.j2:136 template/team.html.j2:142
+#: template/team.html.j2:146
 msgid "Free software developer."
 msgstr ""
-
-#: common/base.j2:5
-msgid "GNU Taler"
-msgstr ""
-
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr ""
-
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-msgid "Team"
-msgstr ""
-
-#: common/footer.j2.inc:16
-msgid "Contact"
-msgstr ""
-
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr ""
-
-#: common/footer.j2.inc:26
-msgid "Bibliography"
-msgstr ""
-
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by BFH"
-msgstr ""
-
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using Free Software "
-"only."
-msgstr ""
-
-#: common/navigation.j2.inc:21
-msgid "Features"
-msgstr ""
-
-#: common/navigation.j2.inc:22
-msgid "Principles"
-msgstr ""
-
-#: common/navigation.j2.inc:23
-msgid "Docs"
-msgstr ""
-- 
cgit v1.2.3

