gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-www] branch stable updated (bd9bfe7 -> ce5a114)


From: gnunet
Subject: [GNUnet-SVN] [taler-www] branch stable updated (bd9bfe7 -> ce5a114)
Date: Tue, 17 Sep 2019 07:58:20 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch stable
in repository www.

    from bd9bfe7  fix location of i18n popup
     add cf9958d  Adjust repository layout (resolves #5596), add sitemap.xml 
generator.
     add bc20c3f  initial README for how to build this (NetBSD for now, easy to 
adopt for the rest)
     add 4cbc233  Makefile: layout changes, copy morefiles.
     add 3333962  syntax fixes, gettext block fixes, commit new po files.
     add 693762f  cover the possibility of localized images.
     add c140ccd  fix the gettext noise caused by no longer existing strings.
     add 3dfd8a0  mark more strings as translatable (wallet, investors, 
developers)
     add 2997070  add web-common cp to Makefile
     add fb8a093  Apparently gmake is a bit more easy to be thrown off than 
NetBSD make.
     add 4d149bc  locale, trigger new CI job
     add b17046c  locale.
     add 9d551eb  fix name
     add ab2aa3c  URL fixes
     add 84e6924  mark more strings as translatable, fix typos.
     add cc602cf  fix locales
     add f78b9ee  URL
     add 154361f  fix error in de translation
     add fa0bfd5  css: try to integrate language button more into the color 
scheme.
     add 07d833a  Revert "css: try to integrate language button more into the 
color scheme."
     add 167b181  stylize the navbar darker, make it easier to read.
     add ce5a114  clarify

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |    1 +
 Makefile                                           |   20 +-
 README                                             |   20 +
 common/navigation.j2.inc                           |    4 +-
 contact.html.j2                                    |   69 -
 copyright.html.j2                                  |   34 -
 developers.html.j2                                 |  288 ----
 faq.html.j2                                        |  173 ---
 features.html.j2                                   |  198 ---
 financial-news.html.j2                             |   43 -
 glossary.html.j2                                   |  234 ---
 governments.html.j2                                |  188 ---
 gsoc-codeless.html.j2                              |  137 --
 index.html.j2                                      |   46 -
 investors.html.j2                                  |  143 --
 locale/de/LC_MESSAGES/messages.po                  | 1636 +++++++++-----------
 locale/en/LC_MESSAGES/messages.po                  | 1178 ++++++++------
 locale/es/LC_MESSAGES/messages.po                  | 1627 +++++++++----------
 locale/fr/LC_MESSAGES/messages.po                  | 1192 ++++++++------
 locale/it/LC_MESSAGES/messages.po                  | 1634 +++++++++----------
 locale/pt/LC_MESSAGES/messages.po                  | 1617 ++++++++++---------
 locale/ru/LC_MESSAGES/messages.po                  | 1182 ++++++++------
 make_sitemap.sh                                    |   74 +
 merchants.html.j2                                  |  186 ---
 news.html.j2                                       |   22 -
 old-news.html.j2                                   |   44 -
 press.html.j2                                      |   61 -
 principles.html.j2                                 |  215 ---
 styles.css                                         |   11 +-
 team.html.j2                                       |  150 --
 template.py                                        |   13 +-
 .../architecture.html.j2                           |    3 -
 .../bibliography.html.j2                           |    0
 template/contact.html.j2                           |   75 +
 template/copyright.html.j2                         |   44 +
 template/developers.html.j2                        |  300 ++++
 docs.html.j2 => template/docs.html.j2              |   94 +-
 template/faq.html.j2                               |  195 +++
 template/features.html.j2                          |  213 +++
 template/financial-news.html.j2                    |   41 +
 template/glossary.html.j2                          |  258 +++
 template/governments.html.j2                       |  183 +++
 template/gsoc-codeless.html.j2                     |  206 +++
 template/index.html.j2                             |   55 +
 template/investors.html.j2                         |  144 ++
 javascript.html => template/javascript.html        |    0
 template/merchants.html.j2                         |  181 +++
 template/news.html.j2                              |   20 +
 template/old-news.html.j2                          |   44 +
 template/press.html.j2                             |   53 +
 template/principles.html.j2                        |  180 +++
 schemafuzz.html.j2 => template/schemafuzz.html.j2  |    4 +-
 template/team.html.j2                              |  155 ++
 wallet.html.j2 => template/wallet.html.j2          |   91 +-
 54 files changed, 8047 insertions(+), 6932 deletions(-)
 create mode 100644 README
 delete mode 100644 contact.html.j2
 delete mode 100644 copyright.html.j2
 delete mode 100644 developers.html.j2
 delete mode 100644 faq.html.j2
 delete mode 100644 features.html.j2
 delete mode 100644 financial-news.html.j2
 delete mode 100644 glossary.html.j2
 delete mode 100644 governments.html.j2
 delete mode 100644 gsoc-codeless.html.j2
 delete mode 100644 index.html.j2
 delete mode 100644 investors.html.j2
 create mode 100755 make_sitemap.sh
 delete mode 100644 merchants.html.j2
 delete mode 100644 news.html.j2
 delete mode 100644 old-news.html.j2
 delete mode 100644 press.html.j2
 delete mode 100644 principles.html.j2
 delete mode 100644 team.html.j2
 rename architecture.html.j2 => template/architecture.html.j2 (95%)
 rename bibliography.html.j2 => template/bibliography.html.j2 (100%)
 create mode 100644 template/contact.html.j2
 create mode 100644 template/copyright.html.j2
 create mode 100644 template/developers.html.j2
 rename docs.html.j2 => template/docs.html.j2 (56%)
 create mode 100644 template/faq.html.j2
 create mode 100644 template/features.html.j2
 create mode 100644 template/financial-news.html.j2
 create mode 100644 template/glossary.html.j2
 create mode 100644 template/governments.html.j2
 create mode 100644 template/gsoc-codeless.html.j2
 create mode 100644 template/index.html.j2
 create mode 100644 template/investors.html.j2
 rename javascript.html => template/javascript.html (100%)
 create mode 100644 template/merchants.html.j2
 create mode 100644 template/news.html.j2
 create mode 100644 template/old-news.html.j2
 create mode 100644 template/press.html.j2
 create mode 100644 template/principles.html.j2
 rename schemafuzz.html.j2 => template/schemafuzz.html.j2 (88%)
 create mode 100644 template/team.html.j2
 rename wallet.html.j2 => template/wallet.html.j2 (71%)

diff --git a/.gitignore b/.gitignore
index 762061b..e1ce6c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ locale/messages.pot
 videos/grothoff2014fossa.webm
 videos/grothoff2014fossa.ogv
 
+rendered/
 en/
 de/
 fr/
diff --git a/Makefile b/Makefile
index 1600d2c..69e1266 100644
--- a/Makefile
+++ b/Makefile
@@ -12,14 +12,28 @@ include config.mk
 # TypeScript logic in web-common.
 all: locale template
        cd web-common && $(TSC)
+       /bin/sh make_sitemap.sh
+       for x in en de fr it es ru pt ; do cp robots.txt rendered/$$x ; done
+       for x in en de fr it es ru pt ; do cp favicon.ico rendered/$$x ; done
+       for x in en de fr it es ru pt ; do cp rendered/sitemap.xml rendered/$$x 
; done
+       cp styles.css rendered/
+       cp -R images rendered/
+       for x in en de fr it es ru pt ; do cp -R images rendered/$$x ; done
+       for x in en de fr it es ru pt ; do cp -R web-common rendered/$$x ; done
+       cp -R dist rendered/
+       cp -R icons rendered/
+       cp -R papers rendered/
+       cp -R pdf rendered/
+       cp -R presentations rendered/
+       cp -R team-images rendered/
 
 # Extract translateable strings from jinja2 templates.
-locale/messages.pot: *.j2 common/*.j2 common/*.j2.inc
+locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
        env PYTHONPATH="." $(BABEL) extract -F locale/babel.map -o 
locale/messages.pot .
 
 # Update translation (.po) files with new strings.
 locale-update: locale/messages.pot
-       msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po 
locale/messages.pot 
+       msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po 
locale/messages.pot
        msgmerge -U -m --previous locale/de/LC_MESSAGES/messages.po 
locale/messages.pot
        msgmerge -U -m --previous locale/fr/LC_MESSAGES/messages.po 
locale/messages.pot
        msgmerge -U -m --previous locale/es/LC_MESSAGES/messages.po 
locale/messages.pot
@@ -54,7 +68,7 @@ run: all
        $(PYTHON) -m http.server
 
 clean:
-       rm -rf __pycache__
+       rm -rf __pycache__ *.pyc  *~ \.*~ \#*\#
        rm -rf en/ de/ fr/ it/ es/ ru/
        rm -rf rendered/
 
diff --git a/README b/README
new file mode 100644
index 0000000..ddaa676
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+Building
+--------
+
+If you are using NetBSD:
+install python3.7, py37-babel, npm, nodejs from pkgsrc.
+
+Adjust the values in config.mk:
+
+       PYTHON=python3.7
+       BABEL=pybabel-3.7
+
+npm install typescript
+Add the node_module's bin to your $PATH for the typescript binary.
+make submodules/init
+make submodules/update
+make
+
+If you installed typescript in $HOME:
+PATH=$HOME/node_modules/.bin/:$PATH env BROWSER=firefox make run
+to run the website
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 297f98d..ca5e35a 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,12 +1,12 @@
 {% macro navlink(site, text) -%}
    <a class="nav-link {{ 'active' if filename == site else '' }}"
-      href="https://taler.net/{{ lang }}/{{ site }}">
+      href="/{{ lang }}/{{ site }}">
     {{ text }}
    </a>
 {%- endmacro %}
 
 <nav class="navbar navbar-expand-lg navbar-light">
-  <a class="navbar-brand taler_home" href="https://taler.net/{{ lang 
}}/index.html">Taler</a>
+  <a class="navbar-brand taler_home" href="/{{ lang }}/index.html">Taler</a>
   <button class="navbar-toggler"
           type="button"
           data-toggle="collapse"
diff --git a/contact.html.j2 b/contact.html.j2
deleted file mode 100644
index f576ad1..0000000
--- a/contact.html.j2
+++ /dev/null
@@ -1,69 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("Contact information") }}</h1>
-  </div>
-</div>
-
-<div class="container">
-<div class="row">
-  <div class="col-lg-4">
-    <h2>{{ _("The mailing list") }}</h2>
-      <p>
-        {% trans %}
-            An archived, public mailing list for GNU Taler is
-            hosted at
-            <a 
href="https://lists.gnu.org/mailman/listinfo/taler";>https://lists.gnu.org/mailman/listinfo/taler</a>.
  You can send messages to the list
-            at <a href="mailto:address@hidden";>address@hidden</a>.
-        {% endtrans %}
-      </p>
-  </div>
-
-  <div class="col-lg-4">
-    <h2>{{ _("Contacting individuals") }}</h2>
-    <p>
-        {% trans %}
-             Team members are generally reachable at
-             <tt>address@hidden</tt>.  All of us
-             support receiving GnuPG encrypted e-mails.
-        {% endtrans %}
-    </p>
-  </div>
-
-  <div class="col-lg-4">
-    <h2>{{ _("General inquiries") }}</h2>
-    <p>
-        {% trans %}
-             You can reach a group of team members handling
-             general inquiries at <tt>contact AT taler.net</tt>.
-        {% endtrans %}
-    </p>
-  </div>
-
-  <div class="col-lg-6">
-    <h2>{{ _("Reporting bugs") }}</h2>
-    <p>
-        {% trans %}
-             We track open feature requests and bugs in our
-             <a href="https://gnunet.org/bugs/";>Bug tracker</a>,
-             which is shared with the GNUnet project.
-             You can also report bugs or feature requests to the
-             mailing list.
-        {% endtrans %}
-    </p>
-  </div>
-
-  <div class="col-lg-6">
-    <h2>{{ _("Executive team") }}</h2>
-    <p>
-        {% trans %}
-             For non-technical commercial requests, please contact
-             <tt>ceo AT taler.net</tt>.
-        {% endtrans %}
-    </p>
-  </div>
-</div>
-</div>
-{% endblock body_content %}
diff --git a/copyright.html.j2 b/copyright.html.j2
deleted file mode 100644
index 1c5201b..0000000
--- a/copyright.html.j2
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<!-- Jumbotron -->
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("Copyright Assignment") }}</h1>
-    <!-- Note: source of the pdf/copyright.pdf is in gitolite-admin/ -->
-{% trans %}
-    <p>Contributors to GNU Taler with Git access must sign the
-    <a href="/pdf/copyright.pdf">copyright assignment</a> to
-    ensure that the <a 
href="https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";>GNUnet
 e.V. --- Taler Systems SA agreement
-    on licensing and collaborative development</a> of the GNUnet and
-    GNU Taler projects is satisfied.</p>
-{% endtrans %}
-  </div>
-  <div class="container">
-{% trans %}
-    <p>The agreements ensure that the code will continue to be made
-    available under free software licenses, but gives developers
-    the freedom to move code between GNUnet and GNU Taler without
-    worrying about licenses and the company the ability to
-    dual-license (for example, so that we can distribute via
-    App-stores that are hostile to free software).</p>
-{% endtrans %}
-{% trans %}
-    <p>Minor contributions (basically, anyone without Git access) do
-    not require copyright assignment. Pseudonymous contributions are
-    accepted, in this case simply sign the agreement with your
-    pseudonym. Scanned copies are sufficient, but snail mail is
-    preferred.</p>
-{% endtrans %}
-  </div>
-</div>
-{% endblock body_content %}
diff --git a/developers.html.j2 b/developers.html.j2
deleted file mode 100644
index 61ae63c..0000000
--- a/developers.html.j2
+++ /dev/null
@@ -1,288 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="jumbotron">
-  <div class="text-center">
-    <h1>{{ _("Taler for developers") }}</h1>
-  </div>
-</div>
-
-<div class="container">
-  <div class="row">
-    <div class="col-lg-6">
-      <h3>{{ _("Free") }}</h3>
-
-      <p>
-        {% trans %}
-               GNU Taler is free software implementing an open
-               protocol. Anybody is welcome to integrate our reference
-               implementation into their applications.  Different
-               components of Taler are being made available under
-               different licenses. The Affero GPLv3+ is used for the
-               exchange, the LGPLv3+ is used for reference code
-               demonstrating integration with merchant platforms, and
-               licenses like GPLv3+ are used for
-               wallets and related customer-facing software.  We are
-               open for constructive suggestions for maximizing the
-               adoption of this payment platform.
-         {% endtrans %}
-      </p>
-
-    </div>
-    <div class="col-lg-6">
-      <h3>{{ _("RESTful") }}</h3>
-
-      <p>
-        {% trans %}
-               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 HTTP or HTTPS. Taler's security does
-               not depend upon the use of HTTPS, but obviously
-               merchants may choose to offer HTTPS for consistency
-               and because it generally is better for privacy
-               compared to HTTP.  Taler uses JSON to encode
-               structure data, making it easy to integrate Taler
-               with existing Web applications.  Taler's protocol
-               is documented in
-               detail at <a href="https://docs.taler.net/";>docs.taler.net</a>.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-</div>
-
-<div class="container-fluid c_acronym">
-<div class="container">
-  <div class="row">
-    <div class="col-lg-4">
-      <h3>{{ _("Code") }}</h3>
-
-      <p>
-        {% trans %}
-               Taler is currently primarily developed by a
-               research team at <a href="http://www.inria.fr/";>Inria</a> and
-               <a href="https://gnunet.org/";>GNUnet</a>. However,
-               contributions from anyone are welcome.  Our Git
-               repositories can be cloned using the Git and HTTP
-               access methods against <tt>git.taler.net</tt> with
-               the name of the respective repository. A list of
-               repositories can be found in
-               our <a href="https://git.taler.net/";>GitWeb</a>.
-         {% endtrans %}
-     </p>
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Documentation") }}</h3>
-
-      <p>
-        {% trans %}
-               In addition to this website, the <a
-               href="https://git.taler.net/";>documented code</a> and
-               the <a href="https://docs.taler.net/";>API
-               documentation</a>.  Technical papers can be found in
-               our <a href="bibliography.html">bibliography</a>.
-       {% endtrans %}
-      </p>
-    </div>
-     <div class="col-lg-4">
-      <h3>{{ _("Discussion") }}</h3>
-
-      <p>
-        {% trans %}
-               We have a mailing list for developer discussions.
-               You can subscribe to or read the list archive at
-               <a 
href="http://lists.gnu.org/mailman/listinfo/taler";>http://lists.gnu.org/mailman/listinfo/taler</a>.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-4">
-      <h3>{{ _("Regression Testing") }}</h3>
-
-      <p>
-         {% trans %}
-               We have <a href="https://buildbot.net/";>Buildbot</a>
-               automation tests to detect regressions and check for
-               portability at <a
-               href="https://buildbot.taler.net/";>buildbot.taler.net</a>.
-        {% endtrans %}
-       </p>
-    </div>
-    <div class="col-lg-4" note="not yet operational">
-      <h3>{{ _("Code Coverage Analysis") }}</h3>
-
-      <p>
-         {% trans %}
-               We use
-               <a href="http://ltp.sourceforge.net/coverage/lcov.php";>LCOV</a>
-               to analyze the code coverage of our tests, the
-               results are available
-               at <a href="https://lcov.taler.net/";>lcov.taler.net</a>.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-</div>
-</div>
-
-<div class="container-fluid">
- <div class="container">
-   <h2>{{ _("Technical Presentation") }}</h2>
-  <div class="row">
-   <div class="col-lg-4">
-     <a href="{{ url('presentations/tech.pdf') }}"><img border=0 
class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') 
}}"><br><p align="center">{{ _("Download") }}</p></a>
-   </div>
-   <div class="col-lg-4" id="canvas-left" style="display:none">
-     <canvas id="the-canvas-left"></canvas>
-   </div>
-   <div class="col-lg-4" id="canvas-right" style="display:none">
-    <canvas id="the-canvas-right"></canvas>
-   </div>
-   <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') 
}}"></script>
-   <script type="text/javascript" src="{{ url('dist/js/pdf-view-tech.js') 
}}"></script>
-  </div>
- </div>
-</div>
-
-<div class="container">
-  <div class="col-lg-12">
-    <h3 id="overview">{{ _("Taler system overview") }}</h3>
-
-
-
-    <p>
-        {% trans %}
-             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:
-        {% endtrans %}
-     </p>
-
-      <img src="/images/taler-arch-full.svg" alt="{{_("system overview")}}" 
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
-      <ol>
-         <li>
-               {% trans %}
-                   A customer instructs his <b>bank</b> to
-                   transfer funds from his account to the Taler
-                   exchange (top left).  In the subject of the
-                   transaction, he includes an authentication
-                   token from his electronic <b>wallet</b>. In
-                   Taler terminology, the customer creates a
-                   reserve at the exchange.
-               {% endtrans %}
-            </li>
-
-         <li>
-               {% trans %}
-                   Once the exchange has received the wire
-                   transfer, it allows the customer's electronic
-                   wallet to <b>withdraw</b> electronic coins.
-                   The electronic coins are digital
-                   representations of the original currency from
-                   the transfer. It is important to note that the
-                   exchange does not learn the &quot;serial
-                   numbers&quot; of the coins created in this
-                   process, so it cannot tell later which customer
-                   purchased what at which merchant.  The use of
-                   Taler does not change the currency or the total
-                   value of the funds (except for fees which the
-                   exchange may charge for the service).
-               {% endtrans %}
-            </li>
-
-         <li>
-               {% trans %}
-                   Once the customer has the digital coins in his
-                   wallet, the wallet can be used to <b>spend</b>
-                   the coins with merchant portals that support
-                   the Taler payment system and accept the
-                   respective exchange as a business partner
-                   (bottom arrow). This creates a digital contract
-                   signed by the customer's coins and the
-                   merchant.  If necessary, the customer can later
-                   use this digitally signed contract in a court
-                   of law to prove the exact terms of the contract
-                   and that he paid the respective amount. The
-                   customer does not learn the banking details of
-                   the merchant, and Taler does not require the
-                   merchant to learn the identity of the
-                   customer. Naturally, the customer can spend any
-                   fraction of his digital coins (the system takes
-                   care of customers getting change).
-               {% endtrans %}
-            </li>
-
-         <li>
-               {% trans %}
-                   Merchants receiving digital
-                   coins <b>deposit</b> the respective claims
-                   that resulted from the contract signing with
-                   the customer at the exchange to redeem the
-                   coins.  The deposit step does not reveal the
-                   details of the contract between the customer
-                   and the merchant or the identity of the
-                   customer to the exchange in any way. However,
-                   the exchange does learn the identity of the
-                   merchant via the provided bank routing
-                   information.  The merchant can, for example
-                   when compelled by the state for taxation,
-                   provide information linking the individual
-                   deposit to the respective contract signed by
-                   the customer. Thus, the exchange's database
-                   allows the state to enforce that merchants pay
-                   applicable taxes (and do not engage in illegal
-                   contracts).
-               {% endtrans %}
-            </li>
-
-         <li>
-               {% trans %}
-                   Finally, the exchange transfers funds
-                   corresponding to the digital coins redeemed by
-                   the merchants to the merchant's <b>bank</b>
-                   account. The exchange may combine multiple
-                   small transactions into one larger bank
-                   transfer.  The merchant can query the exchange
-                   about the relationship between the bank
-                   transfers and the individual claims that were
-                   deposited.
-               {% endtrans %}
-            </li>
-
-         <li>
-               {% trans %}
-                   Most importantly, the exchange keeps
-                   cryptographic proofs that allow it to
-                   demonstrate that it is operating correctly to
-                   third parties.  The system requires an
-                   external <b>auditor</b>, such as a
-                   government-appointed financial regulatory body,
-                   to frequently verify the exchange's databases
-                   and check that its bank balance matches the
-                   total value of the remaining coins in
-                   circulation.
-               {% endtrans %}
-            </li>
-
-         <li>
-               {% trans %}
-                   Without the auditor, the exchange operators
-                   could embezzle funds they are holding in
-                   reserve. Customers and merchants cannot cheat
-                   each other or the exchange. If any party's
-                   computers are compromised, the financial damage
-                   is limited to the respective party and
-                   proportional to the funds they have in
-                   circulation during the period of the
-                   compromise.
-               {% endtrans %}
-            </li>
-      </ol>
-    <p></p>
-    <div class="col">
-      <img class="img-fluid" src="../images/diagram-complex.png">
-    </div>
-  </div>
-</div> <!-- /container -->
-{% endblock body_content %}
diff --git a/faq.html.j2 b/faq.html.j2
deleted file mode 100644
index f3657f7..0000000
--- a/faq.html.j2
+++ /dev/null
@@ -1,173 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="container">
-
-<h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
-{% trans %}
-<p>Taler does not require any Blockchain technology, and is
-also not based on proof-of-work or any other distributed consensus
-mechanism.  Instead, Taler is based on blind signatures.
-However, it is theoretically possible to combine Taler with
-peer-to-peer crypto-currencies like Bitcoin.</p>
-{% endtrans %}
-{% trans %}
-<p>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.</p>
-{% endtrans %}
-
-<h2>{{ _("Where is the balance in my wallet stored?") }}</h2>
-{% trans %}
-<p>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.</p>
-{% endtrans %}
-
-<h2>{{ _("What if my wallet is lost?") }}</h2>
-{% trans %}
-<p>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.</p>
-{% endtrans %}
-{% trans %}
-<p>The risk of losing a wallet can be mitigated by making backups or
-keeping the balance reasonably low.</p>
-{% endtrans %}
-
-<h2>{{ _("What if my computer is hacked?") }}</h2>
-{% trans %}
-<p>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.</p>
-{% endtrans %}
-
-<h2>{{ _("Can I send money to my friend with Taler?") }}</h2>
-{% trans %}
-<p>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.</p>
-{% endtrans %}
-{% trans %}
-<p>Future versions of the Taler wallet may allow exchanging coins
-among friends directly as well.</p>
-{% endtrans %}
-
-
-<h2>{{ _("How does Taler handle payments in different currencies?") }}</h2>
-{% trans %}
-<p>Taler wallets can store digital coins corresponding to multiple
-different currencies such as the Euro, US Dollars or Bitcoins.</p>
-{% endtrans %}
-{% trans %}
-<p>Taler currently does not offer conversion between currencies.</p>
-{% endtrans %}
-
-<h2>{{ _("How does Taler protect my privacy?") }}</h2>
-{% trans %}
-
-<p>Your wallet stores digital coins that are <a
-href="https://en.wikipedia.org/wiki/Blind_signature";>blindly
-signed</a> by an exchange.  The use of a blind signature protects your
-privacy as it prevents the exchange from knowing which coin it signed
-for which customer.</p>
-
-{% endtrans %}
-
-
-<h2>{{ _("How much does it cost?") }}</h2>
-{% trans %}
-
-<p>The Taler protocol allows any exchange to set its own fee
-structure, allowing operators to set fees for withdrawing, depositing,
-refreshing or refunding coins.  Operators can also charge fees for
-closing reserves and for (aggregated) wire transfers to merchants.
-Merchants may choose to cover some of the fees customers incur.
-Actual transaction costs are estimated around 0.001 cent/transaction
-(at high transaction rates, amortized over billions of transactions,
-excluding migration costs). Note that this is an early estimate,
-details may depend on hosting and backup requirements from the
-regulator and could thus easily be 10x higher.</p>
-{% endtrans %}
-
-
-<h2>{{ _("Does Taler work with international payments?") }}</h2>
-{% trans %}
-
-<p>Taler's wallet supports multiple currencies, but the system
-currently does not support conversion between currencies.  However,
-in principle an entity that accepts deposits in one currency and
-allows withdrawals in another currency could be created. Still, the
-regulatory hurdles in this case tend to be particularly complex.
-The focus for Taler is on day-to-day payments, so we have no plans
-to support currency conversion in the near future.</p>
-
-{% endtrans %}
-
-
-<h2>{{ _("How does Taler relate to the (European) Electronic Money 
Directive?") }}</h2>
-{% trans %}
-
-<p>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.</p>
-{% endtrans %}
-
-
-<h2>{{ _("What bank would guarantee the conversion between Taler coins and 
bank money in regular bank accounts?") }}</h2>
-{% trans %}
-
-<p>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 regular bank or 
a central
-bank for a centrally banked electronic currency. Regardless, the bank would 
fall under
-the respective banking regulations establishing a reason why consumers would 
have faith
-in the conversion from Taler coins into regular bank money.</p>
-{% endtrans %}
-
-
-<h2>{{ _("To whom would consumers complain to in case of non-conversion or 
non-compliance?") }}</h2>
-{% trans %}
-
-<p>Any exchange should be audited by one or more independent auditors.  
Merchants and
-consumer wallets will report certain issues automatically to the auditors, but 
auditors
-may also provide a method for manual submission of issues.  The auditors are 
expected
-to make their reports available to the respective regulatory authorities, or 
even
-the general public.</p>
-{% endtrans %}
-
-
-<h2>{{ _("Are there any projects already using Taler?") }}</h2>
-{% trans %}
-
-<p>We are aware of several businesses running exploratory projects or having
-developed working prototypes. We are also
-in discussions with several regular banks as well as several central banks
-about the project. That said, there are currently no products in the
-market yet, and we believe this would be premature given the state of
-the project (see also <a href="https://gnunet.org/bugs/";>our bugtracker</a>
-for a list of open issues).</p>
-{% endtrans %}
-
-
-<h2>{{ _("Does Taler support recurring payments?") }}</h2>
-
-{% trans %}
-<p>Today, our wallet implementation does not support recurring
-payments. Recurring payments, where some fixed amount is paid on a
-regular basis are in theory possible with Taler, but they come with a
-few caveats. Specifically, recurring payments can only work if the
-Taler wallet is running and online around the desired time.
-Furthermore, given their repetitive nature they are linkable, and
-could thus be used to deanonymize the user making the recurring
-payment, for example by forcing the user offline at the time of the
-payment and observing that it does then not happen on time.  Finally,
-the Taler wallet does not work with credit and thus the user would
-have to make sure to carry a sufficient balance for the recurring
-payment to be made. Still, they can be useful, and a future version of
-the Taler wallet will likely support them. But this is not a feature
-that we are targeting for Taler 1.0. at this time</p>
-{% endtrans %}
-
-</div>
-{% endblock body_content %}
diff --git a/features.html.j2 b/features.html.j2
deleted file mode 100644
index 5d94cb1..0000000
--- a/features.html.j2
+++ /dev/null
@@ -1,198 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-
-<div class="container">
-  <div class="row">
-    <div class="col">
-    <h1>GNU Taler: Features</h1>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col">
-
-      <p>
-      {% trans %}
-      GNU Taler is a <span class="tlr">privacy-preserving</span> payment 
system.  Customers can stay
-anonymous, but merchants can not hide their income through payments with GNU 
Taler.
-This helps to <span class="tlr">avoid tax evasion and money laundering</span>.
-       {% endtrans %}
-    </p>
-
-    <p>
-       {% trans %}
-       The primary use case of GNU Taler is <span class="tlr">payments</span>; 
it is <span class="tlr">not meant as a
-store</span> of value.  Payments are always backed by an existing currency. 
-       {% endtrans %}
-    </p>
-
-    <p>
-       {% trans %}
-       Payment are made after <span class="tlr">exchanging existing 
money</span> into <em>electronic money</em> with the help of
-       an Exchange service, that is, a payment service provider for Taler.
-      {% endtrans %}
-    </p>
-
-    <p>
-       {% trans %}
-       When making a payment, customers only need a charged wallet.  A 
merchant can accept payments <span class="tlr">without
-       making their customers register</span> on the merchant's Website.
-       {% endtrans %}
-    </p>
-
-    <p>
-       {% trans %}
-       GNU Taler is <span class="tlr">immune against many types of 
fraud</span>, such as phishing of credit card information
-       or chargeback fraud.  In case of loss or theft, only the limited amount 
of money left in the wallet might be gone.
-       {% endtrans %}
-    </p>
-    </div>
-    <div class="col">
-      <img class="img-fluid" src="../images/diagram-simple.png">
-    </div>
-  </div>
-</div>
-
-<div class="container-fluid">
-<div class="container" style="border: 5px dotted black">
-  <div class="row">
-    <div class="col-lg-6">
-    <h2>{{ _("Paying with Taler") }}</h2>
-    <p>
-    {% trans %}
-    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.
-    {% endtrans %}
-    </p>
-    <p>
-    {% trans %}
-    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.
-    {% endtrans %}
-    </p>
-    <p><a href="https://demo.taler.net";>
-    {% trans %}
-    Try it yourself with the interactive demo!
-    {% endtrans %}
-    </a></p>
-    </div>
-    <div class="col-lg-6">
-    <h2>{{ _("Receiving payments with Taler") }}</h2>
-    <p>
-    {% trans %}
-    To receive Taler payments, a merchant needs a bank account
-    in the desired currency.  We provide supporting software
-    in various programming languages to make the integration painless.
-    The merchant's backend for Taler transaction processing can run
-    on the merchant's premises or be hosted by a third party.
-    {% endtrans %}
-    </p>
-    <p>
-    {% trans %}
-    Merchant integration is simple, and customers can pay for products without 
even having to register an account.
-    {% endtrans %}
-    </p>
-    <p><a href="https://docs.taler.net";>
-    {% trans %}
-    See how merchant integration works in our developer documentation!
-    {% endtrans %}
-    </a></p>
-    </div>
-  </div>
-</div>
-</div>
-
-<div class="container">
-
-  <div class="row adorn_h3_bracket">
-
-    <div class="col-lg-4">
-      <h3>{{ _("Practical") }}</h3>
-
-      <p>
-        {% trans %}
-        Taler is easy to integrate with existing Web
-        applications. Payments are cryptographically
-        secured and are confirmed within milliseconds with
-        extremely low transaction costs.
-        {% endtrans %}
-      </p>
-
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Stable") }}</h3>
-
-      <p>
-        {% trans %}
-        Taler does not introduce a new currency. Taler
-        uses a digital wallet storing coins and payment service
-        providers with escrow accounts in existing currencies.
-        Thus, Taler's cryptographic coins correspond to existing
-        currencies, such as US Dollars, Euros or even Bitcoins.
-        {% endtrans %}
-      </p>
-
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Secure") }}</h3>
-
-      <p>
-        {% trans %}
-        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.
-        {% endtrans %}
-      </p>
-
-    </div>
-  </div>
-  <div class="row adorn_h3_bracket">
-    <div class="col-lg-4">
-      <h3>{{ _("Taxable") }}</h3>
-
-      <p>
-        {% trans %}
-        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.
-        {% endtrans %}
-      </p>
-
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Private") }}</h3>
-      <p>
-        {% trans %}
-        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.
-        {% endtrans %}
-      </p>
-
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Libre") }}</h3>
-
-      <p>
-        {% trans %}
-        Taler provides protocols and reference implementations that in
-        principle enables anybody to run their own payment infrastructure,
-        be it individuals, organizations or whole countries.  Since the
-        reference implementation is a <a href="http://www.gnu.org/";>GNU</a>
-        package, it will always remain free software.
-        {% endtrans %}
-      </p>
-    </div>
-
-  </div>
-
-</div>
-
-{% endblock body_content %}
diff --git a/financial-news.html.j2 b/financial-news.html.j2
deleted file mode 100644
index 8ebe2d4..0000000
--- a/financial-news.html.j2
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("Financial News") }}</h1>
-    <div class="col-lg-12">
-      <p>
-        {% trans %}
-          This page explains (only in English) how Taler can change ongoing
-          developments in the financial industry.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-</div>
-
-<div class="container">
-  <div class="row">
-    <div class="col-lg-12">
-
-{% include "financial-news/2017-07-20.inc" %}
-{% include "financial-news/2017-04-04.inc" %}
-{% include "financial-news/2017-04-03.inc" %}
-{% include "financial-news/2016-10-26.inc" %}
-{% include "financial-news/2016-10-24.inc" %}
-{% include "financial-news/2016-10-21.inc" %}
-{% include "financial-news/2016-10-15.inc" %}
-{% include "financial-news/2016-07-23.inc" %}
-{% include "financial-news/2015-12-22.inc" %}
-{% include "financial-news/2015-04-30.inc" %}
-{% include "financial-news/2015-03-17.inc" %}
-{% include "financial-news/2014-12-06.inc" %}
-{% include "financial-news/2014-12-05.inc" %}
-{% include "financial-news/2014-11-13.inc" %}
-{% include "financial-news/2014-09-10.inc" %}
-{% include "financial-news/2013-09-15.inc" %}
-
-    </div>
-  </div>
-</div> <!-- /container -->
-
-{% endblock body_content %}
diff --git a/glossary.html.j2 b/glossary.html.j2
deleted file mode 100644
index 2736935..0000000
--- a/glossary.html.j2
+++ /dev/null
@@ -1,234 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="container">
-
-<dl>
-<dt>{{ _("auditor") }}</dt>
-  <dd>
-    {% trans %}
-      trusted third party that verifies that the `exchange` is operating 
correctly
-    {% endtrans %}
-  </dd>
-<dt>{{ _("bank") }}</dt>
-  <dd>
-    {% trans %}
-      traditional financial service provider who offers wire `transfers` 
between accounts
-    {% endtrans %}
-  </dd>
-<dt>{{ _("coin") }}</dt>
-  <dd>
-    {% trans %}
-      coins are individual token representing a certain amount of value, also 
known as the `denomination` of the coin
-    {% endtrans %}
-  </dd>
-<dt>{{ _("contract") }}</dt>
-  <dd>
-    {% trans %}
-      the proposal signed by the wallet.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("denomination") }}</dt>
-  <dd>
-    {% trans %}
-      unit of currency, specifies both the currency and the face value of a 
`coin`
-    {% endtrans %}
-  </dd>
-<dt>{{ _("denomination key") }}</dt>
-  <dd>
-    {% trans %}
-      RSA key used by the exchange to certify that a given `coin` is valid and 
of a particular `denomination`
-    {% endtrans %}
-  </dd>
-<dt>{{ _("deposit") }}</dt>
-  <dd>
-    {% trans %}
-      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`
-    {% endtrans %}
-  </dd>
-<dt>{{ _("dirty") }}</dt>
-  <dd>
-    {% trans %}
-     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
-    {% endtrans %}
-  </dd>
-<dt>{{ _("exchange") }}</dt>
-  <dd>
-    {% trans %}
-     Taler's payment service provider.  Issues electronic `coins` during 
`withdrawal` and redeems them when they are `deposited` by merchants.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("expired") }}</dt>
-  <dd>
-    {% trans %}
-     Various operations come with time limits. In particular, `denomination 
keys`
-     come with strict time limits for the various operations involving the
-     `coin` issued under the `denomination`. The most important limit is the
-     `deposit` expiration, which specifies until when wallets are allowed to
-     use the coin in `deposit` or `refreshing` operations. There is also a 
"legal"
-     expiration, which specifies how long the exchange keeps records beyond the
-     `deposit` expiration time.  This latter expiration matters for legal 
disputes
-     in courts and also creates an upper limit for `refreshing` operations on
-     special `zombie coin`.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("extension") }}</dt>
-  <dd>
-    {% trans %}
-     implementation of a `wallet` for browsers
-    {% endtrans %}
-  </dd>
-<dt>{{ _("fresh coin") }}</dt>
-  <dd>
-    {% trans %}
-     a `coin` is fresh if its public key is only known to the customer
-    {% endtrans %}
-  </dd>
-<dt>{{ _("master key") }}</dt>
-  <dd>
-    {% trans %}
-     offline key used by the exchange to certify denomination keys and message 
signing keys
-    {% endtrans %}
-  </dd>
-<dt>{{ _("message signing key") }}</dt>
-  <dd>
-    {% trans %}
-     key used by the exchange to sign online messages, other than coins
-    {% endtrans %}
-  </dd>
-<dt>{{ _("offer") }}</dt>
-  <dd>
-    {% trans %}
-     specification of the details of a transaction, specifies the payment 
obligations
-     for the customer (i.e. the amount), the deliverables of the merchant and 
other
-     related information, such as deadlines or locations; However, it lacks 
some
-     information that the backend is supposed to provide.
-     In other words, after the backend adds the missing information to the 
offer and
-     signs it, it becomes a proposal.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("owner") }}</dt>
-  <dd>
-    {% trans %}
-     a `coin` is owned by the entity that knows the private key of the coin
-    {% endtrans %}
-  </dd>
-<dt>{{ _("payback") }}</dt>
-  <dd>
-    {% trans %}
-     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`
-    {% endtrans %}
-  </dd>
-<dt>{{ _("proof") }}</dt>
-  <dd>
-    {% trans %}
-     message that cryptographically demonstrates that a particular claim is 
correct
-    {% endtrans %}
-  </dd>
-<dt>{{ _("proposal") }}</dt>
-  <dd>
-    {% trans %}
-     a sketch that has been completed and signed by the merchant backend.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("reserve") }}</dt>
-  <dd>
-    {% trans %}
-     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
-    {% endtrans %}
-  </dd>
-<dt>{{ _("refreshing") }}</dt>
-  <dd>
-    {% trans %}
-     operation by which a `dirty` `coin` is converted into one or more `fresh` 
coins
-    {% endtrans %}
-  </dd>
-<dt>{{ _("refund") }}</dt>
-  <dd>
-    {% trans %}
-     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
-    {% endtrans %}
-  </dd>
-<dt>{{ _("revocation") }}</dt>
-  <dd>
-    {% trans %}
-     exceptional operation by which an exchange withdraws a denomination from 
circulation, either because the signing key was compromised or because the 
exchange is going out of operation; unspent coins of a revoked denomination are 
subjected to payback.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("sharing") }}</dt>
-  <dd>
-    {% trans %}
-     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.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("signing key") }}</dt>
-  <dd>
-    {% trans %}
-     see message signing key.
-    {% endtrans %}
-  </dd>
-<dt>{{ _("spending") }}</dt>
-  <dd>
-    {% trans %}
-     operation by which a customer gives a merchant the right to `deposit` 
coins in return for merchandise
-    {% endtrans %}
-  </dd>
-<dt>{{ _("transfer") }}</dt>
-  <dd>
-    {% trans %}
-     method of sending funds between `bank` accounts
-    {% endtrans %}
-  </dd>
-<dt>{{ _("transaction") }}</dt>
-  <dd>
-    {% trans %}
-     method by which ownership is exclusively transferred from one entity to 
another
-    {% endtrans %}
-  </dd>
-<dt>{{ _("transaction id") }}</dt>
-  <dd>
-    {% trans %}
-     unique number by which a merchant identifies a `transaction`
-    {% endtrans %}
-  </dd>
-<dt>{{ _("wallet") }}</dt>
-  <dd>
-    {% trans %}
-     software running on a customer's computer; withdraws, stores and spends 
coins
-    {% endtrans %}
-  </dd>
-<dt>{{ _("wire transfer") }}</dt>
-  <dd>
-    {% trans %}
-     see `transfer`
-    {% endtrans %}
-  </dd>
-<dt>{{ _("wire transfer identifier") }}</dt>
-  <dd>
-    {% trans %}
-     subject of a wire `transfer`; usually a random string to uniquely 
identify the `transfer`
-    {% endtrans %}
-  </dd>
-<dt>{{ _("withdrawal") }}</dt>
-  <dd>
-    {% trans %}
-     operation by which a `wallet` can convert funds from a reserve to fresh 
coins
-    {% endtrans %}
-  </dd>
-<dt>{{ _("zombie coin") }}</dt>
-  <dd>
-    {% trans %}
-     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
-     `refreshing` was subject to `revocation`, resulting in the `fresh` coin
-     from the refresh operation being subjected to `payback`; as a result,
-     the formerly `dirty` coin is eligible for
-     `refreshing`, even if the dirty coin's denomination is `expired` for
-     `deposit` operations (but not if it is expired past the legal
-     data retention requirement).
-    {% endtrans %}
-  </dd>
-</dt>
-</div>
-{% endblock body_content %}
diff --git a/governments.html.j2 b/governments.html.j2
deleted file mode 100644
index be7ce52..0000000
--- a/governments.html.j2
+++ /dev/null
@@ -1,188 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="jumbotron">
-  <div class="container text-center">
-  <h1>{{ _("Advantages for Governments") }}</h1>
-    <p>
-        {% trans %}
-             Taler provides accountability to ensure business operate
-             legally, while also respecting civil liberties of
-             citizens.  Taler is a payment system based on
-             open standards and free software.  Taler needs
-             governments as they set a financial framework and act as
-             trusted regulators.  Taler contributes to digital
-             sovereignty in the critical financial infrastructure.
-         {% endtrans %}
-      </p>
-  </div>
-</div>
-
-<!-- Example row of columns -->
-<div class="container adorn_h3_bracket">
- <div class="row">
-  <div class="col-lg-6">
-    <h3>{{ _("Taxable") }}</h3>
-
-    <p>
-        {% trans %}
-             Taler was built with the goal of fighting corruption and
-             supporting taxation.  With Taler, the receiver of any
-             form of payment is easily identified by the government,
-             and the merchant can be compelled to provide the contract
-             that was accepted by the customer.  Governments can use
-             this data to tax businesses and individuals based on
-             their income, making tax evasion and black markets less
-             viable.
-        {% endtrans %}
-      </p>
-
-    <p>
-        {% trans %}
-             Thus, despite offering anonymity for citizens spending
-             digital cash to buy goods and services, Taler also
-             ensures that the state can observe incoming funds. This
-             can be used to ensure businesses engage only in legal
-             activities, and do not evade income tax, sales tax or
-             value-added tax.  However, this observational capability
-             does not extend to the immediate personal domain.  In
-             particular, monitoring does not cover shared access to
-             funds with trusted friends and family, or synchronizing
-             wallets across multiple devices.
-        {% endtrans %}
-      </p>
-
-    </p>
-  </div>
-  <div class="col-lg-6">
-    <h3>{{ _("Secure") }}</h3>
-
-    <p>
-        {% trans %}
-             Taler's payments are cryptographically secured. Thus,
-             customers, merchants and the Taler payment service provider
-             (the exchange) can mathematically
-             demonstrate their lawful behavior in court in case of
-             disputes. Financial damages are strictly limited,
-             improving economic security for individuals, merchants,
-             the exchange and the state.
-        {% endtrans %}
-      </p>
-
-    <p>
-        {% trans %}
-             As a payment service provider, the Taler exchange is
-             subject to financial regulation. Financial regulation and
-             regular audits are critical to establish trust. In
-             particular, the Taler design mandates the existence of an
-             independent auditor who checks cryptographic proofs that
-             accumulate at the exchange to ensure that the escrow
-             account is managed honestly.  This ensures that the
-             exchange does not threaten the economy due to fraud.
-        {% endtrans %}
-      </p>
-  </div>
- </div>
- <div class="row">
-  <div class="col-lg-6">
-    <h3>{{ _("Libre") }}</h3>
-
-    <p>
-        {% trans %}
-             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.
-        {% endtrans %}
-     </p>
-
-  </div>
-  <div class="col-lg-6">
-    <h3>{{ _("Efficient") }}</h3>
-
-    <p>
-        {% trans %}
-             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.
-        {% endtrans %}
-    </p>
-  </div>
- </div>
-</div>
-
-
-
-<div class="container-fluid c_acronym">
-  <div class="container">
-    <h2 id="documentation">{{ _("Taler and regulation") }}</h2>
-    <dl>
-      <dt>{{ _("Anti money laundering (AML)")}}</dt>
-      <dd>{{ _("With Taler, income is visible and can be tied to the contract 
signed by both parties.") }}</li>
-      <dt>{{ _("Know your customer (KYC)")}}</dt>
-      <dd>{{ _("In Taler, payer and payee are known by their bank accounts 
when withdrawing or depositing coins respectively") }}</dd>
-      <dt>{{ _("General Data Protection Regulation (GDPR)")}}</dt>
-      <dd>{{ _("Taler cryptographically protects citizen's privacy, and by 
design implements data minimization and privacy by default.") }}</dd>
-      <dt>{{ _("Payment Services Directive (PSD2)")}}</dt>
-      <dd>{{ _("Taler provides an open standard with public APIs contributing 
to a competitive banking sector.") }}</dt>
-    </dl>
-  </div>
-</div>
-
-
-<div class="container">
-<div class="col-lg-12">
-  <h2 id="overview">{{ _("Taler provides privacy and accountability") }}</h2>
-
-  <p>
-      {% trans %}
-           Taler assumes governments can observe traditional wire transfers
-           entering and leaving the Taler payment system.  Starting with the
-           wire transfers, governments can obtain:
-      {% endtrans %}
-      <ul>
-
-      <li>
-         {% trans %}
-                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.
-         {% endtrans %}
-       </li>
-
-       <li>
-         {% trans %}
-                 The income received by any merchant via the Taler
-                 system.
-         {% endtrans %}
-      </li>
-
-       <li>
-          {% trans %}
-
-                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.
-        {% endtrans %}
-       </li>
-
-       <li>
-         {% trans %}
-                 The amounts of digital coins legitimately withdrawn
-                 by customers from the exchange, the value of
-                 non-redeemed digital coins in customer's wallets, the
-                 value and corresponding wire details of deposit
-                 operations performed by merchants with the exchange,
-                 and the income of the exchange from transaction fees.
-        {% endtrans %}
-       </li>
-    </ul>
-  </p>
-</div>
-</div>
-
-{% endblock body_content %}
diff --git a/gsoc-codeless.html.j2 b/gsoc-codeless.html.j2
deleted file mode 100644
index 1ffce88..0000000
--- a/gsoc-codeless.html.j2
+++ /dev/null
@@ -1,137 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("GSoC 2018: Codeless Payment") }}</h1>
-    <h6>{{ _("Implemented by Shivam Kohli as part of GSoC 2018 under the 
mentoring and guidance of Florian Dold.") }}</h6>
-  </div>
-</div>
-
-<div class="container">
-  <div class="col-lg-12">
-    <h2 id="overview">{{ _("Overview") }}</h2>
-    <p>
-     {% trans %}
-        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 payment buttons are configured. Registered merchants can 
manage their inventory and simultaneously create a 'Buy Now' button for a 
specific product. This code can be directly copy pasted on the seller's 
frontend and can be used for 'Pay with Taler'.
-     {% endtrans %}
-   </p>
-  </div>
-</div>
-
-<div class="container">
- <div class="col-lg-6">
-    <h2 id="overview">{{ _("Use Cases") }}</h2>
-    <p>{{ _("The various use cases and features of codeless payment are:") 
}}</p>
-    <p>
-      <ul>
-        <li>
-             {% trans %}
-                  The primary use case is the registration of the merchant. 
The codeless payment backend provides a secure django authenticated login to 
the merchant. The registered merchant can add inventory (both digital as well 
as physical) in their stocks. They can manage inventory and simultaneously 
create a 'Buy Now' button for the product. The merchant also monitors the 
orders placed and updates the status of the order which helps in shipment 
tracking.
-             {% endtrans %}
-        </li>
-        <li>
-             {% trans %}
-                  A merchant has the flexibility to add two types of inventory 
as follows:
-                  {% endtrans %}
-                  <ul>
-                    <li>
-             {% trans %}
-             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.
-             {% endtrans %}
-             </li>
-                    <li>
-             {% trans %}
-             The merchant can add any physical inventory available in his 
stocks. While adding these inventory, the seller is prompted to add minimum 
quantity of product that is required to be maintained in the stock. Whenever 
the stocks run below this limit the seller would be notified (currently this 
feature has not been added but soon email notification would be added).
-             {% endtrans %}
-             </li>
-                  </ul>
-        </li>
-        <li>
-             {% trans %}
-                  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 to codeless payment backend and eventually redirected to the payment 
page. After successful payment, the buyer can also track their shipment for 
physical products or view the digital version hosted by the codeless payment 
frontend.
-             {% endtrans %}
-        </li>
-        <li>
-             {% trans %}
-                  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 the payment the backend communicates with merchant backend 
api. After successful payment, the users are redirected to the fulfilment page.
-             {% endtrans %}
-        </li>
-      </ul>
-    </p>
-    <h2 id="overview">{{ _("Dynamic Merchant Instance") }}</h2>
-      <p>The documentation for the API to dynamically manage merchant instance 
can be found <a 
href="https://docs.taler.net/api/api-merchant.html#dynamic-merchant-instance";>here</a>.</p>
- </div>
-  <div class="col-lg-6">
-    <img src="{{ url('images/UseCaseDiagram.png') }}" alt="{{ _("Use Case 
Diagram")}}" style="float: right; margin: 5px 5px 5px 5px;" width="100%">
-  </div>
-</div> <!-- /container -->
-
-<div class="container-fluid c_acronym">
-  <div class="container">
-    <h2 id="documentation">{{ _("Link to the contributions made") }}</h2>
-    <p>
-      </p><ul>
-        <li>{{ _("Codeless Payment Backend") }}
-          (<a href="https://git.taler.net/codeless.git/";>Link</a>)</li>
-        <li>{{ _("Documentation to dynamically manage Merchant Instances") }}
-          (<a 
href="https://git.taler.net/api.git/commit/?id=53b3fbc3a882975b4ca8ef70d7ae256c9c17a23e";>Link</a>)</li>
-      </ul>
-    <p></p>
-  </div>
-</div>
-
-<div class="container">
- <div class="col-lg-12">
-    <h2 id="overview">{{ _("Future Work") }}</h2>
-
-    <p>{{ _("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. But as per the discussion and the scope of this project, there are 
various features that will be soon added in the Codeless Merchant Backend. The 
list of future work is as follows:") }}</p>
-    <p>
-      <ul>
-
-        <li>
-             {% trans %}
-                  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 is currently taken from the merchant(specific to each product) but 
no such notification system is designed.
-             {% endtrans %}
-        </li>
-
-        <li>
-             {% trans %}
-                  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. There would be an additional user interface part in the codeless 
payment service where a logged-in merchant can generate an API key. This API 
key can be used to access the functionality of the merchant backend in a 
controlled way. After requesting an API key, the page would display the 
generated key and a base URL for the  [...]
-             {% endtrans %}
-        </li>
-
-        <li>
-             {% trans %}
-                  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 API access for sellers, this is a useful feature. The codeless 
payment service then can also double as a hosting service for merchants.
-             {% endtrans %}
-        </li>
-
-        <li>
-             {% trans %}
-                  To add various analytics for the merchant. Various analysis 
could be performed on the orders placed for the respective merchant. Some of 
the analysis that can be performed are displaying the most frequently purchased 
product, some insights about the shipment tracking, analysis of products based 
on delivery location, etc. For this part, dicussions and some more research 
have to be done before proceeding to the implementation.
-             {% endtrans %}
-        </li>
-
-      </ul>
-    </p>
- </div>
-</div> <!-- /container -->
-
-<div class="container">
-  <div class="row">
-  <h2 id="documentation">{{ _("Screenshots") }}</h2>
-    <div class="col-lg-4">
-      <h3>Home page</h3>
-      <img src="{{ url('images/home.png') }}" height="240" align="middle">
-    </div>
-    <div class="col-lg-4">
-      <h3>Product page</h3>
-      <img src="{{ url('images/product.png') }}" height="240" align="middle">
-    </div>
-    <div class="col-lg-4">
-      <h3>Shipment Tracking</h3>
-      <img src="{{ url('images/shipment.png') }}" height="240" align="middle">
-    </div>
-  </div>
-</div>
-{% endblock body_content %}
diff --git a/index.html.j2 b/index.html.j2
deleted file mode 100644
index 0c8124c..0000000
--- a/index.html.j2
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="container">
-
-  <div class="row justify-content-center">
-    <div class="col-8">
-     <img src="../images/logo-2018-dold.svg">
-    </div>
-  </div>
-
-  <div class="row justify-content-center text-center">
-    <div class="col-8">
-      <a href="news.html">2018-04: GNU Taler v0.5.0 released</a>
-    </div>
-  </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row">
-    <div class="col">
-      <h2>We provide a payment system that makes <span 
class="tlr">privacy-friendly</span> online transactions
-          <span class="tlr">fast and easy</span>.</h2>
-      <ul class="checklist">
-        <li><img class="checkmark" src="../images/checkmark.png">
-          Payments without registration</li>
-        <li><img class="checkmark" src="../images/checkmark.png">
-          Data protection by default</li>
-        <li><img class="checkmark" src="../images/checkmark.png">
-          Fraud eliminated by design</li>
-        <li><img class="checkmark" src="../images/checkmark.png">
-          Not a new currency!</li>
-        <li><img class="checkmark" src="../images/checkmark.png">
-          Empowers communities to run their own payment infrastructure</li>
-      </ul>
-      <form action="https://demo.taler.net/"; style="display:inline;"><button 
type="submit" class="btn btn-primary">Try Demo!</button></form>
-      <form action="https://docs.taler.net/"; style="display:inline;"><button 
type="submit" class="btn btn-secondary">Read Docs</button></form>
-    </div>
-    <div class="col align-self-center">
-      <img class="img-fluid" src="../images/stock1s.jpg" style="border-radius: 
1cm;" />
-    </div>
-  </div>
-</div>
-
-{% endblock body_content %}
diff --git a/investors.html.j2 b/investors.html.j2
deleted file mode 100644
index 0cce397..0000000
--- a/investors.html.j2
+++ /dev/null
@@ -1,143 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("Invest in Taler!") }}</h1>
-    <div class="col-lg-12">
-      <p>
-        {% trans %}
-          We have created a company, Taler Systems SA in
-          Luxembourg.<br>
-          Please contact <tt>address@hidden</tt>
-          if you want to invest in Taler.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-</div>
-
-
-<div class="container adorn_h3_bracket">
- <div class="row">
-  <div class="col-lg-4">
-    <h3>{{ _("The Team") }}</h3>
-
-    <p>
-       {% trans %}
-             Our <a href="about.html">team</a> combines world-class business 
leaders,
-             cryptographers, software engineers, civil-rights
-             activists and academics. We are unified by a vision
-             of how payments should work and the goal of
-             imposing this vision upon the world.
-        {% endtrans %}
-    </p>
-
-    <p>
-        {% trans %}
-             We are currently supported by <a 
href="http://www.inria.fr/";>Inria</a>, the French
-             national institute for research in informatics and
-             automation, and the <a 
href="https://renewablefreedom.org/";>Renewable Freedom Foundation</a>.
-        {% endtrans %}
-    </p>
-  </div>
-  <div class="col-lg-4">
-    <h3>{{ _("The Technology") }}</h3>
-
-    <p>
-        {% trans %}
-             All transactions in Taler are secured using <a 
href="bibliography.html">modern
-             cryptography</a> and trust in all parties is
-             minimized. Financial damage is bounded (for
-             customers, merchants and the exchange) even in the
-             case that systems are compromised and private keys
-             are stolen.  Databases can be audited for
-             consistency, resulting in either the detection of
-             compromised systems or the demonstration that
-             participants were honest. Actual transaction costs
-             are fractions of a cent.
-        {% endtrans %}
-     </p>
-  </div>
-  <div class="col-lg-4">
-    <h3>{{ _("The Business") }}</h3>
-
-    <p>
-        {% trans %}
-             The scalable business model for Taler is the operation
-             of the payment service provider, which converts money from
-             traditional payment systems (MasterCard, SEPA, UPI,
-             Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous
-             electronic coins in the same currency. The customer
-             can then redeem the electronic coins at a merchant,
-             who can exchange them for money represented using
-             traditional payment systems at the exchange.  The
-             exchange charges fees to facilitate the transactions.
-       {% endtrans %}
-    </p>
-  </div>
- </div>
-</div>
-
-
-<div class="container-fluid c_acronym">
- <div class="container">
-   <h2>{{ _("The Business Case") }}</h2>
-  <div class="row">
-   <div class="col-lg-4">
-     <a href="{{ url('presentations/investors2018.pdf') }}"><img border=0 
class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') 
}}"><br><p align="center">{{ _("Download") }}</p></a>
-
-     <p>
-       {% trans %}
-         Our <a href="financial-news.html">financial news</a> page
-         explains in English how Taler can impact current developments in
-         the global payment market.
-       {% endtrans %}
-     </p>
-   </div>
-   <div class="col-lg-4" id="canvas-left" style="display:none">
-     <canvas id="the-canvas-left"></canvas>
-   </div>
-   <div class="col-lg-4" id="canvas-right" style="display:none">
-    <canvas id="the-canvas-right"></canvas>
-   </div>
-   <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') 
}}"></script>
-   <script type="text/javascript" src="{{ url('dist/js/pdf-view.js') 
}}"></script>
-  </div>
- </div>
-</div>
-
-
-<div class="container">
- <div class="row">
-  <div class="col-lg-12">
-   <h2 id="overview">{{ _("Running a Taler payment service operator") }}</h2>
-
-  <p>
-    {% trans %}
-       The payment service operator runs the <em>Taler exchange</em>.
-       The exchange charges <b>transaction fees</b> to customers or merchants.
-       Its operational expenses are from wire transfers with the banking
-       system and the operation of the computing infrastructure.
-    {% endtrans %}
-  </p>
-
-  <p>
-    <ul>
-    <li>{{ _("Cryptographic operations, bandwidth and storage costs are less 
than 0.01 cent per transaction.") }}</li>
-
-    <li>{{ _("Multiple Taler transactions can be aggregated into larger wire 
transfers to merchants to minimize wire transfer costs.") }}</li>
-
-    <li>{{ _("Protocol allows the exchange to charge fees for any expensive 
operation (withdraw, deposit, refresh, refund or aggregated wire transfers).") 
}}</li>
-
-    <li>{{ _("Partnership with banks establishes consumer trust.") }}</li>
-
-    <li>{{ _("Partnership with free software community enables rapid 
deployment.") }}</li>
-
-    </ul>
-  </div>
- </div>
-</div>
-
-
-{% endblock body_content %}
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 66d0da8..0df4b66 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,71 +2,118 @@ 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-03 12:13+0000\n"
 "PO-Revision-Date: 2017-06-02 09:46+0100\n"
 "Last-Translator: Stefan Kügel <address@hidden>\n"
 "Language-Team: de <address@hidden, address@hidden>\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.4.0\n"
 
-#: architecture.html.j2:6
+#: common/base.j2:5
+msgid "GNU Taler"
+msgstr "Das Taler-Bezahlsystem"
+
+#: common/base.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
+
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "Das Taler-Team"
+
+#: common/footer.j2.inc:16
+msgid "Contact"
+msgstr ""
+
+#: common/footer.j2.inc:21
+msgid "FAQ"
+msgstr ""
+
+#: common/footer.j2.inc:26
+#, fuzzy
+#| msgid "GNU Taler Bibliography"
+msgid "Bibliography"
+msgstr "Bibliografie von GNU Taler"
+
+#: 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 template/developers.html.j2:66
+msgid "and"
+msgstr "und"
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://";
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"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 "Systemarchitektur von Taler"
 
-#: bibliography.html.j2:4
+#: template/bibliography.html.j2:4
 msgid "GNU Taler Bibliography"
 msgstr "Bibliografie von 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 "von"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
-#: bibliography.html.j2:36 common/footer.j2.inc:32
-msgid "and"
-msgstr "und"
-
-#: bibliography.html.j2:37
+#: template/bibliography.html.j2:37
 msgid "available upon request"
 msgstr "erhältlich auf Anfrage"
 
-#: contact.html.j2:6
+#: template/contact.html.j2:6
 msgid "Contact information"
 msgstr "Kontakt"
 
-#: contact.html.j2:13
+#: template/contact.html.j2:13
 msgid "The mailing list"
 msgstr "Die Mailing-Liste"
 
-#: contact.html.j2:15
-#, fuzzy
-#| msgid ""
-#| "An archived, public mailing list for GNU Taler is\n"
-#| "hosted at\n"
-#| "<a href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.";
-#| "gnu.org/mailman/listinfo/taler</a>.  You can send messages to the list\n"
-#| "at <a href=\"mailto:address@hidden\";>address@hidden</a>.\n"
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
+#: template/contact.html.j2:15
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
 msgstr ""
-"Eine öffentliche Mailing-Liste wird archiviert bereitgestellt auf <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. Nachrichten an die Liste sendet man an <a href="
-"\"mailto:address@hidden\";>address@hidden</a>.\n"
 
-#: contact.html.j2:25
+#: template/contact.html.j2:29
 msgid "Contacting individuals"
 msgstr "Mitglieder kontaktieren"
 
-#: contact.html.j2:27
+#: template/contact.html.j2:31
 #, fuzzy
 #| msgid ""
 #| "Team members are generally reachable at\n"
@@ -77,23 +124,31 @@ msgid ""
 "us support receiving GnuPG encrypted e-mails."
 msgstr ""
 "Die Mitglieder des Taler-Teams sind erreichbar mit einer E-Mail an "
-"<tt>address@hidden</tt>, die GnuPG-verschlüsselt empfangen wird. "
+"<tt>address@hidden</tt>, die GnuPG-verschlüsselt empfangen werden kann. "
 
-#: contact.html.j2:36
+#: template/contact.html.j2:40
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:42
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr "Funktionserweiterungen, Fehler und Bugs melden"
 
-#: contact.html.j2:48
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
 #, fuzzy
 #| msgid ""
 #| "We track open feature requests and bugs in our\n"
@@ -102,20 +157,19 @@ msgstr "Funktionserweiterungen, Fehler und Bugs melden"
 #| "You can also report bugs or feature requests to the\n"
 #| "mailing list.\n"
 msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
 msgstr ""
 "Wir verfolgen Bugs und Anfragen zu erweiterten Funktionalitäten zusammen mit "
 "dem GNU-Project auf <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>.\n"
 " Bugs oder Funktionsanfragen können auch an die Mailing-Liste gesendet "
 "werden."
 
-#: contact.html.j2:59
+#: template/contact.html.j2:65
 msgid "Executive team"
 msgstr "Leitungsteam"
 
-#: contact.html.j2:61
+#: template/contact.html.j2:67
 #, fuzzy
 #| msgid ""
 #| "For non-technical commercial requests, please contact\n"
@@ -127,45 +181,50 @@ msgstr ""
 "Für alle nicht-technischen Anfragen bitten wir <tt>ceo AT taler.net</tt> "
 "anzumailen.\n"
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr ""
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:9
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the"
+msgstr ""
+
+#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
+msgid "of the GNUnet and GNU Taler projects is satisfied."
 msgstr ""
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:24
 msgid ""
-"<p>The agreements ensure that the code will continue to be made available "
-"under free software licenses, but gives developers the freedom to move code "
+"The agreements ensure that the code will continue to be made available under "
+"free software licenses, but gives developers the freedom to move code "
 "between GNUnet and GNU Taler without worrying about licenses and the company "
 "the ability to dual-license (for example, so that we can distribute via App-"
-"stores that are hostile to free software).</p>"
+"stores that are hostile to free software)."
 msgstr ""
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:34
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do not require "
+"Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
-"sufficient, but snail mail is preferred.</p>"
+"sufficient, but snail mail is preferred."
 msgstr ""
 
-#: developers.html.j2:5
+#: template/developers.html.j2:5
 msgid "Taler for developers"
 msgstr "Taler für Entwickler"
 
-#: developers.html.j2:12 merchants.html.j2:58
+#: template/developers.html.j2:12 template/merchants.html.j2:58
 msgid "Free"
 msgstr "Frei"
 
-#: developers.html.j2:15
+#: template/developers.html.j2:15
 #, fuzzy
 #| msgid ""
 #| "GNU Taler is free software implementing an open\n"
@@ -192,17 +251,27 @@ msgstr ""
 "Taler ist freie Software mit einem offenen Protokoll. Alle Programmierer "
 "sind dazu eingeladen, unseren Referenzcode in ihre Anwendungen aufzunehmen. "
 "Verschiedene Taler-Komponenten sind unter verschiedenen Lizenzformen "
-"verfügbar. Für die Taler-Wechselstube (den \"Exchange\") dient Affero "
-"GPLv3+, LGPLv3+ für den Referenzcode der Integration in Handelsplattformen, "
-"GPLv3+-Lizenzen gelten für Geldbörsen (\"Wallets\") und Kundeninteraktions-"
+"verfügbar. Für die Taler-Wechselstube (den \"Exchange\") dient Affero GPLv3"
+"+, LGPLv3+ für den Referenzcode der Integration in Handelsplattformen, GPLv3"
+"+-Lizenzen gelten für Geldbörsen (\"Wallets\") und Kundeninteraktions-"
 "Software. Wir heißen alle konstruktiven Vorschläge willkommen, die Taler-"
 "Komponenten in eigene Anwendungen zu integrieren."
 
-#: developers.html.j2:32
+#: template/developers.html.j2:32
 msgid "RESTful"
 msgstr "RESTful-basiert"
 
-#: developers.html.j2:35
+#: template/developers.html.j2:35
+#, fuzzy
+#| 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 HTTP or HTTPS. Taler's security does not depend upon the use of "
+#| "HTTPS, but obviously merchants may choose to offer HTTPS for consistency "
+#| "and because it generally is better for privacy compared to HTTP. Taler "
+#| "uses JSON to encode structure data, making it easy to integrate Taler "
+#| "with existing Web applications. Taler's protocol is documented in detail "
+#| "at <a href=\"https://docs.taler.net/\";>docs.taler.net</a>."
 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 "
@@ -210,8 +279,7 @@ msgid ""
 "obviously merchants may choose to offer HTTPS for consistency and because it "
 "generally is better for privacy compared to HTTP. Taler uses JSON to encode "
 "structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at <a href=\"https://";
-"docs.taler.net/\">docs.taler.net</a>."
+"applications. Taler's protocol is documented in detail at"
 msgstr ""
 "Taler als Bezahlsystem benutzt ein RESTful-Protokoll über HTTP oder HTTPS-"
 "Verbindungen, um auch in eingeschränkten Netzwerkumgebungen sichere "
@@ -225,11 +293,15 @@ msgstr ""
 "Dokumentation des Taler-Protokolls befindet sich auf <a href=\"https://docs.";
 "taler.net/\">docs.taler.net</a>."
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
 msgid "Code"
 msgstr "Code"
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
+msgid "Taler is currently primarily developed by a research team at"
+msgstr ""
+
+#: template/developers.html.j2:70
 #, fuzzy
 #| msgid ""
 #| "Taler is currently primarily developed by a\n"
@@ -242,13 +314,10 @@ msgstr "Code"
 #| "repositories can be found in\n"
 #| "our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
 msgid ""
-"Taler is currently primarily developed by a research team at <a href="
-"\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
-"\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
-"repositories can be cloned using the Git and HTTP access methods against "
-"<tt>git.taler.net</tt> with the name of the respective repository. A list of "
-"repositories can be found in our <a href=\"https://git.taler.net/\";>GitWeb</"
-"a>."
+"However, contributions from anyone are welcome. Our Git repositories can be "
+"cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> "
+"with the name of the respective repository. A list of repositories can be "
+"found in our"
 msgstr ""
 "Taler wird hauptsächlich entwickelt von einem Forscherteam bei <a href="
 "\"http://www.inria.fr/\";>Inria</a> und <a href=\"https://gnunet.org/";
@@ -257,27 +326,45 @@ msgstr ""
 "<tt>git.taler.net</tt> geklont werden. Eine Liste der Repositories befindet "
 "sich auf unserem <a href=\"https://git.taler.net/\";>GitWeb</a>."
 
-#: developers.html.j2:75
+#: template/developers.html.j2:80
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: developers.html.j2:78
-msgid ""
-"In addition to this website, the <a href=\"https://git.taler.net/";
-"\">documented code</a> and the <a href=\"https://docs.taler.net/\";>API "
-"documentation</a>. Technical papers can be found in our <a href="
-"\"bibliography.html\">bibliography</a>."
+#: template/developers.html.j2:83
+msgid "In addition to this website, the"
+msgstr ""
+
+#: template/developers.html.j2:86
+msgid "documented code"
 msgstr ""
-"Neben dieser Webseite bestehen die <a href=\"https://git.taler.net/\";>Code-"
-"Dokumentation</a>, die <a href=\"https://docs.taler.net";
-"\">Entwicklerdokumentation</a>.  Wissenschaftliche Literatur findet man in "
-"der <a href=\"bibliography.html\">Bibliographie</a>."
 
-#: developers.html.j2:88
+#: template/developers.html.j2:87
+#, fuzzy
+#| msgid "and"
+msgid "and the"
+msgstr "und"
+
+#: template/developers.html.j2:90
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentation"
+
+#: template/developers.html.j2:91
+msgid "Technical papers can be found in our"
+msgstr ""
+
+#: template/developers.html.j2:94
+#, fuzzy
+#| msgid "GNU Taler Bibliography"
+msgid "bibliography"
+msgstr "Bibliografie von GNU Taler"
+
+#: template/developers.html.j2:98
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:101
 #, fuzzy
 #| msgid ""
 #| "We have a mailing list for developer discussions.\n"
@@ -286,40 +373,44 @@ msgstr "Diskussion"
 #| "org/mailman/listinfo/taler</a>.\n"
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
-"read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
-"taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"read the list archive at"
 msgstr ""
 "Zum Austausch unter Entwicklern haben wir eine Mailingliste. Um sich "
 "einzutragen oder das Listenarchiv zu lesen besuche man <a href=\"http://";
 "lists.gnu.org/mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/";
 "taler</a>."
 
-#: developers.html.j2:101
+#: template/developers.html.j2:111
 msgid "Regression Testing"
 msgstr "Regressiontests mit Buildbot"
 
-#: developers.html.j2:104
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
 #, fuzzy
 #| msgid ""
 #| "We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
 #| "automation tests to detect regressions and check for\n"
 #| "portability at <a\n"
 #| "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
-msgid ""
-"We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests to "
-"detect regressions and check for portability at <a href=\"https://buildbot.";
-"taler.net/\">buildbot.taler.net</a>."
+msgid "automation tests to detect regressions and check for portability at"
 msgstr ""
 "Unter <a href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a> "
 "befinden sich Ergebnisse der Testumgebung <a href=\"https://buildbot.net/";
 "\">Buildbot</a>, um Fehler nach Modifikationen aufzeigen zu können und die "
 "Portabilität des Codes zu gewährleisten."
 
-#: developers.html.j2:113
+#: template/developers.html.j2:126
 msgid "Code Coverage Analysis"
 msgstr "Testabdeckung"
 
-#: developers.html.j2:116
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
 #, fuzzy
 #| msgid ""
 #| "We use\n"
@@ -327,28 +418,25 @@ msgstr "Testabdeckung"
 #| "to analyze the code coverage of our tests, the\n"
 #| "results are available\n"
 #| "at <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at <a href="
-"\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+msgid "to analyze the code coverage of our tests, the results are available at"
 msgstr ""
 "Wir verwenden <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</"
 "a>, um die Testabdeckung unserer Funktionstests zu analysieren, die "
 "Ergebnisse sind auf <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>."
 
-#: developers.html.j2:131
+#: template/developers.html.j2:146
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:149 template/investors.html.j2:93
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:165
 msgid "Taler system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:168
 #, fuzzy
 #| msgid ""
 #| "The Taler system consists of protocols executed among\n"
@@ -362,13 +450,13 @@ msgstr ""
 "Das Taler-Bezahlsystem verwendet Protokolle für den Geldfluss zwischen den "
 "Beteiligten. Die grundlegenden Transaktionen sind in der Grafik dargestellt:"
 
-#: developers.html.j2:162
+#: template/developers.html.j2:175
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:178
 #, fuzzy
 #| msgid ""
 #| "A customer instructs his <b>bank</b> to\n"
@@ -390,7 +478,7 @@ msgstr ""
 "Überweisung nennen sie eine Transaktionsnummer ihrer Taler-Geldbörse. Damit "
 "bilden sie eine Münzen-Reserve bei der Taler-Wechselstube."
 
-#: developers.html.j2:177
+#: template/developers.html.j2:190
 #, fuzzy
 #| msgid ""
 #| "Once the exchange has received the wire\n"
@@ -426,7 +514,7 @@ msgstr ""
 "nicht mehr nachvollzogen werden kann, welcher Käufer von welchem Verkäufer "
 "welche Güter erwarb. Auch die Güter selbst bleiben unbekannt."
 
-#: developers.html.j2:195
+#: template/developers.html.j2:208
 #, fuzzy
 #| msgid ""
 #| "Once the customer has the digital coins in his\n"
@@ -472,7 +560,7 @@ msgstr ""
 "beliebige Teilbetrag von Münzen aus der Taler-Geldbörse verwendet werden, "
 "das System sorgt für das korrekte Wechselgeld."
 
-#: developers.html.j2:217
+#: template/developers.html.j2:230
 #, fuzzy
 #| msgid ""
 #| "Merchants receiving digital\n"
@@ -515,7 +603,7 @@ msgstr ""
 "auf diese Weise den Staat, ausnahmslos alle Verkäufer zu ihren "
 "Steuerzahlungen zu verpflichten und von illegalen Geschäften abzuhalten."
 
-#: developers.html.j2:240
+#: template/developers.html.j2:253
 #, fuzzy
 #| msgid ""
 #| "Finally, the exchange transfers funds\n"
@@ -542,7 +630,7 @@ msgstr ""
 "Möglichkeit, ihre angemeldeten Forderungen und deren Überweisung an die "
 "Geschäftsbank bei der Taler-Wechselstube abzufragen."
 
-#: developers.html.j2:254
+#: template/developers.html.j2:267
 #, fuzzy
 #| msgid ""
 #| "Most importantly, the exchange keeps\n"
@@ -572,7 +660,7 @@ msgstr ""
 "können. Dabei vergleichen sie die Übereinstimmung der im Umlauf befindlichen "
 "Summe von digitalen Münzen mit den Überweisungen an Geschäftsbanken."
 
-#: developers.html.j2:269
+#: template/developers.html.j2:282
 #, fuzzy
 #| msgid ""
 #| "Without the auditor, the exchange operators\n"
@@ -599,99 +687,150 @@ msgstr ""
 "digitalen Münzen auf dem jeweiligen Computer zum Zeitpunkt der "
 "Schadensentstehung."
 
-#: docs.html.j2:37
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "Taler in den Medien"
+
+#: template/docs.html.j2:13
+msgid ""
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
+msgstr ""
+
+#: template/docs.html.j2:27
+msgid "Components"
 msgstr ""
 
-#: docs.html.j2:38
-msgid "Also available as"
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:40
+msgid "Tutorial and manual for operating a merchant. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:52
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:62
+msgid "Exchange"
+msgstr ""
+
+#: template/docs.html.j2:64
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:74
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:76
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:92
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:94
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "Die Mailing-Liste"
+
+#: template/docs.html.j2:156
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "Die Mailing-Liste"
 
-#: docs.html.j2:152
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:194
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:196
 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 "In welchem Zusammenhang steht Taler mit Bitcoin oder Blockchains?"
 
-#: faq.html.j2:6
+#: template/faq.html.j2:8
 #, fuzzy
 #| msgid ""
 #| "<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
 #| "Taler is not based on proof-of-work or any other distributed consensus\n"
 #| "mechanism.  Instead Taler is based on blind signatures.</p>\n"
 msgid ""
-"<p>Taler does not require any Blockchain technology, and is also not based "
-"on proof-of-work or any other distributed consensus mechanism. Instead, "
-"Taler is based on blind signatures. However, it is theoretically possible to "
-"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
+"Taler does not require any Blockchain technology, and is also not based on "
+"proof-of-work or any other distributed consensus mechanism. Instead, Taler "
+"is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 "Taler verwendet keine Blockchain-Technologie oder Bitcoin selbst. Auch auf "
 "elektronisches gegenseitiges Beglaubigen in einem Web-of-trust- oder proof-"
 "of-work-Verfahren verzichtet Taler. Stattdessen setzt Taler auf Verfahren "
 "mit blinden Signaturen."
 
-#: faq.html.j2:13
+#: template/faq.html.j2:18
 #, fuzzy
 #| msgid ""
 #| "<p>It would be possible, however, to withdraw coins denominated in\n"
@@ -699,39 +838,39 @@ msgstr ""
 #| "would give some benefits over plain Bitcoin, such as instant\n"
 #| "confirmation times.</p>\n"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "Es ist jedoch möglich, Bitcoin als Münzen in eine Taler-Geldbörse mittels "
 "einer dafür geeigneten Wechselstube zu überweisen. Dies brächte gegenüber "
 "Bitcoin sogar den Vorteil von sofortigen Zahlungsbestätigungen."
 
-#: faq.html.j2:20
+#: template/faq.html.j2:26
 msgid "Where is the balance in my wallet stored?"
 msgstr "Wo ist der Münzbestand in meiner Taler-Geldbörse gespeichert?"
 
-#: faq.html.j2:21
+#: template/faq.html.j2:28
 #, fuzzy
 #| msgid ""
 #| "<p>Your wallet stores digital coins and thus ultimately your computer\n"
 #| "holds your balance. The exchange keeps funds matching all unspent\n"
 #| "coins in an escrow bank account.</p>\n"
 msgid ""
-"<p>Your wallet stores digital coins and thus ultimately your computer holds "
+"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.</p>"
+"escrow bank account."
 msgstr ""
 "Die Taler-Geldbörse speichert digitale Münzen nur auf deinem Computer. Das "
 "heißt, nur dieser kennt den Bestand deiner Münzen. Die Taler-Wechselstube "
 "speichert dagegen auf einem Konto, das sie treuhänderisch verwaltet, die "
 "Forderungen von noch nicht gebuchten Münzen."
 
-#: faq.html.j2:27
+#: template/faq.html.j2:35
 msgid "What if my wallet is lost?"
 msgstr "Was passiert bei Verlust der Taler-Geldbörse?"
 
-#: faq.html.j2:28
+#: template/faq.html.j2:37
 #, fuzzy
 #| msgid ""
 #| "<p>Since the digital coins of value in your wallet are anonymized, the\n"
@@ -739,111 +878,111 @@ msgstr "Was passiert bei Verlust der Taler-Geldbörse?"
 #| "Just like with a physical wallet for cash, you are responsible for\n"
 #| "keeping it safe.</p>\n"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "Weil die digitalen Münzen in der Geldbörse anonymisiert gespeichert werden, "
 "kann sie die Wechselstube bei einem Verlust oder Diebstahl nicht "
 "wiederherstellen. Wie bei echten Geldbörsen mit Banknoten und Münzen sind "
 "ihre Eigentümer allein verantwortlich für deren Sicherung."
 
-#: faq.html.j2:34
+#: template/faq.html.j2:46
 #, fuzzy
 #| msgid ""
 #| "<p>The risk of losing a wallet can be mitigated by making backups or\n"
 #| "keeping the balance reasonably low.</p>\n"
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
-"the balance reasonably low.</p>"
+"The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low."
 msgstr ""
 "Das Risiko eines Verlusts der Taler-Geldbörsen kann vermieden werden, indem "
 "man Backups von ihnen anfertigt oder ihren Bestand an digitalen Münzen "
 "niedrig hält."
 
-#: faq.html.j2:39
+#: template/faq.html.j2:52
 msgid "What if my computer is hacked?"
 msgstr "Was ist, wenn mein Computer gehackt wurde?"
 
-#: faq.html.j2:40
+#: template/faq.html.j2:54
 #, fuzzy
 #| msgid ""
 #| "<p>In case of a compromise of one of your devices, an attacker can\n"
 #| "spend coins from your wallet. Checking your balance might reveal\n"
 #| "to you that your device has been compromised.</p>\n"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "Im Fall eines Einbruchs in die Geräte können tatsächlich digitale Münzen aus "
 "dem Bestand in der Taler-Geldbörse ausgegeben werden. Es bietet sich daher "
 "an, den Bestand regelmäßig zu kontrollieren, um einen solchen Einbruch "
 "festzustellen."
 
-#: faq.html.j2:46
+#: template/faq.html.j2:61
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 "Kann ich mit Taler anderen Personen oder Freunden meine digitalen Münzen "
 "senden?"
 
-#: faq.html.j2:47
+#: template/faq.html.j2:63
 #, fuzzy
 #| msgid ""
 #| "<p>If your friend provides goods or services for you in exchange for a\n"
 #| "payment, they can easily set up a Taler merchant and receive the\n"
 #| "payment in their bank account.</p>\n"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "Falls andere Personen Waren oder Dienstleistungen verkaufen wollen, können "
 "sie die Rolle eines Verkäufers einnehmen und diese schnell und einfach "
 "einrichten, um deine Zahlung von der Taler-Geldbörse auf dem Girokonto ihrer "
 "Geschäftsbank zu erhalten."
 
-#: faq.html.j2:52
+#: template/faq.html.j2:70
 #, fuzzy
 #| msgid ""
 #| "<p>Future versions of the Taler wallet may allow exchanging coins\n"
 #| "among friends directly as well.</p>\n"
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well.</p>"
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 "Zukünftige Versionen der Taler-Geldbörse sehen vor, unter Freunden auch "
 "direkt digitale Münzen auszutauschen."
 
-#: faq.html.j2:58
+#: template/faq.html.j2:76
 msgid "How does Taler handle payments in different currencies?"
 msgstr "Wie geht Taler um mit digitalen Münzen anderer Währungen?"
 
-#: faq.html.j2:59
+#: template/faq.html.j2:78
 #, fuzzy
 #| msgid ""
 #| "<p>Taler wallets can store digital coins corresponding to multiple\n"
 #| "different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple different "
-"currencies such as the Euro, US Dollars or Bitcoins.</p>"
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 "Taler-Geldbörsen können gleichzeitig verschiedene digitale Münzen speichern, "
 "die in unterschiedlichen Währungen wie Euro, US-Dollar oder Bitcoin notiert "
 "sind."
 
-#: faq.html.j2:63
+#: template/faq.html.j2:84
 #, fuzzy
 #| msgid ""
 #| "<p>Taler currently does not offer conversion between currencies.</p>\n"
-msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+msgid "Taler currently does not offer conversion between currencies."
 msgstr "Taler bietet jedoch derzeitig keinen Umtausch zwischen Währungen."
 
-#: faq.html.j2:67
+#: template/faq.html.j2:89
 msgid "How does Taler protect my privacy?"
 msgstr "Wie schützt Taler meine privaten Daten?"
 
-#: faq.html.j2:68
+#: template/faq.html.j2:91
 #, fuzzy
 #| msgid ""
 #| "<p>Your wallet stores digital coins that are <a\n"
@@ -853,10 +992,10 @@ msgstr "Wie schützt Taler meine privaten Daten?"
 #| "for which customer.</p>\n"
 #| "\n"
 msgid ""
-"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia.";
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer.</p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
 msgstr ""
 "Deine Geldbörse speichert digitale \"Münzen\", die von der Wechselstube "
 "blind signiert sind (siehe <a href=\"https://de.wikipedia.org/wiki/";
@@ -864,13 +1003,13 @@ msgstr ""
 "privaten Daten, weil die Taler-Wechselstube dadurch keine Kenntnis davon "
 "erlangt, welche der Münzen von welchen Käufern sie signiert."
 
-#: faq.html.j2:79
+#: template/faq.html.j2:101
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:103
 msgid ""
-"<p>The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
 "refunding coins. Operators can also charge fees for closing reserves and for "
 "(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -878,87 +1017,86 @@ msgid ""
 "0.001 cent/transaction (at high transaction rates, amortized over billions "
 "of transactions, excluding migration costs). Note that this is an early "
 "estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher.</p>"
+"regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:117
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:119
 msgid ""
-"<p>Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future.</p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:130
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:132
 msgid ""
-"<p>We believe the European Electronic Money Directive provides part of the "
+"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.</p>"
+"have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:139
 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:141
 msgid ""
-"<p>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 "
+"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 "
 "regular bank or a central bank for a centrally banked electronic currency. "
 "Regardless, the bank would fall under the respective banking regulations "
 "establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money.</p>"
+"Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:150
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:152
 msgid ""
-"<p>Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
 "the auditors, but auditors may also provide a method for manual submission "
 "of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public.</p>"
+"respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:161
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:163
 msgid ""
-"<p>We are aware of several businesses running exploratory projects or having "
+"We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
 "regular banks as well as several central banks about the project. That said, "
 "there are currently no products in the market yet, and we believe this would "
 "be premature given the state of the project (see also <a href=\"https://";
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:174
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:176
 msgid ""
-"<p>Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
 "in theory possible with Taler, but they come with a few caveats. "
 "Specifically, recurring payments can only work if the Taler wallet is "
@@ -970,10 +1108,16 @@ msgid ""
 "the user would have to make sure to carry a sufficient balance for the "
 "recurring payment to be made. Still, they can be useful, and a future "
 "version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time</p>"
+"feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "Taler in den Medien"
+
+#: template/features.html.j2:13
 msgid ""
 "GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -981,28 +1125,28 @@ msgid ""
 "evasion and money laundering</span>."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
 "is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:32
 msgid ""
 "Payment are made after <span class=\"tlr\">exchanging existing money</span> "
 "into <em>electronic money</em> with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:41
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:50
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -1010,11 +1154,11 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:69
 msgid "Paying with Taler"
 msgstr "Bezahlen mit Taler"
 
-#: features.html.j2:62
+#: template/features.html.j2:71
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet\n"
@@ -1038,7 +1182,7 @@ msgstr ""
 "(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
 "Daten übermittelt."
 
-#: features.html.j2:70
+#: template/features.html.j2:79
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet\n"
@@ -1062,15 +1206,15 @@ msgstr ""
 "(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
 "Daten übermittelt."
 
-#: features.html.j2:77
+#: template/features.html.j2:87
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:94
 msgid "Receiving payments with Taler"
 msgstr "Verkaufen mit Taler"
 
-#: features.html.j2:85
+#: template/features.html.j2:96
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account\n"
@@ -1091,21 +1235,21 @@ msgstr ""
 "Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
 "Verkäufers oder gehostet laufen, um die Taler-Buchungen durchzuführen."
 
-#: features.html.j2:94
+#: template/features.html.j2:105
 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:112
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:127
 msgid "Practical"
 msgstr "Praktisch"
 
-#: features.html.j2:116
+#: template/features.html.j2:130
 #, fuzzy
 #| msgid ""
 #| "Taler is easy to integrate with existing Web\n"
@@ -1121,11 +1265,11 @@ msgstr ""
 "Zahlungen sind kryptographisch verschlüsselt, innerhalb von Millisekunden "
 "bestätigt und extrem kostengünstig."
 
-#: features.html.j2:126
+#: template/features.html.j2:140
 msgid "Stable"
 msgstr "Stabil"
 
-#: features.html.j2:129
+#: template/features.html.j2:143
 #, fuzzy
 #| msgid ""
 #| "Taler does not introduce a new currency. Taler\n"
@@ -1145,11 +1289,12 @@ msgstr ""
 "also sagen, dass die kryptografischen Taler-Münzen herkömmlichen Währungen "
 "wie US-Dollar, Euro oder sogar Bitcoin entsprechen."
 
-#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
+#: template/features.html.j2:154 template/governments.html.j2:55
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Sicher"
 
-#: features.html.j2:143
+#: template/features.html.j2:157
 #, fuzzy
 #| msgid ""
 #| "By design Taler does not suffer from many classes\n"
@@ -1165,11 +1310,11 @@ msgstr ""
 "Phishing und wird gleichzeitig jedoch niemals Käufern betrügerische "
 "Absichten unterstellen können."
 
-#: features.html.j2:155 governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Besteuerbar"
 
-#: features.html.j2:158
+#: template/features.html.j2:172
 #, fuzzy
 #| msgid ""
 #| "When using Taler, merchant's revenue is transparent for tax\n"
@@ -1187,11 +1332,11 @@ msgstr ""
 "Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für illegale "
 "Geschäfte."
 
-#: features.html.j2:168
+#: template/features.html.j2:182
 msgid "Private"
 msgstr "Anonym"
 
-#: features.html.j2:170
+#: template/features.html.j2:184
 #, fuzzy
 #| msgid ""
 #| "When you pay with Taler, your identity does not\n"
@@ -1210,11 +1355,11 @@ msgstr ""
 "garantiert einen Nachweis über ihre Zahlung und den erfolgten "
 "Eigentumsübergang."
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:195 template/governments.html.j2:85
 msgid "Libre"
 msgstr "Frei"
 
-#: features.html.j2:184
+#: template/features.html.j2:198
 #, fuzzy
 #| msgid ""
 #| "Taler provides protocols and reference implementations that in\n"
@@ -1225,119 +1370,121 @@ msgstr "Frei"
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
-"organizations or whole countries. Since the reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a> package, it will always remain free "
-"software."
+"organizations or whole countries. Since the reference implementation is a"
 msgstr ""
 "Taler bietet Protokolle und Referenzanwendungen, die prinzipiell für alle "
 "möglichen Bezahlsysteme von Einzelpersonen, Organisationen und sogar ganzen "
 "Staaten geeignet sind. Die Referenzanwendung als <a href=\"http://www.gnu.";
 "org/\">GNU-Package</a> wird immer freie Software sein und bleiben."
 
-#: financial-news.html.j2:6
+#: template/features.html.j2:205
+msgid "package, it will always remain free software."
+msgstr ""
+
+#: template/financial-news.html.j2:6
 msgid "Financial News"
 msgstr "Nachrichten aus der Finanzwelt"
 
-#: 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 "Dokumentation"
 
-#: 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:37
 msgid "denomination key"
 msgstr ""
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:39
 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:44
 msgid "deposit"
 msgstr ""
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:46
 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:52
 msgid "dirty"
 msgstr ""
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:54
 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:61
 msgid "exchange"
 msgstr ""
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:63
 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:68
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:70
 msgid ""
 "Various operations come with time limits. In particular, `denomination keys` "
 "come with strict time limits for the various operations involving the `coin` "
@@ -1350,45 +1497,45 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:82
 msgid "extension"
 msgstr ""
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:84
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:88
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:90
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:94
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:96
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:101
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:103
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:107
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:109
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1398,82 +1545,82 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:118
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:120
 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:124
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:126
 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:132
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:134
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:138
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:140
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:144
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:146
 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:152
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:154
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:159
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:161
 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:167
 #, fuzzy
 #| msgid "Documentation"
 msgid "revocation"
 msgstr "Dokumentation"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:169
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1481,103 +1628,103 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:176
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:178
 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:184
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:186
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:190
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:192
 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:197
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:199
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:203
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:205
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:210
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:212
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:216
 #, fuzzy
 #| msgid "Wallet"
 msgid "wallet"
 msgstr "Geldbörse"
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:218
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:223
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:225
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:229
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:231
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:236
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:238
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:243
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:245
 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 "
@@ -1588,11 +1735,11 @@ msgid ""
 "past the legal data retention requirement)."
 msgstr ""
 
-#: governments.html.j2:6
+#: template/governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Vorteile für Staatsregierungen"
 
-#: governments.html.j2:8
+#: template/governments.html.j2:8
 #, fuzzy
 #| msgid ""
 #| "Taler provides accountability to ensure business operate\n"
@@ -1617,7 +1764,7 @@ msgstr ""
 "zuverlässige Kontrollorgane auftreten. Damit trägt dieses Bezahlsystem auch "
 "zur digitalen Selbstbestimmung von Einzelpersonen im Finanzsektor bei."
 
-#: governments.html.j2:28
+#: template/governments.html.j2:27
 #, fuzzy
 #| msgid ""
 #| "Taler was built with the goal of fighting corruption and\n"
@@ -1648,7 +1795,7 @@ msgstr ""
 "Weise haben Steuerflucht und Schwarzmarktgeschäfte nur noch eine minimale "
 "Wahrscheinlichkeit."
 
-#: governments.html.j2:41
+#: template/governments.html.j2:40
 #, fuzzy
 #| msgid ""
 #| "Thus, despite offering anonymity for citizens spending\n"
@@ -1683,7 +1830,7 @@ msgstr ""
 "Geldbörse durch Berechtigte wie Freunde oder Familienmitglieder sowie "
 "miteinander synchronisierte Geldbörsen auf verschiedenen Endgeräten."
 
-#: governments.html.j2:61
+#: template/governments.html.j2:58
 #, fuzzy
 #| msgid ""
 #| "Taler's payments are cryptographically secured. Thus,\n"
@@ -1708,7 +1855,7 @@ msgstr ""
 "die Sicherheit des gemeinsamen Handelns für Einzelpersonen, Händler, die "
 "Taler-Wechselstube und den Staat enorm verbessert."
 
-#: governments.html.j2:73
+#: template/governments.html.j2:70
 #, fuzzy
 #| msgid ""
 #| "As a payment service provider, the Taler exchange is\n"
@@ -1735,7 +1882,7 @@ msgstr ""
 "treuhänderisch verwalteten Konten stets korrekt gebucht werden. Dies sorgt "
 "dafür, dass keine einzige Wechselstube betrügerisch handelt."
 
-#: governments.html.j2:91
+#: template/governments.html.j2:88
 #, fuzzy
 #| msgid ""
 #| "Taler is free software implementing an open protocol\n"
@@ -1752,11 +1899,11 @@ msgstr ""
 "Bezahlsysteme, deren gegenwärtige Monopolstellungen die politische und "
 "finanzielle Stabilität weltweit akut bedrohen."
 
-#: governments.html.j2:101
+#: template/governments.html.j2:98
 msgid "Efficient"
 msgstr "Effizient"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:101
 #, fuzzy
 #| msgid ""
 #| "Taler has an efficient design.  Unlike\n"
@@ -1774,15 +1921,15 @@ msgstr ""
 "Unmengen von Energie und überlastet kein Stromnetz. Damit bringt Taler auch "
 "einen erheblichen Vorteil in Sachen Umweltschutz."
 
-#: governments.html.j2:120
+#: template/governments.html.j2:117
 msgid "Taler and regulation"
 msgstr "Taler und Regulierungen"
 
-#: governments.html.j2:122
+#: template/governments.html.j2:119
 msgid "Anti money laundering (AML)"
 msgstr "Gesetz gegen Geldwäsche"
 
-#: governments.html.j2:123
+#: template/governments.html.j2:120
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1790,11 +1937,11 @@ msgstr ""
 "Im Taler-Bezahlsystem sind nur Verkäufe und Einkommen öffentlich sichtbar, "
 "die in einem signierten Kaufvertrag vereinbart wurden."
 
-#: governments.html.j2:124
+#: template/governments.html.j2:121
 msgid "Know your customer (KYC)"
 msgstr "Kenne deine Kunden"
 
-#: governments.html.j2:125
+#: template/governments.html.j2:122
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
@@ -1802,11 +1949,11 @@ msgstr ""
 "Käufer und Verkäufer werden anhand ihrer Bankverbindungen erkannt, wenn sie "
 "Münzen abheben oder erstatten lassen."
 
-#: governments.html.j2:126
+#: template/governments.html.j2:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "General Data Protection Regulation (GDPR)"
 
-#: governments.html.j2:127
+#: template/governments.html.j2:124
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
@@ -1815,11 +1962,11 @@ msgstr ""
 "Verschlüsselung. Das Konzept des Bezahlsystems ist zudem so angelegt, dass "
 "es nur die absolut notwendigen Daten verwendet."
 
-#: governments.html.j2:128
+#: template/governments.html.j2:125
 msgid "Payment Services Directive (PSD2)"
 msgstr "Payment Services Directive (PSD2)"
 
-#: governments.html.j2:129
+#: template/governments.html.j2:126
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
@@ -1828,11 +1975,11 @@ msgstr ""
 "Programmierschnittstellen und trägt auf diese Weise zu einer Vielfalt von "
 "Angeboten in der Bankenbranche bei."
 
-#: governments.html.j2:137
+#: template/governments.html.j2:134
 msgid "Taler provides privacy and accountability"
 msgstr "Taler bietet Privatsphäre und Verantwortung in der Geldwirtschaft"
 
-#: governments.html.j2:140
+#: template/governments.html.j2:137
 #, fuzzy
 #| msgid ""
 #| "Taler assumes governments can observe traditional wire transfers\n"
@@ -1849,7 +1996,7 @@ msgstr ""
 "Geldbörse und Erstattung von Ansprüchen aus Geschäften). Regierungen "
 "besitzen damit die Informationen über"
 
-#: governments.html.j2:148
+#: template/governments.html.j2:145
 #, fuzzy
 #| msgid ""
 #| "The total amount of digital currency withdrawn by a\n"
@@ -1864,7 +2011,7 @@ msgstr ""
 "den Gesamtbetrag digitaler Münzen, die Käufer an die Geldbörse überweisen - "
 "die Regierung kann dabei Höchstbeträge pro Zeitperiode festlegen"
 
-#: governments.html.j2:157
+#: template/governments.html.j2:154
 #, fuzzy
 #| msgid ""
 #| "The income received by any merchant via the Taler\n"
@@ -1872,7 +2019,7 @@ msgstr ""
 msgid "The income received by any merchant via the Taler system."
 msgstr "das Einkommen, das Verkäufer im Taler-Bezahlsystem erhalten"
 
-#: governments.html.j2:164
+#: template/governments.html.j2:161
 #, fuzzy
 #| msgid ""
 #| "The exact details of the underlying contract that was\n"
@@ -1887,7 +2034,7 @@ msgstr ""
 "die genauen Inhalte der zugrunde liegenden digitalen Kaufverträge zwischen "
 "Käufern und Verkäufern - ausgenommen jedoch private Daten der Käufer"
 
-#: governments.html.j2:174
+#: template/governments.html.j2:170
 #, fuzzy
 #| msgid ""
 #| "The amounts of digital coins legitimately withdrawn\n"
@@ -1909,23 +2056,23 @@ msgstr ""
 "Wechselstuben an Geschäftsbanken sowie die Einkünfte der Wechselstuben aus "
 "Transaktionsgebühren"
 
-#: 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 "Das Taler-System im Überblick"
 
-#: 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 "
@@ -1935,15 +2082,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:29
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:31
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:37
 msgid ""
 "The primary use case is the registration of the merchant. The codeless "
 "payment backend provides a secure django authenticated login to the "
@@ -1954,19 +2101,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:48
 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:53
 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:61
 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 "
@@ -1975,7 +2122,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:73
 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 "
@@ -1985,7 +2132,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:84
 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 "
@@ -1993,31 +2140,42 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:93
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
+"merchant-instance\">here</a>."
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:103
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:109
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:113
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:127
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:130
 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. "
@@ -2026,7 +2184,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:140
 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 "
@@ -2034,7 +2192,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:150
 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. "
@@ -2046,7 +2204,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:164
 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 "
@@ -2054,7 +2212,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:174
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -2064,15 +2222,61 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:191
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
+#: template/investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "In Taler investieren!"
 
-#: investors.html.j2:9
+#: template/investors.html.j2:9
 #, fuzzy
 #| msgid ""
 #| "We have created a company, Taler Systems SA in\n"
@@ -2087,11 +2291,11 @@ msgstr ""
 "Taler-Bezahlsystem ermöglicht. Bitte kontaktieren Sie dafür <tt>invest@taler."
 "net</tt>."
 
-#: investors.html.j2:24
+#: template/investors.html.j2:24
 msgid "The Team"
 msgstr "Das Taler-Team"
 
-#: investors.html.j2:27
+#: template/investors.html.j2:27
 #, fuzzy
 #| msgid ""
 #| "Our <a href=\"about.html\">team</a> combines world-class business "
@@ -2111,29 +2315,21 @@ msgstr ""
 "die Vision eines einwandfreien Bezahlsystems und die Zielsetzung, diese "
 "Vision in die Welt zu bringen."
 
-#: investors.html.j2:37
-#, fuzzy
-#| msgid ""
-#| "We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
-#| "the French\n"
-#| "national institute for research in informatics and\n"
-#| "automation, and the <a href=\"https://renewablefreedom.org/\";>Renewable "
-#| "Freedom Foundation</a>.\n"
+#: template/investors.html.j2:37
+msgid "We are currently supported by"
+msgstr ""
+
+#: template/investors.html.j2:41
 msgid ""
-"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
 "the French national institute for research in informatics and automation, "
-"and the <a href=\"https://renewablefreedom.org/\";>Renewable Freedom "
-"Foundation</a>."
+"and the"
 msgstr ""
-"Gegenwärtig unterstützen uns <a href=\"http://www.inria.fr/\";>Inria</a>, das "
-"Nationale Forschungsinstitut für Informatik und Automatisierung, sowie die "
-"<a href=\"https://renewablefreedom.org/\";>Renewable Freedom Foundation</a>."
 
-#: investors.html.j2:45
+#: template/investors.html.j2:50
 msgid "The Technology"
 msgstr "Die Technologie"
 
-#: investors.html.j2:48
+#: template/investors.html.j2:53
 #, fuzzy
 #| msgid ""
 #| "All transactions in Taler are secured using <a href=\"bibliography.html"
@@ -2166,11 +2362,11 @@ msgstr ""
 "Beteiligten dar. Die Buchungskosten betragen übrigens nur Bruchteile eines "
 "Cent pro Buchung."
 
-#: investors.html.j2:63
+#: template/investors.html.j2:66
 msgid "The Business"
 msgstr "Das Geschäftsmodell des Taler-Bezahlsystems"
 
-#: investors.html.j2:66
+#: template/investors.html.j2:68
 #, fuzzy
 #| msgid ""
 #| "The scalable business model for Taler is the operation\n"
@@ -2200,22 +2396,22 @@ msgstr ""
 "gutgeschrieben bekommt. Die Wechselstube erhebt für die Überweisungen "
 "geringe Gebühren."
 
-#: investors.html.j2:85
+#: template/investors.html.j2:87
 msgid "The Business Case"
 msgstr "Der Businessplan"
 
-#: investors.html.j2:91
+#: template/investors.html.j2:97
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:120
 msgid "Running a Taler payment service operator"
 msgstr "Ein Taler-Bezahlsystem als Serviceanbieter betreiben"
 
-#: investors.html.j2:117
+#: template/investors.html.j2:123
 #, fuzzy
 #| msgid ""
 #| "The payment service operator runs the <em>Taler exchange</em>.\n"
@@ -2234,7 +2430,7 @@ msgstr ""
 "Banküberweisungen von und zu Geschäftsbanken und für den Betrieb der IT-"
 "Infrastruktur."
 
-#: investors.html.j2:127
+#: template/investors.html.j2:133
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
@@ -2242,7 +2438,7 @@ msgstr ""
 "Die Kosten für die kryptographischen Berechnungen, die Bandbreite und "
 "Datenspeicherung betragen weniger als 0,01 Eurocent pro Transaktion."
 
-#: investors.html.j2:129
+#: template/investors.html.j2:134
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
@@ -2251,7 +2447,7 @@ msgstr ""
 "können mehrere kleine Überweisungen auf das Girokonto der Verkäufer in einer "
 "Transaktion zusammengefasst und übertragen werden."
 
-#: investors.html.j2:131
+#: template/investors.html.j2:135
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2261,21 +2457,21 @@ msgstr ""
 "Geldbörse, Deponieren von Münzen, Refresh-Funktion, Erstattungen und "
 "aggregierte Überweisungen an Geschäftsbanken."
 
-#: investors.html.j2:133
+#: template/investors.html.j2:136
 msgid "Partnership with banks establishes consumer trust."
 msgstr "Partnerschaften mit Banken erhöhen das Kundenvertrauen."
 
-#: investors.html.j2:135
+#: template/investors.html.j2:137
 msgid "Partnership with free software community enables rapid deployment."
 msgstr ""
 "Partnerschaften mit der Free-Software-Bewegung ermöglichen eine rasche "
 "Einführung."
 
-#: merchants.html.j2:5
+#: template/merchants.html.j2:5
 msgid "Advantages for Merchants"
 msgstr "Vorteile für Händler"
 
-#: merchants.html.j2:8
+#: template/merchants.html.j2:8
 #, fuzzy
 #| msgid ""
 #| "Taler is a cost-effective electronic payment system\n"
@@ -2295,11 +2491,11 @@ msgstr ""
 "noch nie dagewesenen Komfort und werden keine Betrugsgefahren mehr fürchten "
 "müssen."
 
-#: merchants.html.j2:22
+#: template/merchants.html.j2:22
 msgid "Fast"
 msgstr "Schnell"
 
-#: merchants.html.j2:25
+#: template/merchants.html.j2:25
 #, fuzzy
 #| msgid ""
 #| "Processing transactions with Taler is fast,\n"
@@ -2328,7 +2524,7 @@ msgstr ""
 "effizienter und bequemer verbucht als in anderen, teureren und "
 "komplizierteren Verfahren. "
 
-#: merchants.html.j2:44
+#: template/merchants.html.j2:44
 #, fuzzy
 #| msgid ""
 #| "You will have cryptographic proof of payment from the\n"
@@ -2354,7 +2550,7 @@ msgstr ""
 "abgeschlossen haben, mit denen sie sogar bei Gerichtsprozessen "
 "Transaktionsnachweise erbringen können."
 
-#: merchants.html.j2:61
+#: template/merchants.html.j2:61
 #, fuzzy
 #| msgid ""
 #| "Taler is free software, and you can use the\n"
@@ -2377,11 +2573,11 @@ msgstr ""
 "Entwicklungsprinzip freier Software stellt zudem sicher, dass man immer aus "
 "einer Vielzahl von Anbietern für Integration und Support wählen kann."
 
-#: merchants.html.j2:76
+#: template/merchants.html.j2:76
 msgid "Cheap"
 msgstr "Günstig"
 
-#: merchants.html.j2:79
+#: template/merchants.html.j2:78
 #, fuzzy
 #| msgid ""
 #| "Taler is uses efficient cryptographic constructions with low\n"
@@ -2401,11 +2597,11 @@ msgstr ""
 "hohen Sicherheitsstand bieten, der Verluste durch Betrug von vornherein "
 "ausschließt, und ihre Anlagen gleichzeitig sehr geringe Fixkosten erfordern."
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:88
 msgid "Flexible"
 msgstr "Flexibel"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:90
 #, fuzzy
 #| msgid ""
 #| "Taler can be used for different currencies (such as\n"
@@ -2421,11 +2617,11 @@ msgstr ""
 "oder Bitcoin) und für jeden Betrag bis zu den Grenzen, die allein "
 "gesetzliche Regulierungen bzw. die Betreiber von Bezahlsystemen festlegen."
 
-#: merchants.html.j2:101
+#: template/merchants.html.j2:99
 msgid "Ethical"
 msgstr "Ethisch"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:101
 #, fuzzy
 #| msgid ""
 #| "Taler prevents tax evasion and money laundering.\n"
@@ -2443,31 +2639,31 @@ msgstr ""
 "Taler sind effizient und benötigen kein stromfressendes Mining. Taler "
 "unterstützt die Transparenz mit einem offenen Standard und freier Software."
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:115
 msgid "Manuals for merchants"
 msgstr "Gebrauchsanleitung für Händler"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:117
 msgid "The GNU Taler merchant backend operator manual"
 msgstr "Die Gebrauchsanleitung des Taler-Backend"
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:121
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr "Tutorial für die Integration von Taler in Webshops (PHP)"
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr "Tutorial für die Integration von Taler in Webshops (Python)"
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:136
 msgid "The GNU Taler Merchant Backend"
 msgstr "Das Taler-Backend für Händler"
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:138
 msgid "Merchants process payments using the Taler backend:"
 msgstr "Händler verwenden das Taler-Backend zur Zahlungsabwicklung:"
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:144
 #, fuzzy
 #| msgid ""
 #| "The backend <b>signs</b> and <b>stores</b> the\n"
@@ -2483,7 +2679,7 @@ msgstr ""
 "Käufer und Verkäufer vorher vereinbart hatten. Das Händlerfrontend liefert "
 "dafür die vom Käufer bestellten Artikelnummern im JSON-Format an das Backend."
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:153
 #, fuzzy
 #| msgid ""
 #| "The backend <b>validates</b> payments received from\n"
@@ -2503,7 +2699,7 @@ msgstr ""
 "Zahlungsaufforderung an das Taler-Backend senden und den zurückgemeldeten "
 "HTTP-Statuscode gegenprüfen."
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:164
 #, fuzzy
 #| msgid ""
 #| "The backend can <b>list</b> completed transactions\n"
@@ -2519,49 +2715,69 @@ msgstr ""
 "die Überweisungen an Girokonten der Geschäftsbanken mit den genauen "
 "Bedingungen jedes Kaufvertrags und nach Geschäftsvorfällen geordnet anzeigen."
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:178
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
+#: 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 "Taler-News"
 
-#: 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 "Taler in den Medien"
 
-#: principles.html.j2:22
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
+#: template/principles.html.j2:21
 #, fuzzy
 #| msgid "GNU Taler in the Press"
 msgid "GNU Taler: Design Principles"
 msgstr "Taler in den Medien"
 
-#: principles.html.j2:29
+#: template/principles.html.j2:25
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:31
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:33
 msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:36
 msgid ""
 "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 "\">Free Software</a>. For merchants, our Free Software reference "
@@ -2570,24 +2786,24 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:45
 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:56
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:58
 #, fuzzy
 #| msgid "How does Taler protect my privacy?"
 msgid "You deserve some privacy"
 msgstr "Wie schützt Taler meine privaten Daten?"
 
-#: principles.html.j2:70
+#: template/principles.html.j2:60
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -2595,7 +2811,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:68
 msgid ""
 "In legislations with data protection regulations (such as the recently "
 "introduced GDPR in Europe), merchants benefit from this as well, as no data "
@@ -2605,45 +2821,45 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:81
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:83
 #, fuzzy
 #| msgid "Anti money laundering (AML)"
 msgid "Money laundering"
 msgstr "Gesetz gegen Geldwäsche"
 
-#: principles.html.j2:99
+#: template/principles.html.j2:85
 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:95
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:97
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:99
 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:109
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:110
 #, fuzzy
 #| msgid "General Data Protection Regulation (GDPR)"
 msgid ""
@@ -2651,7 +2867,7 @@ msgid ""
 "(GDPR) compliant"
 msgstr "General Data Protection Regulation (GDPR)"
 
-#: principles.html.j2:134
+#: template/principles.html.j2:112
 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, "
@@ -2659,15 +2875,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:122
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:123
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:125
 msgid ""
 "Specifically it must be usable for non-expert customers. Usability also "
 "applies to the integration with merchants, and informs choices about the "
@@ -2675,33 +2891,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:136
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Effizient"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:137
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Effizient"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:139
 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:149
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:150
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:152
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -2709,15 +2925,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:163
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:164
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:166
 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 "
@@ -2727,521 +2943,177 @@ 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:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "Das Taler-Team"
+
+#: template/team.html.j2:8
+msgid ""
+"GNU Taler is proudly brought to you by the humans on this page. To contact "
+"the whole team, please write to"
+msgstr ""
+
+#: template/team.html.j2:21
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
 "GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
 
-#: team.html.j2:21
+#: template/team.html.j2:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
 msgstr ""
 "Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
 "verschiedenen Branchen..."
 
-#: team.html.j2:26
+#: template/team.html.j2:31
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
-msgid "GNU mainatiner, lead developer."
+#: template/team.html.j2:38
+msgid "GNU maintainer, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:43
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
 
-#: team.html.j2:43
+#: template/team.html.j2:48
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
 
-#: team.html.j2:50
+#: template/team.html.j2:55
 msgid "Software engineer."
 msgstr "Software-Ingenieur."
 
-#: team.html.j2:55
+#: template/team.html.j2:60
 msgid "Sustainable business development."
 msgstr "Nachhaltige Unternehmensentwicklung."
 
-#: team.html.j2:60
+#: template/team.html.j2:65
 msgid "Theoretical foundations."
 msgstr "Theoretische Grundlagen."
 
-#: team.html.j2:66
+#: template/team.html.j2:71
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:78 template/team.html.j2:82 template/team.html.j2:86
 msgid "Translator (Spanish)"
 msgstr "Übersetzer (Spanisch)."
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:92 template/team.html.j2:96 template/team.html.j2:100
 msgid "Translator (Italian)"
 msgstr "Übersetzer (Italienisch)."
 
-#: team.html.j2:99
+#: template/team.html.j2:104
 #, fuzzy
 #| msgid "Translator (Spanish)"
 msgid "Translator (German)"
 msgstr "Übersetzer (Deutsch)."
 
-#: team.html.j2:106
+#: template/team.html.j2:111
 msgid "Hardware security module"
 msgstr "Hardware-Sicherheitsmodul"
 
-#: team.html.j2:110
+#: template/team.html.j2:115
 msgid "Risk management"
 msgstr "Risikomanagement"
 
-#: team.html.j2:118
+#: template/team.html.j2:123
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
 
-#: team.html.j2:122
+#: template/team.html.j2:127
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
 
-#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
-#: team.html.j2:146
+#: template/team.html.j2:133 template/team.html.j2:137
+#: template/team.html.j2:141 template/team.html.j2:147
+#: template/team.html.j2:151
 #, fuzzy
 #| msgid "Taler for developers"
 msgid "Free software developer."
 msgstr "Taler für Entwickler"
 
-#: common/base.j2:5
-msgid "GNU Taler"
-msgstr "Das Taler-Bezahlsystem"
-
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
+#: template/wallet.html.j2:108
+msgid "Congratulations, you have installed the Taler wallet. Check out the"
+msgstr ""
 
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "Das Taler-Team"
+#: template/wallet.html.j2:113
+msgid "demo"
+msgstr ""
 
-#: common/footer.j2.inc:16
-msgid "Contact"
+#: template/wallet.html.j2:119
+msgid "You don't have a wallet installed yet."
 msgstr ""
 
-#: common/footer.j2.inc:21
-msgid "FAQ"
+#: template/wallet.html.j2:128
+msgid "Install the wallet for your browser below, then check out the"
 msgstr ""
 
-#: common/footer.j2.inc:26
+#: template/wallet.html.j2:132
 #, fuzzy
-#| msgid "GNU Taler Bibliography"
-msgid "Bibliography"
-msgstr "Bibliografie von GNU Taler"
+#| msgid "Documentation"
+msgid "demonstration"
+msgstr "Dokumentation"
 
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://";
-"www.bfh.ch/'>BFH</a>"
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
+msgid "or"
 msgstr ""
 
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
-"only."
+#: template/wallet.html.j2:149
+msgid "is required, but it appears you don't have it installed."
 msgstr ""
 
-#: common/navigation.j2.inc:21
-msgid "Features"
+#: template/wallet.html.j2:159
+msgid "version"
 msgstr ""
 
-#: common/navigation.j2.inc:22
-msgid "Principles"
+#: template/wallet.html.j2:163
+msgid "or newer is required, but it appears you have an older version."
 msgstr ""
 
-#: common/navigation.j2.inc:23
-msgid "Docs"
+#: template/wallet.html.j2:170
+#, fuzzy
+#| msgid "Wallet"
+msgid "Install wallet"
+msgstr "Geldbörse"
+
+#: template/wallet.html.j2:177
+msgid "JavaScript is disabled, installation won't work."
+msgstr ""
+
+#: template/wallet.html.j2:216
+msgid "Install Download Chrome Extension"
 msgstr ""
 
+#: template/wallet.html.j2:223
 #, fuzzy
-#~| msgid "The GNU Taler Merchant Backend"
-#~ msgid "Code (Merchant backend)"
-#~ msgstr "Das Taler-Backend für Händler"
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>To pay with Taler, customers install an electronic wallet\n"
-#~| "on their device.  Before the first payment, the wallet's balance must\n"
-#~| "be charged in the desired currency by some other means of payment.</p>\n"
-#~| "<p>Once the wallet is charged, payments on websites take only one "
-#~| "click,\n"
-#~| "are never falsely rejected by fraud detection and do not pose any risk\n"
-#~| "of phishing or identity theft.</p>\n"
-#~ msgid ""
-#~ "<p>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.</p> <p>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.</p> <p><a href=\"https://demo.taler.net\";>Try it "
-#~ "yourself with the interactive demo!</a></p>"
-#~ msgstr ""
-#~ "Um mit dem Taler-Bezahlsystem einkaufen zu können, muss man eine "
-#~ "elektronische Geldbörse auf einem Endgerät installieren. Vor der ersten "
-#~ "Bezahlung ist es nötig, einen Wert in der gewünschten Währung an die "
-#~ "Geldbörse zu überweisen. Dies erfolgt durch herkömmliche Banküberweisung "
-#~ "oder durch Kreditkarten. Der aufgeladene Wert der Geldbörse kann dann mit "
-#~ "nur einem Klick zum Bezahlen auf Webseiten verwendet werden. Die "
-#~ "Verkäufer müssen diese Bezahlung als berechtigt annehmen. Ein "
-#~ "Datendiebstahl (Phishing) ist dabei technisch ausgeschlossen, es werden "
-#~ "keine persönlichen Daten übermittelt."
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>To receive Taler payments, a merchant needs a bank account\n"
-#~| "in the desired currency.  We provide supporting software\n"
-#~| "in various programming languages to make the integration painless.\n"
-#~| "The merchant's backend for Taler transaction processing can run\n"
-#~| "on the merchant's premises or be hosted by a third party.</p>\n"
-#~ msgid ""
-#~ "<p>To receive Taler payments, a merchant needs a bank account in the "
-#~ "desired currency. We provide supporting software in various programming "
-#~ "languages to make the integration painless. The merchant's backend for "
-#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
-#~ "customers can pay for products without even having to register an account."
-#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
-#~ "works in our developer documentation!</a></p>"
-#~ msgstr ""
-#~ "Um Zahlungen erhalten zu können, brauchen Verkäufer ein Girokonto in der "
-#~ "gewünschten Währung bei einer Geschäftsbank. Das Taler-Bezahlsystem "
-#~ "unterstützt die Software verschiedener Verkaufsplattformen in mehreren "
-#~ "Programmiersprachen, um die Integration so einfach wie möglich zu machen. "
-#~ "Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
-#~ "Verkäufers oder gehostet laufen, um die Taler-Buchungen durchzuführen."
-
-#~ msgid "PhD Student, Inria.."
-#~ msgstr "Doktorand, Inria."
-
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Software-Ingenieur. Arbeitet an libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
-
-#, fuzzy
-#~| msgid "Developers"
-#~ msgid "Developer Resources"
-#~ msgstr "Entwickler"
-
-#, fuzzy
-#~| msgid "About us"
-#~ msgid "About"
-#~ msgstr "Über uns"
-
-#, fuzzy
-#~| msgid "Investors"
-#~ msgid "For Investors"
-#~ msgstr "Investoren"
-
-#~ msgid "Citizens"
-#~ msgstr "Bürger"
-
-#~ msgid "Merchants"
-#~ msgstr "Händler"
-
-#~ msgid "Governments"
-#~ msgstr "Regierungen"
-
-#, fuzzy
-#~| msgid ""
-#~| "Taler uses modern cryptography, ensuring that there\n"
-#~| "is no counterfeit.  Your digital wallet is safer\n"
-#~| "than your physical wallet.  At most, you can lose\n"
-#~| "its contents because your computer or mobile is\n"
-#~| "irreparably damaged or compromised.  Unlike a\n"
-#~| "physical wallet, you can make backups to secure\n"
-#~| "against data loss."
-#~ msgid ""
-#~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
-#~ "Your digital wallet is safer than your physical wallet. At most, you can "
-#~ "lose its contents because your computer or mobile is irreparably damaged "
-#~ "or compromised. Unlike a physical wallet, you can make backups to secure "
-#~ "against data loss."
-#~ msgstr ""
-#~ "Taler verwendet aktuellste kryptografische Mittel, die jeden Betrug "
-#~ "systematisch unterbinden. Die elektronische Geldbörse ist sogar sicherer "
-#~ "als echtes Geld. Ein Schaden entsteht erst, wenn das Speichermedium, das "
-#~ "die Daten der Geldbörse enthält, zerstört oder entwendet wurde. Dies kann "
-#~ "man jedoch verhindern durch regelmäßige Datensicherungen und Backups des "
-#~ "Speichermediums."
-
-#, fuzzy
-#~| msgid ""
-#~| "Your transactions are private, neither the payment\n"
-#~| "service provider nor merchant needs to learn your\n"
-#~| "identity. There is no need to give out credit card\n"
-#~| "numbers or other sensitive information. The merchant\n"
-#~| "will only be able to do exactly the transaction you\n"
-#~| "agreed to."
-#~ msgid ""
-#~ "Your transactions are private, neither the payment service provider nor "
-#~ "merchant needs to learn your identity. There is no need to give out "
-#~ "credit card numbers or other sensitive information. The merchant will "
-#~ "only be able to do exactly the transaction you agreed to."
-#~ msgstr ""
-#~ "Die Überweisungen der Käufer sind anonym. Weder das Taler-Bezahlsystem "
-#~ "noch die Verkäufer können die Identität der Käufer feststellen. Es "
-#~ "besteht auch keine Notwendigkeit, sensible Daten wie Kreditkartennummern "
-#~ "anzugeben. Die Verkäufer können zudem nur Überweisungen ausführen lassen, "
-#~ "die die Käufer genehmigt haben."
-
-#~ msgid "Convenient"
-#~ msgstr "Bequem"
-
-#, fuzzy
-#~| msgid ""
-#~| "You will be able to withdraw money to replenish the\n"
-#~| "digital coins in your wallet using your credit card\n"
-#~| "or wire transfers.  Afterwards you can pay with\n"
-#~| "one-click using the Taler wallet, which optionally\n"
-#~| "keeps your transaction history on your computer."
-#~ msgid ""
-#~ "You will be able to withdraw money to replenish the digital coins in your "
-#~ "wallet using your credit card or wire transfers. Afterwards you can pay "
-#~ "with one-click using the Taler wallet, which optionally keeps your "
-#~ "transaction history on your computer."
-#~ msgstr ""
-#~ "Die Aufladung der Taler-Geldbörse erfolgt durch eine gewöhnliche "
-#~ "Banküberweisung oder mit einer Kreditkarte. Die Zahlung mit der Geldbörse "
-#~ "funktioniert so einfach wie ein Mausklick. Im Gegensatz zu Bargeld "
-#~ "entfällt das lästige Zählen von Banknoten und Münzen. Alle Transaktionen "
-#~ "können optional auf dem Computer gespeichert werden."
-
-#, fuzzy
-#~| msgid ""
-#~| "Coins in your digital wallet will be of the same\n"
-#~| "denomination as the cash in your physical wallet.\n"
-#~| "Taler is not a crypto-currency, so you do not have\n"
-#~| "to worry about cryto-currency related value\n"
-#~| "fluctuations.  Banking with Taler is subject to the\n"
-#~| "usual government protections for financial\n"
-#~| "services."
-#~ msgid ""
-#~ "Coins in your digital wallet will be of the same denomination as the cash "
-#~ "in your physical wallet. Taler is not a crypto-currency, so you do not "
-#~ "have to worry about crypto-currency related value fluctuations. Banking "
-#~ "with Taler is subject to the usual government protections for financial "
-#~ "services."
-#~ msgstr ""
-#~ "Münzen in der Taler-Geldbörse haben die gleiche Wertigkeit wie physisches "
-#~ "Geld in der normalen Brieftasche. Taler ist keine Kryptowährung, nominale "
-#~ "Wertänderungen der Zahlungsmittel sind ausgeschlossen. Das Bezahlsystem "
-#~ "Taler unterliegt der gewöhnlichen Bankenaufsicht und staatlichen "
-#~ "Währungskontrolle."
-
-#~ msgid "Wallet Browser Extension"
-#~ msgstr "Die Taler-Geldbörse als Browser-Erweiterung"
-
-#, fuzzy
-#~| msgid ""
-#~| "We currently provide a <a href=\"wallet.html\">wallet browser extension</"
-#~| "a> for Chromium, Chrome, Firefox, Opera\n"
-#~| "and Edge.  Wallets for mobile phones and other platforms will be "
-#~| "available in the future.\n"
-#~ msgid ""
-#~ "We currently provide a <a href=\"wallet.html\">wallet browser extension</"
-#~ "a> for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile "
-#~ "phones and other platforms will be available in the future."
-#~ msgstr ""
-#~ "Zurzeit gibt es Erweiterungen für die Browser Chromium, Chrome, Firefox, "
-#~ "Opera und Edge. Für Mobilfunktelefone und andere Plattformen entwickeln "
-#~ "wir ebenfalss Taler-Geldbörsen."
-
-#~ msgid "Taler Demo"
-#~ msgstr "Demoversion von Taler"
-
-#, fuzzy
-#~| msgid ""
-#~| "You can see how Taler works in practice by visiting our <a href="
-#~| "\"https://demo.taler.net\";>demo page</a>.\n"
-#~ msgid ""
-#~ "You can see how Taler works in practice by visiting our <a href=\"https://";
-#~ "demo.taler.net\">demo page</a>."
-#~ msgstr ""
-#~ "Auf der <a href=\"https://demo.taler.net\";>Demo-Seite</a> kann man die "
-#~ "Funktionsweise von Taler kennenlernen."
-
-#~ msgid "The Taler Wallet for customers"
-#~ msgstr "Die Taler-Geldbörse für Käufer"
-
-#, fuzzy
-#~| msgid ""
-#~| "Customers interact with the Taler system using\n"
-#~| "the Taler wallet:"
-#~ msgid "Customers interact with the Taler system using the Taler wallet:"
-#~ msgstr "So verwendet man die Taler-Geldbörse:"
-
-#, fuzzy
-#~| msgid ""
-#~| "To <b>withdraw</b> electronic coins, the customer\n"
-#~| "transfers funds from his bank account to the Taler\n"
-#~| "payment service provider (the exchange).  The wire\n"
-#~| "transfer subject must match a code identifying the\n"
-#~| "customer's wallet. After the wire transfer is\n"
-#~| "complete, the wallet will automatically withdraw the\n"
-#~| "coins from the exchange."
-#~ msgid ""
-#~ "To <b>withdraw</b> electronic coins, the customer transfers funds from "
-#~ "his bank account to the Taler payment service provider (the exchange). "
-#~ "The wire transfer subject must match a code identifying the customer's "
-#~ "wallet. After the wire transfer is complete, the wallet will "
-#~ "automatically withdraw the coins from the exchange."
-#~ msgstr ""
-#~ "Um digitale Münzen in die Taler-Geldbörse zu laden, müssen Taler-Nutzer "
-#~ "zuerst Geld von ihrem Girokonto bei ihrer Geschäftsbank an die Taler-"
-#~ "Wechselstube überweisen. Als Verwendungszweck geben sie die Nummer der "
-#~ "empfangenden Taler-Geldbörse an. Die Weiterbuchung von der Taler-"
-#~ "Wechselstube an die Taler-Geldbörse erfolgt automatisch."
-
-#, fuzzy
-#~| msgid ""
-#~| "To <b>spend</b> electronic coins, a merchant must\n"
-#~| "cause the wallet to display a proposal for some\n"
-#~| "purchase.  The wallet will ask the customer for\n"
-#~| "one-click confirmation.  Payment is then instant.\n"
-#~| "Transaction histories and digitally signed contracts\n"
-#~| "can be preserved by the wallet."
-#~ msgid ""
-#~ "To <b>spend</b> electronic coins, a merchant must cause the wallet to "
-#~ "display a proposal for some purchase. The wallet will ask the customer "
-#~ "for one-click confirmation. Payment is then instant. Transaction "
-#~ "histories and digitally signed contracts can be preserved by the wallet."
-#~ msgstr ""
-#~ "Die Abbuchung von der privaten Taler-Geldbörse erfolgt nur, wenn sich die "
-#~ "Verkäufer den jeweiligen Rechnungsbetrag von der Taler-Geldbörse anzeigen "
-#~ "lassen und die Käufer mit einem Klick die Zahlung dieses Rechnungsbetrags "
-#~ "bestätigen. Die Zahlung geschieht dann im selben Augenblick. Alle "
-#~ "Zahlungen und digital signierte Kaufverträge können in der Geldbörse "
-#~ "gespeichert werden."
-
-#, fuzzy
-#~| msgid ""
-#~| "The customer can use the wallet to <b>review</b> his\n"
-#~| "balance. The wallet can contain different\n"
-#~| "currencies, and may be shared across\n"
-#~| "devices. Customers can make backups of the wallet to\n"
-#~| "secure its contents against hardware failures."
-#~ msgid ""
-#~ "The customer can use the wallet to <b>review</b> his balance. The wallet "
-#~ "can contain different currencies, and may be shared across devices. "
-#~ "Customers can make backups of the wallet to secure its contents against "
-#~ "hardware failures."
-#~ msgstr ""
-#~ "Taler-Nutzer können in der Geldbörse alle Buchungen überprüfen. Die "
-#~ "Geldbörse kann verschiedene Währungen enthalten und auf unterschiedlichen "
-#~ "Endgeräten angezeigt werden. Es ist möglich, mehrere Kopien der Taler-"
-#~ "Geldbörse zu speichern, um sie auch bei einem Geräteausfall oder Verlust "
-#~ "der Hardware stets gesichert zu haben."
-
-#~ msgid "Advantages for Citizens"
-#~ msgstr "Vorteile für Taler-Nutzer"
-
-#, fuzzy
-#~| msgid ""
-#~| "Taler largely functions like digital cash.  You\n"
-#~| "withdraw money from your bank account into your\n"
-#~| "electronic wallet, and can henceforth spend digital\n"
-#~| "cash.  The electronic wallet can carry multiple\n"
-#~| "currencies.\n"
-#~ msgid ""
-#~ "Taler largely functions like digital cash. You withdraw money from your "
-#~ "bank account into your electronic wallet, and can henceforth spend "
-#~ "digital cash. The electronic wallet can carry multiple currencies."
-#~ msgstr ""
-#~ "Taler funktioniert generell ähnlich wie jede virtuelle Währung. Man "
-#~ "überweist Geld vom konventionellen Bankkonto in die Taler-Geldbörse, um "
-#~ "aus ihrem Guthaben Einkäufe zu bezahlen. Die elektronische Geldbörse kann "
-#~ "dabei mehrere digitale Währungen enthalten."
-
-#~ msgid "News"
-#~ msgstr "Nachrichten"
-
-#, fuzzy
-#~| msgid "Developers"
-#~ msgid "Resources"
-#~ msgstr "Entwickler"
-
-#, fuzzy
-#~| msgid "Taler System Architecture"
-#~ msgid "System Architecture"
-#~ msgstr "Systemarchitektur von Taler"
-
-#, fuzzy
-#~| msgid "Developers"
-#~ msgid "Developer Introduction"
-#~ msgstr "Entwickler"
-
-#, fuzzy
-#~| msgid "GNU Taler"
-#~ msgid "GNU Taler logo"
-#~ msgstr "Das Taler-Bezahlsystem"
-
-#~ msgid "Taler News"
-#~ msgstr "Taler-News"
-
-#, fuzzy
-#~| msgid ""
-#~| "GNU Taler is an electronic payment system under development at <a href="
-#~| "\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-#~| "2018. You can learn about Taler on this website, try the <a href="
-#~| "\"https://demo.taler.net\";>demo</a> and look at our <a href=\"https://";
-#~| "docs.taler.net\">documentation</a>."
-#~ msgid ""
-#~ "We expect to make it operational in 2019. You can learn about Taler on "
-#~ "this website, try the <a href=\"https://demo.taler.net\";>demo</a> and "
-#~ "look at our <a href=\"https://docs.taler.net\";>documentation</a>."
-#~ msgstr ""
-#~ "Taler ist ein elektronisches Bezahlsystem, das bei <a href=\"http://www.";
-#~ "inria.fr/\">Inria</a> entwickelt wird. Wir rechnen mit seiner Einführung "
-#~ "im Jahr 2018. Auf der <a href=\"https://demo.taler.net\";>Demo-Seite</a> "
-#~ "kann man die Funktionsweise von Taler kennenlernen. Weitere Informationen "
-#~ "sind in der<a href=\"https://docs.taler.net\";>Entwicklerdokumentation</a>."
-
-#~ msgid "One-Click Cash Payments!"
-#~ msgstr "Bezahlen mit einem Klick!"
-
-#~ msgid "Performance Analysis"
-#~ msgstr "Performanceanalyse"
-
-#, fuzzy
-#~| msgid ""
-#~| "We\n"
-#~| "use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
-#~| "for performance regression analysis of the exchange\n"
-#~| "backend\n"
-#~| "at <a href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
-#~ msgid ""
-#~ "We use <a href=\"https://gnunet.org/gauger\";>Gauger</a> for performance "
-#~ "regression analysis of the exchange backend at <a href=\"https://gauger.";
-#~ "taler.net/\">gauger.taler.net</a>."
-#~ msgstr ""
-#~ "Wir verwenden <a href=\"https://gnunet.org/gauger\";>Gauger</a>, um die "
-#~ "Performance zu messen. Ergebnisse sind auf <a href=\"https://gauger.taler.";
-#~ "net/\">gauger.taler.net</a>."
-
-#~ msgid "Demo"
-#~ msgstr "Demo"
-
-#~ msgid "Operators"
-#~ msgstr "Betreiber"
-
-#~ msgid "About&nbsp;us"
-#~ msgstr "Über&nbsp;uns"
-
-#~ msgid "Latest Videos"
-#~ msgstr "Neuste Videos"
+#| msgid "GNU Taler"
+msgid "Install GNU Taler"
+msgstr "Das Taler-Bezahlsystem"
+
+#: template/wallet.html.j2:227
+msgid "from the Chrome Web Store"
+msgstr ""
+
+#: template/wallet.html.j2:239
+msgid "Other browsers"
+msgstr ""
+
+#: template/wallet.html.j2:241
+msgid "Wallets for other browsers will be provided in the near future."
+msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po 
b/locale/en/LC_MESSAGES/messages.po
index 0b252cd..90a70d8 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,135 +2,201 @@ 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-03 12:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <address@hidden>\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\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 ""
 
-#: 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: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 template/developers.html.j2:66
 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 <a href='http://";
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"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
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
+#: template/contact.html.j2:15
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
 msgstr ""
 
-#: contact.html.j2:25
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
+msgstr ""
+
+#: template/contact.html.j2:29
 msgid "Contacting individuals"
 msgstr ""
 
-#: contact.html.j2:27
+#: template/contact.html.j2:31
 msgid ""
 "Team members are generally reachable at <tt>address@hidden</tt>. All of "
 "us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
-#: contact.html.j2:36
+#: template/contact.html.j2:40
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:42
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
 
-#: contact.html.j2:48
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
 msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"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:65
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:61
+#: template/contact.html.j2:67
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
 msgstr ""
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr ""
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:9
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the"
+msgstr ""
+
+#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
+msgid "of the GNUnet and GNU Taler projects is satisfied."
 msgstr ""
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:24
 msgid ""
-"<p>The agreements ensure that the code will continue to be made available "
-"under free software licenses, but gives developers the freedom to move code "
+"The agreements ensure that the code will continue to be made available under "
+"free software licenses, but gives developers the freedom to move code "
 "between GNUnet and GNU Taler without worrying about licenses and the company "
 "the ability to dual-license (for example, so that we can distribute via App-"
-"stores that are hostile to free software).</p>"
+"stores that are hostile to free software)."
 msgstr ""
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:34
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do not require "
+"Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
-"sufficient, but snail mail is preferred.</p>"
+"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 +208,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 "
@@ -154,94 +220,111 @@ msgid ""
 "obviously merchants may choose to offer HTTPS for consistency and because it "
 "generally is better for privacy compared to HTTP. Taler uses JSON to encode "
 "structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at <a href=\"https://";
-"docs.taler.net/\">docs.taler.net</a>."
+"applications. Taler's protocol is documented in detail at"
 msgstr ""
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
 msgid "Code"
 msgstr ""
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
+msgid "Taler is currently primarily developed by a research team at"
+msgstr ""
+
+#: template/developers.html.j2:70
 msgid ""
-"Taler is currently primarily developed by a research team at <a href="
-"\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
-"\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
-"repositories can be cloned using the Git and HTTP access methods against "
-"<tt>git.taler.net</tt> with the name of the respective repository. A list of "
-"repositories can be found in our <a href=\"https://git.taler.net/\";>GitWeb</"
-"a>."
+"However, contributions from anyone are welcome. Our Git repositories can be "
+"cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> "
+"with the name of the respective repository. A list of repositories can be "
+"found in our"
 msgstr ""
 
-#: developers.html.j2:75
+#: template/developers.html.j2:80
 msgid "Documentation"
 msgstr ""
 
-#: developers.html.j2:78
-msgid ""
-"In addition to this website, the <a href=\"https://git.taler.net/";
-"\">documented code</a> and the <a href=\"https://docs.taler.net/\";>API "
-"documentation</a>. Technical papers can be found in our <a href="
-"\"bibliography.html\">bibliography</a>."
+#: template/developers.html.j2:83
+msgid "In addition to this website, the"
+msgstr ""
+
+#: template/developers.html.j2:86
+msgid "documented code"
 msgstr ""
 
-#: developers.html.j2:88
+#: template/developers.html.j2:87
+msgid "and the"
+msgstr ""
+
+#: template/developers.html.j2:90
+msgid "API documentation"
+msgstr ""
+
+#: template/developers.html.j2:91
+msgid "Technical papers can be found in our"
+msgstr ""
+
+#: template/developers.html.j2:94
+msgid "bibliography"
+msgstr ""
+
+#: template/developers.html.j2:98
 msgid "Discussion"
 msgstr ""
 
-#: developers.html.j2:91
+#: template/developers.html.j2:101
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
-"read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
-"taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"read the list archive at"
 msgstr ""
 
-#: developers.html.j2:101
+#: template/developers.html.j2:111
 msgid "Regression Testing"
 msgstr ""
 
-#: developers.html.j2:104
-msgid ""
-"We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests to "
-"detect regressions and check for portability at <a href=\"https://buildbot.";
-"taler.net/\">buildbot.taler.net</a>."
+#: template/developers.html.j2:114
+msgid "We have"
 msgstr ""
 
-#: developers.html.j2:113
+#: template/developers.html.j2:118
+msgid "automation tests to detect regressions and check for portability at"
+msgstr ""
+
+#: template/developers.html.j2:126
 msgid "Code Coverage Analysis"
 msgstr ""
 
-#: developers.html.j2:116
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at <a href="
-"\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+#: template/developers.html.j2:129
+msgid "We use"
 msgstr ""
 
-#: developers.html.j2:131
+#: template/developers.html.j2:133
+msgid "to analyze the code coverage of our tests, the results are available at"
+msgstr ""
+
+#: template/developers.html.j2:146
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:149 template/investors.html.j2:93
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:165
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:155
+#: template/developers.html.j2:168
 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:175
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:165
+#: template/developers.html.j2:178
 msgid ""
 "A customer instructs his <b>bank</b> to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -249,7 +332,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:177
+#: template/developers.html.j2:190
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -261,7 +344,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:195
+#: template/developers.html.j2:208
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -276,7 +359,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:217
+#: template/developers.html.j2:230
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -290,7 +373,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:240
+#: template/developers.html.j2:253
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -299,7 +382,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:254
+#: template/developers.html.j2:267
 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 +392,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:269
+#: template/developers.html.j2:282
 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,183 +401,230 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:37
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:7
+msgid "GNU Taler: Documentation and Resources"
+msgstr ""
+
+#: template/docs.html.j2:13
+msgid ""
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
+msgstr ""
+
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
 msgstr ""
 
-#: docs.html.j2:38
-msgid "Also available as"
+#: template/docs.html.j2:40
+msgid "Tutorial and manual for operating a merchant. Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:52
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:62
+msgid "Exchange"
+msgstr ""
+
+#: template/docs.html.j2:64
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:74
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:76
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:92
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:94
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+msgid "Mailing List"
+msgstr ""
+
+#: template/docs.html.j2:156
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:152
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:194
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:196
 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:8
 msgid ""
-"<p>Taler does not require any Blockchain technology, and is also not based "
-"on proof-of-work or any other distributed consensus mechanism. Instead, "
-"Taler is based on blind signatures. However, it is theoretically possible to "
-"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
+"Taler does not require any Blockchain technology, and is also not based on "
+"proof-of-work or any other distributed consensus mechanism. Instead, Taler "
+"is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 
-#: faq.html.j2:13
+#: template/faq.html.j2:18
 msgid ""
-"<p>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.</p>"
+"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:26
 msgid "Where is the balance in my wallet stored?"
 msgstr ""
 
-#: faq.html.j2:21
+#: template/faq.html.j2:28
 msgid ""
-"<p>Your wallet stores digital coins and thus ultimately your computer holds "
+"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.</p>"
+"escrow bank account."
 msgstr ""
 
-#: faq.html.j2:27
+#: template/faq.html.j2:35
 msgid "What if my wallet is lost?"
 msgstr ""
 
-#: faq.html.j2:28
+#: template/faq.html.j2:37
 msgid ""
-"<p>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.</p>"
+"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:46
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
-"the balance reasonably low.</p>"
+"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:52
 msgid "What if my computer is hacked?"
 msgstr ""
 
-#: faq.html.j2:40
+#: template/faq.html.j2:54
 msgid ""
-"<p>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.</p>"
+"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:61
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 
-#: faq.html.j2:47
+#: template/faq.html.j2:63
 msgid ""
-"<p>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.</p>"
+"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:70
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well.</p>"
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 
-#: faq.html.j2:58
+#: template/faq.html.j2:76
 msgid "How does Taler handle payments in different currencies?"
 msgstr ""
 
-#: faq.html.j2:59
+#: template/faq.html.j2:78
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple different "
-"currencies such as the Euro, US Dollars or Bitcoins.</p>"
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 
-#: faq.html.j2:63
-msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+#: template/faq.html.j2:84
+msgid "Taler currently does not offer conversion between currencies."
 msgstr ""
 
-#: faq.html.j2:67
+#: template/faq.html.j2:89
 msgid "How does Taler protect my privacy?"
 msgstr ""
 
-#: faq.html.j2:68
+#: template/faq.html.j2:91
 msgid ""
-"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia.";
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer.</p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
 msgstr ""
 
-#: faq.html.j2:79
+#: template/faq.html.j2:101
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:103
 msgid ""
-"<p>The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
 "refunding coins. Operators can also charge fees for closing reserves and for "
 "(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -502,87 +632,86 @@ msgid ""
 "0.001 cent/transaction (at high transaction rates, amortized over billions "
 "of transactions, excluding migration costs). Note that this is an early "
 "estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher.</p>"
+"regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:117
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:119
 msgid ""
-"<p>Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future.</p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:130
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:132
 msgid ""
-"<p>We believe the European Electronic Money Directive provides part of the "
+"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.</p>"
+"have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:139
 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:141
 msgid ""
-"<p>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 "
+"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 "
 "regular bank or a central bank for a centrally banked electronic currency. "
 "Regardless, the bank would fall under the respective banking regulations "
 "establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money.</p>"
+"Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:150
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:152
 msgid ""
-"<p>Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
 "the auditors, but auditors may also provide a method for manual submission "
 "of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public.</p>"
+"respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:161
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:163
 msgid ""
-"<p>We are aware of several businesses running exploratory projects or having "
+"We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
 "regular banks as well as several central banks about the project. That said, "
 "there are currently no products in the market yet, and we believe this would "
 "be premature given the state of the project (see also <a href=\"https://";
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:174
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:176
 msgid ""
-"<p>Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
 "in theory possible with Taler, but they come with a few caveats. "
 "Specifically, recurring payments can only work if the Taler wallet is "
@@ -594,10 +723,14 @@ msgid ""
 "the user would have to make sure to carry a sufficient balance for the "
 "recurring payment to be made. Still, they can be useful, and a future "
 "version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time</p>"
+"feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:7
+msgid "GNU Taler: Features"
+msgstr ""
+
+#: template/features.html.j2:13
 msgid ""
 "GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -605,28 +738,28 @@ msgid ""
 "evasion and money laundering</span>."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
 "is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:32
 msgid ""
 "Payment are made after <span class=\"tlr\">exchanging existing money</span> "
 "into <em>electronic money</em> with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:41
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:50
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -634,33 +767,33 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:69
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:62
+#: template/features.html.j2:71
 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:79
 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:87
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:94
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:85
+#: template/features.html.j2:96
 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 +801,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:105
 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:112
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:127
 msgid "Practical"
 msgstr ""
 
-#: features.html.j2:116
+#: template/features.html.j2:130
 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:140
 msgid "Stable"
 msgstr ""
 
-#: features.html.j2:129
+#: template/features.html.j2:143
 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,154 +834,157 @@ 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:154 template/governments.html.j2:55
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr ""
 
-#: features.html.j2:143
+#: template/features.html.j2:157
 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:169 template/governments.html.j2:25
 msgid "Taxable"
 msgstr ""
 
-#: features.html.j2:158
+#: template/features.html.j2:172
 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:182
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:170
+#: template/features.html.j2:184
 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:195 template/governments.html.j2:85
 msgid "Libre"
 msgstr ""
 
-#: features.html.j2:184
+#: template/features.html.j2:198
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
-"organizations or whole countries. Since the reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a> package, it will always remain free "
-"software."
+"organizations or whole countries. Since the reference implementation is a"
+msgstr ""
+
+#: template/features.html.j2:205
+msgid "package, it will always remain free 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:37
 msgid "denomination key"
 msgstr ""
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:39
 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:44
 msgid "deposit"
 msgstr ""
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:46
 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:52
 msgid "dirty"
 msgstr ""
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:54
 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:61
 msgid "exchange"
 msgstr ""
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:63
 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:68
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:70
 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 +997,45 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:82
 msgid "extension"
 msgstr ""
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:84
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:88
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:90
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:94
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:96
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:101
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:103
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:107
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:109
 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 +1045,80 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:118
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:120
 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:124
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:126
 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:132
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:134
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:138
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:140
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:144
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:146
 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:152
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:154
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:159
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:161
 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:167
 msgid "revocation"
 msgstr ""
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:169
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -990,101 +1126,101 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:176
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:178
 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:184
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:186
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:190
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:192
 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:197
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:199
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:203
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:205
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:210
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:212
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:216
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:218
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:223
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:225
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:229
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:231
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:236
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:238
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:243
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:245
 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 +1231,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 +1244,7 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:28
+#: template/governments.html.j2:27
 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 +1254,7 @@ msgid ""
 "evasion and black markets less viable."
 msgstr ""
 
-#: governments.html.j2:41
+#: template/governments.html.j2:40
 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 +1266,7 @@ msgid ""
 "multiple devices."
 msgstr ""
 
-#: governments.html.j2:61
+#: template/governments.html.j2:58
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1139,7 +1275,7 @@ msgid ""
 "merchants, the exchange and the state."
 msgstr ""
 
-#: governments.html.j2:73
+#: template/governments.html.j2:70
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1149,98 +1285,98 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:91
+#: template/governments.html.j2:88
 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:98
 msgid "Efficient"
 msgstr ""
 
-#: governments.html.j2:104
+#: template/governments.html.j2:101
 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:117
 msgid "Taler and regulation"
 msgstr ""
 
-#: governments.html.j2:122
+#: template/governments.html.j2:119
 msgid "Anti money laundering (AML)"
 msgstr ""
 
-#: governments.html.j2:123
+#: template/governments.html.j2:120
 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:121
 msgid "Know your customer (KYC)"
 msgstr ""
 
-#: governments.html.j2:125
+#: template/governments.html.j2:122
 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:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr ""
 
-#: governments.html.j2:127
+#: template/governments.html.j2:124
 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:125
 msgid "Payment Services Directive (PSD2)"
 msgstr ""
 
-#: governments.html.j2:129
+#: template/governments.html.j2:126
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
 msgstr ""
 
-#: governments.html.j2:137
+#: template/governments.html.j2:134
 msgid "Taler provides privacy and accountability"
 msgstr ""
 
-#: governments.html.j2:140
+#: template/governments.html.j2:137
 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:145
 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:154
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
-#: governments.html.j2:164
+#: template/governments.html.j2:161
 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:170
 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 +1385,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 +1409,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:29
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:31
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:37
 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 +1428,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:48
 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:53
 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:61
 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 +1449,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:73
 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 +1459,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:84
 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 +1467,42 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:93
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
+"merchant-instance\">here</a>."
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:103
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:109
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:113
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:127
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:130
 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 +1511,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:140
 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 +1519,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:150
 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 +1531,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:164
 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 +1539,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:174
 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 +1549,71 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:191
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
+#: 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.<br> Please "
 "contact <tt>address@hidden</tt> 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 <a href=\"about.html\">team</a> combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1428,19 +1621,21 @@ msgid ""
 "this vision upon the world."
 msgstr ""
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
+msgid "We are currently supported by"
+msgstr ""
+
+#: template/investors.html.j2:41
 msgid ""
-"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
 "the French national institute for research in informatics and automation, "
-"and the <a href=\"https://renewablefreedom.org/\";>Renewable Freedom "
-"Foundation</a>."
+"and the"
 msgstr ""
 
-#: investors.html.j2:45
+#: template/investors.html.j2:50
 msgid "The Technology"
 msgstr ""
 
-#: investors.html.j2:48
+#: template/investors.html.j2:53
 msgid ""
 "All transactions in Taler are secured using <a href=\"bibliography.html"
 "\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1451,11 +1646,11 @@ msgid ""
 "transaction costs are fractions of a cent."
 msgstr ""
 
-#: investors.html.j2:63
+#: template/investors.html.j2:66
 msgid "The Business"
 msgstr ""
 
-#: investors.html.j2:66
+#: template/investors.html.j2:68
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1466,22 +1661,22 @@ msgid ""
 "to facilitate the transactions."
 msgstr ""
 
-#: investors.html.j2:85
+#: template/investors.html.j2:87
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:91
+#: template/investors.html.j2:97
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:120
 msgid "Running a Taler payment service operator"
 msgstr ""
 
-#: investors.html.j2:117
+#: template/investors.html.j2:123
 msgid ""
 "The payment service operator runs the <em>Taler exchange</em>. The exchange "
 "charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1489,37 +1684,37 @@ msgid ""
 "of the computing infrastructure."
 msgstr ""
 
-#: investors.html.j2:127
+#: template/investors.html.j2:133
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
 msgstr ""
 
-#: investors.html.j2:129
+#: template/investors.html.j2:134
 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:135
 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:136
 msgid "Partnership with banks establishes consumer trust."
 msgstr ""
 
-#: investors.html.j2:135
+#: template/investors.html.j2:137
 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 +1722,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 +1737,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 +1746,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 +1755,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:78
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1572,22 +1767,22 @@ msgid ""
 "overhead and thus offer low transaction fees."
 msgstr ""
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:88
 msgid "Flexible"
 msgstr ""
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:90
 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:99
 msgid "Ethical"
 msgstr ""
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:101
 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 +1790,38 @@ msgid ""
 "reference implementations."
 msgstr ""
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:115
 msgid "Manuals for merchants"
 msgstr ""
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:117
 msgid "The GNU Taler merchant backend operator manual"
 msgstr ""
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:121
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr ""
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr ""
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:136
 msgid "The GNU Taler Merchant Backend"
 msgstr ""
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:138
 msgid "Merchants process payments using the Taler backend:"
 msgstr ""
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:144
 msgid ""
 "The backend <b>signs</b> and <b>stores</b> 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:153
 msgid ""
 "The backend <b>validates</b> payments received from the wallet and "
 "<b>executes</b> them with the Taler payment service provider (the exchange). "
@@ -1634,52 +1829,72 @@ msgid ""
 "the Taler backend and check the HTTP status code that is returned."
 msgstr ""
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:164
 msgid ""
 "The backend can <b>list</b> completed transactions and <b>map</b> wire "
 "transfers to sets of business transactions, including the exact terms of "
 "each contract."
 msgstr ""
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:178
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
+#: 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/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
+#: template/principles.html.j2:21
 msgid "GNU Taler: Design Principles"
 msgstr ""
 
-#: principles.html.j2:29
+#: template/principles.html.j2:25
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:31
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:33
 msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:36
 msgid ""
 "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 "\">Free Software</a>. For merchants, our Free Software reference "
@@ -1688,22 +1903,22 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:45
 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:56
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:58
 msgid "You deserve some privacy"
 msgstr ""
 
-#: principles.html.j2:70
+#: template/principles.html.j2:60
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -1711,7 +1926,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:68
 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 +1936,49 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:81
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:83
 msgid "Money laundering"
 msgstr ""
 
-#: principles.html.j2:99
+#: template/principles.html.j2:85
 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:95
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:97
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:99
 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:109
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:110
 msgid ""
 "Privacy by design, privacy by default, General Data Protection Regulation "
 "(GDPR) compliant"
 msgstr ""
 
-#: principles.html.j2:134
+#: template/principles.html.j2:112
 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 +1986,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:122
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:123
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:125
 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 +2002,29 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:136
 msgid "7. Be efficient"
 msgstr ""
 
-#: principles.html.j2:166
+#: template/principles.html.j2:137
 msgid "Energy efficiency"
 msgstr ""
 
-#: principles.html.j2:168
+#: template/principles.html.j2:139
 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:149
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:150
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:152
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -1817,15 +2032,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:163
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:164
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:166
 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 +2050,158 @@ 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:6
+msgid "GNU Taler: Team"
+msgstr ""
+
+#: template/team.html.j2:8
+msgid ""
+"GNU Taler is proudly brought to you by the humans on this page. To contact "
+"the whole team, please write to"
+msgstr ""
+
+#: template/team.html.j2:21
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
 
-#: team.html.j2:21
+#: template/team.html.j2:26
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
 msgstr ""
 
-#: team.html.j2:26
+#: template/team.html.j2:31
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
-msgid "GNU mainatiner, lead developer."
+#: template/team.html.j2:38
+msgid "GNU maintainer, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:43
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr ""
 
-#: team.html.j2:43
+#: template/team.html.j2:48
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
-#: team.html.j2:50
+#: template/team.html.j2:55
 msgid "Software engineer."
 msgstr ""
 
-#: team.html.j2:55
+#: template/team.html.j2:60
 msgid "Sustainable business development."
 msgstr ""
 
-#: team.html.j2:60
+#: template/team.html.j2:65
 msgid "Theoretical foundations."
 msgstr ""
 
-#: team.html.j2:66
+#: template/team.html.j2:71
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:78 template/team.html.j2:82 template/team.html.j2:86
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:92 template/team.html.j2:96 template/team.html.j2:100
 msgid "Translator (Italian)"
 msgstr ""
 
-#: team.html.j2:99
+#: template/team.html.j2:104
 msgid "Translator (German)"
 msgstr ""
 
-#: team.html.j2:106
+#: template/team.html.j2:111
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:110
+#: template/team.html.j2:115
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:118
+#: template/team.html.j2:123
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:122
+#: template/team.html.j2:127
 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:133 template/team.html.j2:137
+#: template/team.html.j2:141 template/team.html.j2:147
+#: template/team.html.j2:151
 msgid "Free software developer."
 msgstr ""
 
-#: common/base.j2:5
-msgid "GNU Taler"
+#: template/wallet.html.j2:108
+msgid "Congratulations, you have installed the Taler wallet. Check out the"
 msgstr ""
 
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
+#: template/wallet.html.j2:113
+msgid "demo"
 msgstr ""
 
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-msgid "Team"
+#: template/wallet.html.j2:119
+msgid "You don't have a wallet installed yet."
 msgstr ""
 
-#: common/footer.j2.inc:16
-msgid "Contact"
+#: template/wallet.html.j2:128
+msgid "Install the wallet for your browser below, then check out the"
 msgstr ""
 
-#: common/footer.j2.inc:21
-msgid "FAQ"
+#: template/wallet.html.j2:132
+msgid "demonstration"
 msgstr ""
 
-#: common/footer.j2.inc:26
-msgid "Bibliography"
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
+msgid "or"
 msgstr ""
 
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://";
-"www.bfh.ch/'>BFH</a>"
+#: template/wallet.html.j2:149
+msgid "is required, but it appears you don't have it installed."
 msgstr ""
 
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
-"only."
+#: template/wallet.html.j2:159
+msgid "version"
 msgstr ""
 
-#: common/navigation.j2.inc:21
-msgid "Features"
+#: template/wallet.html.j2:163
+msgid "or newer is required, but it appears you have an older version."
 msgstr ""
 
-#: common/navigation.j2.inc:22
-msgid "Principles"
+#: template/wallet.html.j2:170
+msgid "Install wallet"
 msgstr ""
 
-#: common/navigation.j2.inc:23
-msgid "Docs"
+#: template/wallet.html.j2:177
+msgid "JavaScript is disabled, installation won't work."
+msgstr ""
+
+#: template/wallet.html.j2:216
+msgid "Install Download Chrome Extension"
+msgstr ""
+
+#: template/wallet.html.j2:223
+msgid "Install GNU Taler"
+msgstr ""
+
+#: template/wallet.html.j2:227
+msgid "from the Chrome Web Store"
+msgstr ""
+
+#: template/wallet.html.j2:239
+msgid "Other browsers"
+msgstr ""
+
+#: template/wallet.html.j2:241
+msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index dcd2ca4..069f84b 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,65 +2,119 @@ 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-03 12:13+0000\n"
 "PO-Revision-Date: 2017-08-10 06:24+0200\n"
 "Last-Translator: \n"
 "Language-Team: es <address@hidden>\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 template/developers.html.j2:66
+msgid "and"
+msgstr "y"
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://";
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"only."
+msgstr ""
+"Está página fue creada usando únicamente <a href='https://www.gnu.org/home.";
+"es.html'>software libre</a>"
+
+#: 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
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
+#: template/contact.html.j2:15
+msgid "An archived, public mailing list for GNU Taler is hosted at"
 msgstr ""
-"Una lista de correo pública archivada para GNU Taler está alojada en <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. Puede enviar mensajes a la lista <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
 
-#: contact.html.j2:25
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
+msgstr ""
+
+#: template/contact.html.j2:29
 msgid "Contacting individuals"
 msgstr "Contacto con los miembros del equipo"
 
-#: contact.html.j2:27
+#: template/contact.html.j2:31
 msgid ""
 "Team members are generally reachable at <tt>address@hidden</tt>. All of "
 "us support receiving GnuPG encrypted e-mails."
@@ -69,36 +123,48 @@ msgstr ""
 "siguiente formato: <tt>address@hidden</tt>. Todos aceptamos correos "
 "electrónicos cifrados con GnuPG."
 
-#: contact.html.j2:36
+#: template/contact.html.j2:40
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:42
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr "Reportar errores"
 
-#: contact.html.j2:48
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "We track open feature requests and bugs in our <a href=\"https://gnunet.";
+#| "org/bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You "
+#| "can also report bugs or feature requests to the mailing list."
 msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
 msgstr ""
 "Registramos públicamente las solicitudes de funcionalidades y los bugs en "
 "nuestro <a href=\"https://gnunet.org/bugs/\";>sistema de seguimiento de bugs</"
 "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:65
 msgid "Executive team"
 msgstr "Comité Ejecutivo"
 
-#: contact.html.j2:61
+#: template/contact.html.j2:67
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -106,32 +172,38 @@ msgstr ""
 "Para solicitudes comerciales que no sean técnicas, póngase en contacto con "
 "<tt>ceo AT taler.net</tt>."
 
-#: 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:9
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the"
 msgstr ""
-"<p>Los contribuidores de GNU Taler con acceso Git deben firmar la <a href="
-"\"https://taler.net/pdf/copyright.pdf\";>asignación de derechos de autor</a> "
-"para asegurarse de que <a href=\"https://gnunet.org/git/gnunet-ev.git/tree/";
-"gnunet_taler_agreement.tex\">el acuerdo GNUnet eV --- Taler Systems SA sobre "
-"licencias y desarrollo colaborativo</a> de los proyectos GNUnet y GNU Taler "
-"sean respetados.</p>"
 
-#: copyright.html.j2:17
-msgid ""
-"<p>The agreements ensure that the code will continue to be made available "
-"under free software licenses, but gives developers the freedom to move code "
+#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
+msgid "of the GNUnet and GNU Taler projects is satisfied."
+msgstr ""
+
+#: template/copyright.html.j2:24
+#, fuzzy
+#| msgid ""
+#| "<p>The agreements ensure that the code will continue to be made available "
+#| "under free software licenses, but gives developers the freedom to move "
+#| "code between GNUnet and GNU Taler without worrying about licenses and the "
+#| "company the ability to dual-license (for example, so that we can "
+#| "distribute via App-stores that are hostile to free software).</p>"
+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 "
 "between GNUnet and GNU Taler without worrying about licenses and the company "
 "the ability to dual-license (for example, so that we can distribute via App-"
-"stores that are hostile to free software).</p>"
+"stores that are hostile to free software)."
 msgstr ""
 "<p>Los acuerdos garantizan que el código seguirá siendo disponible bajo "
 "licencias de software libre, pero brinda a los desarrolladores la libertad "
@@ -140,12 +212,18 @@ msgstr ""
 "para que podamos distribuir a través de las App-stores que son hostiles al "
 "software libre).</p>"
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:34
+#, fuzzy
+#| msgid ""
+#| "<p>Minor contributions (basically, anyone without Git access) do not "
+#| "require copyright assignment. Pseudonymous contributions are accepted, in "
+#| "this case simply sign the agreement with your pseudonym. Scanned copies "
+#| "are sufficient, but snail mail is preferred.</p>"
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do not require "
+"Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
-"sufficient, but snail mail is preferred.</p>"
+"sufficient, but snail mail is preferred."
 msgstr ""
 "<p>Contribuciones menores (básicamente, cualquier persona sin acceso a Git) "
 "no requieren asignación de derechos de autor. Aceptamos contribuciones "
@@ -153,15 +231,15 @@ msgstr ""
 "elegido. Copias escaneadas son suficientes, pero preferimos que sean "
 "enviadas a nuestra dirección de correo postal.</p>"
 
-#: 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 +260,21 @@ 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
+#, fuzzy
+#| 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 HTTP or HTTPS. Taler's security does not depend upon the use of "
+#| "HTTPS, but obviously merchants may choose to offer HTTPS for consistency "
+#| "and because it generally is better for privacy compared to HTTP. Taler "
+#| "uses JSON to encode structure data, making it easy to integrate Taler "
+#| "with existing Web applications. Taler's protocol is documented in detail "
+#| "at <a href=\"https://docs.taler.net/\";>docs.taler.net</a>."
 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 "
@@ -194,8 +282,7 @@ msgid ""
 "obviously merchants may choose to offer HTTPS for consistency and because it "
 "generally is better for privacy compared to HTTP. Taler uses JSON to encode "
 "structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at <a href=\"https://";
-"docs.taler.net/\">docs.taler.net</a>."
+"applications. Taler's protocol is documented in detail at"
 msgstr ""
 "Taler está diseñado para trabajar con Internet. Para garantizar que los "
 "pagos de Taler puedan funcionar con configuraciones restrictivas de red, "
@@ -207,19 +294,29 @@ msgstr ""
 "aplicaciones web existentes. El protocolo de Taler está documentado en "
 "detalle en <a href=\"https://docs.taler.net/\";>docs.taler.net</a>."
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
 msgid "Code"
 msgstr "Código"
 
-#: developers.html.j2:61
-msgid ""
-"Taler is currently primarily developed by a research team at <a href="
-"\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
-"\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
-"repositories can be cloned using the Git and HTTP access methods against "
-"<tt>git.taler.net</tt> with the name of the respective repository. A list of "
-"repositories can be found in our <a href=\"https://git.taler.net/\";>GitWeb</"
-"a>."
+#: template/developers.html.j2:61
+msgid "Taler is currently primarily developed by a research team at"
+msgstr ""
+
+#: template/developers.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "Taler is currently primarily developed by a research team at <a href="
+#| "\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
+#| "\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
+#| "repositories can be cloned using the Git and HTTP access methods against "
+#| "<tt>git.taler.net</tt> with the name of the respective repository. A list "
+#| "of repositories can be found in our <a href=\"https://git.taler.net/";
+#| "\">GitWeb</a>."
+msgid ""
+"However, contributions from anyone are welcome. Our Git repositories can be "
+"cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> "
+"with the name of the respective repository. A list of repositories can be "
+"found in our"
 msgstr ""
 "Taler está siendo actualmente desarrollado principalmente por un equipo de "
 "investigadores en <a href=\"http://www.inria.fr/\";>Inria</a> y <a href="
@@ -229,79 +326,112 @@ msgstr ""
 "net</tt> con el nombre del repositorio respectivo. Puede encontrar una lista "
 "de repositorios en nuestro <a href=\"https://git.taler.net/\";>GitWeb</a>."
 
-#: developers.html.j2:75
+#: template/developers.html.j2:80
 msgid "Documentation"
 msgstr "Documentación"
 
-#: developers.html.j2:78
-msgid ""
-"In addition to this website, the <a href=\"https://git.taler.net/";
-"\">documented code</a> and the <a href=\"https://docs.taler.net/\";>API "
-"documentation</a>. Technical papers can be found in our <a href="
-"\"bibliography.html\">bibliography</a>."
+#: template/developers.html.j2:83
+msgid "In addition to this website, the"
 msgstr ""
-"En complemento de éste sitio web, el <a href=\"https://git.taler.net/";
-"\">código documentado</a> y la <a href=\"https://docs.taler.net/";
-"\">documentación de la API</a> quedan a su disposición. Los documentos "
-"técnicos se pueden encontrar en nuestra <a href=\"bibliography.html"
-"\">bibliografía</a>."
 
-#: developers.html.j2:88
+#: template/developers.html.j2:86
+msgid "documented code"
+msgstr ""
+
+#: template/developers.html.j2:87
+#, fuzzy
+#| msgid "and"
+msgid "and the"
+msgstr "y"
+
+#: template/developers.html.j2:90
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentación"
+
+#: template/developers.html.j2:91
+msgid "Technical papers can be found in our"
+msgstr ""
+
+#: template/developers.html.j2:94
+#, fuzzy
+#| msgid "Bibliography"
+msgid "bibliography"
+msgstr "Bibliografía"
+
+#: template/developers.html.j2:98
 msgid "Discussion"
 msgstr "Debates"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:101
+#, fuzzy
+#| msgid ""
+#| "We have a mailing list for developer discussions. You can subscribe to or "
+#| "read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
+#| "taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
-"read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
-"taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"read the list archive at"
 msgstr ""
 "Tenemos una lista de correo para las discusiones entre desarrolladores. "
 "Puede suscribirse o leer el archivo de la lista en <a href=\"http://lists.";
 "gnu.org/mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/";
 "taler</a>."
 
-#: developers.html.j2:101
+#: template/developers.html.j2:111
 msgid "Regression Testing"
 msgstr "Pruebas de regresión"
 
-#: developers.html.j2:104
-msgid ""
-"We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests to "
-"detect regressions and check for portability at <a href=\"https://buildbot.";
-"taler.net/\">buildbot.taler.net</a>."
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
+#, fuzzy
+#| msgid ""
+#| "We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests "
+#| "to detect regressions and check for portability at <a href=\"https://";
+#| "buildbot.taler.net/\">buildbot.taler.net</a>."
+msgid "automation tests to detect regressions and check for portability at"
 msgstr ""
 "Tenemos pruebas de automatización con <a href=\"https://buildbot.net/";
 "\">Buildbot</a> para detectar regresiones y comprobar su portabilidad en <a "
 "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>."
 
-#: developers.html.j2:113
+#: template/developers.html.j2:126
 msgid "Code Coverage Analysis"
 msgstr "Análisis de cobertura de código"
 
-#: developers.html.j2:116
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at <a href="
-"\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
+#, fuzzy
+#| msgid ""
+#| "We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> "
+#| "to analyze the code coverage of our tests, the results are available at "
+#| "<a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+msgid "to analyze the code coverage of our tests, the results are available at"
 msgstr ""
 "Usamos <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> "
 "para el análisis de cobertura de código de nuestros tests, los resultados "
 "están disponibles en <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>."
 
-#: developers.html.j2:131
+#: template/developers.html.j2:146
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:149 template/investors.html.j2:93
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:165
 msgid "Taler system overview"
 msgstr "Diagrama general del sistema Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:168
 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 +441,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:175
 msgid "system overview"
 msgstr "Diagrama general del sistema"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:178
 msgid ""
 "A customer instructs his <b>bank</b> to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -328,7 +458,7 @@ msgstr ""
 "<b>billetera</b> 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:190
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -349,7 +479,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:208
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -376,7 +506,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:230
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -403,7 +533,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:253
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -420,7 +550,7 @@ msgstr ""
 "bancarias y las monedas (y derechos a cobrar) individuales que fueron "
 "depositadas."
 
-#: developers.html.j2:254
+#: template/developers.html.j2:267
 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 +567,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:282
 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,209 +583,309 @@ msgstr ""
 "proporcional a los fondos que tuviesen en circulación durante el período en "
 "que la computadora estuviese comprometida."
 
-#: docs.html.j2:37
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "GNU Taler en la Prensa"
+
+#: template/docs.html.j2:13
+msgid ""
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
+msgstr ""
+
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
 msgstr ""
 
-#: docs.html.j2:38
-msgid "Also available as"
+#: template/docs.html.j2:40
+msgid "Tutorial and manual for operating a merchant. Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:52
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:62
+#, fuzzy
+#| msgid "exchange"
+msgid "Exchange"
+msgstr "Plataforma de intercambio"
+
+#: template/docs.html.j2:64
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:74
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:76
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:92
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:94
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "Lista de correo"
+
+#: template/docs.html.j2:156
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "Lista de correo"
 
-#: docs.html.j2:152
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:194
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:196
 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:8
 #, fuzzy
 #| msgid ""
 #| "<p>Taler does not use any Blockchain technology or Bitcoin directly. "
 #| "Taler is not based on proof-of-work or any other distributed consensus "
 #| "mechanism. Instead Taler is based on blind signatures.</p>"
 msgid ""
-"<p>Taler does not require any Blockchain technology, and is also not based "
-"on proof-of-work or any other distributed consensus mechanism. Instead, "
-"Taler is based on blind signatures. However, it is theoretically possible to "
-"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
+"Taler does not require any Blockchain technology, and is also not based on "
+"proof-of-work or any other distributed consensus mechanism. Instead, Taler "
+"is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 "<p>Taler no utiliza ninguna tecnología blockchain o Bitcoin directamente. "
 "Taler no se basa en pruebas de autorización ni en ningún otro mecanismo de "
 "consenso distribuido. A diferencia de ellos,Taler se basa en firmas ciegas.</"
 "p>"
 
-#: faq.html.j2:13
+#: template/faq.html.j2:18
+#, fuzzy
+#| msgid ""
+#| "<p>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."
+#| "</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Sin embargo, sería posible retirar las monedas denominadas en bitcoin "
 "para depositarlas en una cartera Taler (con una plataforma de intercambio "
 "que lo permita), lo que otorgaría algunas ventajas sobre Bitcoin simple, "
 "como por ejemplo, tiempos de confirmación instantánea.</p>"
 
-#: faq.html.j2:20
+#: template/faq.html.j2:26
 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:28
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>Your wallet stores digital coins and thus ultimately your computer holds "
+"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.</p>"
+"escrow bank account."
 msgstr ""
 "<p>Su billetera almacena monedas electrónicas y, por lo tanto, su "
 "computadora tiene su saldo. La plataforma de intercambio conserva fondos "
 "equivalentes a las monedas no gastadas en una cuenta bancaria de fondos en "
 "custodia.</p>"
 
-#: faq.html.j2:27
+#: template/faq.html.j2:35
 msgid "What if my wallet is lost?"
 msgstr "¿Qué pasa si mi billetera se pierde?"
 
-#: faq.html.j2:28
+#: template/faq.html.j2:37
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Puesto que las monedas electrónicas de valor en su billetera se "
 "encuentran anonimizadas, el sistema no puede ayudarle a recuperar una "
 "billetera perdida o robada. Al igual que con una billetera física con dinero "
 "en efectivo, usted es responsable de velar por su seguridad.</p>"
 
-#: faq.html.j2:34
+#: template/faq.html.j2:46
+#, fuzzy
+#| msgid ""
+#| "<p>The risk of losing a wallet can be mitigated by making backups or "
+#| "keeping the balance reasonably low.</p>"
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
-"the balance reasonably low.</p>"
+"The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low."
 msgstr ""
 "<p>El riesgo de perder una billetera puede mitigarse haciendo copias de "
 "seguridad o manteniendo el saldo razonablemente bajo.</p>"
 
-#: faq.html.j2:39
+#: template/faq.html.j2:52
 msgid "What if my computer is hacked?"
 msgstr "¿Qué pasa si mi computadora es hackeada?"
 
-#: faq.html.j2:40
+#: template/faq.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Si uno de sus dispositivos es hackeado, un atacante puede eventualmente "
 "gastar monedas de su billetera. La verificación de su saldo puede indicarle "
 "que uno de sus dispositivos ha sido comprometido.</p>"
 
-#: faq.html.j2:46
+#: template/faq.html.j2:61
 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:63
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Si su amigo le proporciona bienes o servicios a cambio de un pago, se "
 "puede habilitar fácilmente como un comerciante Taler y recibir el pago a su "
 "cuenta bancaria.</p>"
 
-#: faq.html.j2:52
+#: template/faq.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "<p>Future versions of the Taler wallet may allow exchanging coins among "
+#| "friends directly as well.</p>"
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well.</p>"
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 "<p>Versiones futuras de la billetera Taler pueden permitir también el "
 "intercambio de monedas directamente entre amigos.</p>"
 
-#: faq.html.j2:58
+#: template/faq.html.j2:76
 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:78
+#, fuzzy
+#| msgid ""
+#| "<p>Taler wallets can store digital coins corresponding to multiple "
+#| "different currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple different "
-"currencies such as the Euro, US Dollars or Bitcoins.</p>"
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 "<p>Las carpetas de Taler pueden almacenar monedas electrónicas "
 "correspondientes a monedas diferentes, como euros, dólares o bitcoins.</p>"
 
-#: faq.html.j2:63
-msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+#: template/faq.html.j2:84
+#, fuzzy
+#| msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+msgid "Taler currently does not offer conversion between currencies."
 msgstr "<p>Actualmente Taler no ofrece conversiones entre monedas.</p>"
 
-#: faq.html.j2:67
+#: template/faq.html.j2:89
 msgid "How does Taler protect my privacy?"
 msgstr "¿De qué manera Taler protege mi privacidad?"
 
-#: faq.html.j2:68
+#: template/faq.html.j2:91
+#, fuzzy
+#| msgid ""
+#| "<p>Your wallet stores digital coins that are <a href=\"https://en.";
+#| "wikipedia.org/wiki/Blind_signature\">blindly signed</a> by an exchange. "
+#| "The use of a blind signature protects your privacy as it prevents the "
+#| "exchange from knowing which coin it signed for which customer.</p>"
 msgid ""
-"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia.";
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer.</p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
 msgstr ""
 "<p>Su billetera almacena monedas electrónicas que son <a href=\"https://es.";
 "wikipedia.org/wiki/Firma_digital_ciega\">firmadas ciegamente</a> por una "
@@ -663,13 +893,13 @@ msgstr ""
 "ya que impide que se conozcan las monedas utilizadas o los clientes "
 "involucrados.</p>"
 
-#: faq.html.j2:79
+#: template/faq.html.j2:101
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:103
 msgid ""
-"<p>The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
 "refunding coins. Operators can also charge fees for closing reserves and for "
 "(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -677,87 +907,86 @@ msgid ""
 "0.001 cent/transaction (at high transaction rates, amortized over billions "
 "of transactions, excluding migration costs). Note that this is an early "
 "estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher.</p>"
+"regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:117
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:119
 msgid ""
-"<p>Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future.</p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:130
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:132
 msgid ""
-"<p>We believe the European Electronic Money Directive provides part of the "
+"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.</p>"
+"have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:139
 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:141
 msgid ""
-"<p>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 "
+"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 "
 "regular bank or a central bank for a centrally banked electronic currency. "
 "Regardless, the bank would fall under the respective banking regulations "
 "establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money.</p>"
+"Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:150
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:152
 msgid ""
-"<p>Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
 "the auditors, but auditors may also provide a method for manual submission "
 "of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public.</p>"
+"respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:161
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:163
 msgid ""
-"<p>We are aware of several businesses running exploratory projects or having "
+"We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
 "regular banks as well as several central banks about the project. That said, "
 "there are currently no products in the market yet, and we believe this would "
 "be premature given the state of the project (see also <a href=\"https://";
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:174
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:176
 msgid ""
-"<p>Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
 "in theory possible with Taler, but they come with a few caveats. "
 "Specifically, recurring payments can only work if the Taler wallet is "
@@ -769,10 +998,16 @@ msgid ""
 "the user would have to make sure to carry a sufficient balance for the "
 "recurring payment to be made. Still, they can be useful, and a future "
 "version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time</p>"
+"feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "GNU Taler en la Prensa"
+
+#: template/features.html.j2:13
 msgid ""
 "GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -780,28 +1015,28 @@ msgid ""
 "evasion and money laundering</span>."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
 "is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:32
 msgid ""
 "Payment are made after <span class=\"tlr\">exchanging existing money</span> "
 "into <em>electronic money</em> with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:41
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:50
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -809,11 +1044,11 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:69
 msgid "Paying with Taler"
 msgstr "Pagando con Taler"
 
-#: features.html.j2:62
+#: template/features.html.j2:71
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -834,7 +1069,7 @@ msgstr ""
 "clic, nunca son rechazados equivocadamente por detección de fraude, y no "
 "representan ningún riesgo de phishing o robo de identidad.</p>"
 
-#: features.html.j2:70
+#: template/features.html.j2:79
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -855,15 +1090,15 @@ msgstr ""
 "clic, nunca son rechazados equivocadamente por detección de fraude, y no "
 "representan ningún riesgo de phishing o robo de identidad.</p>"
 
-#: features.html.j2:77
+#: template/features.html.j2:87
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:94
 msgid "Receiving payments with Taler"
 msgstr "Recibiendo pagos con Taler"
 
-#: features.html.j2:85
+#: template/features.html.j2:96
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -884,21 +1119,21 @@ msgstr ""
 "puede ejecutarse en el hardware del comerciante, o puede estar alojado por "
 "un tercero. </ P>"
 
-#: features.html.j2:94
+#: template/features.html.j2:105
 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:112
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:127
 msgid "Practical"
 msgstr "Práctico"
 
-#: features.html.j2:116
+#: template/features.html.j2:130
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -908,11 +1143,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:140
 msgid "Stable"
 msgstr "Estable"
 
-#: features.html.j2:129
+#: template/features.html.j2:143
 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 +1160,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:154 template/governments.html.j2:55
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Seguro"
 
-#: features.html.j2:143
+#: template/features.html.j2:157
 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 +1176,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:169 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Imponible"
 
-#: features.html.j2:158
+#: template/features.html.j2:172
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -955,11 +1191,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:182
 msgid "Private"
 msgstr "Privado"
 
-#: features.html.j2:170
+#: template/features.html.j2:184
 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,17 +1205,22 @@ 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:195 template/governments.html.j2:85
 msgid "Libre"
 msgstr "Libre"
 
-#: features.html.j2:184
+#: template/features.html.j2:198
+#, fuzzy
+#| msgid ""
+#| "Taler provides protocols and reference implementations that in principle "
+#| "enables anybody to run their own payment infrastructure, be it "
+#| "individuals, organizations or whole countries. Since the reference "
+#| "implementation is a <a href=\"http://www.gnu.org/\";>GNU</a> package, it "
+#| "will always remain free software."
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
-"organizations or whole countries. Since the reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a> package, it will always remain free "
-"software."
+"organizations or whole countries. Since the reference implementation is a"
 msgstr ""
 "Taler ofrece protocolos e implementaciones de referencia que en principio "
 "permiten a cualquiera ejecutar su propia infraestructura de pagos, ya sean "
@@ -987,32 +1228,36 @@ msgstr ""
 "referencia es un paquete <a href=\"http://www.gnu.org/\";>GNU</a>, siempre "
 "permanecerá como software libre."
 
-#: financial-news.html.j2:6
+#: template/features.html.j2:205
+msgid "package, it will always remain free software."
+msgstr ""
+
+#: 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 +1265,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 +1277,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:37
 msgid "denomination key"
 msgstr "Clave de denominación o 'denomination key'"
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:39
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
@@ -1063,11 +1308,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:44
 msgid "deposit"
 msgstr "Depósito"
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:46
 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 +1321,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:52
 msgid "dirty"
 msgstr "Moneda sucia"
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:54
 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 +1336,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:61
 msgid "exchange"
 msgstr "Plataforma de intercambio"
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:63
 #, fuzzy
 #| msgid ""
 #| "Taler's payment service provider. Issues eletronic `coins` during "
@@ -1108,11 +1353,11 @@ msgstr ""
 "durante el `retiro` y las recupera cuando son `depositadas` por los "
 "comerciantes."
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:68
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:70
 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 +1370,28 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:82
 msgid "extension"
 msgstr "Extensión"
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:84
 msgid "implementation of a `wallet` for browsers"
 msgstr "Implementación de una `billetera` para navegadores web"
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:88
 msgid "fresh coin"
 msgstr "Moneda fresca"
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:90
 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:94
 msgid "master key"
 msgstr "Clave maestra o 'master key'"
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:96
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1154,21 +1399,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:101
 msgid "message signing key"
 msgstr "Clave de firma de mensajes"
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:103
 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:107
 msgid "offer"
 msgstr "Oferta"
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:109
 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 +1429,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:118
 msgid "owner"
 msgstr "Propiedad"
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:120
 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:124
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:126
 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:132
 msgid "proof"
 msgstr "Prueba"
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:134
 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:138
 msgid "proposal"
 msgstr "Propuesta"
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:140
 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:144
 msgid "reserve"
 msgstr "Reserva"
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:146
 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 +1484,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:152
 msgid "refreshing"
 msgstr "Renovación de moneda"
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:154
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1251,11 +1496,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:159
 msgid "refund"
 msgstr "Reembolso"
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:161
 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 +1510,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:167
 #, fuzzy
 #| msgid "denomination"
 msgid "revocation"
 msgstr "Denominación"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:169
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1279,11 +1524,11 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:176
 msgid "sharing"
 msgstr "Compartir"
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:178
 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 +1537,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:184
 msgid "signing key"
 msgstr "Clave de firmado"
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:186
 msgid "see message signing key."
 msgstr "Ver clave de firma de mensajes"
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:190
 msgid "spending"
 msgstr "Gasto"
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:192
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1312,19 +1557,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:197
 msgid "transfer"
 msgstr "Transferencia"
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:199
 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:203
 msgid "transaction"
 msgstr "Transacción"
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:205
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1332,38 +1577,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:210
 msgid "transaction id"
 msgstr "Identificador de la transacción o `transaction id`"
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:212
 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:216
 msgid "wallet"
 msgstr "Billetera "
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:218
 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:223
 msgid "wire transfer"
 msgstr "Transferencia bancaria"
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:225
 msgid "see `transfer`"
 msgstr "Ver 'transferencia'"
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:229
 msgid "wire transfer identifier"
 msgstr "Identificador de transferencias bancarias"
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:231
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1371,22 +1616,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:236
 msgid "withdrawal"
 msgstr "Retiro"
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:238
 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:243
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:245
 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 +1642,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 +1661,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:27
 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 +1678,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:40
 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 +1699,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:58
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1469,7 +1714,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:70
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1487,7 +1732,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:88
 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 +1743,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:98
 msgid "Efficient"
 msgstr "Eficiente"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:101
 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 +1758,15 @@ msgstr ""
 "disponibilidad de redes eléctricas nacionales ni contribuirá "
 "(significativamente) a la contaminación ambiental."
 
-#: governments.html.j2:120
+#: template/governments.html.j2:117
 msgid "Taler and regulation"
 msgstr "Taler y la regulación vigente"
 
-#: governments.html.j2:122
+#: template/governments.html.j2:119
 msgid "Anti money laundering (AML)"
 msgstr "Anti Lavado de dinero o 'Anti money laundering' (AML)"
 
-#: governments.html.j2:123
+#: template/governments.html.j2:120
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1529,11 +1774,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:121
 msgid "Know your customer (KYC)"
 msgstr "Conoce a tu cliente (KYC)"
 
-#: governments.html.j2:125
+#: template/governments.html.j2:122
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
@@ -1541,11 +1786,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:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "Regulación General de Protección de Datos (GDPR)"
 
-#: governments.html.j2:127
+#: template/governments.html.j2:124
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
@@ -1554,11 +1799,11 @@ msgstr ""
 "diseño, implementa la minimización de datos y privacidad de forma "
 "predeterminada."
 
-#: governments.html.j2:128
+#: template/governments.html.j2:125
 msgid "Payment Services Directive (PSD2)"
 msgstr "Directriz de Servicios de Pago (PSD2)"
 
-#: governments.html.j2:129
+#: template/governments.html.j2:126
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
@@ -1566,11 +1811,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:134
 msgid "Taler provides privacy and accountability"
 msgstr "Taler provee privacidad y responsabilidad"
 
-#: governments.html.j2:140
+#: template/governments.html.j2:137
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
@@ -1580,7 +1825,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:145
 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 +1835,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:154
 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:161
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
@@ -1605,7 +1850,7 @@ msgstr ""
 "el comerciante. Sin embargo, esta información normalmente no incluye la "
 "identidad del cliente."
 
-#: governments.html.j2:174
+#: template/governments.html.j2:170
 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 +1864,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 +1890,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:29
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:31
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:37
 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 +1909,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:48
 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:53
 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:61
 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 +1930,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:73
 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 +1940,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:84
 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 +1948,42 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:93
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
+"merchant-instance\">here</a>."
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:103
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:109
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:113
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:127
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:130
 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 +1992,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:140
 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 +2000,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:150
 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 +2012,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:164
 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 +2020,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:174
 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 +2030,61 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:191
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
+#: 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.<br> Please "
 "contact <tt>address@hidden</tt> if you want to invest in Taler."
@@ -1791,11 +2093,11 @@ msgstr ""
 "invertir en Taler puede contactarse al correo electrónico <tt>invest@taler."
 "net</tt>"
 
-#: 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 <a href=\"about.html\">team</a> combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1807,22 +2109,21 @@ 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"
+msgstr ""
+
+#: template/investors.html.j2:41
 msgid ""
-"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
 "the French national institute for research in informatics and automation, "
-"and the <a href=\"https://renewablefreedom.org/\";>Renewable Freedom "
-"Foundation</a>."
+"and the"
 msgstr ""
-"Actualmente nos apoya <a href=\"http://www.inria.fr/\";>Inria</a>, el "
-"Instituto Nacional de Investigación en Informática y Automatización, y la <a "
-"href=\"https://renewablefreedom.org/\";>Fundación Libertad Renovable</a>."
 
-#: investors.html.j2:45
+#: template/investors.html.j2:50
 msgid "The Technology"
 msgstr "La Tecnología"
 
-#: investors.html.j2:48
+#: template/investors.html.j2:53
 msgid ""
 "All transactions in Taler are secured using <a href=\"bibliography.html"
 "\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1842,11 +2143,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:66
 msgid "The Business"
 msgstr "El Negocio"
 
-#: investors.html.j2:66
+#: template/investors.html.j2:68
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1865,22 +2166,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:87
 msgid "The Business Case"
 msgstr "El Caso de los Negocios"
 
-#: investors.html.j2:91
+#: template/investors.html.j2:97
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:120
 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:123
 msgid ""
 "The payment service operator runs the <em>Taler exchange</em>. The exchange "
 "charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1893,7 +2194,7 @@ msgstr ""
 "transferencias electrónicas y del funcionamiento de la infraestructura "
 "informática."
 
-#: investors.html.j2:127
+#: template/investors.html.j2:133
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
@@ -1901,7 +2202,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:134
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
@@ -1910,7 +2211,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:135
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -1919,21 +2220,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:136
 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:137
 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 +2246,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 +2268,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 +2284,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 +2298,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:78
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -2014,11 +2315,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:88
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:90
 #, fuzzy
 #| msgid ""
 #| "Taler can be used for different currencies (such as Euros, US Dollars or "
@@ -2034,11 +2335,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:99
 msgid "Ethical"
 msgstr "Ético"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:101
 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 +2351,31 @@ msgstr ""
 "la transparencia proporcionando un estándar abierto e implementaciones de "
 "referencia de software libre."
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:115
 msgid "Manuals for merchants"
 msgstr "Manual para comerciantes"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:117
 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:121
 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:125
 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:136
 msgid "The GNU Taler Merchant Backend"
 msgstr "Backend del comerciante de GNU Taler"
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:138
 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:144
 msgid ""
 "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
@@ -2085,7 +2386,7 @@ msgstr ""
 "comerciante necesita dar la orden del cliente al backend en un formato de "
 "JSON."
 
-#: merchants.html.j2:156
+#: template/merchants.html.j2:153
 msgid ""
 "The backend <b>validates</b> payments received from the wallet and "
 "<b>executes</b> them with the Taler payment service provider (the exchange). "
@@ -2098,7 +2399,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:164
 msgid ""
 "The backend can <b>list</b> completed transactions and <b>map</b> wire "
 "transfers to sets of business transactions, including the exact terms of "
@@ -2108,49 +2409,69 @@ msgstr ""
 "<b>relacionar</b> 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:178
 msgid "customer perspective"
 msgstr "Perspectiva del consumidor"
 
-#: news.html.j2:16
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
+#: 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/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
+#: template/principles.html.j2:21
 #, 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:25
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:31
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:33
 msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:36
 msgid ""
 "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 "\">Free Software</a>. For merchants, our Free Software reference "
@@ -2159,24 +2480,24 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:45
 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:56
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:58
 #, 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:60
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -2184,7 +2505,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:68
 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 +2515,45 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:81
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:83
 #, 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:85
 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:95
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:97
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:99
 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:109
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:110
 #, fuzzy
 #| msgid "General Data Protection Regulation (GDPR)"
 msgid ""
@@ -2240,7 +2561,7 @@ msgid ""
 "(GDPR) compliant"
 msgstr "Regulación General de Protección de Datos (GDPR)"
 
-#: principles.html.j2:134
+#: template/principles.html.j2:112
 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 +2569,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:122
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:123
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:125
 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 +2585,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:136
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Eficiente"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:137
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Eficiente"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:139
 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:149
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:150
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:152
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -2298,15 +2619,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:163
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:164
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:166
 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 +2637,23 @@ 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:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "GNU Taler"
+
+#: template/team.html.j2:8
+msgid ""
+"GNU Taler is proudly brought to you by the humans on this page. To contact "
+"the whole team, please write to"
+msgstr ""
+
+#: template/team.html.j2:21
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
@@ -2328,410 +2661,154 @@ 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:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
 msgstr ""
 "Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
 "de TI en diferentes industrias."
 
-#: team.html.j2:26
+#: template/team.html.j2:31
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
-msgid "GNU mainatiner, lead developer."
+#: template/team.html.j2:38
+msgid "GNU maintainer, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:43
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Criptografía aplicada. Contacto para W3C &amp; Tor."
 
-#: team.html.j2:43
+#: template/team.html.j2:48
 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:55
 msgid "Software engineer."
 msgstr "Ingeniero de Software."
 
-#: team.html.j2:55
+#: template/team.html.j2:60
 msgid "Sustainable business development."
 msgstr "Desarrollo de negocios sostenibles."
 
-#: team.html.j2:60
+#: template/team.html.j2:65
 msgid "Theoretical foundations."
 msgstr "Fundamentos teóricos."
 
-#: team.html.j2:66
+#: template/team.html.j2:71
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:78 template/team.html.j2:82 template/team.html.j2:86
 msgid "Translator (Spanish)"
 msgstr "Traductor (español)"
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:92 template/team.html.j2:96 template/team.html.j2:100
 msgid "Translator (Italian)"
 msgstr "Traductora (italiano)"
 
-#: team.html.j2:99
+#: template/team.html.j2:104
 msgid "Translator (German)"
 msgstr "Traductor (alemán)"
 
-#: team.html.j2:106
+#: template/team.html.j2:111
 msgid "Hardware security module"
 msgstr "Módulo de seguridad de hardware"
 
-#: team.html.j2:110
+#: template/team.html.j2:115
 msgid "Risk management"
 msgstr "Gestión de riesgos"
 
-#: team.html.j2:118
+#: template/team.html.j2:123
 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:127
 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:133 template/team.html.j2:137
+#: template/team.html.j2:141 template/team.html.j2:147
+#: template/team.html.j2:151
 #, 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"
+#: template/wallet.html.j2:108
+msgid "Congratulations, you have installed the Taler wallet. Check out the"
+msgstr ""
 
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://";
-"www.bfh.ch/'>BFH</a>"
+#: template/wallet.html.j2:113
+msgid "demo"
 msgstr ""
 
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
-"only."
+#: template/wallet.html.j2:119
+msgid "You don't have a wallet installed yet."
 msgstr ""
-"Está página fue creada usando únicamente <a href='https://www.gnu.org/home.";
-"es.html'>software libre</a>"
 
-#: common/navigation.j2.inc:21
-msgid "Features"
+#: template/wallet.html.j2:128
+msgid "Install the wallet for your browser below, then check out the"
 msgstr ""
 
-#: common/navigation.j2.inc:22
-msgid "Principles"
+#: template/wallet.html.j2:132
+#, fuzzy
+#| msgid "denomination"
+msgid "demonstration"
+msgstr "Denominación"
+
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
+msgid "or"
 msgstr ""
 
-#: common/navigation.j2.inc:23
-msgid "Docs"
+#: template/wallet.html.j2:149
+msgid "is required, but it appears you don't have it installed."
 msgstr ""
 
+#: template/wallet.html.j2:159
 #, fuzzy
-#~| msgid "exchange"
-#~ msgid "Code (Exchange)"
-#~ msgstr "Plataforma de intercambio"
+#| msgid "extension"
+msgid "version"
+msgstr "Extensión"
 
-#, fuzzy
-#~| msgid "The GNU Taler Merchant Backend"
-#~ msgid "Code (Merchant backend)"
-#~ msgstr "Backend del comerciante de GNU Taler"
+#: template/wallet.html.j2:163
+msgid "or newer is required, but it appears you have an older version."
+msgstr ""
 
+#: template/wallet.html.j2:170
 #, fuzzy
-#~| msgid ""
-#~| "<p>To pay with Taler, customers install an electronic wallet on their "
-#~| "device. Before the first payment, the wallet's balance must be charged "
-#~| "in the desired currency by some other means of payment.</p> <p>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.</p>"
-#~ msgid ""
-#~ "<p>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.</p> <p>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.</p> <p><a href=\"https://demo.taler.net\";>Try it "
-#~ "yourself with the interactive demo!</a></p>"
-#~ msgstr ""
-#~ "<p>Para pagar con Taler, los clientes instalan una billetera electrónica "
-#~ "en su dispositivo. Antes del primer pago, el saldo de la billetera debe "
-#~ "ser abonado en la moneda deseada por algún otro medio de pago.</p> <p>Una "
-#~ "vez que se haya cargado la billetera, los pagos en sitios web solo toman "
-#~ "un clic, nunca son rechazados equivocadamente por detección de fraude, y "
-#~ "no representan ningún riesgo de phishing o robo de identidad.</p>"
+#| msgid "wallet"
+msgid "Install wallet"
+msgstr "Billetera "
 
-#, fuzzy
-#~| msgid ""
-#~| "<p>To receive Taler payments, a merchant needs a bank account in the "
-#~| "desired currency. We provide supporting software in various programming "
-#~| "languages to make the integration painless. The merchant's backend for "
-#~| "Taler transaction processing can run on the merchant's premises or be "
-#~| "hosted by a third party.</p>"
-#~ msgid ""
-#~ "<p>To receive Taler payments, a merchant needs a bank account in the "
-#~ "desired currency. We provide supporting software in various programming "
-#~ "languages to make the integration painless. The merchant's backend for "
-#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
-#~ "customers can pay for products without even having to register an account."
-#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
-#~ "works in our developer documentation!</a></p>"
-#~ msgstr ""
-#~ "<p>Para recibir pagos con Taler, un comerciante necesita una cuenta "
-#~ "bancaria en la moneda deseada. Nosotros proporcionamos el software de "
-#~ "apoyo en varios lenguajes de programación para hacer esta integración más "
-#~ "fácil. El backend para el procesamiento de transacciones del comerciante "
-#~ "por parte de Taler puede ejecutarse en el hardware del comerciante, o "
-#~ "puede estar alojado por un tercero. </ P>"
-
-#~ msgid "PhD Student, Inria.."
-#~ msgstr "Estudiante de doctorado, INRIA."
-
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Ingeniero de Software. Trabaja en libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
-
-#~ msgid "Developer Resources"
-#~ msgstr "Recursos de desarrollo"
-
-#~ msgid "About"
-#~ msgstr "Acerca de GNU Taler"
-
-#~ msgid "For Investors"
-#~ msgstr "Inversionistas"
-
-#~ msgid "Citizens"
-#~ msgstr "Ciudadanos"
-
-#~ msgid "Merchants"
-#~ msgstr "Comerciantes"
-
-#~ msgid "Governments"
-#~ msgstr "Gobiernos"
-
-#~ msgid ""
-#~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
-#~ "Your digital wallet is safer than your physical wallet. At most, you can "
-#~ "lose its contents because your computer or mobile is irreparably damaged "
-#~ "or compromised. Unlike a physical wallet, you can make backups to secure "
-#~ "against data loss."
-#~ msgstr ""
-#~ "Taler utiliza criptografía moderna, que asegura que no haya "
-#~ "falsificación. Es por ello que una billetera electrónica es más segura "
-#~ "que una billetera física. A lo mucho, podrá perder el contenido de su "
-#~ "billetera electrónica si su computadora o teléfono móvil estuviesen "
-#~ "irremediablemente dañados o comprometidos. A diferencia de una billetera "
-#~ "física, puede realizar copias de seguridad para protegerse contra la "
-#~ "pérdida de datos."
-
-#~ msgid ""
-#~ "Your transactions are private, neither the payment service provider nor "
-#~ "merchant needs to learn your identity. There is no need to give out "
-#~ "credit card numbers or other sensitive information. The merchant will "
-#~ "only be able to do exactly the transaction you agreed to."
-#~ msgstr ""
-#~ "Sus transacciones son privadas, ni el proveedor de servicios de pago ni "
-#~ "el comerciante necesitan conocer su identidad. No es necesario dar "
-#~ "números de tarjetas de crédito u otra información delicada. El "
-#~ "comerciante sólo será capaz de hacer exactamente la transacción que se "
-#~ "acordó entre ambas partes."
-
-#~ msgid "Convenient"
-#~ msgstr "Práctico"
-
-#~ msgid ""
-#~ "You will be able to withdraw money to replenish the digital coins in your "
-#~ "wallet using your credit card or wire transfers. Afterwards you can pay "
-#~ "with one-click using the Taler wallet, which optionally keeps your "
-#~ "transaction history on your computer."
-#~ msgstr ""
-#~ "Podrá retirar dinero para reponer las monedas electrónicas en su "
-#~ "billetera utilizando su tarjeta de crédito o transferencias electrónicas. "
-#~ "Después puede pagar con un solo clic usando la billetera Taler, que "
-#~ "opcionalmente guarda el historial de transacciones en su computadora."
+#: template/wallet.html.j2:177
+msgid "JavaScript is disabled, installation won't work."
+msgstr ""
 
-#, fuzzy
-#~| msgid ""
-#~| "Coins in your digital wallet will be of the same denomination as the "
-#~| "cash in your physical wallet. Taler is not a crypto-currency, so you do "
-#~| "not have to worry about cryto-currency related value fluctuations. "
-#~| "Banking with Taler is subject to the usual government protections for "
-#~| "financial services."
-#~ msgid ""
-#~ "Coins in your digital wallet will be of the same denomination as the cash "
-#~ "in your physical wallet. Taler is not a crypto-currency, so you do not "
-#~ "have to worry about crypto-currency related value fluctuations. Banking "
-#~ "with Taler is subject to the usual government protections for financial "
-#~ "services."
-#~ msgstr ""
-#~ "Las monedas en su billetera electrónica serán de la misma denominación "
-#~ "que el efectivo en su billetera física. Taler no es una moneda "
-#~ "criptográfica, por lo que no tiene que preocuparse por las fluctuaciones "
-#~ "del valor relacionadas con la moneda. La banca con Taler está sujeta a "
-#~ "las protecciones habituales del gobierno para los servicios financieros."
-
-#~ msgid "Wallet Browser Extension"
-#~ msgstr "Extensión Wallet para el Navegador Web"
-
-#~ msgid ""
-#~ "We currently provide a <a href=\"wallet.html\">wallet browser extension</"
-#~ "a> for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile "
-#~ "phones and other platforms will be available in the future."
-#~ msgstr ""
-#~ "Actualmente ofrecemos una <a href=\"wallet.html\">billetera</a> como "
-#~ "extensión para los navegadores Chromium, Chrome, Firefox, Opera y Edge. "
-#~ "Las billeteras para teléfonos móviles y otras plataformas estarán "
-#~ "disponibles a futuro."
-
-#~ msgid "Taler Demo"
-#~ msgstr "Demo Taler"
-
-#~ msgid ""
-#~ "You can see how Taler works in practice by visiting our <a href=\"https://";
-#~ "demo.taler.net\">demo page</a>."
-#~ msgstr ""
-#~ "Puede ver cómo funciona Taler visitando nuestra <a href=\"https://demo.";
-#~ "taler.net\">página de demostración</a>."
-
-#~ msgid "The Taler Wallet for customers"
-#~ msgstr "La Billetera Taler para clientes"
-
-#~ msgid "Customers interact with the Taler system using the Taler wallet:"
-#~ msgstr ""
-#~ "Los clientes interactúan con el sistema Taler utilizando la billetera "
-#~ "Taler:"
-
-#~ msgid ""
-#~ "To <b>withdraw</b> electronic coins, the customer transfers funds from "
-#~ "his bank account to the Taler payment service provider (the exchange). "
-#~ "The wire transfer subject must match a code identifying the customer's "
-#~ "wallet. After the wire transfer is complete, the wallet will "
-#~ "automatically withdraw the coins from the exchange."
-#~ msgstr ""
-#~ "Para <b>retirar</b> monedas electrónicas, el cliente transfiere fondos de "
-#~ "su cuenta bancaria al proveedor de servicios de pago de Taler (la "
-#~ "plataforma de intercambio). El asunto de la transferencia bancaria debe "
-#~ "coincidir con un código que identifique la billetera del cliente. Una vez "
-#~ "finalizada la transferencia, la billetera debitará automáticamente las "
-#~ "monedas de la plataforma de intercambio."
-
-#~ msgid ""
-#~ "To <b>spend</b> electronic coins, a merchant must cause the wallet to "
-#~ "display a proposal for some purchase. The wallet will ask the customer "
-#~ "for one-click confirmation. Payment is then instant. Transaction "
-#~ "histories and digitally signed contracts can be preserved by the wallet."
-#~ msgstr ""
-#~ "Para <b>gastar</b> monedas electrónicas, se requiere que un comerciante "
-#~ "entregue a la billetera una propuesta de compra. La billetera le pedirá "
-#~ "al cliente una confirmación de un solo clic. El pago es luego "
-#~ "instantáneo. El historial de transacciones y los contratos firmados "
-#~ "digitalmente pueden ser conservados por la billetera."
-
-#~ msgid ""
-#~ "The customer can use the wallet to <b>review</b> his balance. The wallet "
-#~ "can contain different currencies, and may be shared across devices. "
-#~ "Customers can make backups of the wallet to secure its contents against "
-#~ "hardware failures."
-#~ msgstr ""
-#~ "El cliente puede utilizar la billetera para <b>verificar</b> su saldo. La "
-#~ "billetera puede contener diferentes monedas y puede ser compartida entre "
-#~ "dispositivos. Los clientes pueden realizar copias de seguridad de la "
-#~ "billetera para proteger su contenido contra fallas de hardware."
-
-#~ msgid "Advantages for Citizens"
-#~ msgstr "Ventajas para los ciudadanos"
-
-#~ msgid ""
-#~ "Taler largely functions like digital cash. You withdraw money from your "
-#~ "bank account into your electronic wallet, and can henceforth spend "
-#~ "digital cash. The electronic wallet can carry multiple currencies."
-#~ msgstr ""
-#~ "Taler funciona en gran parte como dinero efectivo electrónico. Usted "
-#~ "retira dinero de su cuenta bancaria para acreditar su billetera "
-#~ "electrónica, y entonces puede utilizar dinero efectivo electrónico. La "
-#~ "billetera electrónica es compatible con diferentes tipos de monedas."
-
-#~ msgid "Resources"
-#~ msgstr "Recursos"
-
-#~ msgid "System Architecture"
-#~ msgstr "Arquitectura del sistema"
-
-#~ msgid "Glossary"
-#~ msgstr "Glosario"
-
-#~ msgid "Developer Introduction"
-#~ msgstr "Introducción para desarrolladores"
-
-#~ msgid "Copyright for Contributors"
-#~ msgstr "Copyright para contribuidores"
-
-#~ msgid "GNU Taler logo"
-#~ msgstr "Logotipo de GNU Taler"
-
-#~ msgid "Taler News"
-#~ msgstr "Noticias de Taler"
+#: template/wallet.html.j2:216
+msgid "Install Download Chrome Extension"
+msgstr ""
 
+#: template/wallet.html.j2:223
 #, fuzzy
-#~| msgid ""
-#~| "GNU Taler is an electronic payment system under development at <a href="
-#~| "\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-#~| "2018. You can learn about Taler on this website, try the <a href="
-#~| "\"https://demo.taler.net\";>demo</a> and look at our <a href=\"https://";
-#~| "docs.taler.net\">documentation</a>."
-#~ msgid ""
-#~ "We expect to make it operational in 2019. You can learn about Taler on "
-#~ "this website, try the <a href=\"https://demo.taler.net\";>demo</a> and "
-#~ "look at our <a href=\"https://docs.taler.net\";>documentation</a>."
-#~ msgstr ""
-#~ "GNU Taler es un sistema de pago electrónico que está siendo desarrollado "
-#~ "en <a href=\"http://www.inria.fr/\";>Inria</a>. Esperamos hacerla "
-#~ "operativa en 2018. Puede aprender sobre Taler en este sitio web, pruebe "
-#~ "la <a href=\"https://demo.taler.net\";>demo</a> y eche un vistazo a "
-#~ "nuestro <a href=\"https://docs.taler.net\";>documentación</a>."
-
-#~ msgid "One-Click Cash Payments!"
-#~ msgstr "¡Pagos en efectivo a un solo click!"
-
-#~ msgid "Performance Analysis"
-#~ msgstr "Performance"
-
-#~ msgid ""
-#~ "We use <a href=\"https://gnunet.org/gauger\";>Gauger</a> for performance "
-#~ "regression analysis of the exchange backend at <a href=\"https://gauger.";
-#~ "taler.net/\">gauger.taler.net</a>."
-#~ msgstr ""
-#~ "Usamos <a href=\"https://gnunet.org/gauger\";>Gauger</a> para el análisis "
-#~ "regresivo de rendimiento de backend de la plataforma de intercambio en <a "
-#~ "href=\"https://gauger.taler.net/\";>gauger.taler.net</a>."
+#| msgid "GNU Taler"
+msgid "Install GNU Taler"
+msgstr "GNU Taler"
+
+#: template/wallet.html.j2:227
+msgid "from the Chrome Web Store"
+msgstr ""
+
+#: template/wallet.html.j2:239
+msgid "Other browsers"
+msgstr ""
+
+#: template/wallet.html.j2:241
+msgid "Wallets for other browsers will be provided in the near future."
+msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 3f96de2..61aacc1 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,137 +2,203 @@ 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-03 12:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fr <address@hidden>\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 template/developers.html.j2:66
+msgid "and"
+msgstr ""
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://";
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"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
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
+#: template/contact.html.j2:15
+msgid "An archived, public mailing list for GNU Taler is hosted at"
 msgstr ""
 
-#: contact.html.j2:25
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
+msgstr ""
+
+#: template/contact.html.j2:29
 msgid "Contacting individuals"
 msgstr ""
 
-#: contact.html.j2:27
+#: template/contact.html.j2:31
 msgid ""
 "Team members are generally reachable at <tt>address@hidden</tt>. All of "
 "us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
-#: contact.html.j2:36
+#: template/contact.html.j2:40
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:42
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
 
-#: contact.html.j2:48
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
 msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"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:65
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:61
+#: template/contact.html.j2:67
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
 msgstr ""
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr ""
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:9
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the"
+msgstr ""
+
+#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
+msgid "of the GNUnet and GNU Taler projects is satisfied."
 msgstr ""
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:24
 msgid ""
-"<p>The agreements ensure that the code will continue to be made available "
-"under free software licenses, but gives developers the freedom to move code "
+"The agreements ensure that the code will continue to be made available under "
+"free software licenses, but gives developers the freedom to move code "
 "between GNUnet and GNU Taler without worrying about licenses and the company "
 "the ability to dual-license (for example, so that we can distribute via App-"
-"stores that are hostile to free software).</p>"
+"stores that are hostile to free software)."
 msgstr ""
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:34
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do not require "
+"Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
-"sufficient, but snail mail is preferred.</p>"
+"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 +210,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 "
@@ -156,96 +222,115 @@ msgid ""
 "obviously merchants may choose to offer HTTPS for consistency and because it "
 "generally is better for privacy compared to HTTP. Taler uses JSON to encode "
 "structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at <a href=\"https://";
-"docs.taler.net/\">docs.taler.net</a>."
+"applications. Taler's protocol is documented in detail at"
 msgstr ""
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
 msgid "Code"
 msgstr "Code"
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
+msgid "Taler is currently primarily developed by a research team at"
+msgstr ""
+
+#: template/developers.html.j2:70
 msgid ""
-"Taler is currently primarily developed by a research team at <a href="
-"\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
-"\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
-"repositories can be cloned using the Git and HTTP access methods against "
-"<tt>git.taler.net</tt> with the name of the respective repository. A list of "
-"repositories can be found in our <a href=\"https://git.taler.net/\";>GitWeb</"
-"a>."
+"However, contributions from anyone are welcome. Our Git repositories can be "
+"cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> "
+"with the name of the respective repository. A list of repositories can be "
+"found in our"
 msgstr ""
 
-#: developers.html.j2:75
+#: template/developers.html.j2:80
 msgid "Documentation"
 msgstr "Documentation"
 
-#: developers.html.j2:78
-msgid ""
-"In addition to this website, the <a href=\"https://git.taler.net/";
-"\">documented code</a> and the <a href=\"https://docs.taler.net/\";>API "
-"documentation</a>. Technical papers can be found in our <a href="
-"\"bibliography.html\">bibliography</a>."
+#: template/developers.html.j2:83
+msgid "In addition to this website, the"
+msgstr ""
+
+#: template/developers.html.j2:86
+msgid "documented code"
+msgstr ""
+
+#: template/developers.html.j2:87
+msgid "and the"
+msgstr ""
+
+#: template/developers.html.j2:90
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentation"
+
+#: template/developers.html.j2:91
+msgid "Technical papers can be found in our"
 msgstr ""
 
-#: developers.html.j2:88
+#: template/developers.html.j2:94
+msgid "bibliography"
+msgstr ""
+
+#: template/developers.html.j2:98
 msgid "Discussion"
 msgstr "Discussion"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:101
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
-"read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
-"taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"read the list archive at"
 msgstr ""
 
-#: developers.html.j2:101
+#: template/developers.html.j2:111
 msgid "Regression Testing"
 msgstr "Tests de régression"
 
-#: developers.html.j2:104
-msgid ""
-"We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests to "
-"detect regressions and check for portability at <a href=\"https://buildbot.";
-"taler.net/\">buildbot.taler.net</a>."
+#: template/developers.html.j2:114
+msgid "We have"
 msgstr ""
 
-#: developers.html.j2:113
+#: template/developers.html.j2:118
+msgid "automation tests to detect regressions and check for portability at"
+msgstr ""
+
+#: template/developers.html.j2:126
 msgid "Code Coverage Analysis"
 msgstr "Mesure de couverture du code"
 
-#: developers.html.j2:116
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at <a href="
-"\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+#: template/developers.html.j2:129
+msgid "We use"
 msgstr ""
 
-#: developers.html.j2:131
+#: template/developers.html.j2:133
+msgid "to analyze the code coverage of our tests, the results are available at"
+msgstr ""
+
+#: template/developers.html.j2:146
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:149 template/investors.html.j2:93
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:165
 msgid "Taler system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:168
 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:175
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:178
 msgid ""
 "A customer instructs his <b>bank</b> to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -253,7 +338,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:177
+#: template/developers.html.j2:190
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -265,7 +350,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:195
+#: template/developers.html.j2:208
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -280,7 +365,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:217
+#: template/developers.html.j2:230
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -294,7 +379,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:240
+#: template/developers.html.j2:253
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -303,7 +388,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:254
+#: template/developers.html.j2:267
 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 +398,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:269
+#: template/developers.html.j2:282
 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,183 +407,230 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:37
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:7
+msgid "GNU Taler: Documentation and Resources"
+msgstr ""
+
+#: template/docs.html.j2:13
+msgid ""
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
+msgstr ""
+
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
 msgstr ""
 
-#: docs.html.j2:38
-msgid "Also available as"
+#: template/docs.html.j2:40
+msgid "Tutorial and manual for operating a merchant. Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:52
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:62
+msgid "Exchange"
+msgstr ""
+
+#: template/docs.html.j2:64
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:74
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:76
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:92
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:94
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+msgid "Mailing List"
+msgstr ""
+
+#: template/docs.html.j2:156
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:152
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:194
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:196
 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:8
 msgid ""
-"<p>Taler does not require any Blockchain technology, and is also not based "
-"on proof-of-work or any other distributed consensus mechanism. Instead, "
-"Taler is based on blind signatures. However, it is theoretically possible to "
-"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
+"Taler does not require any Blockchain technology, and is also not based on "
+"proof-of-work or any other distributed consensus mechanism. Instead, Taler "
+"is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 
-#: faq.html.j2:13
+#: template/faq.html.j2:18
 msgid ""
-"<p>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.</p>"
+"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:26
 msgid "Where is the balance in my wallet stored?"
 msgstr ""
 
-#: faq.html.j2:21
+#: template/faq.html.j2:28
 msgid ""
-"<p>Your wallet stores digital coins and thus ultimately your computer holds "
+"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.</p>"
+"escrow bank account."
 msgstr ""
 
-#: faq.html.j2:27
+#: template/faq.html.j2:35
 msgid "What if my wallet is lost?"
 msgstr ""
 
-#: faq.html.j2:28
+#: template/faq.html.j2:37
 msgid ""
-"<p>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.</p>"
+"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:46
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
-"the balance reasonably low.</p>"
+"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:52
 msgid "What if my computer is hacked?"
 msgstr ""
 
-#: faq.html.j2:40
+#: template/faq.html.j2:54
 msgid ""
-"<p>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.</p>"
+"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:61
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 
-#: faq.html.j2:47
+#: template/faq.html.j2:63
 msgid ""
-"<p>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.</p>"
+"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:70
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well.</p>"
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 
-#: faq.html.j2:58
+#: template/faq.html.j2:76
 msgid "How does Taler handle payments in different currencies?"
 msgstr ""
 
-#: faq.html.j2:59
+#: template/faq.html.j2:78
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple different "
-"currencies such as the Euro, US Dollars or Bitcoins.</p>"
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 
-#: faq.html.j2:63
-msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+#: template/faq.html.j2:84
+msgid "Taler currently does not offer conversion between currencies."
 msgstr ""
 
-#: faq.html.j2:67
+#: template/faq.html.j2:89
 msgid "How does Taler protect my privacy?"
 msgstr ""
 
-#: faq.html.j2:68
+#: template/faq.html.j2:91
 msgid ""
-"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia.";
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer.</p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
 msgstr ""
 
-#: faq.html.j2:79
+#: template/faq.html.j2:101
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:103
 msgid ""
-"<p>The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
 "refunding coins. Operators can also charge fees for closing reserves and for "
 "(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -506,87 +638,86 @@ msgid ""
 "0.001 cent/transaction (at high transaction rates, amortized over billions "
 "of transactions, excluding migration costs). Note that this is an early "
 "estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher.</p>"
+"regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:117
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:119
 msgid ""
-"<p>Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future.</p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:130
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:132
 msgid ""
-"<p>We believe the European Electronic Money Directive provides part of the "
+"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.</p>"
+"have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:139
 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:141
 msgid ""
-"<p>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 "
+"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 "
 "regular bank or a central bank for a centrally banked electronic currency. "
 "Regardless, the bank would fall under the respective banking regulations "
 "establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money.</p>"
+"Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:150
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:152
 msgid ""
-"<p>Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
 "the auditors, but auditors may also provide a method for manual submission "
 "of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public.</p>"
+"respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:161
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:163
 msgid ""
-"<p>We are aware of several businesses running exploratory projects or having "
+"We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
 "regular banks as well as several central banks about the project. That said, "
 "there are currently no products in the market yet, and we believe this would "
 "be premature given the state of the project (see also <a href=\"https://";
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:174
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:176
 msgid ""
-"<p>Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
 "in theory possible with Taler, but they come with a few caveats. "
 "Specifically, recurring payments can only work if the Taler wallet is "
@@ -598,10 +729,14 @@ msgid ""
 "the user would have to make sure to carry a sufficient balance for the "
 "recurring payment to be made. Still, they can be useful, and a future "
 "version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time</p>"
+"feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:7
+msgid "GNU Taler: Features"
+msgstr ""
+
+#: template/features.html.j2:13
 msgid ""
 "GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -609,28 +744,28 @@ msgid ""
 "evasion and money laundering</span>."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
 "is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:32
 msgid ""
 "Payment are made after <span class=\"tlr\">exchanging existing money</span> "
 "into <em>electronic money</em> with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:41
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:50
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -638,33 +773,33 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:69
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:62
+#: template/features.html.j2:71
 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:79
 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:87
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:94
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:85
+#: template/features.html.j2:96
 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 +807,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:105
 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:112
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:127
 #, fuzzy
 #| msgid "Ethical"
 msgid "Practical"
 msgstr "Ethique"
 
-#: features.html.j2:116
+#: template/features.html.j2:130
 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:140
 #, fuzzy
 #| msgid "Taxable"
 msgid "Stable"
 msgstr "Taxable"
 
-#: features.html.j2:129
+#: template/features.html.j2:143
 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,156 +844,159 @@ 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:154 template/governments.html.j2:55
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Sûr"
 
-#: features.html.j2:143
+#: template/features.html.j2:157
 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:169 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Taxable"
 
-#: features.html.j2:158
+#: template/features.html.j2:172
 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:182
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:170
+#: template/features.html.j2:184
 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:195 template/governments.html.j2:85
 msgid "Libre"
 msgstr "Libre"
 
-#: features.html.j2:184
+#: template/features.html.j2:198
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
-"organizations or whole countries. Since the reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a> package, it will always remain free "
-"software."
+"organizations or whole countries. Since the reference implementation is a"
+msgstr ""
+
+#: template/features.html.j2:205
+msgid "package, it will always remain free 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:37
 msgid "denomination key"
 msgstr ""
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:39
 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:44
 msgid "deposit"
 msgstr ""
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:46
 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:52
 msgid "dirty"
 msgstr ""
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:54
 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:61
 msgid "exchange"
 msgstr ""
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:63
 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:68
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:70
 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 +1009,45 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:82
 msgid "extension"
 msgstr ""
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:84
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:88
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:90
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:94
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:96
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:101
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:103
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:107
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:109
 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 +1057,82 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:118
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:120
 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:124
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:126
 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:132
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:134
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:138
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:140
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:144
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:146
 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:152
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:154
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:159
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:161
 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:167
 #, fuzzy
 #| msgid "Documentation"
 msgid "revocation"
 msgstr "Documentation"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:169
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1002,101 +1140,101 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:176
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:178
 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:184
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:186
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:190
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:192
 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:197
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:199
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:203
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:205
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:210
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:212
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:216
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:218
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:223
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:225
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:229
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:231
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:236
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:238
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:243
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:245
 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 +1245,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 +1258,7 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:28
+#: template/governments.html.j2:27
 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 +1268,7 @@ msgid ""
 "evasion and black markets less viable."
 msgstr ""
 
-#: governments.html.j2:41
+#: template/governments.html.j2:40
 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 +1280,7 @@ msgid ""
 "multiple devices."
 msgstr ""
 
-#: governments.html.j2:61
+#: template/governments.html.j2:58
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1151,7 +1289,7 @@ msgid ""
 "merchants, the exchange and the state."
 msgstr ""
 
-#: governments.html.j2:73
+#: template/governments.html.j2:70
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1161,98 +1299,98 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:91
+#: template/governments.html.j2:88
 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:98
 msgid "Efficient"
 msgstr "Efficace"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:101
 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:117
 msgid "Taler and regulation"
 msgstr ""
 
-#: governments.html.j2:122
+#: template/governments.html.j2:119
 msgid "Anti money laundering (AML)"
 msgstr ""
 
-#: governments.html.j2:123
+#: template/governments.html.j2:120
 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:121
 msgid "Know your customer (KYC)"
 msgstr ""
 
-#: governments.html.j2:125
+#: template/governments.html.j2:122
 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:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr ""
 
-#: governments.html.j2:127
+#: template/governments.html.j2:124
 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:125
 msgid "Payment Services Directive (PSD2)"
 msgstr ""
 
-#: governments.html.j2:129
+#: template/governments.html.j2:126
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
 msgstr ""
 
-#: governments.html.j2:137
+#: template/governments.html.j2:134
 msgid "Taler provides privacy and accountability"
 msgstr ""
 
-#: governments.html.j2:140
+#: template/governments.html.j2:137
 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:145
 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:154
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
-#: governments.html.j2:164
+#: template/governments.html.j2:161
 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:170
 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 +1399,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 +1425,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:29
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:31
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:37
 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 +1444,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:48
 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:53
 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:61
 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 +1465,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:73
 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 +1475,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:84
 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 +1483,42 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:93
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
+"merchant-instance\">here</a>."
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:103
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:109
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:113
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:127
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:130
 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 +1527,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:140
 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 +1535,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:150
 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 +1547,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:164
 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 +1555,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:174
 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 +1565,71 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:191
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
+#: 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.<br> Please "
 "contact <tt>address@hidden</tt> 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 <a href=\"about.html\">team</a> combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1442,19 +1637,21 @@ msgid ""
 "this vision upon the world."
 msgstr ""
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
+msgid "We are currently supported by"
+msgstr ""
+
+#: template/investors.html.j2:41
 msgid ""
-"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
 "the French national institute for research in informatics and automation, "
-"and the <a href=\"https://renewablefreedom.org/\";>Renewable Freedom "
-"Foundation</a>."
+"and the"
 msgstr ""
 
-#: investors.html.j2:45
+#: template/investors.html.j2:50
 msgid "The Technology"
 msgstr ""
 
-#: investors.html.j2:48
+#: template/investors.html.j2:53
 msgid ""
 "All transactions in Taler are secured using <a href=\"bibliography.html"
 "\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1465,11 +1662,11 @@ msgid ""
 "transaction costs are fractions of a cent."
 msgstr ""
 
-#: investors.html.j2:63
+#: template/investors.html.j2:66
 msgid "The Business"
 msgstr ""
 
-#: investors.html.j2:66
+#: template/investors.html.j2:68
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1480,22 +1677,22 @@ msgid ""
 "to facilitate the transactions."
 msgstr ""
 
-#: investors.html.j2:85
+#: template/investors.html.j2:87
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:91
+#: template/investors.html.j2:97
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:120
 msgid "Running a Taler payment service operator"
 msgstr ""
 
-#: investors.html.j2:117
+#: template/investors.html.j2:123
 msgid ""
 "The payment service operator runs the <em>Taler exchange</em>. The exchange "
 "charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1503,38 +1700,38 @@ msgid ""
 "of the computing infrastructure."
 msgstr ""
 
-#: investors.html.j2:127
+#: template/investors.html.j2:133
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
 msgstr ""
 
-#: investors.html.j2:129
+#: template/investors.html.j2:134
 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:135
 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:136
 msgid "Partnership with banks establishes consumer trust."
 msgstr ""
 
-#: investors.html.j2:135
+#: template/investors.html.j2:137
 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 +1739,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 +1754,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 +1763,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 +1772,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:78
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1587,22 +1784,22 @@ msgid ""
 "overhead and thus offer low transaction fees."
 msgstr ""
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:88
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:90
 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:99
 msgid "Ethical"
 msgstr "Ethique"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:101
 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 +1807,39 @@ msgid ""
 "reference implementations."
 msgstr ""
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:115
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:117
 msgid "The GNU Taler merchant backend operator manual"
 msgstr ""
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:121
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr ""
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr ""
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:136
 msgid "The GNU Taler Merchant Backend"
 msgstr ""
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:138
 msgid "Merchants process payments using the Taler backend:"
 msgstr ""
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:144
 msgid ""
 "The backend <b>signs</b> and <b>stores</b> 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:153
 msgid ""
 "The backend <b>validates</b> payments received from the wallet and "
 "<b>executes</b> them with the Taler payment service provider (the exchange). "
@@ -1650,52 +1847,72 @@ msgid ""
 "the Taler backend and check the HTTP status code that is returned."
 msgstr ""
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:164
 msgid ""
 "The backend can <b>list</b> completed transactions and <b>map</b> wire "
 "transfers to sets of business transactions, including the exact terms of "
 "each contract."
 msgstr ""
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:178
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
+#: 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/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
+#: template/principles.html.j2:21
 msgid "GNU Taler: Design Principles"
 msgstr ""
 
-#: principles.html.j2:29
+#: template/principles.html.j2:25
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:31
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:33
 msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:36
 msgid ""
 "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 "\">Free Software</a>. For merchants, our Free Software reference "
@@ -1704,22 +1921,22 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:45
 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:56
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:58
 msgid "You deserve some privacy"
 msgstr ""
 
-#: principles.html.j2:70
+#: template/principles.html.j2:60
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -1727,7 +1944,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:68
 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 +1954,49 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:81
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:83
 msgid "Money laundering"
 msgstr ""
 
-#: principles.html.j2:99
+#: template/principles.html.j2:85
 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:95
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:97
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:99
 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:109
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:110
 msgid ""
 "Privacy by design, privacy by default, General Data Protection Regulation "
 "(GDPR) compliant"
 msgstr ""
 
-#: principles.html.j2:134
+#: template/principles.html.j2:112
 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 +2004,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:122
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:123
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:125
 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 +2020,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:136
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Efficace"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:137
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Efficace"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:139
 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:149
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:150
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:152
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -1837,15 +2054,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:163
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:164
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:166
 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 +2072,21 @@ 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:6
+msgid "GNU Taler: Team"
+msgstr ""
+
+#: template/team.html.j2:8
+msgid ""
+"GNU Taler is proudly brought to you by the humans on this page. To contact "
+"the whole team, please write to"
+msgstr ""
+
+#: template/team.html.j2:21
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
@@ -1868,152 +2095,153 @@ 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:26
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
 msgstr ""
 
-#: team.html.j2:26
+#: template/team.html.j2:31
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
-msgid "GNU mainatiner, lead developer."
+#: template/team.html.j2:38
+msgid "GNU maintainer, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:43
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "mathématicien"
 
-#: team.html.j2:43
+#: template/team.html.j2:48
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Enthousiaste Ethique"
 
-#: team.html.j2:50
+#: template/team.html.j2:55
 #, fuzzy
 #| msgid "Software engineer. Works on libebics."
 msgid "Software engineer."
 msgstr "EBICS."
 
-#: team.html.j2:55
+#: template/team.html.j2:60
 #, fuzzy
 msgid "Sustainable business development."
 msgstr "Basse fréquence"
 
-#: team.html.j2:60
+#: template/team.html.j2:65
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Fatale (en théorie)"
 
-#: team.html.j2:66
+#: template/team.html.j2:71
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:78 template/team.html.j2:82 template/team.html.j2:86
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traductrice"
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:92 template/team.html.j2:96 template/team.html.j2:100
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traductrice"
 
-#: team.html.j2:99
+#: template/team.html.j2:104
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traductrice"
 
-#: team.html.j2:106
+#: template/team.html.j2:111
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:110
+#: template/team.html.j2:115
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:118
+#: template/team.html.j2:123
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Principalement inoffensif"
 
-#: team.html.j2:122
+#: template/team.html.j2:127
 #, 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:133 template/team.html.j2:137
+#: template/team.html.j2:141 template/team.html.j2:147
+#: template/team.html.j2:151
 #, fuzzy
 #| msgid "Taler for developers"
 msgid "Free software developer."
 msgstr "Taler pour les développeurs"
 
-#: common/base.j2:5
-msgid "GNU Taler"
+#: template/wallet.html.j2:108
+msgid "Congratulations, you have installed the Taler wallet. Check out the"
 msgstr ""
 
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
+#: template/wallet.html.j2:113
+msgid "demo"
 msgstr ""
 
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-msgid "Team"
+#: template/wallet.html.j2:119
+msgid "You don't have a wallet installed yet."
 msgstr ""
 
-#: common/footer.j2.inc:16
-msgid "Contact"
+#: template/wallet.html.j2:128
+msgid "Install the wallet for your browser below, then check out the"
 msgstr ""
 
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr ""
+#: template/wallet.html.j2:132
+#, fuzzy
+#| msgid "Documentation"
+msgid "demonstration"
+msgstr "Documentation"
 
-#: common/footer.j2.inc:26
-msgid "Bibliography"
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
+msgid "or"
 msgstr ""
 
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://";
-"www.bfh.ch/'>BFH</a>"
+#: template/wallet.html.j2:149
+msgid "is required, but it appears you don't have it installed."
 msgstr ""
 
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
-"only."
+#: template/wallet.html.j2:159
+msgid "version"
 msgstr ""
 
-#: common/navigation.j2.inc:21
-msgid "Features"
+#: template/wallet.html.j2:163
+msgid "or newer is required, but it appears you have an older version."
 msgstr ""
 
-#: common/navigation.j2.inc:22
-msgid "Principles"
+#: template/wallet.html.j2:170
+msgid "Install wallet"
 msgstr ""
 
-#: common/navigation.j2.inc:23
-msgid "Docs"
+#: template/wallet.html.j2:177
+msgid "JavaScript is disabled, installation won't work."
 msgstr ""
 
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "EBICS."
+#: template/wallet.html.j2:216
+msgid "Install Download Chrome Extension"
+msgstr ""
 
-#, fuzzy
-#~| msgid "Software engineer. Works on libebics."
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "EBICS."
+#: template/wallet.html.j2:223
+msgid "Install GNU Taler"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Merchants"
-#~ msgstr "Documentation"
+#: template/wallet.html.j2:227
+msgid "from the Chrome Web Store"
+msgstr ""
 
-#~ msgid "Performance Analysis"
-#~ msgstr "Analyse de performances"
+#: template/wallet.html.j2:239
+msgid "Other browsers"
+msgstr ""
 
-#~ msgid "Translator (Deutsch)"
-#~ msgstr "Traducteur"
+#: template/wallet.html.j2:241
+msgid "Wallets for other browsers will be provided in the near future."
+msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index 2f95135..42ede1c 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,64 +2,120 @@ 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-03 12:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: it <address@hidden>\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 template/developers.html.j2:66
+msgid "and"
+msgstr "e"
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://";
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"only."
+msgstr ""
+"Questa pagina è stata creata utilizzando solo <a href='https://www.gnu.";
+"org/'>Software Libero</a>. "
+
+#: 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
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
+#: template/contact.html.j2:15
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
 msgstr ""
-"L'archivio della mailing list di GNU Taler è disponibile all'indirizzo <a "
-"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. I messaggi per la lista vanno inviati a <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
 
-#: contact.html.j2:25
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
+msgstr ""
+
+#: template/contact.html.j2:29
 msgid "Contacting individuals"
 msgstr "Contattare membri del gruppo"
 
-#: contact.html.j2:27
+#: template/contact.html.j2:31
 msgid ""
 "Team members are generally reachable at <tt>address@hidden</tt>. All of "
 "us support receiving GnuPG encrypted e-mails."
@@ -67,36 +123,48 @@ msgstr ""
 "Ogni membro è generalmente raggiungibile all'indirizzo <tt>LASTNAME@taler."
 "net</tt> Sono particolarmente gradite e-mail criptate via GnuPG."
 
-#: contact.html.j2:36
+#: template/contact.html.j2:40
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:42
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr "Riporta un bug"
 
-#: contact.html.j2:48
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "We track open feature requests and bugs in our <a href=\"https://gnunet.";
+#| "org/bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You "
+#| "can also report bugs or feature requests to the mailing list."
 msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
 msgstr ""
 "Tracciamo bugs e proposte per nuove funzionalità nel nostro <a href="
 "\"https://gnunet.org/bugs/\";>Bug tracker</a>, che serve anche il progetto "
 "GNUnet. Bugs e nuove funzionalità possono essere riportate anche nella "
 "mailing-list."
 
-#: contact.html.j2:59
+#: template/contact.html.j2:65
 msgid "Executive team"
 msgstr "Dirigenza"
 
-#: contact.html.j2:61
+#: template/contact.html.j2:67
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -104,31 +172,38 @@ msgstr ""
 "Per richieste di natura commerciale, si prega di contattare <tt>ceo AT taler."
 "net</tt>."
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr "Diritti d'autore"
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:9
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the"
 msgstr ""
-"<p>I collaboratori di GNU Taler con accesso a Git devono firmare l'<a href="
-"\"/ pdf/copyright.pdf\">attribuzione del diritto d'autore</a> per far sì che "
-"l'<a href=\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.";
-"tex\">accordo GNUnet e.V. --- Taler Systems Sa sulle licenze e lo sviluppo "
-"collaborativo</a> dei progetti GNUnet e GNU Taler sia soddisfatto.</p>"
 
-#: copyright.html.j2:17
-msgid ""
-"<p>The agreements ensure that the code will continue to be made available "
-"under free software licenses, but gives developers the freedom to move code "
+#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
+msgid "of the GNUnet and GNU Taler projects is satisfied."
+msgstr ""
+
+#: template/copyright.html.j2:24
+#, fuzzy
+#| msgid ""
+#| "<p>The agreements ensure that the code will continue to be made available "
+#| "under free software licenses, but gives developers the freedom to move "
+#| "code between GNUnet and GNU Taler without worrying about licenses and the "
+#| "company the ability to dual-license (for example, so that we can "
+#| "distribute via App-stores that are hostile to free software).</p>"
+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 "
 "between GNUnet and GNU Taler without worrying about licenses and the company "
 "the ability to dual-license (for example, so that we can distribute via App-"
-"stores that are hostile to free software).</p>"
+"stores that are hostile to free software)."
 msgstr ""
 "<p>Gli accordi garantiscono che il codice continui ad essere disponibile "
 "sotto licenze di software libero, dando ai programmatori la libertà di "
@@ -136,12 +211,18 @@ msgstr ""
 "alla società la capacità di doppia licenza (ad esempio, in modo da poter "
 "distribuire attraverso App-store ostili al software libero).</p>"
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:34
+#, fuzzy
+#| msgid ""
+#| "<p>Minor contributions (basically, anyone without Git access) do not "
+#| "require copyright assignment. Pseudonymous contributions are accepted, in "
+#| "this case simply sign the agreement with your pseudonym. Scanned copies "
+#| "are sufficient, but snail mail is preferred.</p>"
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do not require "
+"Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
-"sufficient, but snail mail is preferred.</p>"
+"sufficient, but snail mail is preferred."
 msgstr ""
 "<p>Le collaborazioni minori (fondamentalmente, chiunque non abbia accesso a "
 "Git) non richiedono l'attribuzione del diritto d'autore. Le collaborazioni "
@@ -149,15 +230,15 @@ msgstr ""
 "l'accordo con il tuo pseudonimo. Sono sufficienti copie scansionate, ma è "
 "preferibile attraverso posta ordinaria.</p>"
 
-#: 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 +259,21 @@ 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
+#, fuzzy
+#| 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 HTTP or HTTPS. Taler's security does not depend upon the use of "
+#| "HTTPS, but obviously merchants may choose to offer HTTPS for consistency "
+#| "and because it generally is better for privacy compared to HTTP. Taler "
+#| "uses JSON to encode structure data, making it easy to integrate Taler "
+#| "with existing Web applications. Taler's protocol is documented in detail "
+#| "at <a href=\"https://docs.taler.net/\";>docs.taler.net</a>."
 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 "
@@ -190,8 +281,7 @@ msgid ""
 "obviously merchants may choose to offer HTTPS for consistency and because it "
 "generally is better for privacy compared to HTTP. Taler uses JSON to encode "
 "structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at <a href=\"https://";
-"docs.taler.net/\">docs.taler.net</a>."
+"applications. Taler's protocol is documented in detail at"
 msgstr ""
 "Taler è progettato per funzionare su Internet. Per garantire che i pagamenti "
 "con Taler funzionino con configurazioni di rete restrittive, Taler utilizza "
@@ -204,19 +294,29 @@ msgstr ""
 "Taler è documentato in dettaglio sul sito <a href=\"https://docs.taler.net/";
 "\">docs.taler.net</a>."
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
 msgid "Code"
 msgstr "Codice"
 
-#: developers.html.j2:61
-msgid ""
-"Taler is currently primarily developed by a research team at <a href="
-"\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
-"\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
-"repositories can be cloned using the Git and HTTP access methods against "
-"<tt>git.taler.net</tt> with the name of the respective repository. A list of "
-"repositories can be found in our <a href=\"https://git.taler.net/\";>GitWeb</"
-"a>."
+#: template/developers.html.j2:61
+msgid "Taler is currently primarily developed by a research team at"
+msgstr ""
+
+#: template/developers.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "Taler is currently primarily developed by a research team at <a href="
+#| "\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
+#| "\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
+#| "repositories can be cloned using the Git and HTTP access methods against "
+#| "<tt>git.taler.net</tt> with the name of the respective repository. A list "
+#| "of repositories can be found in our <a href=\"https://git.taler.net/";
+#| "\">GitWeb</a>."
+msgid ""
+"However, contributions from anyone are welcome. Our Git repositories can be "
+"cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> "
+"with the name of the respective repository. A list of repositories can be "
+"found in our"
 msgstr ""
 "Attualmente Taler è sviluppato principalmente da un team di ricerca presso  "
 "<a href=\"http://www.inria.fr/\";>Inria</a> e <a href=\"https://gnunet.org/";
@@ -226,79 +326,113 @@ msgstr ""
 "repository. E' possibile trovare un elenco di repository sul nostro <a href="
 "\"https://git.taler.net/\";>GitWeb</a>."
 
-#: developers.html.j2:75
+#: template/developers.html.j2:80
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: developers.html.j2:78
-msgid ""
-"In addition to this website, the <a href=\"https://git.taler.net/";
-"\">documented code</a> and the <a href=\"https://docs.taler.net/\";>API "
-"documentation</a>. Technical papers can be found in our <a href="
-"\"bibliography.html\">bibliography</a>."
+#: template/developers.html.j2:83
+msgid "In addition to this website, the"
+msgstr ""
+
+#: template/developers.html.j2:86
+msgid "documented code"
 msgstr ""
-"Oltre a questo sito web, il <a href=\"https://git.taler.net/\";>codice "
-"documentato</a> e la <a href=\"https://docs.taler.net/\";>documentazione API</"
-"a>. Si possono trovare i documenti tecnici nella nostra <a href="
-"\"bibliography.html\">bibliografia</a>."
 
-#: developers.html.j2:88
+#: template/developers.html.j2:87
+#, fuzzy
+#| msgid "and"
+msgid "and the"
+msgstr "e"
+
+#: template/developers.html.j2:90
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentazione"
+
+#: template/developers.html.j2:91
+msgid "Technical papers can be found in our"
+msgstr ""
+
+#: template/developers.html.j2:94
+#, fuzzy
+#| msgid "GNU Taler Bibliography"
+msgid "bibliography"
+msgstr "Bibliografia"
+
+#: template/developers.html.j2:98
 msgid "Discussion"
 msgstr "Discussione"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:101
+#, fuzzy
+#| msgid ""
+#| "We have a mailing list for developer discussions. You can subscribe to or "
+#| "read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
+#| "taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
-"read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
-"taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"read the list archive at"
 msgstr ""
 "Abbiamo una mailing list per le discussioni tra i programmatori. Puoi "
 "iscriverti o leggere l'archivio al seguente link <a href=\"http://lists.gnu.";
 "org/mailman /listinfo/taler\">http://lists.gnu.org/mailman/listinfo/taler</"
 "a>."
 
-#: developers.html.j2:101
+#: template/developers.html.j2:111
 msgid "Regression Testing"
 msgstr "Test delle regressioni"
 
-#: developers.html.j2:104
-msgid ""
-"We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests to "
-"detect regressions and check for portability at <a href=\"https://buildbot.";
-"taler.net/\">buildbot.taler.net</a>."
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
+#, fuzzy
+#| msgid ""
+#| "We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests "
+#| "to detect regressions and check for portability at <a href=\"https://";
+#| "buildbot.taler.net/\">buildbot.taler.net</a>."
+msgid "automation tests to detect regressions and check for portability at"
 msgstr ""
 "Disponiamo di test di automazione <a href=\"https://buildbot.net/";
 "\">Buildbot</a> per rilevare regressioni e verificare la portabilità al "
 "seguente link <a href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>."
 
-#: developers.html.j2:113
+#: template/developers.html.j2:126
 msgid "Code Coverage Analysis"
 msgstr "Analisi della copertura del codice"
 
-#: developers.html.j2:116
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at <a href="
-"\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
+#, fuzzy
+#| msgid ""
+#| "We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> "
+#| "to analyze the code coverage of our tests, the results are available at "
+#| "<a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+msgid "to analyze the code coverage of our tests, the results are available at"
 msgstr ""
 "Utilizziamo <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</"
 "a> per analizzare la copertura del codice dei nostri test, i risultati sono "
 "disponibili al seguente link <a href=\"https://lcov.taler.net/\";>lcov.taler."
 "net</a>."
 
-#: developers.html.j2:131
+#: template/developers.html.j2:146
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:149 template/investors.html.j2:93
 msgid "Download"
 msgstr "Scarica"
 
-#: developers.html.j2:150
+#: template/developers.html.j2:165
 msgid "Taler system overview"
 msgstr "Panoramica del sistema Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:168
 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 +442,13 @@ msgstr ""
 "mostrato nell'illustrazione a destra. Le transazioni tipiche comportano le "
 "seguenti operazioni:"
 
-#: developers.html.j2:162
+#: template/developers.html.j2:175
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Panoramica del sistema"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:178
 msgid ""
 "A customer instructs his <b>bank</b> to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -326,7 +460,7 @@ msgstr ""
 "include un token di autenticazione dal suo <b>portafoglio</b> elettronico. "
 "Nella terminologia di Taler, il cliente crea una riserva al cambio."
 
-#: developers.html.j2:177
+#: template/developers.html.j2:190
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -347,7 +481,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:208
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -374,7 +508,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:230
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -399,7 +533,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:253
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -414,7 +548,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:267
 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 +564,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:282
 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,222 +578,322 @@ msgstr ""
 "sono compromessi, il danno finanziario è limitato alla rispettiva parte ed è "
 "proporzionale ai fondi in circolazione durante quel periodo."
 
-#: docs.html.j2:37
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "GNU Taler nella Stampa"
+
+#: template/docs.html.j2:13
+msgid ""
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
 msgstr ""
 
-#: docs.html.j2:38
-msgid "Also available as"
+#: template/docs.html.j2:27
+msgid "Components"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
+msgstr ""
+
+#: template/docs.html.j2:40
+msgid "Tutorial and manual for operating a merchant. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:52
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:62
+#, fuzzy
+#| msgid "exchange"
+msgid "Exchange"
+msgstr "cambio"
+
+#: template/docs.html.j2:64
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:74
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:76
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:92
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:94
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "La mailing list"
+
+#: template/docs.html.j2:156
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "La mailing list"
 
-#: docs.html.j2:152
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:194
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:196
 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:8
 #, fuzzy
 #| msgid ""
 #| "<p>Taler does not use any Blockchain technology or Bitcoin directly. "
 #| "Taler is not based on proof-of-work or any other distributed consensus "
 #| "mechanism. Instead Taler is based on blind signatures.</p>"
 msgid ""
-"<p>Taler does not require any Blockchain technology, and is also not based "
-"on proof-of-work or any other distributed consensus mechanism. Instead, "
-"Taler is based on blind signatures. However, it is theoretically possible to "
-"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
+"Taler does not require any Blockchain technology, and is also not based on "
+"proof-of-work or any other distributed consensus mechanism. Instead, Taler "
+"is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 "<p>Taler non utilizza in maniera diretta nessuna tecnologia Blockchain o "
 "Bitcoin. Taler non si basa su proof-of-work o qualsiasi altro modello di "
 "consenso distribuito. Al contrario, esso è basato sulle firme cieche (blind "
 "signatures).</p>"
 
-#: faq.html.j2:13
+#: template/faq.html.j2:18
+#, fuzzy
+#| msgid ""
+#| "<p>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."
+#| "</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Sarebbe possibile, comunque, prelevare monete espresse in Bitcoin verso "
 "un portafoglio Taler (con un cambio appropriato), il quale darebbe alcuni "
 "vantaggi rispetto al semplice Bitcoin, come ad esempio i tempi di conferma "
 "immediati.</p>"
 
-#: faq.html.j2:20
+#: template/faq.html.j2:26
 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:28
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>Your wallet stores digital coins and thus ultimately your computer holds "
+"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.</p>"
+"escrow bank account."
 msgstr ""
 "<p>Il tuo portafoglio contiene monete digitali, così in sostanza è il tuo "
 "computer a conservare il tuo saldo. Il cambio mette da parte i fondi che "
 "corrispondono a tutte le monete non spese in un conto bancario di garanzia.</"
 "p>"
 
-#: faq.html.j2:27
+#: template/faq.html.j2:35
 msgid "What if my wallet is lost?"
 msgstr "Cosa accade se il mio portafoglio si perde? "
 
-#: faq.html.j2:28
+#: template/faq.html.j2:37
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Poiché nel tuo portafoglio le monete digitali di valore vengono rese "
 "anonime, il cambio non può aiutarti a recuperare un portafoglio perso o "
 "rubato. Proprio come accade con un portafoglio materiale per denaro "
 "contante, sei tu responsabile per tenerlo al sicuro.</p>"
 
-#: faq.html.j2:34
+#: template/faq.html.j2:46
+#, fuzzy
+#| msgid ""
+#| "<p>The risk of losing a wallet can be mitigated by making backups or "
+#| "keeping the balance reasonably low.</p>"
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
-"the balance reasonably low.</p>"
+"The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low."
 msgstr ""
 "<p>Il rischio di perdere un portafoglio puà essere ridotto facendo backup o "
 "mantenendo il saldo ragionevolmente basso.</p> "
 
-#: faq.html.j2:39
+#: template/faq.html.j2:52
 msgid "What if my computer is hacked?"
 msgstr "Cosa accade se il mio computer viene attaccato?"
 
-#: faq.html.j2:40
+#: template/faq.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>In caso di compromissione di uno dei tuoi dispositivi, un aggressore può "
 "spendere le monete del tuo portafoglio. Controllare il tuo saldo potrebbe "
 "rivelarti se il tuo dispositivo è stato compromesso.</p>"
 
-#: faq.html.j2:46
+#: template/faq.html.j2:61
 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:63
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Se i tuoi amici ti forniscono beni o servizi in cambio di un pagamento, "
 "possono facilmente creare un commerciante Taler e ricevere il pagamento nel "
 "loro conto bancario.</p>"
 
-#: faq.html.j2:52
+#: template/faq.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "<p>Future versions of the Taler wallet may allow exchanging coins among "
+#| "friends directly as well.</p>"
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well.</p>"
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 "<p>Le versioni future del portafoglio Taler potranno consentire lo scambio "
 "di monete anche direttamente tra amici.</p>"
 
-#: faq.html.j2:58
+#: template/faq.html.j2:76
 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:78
+#, fuzzy
+#| msgid ""
+#| "<p>Taler wallets can store digital coins corresponding to multiple "
+#| "different currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple different "
-"currencies such as the Euro, US Dollars or Bitcoins.</p>"
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 "<p>I portafogli Taler possono contenere monete digitali corrispondenti a più "
 "valute diverse, come l'Euro, il Dollaro americano o i Bitcoin.</p> "
 
-#: faq.html.j2:63
-msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+#: template/faq.html.j2:84
+#, fuzzy
+#| msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+msgid "Taler currently does not offer conversion between currencies."
 msgstr "<p>Al momento Taler non offre la conversione tra le valute.</p> "
 
-#: faq.html.j2:67
+#: template/faq.html.j2:89
 msgid "How does Taler protect my privacy?"
 msgstr "Come protegge Taler la mia privacy?"
 
-#: faq.html.j2:68
+#: template/faq.html.j2:91
+#, fuzzy
+#| msgid ""
+#| "<p>Your wallet stores digital coins that are <a href=\"https://en.";
+#| "wikipedia.org/wiki/Blind_signature\">blindly signed</a> by an exchange. "
+#| "The use of a blind signature protects your privacy as it prevents the "
+#| "exchange from knowing which coin it signed for which customer.</p>"
 msgid ""
-"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia.";
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer.</p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
 msgstr ""
 "<p>Il tuo portafoglio contiene monete digitali che sono <a href=\"https://en.";
 "wikipedia.org/wiki/Blind_signature\">firmate ciecamente</a> da un cambio. "
 "L'uso della blind signature protegge la tua privacy in quanto impedisce al "
 "cambio di sapere quale moneta ha firmato e per quale cliente.</p> "
 
-#: faq.html.j2:79
+#: template/faq.html.j2:101
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:103
 msgid ""
-"<p>The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
 "refunding coins. Operators can also charge fees for closing reserves and for "
 "(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -667,87 +901,86 @@ msgid ""
 "0.001 cent/transaction (at high transaction rates, amortized over billions "
 "of transactions, excluding migration costs). Note that this is an early "
 "estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher.</p>"
+"regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:117
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:119
 msgid ""
-"<p>Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future.</p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:130
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:132
 msgid ""
-"<p>We believe the European Electronic Money Directive provides part of the "
+"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.</p>"
+"have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:139
 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:141
 msgid ""
-"<p>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 "
+"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 "
 "regular bank or a central bank for a centrally banked electronic currency. "
 "Regardless, the bank would fall under the respective banking regulations "
 "establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money.</p>"
+"Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:150
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:152
 msgid ""
-"<p>Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
 "the auditors, but auditors may also provide a method for manual submission "
 "of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public.</p>"
+"respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:161
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:163
 msgid ""
-"<p>We are aware of several businesses running exploratory projects or having "
+"We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
 "regular banks as well as several central banks about the project. That said, "
 "there are currently no products in the market yet, and we believe this would "
 "be premature given the state of the project (see also <a href=\"https://";
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:174
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:176
 msgid ""
-"<p>Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
 "in theory possible with Taler, but they come with a few caveats. "
 "Specifically, recurring payments can only work if the Taler wallet is "
@@ -759,10 +992,16 @@ msgid ""
 "the user would have to make sure to carry a sufficient balance for the "
 "recurring payment to be made. Still, they can be useful, and a future "
 "version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time</p>"
+"feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "GNU Taler nella Stampa"
+
+#: template/features.html.j2:13
 msgid ""
 "GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -770,28 +1009,28 @@ msgid ""
 "evasion and money laundering</span>."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
 "is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:32
 msgid ""
 "Payment are made after <span class=\"tlr\">exchanging existing money</span> "
 "into <em>electronic money</em> with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:41
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:50
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -799,11 +1038,11 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:69
 msgid "Paying with Taler"
 msgstr "Pagare con Taler"
 
-#: features.html.j2:62
+#: template/features.html.j2:71
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -825,7 +1064,7 @@ msgstr ""
 "intercettazione di frodi e non presentano alcun rischio di phishing o furto "
 "di identità.</p> "
 
-#: features.html.j2:70
+#: template/features.html.j2:79
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -847,15 +1086,15 @@ msgstr ""
 "intercettazione di frodi e non presentano alcun rischio di phishing o furto "
 "di identità.</p> "
 
-#: features.html.j2:77
+#: template/features.html.j2:87
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:94
 msgid "Receiving payments with Taler"
 msgstr "Ricevere pagamenti con Taler"
 
-#: features.html.j2:85
+#: template/features.html.j2:96
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -875,21 +1114,21 @@ msgstr ""
 "backend del commerciante per l'elaborazione della transazione di Taler può "
 "essere eseguito nella sede del commerciante o essere ospitato da terzi.</p> "
 
-#: features.html.j2:94
+#: template/features.html.j2:105
 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:112
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:127
 msgid "Practical"
 msgstr "Pratico"
 
-#: features.html.j2:116
+#: template/features.html.j2:130
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -899,11 +1138,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:140
 msgid "Stable"
 msgstr "Stabile"
 
-#: features.html.j2:129
+#: template/features.html.j2:143
 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 +1155,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:154 template/governments.html.j2:55
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Sicuro"
 
-#: features.html.j2:143
+#: template/features.html.j2:157
 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 +1171,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:169 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Tassabile"
 
-#: features.html.j2:158
+#: template/features.html.j2:172
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -946,11 +1186,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:182
 msgid "Private"
 msgstr "Privato"
 
-#: features.html.j2:170
+#: template/features.html.j2:184
 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,18 +1201,23 @@ msgstr ""
 "moneta elettronica. Tuttavia, si ottiene una conferma di pagamento "
 "legalmentevalida. "
 
-#: features.html.j2:181 governments.html.j2:88
+#: template/features.html.j2:195 template/governments.html.j2:85
 #, fuzzy
 msgid "Libre"
 msgstr "Libero"
 
-#: features.html.j2:184
+#: template/features.html.j2:198
+#, fuzzy
+#| msgid ""
+#| "Taler provides protocols and reference implementations that in principle "
+#| "enables anybody to run their own payment infrastructure, be it "
+#| "individuals, organizations or whole countries. Since the reference "
+#| "implementation is a <a href=\"http://www.gnu.org/\";>GNU</a> package, it "
+#| "will always remain free software."
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
-"organizations or whole countries. Since the reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a> package, it will always remain free "
-"software."
+"organizations or whole countries. Since the reference implementation is a"
 msgstr ""
 "Taler fornisce protocolli e implementazioni di riferimento che in linea di "
 "principio permettono a chiunque di gestire la propria infrastruttura di "
@@ -980,32 +1225,36 @@ msgstr ""
 "momento che l'implementazione di riferimento è un pacchetto <a href=\"http://";
 "wwww.gnu.org/\"GNU</a>, rimarrà sempre software libero. "
 
-#: financial-news.html.j2:6
+#: template/features.html.j2:205
+msgid "package, it will always remain free software."
+msgstr ""
+
+#: 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 +1262,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 +1274,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:37
 msgid "denomination key"
 msgstr "chiave di denominazione"
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:39
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
@@ -1056,11 +1305,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:44
 msgid "deposit"
 msgstr "deposito"
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:46
 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 +1318,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:52
 msgid "dirty"
 msgstr "sporco"
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:54
 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 +1333,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:61
 msgid "exchange"
 msgstr "cambio"
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:63
 #, fuzzy
 #| msgid ""
 #| "Taler's payment service provider. Issues eletronic `coins` during "
@@ -1101,11 +1350,11 @@ msgstr ""
 "elettroniche durante il 'prelievo' e le riscatta quando vengono  "
 "'depositate' dai commercianti"
 
-#: glossary.html.j2:60
+#: template/glossary.html.j2:68
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:70
 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 +1367,29 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:82
 msgid "extension"
 msgstr "estensione"
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:84
 msgid "implementation of a `wallet` for browsers"
 msgstr "implementazione di un 'portafoglio' per i browsers"
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:88
 msgid "fresh coin"
 msgstr "moneta fresca"
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:90
 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:94
 msgid "master key"
 msgstr "chiave master"
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:96
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1148,21 +1397,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:101
 msgid "message signing key"
 msgstr "chiave di firma del messaggio"
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:103
 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:107
 msgid "offer"
 msgstr "offerta"
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:109
 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 +1427,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:118
 msgid "owner"
 msgstr "possessore"
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:120
 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:124
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:126
 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:132
 msgid "proof"
 msgstr "prova"
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:134
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
@@ -1211,19 +1460,19 @@ msgstr ""
 "messaggio che dimostra crittograficamente che una particolare richiesta di "
 "risarchimento è corretta "
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:138
 msgid "proposal"
 msgstr "proposta"
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:140
 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:144
 msgid "reserve"
 msgstr "riserva"
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:146
 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 +1482,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:152
 msgid "refreshing"
 msgstr "aggiornamento"
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:154
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1245,11 +1494,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:159
 msgid "refund"
 msgstr "rimborso"
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:161
 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 +1508,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:167
 #, fuzzy
 #| msgid "denomination"
 msgid "revocation"
 msgstr "denominazione"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:169
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1273,11 +1522,11 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:176
 msgid "sharing"
 msgstr "condivisione"
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:178
 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 +1535,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:184
 msgid "signing key"
 msgstr "chiave di firma"
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:186
 msgid "see message signing key."
 msgstr "vedi 'chiave di firma del messaggio' "
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:190
 msgid "spending"
 msgstr "spesa"
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:192
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1306,19 +1555,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:197
 msgid "transfer"
 msgstr "trasferimento"
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:199
 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:203
 msgid "transaction"
 msgstr "transazione"
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:205
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1326,39 +1575,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:210
 msgid "transaction id"
 msgstr "ID di transazione"
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:212
 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:216
 msgid "wallet"
 msgstr "portafoglio"
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:218
 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:223
 msgid "wire transfer"
 msgstr "bonifico bancario"
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:225
 msgid "see `transfer`"
 msgstr "vedi 'trasferimento' "
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:229
 msgid "wire transfer identifier"
 msgstr "identificatore del bonifico bancario"
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:231
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1366,22 +1615,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:236
 msgid "withdrawal"
 msgstr "prelievo"
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:238
 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:243
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:245
 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 +1641,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 +1660,7 @@ msgstr ""
 "autorità di controllo di fiducia. Taler contribuisce alla sovranità digitale "
 "nella critica infrastruttura finanziaria. "
 
-#: governments.html.j2:28
+#: template/governments.html.j2:27
 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 +1677,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:40
 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 +1698,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:58
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1464,7 +1713,7 @@ msgstr ""
 "migliorando la sicurezza economica per gli individui, i commercianti, il "
 "cambio e lo Stato. "
 
-#: governments.html.j2:73
+#: template/governments.html.j2:70
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1481,7 +1730,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:88
 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 +1741,11 @@ msgstr ""
 "dei sistemi di pagamento che oggi minaccia la stabilità politica e "
 "finanziaria globale. "
 
-#: governments.html.j2:101
+#: template/governments.html.j2:98
 msgid "Efficient"
 msgstr "Efficiente"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:101
 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 +1756,15 @@ msgstr ""
 "disponibilità di reti elettriche nazionali e non contribuirà (in modo "
 "significativo) all'inquinamento ambientale. "
 
-#: governments.html.j2:120
+#: template/governments.html.j2:117
 msgid "Taler and regulation"
 msgstr "Taler e la regolamentazione"
 
-#: governments.html.j2:122
+#: template/governments.html.j2:119
 msgid "Anti money laundering (AML)"
 msgstr "Antiriciclaggio (AML) "
 
-#: governments.html.j2:123
+#: template/governments.html.j2:120
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1523,11 +1772,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:121
 msgid "Know your customer (KYC)"
 msgstr "Conosci il tuo cliente (KYC) "
 
-#: governments.html.j2:125
+#: template/governments.html.j2:122
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
@@ -1535,11 +1784,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:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "Regolamento generale sulla protezione dei dati (GDPR) "
 
-#: governments.html.j2:127
+#: template/governments.html.j2:124
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
@@ -1548,11 +1797,11 @@ msgstr ""
 "progettazione implementa la minimizzazione dei dati e la privacy per "
 "impostazione predefinita. "
 
-#: governments.html.j2:128
+#: template/governments.html.j2:125
 msgid "Payment Services Directive (PSD2)"
 msgstr "Direttiva sui servizi di pagamento (PSD2) "
 
-#: governments.html.j2:129
+#: template/governments.html.j2:126
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
@@ -1560,11 +1809,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:134
 msgid "Taler provides privacy and accountability"
 msgstr "Taler offre privacy e responsabilità "
 
-#: governments.html.j2:140
+#: template/governments.html.j2:137
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
@@ -1574,7 +1823,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:145
 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 +1833,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:154
 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:161
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
@@ -1599,7 +1848,7 @@ msgstr ""
 "commerciante. Tuttavia, queste informazioni non includono solitamente "
 "l'identità del cliente. "
 
-#: governments.html.j2:174
+#: template/governments.html.j2:170
 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 +1862,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 +1888,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:29
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:31
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:37
 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 +1907,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:48
 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:53
 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:61
 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 +1928,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:73
 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 +1938,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:84
 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 +1946,42 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:93
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
+"merchant-instance\">here</a>."
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:103
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:109
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:113
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:127
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:130
 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 +1990,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:140
 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 +1998,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:150
 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 +2010,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:164
 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 +2018,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:174
 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 +2028,61 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:191
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
+#: 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.<br> Please "
 "contact <tt>address@hidden</tt> if you want to invest in Taler."
@@ -1785,11 +2091,11 @@ msgstr ""
 "desideri investire in Taler ti preghiamo di contattare <tt>address@hidden</"
 "tt> "
 
-#: 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 <a href=\"about.html\">team</a> combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1802,23 +2108,21 @@ 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"
+msgstr ""
+
+#: template/investors.html.j2:41
 msgid ""
-"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
 "the French national institute for research in informatics and automation, "
-"and the <a href=\"https://renewablefreedom.org/\";>Renewable Freedom "
-"Foundation</a>."
+"and the"
 msgstr ""
-"Attualmente siamo supportati da <a href=\"http://www.inria.fr/\";>Inria</a>, "
-"l'istituto nazionale francese per la ricerca in informatica e automazione, e "
-"dalla <a href=\"https://renewablefreedom.org/\"Renewable Freedom Foundation</"
-"a>. "
 
-#: investors.html.j2:45
+#: template/investors.html.j2:50
 msgid "The Technology"
 msgstr "La Tecnologia"
 
-#: investors.html.j2:48
+#: template/investors.html.j2:53
 msgid ""
 "All transactions in Taler are secured using <a href=\"bibliography.html"
 "\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1837,11 +2141,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:66
 msgid "The Business"
 msgstr "Il Business"
 
-#: investors.html.j2:66
+#: template/investors.html.j2:68
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1859,11 +2163,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:87
 msgid "The Business Case"
 msgstr "Il Caso Aziendale"
 
-#: investors.html.j2:91
+#: template/investors.html.j2:97
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
 "English how Taler can impact current developments in the global payment "
@@ -1873,11 +2177,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:120
 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:123
 msgid ""
 "The payment service operator runs the <em>Taler exchange</em>. The exchange "
 "charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1890,7 +2194,7 @@ msgstr ""
 "bonifici con il sistema bancario e al funzionamento dell'infrastruttura di "
 "calcolo. "
 
-#: investors.html.j2:127
+#: template/investors.html.j2:133
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
@@ -1898,7 +2202,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:134
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
@@ -1907,7 +2211,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:135
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -1916,21 +2220,21 @@ msgstr ""
 "operazione costosa (prelievo, deposito, aggiornamento, rimborso o bonifici "
 "bancari aggregati. "
 
-#: investors.html.j2:133
+#: template/investors.html.j2:136
 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:137
 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 +2246,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 +2269,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 +2284,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 +2298,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:78
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -2011,11 +2315,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:88
 msgid "Flexible"
 msgstr "Flessibile"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:90
 #, fuzzy
 #| msgid ""
 #| "Taler can be used for different currencies (such as Euros, US Dollars or "
@@ -2030,11 +2334,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:99
 msgid "Ethical"
 msgstr "Etico"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:101
 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 +2350,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:115
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Manuali per i commercianti"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:117
 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:121
 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:125
 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:136
 msgid "The GNU Taler Merchant Backend"
 msgstr "Il backend del commerciante GNU Taler"
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:138
 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:144
 msgid ""
 "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
@@ -2081,7 +2385,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:153
 msgid ""
 "The backend <b>validates</b> payments received from the wallet and "
 "<b>executes</b> them with the Taler payment service provider (the exchange). "
@@ -2094,7 +2398,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:164
 msgid ""
 "The backend can <b>list</b> completed transactions and <b>map</b> wire "
 "transfers to sets of business transactions, including the exact terms of "
@@ -2104,47 +2408,67 @@ msgstr ""
 "bonifici a set di transazioni commerciali, includendo i termini esatti di "
 "ogni contratto. "
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:178
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
+#: 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/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
+#: template/principles.html.j2:21
 #, 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:25
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:31
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:33
 msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:36
 msgid ""
 "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 "\">Free Software</a>. For merchants, our Free Software reference "
@@ -2153,24 +2477,24 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:45
 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:56
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:58
 #, 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:60
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -2178,7 +2502,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:68
 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 +2512,45 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:81
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:83
 #, fuzzy
 #| msgid "Anti money laundering (AML)"
 msgid "Money laundering"
 msgstr "Antiriciclaggio (AML) "
 
-#: principles.html.j2:99
+#: template/principles.html.j2:85
 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:95
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:97
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:99
 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:109
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:110
 #, fuzzy
 #| msgid "General Data Protection Regulation (GDPR)"
 msgid ""
@@ -2234,7 +2558,7 @@ msgid ""
 "(GDPR) compliant"
 msgstr "Regolamento generale sulla protezione dei dati (GDPR) "
 
-#: principles.html.j2:134
+#: template/principles.html.j2:112
 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 +2566,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:122
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:123
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:125
 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 +2582,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:136
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Efficiente"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:137
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Efficiente"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:139
 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:149
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:150
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:152
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -2292,15 +2616,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:163
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:164
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:166
 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 +2634,23 @@ 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:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "GNU Taler"
+
+#: template/team.html.j2:8
+msgid ""
+"GNU Taler is proudly brought to you by the humans on this page. To contact "
+"the whole team, please write to"
+msgstr ""
+
+#: template/team.html.j2:21
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
@@ -2323,432 +2659,164 @@ msgstr ""
 "Ricercatore in reti e sicurezza, ingegnere del software; autore di software "
 "GNU"
 
-#: team.html.j2:21
+#: template/team.html.j2:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
 msgstr ""
 "Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
 "diversi settori"
 
-#: team.html.j2:26
+#: template/team.html.j2:31
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
-msgid "GNU mainatiner, lead developer."
+#: template/team.html.j2:38
+msgid "GNU maintainer, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:43
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Matematico e crittografo. Attivo nel W3C &amp; Tor"
 
-#: team.html.j2:43
+#: template/team.html.j2:48
 #, 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:55
 msgid "Software engineer."
 msgstr "Programmatore."
 
-#: team.html.j2:55
+#: template/team.html.j2:60
 msgid "Sustainable business development."
 msgstr "Sviluppo di business sostenibile."
 
-#: team.html.j2:60
+#: template/team.html.j2:65
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Teorica della sicurezza dei protocolli"
 
-#: team.html.j2:66
+#: template/team.html.j2:71
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:78 template/team.html.j2:82 template/team.html.j2:86
 #, 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:92 template/team.html.j2:96 template/team.html.j2:100
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traduttrice per l'italiano."
 
-#: team.html.j2:99
+#: template/team.html.j2:104
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traduttore per lo spagnolo."
 
-#: team.html.j2:106
+#: template/team.html.j2:111
 msgid "Hardware security module"
 msgstr "Sicurezza hardware."
 
-#: team.html.j2:110
+#: template/team.html.j2:115
 msgid "Risk management"
 msgstr "Gestione del rischio."
 
-#: team.html.j2:118
+#: template/team.html.j2:123
 #, 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:127
 #, 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:133 template/team.html.j2:137
+#: template/team.html.j2:141 template/team.html.j2:147
+#: template/team.html.j2:151
 #, 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 <a href='http://";
-"www.bfh.ch/'>BFH</a>"
+#: template/wallet.html.j2:108
+msgid "Congratulations, you have installed the Taler wallet. Check out the"
 msgstr ""
 
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
-"only."
+#: template/wallet.html.j2:113
+msgid "demo"
 msgstr ""
-"Questa pagina è stata creata utilizzando solo <a href='https://www.gnu.";
-"org/'>Software Libero</a>. "
 
-#: common/navigation.j2.inc:21
-msgid "Features"
+#: template/wallet.html.j2:119
+msgid "You don't have a wallet installed yet."
 msgstr ""
 
-#: common/navigation.j2.inc:22
-msgid "Principles"
+#: template/wallet.html.j2:128
+msgid "Install the wallet for your browser below, then check out the"
 msgstr ""
 
-#: common/navigation.j2.inc:23
-msgid "Docs"
-msgstr ""
-
-#, fuzzy
-#~| msgid "exchange"
-#~ msgid "Code (Exchange)"
-#~ msgstr "cambio"
-
-#, fuzzy
-#~| msgid "The GNU Taler Merchant Backend"
-#~ msgid "Code (Merchant backend)"
-#~ msgstr "Il backend del commerciante GNU Taler"
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>To pay with Taler, customers install an electronic wallet on their "
-#~| "device. Before the first payment, the wallet's balance must be charged "
-#~| "in the desired currency by some other means of payment.</p> <p>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.</p>"
-#~ msgid ""
-#~ "<p>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.</p> <p>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.</p> <p><a href=\"https://demo.taler.net\";>Try it "
-#~ "yourself with the interactive demo!</a></p>"
-#~ msgstr ""
-#~ "<p>Per pagare con Taler, i clienti installano un portafoglio elettronico "
-#~ "sul proprio dispositivo. Prima del primo pagamento, il saldo del "
-#~ "portafoglio deve essere caricato da altri mezzi di pagamento nella valuta "
-#~ "desiderata.</p> <p>Una volta che il portafoglio viene caricato, i "
-#~ "pagamenti sui siti web richiedono un solo click, non vengono mai "
-#~ "falsamente respinti per intercettazione di frodi e non presentano alcun "
-#~ "rischio di phishing o furto di identità.</p> "
-
+#: template/wallet.html.j2:132
 #, fuzzy
-#~| msgid ""
-#~| "<p>To receive Taler payments, a merchant needs a bank account in the "
-#~| "desired currency. We provide supporting software in various programming "
-#~| "languages to make the integration painless. The merchant's backend for "
-#~| "Taler transaction processing can run on the merchant's premises or be "
-#~| "hosted by a third party.</p>"
-#~ msgid ""
-#~ "<p>To receive Taler payments, a merchant needs a bank account in the "
-#~ "desired currency. We provide supporting software in various programming "
-#~ "languages to make the integration painless. The merchant's backend for "
-#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
-#~ "customers can pay for products without even having to register an account."
-#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
-#~ "works in our developer documentation!</a></p>"
-#~ msgstr ""
-#~ "<p>Per ricevere i pagamenti di Taler, un commerciante ha bisogno di un "
-#~ "conto bancario nella valuta desiderata. Forniamo software di supporto in "
-#~ "vari linguaggi di programmazione per realizzare senza problemi "
-#~ "l'integrazione. Il backend del commerciante per l'elaborazione della "
-#~ "transazione di Taler può essere eseguito nella sede del commerciante o "
-#~ "essere ospitato da terzi.</p> "
-
-#~ msgid "PhD Student, Inria.."
-#~ msgstr ""
-#~ "Dottorando a Inria Rennes.. Programmatore e architetto del protocollo "
-#~ "Taler."
-
-#, fuzzy
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Programmatore. Attualmente coinvolto in libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
-
-#~ msgid "Developer Resources"
-#~ msgstr "Risorse per i programmatori"
-
-#~ msgid "About"
-#~ msgstr "Chi siamo"
+#| msgid "denomination"
+msgid "demonstration"
+msgstr "denominazione"
 
-#~ msgid "For Investors"
-#~ msgstr "Per gli investitori"
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
+msgid "or"
+msgstr ""
 
-#~ msgid "Citizens"
-#~ msgstr "Cittadini"
+#: template/wallet.html.j2:149
+msgid "is required, but it appears you don't have it installed."
+msgstr ""
 
+#: template/wallet.html.j2:159
 #, fuzzy
-#~ msgid "Merchants"
-#~ msgstr "Commercianti"
-
-#~ msgid "Governments"
-#~ msgstr "Pubbliche Amministrazioni"
-
-#~ msgid ""
-#~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
-#~ "Your digital wallet is safer than your physical wallet. At most, you can "
-#~ "lose its contents because your computer or mobile is irreparably damaged "
-#~ "or compromised. Unlike a physical wallet, you can make backups to secure "
-#~ "against data loss."
-#~ msgstr ""
-#~ "Taler usa crittografia moderna, minimizzando il rischio di "
-#~ "contraffazione. Il portafoglio elettronico è più sicuro di quello fisico. "
-#~ "Nel caso pessimo - si pensi alla compromissione del proprio computer, o "
-#~ "ad un grave danno fisico -, la perdita  è limitata dalla somma presente "
-#~ "nel portafoglio. Tuttavia, Taler permette di effettuare copie di "
-#~ "sicurezza del portafoglio, per ovviare a tali perdite di dati."
-
-#~ msgid ""
-#~ "Your transactions are private, neither the payment service provider nor "
-#~ "merchant needs to learn your identity. There is no need to give out "
-#~ "credit card numbers or other sensitive information. The merchant will "
-#~ "only be able to do exactly the transaction you agreed to."
-#~ msgstr ""
-#~ "Le transazioni Taler sono interamente private, né il venditore né il "
-#~ "servizio di cambio apprenderanno l'identità dell'utente. Al momento di un "
-#~ "acquisto, non è in nessun modo richiesto di fornire dati di carte di "
-#~ "credito o altre informazioni sensibili. Il venditore non potrà in nessun "
-#~ "modo ottenere informazioni sul cliente che non siano state fornite dal "
-#~ "cliente stesso."
-
-#~ msgid "Convenient"
-#~ msgstr "Comodo"
-
-#~ msgid ""
-#~ "You will be able to withdraw money to replenish the digital coins in your "
-#~ "wallet using your credit card or wire transfers. Afterwards you can pay "
-#~ "with one-click using the Taler wallet, which optionally keeps your "
-#~ "transaction history on your computer."
-#~ msgstr ""
-#~ "Il portafoglio potrà essere ricaricato di contante mediante carta di "
-#~ "credito o bonifico bancario. Successivamente, sarà possibile effettuare "
-#~ "pagamenti Taler mediante un singolo click. Il portafoglio terrà inoltre "
-#~ "una lista di tutte le transazioni Taler che avete effettuato."
+#| msgid "extension"
+msgid "version"
+msgstr "estensione"
 
-#, fuzzy
-#~| msgid ""
-#~| "Coins in your digital wallet will be of the same denomination as the "
-#~| "cash in your physical wallet. Taler is not a crypto-currency, so you do "
-#~| "not have to worry about cryto-currency related value fluctuations. "
-#~| "Banking with Taler is subject to the usual government protections for "
-#~| "financial services."
-#~ msgid ""
-#~ "Coins in your digital wallet will be of the same denomination as the cash "
-#~ "in your physical wallet. Taler is not a crypto-currency, so you do not "
-#~ "have to worry about crypto-currency related value fluctuations. Banking "
-#~ "with Taler is subject to the usual government protections for financial "
-#~ "services."
-#~ msgstr ""
-#~ "I gettoni presenti nel vostro portafoglio Taler, avranno gli stessi tagli "
-#~ "di quelli presenti nel vostro portafoglio fisico. Taler non è una nuova "
-#~ "valuta, dunque non risente delle fluttuazioni a cui le nuove critto-"
-#~ "valute sono tipicamente soggette."
-
-#~ msgid "Wallet Browser Extension"
-#~ msgstr "Portafoglio: un'estensione del browser."
-
-#~ msgid ""
-#~ "We currently provide a <a href=\"wallet.html\">wallet browser extension</"
-#~ "a> for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile "
-#~ "phones and other platforms will be available in the future."
-#~ msgstr ""
-#~ "Il portafoglio che forniamo al momento è una <a href=\"wallet.html"
-#~ "\">estensione per browser</a>. I browser supportati sono: Chromium, "
-#~ "Chrome, Firefox, Opera e Edge. Portafogli per smartphones e altre "
-#~ "piattaforme sono in via di sviluppo."
-
-#~ msgid "Taler Demo"
-#~ msgstr "Dimostrazione di Taler"
-
-#~ msgid ""
-#~ "You can see how Taler works in practice by visiting our <a href=\"https://";
-#~ "demo.taler.net\">demo page</a>."
-#~ msgstr ""
-#~ "è possibile vedere Taler in azione visitando la nostra <a href=\"https://";
-#~ "demo.taler.net\">pagina dimostrativa</a>."
-
-#~ msgid "The Taler Wallet for customers"
-#~ msgstr "I clienti e il portafoglio"
-
-#~ msgid "Customers interact with the Taler system using the Taler wallet:"
-#~ msgstr "I clienti interagiscono con Taler usando il portafoglio"
-
-#~ msgid ""
-#~ "To <b>withdraw</b> electronic coins, the customer transfers funds from "
-#~ "his bank account to the Taler payment service provider (the exchange). "
-#~ "The wire transfer subject must match a code identifying the customer's "
-#~ "wallet. After the wire transfer is complete, the wallet will "
-#~ "automatically withdraw the coins from the exchange."
-#~ msgstr ""
-#~ "Per <b>ritirare</b> gettoni, il cliente trasferisce la somma desiderata "
-#~ "dal suo conto in banca a quello dell'ufficio di cambio (chiamato anche "
-#~ "\"exchange\"). La causale del bonifico dovrà contenere un numero che "
-#~ "identifica il portafoglio del cliente. Una volta che il bonifico diventa "
-#~ "effettivo, il portafoglio inizierà automaticamente a ritirare i gettoni "
-#~ "dall'ufficio di cambio."
-
-#~ msgid ""
-#~ "To <b>spend</b> electronic coins, a merchant must cause the wallet to "
-#~ "display a proposal for some purchase. The wallet will ask the customer "
-#~ "for one-click confirmation. Payment is then instant. Transaction "
-#~ "histories and digitally signed contracts can be preserved by the wallet."
-#~ msgstr ""
-#~ "Per <b>spendere</b> i gettoni, quando il cliente seleziona un articolo di "
-#~ "suo interesse presso il sito del venditore, quest'ultimo piloterà il "
-#~ "portafoglio per far visualizzare al cliente un resoconto di ciò che sta "
-#~ "per essere acquistato. Tale resoconto - detto anche \"contratto\" - è una "
-#~ "pagina Web gestita interamente dal portafoglio, nella quale il cliente "
-#~ "può confermare, con un solo click, il suo acquisto. Lo storico delle "
-#~ "transazioni e i contratti che il portafoglio firma per il cliente possono "
-#~ "essere conservati dal portafoglio."
-
-#~ msgid ""
-#~ "The customer can use the wallet to <b>review</b> his balance. The wallet "
-#~ "can contain different currencies, and may be shared across devices. "
-#~ "Customers can make backups of the wallet to secure its contents against "
-#~ "hardware failures."
-#~ msgstr ""
-#~ "Attraverso il portafoglio, il cliente può <b>rivedere</b> il suo "
-#~ "bilancio. Il portafoglio può contenere diverse valute, e può essere "
-#~ "condiviso da più dispositivi. Il cliente può fare copie di sicurezza del "
-#~ "proprio portafoglio per proteggersi contro guasti del proprio hardware."
-
-#~ msgid "Advantages for Citizens"
-#~ msgstr "Vantaggi per il cittadino"
-
-#~ msgid ""
-#~ "Taler largely functions like digital cash. You withdraw money from your "
-#~ "bank account into your electronic wallet, and can henceforth spend "
-#~ "digital cash. The electronic wallet can carry multiple currencies."
-#~ msgstr ""
-#~ "Taler realizza un sistema di contante digitale. Il contante va infatti "
-#~ "prelevato dal conto in banca del cliente e tenuto nel portafoglio "
-#~ "elettronico, da cui potrà essere speso. Il portafoglio può contenere "
-#~ "moneta di diverse valute."
-
-#~ msgid "Resources"
-#~ msgstr "Risorse"
+#: template/wallet.html.j2:163
+msgid "or newer is required, but it appears you have an older version."
+msgstr ""
 
+#: template/wallet.html.j2:170
 #, fuzzy
-#~| msgid "Taler System Architecture"
-#~ msgid "System Architecture"
-#~ msgstr "Architettura di sistema"
-
-#~ msgid "Glossary"
-#~ msgstr "Glossario"
+#| msgid "wallet"
+msgid "Install wallet"
+msgstr "portafoglio"
 
-#~ msgid "Developer Introduction"
-#~ msgstr "Introduzione per i programmatori"
+#: template/wallet.html.j2:177
+msgid "JavaScript is disabled, installation won't work."
+msgstr ""
 
-#~ msgid "Copyright for Contributors"
-#~ msgstr "Diritti d'autore per i collaboratori"
+#: template/wallet.html.j2:216
+msgid "Install Download Chrome Extension"
+msgstr ""
 
+#: template/wallet.html.j2:223
 #, fuzzy
-#~| msgid "GNU Taler Bibliography"
-#~ msgid "GNU Taler logo"
-#~ msgstr "Logo GNU Taler"
+#| msgid "GNU Taler"
+msgid "Install GNU Taler"
+msgstr "GNU Taler"
 
-#~ msgid "Taler News"
-#~ msgstr "Notizie su Taler"
+#: template/wallet.html.j2:227
+msgid "from the Chrome Web Store"
+msgstr ""
 
-#, fuzzy
-#~| msgid ""
-#~| "GNU Taler is an electronic payment system under development at <a href="
-#~| "\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-#~| "2018. You can learn about Taler on this website, try the <a href="
-#~| "\"https://demo.taler.net\";>demo</a> and look at our <a href=\"https://";
-#~| "docs.taler.net\">documentation</a>."
-#~ msgid ""
-#~ "We expect to make it operational in 2019. You can learn about Taler on "
-#~ "this website, try the <a href=\"https://demo.taler.net\";>demo</a> and "
-#~ "look at our <a href=\"https://docs.taler.net\";>documentation</a>."
-#~ msgstr ""
-#~ "GNU Taler è un sistema di pagamento elettronico in fase di sviluppo "
-#~ "presso <a href=\"http://www.inria.fr/\";>Inria</a>. Ci aspettiamo di "
-#~ "renderlo operativo nel 2018. Puoi conoscere Taler su questo sito web, "
-#~ "provare la <a href=\"https://demo.taler.net\";>demo</a> e dare uno sguardo "
-#~ "alla nostra documentazione per gli <a href=\"https://docs.taler.net";
-#~ "\">sviluppatori</a>. "
-
-#~ msgid "One-Click Cash Payments!"
-#~ msgstr "Pagamenti in contanti con un solo click! "
-
-#~ msgid "Performance Analysis"
-#~ msgstr "Analisi delle prestazioni"
-
-#~ msgid ""
-#~ "We use <a href=\"https://gnunet.org/gauger\";>Gauger</a> for performance "
-#~ "regression analysis of the exchange backend at <a href=\"https://gauger.";
-#~ "taler.net/\">gauger.taler.net</a>."
-#~ msgstr ""
-#~ "Ci serviamo di <a href=\"https://gnunet.org/gauger\";>Gauger</a> per "
-#~ "l'analisi dalla regressione delle prestazioni del backend di scambio al "
-#~ "seguente link <a href=\"https://gauger.taler.net/\"gauger.taler.net</a>."
+#: template/wallet.html.j2:239
+msgid "Other browsers"
+msgstr ""
+
+#: template/wallet.html.j2:241
+msgid "Wallets for other browsers will be provided in the near future."
+msgstr ""
diff --git a/locale/pt/LC_MESSAGES/messages.po 
b/locale/pt/LC_MESSAGES/messages.po
index 323028c..4674695 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,65 +6,119 @@ 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-03 12:13+0000\n"
 "PO-Revision-Date: 2018-01-28 15:27-0200\n"
 "Last-Translator: Rafael Fontenelle <address@hidden>\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 template/developers.html.j2:66
+msgid "and"
+msgstr "e"
+
+#: common/footer.j2.inc:35
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://";
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"only."
+msgstr ""
+"Essa página foi criada usando apenas <a href='https://www.gnu.org/'>software "
+"livre</a>."
+
+#: 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
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
+#: template/contact.html.j2:15
+msgid "An archived, public mailing list for GNU Taler is hosted at"
 msgstr ""
-"Uma lista de discussão público arquivada para o GNU Taler é hospedada em <a "
-"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. Você pode enviar mensagens para a lista em <a "
-"href=\"mailto:address@hidden\";>address@hidden</a>."
 
-#: contact.html.j2:25
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
+msgstr ""
+
+#: template/contact.html.j2:29
 msgid "Contacting individuals"
 msgstr "Contatando indivíduos"
 
-#: contact.html.j2:27
+#: template/contact.html.j2:31
 msgid ""
 "Team members are generally reachable at <tt>address@hidden</tt>. All of "
 "us support receiving GnuPG encrypted e-mails."
@@ -72,36 +126,48 @@ msgstr ""
 "Os membros da equipe geralmente são acessíveis em <tt>address@hidden</"
 "tt>. Todos nós apoiamos o recebimento de e-mails criptografados pelo GnuPG."
 
-#: contact.html.j2:36
+#: template/contact.html.j2:40
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:42
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr "Relatando bugs"
 
-#: contact.html.j2:48
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "We track open feature requests and bugs in our <a href=\"https://gnunet.";
+#| "org/bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You "
+#| "can also report bugs or feature requests to the mailing list."
 msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
 msgstr ""
 "Acompanhamos a abertura de pedidos de recursos e erros em nosso <a href="
 "\"https://gnunet.org/bugs/\";>rastreador de bugs</a>, que é compartilhado com "
 "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:65
 msgid "Executive team"
 msgstr "Equipe executiva"
 
-#: contact.html.j2:61
+#: template/contact.html.j2:67
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -109,32 +175,38 @@ msgstr ""
 "Para pedidos comerciais não técnicos, por favor contate <tt>ceo AT taler."
 "net</tt>."
 
-#: 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:9
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the"
 msgstr ""
-"<p>Contribuidores para o GNU Taler com acesso Git devem assinar a <a href=\"/"
-"pdf/copyright.pdf\">atribuição de direitos autorais</a> para garantir que <a "
-"href=\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">o acordo de GNUnet e.V. --- Taler Systems SA sobre licenciamento e "
-"desenvolvimento colaborativo</a> dos projetos GNUnet e GNU Taler esteja "
-"satisfeito.</p>"
 
-#: copyright.html.j2:17
-msgid ""
-"<p>The agreements ensure that the code will continue to be made available "
-"under free software licenses, but gives developers the freedom to move code "
+#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
+msgid "of the GNUnet and GNU Taler projects is satisfied."
+msgstr ""
+
+#: template/copyright.html.j2:24
+#, fuzzy
+#| msgid ""
+#| "<p>The agreements ensure that the code will continue to be made available "
+#| "under free software licenses, but gives developers the freedom to move "
+#| "code between GNUnet and GNU Taler without worrying about licenses and the "
+#| "company the ability to dual-license (for example, so that we can "
+#| "distribute via App-stores that are hostile to free software).</p>"
+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 "
 "between GNUnet and GNU Taler without worrying about licenses and the company "
 "the ability to dual-license (for example, so that we can distribute via App-"
-"stores that are hostile to free software).</p>"
+"stores that are hostile to free software)."
 msgstr ""
 "<p>Os acordos garantem que o código continuará a ser disponibilizado sob as "
 "licenças de software livre, mas oferece aos desenvolvedores a liberdade de "
@@ -143,27 +215,33 @@ msgstr ""
 "distribuir através de lojas de aplicativos (“App stores”) que sejam hostis "
 "ao software livre).</p>"
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:34
+#, fuzzy
+#| msgid ""
+#| "<p>Minor contributions (basically, anyone without Git access) do not "
+#| "require copyright assignment. Pseudonymous contributions are accepted, in "
+#| "this case simply sign the agreement with your pseudonym. Scanned copies "
+#| "are sufficient, but snail mail is preferred.</p>"
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do not require "
+"Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
-"sufficient, but snail mail is preferred.</p>"
+"sufficient, but snail mail is preferred."
 msgstr ""
 "<p>As contribuições menores (basicamente, qualquer pessoa sem acesso Git) "
 "não exigem atribuição de direitos autorais. As contribuições pseudônimas são "
 "aceitas, neste caso, basta assinar o acordo com seu pseudônimo. As cópias "
 "digitalizadas são suficientes, mas correio normal é preferido.</p>"
 
-#: 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 +261,21 @@ 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
+#, fuzzy
+#| 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 HTTP or HTTPS. Taler's security does not depend upon the use of "
+#| "HTTPS, but obviously merchants may choose to offer HTTPS for consistency "
+#| "and because it generally is better for privacy compared to HTTP. Taler "
+#| "uses JSON to encode structure data, making it easy to integrate Taler "
+#| "with existing Web applications. Taler's protocol is documented in detail "
+#| "at <a href=\"https://docs.taler.net/\";>docs.taler.net</a>."
 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 "
@@ -195,8 +283,7 @@ msgid ""
 "obviously merchants may choose to offer HTTPS for consistency and because it "
 "generally is better for privacy compared to HTTP. Taler uses JSON to encode "
 "structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at <a href=\"https://";
-"docs.taler.net/\">docs.taler.net</a>."
+"applications. Taler's protocol is documented in detail at"
 msgstr ""
 "O Taler foi projetado para trabalhar na Internet. Para garantir que os "
 "pagamentos do Taler possam funcionar com configurações de rede restritivas, "
@@ -208,19 +295,29 @@ msgstr ""
 "Web existentes. O protocolo do Taler é documentado em detalhes em <a href="
 "\"https://docs.taler.net/\";>docs.taler.net</a>."
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
 msgid "Code"
 msgstr "Código"
 
-#: developers.html.j2:61
-msgid ""
-"Taler is currently primarily developed by a research team at <a href="
-"\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
-"\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
-"repositories can be cloned using the Git and HTTP access methods against "
-"<tt>git.taler.net</tt> with the name of the respective repository. A list of "
-"repositories can be found in our <a href=\"https://git.taler.net/\";>GitWeb</"
-"a>."
+#: template/developers.html.j2:61
+msgid "Taler is currently primarily developed by a research team at"
+msgstr ""
+
+#: template/developers.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "Taler is currently primarily developed by a research team at <a href="
+#| "\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
+#| "\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
+#| "repositories can be cloned using the Git and HTTP access methods against "
+#| "<tt>git.taler.net</tt> with the name of the respective repository. A list "
+#| "of repositories can be found in our <a href=\"https://git.taler.net/";
+#| "\">GitWeb</a>."
+msgid ""
+"However, contributions from anyone are welcome. Our Git repositories can be "
+"cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> "
+"with the name of the respective repository. A list of repositories can be "
+"found in our"
 msgstr ""
 "Atualmente, o Taler é desenvolvido por uma equipe de pesquisa no <a href="
 "\"http://www.inria.fr/\";>Inria</a> e no <a href=\"https://gnunet.org/";
@@ -230,77 +327,111 @@ msgstr ""
 "lista de repositórios pode ser encontrada em nosso <a href=\"https://git.";
 "taler.net/\">GitWeb</a>."
 
-#: developers.html.j2:75
+#: template/developers.html.j2:80
 msgid "Documentation"
 msgstr "Documentação"
 
-#: developers.html.j2:78
-msgid ""
-"In addition to this website, the <a href=\"https://git.taler.net/";
-"\">documented code</a> and the <a href=\"https://docs.taler.net/\";>API "
-"documentation</a>. Technical papers can be found in our <a href="
-"\"bibliography.html\">bibliography</a>."
+#: template/developers.html.j2:83
+msgid "In addition to this website, the"
+msgstr ""
+
+#: template/developers.html.j2:86
+msgid "documented code"
 msgstr ""
-"Além deste site, o <a href=\"https://git.taler.net/\";>código documentado</a> "
-"e a <a href=\"https://docs.taler.net/\";>API documentação</a>. Os documentos "
-"técnicos podem ser encontrados em nossa <a href=\"bibliography.html"
-"\">bibliografia</a>."
 
-#: developers.html.j2:88
+#: template/developers.html.j2:87
+#, fuzzy
+#| msgid "and"
+msgid "and the"
+msgstr "e"
+
+#: template/developers.html.j2:90
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentação"
+
+#: template/developers.html.j2:91
+msgid "Technical papers can be found in our"
+msgstr ""
+
+#: template/developers.html.j2:94
+#, fuzzy
+#| msgid "Bibliography"
+msgid "bibliography"
+msgstr "Bibliografia"
+
+#: template/developers.html.j2:98
 msgid "Discussion"
 msgstr "Discussão"
 
-#: developers.html.j2:91
+#: template/developers.html.j2:101
+#, fuzzy
+#| msgid ""
+#| "We have a mailing list for developer discussions. You can subscribe to or "
+#| "read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
+#| "taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
-"read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
-"taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"read the list archive at"
 msgstr ""
 "Temos uma lista de discussão para discussões de desenvolvedores. Você pode "
 "se inscrever ou ler o arquivo da lista em <a href=\"http://lists.gnu.org/";
 "mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:101
+#: template/developers.html.j2:111
 msgid "Regression Testing"
 msgstr "Teste de regressão"
 
-#: developers.html.j2:104
-msgid ""
-"We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests to "
-"detect regressions and check for portability at <a href=\"https://buildbot.";
-"taler.net/\">buildbot.taler.net</a>."
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
+#, fuzzy
+#| msgid ""
+#| "We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests "
+#| "to detect regressions and check for portability at <a href=\"https://";
+#| "buildbot.taler.net/\">buildbot.taler.net</a>."
+msgid "automation tests to detect regressions and check for portability at"
 msgstr ""
 "Nós temos testes de automação com <a href=\"https://buildbot.net/";
 "\">Buildbot</a> para detectar regressões e verificar a portabilidade em <a "
 "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>."
 
-#: developers.html.j2:113
+#: template/developers.html.j2:126
 msgid "Code Coverage Analysis"
 msgstr "Análise de cobertura de código"
 
-#: developers.html.j2:116
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at <a href="
-"\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
+#, fuzzy
+#| msgid ""
+#| "We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> "
+#| "to analyze the code coverage of our tests, the results are available at "
+#| "<a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+msgid "to analyze the code coverage of our tests, the results are available at"
 msgstr ""
 "Usamos <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> "
 "para analisar a cobertura do código de nossos testes, os resultados estão "
 "disponíveis em <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>."
 
-#: developers.html.j2:131
+#: template/developers.html.j2:146
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:149 template/investors.html.j2:93
 msgid "Download"
 msgstr "Baixar"
 
-#: developers.html.j2:150
+#: template/developers.html.j2:165
 msgid "Taler system overview"
 msgstr "Visão geral do sistema Taler"
 
-#: developers.html.j2:155
+#: template/developers.html.j2:168
 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 +441,11 @@ msgstr ""
 "ilustrado na ilustração à direita. As transações típicas envolvem as "
 "seguintes etapas:"
 
-#: developers.html.j2:162
+#: template/developers.html.j2:175
 msgid "system overview"
 msgstr "visão geral do sistema"
 
-#: developers.html.j2:165
+#: template/developers.html.j2:178
 msgid ""
 "A customer instructs his <b>bank</b> to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -326,7 +457,7 @@ msgstr ""
 "inclui um token de autenticação de sua <b>carteira</b> eletrônica. Na "
 "terminologia do Taler, o cliente cria uma reserva no câmbio."
 
-#: developers.html.j2:177
+#: template/developers.html.j2:190
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -346,7 +477,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:208
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -372,7 +503,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:230
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -397,7 +528,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:253
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -412,7 +543,7 @@ msgstr ""
 "entre as transferências bancárias e as reivindicações individuais que foram "
 "depositadas."
 
-#: developers.html.j2:254
+#: template/developers.html.j2:267
 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 +559,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:282
 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,220 +573,320 @@ 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
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "GNU Taler na imprensa"
+
+#: template/docs.html.j2:13
+msgid ""
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
+msgstr ""
+
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
 msgstr ""
 
-#: docs.html.j2:38
-msgid "Also available as"
+#: template/docs.html.j2:40
+msgid "Tutorial and manual for operating a merchant. Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:52
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:62
+#, fuzzy
+#| msgid "exchange"
+msgid "Exchange"
+msgstr "câmbio <i>(exchange)</i>"
+
+#: template/docs.html.j2:64
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:74
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:76
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:92
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:94
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "A lista de discussão"
+
+#: template/docs.html.j2:156
 #, 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:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:194
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:196
 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:8
 #, fuzzy
 #| msgid ""
 #| "<p>Taler does not use any Blockchain technology or Bitcoin directly. "
 #| "Taler is not based on proof-of-work or any other distributed consensus "
 #| "mechanism. Instead Taler is based on blind signatures.</p>"
 msgid ""
-"<p>Taler does not require any Blockchain technology, and is also not based "
-"on proof-of-work or any other distributed consensus mechanism. Instead, "
-"Taler is based on blind signatures. However, it is theoretically possible to "
-"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
+"Taler does not require any Blockchain technology, and is also not based on "
+"proof-of-work or any other distributed consensus mechanism. Instead, Taler "
+"is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 "<p>Taler não usa nenhuma tecnologia de Blockchain ou Bitcoin diretamente. O "
 "Taler não é baseado na prova de trabalho ou em qualquer outro mecanismo de "
 "consenso distribuído. Em vez disso, o Taler é baseado em assinaturas cegas.</"
 "p>"
 
-#: faq.html.j2:13
+#: template/faq.html.j2:18
+#, fuzzy
+#| msgid ""
+#| "<p>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."
+#| "</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Seria possível, no entanto, sacar as moedas denominadas em Bitcoin em uma "
 "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.</p>"
 
-#: faq.html.j2:20
+#: template/faq.html.j2:26
 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:28
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>Your wallet stores digital coins and thus ultimately your computer holds "
+"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.</p>"
+"escrow bank account."
 msgstr ""
 "<p>Sua carteira armazena moedas digitais e, portanto, o seu computador "
 "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.</p>"
 
-#: faq.html.j2:27
+#: template/faq.html.j2:35
 msgid "What if my wallet is lost?"
 msgstr "E se minha carteira for perdida?"
 
-#: faq.html.j2:28
+#: template/faq.html.j2:37
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Como as moedas digitais de valor em sua carteira são anonimizadas, o "
 "câmbio não pode ajudá-lo a recuperar uma carteira perdida ou roubada. Assim "
 "como com uma carteira física para dinheiro, você é responsável por mantê-lo "
 "seguro.</p>"
 
-#: faq.html.j2:34
+#: template/faq.html.j2:46
+#, fuzzy
+#| msgid ""
+#| "<p>The risk of losing a wallet can be mitigated by making backups or "
+#| "keeping the balance reasonably low.</p>"
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
-"the balance reasonably low.</p>"
+"The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low."
 msgstr ""
 "<p>O risco de perder uma carteira pode ser mitigado fazendo backups ou "
 "mantendo o saldo razoavelmente baixo.</p>"
 
-#: faq.html.j2:39
+#: template/faq.html.j2:52
 msgid "What if my computer is hacked?"
 msgstr "E se meu computador for hackeado?"
 
-#: faq.html.j2:40
+#: template/faq.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>No caso de um comprometimento de um dos seus dispositivos, um invasor "
 "pode gastar moedas da sua carteira. Verificar seu equilíbrio pode revelar "
 "que seu dispositivo foi comprometido.</p>"
 
-#: faq.html.j2:46
+#: template/faq.html.j2:61
 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:63
+#, fuzzy
+#| msgid ""
+#| "<p>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.</p>"
 msgid ""
-"<p>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.</p>"
+"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 ""
 "<p>Se o seu amigo fornecer bens ou serviços para você em troca de um "
 "pagamento, eles podem configurar facilmente um comerciante no Taler e "
 "receber o pagamento em sua conta bancária.</p>"
 
-#: faq.html.j2:52
+#: template/faq.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "<p>Future versions of the Taler wallet may allow exchanging coins among "
+#| "friends directly as well.</p>"
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well.</p>"
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 "<p>As versões futuras da carteira do Taler podem permitir também trocar "
 "moedas entre amigos.</p>"
 
-#: faq.html.j2:58
+#: template/faq.html.j2:76
 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:78
+#, fuzzy
+#| msgid ""
+#| "<p>Taler wallets can store digital coins corresponding to multiple "
+#| "different currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple different "
-"currencies such as the Euro, US Dollars or Bitcoins.</p>"
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 "<p>As carteiras do Taler podem armazenar moedas digitais correspondentes a "
 "várias moedas diferentes, como o Euro, Dólares dos EUA ou Bitcoins.</p>"
 
-#: faq.html.j2:63
-msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+#: template/faq.html.j2:84
+#, fuzzy
+#| msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+msgid "Taler currently does not offer conversion between currencies."
 msgstr "<p>O Taler atualmente não oferece conversão entre moedas.</p>"
 
-#: faq.html.j2:67
+#: template/faq.html.j2:89
 msgid "How does Taler protect my privacy?"
 msgstr "Como o Taler protege minha privacidade?"
 
-#: faq.html.j2:68
+#: template/faq.html.j2:91
+#, fuzzy
+#| msgid ""
+#| "<p>Your wallet stores digital coins that are <a href=\"https://en.";
+#| "wikipedia.org/wiki/Blind_signature\">blindly signed</a> by an exchange. "
+#| "The use of a blind signature protects your privacy as it prevents the "
+#| "exchange from knowing which coin it signed for which customer.</p>"
 msgid ""
-"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia.";
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer.</p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
 msgstr ""
 "<p>A sua carteira armazena moedas digitais que são <a href=\"https://en.";
 "wikipedia.org/wiki/Blind_signature\">assinadas cegamente</a> por um câmbio. "
 "O uso de uma assinatura cega protege sua privacidade, pois impede o câmbio "
 "de saber qual moeda assinou para qual cliente.</p>"
 
-#: faq.html.j2:79
+#: template/faq.html.j2:101
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:103
 msgid ""
-"<p>The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
 "refunding coins. Operators can also charge fees for closing reserves and for "
 "(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -663,87 +894,86 @@ msgid ""
 "0.001 cent/transaction (at high transaction rates, amortized over billions "
 "of transactions, excluding migration costs). Note that this is an early "
 "estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher.</p>"
+"regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:117
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:119
 msgid ""
-"<p>Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future.</p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:130
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:132
 msgid ""
-"<p>We believe the European Electronic Money Directive provides part of the "
+"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.</p>"
+"have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:139
 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:141
 msgid ""
-"<p>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 "
+"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 "
 "regular bank or a central bank for a centrally banked electronic currency. "
 "Regardless, the bank would fall under the respective banking regulations "
 "establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money.</p>"
+"Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:150
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:152
 msgid ""
-"<p>Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
 "the auditors, but auditors may also provide a method for manual submission "
 "of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public.</p>"
+"respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:161
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:163
 msgid ""
-"<p>We are aware of several businesses running exploratory projects or having "
+"We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
 "regular banks as well as several central banks about the project. That said, "
 "there are currently no products in the market yet, and we believe this would "
 "be premature given the state of the project (see also <a href=\"https://";
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:174
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:176
 msgid ""
-"<p>Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
 "in theory possible with Taler, but they come with a few caveats. "
 "Specifically, recurring payments can only work if the Taler wallet is "
@@ -755,10 +985,16 @@ msgid ""
 "the user would have to make sure to carry a sufficient balance for the "
 "recurring payment to be made. Still, they can be useful, and a future "
 "version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time</p>"
+"feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "GNU Taler na imprensa"
+
+#: template/features.html.j2:13
 msgid ""
 "GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -766,28 +1002,28 @@ msgid ""
 "evasion and money laundering</span>."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
 "is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:32
 msgid ""
 "Payment are made after <span class=\"tlr\">exchanging existing money</span> "
 "into <em>electronic money</em> with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:41
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:50
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -795,11 +1031,11 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:69
 msgid "Paying with Taler"
 msgstr "Pagando com o Taler"
 
-#: features.html.j2:62
+#: template/features.html.j2:71
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -820,7 +1056,7 @@ msgstr ""
 "nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
 "risco de phishing ou roubo de identidade.</p>"
 
-#: features.html.j2:70
+#: template/features.html.j2:79
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -841,15 +1077,15 @@ msgstr ""
 "nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
 "risco de phishing ou roubo de identidade.</p>"
 
-#: features.html.j2:77
+#: template/features.html.j2:87
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:94
 msgid "Receiving payments with Taler"
 msgstr "Recebendo pagamentos com o Taler"
 
-#: features.html.j2:85
+#: template/features.html.j2:96
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -869,21 +1105,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.</p>"
 
-#: features.html.j2:94
+#: template/features.html.j2:105
 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:112
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:127
 msgid "Practical"
 msgstr "Prático"
 
-#: features.html.j2:116
+#: template/features.html.j2:130
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -893,11 +1129,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:140
 msgid "Stable"
 msgstr "Estável"
 
-#: features.html.j2:129
+#: template/features.html.j2:143
 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 +1146,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:154 template/governments.html.j2:55
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr "Seguro"
 
-#: features.html.j2:143
+#: template/features.html.j2:157
 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 +1162,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:169 template/governments.html.j2:25
 msgid "Taxable"
 msgstr "Tributável"
 
-#: features.html.j2:158
+#: template/features.html.j2:172
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -940,11 +1177,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:182
 msgid "Private"
 msgstr "Privado"
 
-#: features.html.j2:170
+#: template/features.html.j2:184
 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,17 +1192,22 @@ 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:195 template/governments.html.j2:85
 msgid "Libre"
 msgstr "Livre"
 
-#: features.html.j2:184
+#: template/features.html.j2:198
+#, fuzzy
+#| msgid ""
+#| "Taler provides protocols and reference implementations that in principle "
+#| "enables anybody to run their own payment infrastructure, be it "
+#| "individuals, organizations or whole countries. Since the reference "
+#| "implementation is a <a href=\"http://www.gnu.org/\";>GNU</a> package, it "
+#| "will always remain free software."
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
-"organizations or whole countries. Since the reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a> package, it will always remain free "
-"software."
+"organizations or whole countries. Since the reference implementation is a"
 msgstr ""
 "O Taler fornece protocolos e implementações de referência que, em princípio, "
 "permite que qualquer pessoa execute sua própria infraestrutura de pagamento, "
@@ -973,11 +1215,15 @@ msgstr ""
 "implementação de referência é um pacote <a href=\"http://www.gnu.org/\";>GNU</"
 "a>, ele sempre permanecerá como software livre."
 
-#: financial-news.html.j2:6
+#: template/features.html.j2:205
+msgid "package, it will always remain free software."
+msgstr ""
+
+#: 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 +1231,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 <i>(bank)</i>"
 
-#: glossary.html.j2:14
+#: template/glossary.html.j2:14
 msgid ""
 "traditional financial service provider who offers wire `transfers` between "
 "accounts"
@@ -1007,11 +1253,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 <i>(coin)</i>"
 
-#: 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 +1265,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 <i>(contract)</i>"
 
-#: 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 <i>(denomination)</i>"
 
-#: 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:37
 msgid "denomination key"
 msgstr "chave de denominação <i>(denomination key)</i>"
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:39
 msgid ""
 "RSA key used by the exchange to certify that a given `coin` is valid and of "
 "a particular `denomination`"
@@ -1050,11 +1296,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:44
 msgid "deposit"
 msgstr "depósito <i>(deposit)</i>"
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:46
 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 +1309,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:52
 msgid "dirty"
 msgstr "suja <i>(dirty)</i>"
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:54
 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 +1324,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:61
 msgid "exchange"
 msgstr "câmbio <i>(exchange)</i>"
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:63
 msgid ""
 "Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
@@ -1090,11 +1336,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:68
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:70
 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 +1353,29 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:82
 msgid "extension"
 msgstr "extensão <i>(extension)</i>"
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:84
 msgid "implementation of a `wallet` for browsers"
 msgstr "implementação de uma “carteira” para navegadores."
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:88
 msgid "fresh coin"
 msgstr "moeda nova <i>(fresh coin)</i>"
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:90
 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:94
 msgid "master key"
 msgstr "chave mestre <i>(master key)</i>"
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:96
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1137,19 +1383,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:101
 msgid "message signing key"
 msgstr "chave de assinatura de mensagem <i>(message signing key)</i>"
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:103
 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:107
 msgid "offer"
 msgstr "oferta <i>(offer)</i>"
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:109
 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 +1411,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:118
 msgid "owner"
 msgstr "proprietário <i>(owner)</i>"
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:120
 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:124
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:126
 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:132
 msgid "proof"
 msgstr "prova <i>(proof)</i>"
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:134
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
@@ -1198,19 +1444,19 @@ msgstr ""
 "mensagem que demonstra criptograficamente que uma reivindicação particular "
 "é .correta"
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:138
 msgid "proposal"
 msgstr "proposta <i>(proposal)</i>"
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:140
 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:144
 msgid "reserve"
 msgstr "reserva <i>(reserve)</i>"
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:146
 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 +1466,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:152
 msgid "refreshing"
 msgstr "renovação <i>(refreshing)</i>"
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:154
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1232,11 +1478,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:159
 msgid "refund"
 msgstr "restituição <i>(refund)</i>"
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:161
 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 +1492,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:167
 #, fuzzy
 #| msgid "denomination"
 msgid "revocation"
 msgstr "denominação <i>(denomination)</i>"
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:169
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -1260,11 +1506,11 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:176
 msgid "sharing"
 msgstr "compartilhamento <i>(sharing)</i>"
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:178
 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 +1519,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:184
 msgid "signing key"
 msgstr "chave de assinatura <i>(signing key)</i>"
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:186
 msgid "see message signing key."
 msgstr "ver chave de assinatura de mensagem."
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:190
 msgid "spending"
 msgstr "gasto <i>(spending)</i>"
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:192
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1293,19 +1539,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:197
 msgid "transfer"
 msgstr "transferência <i>(transfer)</i>"
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:199
 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:203
 msgid "transaction"
 msgstr "transação <i>(transaction)</i>"
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:205
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1313,39 +1559,39 @@ msgstr ""
 "método pelo qual a propriedade é transferida exclusivamente de uma entidade "
 "para outra."
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:210
 msgid "transaction id"
 msgstr "id de transação <i>(transaction id)</i>"
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:212
 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:216
 msgid "wallet"
 msgstr "carteira <i>(wallet)</i>"
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:218
 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:223
 msgid "wire transfer"
 msgstr "transferência eletrônica <i>(wire transfer)</i>"
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:225
 msgid "see `transfer`"
 msgstr "veja “transferência”."
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:229
 msgid "wire transfer identifier"
 msgstr ""
 "identificador de transferência eletrônica <i>(wire transfer identifier)</i>"
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:231
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1353,22 +1599,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:236
 msgid "withdrawal"
 msgstr "saque <i>(withdrawal)</i>"
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:238
 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:243
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:245
 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 +1625,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 +1644,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:27
 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 +1660,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:40
 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 +1681,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:58
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1449,7 +1695,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:70
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1466,7 +1712,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:88
 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 +1722,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:98
 msgid "Efficient"
 msgstr "Eficiente"
 
-#: governments.html.j2:104
+#: template/governments.html.j2:101
 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 +1737,15 @@ msgstr ""
 "disponibilidade de redes elétricas nacionais nem contribuirá "
 "(significativamente) para a poluição ambiental."
 
-#: governments.html.j2:120
+#: template/governments.html.j2:117
 msgid "Taler and regulation"
 msgstr "Taler e regulação"
 
-#: governments.html.j2:122
+#: template/governments.html.j2:119
 msgid "Anti money laundering (AML)"
 msgstr "Antilavagem de dinheiro (AML)"
 
-#: governments.html.j2:123
+#: template/governments.html.j2:120
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1507,11 +1753,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:121
 msgid "Know your customer (KYC)"
 msgstr "Conheça seu cliente (KYC)"
 
-#: governments.html.j2:125
+#: template/governments.html.j2:122
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
@@ -1519,11 +1765,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:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "Regulação de Proteção de Dados Pessoais (GDPR)"
 
-#: governments.html.j2:127
+#: template/governments.html.j2:124
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
@@ -1531,11 +1777,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:125
 msgid "Payment Services Directive (PSD2)"
 msgstr "Diretiva de Serviços de Pagamento (PSD2)"
 
-#: governments.html.j2:129
+#: template/governments.html.j2:126
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
@@ -1543,11 +1789,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:134
 msgid "Taler provides privacy and accountability"
 msgstr "Taler fornece privacidade e responsabilidade"
 
-#: governments.html.j2:140
+#: template/governments.html.j2:137
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
@@ -1557,7 +1803,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:145
 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 +1813,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:154
 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:161
 msgid ""
 "The exact details of the underlying contract that was signed between "
 "customer and merchant. However, this information would typically not include "
@@ -1582,7 +1828,7 @@ msgstr ""
 "comerciante. No entanto, esta informação normalmente não inclui a identidade "
 "do cliente."
 
-#: governments.html.j2:174
+#: template/governments.html.j2:170
 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 +1842,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 +1868,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:29
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:31
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:37
 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 +1887,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:48
 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:53
 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:61
 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 +1908,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:73
 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 +1918,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:84
 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 +1926,42 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:93
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
+"merchant-instance\">here</a>."
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:103
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:109
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:113
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:127
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:130
 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 +1970,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:140
 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 +1978,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:150
 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 +1990,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:164
 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 +1998,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:174
 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 +2008,61 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:191
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
+#: 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.<br> Please "
 "contact <tt>address@hidden</tt> if you want to invest in Taler."
@@ -1767,11 +2070,11 @@ msgstr ""
 "Nós criamos uma empresa, Taler Systems SA em Luxemburgo.<br> Por favor, "
 "contate <tt>address@hidden</tt> 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 <a href=\"about.html\">team</a> combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1783,22 +2086,21 @@ 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"
+msgstr ""
+
+#: template/investors.html.j2:41
 msgid ""
-"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
 "the French national institute for research in informatics and automation, "
-"and the <a href=\"https://renewablefreedom.org/\";>Renewable Freedom "
-"Foundation</a>."
+"and the"
 msgstr ""
-"Atualmente, somos apoiados pelo <a href=\"http://www.inria.fr/\";>Inria</a>, "
-"o instituto nacional francês de pesquisa em informática e automação, e <a "
-"href=\"https://renewablefreedom.org/\";>Renewable Freedom Foundation</a>."
 
-#: investors.html.j2:45
+#: template/investors.html.j2:50
 msgid "The Technology"
 msgstr "A tecnologia"
 
-#: investors.html.j2:48
+#: template/investors.html.j2:53
 msgid ""
 "All transactions in Taler are secured using <a href=\"bibliography.html"
 "\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1817,11 +2119,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:66
 msgid "The Business"
 msgstr "Os negócios"
 
-#: investors.html.j2:66
+#: template/investors.html.j2:68
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1839,11 +2141,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:87
 msgid "The Business Case"
 msgstr "O caso de negócio"
 
-#: investors.html.j2:91
+#: template/investors.html.j2:97
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
 "English how Taler can impact current developments in the global payment "
@@ -1853,11 +2155,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:120
 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:123
 msgid ""
 "The payment service operator runs the <em>Taler exchange</em>. The exchange "
 "charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1869,7 +2171,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:133
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
@@ -1877,7 +2179,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:134
 msgid ""
 "Multiple Taler transactions can be aggregated into larger wire transfers to "
 "merchants to minimize wire transfer costs."
@@ -1886,7 +2188,7 @@ msgstr ""
 "bancárias maiores para os comerciantes minimizarem os custos de "
 "transferência eletrônica."
 
-#: investors.html.j2:131
+#: template/investors.html.j2:135
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -1894,20 +2196,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:136
 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:137
 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 +2221,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 +2243,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 +2258,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 +2272,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:78
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1987,11 +2289,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:88
 msgid "Flexible"
 msgstr "Flexível"
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:90
 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 +2303,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:99
 msgid "Ethical"
 msgstr "Ético"
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:101
 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 +2319,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:115
 msgid "Manuals for merchants"
 msgstr "Manuais para comerciantes"
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:117
 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:121
 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:125
 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:136
 msgid "The GNU Taler Merchant Backend"
 msgstr "O backend de comerciante do GNU Taler"
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:138
 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:144
 msgid ""
 "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
 "by the merchant to customers. For this, the merchant's frontend needs to "
@@ -2051,7 +2353,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:153
 msgid ""
 "The backend <b>validates</b> payments received from the wallet and "
 "<b>executes</b> them with the Taler payment service provider (the exchange). "
@@ -2063,7 +2365,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:164
 msgid ""
 "The backend can <b>list</b> completed transactions and <b>map</b> wire "
 "transfers to sets of business transactions, including the exact terms of "
@@ -2073,47 +2375,67 @@ 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:178
 msgid "customer perspective"
 msgstr "perspectiva do cliente"
 
-#: news.html.j2:16
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
+#: 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/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
+#: template/principles.html.j2:21
 #, 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:25
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:31
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:33
 msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:36
 msgid ""
 "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 "\">Free Software</a>. For merchants, our Free Software reference "
@@ -2122,24 +2444,24 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:45
 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:56
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:58
 #, 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:60
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -2147,7 +2469,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:68
 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 +2479,45 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:81
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:83
 #, fuzzy
 #| msgid "Anti money laundering (AML)"
 msgid "Money laundering"
 msgstr "Antilavagem de dinheiro (AML)"
 
-#: principles.html.j2:99
+#: template/principles.html.j2:85
 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:95
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:97
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:99
 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:109
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:110
 #, fuzzy
 #| msgid "General Data Protection Regulation (GDPR)"
 msgid ""
@@ -2203,7 +2525,7 @@ msgid ""
 "(GDPR) compliant"
 msgstr "Regulação de Proteção de Dados Pessoais (GDPR)"
 
-#: principles.html.j2:134
+#: template/principles.html.j2:112
 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 +2533,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:122
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:123
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:125
 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 +2549,33 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:136
 #, fuzzy
 #| msgid "Efficient"
 msgid "7. Be efficient"
 msgstr "Eficiente"
 
-#: principles.html.j2:166
+#: template/principles.html.j2:137
 #, fuzzy
 #| msgid "Efficient"
 msgid "Energy efficiency"
 msgstr "Eficiente"
 
-#: principles.html.j2:168
+#: template/principles.html.j2:139
 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:149
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:150
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:152
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -2261,15 +2583,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:163
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:164
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:166
 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 +2601,23 @@ 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:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "GNU Taler"
+
+#: template/team.html.j2:8
+msgid ""
+"GNU Taler is proudly brought to you by the humans on this page. To contact "
+"the whole team, please write to"
+msgstr ""
+
+#: template/team.html.j2:21
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
@@ -2291,402 +2625,155 @@ msgstr ""
 "Mantenedor do GNU. Pesquisador de segurança de rede &amp; privacidade. "
 "Arquiteto de software."
 
-#: team.html.j2:21
+#: template/team.html.j2:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
 msgstr ""
 "Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
 "diferentes indústrias, …."
 
-#: team.html.j2:26
+#: template/team.html.j2:31
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
-msgid "GNU mainatiner, lead developer."
+#: template/team.html.j2:38
+msgid "GNU maintainer, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:43
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Criptografia aplicada. Contato para W3c &amp; Tor."
 
-#: team.html.j2:43
+#: template/team.html.j2:48
 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:55
 msgid "Software engineer."
 msgstr "Engenheiro de software."
 
-#: team.html.j2:55
+#: template/team.html.j2:60
 msgid "Sustainable business development."
 msgstr "Desenvolvimento empresarial sustentável."
 
-#: team.html.j2:60
+#: template/team.html.j2:65
 msgid "Theoretical foundations."
 msgstr "Fundações teóricas."
 
-#: team.html.j2:66
+#: template/team.html.j2:71
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:78 template/team.html.j2:82 template/team.html.j2:86
 msgid "Translator (Spanish)"
 msgstr "Tradutor (Espanhol)"
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:92 template/team.html.j2:96 template/team.html.j2:100
 msgid "Translator (Italian)"
 msgstr "Tradutor (Italiano)"
 
-#: team.html.j2:99
+#: template/team.html.j2:104
 msgid "Translator (German)"
 msgstr "Tradutor (Alemão)"
 
-#: team.html.j2:106
+#: template/team.html.j2:111
 msgid "Hardware security module"
 msgstr "Módulo de segurança de hardware"
 
-#: team.html.j2:110
+#: template/team.html.j2:115
 msgid "Risk management"
 msgstr "Gerenciamento de risco"
 
-#: team.html.j2:118
+#: template/team.html.j2:123
 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:127
 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:133 template/team.html.j2:137
+#: template/team.html.j2:141 template/team.html.j2:147
+#: template/team.html.j2:151
 #, 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"
+#: template/wallet.html.j2:108
+msgid "Congratulations, you have installed the Taler wallet. Check out the"
+msgstr ""
 
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "A equipe"
+#: template/wallet.html.j2:113
+msgid "demo"
+msgstr ""
 
-#: common/footer.j2.inc:16
-msgid "Contact"
-msgstr "Contato"
+#: template/wallet.html.j2:119
+msgid "You don't have a wallet installed yet."
+msgstr ""
 
-#: common/footer.j2.inc:21
-msgid "FAQ"
-msgstr "FAQ"
+#: template/wallet.html.j2:128
+msgid "Install the wallet for your browser below, then check out the"
+msgstr ""
 
-#: common/footer.j2.inc:26
-msgid "Bibliography"
-msgstr "Bibliografia"
+#: template/wallet.html.j2:132
+#, fuzzy
+#| msgid "denomination"
+msgid "demonstration"
+msgstr "denominação <i>(denomination)</i>"
 
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://";
-"www.bfh.ch/'>BFH</a>"
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
+msgid "or"
 msgstr ""
 
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
-"only."
+#: template/wallet.html.j2:149
+msgid "is required, but it appears you don't have it installed."
 msgstr ""
-"Essa página foi criada usando apenas <a href='https://www.gnu.org/'>software "
-"livre</a>."
 
-#: common/navigation.j2.inc:21
-msgid "Features"
-msgstr ""
+#: template/wallet.html.j2:159
+#, fuzzy
+#| msgid "extension"
+msgid "version"
+msgstr "extensão <i>(extension)</i>"
 
-#: common/navigation.j2.inc:22
-msgid "Principles"
+#: template/wallet.html.j2:163
+msgid "or newer is required, but it appears you have an older version."
 msgstr ""
 
-#: common/navigation.j2.inc:23
-msgid "Docs"
+#: template/wallet.html.j2:170
+#, fuzzy
+#| msgid "wallet"
+msgid "Install wallet"
+msgstr "carteira <i>(wallet)</i>"
+
+#: template/wallet.html.j2:177
+msgid "JavaScript is disabled, installation won't work."
 msgstr ""
 
-#, fuzzy
-#~| msgid "exchange"
-#~ msgid "Code (Exchange)"
-#~ msgstr "câmbio <i>(exchange)</i>"
+#: template/wallet.html.j2:216
+msgid "Install Download Chrome Extension"
+msgstr ""
 
+#: template/wallet.html.j2:223
 #, fuzzy
-#~| msgid "The GNU Taler Merchant Backend"
-#~ msgid "Code (Merchant backend)"
-#~ msgstr "O backend de comerciante do GNU Taler"
+#| msgid "GNU Taler"
+msgid "Install GNU Taler"
+msgstr "GNU Taler"
 
-#, fuzzy
-#~| msgid ""
-#~| "<p>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.</p> <p>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.</p>"
-#~ msgid ""
-#~ "<p>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.</p> <p>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.</p> <p><a href=\"https://demo.taler.net\";>Try it "
-#~ "yourself with the interactive demo!</a></p>"
-#~ msgstr ""
-#~ "<p>Para pagar com o Taler, os clientes instalam uma carteira eletrônica "
-#~ "em seu dispositivo. Antes do primeiro pagamento, a moeda desejada deve "
-#~ "ser adicionada ao saldo da carteira por outros meios de pagamento.</p> "
-#~ "<p>Uma vez que a carteira é cobrada, os pagamentos em sites levam apenas "
-#~ "um clique, nunca são falsamente rejeitados pela detecção de fraude e não "
-#~ "apresentam risco de phishing ou roubo de identidade.</p>"
+#: template/wallet.html.j2:227
+msgid "from the Chrome Web Store"
+msgstr ""
 
-#, fuzzy
-#~| msgid ""
-#~| "<p>To receive Taler payments, a merchant needs a bank account in the "
-#~| "desired currency. We provide supporting software in various programming "
-#~| "languages to make the integration painless. The merchant's backend for "
-#~| "Taler transaction processing can run on the merchant's premises or be "
-#~| "hosted by a third party.</p>"
-#~ msgid ""
-#~ "<p>To receive Taler payments, a merchant needs a bank account in the "
-#~ "desired currency. We provide supporting software in various programming "
-#~ "languages to make the integration painless. The merchant's backend for "
-#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
-#~ "customers can pay for products without even having to register an account."
-#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
-#~ "works in our developer documentation!</a></p>"
-#~ msgstr ""
-#~ "<p>Para receber pagamentos do Taler, um comerciante precisa de uma conta "
-#~ "bancária na moeda desejada. Nós fornecemos software de suporte em várias "
-#~ "linguagens de programação para tornar a integração indolor. O backend do "
-#~ "comerciante para o processamento de transações da Taler pode ser "
-#~ "executado nas instalações do comerciante ou ser hospedado por um terceiro."
-#~ "</p>"
-
-#~ msgid "PhD Student, Inria.."
-#~ msgstr "Estudante de PhD, Inria."
-
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Engenheiro de software. Funciona em libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
-
-#~ msgid "Developer Resources"
-#~ msgstr "Recursos para desenvolvedores"
-
-#~ msgid "About"
-#~ msgstr "Sobre"
-
-#~ msgid "For Investors"
-#~ msgstr "Para investidores"
-
-#~ msgid "Citizens"
-#~ msgstr "Cidadãos"
-
-#~ msgid "Merchants"
-#~ msgstr "Comerciantes"
-
-#~ msgid "Governments"
-#~ msgstr "Governos"
-
-#~ msgid ""
-#~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
-#~ "Your digital wallet is safer than your physical wallet. At most, you can "
-#~ "lose its contents because your computer or mobile is irreparably damaged "
-#~ "or compromised. Unlike a physical wallet, you can make backups to secure "
-#~ "against data loss."
-#~ msgstr ""
-#~ "O Taler usa criptografia moderna, garantindo que não haja falsificação. "
-#~ "Sua carteira digital é mais segura do que sua carteira física. No máximo, "
-#~ "você pode perder seu conteúdo porque seu computador ou dispositivo móvel "
-#~ "está irremediavelmente danificado ou comprometido. Ao contrário de uma "
-#~ "carteira física, você pode fazer backups para proteger contra a perda de "
-#~ "dados."
-
-#~ msgid ""
-#~ "Your transactions are private, neither the payment service provider nor "
-#~ "merchant needs to learn your identity. There is no need to give out "
-#~ "credit card numbers or other sensitive information. The merchant will "
-#~ "only be able to do exactly the transaction you agreed to."
-#~ msgstr ""
-#~ "Suas transações são privadas, nem o provedor de serviços de pagamento nem "
-#~ "o comerciante precisam descobrir sua identidade. Não há necessidade de "
-#~ "fornecer números de cartões de crédito ou outras informações "
-#~ "confidenciais. O comerciante só poderá fazer exatamente a transação que "
-#~ "você concordou."
-
-#~ msgid "Convenient"
-#~ msgstr "Conveniente"
-
-#~ msgid ""
-#~ "You will be able to withdraw money to replenish the digital coins in your "
-#~ "wallet using your credit card or wire transfers. Afterwards you can pay "
-#~ "with one-click using the Taler wallet, which optionally keeps your "
-#~ "transaction history on your computer."
-#~ msgstr ""
-#~ "Você poderá sacar dinheiro para repor as moedas digitais em sua carteira "
-#~ "usando seu cartão de crédito ou transferência eletrônica. Posteriormente, "
-#~ "você pode pagar com um clique usando a carteira do Taler, que, "
-#~ "opcionalmente, mantém seu histórico de transações no seu computador."
-
-#~ msgid ""
-#~ "Coins in your digital wallet will be of the same denomination as the cash "
-#~ "in your physical wallet. Taler is not a crypto-currency, so you do not "
-#~ "have to worry about crypto-currency related value fluctuations. Banking "
-#~ "with Taler is subject to the usual government protections for financial "
-#~ "services."
-#~ msgstr ""
-#~ "As moedas em sua carteira digital serão da mesma denominação que o "
-#~ "dinheiro em sua carteira física. O Taler não é uma cripto-moeda, então "
-#~ "você não precisa se preocupar com as flutuações de valores relacionadas "
-#~ "ao cripto-moeda. A operação bancária com o Taler está sujeita às "
-#~ "proteções usuais do governo para serviços financeiros."
-
-#~ msgid "Wallet Browser Extension"
-#~ msgstr "Extensão de carteira para navegador"
-
-#~ msgid ""
-#~ "We currently provide a <a href=\"wallet.html\">wallet browser extension</"
-#~ "a> for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile "
-#~ "phones and other platforms will be available in the future."
-#~ msgstr ""
-#~ "Atualmente oferecemos uma <a href=\"wallet.html\">extensão do navegador "
-#~ "de carteira</a> para Chromium, Chrome, Firefox, Opera e Edge. Carteiras "
-#~ "para telefones celulares e outras plataformas estarão disponíveis no "
-#~ "futuro."
-
-#~ msgid "Taler Demo"
-#~ msgstr "Demonstração do Taler"
-
-#~ msgid ""
-#~ "You can see how Taler works in practice by visiting our <a href=\"https://";
-#~ "demo.taler.net\">demo page</a>."
-#~ msgstr ""
-#~ "Você pode ver como o Taler funciona na prática visitando nossa <a href="
-#~ "\"https://demo.taler.net\";>página de demonstração</a>."
-
-#~ msgid "The Taler Wallet for customers"
-#~ msgstr "A carteira do Taler para clientes"
-
-#~ msgid "Customers interact with the Taler system using the Taler wallet:"
-#~ msgstr ""
-#~ "Os clientes interagem com o sistema Taler usando a carteira do Taler:"
-
-#~ msgid ""
-#~ "To <b>withdraw</b> electronic coins, the customer transfers funds from "
-#~ "his bank account to the Taler payment service provider (the exchange). "
-#~ "The wire transfer subject must match a code identifying the customer's "
-#~ "wallet. After the wire transfer is complete, the wallet will "
-#~ "automatically withdraw the coins from the exchange."
-#~ msgstr ""
-#~ "Para <b>sacar</b> moedas eletrônicas, o cliente transfere fundos da sua "
-#~ "conta bancária para o provedor do serviço de pagamento da Taler (o "
-#~ "câmbio). O assunto da transferência eletrônica deve corresponder ao "
-#~ "código que identifica a carteira do cliente. Após a conclusão da "
-#~ "transferência eletrônica, a carteira retirará automaticamente as moedas "
-#~ "do câmbio."
-
-#~ msgid ""
-#~ "To <b>spend</b> electronic coins, a merchant must cause the wallet to "
-#~ "display a proposal for some purchase. The wallet will ask the customer "
-#~ "for one-click confirmation. Payment is then instant. Transaction "
-#~ "histories and digitally signed contracts can be preserved by the wallet."
-#~ msgstr ""
-#~ "Para <b>gastar</b> moedas eletrônicas, um comerciante deve fazer com que "
-#~ "a carteira exiba uma proposta para alguma compra. A carteira perguntará "
-#~ "ao cliente uma confirmação de clique único. O pagamento é instantâneo. "
-#~ "Histórias de transações e contratos assinados digitalmente podem ser "
-#~ "preservados pela carteira."
-
-#~ msgid ""
-#~ "The customer can use the wallet to <b>review</b> his balance. The wallet "
-#~ "can contain different currencies, and may be shared across devices. "
-#~ "Customers can make backups of the wallet to secure its contents against "
-#~ "hardware failures."
-#~ msgstr ""
-#~ "O cliente pode usar a carteira para <b>revisar</b> seu saldo. A carteira "
-#~ "pode conter moedas diferentes e pode ser compartilhada entre "
-#~ "dispositivos. Os clientes podem fazer backups da carteira para proteger "
-#~ "seus conteúdos contra falhas de hardware."
-
-#~ msgid "Advantages for Citizens"
-#~ msgstr "Vantagens para cidadãos"
-
-#~ msgid ""
-#~ "Taler largely functions like digital cash. You withdraw money from your "
-#~ "bank account into your electronic wallet, and can henceforth spend "
-#~ "digital cash. The electronic wallet can carry multiple currencies."
-#~ msgstr ""
-#~ "O Taler funciona em grande parte como dinheiro digital. Você saca "
-#~ "dinheiro da sua conta bancária para sua carteira eletrônica e, em "
-#~ "seguida, pode gastar o dinheiro digital. A carteira eletrônica pode "
-#~ "transportar múltiplas moedas."
-
-#~ msgid "Resources"
-#~ msgstr "Recursos"
-
-#~ msgid "System Architecture"
-#~ msgstr "Arquitetura do sistema"
-
-#~ msgid "Glossary"
-#~ msgstr "Glossário"
-
-#~ msgid "Developer Introduction"
-#~ msgstr "Introdução para desenvolvedores"
-
-#~ msgid "Copyright for Contributors"
-#~ msgstr "Direitos autorais para contribuidores"
-
-#~ msgid "GNU Taler logo"
-#~ msgstr "Logo do GNU Taler"
-
-#~ msgid "Taler News"
-#~ msgstr "Notícias do Taler"
+#: template/wallet.html.j2:239
+msgid "Other browsers"
+msgstr ""
 
-#, fuzzy
-#~| msgid ""
-#~| "GNU Taler is an electronic payment system under development at <a href="
-#~| "\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-#~| "2018. You can learn about Taler on this website, try the <a href="
-#~| "\"https://demo.taler.net\";>demo</a> and look at our <a href=\"https://";
-#~| "docs.taler.net\">documentation</a>."
-#~ msgid ""
-#~ "We expect to make it operational in 2019. You can learn about Taler on "
-#~ "this website, try the <a href=\"https://demo.taler.net\";>demo</a> and "
-#~ "look at our <a href=\"https://docs.taler.net\";>documentation</a>."
-#~ msgstr ""
-#~ "GNU Taler é um sistema de pagamento eletrônico em desenvolvimento no <a "
-#~ "href=\"http://www.inria.fr/\";>Inria</a>. Esperamos torná-lo operacional "
-#~ "em 2018. Você pode aprender sobre o Taler neste site, experimentar a <a "
-#~ "href=\"https://demo.taler.net\";>demonstração</a> e olhar nossa <a href="
-#~ "\"https://docs.taler.net\";>documentação</a>."
-
-#~ msgid "One-Click Cash Payments!"
-#~ msgstr "Pagamentos em dinheiro<br/>com um clique!"
-
-#~ msgid "Performance Analysis"
-#~ msgstr "Análise de desempenho"
-
-#~ msgid ""
-#~ "We use <a href=\"https://gnunet.org/gauger\";>Gauger</a> for performance "
-#~ "regression analysis of the exchange backend at <a href=\"https://gauger.";
-#~ "taler.net/\">gauger.taler.net</a>."
-#~ msgstr ""
-#~ "Usamos <a href=\"https://gnunet.org/gauger\";>Gauger</a> para análise de "
-#~ "regressão de desempenho do backend do câmbio em <a href=\"https://gauger.";
-#~ "taler.net/\">gauger.taler.net</a>."
+#: template/wallet.html.j2:241
+msgid "Wallets for other browsers will be provided in the near future."
+msgstr ""
diff --git a/locale/ru/LC_MESSAGES/messages.po 
b/locale/ru/LC_MESSAGES/messages.po
index d4b81e2..868cc56 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,136 +7,202 @@ 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-03 12:13+0000\n"
 "PO-Revision-Date: 2017-12-29 11:14+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ru <address@hidden>\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 ""
 
-#: 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: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 template/developers.html.j2:66
 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 <a href='http://";
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:37
+msgid ""
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"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
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/";
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:address@hidden\";>address@hidden</a>."
+#: template/contact.html.j2:15
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
 msgstr ""
 
-#: contact.html.j2:25
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
+msgstr ""
+
+#: template/contact.html.j2:29
 msgid "Contacting individuals"
 msgstr ""
 
-#: contact.html.j2:27
+#: template/contact.html.j2:31
 msgid ""
 "Team members are generally reachable at <tt>address@hidden</tt>. All of "
 "us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
-#: contact.html.j2:36
+#: template/contact.html.j2:40
 msgid "General inquiries"
 msgstr ""
 
-#: contact.html.j2:38
+#: template/contact.html.j2:42
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
 msgstr ""
 
-#: contact.html.j2:46
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
 
-#: contact.html.j2:48
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
 msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"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:65
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:61
+#: template/contact.html.j2:67
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
 msgstr ""
 
-#: copyright.html.j2:6
+#: template/copyright.html.j2:6
 msgid "Copyright Assignment"
 msgstr ""
 
-#: copyright.html.j2:8
+#: template/copyright.html.j2:9
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the"
+msgstr ""
+
+#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
+msgid "of the GNUnet and GNU Taler projects is satisfied."
 msgstr ""
 
-#: copyright.html.j2:17
+#: template/copyright.html.j2:24
 msgid ""
-"<p>The agreements ensure that the code will continue to be made available "
-"under free software licenses, but gives developers the freedom to move code "
+"The agreements ensure that the code will continue to be made available under "
+"free software licenses, but gives developers the freedom to move code "
 "between GNUnet and GNU Taler without worrying about licenses and the company "
 "the ability to dual-license (for example, so that we can distribute via App-"
-"stores that are hostile to free software).</p>"
+"stores that are hostile to free software)."
 msgstr ""
 
-#: copyright.html.j2:25
+#: template/copyright.html.j2:34
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do not require "
+"Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
-"sufficient, but snail mail is preferred.</p>"
+"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 +214,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 "
@@ -160,94 +226,111 @@ msgid ""
 "obviously merchants may choose to offer HTTPS for consistency and because it "
 "generally is better for privacy compared to HTTP. Taler uses JSON to encode "
 "structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at <a href=\"https://";
-"docs.taler.net/\">docs.taler.net</a>."
+"applications. Taler's protocol is documented in detail at"
 msgstr ""
 
-#: developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
 msgid "Code"
 msgstr ""
 
-#: developers.html.j2:61
+#: template/developers.html.j2:61
+msgid "Taler is currently primarily developed by a research team at"
+msgstr ""
+
+#: template/developers.html.j2:70
 msgid ""
-"Taler is currently primarily developed by a research team at <a href="
-"\"http://www.inria.fr/\";>Inria</a> and <a href=\"https://gnunet.org/";
-"\">GNUnet</a>. However, contributions from anyone are welcome. Our Git "
-"repositories can be cloned using the Git and HTTP access methods against "
-"<tt>git.taler.net</tt> with the name of the respective repository. A list of "
-"repositories can be found in our <a href=\"https://git.taler.net/\";>GitWeb</"
-"a>."
+"However, contributions from anyone are welcome. Our Git repositories can be "
+"cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> "
+"with the name of the respective repository. A list of repositories can be "
+"found in our"
 msgstr ""
 
-#: developers.html.j2:75
+#: template/developers.html.j2:80
 msgid "Documentation"
 msgstr ""
 
-#: developers.html.j2:78
-msgid ""
-"In addition to this website, the <a href=\"https://git.taler.net/";
-"\">documented code</a> and the <a href=\"https://docs.taler.net/\";>API "
-"documentation</a>. Technical papers can be found in our <a href="
-"\"bibliography.html\">bibliography</a>."
+#: template/developers.html.j2:83
+msgid "In addition to this website, the"
+msgstr ""
+
+#: template/developers.html.j2:86
+msgid "documented code"
 msgstr ""
 
-#: developers.html.j2:88
+#: template/developers.html.j2:87
+msgid "and the"
+msgstr ""
+
+#: template/developers.html.j2:90
+msgid "API documentation"
+msgstr ""
+
+#: template/developers.html.j2:91
+msgid "Technical papers can be found in our"
+msgstr ""
+
+#: template/developers.html.j2:94
+msgid "bibliography"
+msgstr ""
+
+#: template/developers.html.j2:98
 msgid "Discussion"
 msgstr ""
 
-#: developers.html.j2:91
+#: template/developers.html.j2:101
 msgid ""
 "We have a mailing list for developer discussions. You can subscribe to or "
-"read the list archive at <a href=\"http://lists.gnu.org/mailman/listinfo/";
-"taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"read the list archive at"
 msgstr ""
 
-#: developers.html.j2:101
+#: template/developers.html.j2:111
 msgid "Regression Testing"
 msgstr ""
 
-#: developers.html.j2:104
-msgid ""
-"We have <a href=\"https://buildbot.net/\";>Buildbot</a> automation tests to "
-"detect regressions and check for portability at <a href=\"https://buildbot.";
-"taler.net/\">buildbot.taler.net</a>."
+#: template/developers.html.j2:114
+msgid "We have"
 msgstr ""
 
-#: developers.html.j2:113
+#: template/developers.html.j2:118
+msgid "automation tests to detect regressions and check for portability at"
+msgstr ""
+
+#: template/developers.html.j2:126
 msgid "Code Coverage Analysis"
 msgstr ""
 
-#: developers.html.j2:116
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at <a href="
-"\"https://lcov.taler.net/\";>lcov.taler.net</a>."
+#: template/developers.html.j2:129
+msgid "We use"
 msgstr ""
 
-#: developers.html.j2:131
+#: template/developers.html.j2:133
+msgid "to analyze the code coverage of our tests, the results are available at"
+msgstr ""
+
+#: template/developers.html.j2:146
 msgid "Technical Presentation"
 msgstr ""
 
-#: developers.html.j2:134 investors.html.j2:88
+#: template/developers.html.j2:149 template/investors.html.j2:93
 msgid "Download"
 msgstr ""
 
-#: developers.html.j2:150
+#: template/developers.html.j2:165
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:155
+#: template/developers.html.j2:168
 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:175
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:165
+#: template/developers.html.j2:178
 msgid ""
 "A customer instructs his <b>bank</b> to transfer funds from his account to "
 "the Taler exchange (top left). In the subject of the transaction, he "
@@ -255,7 +338,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:177
+#: template/developers.html.j2:190
 msgid ""
 "Once the exchange has received the wire transfer, it allows the customer's "
 "electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -267,7 +350,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:195
+#: template/developers.html.j2:208
 msgid ""
 "Once the customer has the digital coins in his wallet, the wallet can be "
 "used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -282,7 +365,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:217
+#: template/developers.html.j2:230
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -296,7 +379,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:240
+#: template/developers.html.j2:253
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -305,7 +388,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:254
+#: template/developers.html.j2:267
 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 +398,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:269
+#: template/developers.html.j2:282
 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,183 +407,230 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:37
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:7
+msgid "GNU Taler: Documentation and Resources"
+msgstr ""
+
+#: template/docs.html.j2:13
+msgid ""
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
+msgstr ""
+
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
 msgstr ""
 
-#: docs.html.j2:38
-msgid "Also available as"
+#: template/docs.html.j2:40
+msgid "Tutorial and manual for operating a merchant. Also available as"
 msgstr ""
 
-#: docs.html.j2:44
+#: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:46
+#: template/docs.html.j2:52
 msgid ""
 "Tutorial for processing Taler payments using the merchant backend API. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:57
+#: template/docs.html.j2:62
+msgid "Exchange"
+msgstr ""
+
+#: template/docs.html.j2:64
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:66
+#: template/docs.html.j2:74
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:68
+#: template/docs.html.j2:76
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:83
+#: template/docs.html.j2:92
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:85
+#: template/docs.html.j2:94
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:110
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:118
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:144
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+msgid "Mailing List"
+msgstr ""
+
+#: template/docs.html.j2:156
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:152
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:160
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:182
+#: template/docs.html.j2:194
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:184
+#: template/docs.html.j2:196
 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:8
 msgid ""
-"<p>Taler does not require any Blockchain technology, and is also not based "
-"on proof-of-work or any other distributed consensus mechanism. Instead, "
-"Taler is based on blind signatures. However, it is theoretically possible to "
-"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
+"Taler does not require any Blockchain technology, and is also not based on "
+"proof-of-work or any other distributed consensus mechanism. Instead, Taler "
+"is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
 
-#: faq.html.j2:13
+#: template/faq.html.j2:18
 msgid ""
-"<p>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.</p>"
+"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:26
 msgid "Where is the balance in my wallet stored?"
 msgstr ""
 
-#: faq.html.j2:21
+#: template/faq.html.j2:28
 msgid ""
-"<p>Your wallet stores digital coins and thus ultimately your computer holds "
+"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.</p>"
+"escrow bank account."
 msgstr ""
 
-#: faq.html.j2:27
+#: template/faq.html.j2:35
 msgid "What if my wallet is lost?"
 msgstr ""
 
-#: faq.html.j2:28
+#: template/faq.html.j2:37
 msgid ""
-"<p>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.</p>"
+"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:46
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
-"the balance reasonably low.</p>"
+"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:52
 msgid "What if my computer is hacked?"
 msgstr ""
 
-#: faq.html.j2:40
+#: template/faq.html.j2:54
 msgid ""
-"<p>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.</p>"
+"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:61
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 
-#: faq.html.j2:47
+#: template/faq.html.j2:63
 msgid ""
-"<p>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.</p>"
+"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:70
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well.</p>"
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 
-#: faq.html.j2:58
+#: template/faq.html.j2:76
 msgid "How does Taler handle payments in different currencies?"
 msgstr ""
 
-#: faq.html.j2:59
+#: template/faq.html.j2:78
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple different "
-"currencies such as the Euro, US Dollars or Bitcoins.</p>"
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 
-#: faq.html.j2:63
-msgid "<p>Taler currently does not offer conversion between currencies.</p>"
+#: template/faq.html.j2:84
+msgid "Taler currently does not offer conversion between currencies."
 msgstr ""
 
-#: faq.html.j2:67
+#: template/faq.html.j2:89
 msgid "How does Taler protect my privacy?"
 msgstr ""
 
-#: faq.html.j2:68
+#: template/faq.html.j2:91
 msgid ""
-"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia.";
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer.</p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
 msgstr ""
 
-#: faq.html.j2:79
+#: template/faq.html.j2:101
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:80
+#: template/faq.html.j2:103
 msgid ""
-"<p>The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
 "refunding coins. Operators can also charge fees for closing reserves and for "
 "(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -508,87 +638,86 @@ msgid ""
 "0.001 cent/transaction (at high transaction rates, amortized over billions "
 "of transactions, excluding migration costs). Note that this is an early "
 "estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher.</p>"
+"regulator and could thus easily be 10x higher."
 msgstr ""
 
-#: faq.html.j2:95
+#: template/faq.html.j2:117
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:96
+#: template/faq.html.j2:119
 msgid ""
-"<p>Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future.</p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
 msgstr ""
 
-#: faq.html.j2:109
+#: template/faq.html.j2:130
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:110
+#: template/faq.html.j2:132
 msgid ""
-"<p>We believe the European Electronic Money Directive provides part of the "
+"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.</p>"
+"have to follow."
 msgstr ""
 
-#: faq.html.j2:118
+#: template/faq.html.j2:139
 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:141
 msgid ""
-"<p>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 "
+"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 "
 "regular bank or a central bank for a centrally banked electronic currency. "
 "Regardless, the bank would fall under the respective banking regulations "
 "establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money.</p>"
+"Taler coins into regular bank money."
 msgstr ""
 
-#: faq.html.j2:129
+#: template/faq.html.j2:150
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:130
+#: template/faq.html.j2:152
 msgid ""
-"<p>Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
 "the auditors, but auditors may also provide a method for manual submission "
 "of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public.</p>"
+"respective regulatory authorities, or even the general public."
 msgstr ""
 
-#: faq.html.j2:140
+#: template/faq.html.j2:161
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:141
+#: template/faq.html.j2:163
 msgid ""
-"<p>We are aware of several businesses running exploratory projects or having "
+"We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
 "regular banks as well as several central banks about the project. That said, "
 "there are currently no products in the market yet, and we believe this would "
 "be premature given the state of the project (see also <a href=\"https://";
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: faq.html.j2:153
+#: template/faq.html.j2:174
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:155
+#: template/faq.html.j2:176
 msgid ""
-"<p>Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
 "in theory possible with Taler, but they come with a few caveats. "
 "Specifically, recurring payments can only work if the Taler wallet is "
@@ -600,10 +729,14 @@ msgid ""
 "the user would have to make sure to carry a sufficient balance for the "
 "recurring payment to be made. Still, they can be useful, and a future "
 "version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time</p>"
+"feature that we are targeting for Taler 1.0. at this time"
 msgstr ""
 
-#: features.html.j2:15
+#: template/features.html.j2:7
+msgid "GNU Taler: Features"
+msgstr ""
+
+#: template/features.html.j2:13
 msgid ""
 "GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
 "Customers can stay anonymous, but merchants can not hide their income "
@@ -611,28 +744,28 @@ msgid ""
 "evasion and money laundering</span>."
 msgstr ""
 
-#: features.html.j2:23
+#: template/features.html.j2:23
 msgid ""
 "The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
 "is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
 "always backed by an existing currency."
 msgstr ""
 
-#: features.html.j2:30
+#: template/features.html.j2:32
 msgid ""
 "Payment are made after <span class=\"tlr\">exchanging existing money</span> "
 "into <em>electronic money</em> with the help of an Exchange service, that "
 "is, a payment service provider for Taler."
 msgstr ""
 
-#: features.html.j2:37
+#: template/features.html.j2:41
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant's Website."
 msgstr ""
 
-#: features.html.j2:44
+#: template/features.html.j2:50
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
@@ -640,33 +773,33 @@ msgid ""
 "gone."
 msgstr ""
 
-#: features.html.j2:60
+#: template/features.html.j2:69
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:62
+#: template/features.html.j2:71
 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:79
 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:87
 msgid "Try it yourself with the interactive demo!"
 msgstr ""
 
-#: features.html.j2:83
+#: template/features.html.j2:94
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:85
+#: template/features.html.j2:96
 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 +807,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:105
 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:112
 msgid "See how merchant integration works in our developer documentation!"
 msgstr ""
 
-#: features.html.j2:113
+#: template/features.html.j2:127
 msgid "Practical"
 msgstr ""
 
-#: features.html.j2:116
+#: template/features.html.j2:130
 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:140
 msgid "Stable"
 msgstr ""
 
-#: features.html.j2:129
+#: template/features.html.j2:143
 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,154 +840,157 @@ 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:154 template/governments.html.j2:55
+#: template/merchants.html.j2:41
 msgid "Secure"
 msgstr ""
 
-#: features.html.j2:143
+#: template/features.html.j2:157
 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:169 template/governments.html.j2:25
 msgid "Taxable"
 msgstr ""
 
-#: features.html.j2:158
+#: template/features.html.j2:172
 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:182
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:170
+#: template/features.html.j2:184
 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:195 template/governments.html.j2:85
 msgid "Libre"
 msgstr ""
 
-#: features.html.j2:184
+#: template/features.html.j2:198
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
-"organizations or whole countries. Since the reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a> package, it will always remain free "
-"software."
+"organizations or whole countries. Since the reference implementation is a"
+msgstr ""
+
+#: template/features.html.j2:205
+msgid "package, it will always remain free 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:37
 msgid "denomination key"
 msgstr ""
 
-#: glossary.html.j2:38
+#: template/glossary.html.j2:39
 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:44
 msgid "deposit"
 msgstr ""
 
-#: glossary.html.j2:44
+#: template/glossary.html.j2:46
 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:52
 msgid "dirty"
 msgstr ""
 
-#: glossary.html.j2:50
+#: template/glossary.html.j2:54
 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:61
 msgid "exchange"
 msgstr ""
 
-#: glossary.html.j2:56
+#: template/glossary.html.j2:63
 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:68
 msgid "expired"
 msgstr ""
 
-#: glossary.html.j2:62
+#: template/glossary.html.j2:70
 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 +1003,45 @@ msgid ""
 "special `zombie coin`."
 msgstr ""
 
-#: glossary.html.j2:74
+#: template/glossary.html.j2:82
 msgid "extension"
 msgstr ""
 
-#: glossary.html.j2:76
+#: template/glossary.html.j2:84
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:80
+#: template/glossary.html.j2:88
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:82
+#: template/glossary.html.j2:90
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: template/glossary.html.j2:94
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:88
+#: template/glossary.html.j2:96
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:92
+#: template/glossary.html.j2:101
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:94
+#: template/glossary.html.j2:103
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:98
+#: template/glossary.html.j2:107
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:100
+#: template/glossary.html.j2:109
 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 +1051,80 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:109
+#: template/glossary.html.j2:118
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:111
+#: template/glossary.html.j2:120
 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:124
 msgid "payback"
 msgstr ""
 
-#: glossary.html.j2:117
+#: template/glossary.html.j2:126
 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:132
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:125
+#: template/glossary.html.j2:134
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:129
+#: template/glossary.html.j2:138
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:131
+#: template/glossary.html.j2:140
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:135
+#: template/glossary.html.j2:144
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:137
+#: template/glossary.html.j2:146
 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:152
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:143
+#: template/glossary.html.j2:154
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:147
+#: template/glossary.html.j2:159
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:149
+#: template/glossary.html.j2:161
 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:167
 msgid "revocation"
 msgstr ""
 
-#: glossary.html.j2:155
+#: template/glossary.html.j2:169
 msgid ""
 "exceptional operation by which an exchange withdraws a denomination from "
 "circulation, either because the signing key was compromised or because the "
@@ -996,101 +1132,101 @@ msgid ""
 "are subjected to payback."
 msgstr ""
 
-#: glossary.html.j2:159
+#: template/glossary.html.j2:176
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:161
+#: template/glossary.html.j2:178
 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:184
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:167
+#: template/glossary.html.j2:186
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:171
+#: template/glossary.html.j2:190
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:173
+#: template/glossary.html.j2:192
 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:197
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:179
+#: template/glossary.html.j2:199
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:183
+#: template/glossary.html.j2:203
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:185
+#: template/glossary.html.j2:205
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:189
+#: template/glossary.html.j2:210
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:191
+#: template/glossary.html.j2:212
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:195
+#: template/glossary.html.j2:216
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:197
+#: template/glossary.html.j2:218
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:201
+#: template/glossary.html.j2:223
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:203
+#: template/glossary.html.j2:225
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:207
+#: template/glossary.html.j2:229
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:209
+#: template/glossary.html.j2:231
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:213
+#: template/glossary.html.j2:236
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:215
+#: template/glossary.html.j2:238
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
-#: glossary.html.j2:219
+#: template/glossary.html.j2:243
 msgid "zombie coin"
 msgstr ""
 
-#: glossary.html.j2:221
+#: template/glossary.html.j2:245
 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 +1237,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 +1250,7 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:28
+#: template/governments.html.j2:27
 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 +1260,7 @@ msgid ""
 "evasion and black markets less viable."
 msgstr ""
 
-#: governments.html.j2:41
+#: template/governments.html.j2:40
 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 +1272,7 @@ msgid ""
 "multiple devices."
 msgstr ""
 
-#: governments.html.j2:61
+#: template/governments.html.j2:58
 msgid ""
 "Taler's payments are cryptographically secured. Thus, customers, merchants "
 "and the Taler payment service provider (the exchange) can mathematically "
@@ -1145,7 +1281,7 @@ msgid ""
 "merchants, the exchange and the state."
 msgstr ""
 
-#: governments.html.j2:73
+#: template/governments.html.j2:70
 msgid ""
 "As a payment service provider, the Taler exchange is subject to financial "
 "regulation. Financial regulation and regular audits are critical to "
@@ -1155,98 +1291,98 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:91
+#: template/governments.html.j2:88
 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:98
 msgid "Efficient"
 msgstr ""
 
-#: governments.html.j2:104
+#: template/governments.html.j2:101
 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:117
 msgid "Taler and regulation"
 msgstr ""
 
-#: governments.html.j2:122
+#: template/governments.html.j2:119
 msgid "Anti money laundering (AML)"
 msgstr ""
 
-#: governments.html.j2:123
+#: template/governments.html.j2:120
 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:121
 msgid "Know your customer (KYC)"
 msgstr ""
 
-#: governments.html.j2:125
+#: template/governments.html.j2:122
 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:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr ""
 
-#: governments.html.j2:127
+#: template/governments.html.j2:124
 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:125
 msgid "Payment Services Directive (PSD2)"
 msgstr ""
 
-#: governments.html.j2:129
+#: template/governments.html.j2:126
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
 msgstr ""
 
-#: governments.html.j2:137
+#: template/governments.html.j2:134
 msgid "Taler provides privacy and accountability"
 msgstr ""
 
-#: governments.html.j2:140
+#: template/governments.html.j2:137
 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:145
 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:154
 msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
-#: governments.html.j2:164
+#: template/governments.html.j2:161
 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:170
 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 +1391,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 +1415,15 @@ msgid ""
 "can be used for 'Pay with Taler'."
 msgstr ""
 
-#: gsoc-codeless.html.j2:23
+#: template/gsoc-codeless.html.j2:29
 msgid "Use Cases"
 msgstr ""
 
-#: gsoc-codeless.html.j2:24
+#: template/gsoc-codeless.html.j2:31
 msgid "The various use cases and features of codeless payment are:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:28
+#: template/gsoc-codeless.html.j2:37
 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 +1434,19 @@ msgid ""
 "tracking."
 msgstr ""
 
-#: gsoc-codeless.html.j2:33
+#: template/gsoc-codeless.html.j2:48
 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:53
 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:61
 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 +1455,7 @@ msgid ""
 "has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:50
+#: template/gsoc-codeless.html.j2:73
 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 +1465,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:55
+#: template/gsoc-codeless.html.j2:84
 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 +1473,42 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:61
+#: template/gsoc-codeless.html.j2:93
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:65
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
+"merchant-instance\">here</a>."
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:103
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:71
+#: template/gsoc-codeless.html.j2:109
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:74
+#: template/gsoc-codeless.html.j2:113
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:76
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:85
+#: template/gsoc-codeless.html.j2:127
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:87
+#: template/gsoc-codeless.html.j2:130
 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 +1517,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:92
+#: template/gsoc-codeless.html.j2:140
 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 +1525,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:98
+#: template/gsoc-codeless.html.j2:150
 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 +1537,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:104
+#: template/gsoc-codeless.html.j2:164
 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 +1545,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:110
+#: template/gsoc-codeless.html.j2:174
 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 +1555,71 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:122
+#: template/gsoc-codeless.html.j2:191
 msgid "Screenshots"
 msgstr ""
 
-#: investors.html.j2:6
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
+#: 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.<br> Please "
 "contact <tt>address@hidden</tt> 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 <a href=\"about.html\">team</a> combines world-class business leaders, "
 "cryptographers, software engineers, civil-rights activists and academics. We "
@@ -1434,19 +1627,21 @@ msgid ""
 "this vision upon the world."
 msgstr ""
 
-#: investors.html.j2:37
+#: template/investors.html.j2:37
+msgid "We are currently supported by"
+msgstr ""
+
+#: template/investors.html.j2:41
 msgid ""
-"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>, "
 "the French national institute for research in informatics and automation, "
-"and the <a href=\"https://renewablefreedom.org/\";>Renewable Freedom "
-"Foundation</a>."
+"and the"
 msgstr ""
 
-#: investors.html.j2:45
+#: template/investors.html.j2:50
 msgid "The Technology"
 msgstr ""
 
-#: investors.html.j2:48
+#: template/investors.html.j2:53
 msgid ""
 "All transactions in Taler are secured using <a href=\"bibliography.html"
 "\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1457,11 +1652,11 @@ msgid ""
 "transaction costs are fractions of a cent."
 msgstr ""
 
-#: investors.html.j2:63
+#: template/investors.html.j2:66
 msgid "The Business"
 msgstr ""
 
-#: investors.html.j2:66
+#: template/investors.html.j2:68
 msgid ""
 "The scalable business model for Taler is the operation of the payment "
 "service provider, which converts money from traditional payment systems "
@@ -1472,22 +1667,22 @@ msgid ""
 "to facilitate the transactions."
 msgstr ""
 
-#: investors.html.j2:85
+#: template/investors.html.j2:87
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:91
+#: template/investors.html.j2:97
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
 "English how Taler can impact current developments in the global payment "
 "market."
 msgstr ""
 
-#: investors.html.j2:114
+#: template/investors.html.j2:120
 msgid "Running a Taler payment service operator"
 msgstr ""
 
-#: investors.html.j2:117
+#: template/investors.html.j2:123
 msgid ""
 "The payment service operator runs the <em>Taler exchange</em>. The exchange "
 "charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1495,37 +1690,37 @@ msgid ""
 "of the computing infrastructure."
 msgstr ""
 
-#: investors.html.j2:127
+#: template/investors.html.j2:133
 msgid ""
 "Cryptographic operations, bandwidth and storage costs are less than 0.01 "
 "cent per transaction."
 msgstr ""
 
-#: investors.html.j2:129
+#: template/investors.html.j2:134
 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:135
 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:136
 msgid "Partnership with banks establishes consumer trust."
 msgstr ""
 
-#: investors.html.j2:135
+#: template/investors.html.j2:137
 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 +1728,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 +1743,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 +1752,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 +1761,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:78
 msgid ""
 "Taler is uses efficient cryptographic constructions with low bandwidth and "
 "storage requirements. Combined with Taler's strong security which makes "
@@ -1578,22 +1773,22 @@ msgid ""
 "overhead and thus offer low transaction fees."
 msgstr ""
 
-#: merchants.html.j2:89
+#: template/merchants.html.j2:88
 msgid "Flexible"
 msgstr ""
 
-#: merchants.html.j2:92
+#: template/merchants.html.j2:90
 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:99
 msgid "Ethical"
 msgstr ""
 
-#: merchants.html.j2:104
+#: template/merchants.html.j2:101
 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 +1796,38 @@ msgid ""
 "reference implementations."
 msgstr ""
 
-#: merchants.html.j2:119
+#: template/merchants.html.j2:115
 msgid "Manuals for merchants"
 msgstr ""
 
-#: merchants.html.j2:122
+#: template/merchants.html.j2:117
 msgid "The GNU Taler merchant backend operator manual"
 msgstr ""
 
-#: merchants.html.j2:125
+#: template/merchants.html.j2:121
 msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr ""
 
-#: merchants.html.j2:128
+#: template/merchants.html.j2:125
 msgid "The GNU Taler Web shop integration tutorial (Python)"
 msgstr ""
 
-#: merchants.html.j2:140
+#: template/merchants.html.j2:136
 msgid "The GNU Taler Merchant Backend"
 msgstr ""
 
-#: merchants.html.j2:142
+#: template/merchants.html.j2:138
 msgid "Merchants process payments using the Taler backend:"
 msgstr ""
 
-#: merchants.html.j2:147
+#: template/merchants.html.j2:144
 msgid ""
 "The backend <b>signs</b> and <b>stores</b> 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:153
 msgid ""
 "The backend <b>validates</b> payments received from the wallet and "
 "<b>executes</b> them with the Taler payment service provider (the exchange). "
@@ -1640,52 +1835,72 @@ msgid ""
 "the Taler backend and check the HTTP status code that is returned."
 msgstr ""
 
-#: merchants.html.j2:167
+#: template/merchants.html.j2:164
 msgid ""
 "The backend can <b>list</b> completed transactions and <b>map</b> wire "
 "transfers to sets of business transactions, including the exact terms of "
 "each contract."
 msgstr ""
 
-#: merchants.html.j2:183
+#: template/merchants.html.j2:178
 msgid "customer perspective"
 msgstr ""
 
-#: news.html.j2:16
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
+#: 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/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
+#: template/principles.html.j2:21
 msgid "GNU Taler: Design Principles"
 msgstr ""
 
-#: principles.html.j2:29
+#: template/principles.html.j2:25
 msgid ""
 "When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
-#: principles.html.j2:36
+#: template/principles.html.j2:31
 msgid "1. Free Software implementation"
 msgstr ""
 
-#: principles.html.j2:40
+#: template/principles.html.j2:33
 msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
-#: principles.html.j2:42
+#: template/principles.html.j2:36
 msgid ""
 "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 "\">Free Software</a>. For merchants, our Free Software reference "
@@ -1694,22 +1909,22 @@ msgid ""
 "compromising sovereignty."
 msgstr ""
 
-#: principles.html.j2:51
+#: template/principles.html.j2:45
 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:56
 msgid "2. Protect the privacy of buyers"
 msgstr ""
 
-#: principles.html.j2:68
+#: template/principles.html.j2:58
 msgid "You deserve some privacy"
 msgstr ""
 
-#: principles.html.j2:70
+#: template/principles.html.j2:60
 msgid ""
 "Privacy should be guaranteed via technical measures, as opposed to mere "
 "policies. Especially with micropayments for online content, a disproportion- "
@@ -1717,7 +1932,7 @@ msgid ""
 "payment system does not have privacy protections."
 msgstr ""
 
-#: principles.html.j2:78
+#: template/principles.html.j2:68
 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 +1942,49 @@ msgid ""
 "to business needs."
 msgstr ""
 
-#: principles.html.j2:92
+#: template/principles.html.j2:81
 msgid ""
 "3. Enable the state to tax income and crack down on illegal business "
 "activities"
 msgstr ""
 
-#: principles.html.j2:97
+#: template/principles.html.j2:83
 msgid "Money laundering"
 msgstr ""
 
-#: principles.html.j2:99
+#: template/principles.html.j2:85
 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:95
 msgid "4. Prevent payment fraud"
 msgstr ""
 
-#: principles.html.j2:115
+#: template/principles.html.j2:97
 msgid "Phishing attack"
 msgstr ""
 
-#: principles.html.j2:117
+#: template/principles.html.j2:99
 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:109
 msgid "5. Only disclose the minimal amount of information necessary"
 msgstr ""
 
-#: principles.html.j2:132
+#: template/principles.html.j2:110
 msgid ""
 "Privacy by design, privacy by default, General Data Protection Regulation "
 "(GDPR) compliant"
 msgstr ""
 
-#: principles.html.j2:134
+#: template/principles.html.j2:112
 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 +1992,15 @@ msgid ""
 "competitors."
 msgstr ""
 
-#: principles.html.j2:144
+#: template/principles.html.j2:122
 msgid "6. Be usable"
 msgstr ""
 
-#: principles.html.j2:148
+#: template/principles.html.j2:123
 msgid "Buy with one click"
 msgstr ""
 
-#: principles.html.j2:150
+#: template/principles.html.j2:125
 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 +2008,29 @@ msgid ""
 "operations into an isolated component with a simple API."
 msgstr ""
 
-#: principles.html.j2:162
+#: template/principles.html.j2:136
 msgid "7. Be efficient"
 msgstr ""
 
-#: principles.html.j2:166
+#: template/principles.html.j2:137
 msgid "Energy efficiency"
 msgstr ""
 
-#: principles.html.j2:168
+#: template/principles.html.j2:139
 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:149
 msgid "8. Fault-tolerant design"
 msgstr ""
 
-#: principles.html.j2:181
+#: template/principles.html.j2:150
 msgid "Life Safers"
 msgstr ""
 
-#: principles.html.j2:183
+#: template/principles.html.j2:152
 msgid ""
 "Taler should tolerate failure of individual components and systems, "
 "including malicious operators compromising core secrets. This manifests in "
@@ -1823,15 +2038,15 @@ msgid ""
 "auditing procedures."
 msgstr ""
 
-#: principles.html.j2:195
+#: template/principles.html.j2:163
 msgid "9. Foster competition"
 msgstr ""
 
-#: principles.html.j2:199
+#: template/principles.html.j2:164
 msgid "A competitive market"
 msgstr ""
 
-#: principles.html.j2:201
+#: template/principles.html.j2:166
 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 +2056,158 @@ 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:6
+msgid "GNU Taler: Team"
+msgstr ""
+
+#: template/team.html.j2:8
+msgid ""
+"GNU Taler is proudly brought to you by the humans on this page. To contact "
+"the whole team, please write to"
+msgstr ""
+
+#: template/team.html.j2:21
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
 
-#: team.html.j2:21
+#: template/team.html.j2:26
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
 msgstr ""
 
-#: team.html.j2:26
+#: template/team.html.j2:31
 msgid "Lawyer and banker."
 msgstr ""
 
-#: team.html.j2:33
-msgid "GNU mainatiner, lead developer."
+#: template/team.html.j2:38
+msgid "GNU maintainer, lead developer."
 msgstr ""
 
-#: team.html.j2:38
+#: template/team.html.j2:43
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr ""
 
-#: team.html.j2:43
+#: template/team.html.j2:48
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
-#: team.html.j2:50
+#: template/team.html.j2:55
 msgid "Software engineer."
 msgstr ""
 
-#: team.html.j2:55
+#: template/team.html.j2:60
 msgid "Sustainable business development."
 msgstr ""
 
-#: team.html.j2:60
+#: template/team.html.j2:65
 msgid "Theoretical foundations."
 msgstr ""
 
-#: team.html.j2:66
+#: template/team.html.j2:71
 msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:73 team.html.j2:77 team.html.j2:81
+#: template/team.html.j2:78 template/team.html.j2:82 template/team.html.j2:86
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: team.html.j2:87 team.html.j2:91 team.html.j2:95
+#: template/team.html.j2:92 template/team.html.j2:96 template/team.html.j2:100
 msgid "Translator (Italian)"
 msgstr ""
 
-#: team.html.j2:99
+#: template/team.html.j2:104
 msgid "Translator (German)"
 msgstr ""
 
-#: team.html.j2:106
+#: template/team.html.j2:111
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:110
+#: template/team.html.j2:115
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:118
+#: template/team.html.j2:123
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:122
+#: template/team.html.j2:127
 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:133 template/team.html.j2:137
+#: template/team.html.j2:141 template/team.html.j2:147
+#: template/team.html.j2:151
 msgid "Free software developer."
 msgstr ""
 
-#: common/base.j2:5
-msgid "GNU Taler"
+#: template/wallet.html.j2:108
+msgid "Congratulations, you have installed the Taler wallet. Check out the"
 msgstr ""
 
-#: common/base.j2:6
-msgid "Taxable Anonymous Libre Electronic Reserves"
+#: template/wallet.html.j2:113
+msgid "demo"
 msgstr ""
 
-#: common/footer.j2.inc:11 common/navigation.j2.inc:24
-msgid "Team"
+#: template/wallet.html.j2:119
+msgid "You don't have a wallet installed yet."
 msgstr ""
 
-#: common/footer.j2.inc:16
-msgid "Contact"
+#: template/wallet.html.j2:128
+msgid "Install the wallet for your browser below, then check out the"
 msgstr ""
 
-#: common/footer.j2.inc:21
-msgid "FAQ"
+#: template/wallet.html.j2:132
+msgid "demonstration"
 msgstr ""
 
-#: common/footer.j2.inc:26
-msgid "Bibliography"
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
+msgid "or"
 msgstr ""
 
-#: common/footer.j2.inc:35
-msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://";
-"www.bfh.ch/'>BFH</a>"
+#: template/wallet.html.j2:149
+msgid "is required, but it appears you don't have it installed."
 msgstr ""
 
-#: common/footer.j2.inc:37
-msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
-"only."
+#: template/wallet.html.j2:159
+msgid "version"
 msgstr ""
 
-#: common/navigation.j2.inc:21
-msgid "Features"
+#: template/wallet.html.j2:163
+msgid "or newer is required, but it appears you have an older version."
 msgstr ""
 
-#: common/navigation.j2.inc:22
-msgid "Principles"
+#: template/wallet.html.j2:170
+msgid "Install wallet"
 msgstr ""
 
-#: common/navigation.j2.inc:23
-msgid "Docs"
+#: template/wallet.html.j2:177
+msgid "JavaScript is disabled, installation won't work."
+msgstr ""
+
+#: template/wallet.html.j2:216
+msgid "Install Download Chrome Extension"
+msgstr ""
+
+#: template/wallet.html.j2:223
+msgid "Install GNU Taler"
+msgstr ""
+
+#: template/wallet.html.j2:227
+msgid "from the Chrome Web Store"
+msgstr ""
+
+#: template/wallet.html.j2:239
+msgid "Other browsers"
+msgstr ""
+
+#: template/wallet.html.j2:241
+msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
diff --git a/make_sitemap.sh b/make_sitemap.sh
new file mode 100755
index 0000000..bc2578d
--- /dev/null
+++ b/make_sitemap.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Copyright (C) 2018, 2019 GNUnet e.V.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+#
+# This initial version builds on code from ssg4
+# copyright is as follows:
+# -----
+# https://www.romanzolotarev.com/bin/ssg4
+# Copyright 2018 Roman Zolotarev <address@hidden>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# -----
+
+list_pages(){
+cd rendered && find . -type f ! -path '*/.*' ! -path '*/_*' -name '*.html' | 
sed 's#^./##;#'
+}
+
+main(){
+       dst=rendered
+        base_url="$4"
+        date=$(date +%Y-%m-%d)
+        urls=$(list_pages "$src")
+
+        test -n "$urls" &&
+        render_sitemap "$urls" "$base_url" "$date" > "$dst/sitemap.xml"
+
+        print_status 'url' 'urls' "$urls" >&2
+        echo >&2
+}
+
+print_status() {
+        test -z "$3" && printf 'no %s' "$2" && return
+
+        echo "$3" | awk -v singular="$1" -v plural="$2" '
+        END {
+                if (NR==1) printf NR " " singular
+                if (NR>1) printf NR " " plural
+        }'
+}
+
+render_sitemap() {
+        urls="$1"
+        base_url="$2"
+        date="$3"
+
+        echo '<?xml version="1.0" encoding="UTF-8"?>'
+        echo '<urlset'
+        echo 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";'
+        echo 'xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9'
+        echo 'http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd";'
+        echo 'xmlns="http://www.sitemaps.org/schemas/sitemap/0.9";>'
+        echo "$urls" |
+        sed -E 's#^(.*)$#<url><loc>'"$base_url"'/\1</loc><lastmod>'\
+"$date"'</lastmod><priority>1.0</priority></url>#'
+        echo '</urlset>'
+}
+
+main "$@"
+
diff --git a/merchants.html.j2 b/merchants.html.j2
deleted file mode 100644
index fff24bf..0000000
--- a/merchants.html.j2
+++ /dev/null
@@ -1,186 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("Advantages for Merchants") }}</h1>
-
-      <p>
-         {% trans %}
-             Taler is a cost-effective electronic payment system
-             which provides you with cryptographic proof that
-             the payment worked correctly within milliseconds.
-             Your Web customers pay with previously unknown
-             levels of convenience without risk of fraud.
-         {% endtrans %}
-       </p>
-  </div>
-</div>
-
-<div class="container adorn_h3_bracket">
-  <div class="row">
-    <div class="col-lg-4">
-      <h3>{{ _("Fast") }}</h3>
-
-      <p>
-         {% trans %}
-               Processing transactions with Taler is fast,
-               allowing you to confirm the transaction with your
-               customer virtually immediately.  Your customers
-               will appreciate that they do not have to type in
-               credit card information and play the &quot;verified
-               by&quot; game.  By making payments significantly
-               more convenient for your customers, you may be able
-               to use Taler for small transactions that would not
-               work with credit card payments due to the mental
-               overhead for customers.
-         {% endtrans %}
-       </p>
-
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Secure") }}</h3>
-
-      <p>
-         {% trans %}
-               You will have cryptographic proof of payment from the
-               Taler payment service provider. With Taler you never
-               handle sensitive customer account information and thus
-               do not have to undergo any particular security audits
-               (such as PCI DSS).  Your systems will have customer
-               contracts with qualified signatures for all
-               transactions which you can use in court in case of
-               disputes.
-         {% endtrans %}
-       </p>
-
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Free") }}</h3>
-
-      <p>
-         {% trans %}
-               Taler is free software, and you can use the
-               liberally-licensed reference code as a starting
-               point to integrate Taler into your services. To use
-               Taler, you do not need to pay license fees, and the
-               free software development model will ensure that
-               you can select from many competing integrators for
-               support.
-         {% endtrans %}
-       </p>
-
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-4">
-      <h3>{{ _("Cheap") }}</h3>
-
-      <p>
-         {% trans %}
-               Taler is uses efficient cryptographic constructions with low
-               bandwidth and storage requirements.  Combined with Taler's 
strong
-               security which makes fraud impossible, Taler payment service
-               providers can operate with very low overhead and
-               thus offer low transaction fees.
-         {% endtrans %}
-       </p>
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Flexible") }}</h3>
-
-      <p>
-         {% trans %}
-               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.
-         {% endtrans %}
-      </p>
-    </div>
-    <div class="col-lg-4">
-      <h3>{{ _("Ethical") }}</h3>
-
-      <p>
-         {% trans %}
-               Taler prevents tax evasion and money laundering.
-               Taler's protocols are efficient and do not use wasteful
-               proof-of-work calculations. Taler encourages
-               transparency by providing an open standard and free
-               software reference implementations.
-         {% endtrans %}
-      </p>
-
-    </div>
-  </div>
-</div>
-
-<div class="container-fluid c_acronym">
-<div class="container">
-  <h2 id="documentation">{{ _("Manuals for merchants") }}</h2>
-  <p>
-    </p><ul>
-      <li>{{ _("The GNU Taler merchant backend operator manual") }}
-        (<a 
href="https://docs.taler.net/merchant/backend/html/manual.html";>html</a>,
-         <a 
href="https://docs.taler.net/merchant/backend/pdf/manual.pdf";>pdf</a>)</li>
-      <li>{{ _("The GNU Taler Web shop integration tutorial (PHP)") }}
-        (<a 
href="https://docs.taler.net/merchant/frontend/php/html/tutorial.html";>html</a>,
-         <a 
href="https://docs.taler.net/merchant/frontend/php/pdf/tutorial.pdf";>pdf</a>)</li>
-      <li>{{ _("The GNU Taler Web shop integration tutorial (Python)") }}
-        (<a 
href="https://docs.taler.net/merchant/frontend/python/html/tutorial.html";>html</a>,
-         <a 
href="https://docs.taler.net/merchant/frontend/python/pdf/tutorial.pdf";>pdf</a>)</li>
-    </ul>
-  <p></p>
-</div>
-</div>
-
-
-<div class="container">
-
- <div class="col-lg-6">
-    <h2 id="overview">{{ _("The GNU Taler Merchant Backend") }}</h2>
-
-    <p>{{ _("Merchants process payments using the Taler backend:") }}</p>
-    <p>
-      <ul>
-
-        <li>
-             {% trans %}
-                  The backend <b>signs</b> and <b>stores</b> 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.
-             {% endtrans %}
-        </li>
-
-        <li>
-             {% trans %}
-                  The backend <b>validates</b> payments received from
-                  the wallet and <b>executes</b> them with the Taler
-                  payment service provider (the exchange).  For this,
-                  the merchant's frontend must pass the payment
-                  request through to the Taler backend and check the
-                  HTTP status code that is returned.
-             {% endtrans %}
-        </li>
-
-        <li>
-             {% trans %}
-                  The backend can <b>list</b> completed transactions
-                  and <b>map</b> wire transfers to sets of business
-                  transactions, including the exact terms of each
-                  contract.
-             {% endtrans %}
-        </li>
-
-      </ul>
-    </p>
- </div>
- <!-- 
-   FIXME: When we wrap this img in a div of class col,
-   FIXME: the image ends up overlaping the footer.
- -->
- <img src="{{ svg_localized('images/backend') }}"
-      alt="{{ _("customer perspective")}}"
-      class="img-fluid">
-</div> <!-- /container -->
-{% endblock body_content %}
diff --git a/news.html.j2 b/news.html.j2
deleted file mode 100644
index 8984afa..0000000
--- a/news.html.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="container">
-  <div class="col">
-  <h1>News</h1>
-
-{% include "news/2018-04.inc" %}
-{% include "news/2017-10.inc" %}
-{# include "news/2017-08.inc" #}
-{# include "news/2017-04.inc" #}
-{# include "news/2017-03.inc" #}
-{# include "news/2017-02.inc" #}
-{% include "news/2017-01.inc" %}
-
-<a href="old-news.html"><h3>{{ _("More news")}}</h3></a>
-  </div>
-
-</div>
-
-
-{% endblock body_content %}
diff --git a/old-news.html.j2 b/old-news.html.j2
deleted file mode 100644
index fe339cd..0000000
--- a/old-news.html.j2
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("Older News") }}</h1>
-    <div class="col-lg-12">
-      <p>
-        {% trans %}
-          This page documents the GNU Taler history.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-</div>
-
-<div class="container">
-  <div class="row">
-    <div class="col-lg-12">
-
-{#
-  {% include "news/2016-12.inc" %}
-#}
-{% include "news/2016-10.inc" %}
-{% include "news/2016-09.inc" %}
-{% include "news/2016-08.inc" %}
-{% include "news/2016-06.inc" %}
-{% include "news/2015-12.inc" %}
-
-{#
-  {% include "news/2015-11.inc" %}
-#}
-
-{% include "news/2015-02.inc" %}
-{#
-  {% include "news/2014-12.inc" %}
-#}
-{% include "news/2014-11.inc" %}
-
-    </div>
-  </div>
-</div> <!-- /container -->
-
-{% endblock body_content %}
diff --git a/press.html.j2 b/press.html.j2
deleted file mode 100644
index 336ec36..0000000
--- a/press.html.j2
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="container">
-<h1>{{ _("GNU Taler in the Press")}}</h1>
-
-<h2>2018</h2>
-<p>
-<ul>
-  <li><a 
href="https://www.coindesk.com/free-software-messiah-richard-stallman-we-can-do-better-than-bitcoin";>CoinDesk</a></li>
-  <li><a 
href="https://www.theguardian.com/commentisfree/2018/apr/03/facebook-abusing-data-law-privacy-big-tech-surveillance";>The
 Guardian</a></li>
-  <li><a 
href="https://fossbytes.com/richard-stallman-proposes-data-collection-ceasing/";>FOSSBYTES</a></li>
-  <li><a 
href="http://www.pro-linux.de/news/1/25771/stallman-radikaler-vorschlag-zum-schutz-der-privatsph%C3%83%C2%A4re.html";>Pro
 Linux</a></li>
-  <li><a 
href="https://www.developpez.com/actu/196326/Richard-Stallman-remet-en-cause-l-efficacite-du-RGPD-il-veut-plutot-une-loi-qui-empeche-les-systemes-de-collecter-des-donnees-personnelles/";>Developpez.com</a></li>
-</ul>
-<p>
-
-<h2>2017</h2>
-<p>
-<ul>
- <li><a 
href="https://news.ycombinator.com/item?id=15274110";>Y-combinator</a></li>
- <li><a href="http://hackerpublicradio.org/eps.php?id=2222";>Hacker Public 
Radio</a></li>
- <li><a href="https://www.secupay.com/de/Node/932";>Secupay</a></li>
- <li><a 
href="https://www.developpez.com/actu/142082/Taler-le-systeme-de-paiement-electronique-anonyme-developpe-par-GNU-et-l-INRIA-passe-en-version-0-3-0/";>Developpez.com</a></li>
- <li><a 
href="https://yourstory.com/2017/08/techie-tuesdays-richard-stallman/";>Techie 
Tuesdays</a></li>
- <li><a 
href="https://www.heise.de/tp/features/Kryptowaehrung-will-sich-an-den-Oelpreis-binden-3702862.html";>Heise</a></li>
-</ul>
-</p>
-
-<h2>2016</h2>
-<p>
-<ul>
- <li><a 
href="https://www.theguardian.com/technology/2016/sep/01/online-publishers-readers-ad-block-surveillance-donate-anonymously";>The
 Guardian</a></li>
- <li><a 
href="https://phoronix.com/scan.php?page=news_item&px=GNU-Taler-0.0.0";>Phoronix</a></li>
- <li><a 
href="https://www.reddit.com/r/technology/comments/4mnkin/gnu_taler_000_is_a_free_software_electronic/";>Reddit</a></li>
- <li><a 
href="http://www.heise.de/newsticker/meldung/GNU-Taler-Open-Source-Protokoll-fuer-Zahlungen-in-Version-0-0-0-erschienen-3228525.html";>Heise</a></li>
- <li><a 
href="http://www.golem.de/news/halbanonymes-bezahlsystem-gnu-taler-soll-kryptowaehrungen-gerechter-machen-1606-121323.html";>Golem</a></li>
- <li><a 
href="https://news.ycombinator.com/item?id=11840453";>Y-combinator</a></li>
- <li><a 
href="https://np.reddit.com/r/Anarcho_Capitalism/comments/4mnen4/gnutards_came_up_with_an_alternative_to_bitcoin/";>Reddit</a></li>
- <li><a 
href="http://www.theregister.co.uk/2016/06/06/gnu_cryptocurrency_aims_at_the_mainstream_economy_not_the_black_market/";>The
 Register</a></li>
- <li><a 
href="http://www.opennet.ru/opennews/art.shtml?num=44544";>Opennet</a></li>
- <li><a 
href="http://www.pro-linux.de/news/1/23626/gnu-startet-anonymes-bezahlsystem-taler.html";>Pro-Linux</a></li>
- <li><a href="https://www.nixp.ru/news/13738.html";>nixp</a></li>
- <li><a 
href="https://www.mittelstandswiki.de/2016/06/open-source-geld-gnu-taler-soll-landeswaehrungen-online-verbinden/";>Mittelstands
 Wiki</a></li>
- <li><a 
href="https://www.genbeta.com/especial/el-usuario-merece-que-sea-obligatorio-que-se-respete-su-libertad-entrevista-a-richard-stallman";>Genbeta</a></li>
- <li><a 
href="http://www.lupa.cz/clanky/stallman-vydavatele-musi-umoznit-ctenarum-platit-za-zpravy-anonymne/";>Lupz</a></li>
-</ul>
-</p>
-
-<h2>2015</h2>
-<p>
-<ul>
- <li><a 
href="https://www.reddit.com/r/Bitcoin/comments/3m037h/taler_a_gnu_attempt_at_replacing_bitcoin/";>Reddit</a></li>
- <li><a 
href="https://news.ycombinator.com/item?id=10258312";>Y-combinator</a></li>
- <li><a href="http://www.heise.de/tp/artikel/46/46089/1.html";>Heise</a></li>
- <li><a 
href="https://bitcoinmagazine.com/21901/bitcoin-governments-without-privacy-taxes/";>Bitcoinmagazine</a></li>
- <li><a 
href="http://www.econotimes.com/Will-identifiable-digital-currency-become-the-new-normal-88131";>EconoTimes</a></li>
-</ul>
-</p>
-
-</div>
-{% endblock body_content %}
diff --git a/principles.html.j2 b/principles.html.j2
deleted file mode 100644
index e1b94e1..0000000
--- a/principles.html.j2
+++ /dev/null
@@ -1,215 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<script>
-function expand(n) {
-  var x = document.getElementById(n);
-  console.log(x);
-  x.setAttribute("style", "");
-}
-</script>
-
-<style>
-h2 {
-  margin-top: 1em;
-}
-</style>
-
-<div class="container">
-  <div class="row">
-    <div class="col">
-      <h1>
-      {% trans %}
-      GNU Taler: Design Principles
-      {% endtrans %}
-      </h1>
-    </div>
-  </div>
-  <p>
-  {% trans %}
-  When designing GNU Taler, we had the following design principles in mind:
-  {% endtrans %}
-  </p>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-         1. Free Software implementation
-      {% endtrans %}
-      </h2>
-      <a href="https://www.gnu.org/graphics/freedom.html";><img 
style="width:20vw;float:right" src="../images/stallman.medium.png" 
alt="{{_("... in the are of computing, freedom means not using proprietary 
software")}}"></a>
-      <p>
-        {% trans %}
-        GNU Taler must be <a 
href="https://www.gnu.org/philosophy/free-sw.html";>Free Software</a>.
-        For merchants, our Free Software
-        reference implementation prevents vendor lock-in. As
-        the software of the payment provider itself is free, countries can
-        deploy the payment system without compromising sovereignty.
-        {% endtrans %}
-       </p>
-       <p>
-        {% trans %}
-        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.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-      2. Protect the privacy of buyers
-      {% endtrans %}
-      </h2>
-      <!-- From https://www.pixabay.com/ -->
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}">
-      <p>
-        {% trans %}
-        Privacy should be guaranteed via technical measures, as opposed to mere
-        policies. Especially with micropayments for online content, a 
disproportion-
-        ate amount of rather private data about buyers would be revealed, if 
the
-        payment system does not have privacy protections.
-        {% endtrans %}
-      </p>
-      <p>
-        {% trans %}
-        In legislations with data protection regulations (such as the recently 
introduced GDPR in Europe),
-        merchants benefit from this as well, as
-        no data breach of customers can happen if this information is, by 
design,
-        not collected in the first place. Obviously some private data, such as 
the
-        shipping address for a physical delivery, must still be collected 
according to
-        business needs.
-        {% endtrans %}
-     </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-         3. Enable the state to tax income and crack down on illegal business 
activities
-      {% endtrans %}
-      </h2>
-      <!-- From https://www.pxhere.com/ -->
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}">
-      <p>
-      {% trans %}
-        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.
-      {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-      4. Prevent payment fraud
-      {% endtrans %}
-      </h2>
-      <!-- From https://www.maxpixel.net/ -->
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}">
-      <p>
-      {% trans %}
-        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.
-      {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-      5. Only disclose the minimal amount of information necessary
-      {% endtrans %}
-      </h2>
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by 
default, General Data Protection Regulation (GDPR) compliant")}}"></a>
-      <p>
-      {% trans %}
-        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, 
for example,
-        by keeping details about the merchant’s financials hidden from 
competitors.
-      {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>{% trans %}
-      6. Be usable
-      {% endtrans %}
-      </h2>
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}"></a>
-      <p>
-      {% trans %}
-Specifically it must be usable for non-expert customers. Usability also
-applies to the integration with merchants, and informs choices about the
-architecture, such as encapsulating procedures that require cryptographic
-operations into an isolated component with a simple API.
-      {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-      7. Be efficient
-      {% endtrans %}
-      </h2>
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/efficient.png" alt="{{_("Energy efficiency")}}"></a>
-      <p>
-      {% trans %}
-         Approaches such as proof-of-work are ruled out by this requirement. 
Efficiency is necessary for GNU Taler to be used for micropayments.
-      {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-      8. Fault-tolerant design
-      {% endtrans %}
-      </a></h2>
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}"></a>
-      <p>
-      {% trans %}
-        Taler should tolerate failure of individual components and systems,
-        including malicious operators compromising core secrets.
-        This manifests in architectural choices such
-        as the isolation of certain components, and auditing procedures.
-      {% endtrans %}
-      </p>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>
-      {% trans %}
-      9. Foster competition
-      {% endtrans %}
-      </h2>
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/market.medium.jpg" alt="{{_("A competitive market")}}"></a>
-      <p>
-      {% trans %}
-It must be relatively easy for competitors to join the systems. While the
-barriers for this in traditional financial systems are rather high, the 
technical
-burden for new competitors to join must be minimized. Another design
-choice that supports this is to split the whole system into smaller components
-that can be operated, developed and improved upon independently,
-instead of having one completely monolithic system.
-      {% endtrans %}
-      </p>
-      </div>
-    </div>
-  </div>
-</div>
-
-{% endblock body_content %}
diff --git a/styles.css b/styles.css
index a2981c4..2307a5f 100644
--- a/styles.css
+++ b/styles.css
@@ -33,6 +33,13 @@ nav a:visited {
     text-decoration: none;
 }
 
+.navbar-light .navbar-nav .nav-link {
+    /* 0,0,0,.5 makes it problematic to read,
+       simply black is less problematic */
+    color: rgb(0, 0, 0);
+    text-decoration: underline;
+}
+
 #body_content a:hover {
   transition: background-color 0.3s;
   background-color: rgba(200, 200, 200, 0.5);
@@ -72,12 +79,12 @@ footer {
 }
 
 .btn-dark {
-  background-color: #9d9d9d; 
+  background-color: #9d9d9d;
 }
 
 
 #mybody nav {
- border-radius: 0px; 
+ border-radius: 0px;
 }
 
 footer {
diff --git a/team.html.j2 b/team.html.j2
deleted file mode 100644
index 96182b9..0000000
--- a/team.html.j2
+++ /dev/null
@@ -1,150 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="container">
-<div class="row">
-  <div class="col">
-    <h1>GNU Taler: Team</h2>
-    GNU Taler is proudly brought to you by the humans on this page.  To 
contact the whole team, please
-    write to <a href="mailto:address@hidden";>address@hidden</a>.
-  </div>
-</div>
-<div class="row mt-5"></div>
-<div class="row">
-  <div class="col-lg-4">
-    <h2><a href="http://grothoff.org/christian/";>Dr. Christian 
Grothoff</a></h2>
-    <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" 
alt="Christian Grothoff" align="middle">
-    <p>{{ _("GNU maintainer. Network security &amp; privacy researcher. 
Software architect.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2><a href="http://www.digitalekho.com/about-us/index.html";>Leon 
Schumacher</a></h2>
-    <img src="{{ url('team-images/leon-schumacher.jpg') }}" height="240" 
alt="Leon Schumacher" align="middle">
-    <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director in 
different industries, ….") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Michael Widmer</h2>
-    <img src="{{ url('team-images/michael-widmer.jpg') }}" height="240" 
alt="Michael Widmer" align="middle">
-    <p>{{ _("Lawyer and banker.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-4">
-    <h2><a href="https://fdold.eu/";>Dr. Florian Dold</a></h2>
-    <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" 
alt="Florian Dold" align="middle">
-    <p>{{ _("GNU mainatiner, lead developer.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Dr. Jeffrey Burdges</h2>
-    <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" 
alt="Jeffrey Burdges" align="middle">
-    <p>{{ _("Applied cryptography. Contact to W3c &amp; Tor.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2><a href="https://www.stallman.org/";>Dr. Richard M. Stallman</a></h2>
-    <img src="{{ url('team-images/richard-stallman.jpg') }}" height="240" 
alt="Richard Stallman" align="middle">
-    <p>{{ _("Founder of the GNU project. Ethical guidance and licensing.") 
}}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-4">
-    <h2>Marcello Stanisci</h2>
-    <img src="{{ url('team-images/marcello-stanisci.jpg') }}" height="240" 
alt="Marcello Stanisci" align="middle">
-    <p>{{ _("Software engineer.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Dr. Nana Karlstetter</h2>
-    <img src="{{ url('team-images/nana-karlstetter.jpg') }}" height="240" 
alt="Nana Karlstetter" align="middle">
-    <p>{{ _("Sustainable business development.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2><a href="http://www.onete.net/";>Dr. Cristina Onete</a></h2>
-    <img src="{{ url('team-images/cristina-onete.jpg') }}" height="240" 
alt="Cristina Onete" align="middle">
-    <p>{{ _("Theoretical foundations.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-4">
-    <h2>ng0</h2>
-    <p>{{ _("System administration, Taler Systems SA.") }}</p>
-  </div>
-</div>
-<!-- keep translators together -->
-<div class="row">
-  <div class="col-lg-4">
-    <h2><a href="https://ar.linkedin.com/in/martinolivera";>Martín 
Olivera</a></h2>
-    <p>{{ _("Translator (Spanish)") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Patricia Sunshine</h2>
-    <p>{{ _("Translator (Spanish)") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Fumiko</h2>
-    <p>{{ _("Translator (Spanish)") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-4">
-    <h2>Greta Breveglieri</h2>
-    <p>{{ _("Translator (Italian)") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Ylenia Baldanza</h2>
-    <p>{{ _("Translator (Italian)") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Valeria Salerno</h2>
-    <p>{{ _("Translator (Italian)") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Stefan K&uuml;gel</h2>
-    <p>{{ _("Translator (German)") }}</p>
-  </div>
-</div>
-<!-- more 'remote' people -->
-<div class="row">
-  <div class="col-lg-4">
-    <h2><a href="https://www.nitrokey.com/";>Jan Suhr</a></h2>
-    <p>{{ _("Hardware security module") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2><a href="http://www.goebel-consult.de/";>Hartmut Goebel</a></h2>
-    <p>{{ _("Risk management") }}</p>
-  </div>
-</div>
-<!-- students -->
-<div class="row">
-  <div class="col-lg-4">
-    <h2><a href="http://sreeharsha.totakura.in/";>Sree Harsha Totakura</a></h2>
-    <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" 
alt="Sree Harsha Totakura" align="middle">
-    <p>{{ _("PhD Student, TU Munich. Currently teaching.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2><a href="https://www.sec.in.tum.de/julian-kirsch/";>Julian 
Kirsch</a></h2>
-    <p>{{ _("PhD student, TU Munich. Currently teaching.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-4">
-    <h2>Oliver Broome</h2>
-    <p>{{ _("Free software developer.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Shivam Kohli</h2>
-    <p>{{ _("Free software developer.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Benedikt Müller</h2>
-    <p>{{ _("Free software developer.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-4">
-    <h2>Dominique Hofmann</h2>
-    <p>{{ _("Free software developer.") }}</p>
-  </div>
-  <div class="col-lg-4">
-    <h2>Jan Str&uuml;bin</h2>
-    <p>{{ _("Free software developer.") }}</p>
-  </div>
-</div>
-</div>
-{% endblock body_content %}
diff --git a/template.py b/template.py
index a055a33..d7be569 100755
--- a/template.py
+++ b/template.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# coding: utf-8
+#
 # This file is in the public domain.
 #
 # This script runs the jinja2 templating engine on an input template-file
@@ -34,7 +36,7 @@ langs_full = {"en": "English",
               "ru": "Ру́сский язы́к",
               "pt": "Português"}
 
-for in_file in glob.glob("*.j2"):
+for in_file in glob.glob("template/*.j2"):
     name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups()
     tmpl = env.get_template(in_file)
 
@@ -42,7 +44,7 @@ for in_file in glob.glob("*.j2"):
         """
         Return URL for the current page in another locale.
         """
-        return "../" + other_locale + "/" + in_file.rstrip(".j2")
+        return "../" + other_locale + "/" + in_file.replace('template/', 
'').rstrip(".j2")
 
     def url_localized(filename):
         return "../" + locale + "/" + filename
@@ -70,7 +72,6 @@ for in_file in glob.glob("*.j2"):
 
         env.install_gettext_translations(tr, newstyle=True)
 
-
         content = tmpl.render(
                 docshost="docs.taler.net",
                 lang=locale,
@@ -80,7 +81,7 @@ for in_file in glob.glob("*.j2"):
                 url_localized=url_localized,
                 svg_localized=svg_localized,
                 filename=name + "." + ext)
-        out_name = "./" + locale + "/" + in_file.rstrip(".j2")
-        os.makedirs("./" + locale, exist_ok=True)
-        with codecs.open(out_name, "w", "utf-8") as f:
+        out_name = "./rendered/" + locale + "/" + in_file.replace('template/', 
'').rstrip(".j2")
+        os.makedirs("./rendered/" + locale, exist_ok=True)
+        with codecs.open(out_name, "w", encoding='utf-8') as f:
             f.write(content)
diff --git a/architecture.html.j2 b/template/architecture.html.j2
similarity index 95%
rename from architecture.html.j2
rename to template/architecture.html.j2
index 21fd6ba..d9170b2 100644
--- a/architecture.html.j2
+++ b/template/architecture.html.j2
@@ -4,10 +4,7 @@
 <div class="jumbotron">
   <div class="container text-center">
     <h1>{{ _("Taler System Architecture") }}</h1>
-    <p>
-    </p>
   </div>
-
 </div>
 
 <div class="container">
diff --git a/bibliography.html.j2 b/template/bibliography.html.j2
similarity index 100%
rename from bibliography.html.j2
rename to template/bibliography.html.j2
diff --git a/template/contact.html.j2 b/template/contact.html.j2
new file mode 100644
index 0000000..91c7abe
--- /dev/null
+++ b/template/contact.html.j2
@@ -0,0 +1,75 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+  <div class="jumbotron">
+    <div class="container text-center">
+      <h1>{{ _("Contact information") }}</h1>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-4">
+        <h2>{{ _("The mailing list") }}</h2>
+        <p>
+          {% trans %}
+            An archived, public mailing list for GNU Taler is
+            hosted at
+          {% endtrans %}
+          <a 
href="https://lists.gnu.org/mailman/listinfo/taler";>https://lists.gnu.org/mailman/listinfo/taler</a>
+          (<a href="https://lists.gnu.org/archive/html/taler/";>{{ 
_("archive")}}</a>).
+          {% trans %}
+            You can send messages to the list at
+          {% endtrans %}
+          <a href="mailto:address@hidden";>address@hidden</a>.
+        </p>
+      </div>
+
+      <div class="col-lg-4">
+        <h2>{{ _("Contacting individuals") }}</h2>
+        <p>
+          {% trans %}
+            Team members are generally reachable at
+            <tt>address@hidden</tt>. All of us
+            support receiving GnuPG encrypted e-mails.
+          {% endtrans %}
+        </p>
+      </div>
+
+      <div class="col-lg-4">
+        <h2>{{ _("General inquiries") }}</h2>
+        <p>
+          {% trans %}
+            You can reach a group of team members handling
+            general inquiries at <tt>contact AT taler.net</tt>.
+          {% endtrans %}
+        </p>
+      </div>
+
+      <div class="col-lg-6">
+        <h2>{{ _("Reporting bugs") }}</h2>
+        <p>
+          {% trans %}
+            We track open feature requests and bugs in our
+          {% endtrans %}
+          <a href="https://gnunet.org/bugs/";>{{ _("Bug tracker")}}</a>,
+          {% trans %}
+            which is shared with the GNUnet project.
+            You can also report bugs or feature requests to the
+            mailing list.
+          {% endtrans %}
+        </p>
+      </div>
+
+      <div class="col-lg-6">
+        <h2>{{ _("Executive team") }}</h2>
+        <p>
+          {% trans %}
+            For non-technical commercial requests, please contact
+            <tt>ceo AT taler.net</tt>.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+{% endblock body_content %}
diff --git a/template/copyright.html.j2 b/template/copyright.html.j2
new file mode 100644
index 0000000..8ce7357
--- /dev/null
+++ b/template/copyright.html.j2
@@ -0,0 +1,44 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<!-- Jumbotron -->
+<div class="jumbotron">
+  <div class="container text-center">
+    <h1>{{ _("Copyright Assignment") }}</h1>
+    <!-- Note: source of the pdf/copyright.pdf is in gitolite-admin/ -->
+    <p>
+      {% trans %}
+        Contributors to GNU Taler with Git access must sign the
+        <a href="/pdf/copyright.pdf">copyright assignment</a>
+        to ensure that the
+      {% endtrans %}
+      <a 
href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";>
+        GNUnet e.V. --- Taler Systems SA {{ _("agreement on licensing and 
collaborative development")}}
+      </a>
+      {% trans %}
+        of the GNUnet and GNU Taler projects is satisfied.
+      {% endtrans %}
+    </p>
+  </div>
+  <div class="container">
+    <p>
+      {% trans %}
+        The agreements ensure that the code will continue to be made
+        available under free software licenses, but gives developers
+        the freedom to move code between GNUnet and GNU Taler without
+        worrying about licenses and the company the ability to
+        dual-license (for example, so that we can distribute via
+        App-stores that are hostile to free software).
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+        Minor contributions (basically, anyone without Git access) do
+        not require copyright assignment. Pseudonymous contributions are
+        accepted, in this case simply sign the agreement with your
+        pseudonym. Scanned copies are sufficient, but snail mail is
+        preferred.
+      {% endtrans %}
+    </p>
+  </div>
+</div>
+{% endblock body_content %}
diff --git a/template/developers.html.j2 b/template/developers.html.j2
new file mode 100644
index 0000000..0fc1f67
--- /dev/null
+++ b/template/developers.html.j2
@@ -0,0 +1,300 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+  <div class="jumbotron">
+    <div class="text-center">
+      <h1>{{ _("Taler for developers") }}</h1>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-6">
+        <h3>{{ _("Free") }}</h3>
+
+        <p>
+          {% trans %}
+            GNU Taler is free software implementing an open
+            protocol. Anybody is welcome to integrate our reference
+            implementation into their applications.  Different
+            components of Taler are being made available under
+            different licenses. The Affero GPLv3+ is used for the
+            exchange, the LGPLv3+ is used for reference code
+            demonstrating integration with merchant platforms, and
+            licenses like GPLv3+ are used for
+            wallets and related customer-facing software.  We are
+            open for constructive suggestions for maximizing the
+            adoption of this payment platform.
+          {% endtrans %}
+        </p>
+
+      </div>
+      <div class="col-lg-6">
+        <h3>{{ _("RESTful") }}</h3>
+
+        <p>
+          {% trans %}
+            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 HTTP or HTTPS. Taler's security does
+            not depend upon the use of HTTPS, but obviously
+            merchants may choose to offer HTTPS for consistency
+            and because it generally is better for privacy
+            compared to HTTP.  Taler uses JSON to encode
+            structure data, making it easy to integrate Taler
+            with existing Web applications.  Taler's protocol
+            is documented in detail at
+          {% endtrans %}
+          <a href="https://docs.taler.net/";>docs.taler.net</a>.
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="container-fluid c_acronym">
+    <div class="container">
+      <div class="row">
+        <div class="col-lg-4">
+          <h3>{{ _("Code") }}</h3>
+
+          <p>
+            {% trans %}
+              Taler is currently primarily developed by a
+              research team at
+            {% endtrans %}
+            <a href="http://www.inria.fr/";>Inria</a>
+            {% trans %}
+              and
+            {% endtrans %}
+            <a href="https://gnunet.org/";>GNUnet</a>.
+            {% trans %}
+              However, contributions from anyone are welcome.  Our Git
+              repositories can be cloned using the Git and HTTP access methods
+              against <tt>git.taler.net</tt> with the name of the respective
+              repository. A list of repositories can be found in our
+            {% endtrans %}
+            <a href="https://git.taler.net/";>GitWeb</a>.
+          </p>
+        </div>
+        <div class="col-lg-4">
+          <h3>{{ _("Documentation") }}</h3>
+
+          <p>
+            {% trans %}
+              In addition to this website, the
+            {% endtrans %}
+            <a href="https://git.taler.net/";>{{ _("documented code")}}</a>
+            {% trans %}
+              and the
+            {% endtrans %}
+            <a href="https://docs.taler.net/";>{{ _("API documentation")}}</a>.
+            {% trans %}
+              Technical papers can be found in our
+            {% endtrans %}
+            <a href="bibliography.html">{{ _("bibliography")}}</a>.
+          </p>
+        </div>
+        <div class="col-lg-4">
+          <h3>{{ _("Discussion") }}</h3>
+
+          <p>
+            {% trans %}
+              We have a mailing list for developer discussions.
+              You can subscribe to or read the list archive at
+            {% endtrans %}
+            <a 
href="http://lists.gnu.org/mailman/listinfo/taler";>http://lists.gnu.org/mailman/listinfo/taler</a>.
+          </p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-lg-4">
+          <h3>{{ _("Regression Testing") }}</h3>
+
+          <p>
+            {% trans %}
+              We have
+            {% endtrans %}
+            <a href="https://buildbot.net/";>Buildbot</a>
+            {% trans %}
+              automation tests to detect regressions and check for
+              portability at
+            {% endtrans %}
+            <a href="https://buildbot.taler.net/";>buildbot.taler.net</a>.
+          </p>
+        </div>
+        <div class="col-lg-4" note="not yet operational">
+          <h3>{{ _("Code Coverage Analysis") }}</h3>
+
+          <p>
+            {% trans %}
+              We use
+            {% endtrans %}
+            <a href="http://ltp.sourceforge.net/coverage/lcov.php";>LCOV</a>
+            {% trans %}
+              to analyze the code coverage of our tests, the
+              results are available at
+            {% endtrans %}
+            <a href="https://lcov.taler.net/";>lcov.taler.net</a>.
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="container-fluid">
+    <div class="container">
+      <h2>{{ _("Technical Presentation") }}</h2>
+      <div class="row">
+        <div class="col-lg-4">
+          <a href="{{ url('presentations/tech.pdf') }}"><img border=0 
class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') 
}}"><br><p align="center">{{ _("Download") }}</p></a>
+        </div>
+        <div class="col-lg-4" id="canvas-left" style="display:none">
+          <canvas id="the-canvas-left"></canvas>
+        </div>
+        <div class="col-lg-4" id="canvas-right" style="display:none">
+          <canvas id="the-canvas-right"></canvas>
+        </div>
+        <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') 
}}"></script>
+        <script type="text/javascript" src="{{ url('dist/js/pdf-view-tech.js') 
}}"></script>
+      </div>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="col-lg-12">
+      <h3 id="overview">{{ _("Taler system overview") }}</h3>
+
+      <p>
+        {% trans %}
+          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:
+        {% endtrans %}
+      </p>
+
+      <img src="/images/taler-arch-full.svg" alt="{{_("system overview")}}" 
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
+      <ol>
+        <li>
+          {% trans %}
+            A customer instructs his <b>bank</b> to
+            transfer funds from his account to the Taler
+            exchange (top left).  In the subject of the
+            transaction, he includes an authentication
+            token from his electronic <b>wallet</b>. In
+            Taler terminology, the customer creates a
+            reserve at the exchange.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            Once the exchange has received the wire
+            transfer, it allows the customer's electronic
+            wallet to <b>withdraw</b> electronic coins.
+            The electronic coins are digital
+            representations of the original currency from
+            the transfer. It is important to note that the
+            exchange does not learn the &quot;serial
+            numbers&quot; of the coins created in this
+            process, so it cannot tell later which customer
+            purchased what at which merchant.  The use of
+            Taler does not change the currency or the total
+            value of the funds (except for fees which the
+            exchange may charge for the service).
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            Once the customer has the digital coins in his
+            wallet, the wallet can be used to <b>spend</b>
+            the coins with merchant portals that support
+            the Taler payment system and accept the
+            respective exchange as a business partner
+            (bottom arrow). This creates a digital contract
+            signed by the customer's coins and the
+            merchant.  If necessary, the customer can later
+            use this digitally signed contract in a court
+            of law to prove the exact terms of the contract
+            and that he paid the respective amount. The
+            customer does not learn the banking details of
+            the merchant, and Taler does not require the
+            merchant to learn the identity of the
+            customer. Naturally, the customer can spend any
+            fraction of his digital coins (the system takes
+            care of customers getting change).
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            Merchants receiving digital
+            coins <b>deposit</b> the respective claims
+            that resulted from the contract signing with
+            the customer at the exchange to redeem the
+            coins.  The deposit step does not reveal the
+            details of the contract between the customer
+            and the merchant or the identity of the
+            customer to the exchange in any way. However,
+            the exchange does learn the identity of the
+            merchant via the provided bank routing
+            information.  The merchant can, for example
+            when compelled by the state for taxation,
+            provide information linking the individual
+            deposit to the respective contract signed by
+            the customer. Thus, the exchange's database
+            allows the state to enforce that merchants pay
+            applicable taxes (and do not engage in illegal
+            contracts).
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            Finally, the exchange transfers funds
+            corresponding to the digital coins redeemed by
+            the merchants to the merchant's <b>bank</b>
+            account. The exchange may combine multiple
+            small transactions into one larger bank
+            transfer.  The merchant can query the exchange
+            about the relationship between the bank
+            transfers and the individual claims that were
+            deposited.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            Most importantly, the exchange keeps
+            cryptographic proofs that allow it to
+            demonstrate that it is operating correctly to
+            third parties.  The system requires an
+            external <b>auditor</b>, such as a
+            government-appointed financial regulatory body,
+            to frequently verify the exchange's databases
+            and check that its bank balance matches the
+            total value of the remaining coins in
+            circulation.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            Without the auditor, the exchange operators
+            could embezzle funds they are holding in
+            reserve. Customers and merchants cannot cheat
+            each other or the exchange. If any party's
+            computers are compromised, the financial damage
+            is limited to the respective party and
+            proportional to the funds they have in
+            circulation during the period of the
+            compromise.
+          {% endtrans %}
+        </li>
+      </ol>
+      <div class="col">
+        <img class="img-fluid" src="../images/diagram-complex.png">
+      </div>
+    </div>
+  </div> <!-- /container -->
+{% endblock body_content %}
diff --git a/docs.html.j2 b/template/docs.html.j2
similarity index 56%
rename from docs.html.j2
rename to template/docs.html.j2
index 46fd154..83fa2e5 100644
--- a/docs.html.j2
+++ b/template/docs.html.j2
@@ -4,14 +4,17 @@
 <div class="container">
   <div class="row">
     <div class="col">
-    <h1>GNU Taler: Documentation and Resources</h1>
+    <h1>{{ _("GNU Taler: Documentation and Resources")}}</h1>
     </div>
   </div>
 
   <div class="row">
     <div class="col">
-    This is an overview of documentation and other resources for GNU Taler.  
The full documentation
-    contents can be found <a href="https://docs.taler.net/";>here</a>.
+      {% trans %}
+        This is an overview of documentation and other resources for GNU Taler.
+        The full documentation contents can be found
+        <a href="https://docs.taler.net/";>here</a>.
+      {% endtrans %}
     </div>
   </div>
 
@@ -21,7 +24,7 @@
 
   <div class="row justify-content-center text-center">
     <div class="col-8">
-      <h2>Components</h2>
+      <h2>{{ _("Components")}}</h2>
     </div>
   </div>
 
@@ -32,43 +35,49 @@
     <div class="col-3">
       <a href="https://{{ docshost }}/taler-merchant-manual.html">
       <img src="../icons/icon-backend.svg" height=60>
-      <h3>Merchant Backend Administration</h3>
+      <h3>{{ _("Merchant Backend Administration")}}</h3>
       </a>
-      {{ _("Tutorial and manual for operating a merchant") }}.
-      {{ _("Also available as") }} <a href="https://{{ docshost 
}}/pdf/taler-merchant-manual.pdf">PDF</a>.
+      {% trans %}
+        Tutorial and manual for operating a merchant.
+        Also available as
+      {% endtrans %}
+      <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>.
     </div>
 
     <div class="col-3">
       <a href="https://{{ docshost }}/taler-merchant-api-tutorial.html">
-      <img src="../icons/icon-market.svg" height=60>
-      <h3>{{ _("Merchant API Tutorial") }}</h3>
+        <img src="../icons/icon-market.svg" height=60>
+        <h3>{{ _("Merchant API Tutorial") }}</h3>
       </a>
       {% trans %}
-      Tutorial for processing Taler payments using the merchant backend API.
-      Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
+        Tutorial for processing Taler payments using the merchant backend API.
+        Also available as
+      {% endtrans %}
+      <a href="https://{{ docshost 
}}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
     </div>
 
     <div class="col-3">
       <a href="https://{{ docshost }}/taler-exchange-manual.html">
-      <img src="../icons/icon-exchange.svg" height=60>
-      <h3>Exchange</h3>
+        <img src="../icons/icon-exchange.svg" height=60>
+        <h3>{{ _("Exchange")}}</h3>
       </a>
       {% trans %}
-      Operator's manual for the GNU Taler exchange.
-      Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-exchange-manual.pdf">PDF</a>.
+        Operator's manual for the GNU Taler exchange.
+        Also available as
+      {% endtrans %}
+      <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>.
     </div>
 
     <div class="col-3">
       <a href="https://{{ docshost }}/taler-bank-manual.html">
-      <img src="../icons/icon-bank.svg" height=60>
-      <h3>{{ _("Bank Integration") }}</h3>
+        <img src="../icons/icon-bank.svg" height=60>
+        <h3>{{ _("Bank Integration") }}</h3>
       </a>
       {% trans %}
-      Manual for tightly integrating Taler with banking applications.
-      Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-bank-manual.pdf">PDF</a>.
+        Manual for tightly integrating Taler with banking applications.
+        Also available as
+      {% endtrans %}
+      <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>.
     </div>
   </div>
 
@@ -79,13 +88,14 @@
 
     <div class="col-3">
       <a href="https://{{ docshost }}/taler-backoffice-manual.html">
-      <img src="../icons/icon-backoffice.svg" height=60>
-      <h3>{{ _("Back office") }}</h3>
+        <img src="../icons/icon-backoffice.svg" height=60>
+        <h3>{{ _("Back office") }}</h3>
       </a>
       {% trans %}
-      Manual to run the back-office Web application.
-      Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-backoffice-manual.pdf">PDF</a>.
+        Manual to run the back-office Web application.
+        Also available as
+      {% endtrans %}
+      <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>.
     </div>
   </div>
 
@@ -94,7 +104,7 @@
 
   <div class="row justify-content-center text-center">
     <div class="col-8">
-      <h2>Internals</h2>
+      <h2>{{ _("Internals")}}</h2>
     </div>
   </div>
 
@@ -104,21 +114,23 @@
   <div class="row">
     <div class="col-3">
       <a href="https://{{ docshost }}/core/index.html">
-      <img src="../icons/icon-api.svg" height=60>
-      <h3>HTTP API</h3>
+        <img src="../icons/icon-api.svg" height=60>
+        <h3>{{ _("HTTP API")}}</h3>
       </a>
-      {{ _("Reference for the HTTP-based API for Taler components.") }}
-      </div>
+      {% trans %}
+        Reference for the HTTP-based API for Taler components.
+      {% endtrans %}
+    </div>
 
     <div class="col-3">
       <a href="https://{{ docshost }}/onboarding.html">
         <img src="../icons/icon-developers.svg" height=60>
-        <h3>Onboarding</h3>
+        <h3>{{ _("Onboarding")}}</h3>
       </a>
       {% trans %}
-      Description of our taler.net setup and how to contribute.
-      Also available as
-      {% endtrans %} 
+        Description of our taler.net setup and how to contribute.
+        Also available as
+      {% endtrans %}
       <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>.
     </div>
   </div>
@@ -128,7 +140,7 @@
 
   <div class="row justify-content-center text-center">
     <div class="col-8">
-      <h2>Community</h2>
+      <h2>{{ _("Community")}}</h2>
     </div>
   </div>
 
@@ -139,7 +151,7 @@
     <div class="col-3">
       <a href="https://lists.gnu.org/mailman/listinfo/taler";>
         <img src="../icons/icon-share.svg" height=60>
-        <h3>Mailing List</h3>
+        <h3>{{ _("Mailing List")}}</h3>
       </a>
       {{ _("The official GNU Taler mailing list.") }}
     </div>
@@ -147,7 +159,7 @@
     <div class="col-3">
       <a href="https://webchat.freenode.net/?channels=taler";>
         <img src="../icons/icon-share.svg" height=60>
-        <h3>IRC</h3>
+        <h3>{{ _("IRC")}}</h3>
       </a>
       {{ _("Our IRC channel is #taler on freenode.") }}
     </div>
@@ -155,7 +167,7 @@
     <div class="col-3">
       <a href="https://gnunet.org/bugs/";>
         <img src="../icons/icon-share.svg" height=60>
-        <h3>Bug Tracker</h3>
+        <h3>{{ _("Bug Tracker")}}</h3>
       </a>
       {{ _("Our bug tracker for bugs and feature request.") }}
     </div>
@@ -167,7 +179,7 @@
 
   <div class="row justify-content-center text-center">
     <div class="col-8">
-      <h2>Code</h2>
+      <h2>{{ _("Code")}}</h2>
     </div>
   </div>
 
diff --git a/template/faq.html.j2 b/template/faq.html.j2
new file mode 100644
index 0000000..3a9349d
--- /dev/null
+++ b/template/faq.html.j2
@@ -0,0 +1,195 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+  <div class="container">
+
+    <h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
+
+    <p>
+      {% trans %}
+        Taler does not require any Blockchain technology, and is
+        also not based on proof-of-work or any other distributed consensus
+        mechanism.  Instead, Taler is based on blind signatures.
+        However, it is theoretically possible to combine Taler with
+        peer-to-peer crypto-currencies like Bitcoin.
+      {% endtrans %}
+    </p>
+
+    <p>
+      {% trans %}
+        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.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("Where is the balance in my wallet stored?") }}</h2>
+    <p>
+      {% trans %}
+        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.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("What if my wallet is lost?") }}</h2>
+    <p>
+      {% trans %}
+        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.
+      {% endtrans %}
+    </p>
+
+    <p>
+      {% trans %}
+        The risk of losing a wallet can be mitigated by making backups or
+        keeping the balance reasonably low.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("What if my computer is hacked?") }}</h2>
+    <p>
+      {% trans %}
+        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.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("Can I send money to my friend with Taler?") }}</h2>
+    <p>
+      {% trans %}
+        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.
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+        Future versions of the Taler wallet may allow exchanging coins
+        among friends directly as well.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("How does Taler handle payments in different currencies?") }}</h2>
+    <p>
+      {% trans %}
+        Taler wallets can store digital coins corresponding to multiple
+        different currencies such as the Euro, US Dollars or Bitcoins.
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+        Taler currently does not offer conversion between currencies.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("How does Taler protect my privacy?") }}</h2>
+    <p>
+      {% trans %}
+        Your wallet stores digital coins that are
+        <a href="https://en.wikipedia.org/wiki/Blind_signature";>blindly 
signed</a>
+        by an exchange.  The use of a blind signature protects your
+        privacy as it prevents the exchange from knowing which coin it signed
+        for which customer.
+      {% endtrans %}
+    </p>
+
+
+    <h2>{{ _("How much does it cost?") }}</h2>
+    <p>
+      {% trans %}
+        The Taler protocol allows any exchange to set its own fee
+        structure, allowing operators to set fees for withdrawing, depositing,
+        refreshing or refunding coins.  Operators can also charge fees for
+        closing reserves and for (aggregated) wire transfers to merchants.
+        Merchants may choose to cover some of the fees customers incur.
+        Actual transaction costs are estimated around 0.001 cent/transaction
+        (at high transaction rates, amortized over billions of transactions,
+        excluding migration costs). Note that this is an early estimate,
+        details may depend on hosting and backup requirements from the
+        regulator and could thus easily be 10x higher.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("Does Taler work with international payments?") }}</h2>
+    <p>
+      {% trans %}
+        Taler's wallet supports multiple currencies, but the system
+        currently does not support conversion between currencies.  However,
+        in principle an entity that accepts deposits in one currency and
+        allows withdrawals in another currency could be created. Still, the
+        regulatory hurdles in this case tend to be particularly complex.
+        The focus for Taler is on day-to-day payments, so we have no plans
+        to support currency conversion in the near future.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("How does Taler relate to the (European) Electronic Money 
Directive?") }}</h2>
+    <p>
+      {% trans %}
+        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.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("What bank would guarantee the conversion between Taler coins and 
bank money in regular bank accounts?") }}</h2>
+    <p>
+      {% trans %}
+        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 regular 
bank or a central
+        bank for a centrally banked electronic currency. Regardless, the bank 
would fall under
+        the respective banking regulations establishing a reason why consumers 
would have faith
+        in the conversion from Taler coins into regular bank money.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("To whom would consumers complain to in case of non-conversion or 
non-compliance?") }}</h2>
+    <p>
+      {% trans %}
+        Any exchange should be audited by one or more independent auditors.  
Merchants and
+        consumer wallets will report certain issues automatically to the 
auditors, but auditors
+        may also provide a method for manual submission of issues.  The 
auditors are expected
+        to make their reports available to the respective regulatory 
authorities, or even
+        the general public.
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("Are there any projects already using Taler?") }}</h2>
+    <p>
+      {% trans %}
+        We are aware of several businesses running exploratory projects or 
having
+        developed working prototypes. We are also
+        in discussions with several regular banks as well as several central 
banks
+        about the project. That said, there are currently no products in the
+        market yet, and we believe this would be premature given the state of
+        the project (see also <a href="https://gnunet.org/bugs/";>our 
bugtracker</a>
+        for a list of open issues).
+      {% endtrans %}
+    </p>
+
+    <h2>{{ _("Does Taler support recurring payments?") }}</h2>
+    <p>
+      {% trans %}
+        Today, our wallet implementation does not support recurring
+        payments. Recurring payments, where some fixed amount is paid on a
+        regular basis are in theory possible with Taler, but they come with a
+        few caveats. Specifically, recurring payments can only work if the
+        Taler wallet is running and online around the desired time.
+        Furthermore, given their repetitive nature they are linkable, and
+        could thus be used to deanonymize the user making the recurring
+        payment, for example by forcing the user offline at the time of the
+        payment and observing that it does then not happen on time.  Finally,
+        the Taler wallet does not work with credit and thus the user would
+        have to make sure to carry a sufficient balance for the recurring
+        payment to be made. Still, they can be useful, and a future version of
+        the Taler wallet will likely support them. But this is not a feature
+        that we are targeting for Taler 1.0. at this time
+      {% endtrans %}
+    </p>
+
+  </div>
+{% endblock body_content %}
diff --git a/template/features.html.j2 b/template/features.html.j2
new file mode 100644
index 0000000..e4c4448
--- /dev/null
+++ b/template/features.html.j2
@@ -0,0 +1,213 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+<div class="container">
+  <div class="row">
+    <div class="col">
+    <h1>{{ _("GNU Taler: Features")}}</h1>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col">
+      <p>
+        {% trans %}
+          GNU Taler is a <span class="tlr">privacy-preserving</span>
+          payment system.  Customers can stay anonymous, but
+          merchants can not hide their income through payments with GNU Taler.
+          This helps to
+          <span class="tlr">avoid tax evasion and money laundering</span>.
+       {% endtrans %}
+    </p>
+
+    <p>
+       {% trans %}
+         The primary use case of GNU Taler is
+         <span class="tlr">payments</span>; it is
+         <span class="tlr">not meant as a store</span>
+         of value. Payments are always backed by an existing currency.
+       {% endtrans %}
+    </p>
+
+    <p>
+      {% trans %}
+        Payment are made after
+        <span class="tlr">exchanging existing money</span>
+        into <em>electronic money</em> with the help of
+        an Exchange service, that is, a payment service provider for Taler.
+      {% endtrans %}
+    </p>
+
+    <p>
+       {% trans %}
+         When making a payment, customers only need a charged wallet.
+         A merchant can accept payments
+         <span class="tlr">without making their customers register</span>
+         on the merchant's Website.
+       {% endtrans %}
+    </p>
+
+    <p>
+      {% trans %}
+        GNU Taler is
+        <span class="tlr">immune against many types of fraud</span>,
+        such as phishing of credit card information or
+        chargeback fraud.  In case of loss or theft, only the limited amount
+        of money left in the wallet might be gone.
+      {% endtrans %}
+    </p>
+    </div>
+    <div class="col">
+      <img class="img-fluid" src="../images/diagram-simple.png">
+    </div>
+  </div>
+</div>
+
+<div class="container-fluid">
+  <div class="container" style="border: 5px dotted black">
+    <div class="row">
+      <div class="col-lg-6">
+        <h2>{{ _("Paying with Taler") }}</h2>
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+        <p>
+          <a href="https://demo.taler.net";>
+            {% trans %}
+              Try it yourself with the interactive demo!
+            {% endtrans %}
+          </a>
+        </p>
+      </div>
+      <div class="col-lg-6">
+        <h2>{{ _("Receiving payments with Taler") }}</h2>
+        <p>
+          {% trans %}
+            To receive Taler payments, a merchant needs a bank account
+            in the desired currency.  We provide supporting software
+            in various programming languages to make the integration painless.
+            The merchant's backend for Taler transaction processing can run
+            on the merchant's premises or be hosted by a third party.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Merchant integration is simple, and customers can pay for products
+            without even having to register an account.
+          {% endtrans %}
+        </p>
+        <p>
+          <a href="https://docs.taler.net";>
+            {% trans %}
+              See how merchant integration works in our developer 
documentation!
+            {% endtrans %}
+          </a>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="container">
+
+  <div class="row adorn_h3_bracket">
+
+    <div class="col-lg-4">
+      <h3>{{ _("Practical") }}</h3>
+
+      <p>
+        {% trans %}
+          Taler is easy to integrate with existing Web
+          applications. Payments are cryptographically
+          secured and are confirmed within milliseconds with
+          extremely low transaction costs.
+        {% endtrans %}
+      </p>
+
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Stable") }}</h3>
+
+      <p>
+        {% trans %}
+          Taler does not introduce a new currency. Taler
+          uses a digital wallet storing coins and payment service
+          providers with escrow accounts in existing currencies.
+          Thus, Taler's cryptographic coins correspond to existing
+          currencies, such as US Dollars, Euros or even Bitcoins.
+        {% endtrans %}
+      </p>
+
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Secure") }}</h3>
+
+      <p>
+        {% trans %}
+          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.
+        {% endtrans %}
+      </p>
+
+    </div>
+  </div>
+  <div class="row adorn_h3_bracket">
+    <div class="col-lg-4">
+      <h3>{{ _("Taxable") }}</h3>
+
+      <p>
+        {% trans %}
+          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.
+        {% endtrans %}
+      </p>
+
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Private") }}</h3>
+      <p>
+        {% trans %}
+          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.
+        {% endtrans %}
+      </p>
+
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Libre") }}</h3>
+
+      <p>
+        {% trans %}
+          Taler provides protocols and reference implementations that in
+          principle enables anybody to run their own payment infrastructure,
+          be it individuals, organizations or whole countries.  Since the
+          reference implementation is a
+        {% endtrans %}
+        <a href="https://www.gnu.org/";>GNU</a>
+        {% trans %}
+          package, it will always remain free software.
+        {% endtrans %}
+      </p>
+    </div>
+  </div>
+</div>
+
+{% endblock body_content %}
diff --git a/template/financial-news.html.j2 b/template/financial-news.html.j2
new file mode 100644
index 0000000..f104cbc
--- /dev/null
+++ b/template/financial-news.html.j2
@@ -0,0 +1,41 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+<div class="jumbotron">
+  <div class="container text-center">
+    <h1>{{ _("Financial News") }}</h1>
+    <div class="col-lg-12">
+      <p>
+        {% trans %}
+          This page explains (only in English) how Taler can change ongoing
+          developments in the financial industry.
+        {% endtrans %}
+      </p>
+    </div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12">
+      {% include "financial-news/2017-07-20.inc" %}
+      {% include "financial-news/2017-04-04.inc" %}
+      {% include "financial-news/2017-04-03.inc" %}
+      {% include "financial-news/2016-10-26.inc" %}
+      {% include "financial-news/2016-10-24.inc" %}
+      {% include "financial-news/2016-10-21.inc" %}
+      {% include "financial-news/2016-10-15.inc" %}
+      {% include "financial-news/2016-07-23.inc" %}
+      {% include "financial-news/2015-12-22.inc" %}
+      {% include "financial-news/2015-04-30.inc" %}
+      {% include "financial-news/2015-03-17.inc" %}
+      {% include "financial-news/2014-12-06.inc" %}
+      {% include "financial-news/2014-12-05.inc" %}
+      {% include "financial-news/2014-11-13.inc" %}
+      {% include "financial-news/2014-09-10.inc" %}
+      {% include "financial-news/2013-09-15.inc" %}
+    </div>
+  </div>
+</div> <!-- /container -->
+
+{% endblock body_content %}
diff --git a/template/glossary.html.j2 b/template/glossary.html.j2
new file mode 100644
index 0000000..cb5862e
--- /dev/null
+++ b/template/glossary.html.j2
@@ -0,0 +1,258 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<div class="container">
+
+  <dl>
+    <dt>{{ _("auditor") }}</dt>
+    <dd>
+      {% trans %}
+        trusted third party that verifies that the `exchange` is operating 
correctly
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("bank") }}</dt>
+    <dd>
+      {% trans %}
+        traditional financial service provider who offers wire `transfers` 
between accounts
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("coin") }}</dt>
+    <dd>
+      {% trans %}
+        coins are individual token representing a certain amount of value, 
also known as the `denomination` of the coin
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("contract") }}</dt>
+    <dd>
+      {% trans %}
+        the proposal signed by the wallet.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("denomination") }}</dt>
+    <dd>
+      {% trans %}
+        unit of currency, specifies both the currency and the face value of a
+        `coin`
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("denomination key") }}</dt>
+    <dd>
+      {% trans %}
+        RSA key used by the exchange to certify that a given `coin` is valid 
and
+        of a particular `denomination`
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("deposit") }}</dt>
+    <dd>
+      {% trans %}
+        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`
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("dirty") }}</dt>
+    <dd>
+      {% trans %}
+        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
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("exchange") }}</dt>
+    <dd>
+      {% trans %}
+        Taler's payment service provider.  Issues electronic `coins` during
+        `withdrawal` and redeems them when they are `deposited` by merchants.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("expired") }}</dt>
+    <dd>
+      {% trans %}
+        Various operations come with time limits. In particular, `denomination 
keys`
+        come with strict time limits for the various operations involving the
+        `coin` issued under the `denomination`. The most important limit is the
+        `deposit` expiration, which specifies until when wallets are allowed to
+        use the coin in `deposit` or `refreshing` operations. There is also a 
"legal"
+        expiration, which specifies how long the exchange keeps records beyond 
the
+        `deposit` expiration time.  This latter expiration matters for legal 
disputes
+        in courts and also creates an upper limit for `refreshing` operations 
on
+        special `zombie coin`.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("extension") }}</dt>
+    <dd>
+      {% trans %}
+        implementation of a `wallet` for browsers
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("fresh coin") }}</dt>
+    <dd>
+      {% trans %}
+        a `coin` is fresh if its public key is only known to the customer
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("master key") }}</dt>
+    <dd>
+      {% trans %}
+        offline key used by the exchange to certify denomination keys and
+        message signing keys
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("message signing key") }}</dt>
+    <dd>
+      {% trans %}
+        key used by the exchange to sign online messages, other than coins
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("offer") }}</dt>
+    <dd>
+      {% trans %}
+        specification of the details of a transaction, specifies the payment 
obligations
+        for the customer (i.e. the amount), the deliverables of the merchant 
and other
+        related information, such as deadlines or locations; However, it lacks 
some
+        information that the backend is supposed to provide.
+        In other words, after the backend adds the missing information to the 
offer and
+        signs it, it becomes a proposal.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("owner") }}</dt>
+    <dd>
+      {% trans %}
+        a `coin` is owned by the entity that knows the private key of the coin
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("payback") }}</dt>
+    <dd>
+      {% trans %}
+        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`
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("proof") }}</dt>
+    <dd>
+      {% trans %}
+        message that cryptographically demonstrates that a particular claim is 
correct
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("proposal") }}</dt>
+    <dd>
+      {% trans %}
+        a sketch that has been completed and signed by the merchant backend.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("reserve") }}</dt>
+    <dd>
+      {% trans %}
+        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
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("refreshing") }}</dt>
+    <dd>
+      {% trans %}
+        operation by which a `dirty` `coin` is converted into one or more
+        `fresh` coins
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("refund") }}</dt>
+    <dd>
+      {% trans %}
+        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
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("revocation") }}</dt>
+    <dd>
+      {% trans %}
+        exceptional operation by which an exchange withdraws a denomination 
from
+        circulation, either because the signing key was compromised or because
+        the exchange is going out of operation; unspent coins of a revoked
+        denomination are subjected to payback.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("sharing") }}</dt>
+    <dd>
+      {% trans %}
+        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.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("signing key") }}</dt>
+    <dd>
+      {% trans %}
+        see message signing key.
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("spending") }}</dt>
+    <dd>
+      {% trans %}
+        operation by which a customer gives a merchant the right to `deposit`
+        coins in return for merchandise
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("transfer") }}</dt>
+    <dd>
+      {% trans %}
+        method of sending funds between `bank` accounts
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("transaction") }}</dt>
+    <dd>
+      {% trans %}
+        method by which ownership is exclusively transferred from one entity
+        to another
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("transaction id") }}</dt>
+    <dd>
+      {% trans %}
+        unique number by which a merchant identifies a `transaction`
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("wallet") }}</dt>
+    <dd>
+      {% trans %}
+        software running on a customer's computer; withdraws, stores and
+        spends coins
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("wire transfer") }}</dt>
+    <dd>
+      {% trans %}
+        see `transfer`
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("wire transfer identifier") }}</dt>
+    <dd>
+      {% trans %}
+        subject of a wire `transfer`; usually a random string to uniquely
+        identify the `transfer`
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("withdrawal") }}</dt>
+    <dd>
+      {% trans %}
+        operation by which a `wallet` can convert funds from a reserve to
+        fresh coins
+      {% endtrans %}
+    </dd>
+    <dt>{{ _("zombie coin") }}</dt>
+    <dd>
+      {% trans %}
+        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
+        `refreshing` was subject to `revocation`, resulting in the `fresh` coin
+        from the refresh operation being subjected to `payback`; as a result,
+        the formerly `dirty` coin is eligible for
+        `refreshing`, even if the dirty coin's denomination is `expired` for
+        `deposit` operations (but not if it is expired past the legal
+        data retention requirement).
+      {% endtrans %}
+    </dd>
+</dt>
+</div>
+{% endblock body_content %}
diff --git a/template/governments.html.j2 b/template/governments.html.j2
new file mode 100644
index 0000000..1f169d6
--- /dev/null
+++ b/template/governments.html.j2
@@ -0,0 +1,183 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+  <div class="jumbotron">
+    <div class="container text-center">
+      <h1>{{ _("Advantages for Governments") }}</h1>
+      <p>
+        {% trans %}
+          Taler provides accountability to ensure business operate
+          legally, while also respecting civil liberties of
+          citizens.  Taler is a payment system based on
+          open standards and free software.  Taler needs
+          governments as they set a financial framework and act as
+          trusted regulators.  Taler contributes to digital
+          sovereignty in the critical financial infrastructure.
+        {% endtrans %}
+      </p>
+    </div>
+  </div>
+
+  <!-- Example row of columns -->
+  <div class="container adorn_h3_bracket">
+    <div class="row">
+      <div class="col-lg-6">
+        <h3>{{ _("Taxable") }}</h3>
+        <p>
+          {% trans %}
+            Taler was built with the goal of fighting corruption and
+            supporting taxation.  With Taler, the receiver of any
+            form of payment is easily identified by the government,
+            and the merchant can be compelled to provide the contract
+            that was accepted by the customer.  Governments can use
+            this data to tax businesses and individuals based on
+            their income, making tax evasion and black markets less
+            viable.
+          {% endtrans %}
+        </p>
+
+        <p>
+          {% trans %}
+            Thus, despite offering anonymity for citizens spending
+            digital cash to buy goods and services, Taler also
+            ensures that the state can observe incoming funds. This
+            can be used to ensure businesses engage only in legal
+            activities, and do not evade income tax, sales tax or
+            value-added tax.  However, this observational capability
+            does not extend to the immediate personal domain.  In
+            particular, monitoring does not cover shared access to
+            funds with trusted friends and family, or synchronizing
+            wallets across multiple devices.
+          {% endtrans %}
+        </p>
+      </div>
+      <div class="col-lg-6">
+        <h3>{{ _("Secure") }}</h3>
+
+        <p>
+          {% trans %}
+            Taler's payments are cryptographically secured. Thus,
+            customers, merchants and the Taler payment service provider
+            (the exchange) can mathematically
+            demonstrate their lawful behavior in court in case of
+            disputes. Financial damages are strictly limited,
+            improving economic security for individuals, merchants,
+            the exchange and the state.
+          {% endtrans %}
+        </p>
+
+        <p>
+          {% trans %}
+            As a payment service provider, the Taler exchange is
+            subject to financial regulation. Financial regulation and
+            regular audits are critical to establish trust. In
+            particular, the Taler design mandates the existence of an
+            independent auditor who checks cryptographic proofs that
+            accumulate at the exchange to ensure that the escrow
+            account is managed honestly.  This ensures that the
+            exchange does not threaten the economy due to fraud.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-6">
+        <h3>{{ _("Libre") }}</h3>
+
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+
+      </div>
+      <div class="col-lg-6">
+        <h3>{{ _("Efficient") }}</h3>
+
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+
+
+
+  <div class="container-fluid c_acronym">
+    <div class="container">
+      <h2 id="documentation">{{ _("Taler and regulation") }}</h2>
+      <dl>
+        <dt>{{ _("Anti money laundering (AML)")}}</dt>
+        <dd>{{ _("With Taler, income is visible and can be tied to the 
contract signed by both parties.") }}</dd>
+        <dt>{{ _("Know your customer (KYC)")}}</dt>
+        <dd>{{ _("In Taler, payer and payee are known by their bank accounts 
when withdrawing or depositing coins respectively") }}</dd>
+        <dt>{{ _("General Data Protection Regulation (GDPR)")}}</dt>
+        <dd>{{ _("Taler cryptographically protects citizen's privacy, and by 
design implements data minimization and privacy by default.") }}</dd>
+        <dt>{{ _("Payment Services Directive (PSD2)")}}</dt>
+        <dd>{{ _("Taler provides an open standard with public APIs 
contributing to a competitive banking sector.") }}</dd>
+      </dl>
+    </div>
+  </div>
+
+
+  <div class="container">
+    <div class="col-lg-12">
+      <h2 id="overview">{{ _("Taler provides privacy and accountability") 
}}</h2>
+
+      <p>
+        {% trans %}
+          Taler assumes governments can observe traditional wire transfers
+          entering and leaving the Taler payment system.
+          Starting with the wire transfers, governments can obtain:
+        {% endtrans %}
+      </p>
+      <ul>
+        <li>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            The income received by any merchant via the Taler
+            system.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            The amounts of digital coins legitimately withdrawn
+            by customers from the exchange, the value of
+            non-redeemed digital coins in customer's wallets, the
+            value and corresponding wire details of deposit
+            operations performed by merchants with the exchange,
+            and the income of the exchange from transaction fees.
+          {% endtrans %}
+        </li>
+      </ul>
+    </div>
+  </div>
+
+{% endblock body_content %}
diff --git a/template/gsoc-codeless.html.j2 b/template/gsoc-codeless.html.j2
new file mode 100644
index 0000000..74fb05d
--- /dev/null
+++ b/template/gsoc-codeless.html.j2
@@ -0,0 +1,206 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+  <div class="jumbotron">
+    <div class="container text-center">
+      <h1>{{ _("GSoC 2018: Codeless Payment") }}</h1>
+      <h6>{{ _("Implemented by Shivam Kohli as part of GSoC 2018 under the 
mentoring and guidance of Florian Dold.") }}</h6>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="col-lg-12">
+      <h2 id="overview">{{ _("Overview") }}</h2>
+      <p>
+        {% trans %}
+          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 payment buttons are configured. Registered
+          merchants can manage their inventory and simultaneously create a
+          'Buy Now' button for a specific product. This code can be directly
+          copy pasted on the seller's frontend and can be used for 'Pay with
+          Taler'.
+        {% endtrans %}
+      </p>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="col-lg-6">
+      <h2 id="overview">{{ _("Use Cases") }}</h2>
+      <p>
+        {% trans %}
+          The various use cases and features of codeless payment are:
+        {% endtrans %}
+      </p>
+      <ul>
+        <li>
+          {% trans %}
+            The primary use case is the registration of the merchant. The
+            codeless payment backend provides a secure django authenticated
+            login to the merchant. The registered merchant can add inventory
+            (both digital as well as physical) in their stocks. They can
+            manage inventory and simultaneously create a 'Buy Now' button for
+            the product. The merchant also monitors the orders placed and
+            updates the status of the order which helps in shipment tracking.
+          {% endtrans %}
+        </li>
+        <li>
+          {% trans %}
+            A merchant has the flexibility to add two types of inventory as 
follows:
+          {% endtrans %}
+          <ul>
+            <li>
+              {% trans %}
+                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.
+              {% endtrans %}
+            </li>
+            <li>
+              {% trans %}
+                The merchant can add any physical inventory available in his
+                stocks. While adding these inventory, the seller is prompted
+                to add minimum quantity of product that is required to be
+                maintained in the stock. Whenever the stocks run below this
+                limit the seller would be notified (currently this feature has
+                not been added but soon email notification would be added).
+              {% endtrans %}
+            </li>
+          </ul>
+        </li>
+        <li>
+          {% trans %}
+            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 to codeless payment backend and eventually
+            redirected to the payment page. After successful payment, the
+            buyer can also track their shipment for physical products or
+            view the digital version hosted by the codeless payment
+            frontend.
+          {% endtrans %}
+        </li>
+        <li>
+          {% trans %}
+            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 the payment the backend communicates with
+            merchant backend api. After successful payment, the users are
+            redirected to the fulfilment page.
+          {% endtrans %}
+        </li>
+      </ul>
+      <h2 id="overview">{{ _("Dynamic Merchant Instance") }}</h2>
+      <p>
+        {% trans %}
+          The documentation for the API to dynamically manage merchant
+          instance can be found
+          <a 
href="https://docs.taler.net/api/api-merchant.html#dynamic-merchant-instance";>here</a>.
+        {% endtrans %}
+      </p>
+    </div>
+    <div class="col-lg-6">
+      <img src="{{ url('images/UseCaseDiagram.png') }}" alt="{{ _("Use Case 
Diagram")}}" style="float: right; margin: 5px 5px 5px 5px;" width="100%">
+    </div>
+  </div> <!-- /container -->
+
+  <div class="container-fluid c_acronym">
+    <div class="container">
+      <h2 id="documentation">{{ _("Link to the contributions made") }}</h2>
+      <p>
+      </p>
+      <ul>
+        <li>{{ _("Codeless Payment Backend") }}
+          (<a href="https://git.taler.net/codeless.git/";>{{ _("Link")}}</a>)
+        </li>
+        <li>{{ _("Documentation to dynamically manage Merchant Instances") }}
+          (<a 
href="https://git.taler.net/api.git/commit/?id=53b3fbc3a882975b4ca8ef70d7ae256c9c17a23e";>{{
 _("Link")}}</a>)
+        </li>
+      </ul>
+      <p>
+      </p>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="col-lg-12">
+      <h2 id="overview">{{ _("Future Work") }}</h2>
+
+      <p>
+        {% trans %}
+          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. But as per the discussion and the scope of this
+          project, there are various features that will be soon added in the
+          Codeless Merchant Backend. The list of future work is as follows:
+        {% endtrans %}
+      </p>
+      <ul>
+        <li>
+          {% trans %}
+            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 is currently taken from the
+            merchant(specific to each product) but no such notification system
+            is designed.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            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. There would be an additional user interface
+            part in the codeless payment service where a logged-in merchant
+            can generate an API key. This API key can be used to access the
+            functionality of the merchant backend in a controlled way. After
+            requesting an API key, the page would display the generated key
+            and a base URL for the API to use by the seller, which is handled
+            by the codeless payments service.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            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 API access for sellers, this is a useful
+            feature. The codeless payment service then can also double as a
+            hosting service for merchants.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            To add various analytics for the merchant. Various analysis
+            could be performed on the orders placed for the respective
+            merchant. Some of the analysis that can be performed are
+            displaying the most frequently purchased product, some insights
+            about the shipment tracking, analysis of products based on
+            delivery location, etc. For this part, dicussions and some more
+            research have to be done before proceeding to the
+            implementation.
+          {% endtrans %}
+        </li>
+      </ul>
+    </div>
+  </div> <!-- /container -->
+
+  <div class="container">
+    <div class="row">
+      <h2 id="documentation">{{ _("Screenshots") }}</h2>
+      <div class="col-lg-4">
+        <h3>{{ _("Home page")}}</h3>
+        <img src="{{ url('images/home.png') }}" height="240" align="middle">
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("Product page")}}</h3>
+        <img src="{{ url('images/product.png') }}" height="240" align="middle">
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("Shipment Tracking")}}</h3>
+        <img src="{{ url('images/shipment.png') }}" height="240" 
align="middle">
+      </div>
+    </div>
+  </div>
+{% endblock body_content %}
diff --git a/template/index.html.j2 b/template/index.html.j2
new file mode 100644
index 0000000..59937c6
--- /dev/null
+++ b/template/index.html.j2
@@ -0,0 +1,55 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+  <div class="container">
+
+    <div class="row justify-content-center">
+      <div class="col-8">
+        <img src="../images/logo-2018-dold.svg">
+      </div>
+    </div>
+
+    <div class="row justify-content-center text-center">
+      <div class="col-8">
+        <a href="news.html">2018-04: GNU Taler v0.5.0 released</a>
+      </div>
+    </div>
+
+    <div class="row mt-5">
+    </div>
+
+    <div class="row">
+      <div class="col">
+        <h2>{{ _("We provide a payment system that makes <span 
class='tlr'>privacy-friendly</span> online transactions <span class='tlr'>fast 
and easy</span>.")}}</h2>
+        <ul class="checklist">
+          <li>
+            <img class="checkmark" src="../images/checkmark.png">
+            {{ _("Payments without registration")}}
+          </li>
+          <li>
+            <img class="checkmark" src="../images/checkmark.png">
+            {{ _("Data protection by default")}}
+          </li>
+          <li>
+            <img class="checkmark" src="../images/checkmark.png">
+            {{ _("Fraud eliminated by design")}}
+          </li>
+          <li>
+            <img class="checkmark" src="../images/checkmark.png">
+            {{ _("Not a new currency!")}}
+          </li>
+          <li>
+            <img class="checkmark" src="../images/checkmark.png">
+            {{ _("Empowers communities to run their own payment 
infrastructure")}}
+          </li>
+        </ul>
+        <form action="https://demo.taler.net/"; style="display:inline;"><button 
type="submit" class="btn btn-primary">{{ _("Try Demo!")}}</button></form>
+        <form action="https://docs.taler.net/"; style="display:inline;"><button 
type="submit" class="btn btn-secondary">{{ _("Read Docs")}}</button></form>
+      </div>
+      <div class="col align-self-center">
+        <img class="img-fluid" src="../images/stock1s.jpg" 
style="border-radius: 1cm;" />
+      </div>
+    </div>
+  </div>
+
+{% endblock body_content %}
diff --git a/template/investors.html.j2 b/template/investors.html.j2
new file mode 100644
index 0000000..d31914b
--- /dev/null
+++ b/template/investors.html.j2
@@ -0,0 +1,144 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+  <div class="jumbotron">
+    <div class="container text-center">
+      <h1>{{ _("Invest in Taler!") }}</h1>
+      <div class="col-lg-12">
+        <p>
+          {% trans %}
+            We have created a company, Taler Systems SA in
+            Luxembourg.<br>
+            Please contact <tt>address@hidden</tt>
+            if you want to invest in Taler.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+
+
+  <div class="container adorn_h3_bracket">
+    <div class="row">
+      <div class="col-lg-4">
+        <h3>{{ _("The Team") }}</h3>
+
+        <p>
+          {% trans %}
+            Our <a href="about.html">team</a> combines world-class business 
leaders,
+            cryptographers, software engineers, civil-rights
+            activists and academics. We are unified by a vision
+            of how payments should work and the goal of
+            imposing this vision upon the world.
+          {% endtrans %}
+        </p>
+
+        <p>
+          {% trans %}
+            We are currently supported by
+          {% endtrans %}
+          <a href="http://www.inria.fr/";>Inria</a>,
+          {% trans %}
+            the French national institute for research in informatics and
+            automation, and the
+          {% endtrans %}
+          <!-- They do have a German name though, allow translation? -->
+          <a href="https://renewablefreedom.org/";>Renewable Freedom 
Foundation</a>.
+        </p>
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("The Technology") }}</h3>
+
+        <p>
+          {% trans %}
+            All transactions in Taler are secured using
+            <a href="bibliography.html">modern cryptography</a>
+            and trust in all parties is minimized. Financial damage is bounded
+            (for customers, merchants and the exchange) even in the case that
+            systems are compromised and private keys are stolen.  Databases
+            can be audited for consistency, resulting in either the detection
+            of compromised systems or the demonstration that participants were
+            honest. Actual transaction costs are fractions of a cent.
+          {% endtrans %}
+        </p>
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("The Business") }}</h3>
+        <p>
+          {% trans %}
+            The scalable business model for Taler is the operation
+            of the payment service provider, which converts money from
+            traditional payment systems (MasterCard, SEPA, UPI,
+            Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous
+            electronic coins in the same currency. The customer
+            can then redeem the electronic coins at a merchant,
+            who can exchange them for money represented using
+            traditional payment systems at the exchange.  The
+            exchange charges fees to facilitate the transactions.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+
+
+  <div class="container-fluid c_acronym">
+    <div class="container">
+      <h2>{{ _("The Business Case") }}</h2>
+      <div class="row">
+        <div class="col-lg-4">
+          <a href="{{ url('presentations/investors2018.pdf') }}">
+            <img border=0 class="center-block" width=64 height=64 alt="PDF" 
src="{{ url('images/pdf.svg') }}">
+            <br>
+            <p align="center">{{ _("Download") }}</p>
+          </a>
+
+          <p>
+            {% trans %}
+              Our <a href="financial-news.html">financial news</a> page
+              explains in English how Taler can impact current developments in
+              the global payment market.
+            {% endtrans %}
+          </p>
+        </div>
+        <div class="col-lg-4" id="canvas-left" style="display:none">
+          <canvas id="the-canvas-left"></canvas>
+        </div>
+        <div class="col-lg-4" id="canvas-right" style="display:none">
+          <canvas id="the-canvas-right"></canvas>
+        </div>
+        <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') 
}}"></script>
+        <script type="text/javascript" src="{{ url('dist/js/pdf-view.js') 
}}"></script>
+      </div>
+    </div>
+  </div>
+
+
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-12">
+        <h2 id="overview">{{ _("Running a Taler payment service operator") 
}}</h2>
+
+        <p>
+          {% trans %}
+            The payment service operator runs the <em>Taler exchange</em>.
+            The exchange charges <b>transaction fees</b> to customers or 
merchants.
+            Its operational expenses are from wire transfers with the banking
+            system and the operation of the computing infrastructure.
+          {% endtrans %}
+        </p>
+
+        <p>
+          <ul>
+            <li>{{ _("Cryptographic operations, bandwidth and storage costs 
are less than 0.01 cent per transaction.") }}</li>
+            <li>{{ _("Multiple Taler transactions can be aggregated into 
larger wire transfers to merchants to minimize wire transfer costs.") }}</li>
+            <li>{{ _("Protocol allows the exchange to charge fees for any 
expensive operation (withdraw, deposit, refresh, refund or aggregated wire 
transfers).") }}</li>
+            <li>{{ _("Partnership with banks establishes consumer trust.") 
}}</li>
+            <li>{{ _("Partnership with free software community enables rapid 
deployment.") }}</li>
+          </ul>
+      </div>
+    </div>
+  </div>
+
+
+{% endblock body_content %}
diff --git a/javascript.html b/template/javascript.html
similarity index 100%
rename from javascript.html
rename to template/javascript.html
diff --git a/template/merchants.html.j2 b/template/merchants.html.j2
new file mode 100644
index 0000000..57e14ed
--- /dev/null
+++ b/template/merchants.html.j2
@@ -0,0 +1,181 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+  <div class="jumbotron">
+    <div class="container text-center">
+      <h1>{{ _("Advantages for Merchants") }}</h1>
+
+      <p>
+        {% trans %}
+          Taler is a cost-effective electronic payment system
+          which provides you with cryptographic proof that
+          the payment worked correctly within milliseconds.
+          Your Web customers pay with previously unknown
+          levels of convenience without risk of fraud.
+        {% endtrans %}
+      </p>
+    </div>
+  </div>
+
+  <div class="container adorn_h3_bracket">
+    <div class="row">
+      <div class="col-lg-4">
+        <h3>{{ _("Fast") }}</h3>
+
+        <p>
+          {% trans %}
+            Processing transactions with Taler is fast,
+            allowing you to confirm the transaction with your
+            customer virtually immediately.  Your customers
+            will appreciate that they do not have to type in
+            credit card information and play the &quot;verified
+            by&quot; game.  By making payments significantly
+            more convenient for your customers, you may be able
+            to use Taler for small transactions that would not
+            work with credit card payments due to the mental
+            overhead for customers.
+          {% endtrans %}
+        </p>
+
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("Secure") }}</h3>
+
+        <p>
+          {% trans %}
+            You will have cryptographic proof of payment from the
+            Taler payment service provider. With Taler you never
+            handle sensitive customer account information and thus
+            do not have to undergo any particular security audits
+            (such as PCI DSS).  Your systems will have customer
+            contracts with qualified signatures for all
+            transactions which you can use in court in case of
+            disputes.
+          {% endtrans %}
+        </p>
+
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("Free") }}</h3>
+
+        <p>
+          {% trans %}
+            Taler is free software, and you can use the
+            liberally-licensed reference code as a starting
+            point to integrate Taler into your services. To use
+            Taler, you do not need to pay license fees, and the
+            free software development model will ensure that
+            you can select from many competing integrators for
+            support.
+          {% endtrans %}
+        </p>
+
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h3>{{ _("Cheap") }}</h3>
+        <p>
+          {% trans %}
+            Taler is uses efficient cryptographic constructions with low
+            bandwidth and storage requirements.  Combined with Taler's strong
+            security which makes fraud impossible, Taler payment service
+            providers can operate with very low overhead and
+            thus offer low transaction fees.
+          {% endtrans %}
+        </p>
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("Flexible") }}</h3>
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+      </div>
+      <div class="col-lg-4">
+        <h3>{{ _("Ethical") }}</h3>
+        <p>
+          {% trans %}
+            Taler prevents tax evasion and money laundering.
+            Taler's protocols are efficient and do not use wasteful
+            proof-of-work calculations. Taler encourages
+            transparency by providing an open standard and free
+            software reference implementations.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="container-fluid c_acronym">
+    <div class="container">
+      <h2 id="documentation">{{ _("Manuals for merchants") }}</h2>
+      <ul>
+        <li>{{ _("The GNU Taler merchant backend operator manual") }}
+          (<a 
href="https://docs.taler.net/merchant/backend/html/manual.html";>html</a>,
+          <a 
href="https://docs.taler.net/merchant/backend/pdf/manual.pdf";>pdf</a>)
+        </li>
+        <li>{{ _("The GNU Taler Web shop integration tutorial (PHP)") }}
+          (<a 
href="https://docs.taler.net/merchant/frontend/php/html/tutorial.html";>html</a>,
+          <a 
href="https://docs.taler.net/merchant/frontend/php/pdf/tutorial.pdf";>pdf</a>)
+        </li>
+        <li>{{ _("The GNU Taler Web shop integration tutorial (Python)") }}
+          (<a 
href="https://docs.taler.net/merchant/frontend/python/html/tutorial.html";>html</a>,
+          <a 
href="https://docs.taler.net/merchant/frontend/python/pdf/tutorial.pdf";>pdf</a>)
+        </li>
+      </ul>
+    </div>
+  </div>
+
+
+  <div class="container">
+    <div class="col-lg-6">
+      <h2 id="overview">{{ _("The GNU Taler Merchant Backend") }}</h2>
+      <p>
+        {% trans %}
+          Merchants process payments using the Taler backend:
+        {% endtrans %}
+      </p>
+      <ul>
+        <li>
+          {% trans %}
+            The backend <b>signs</b> and <b>stores</b> 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.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            The backend <b>validates</b> payments received from
+            the wallet and <b>executes</b> them with the Taler
+            payment service provider (the exchange).  For this,
+            the merchant's frontend must pass the payment
+            request through to the Taler backend and check the
+            HTTP status code that is returned.
+          {% endtrans %}
+        </li>
+
+        <li>
+          {% trans %}
+            The backend can <b>list</b> completed transactions
+            and <b>map</b> wire transfers to sets of business
+            transactions, including the exact terms of each
+            contract.
+          {% endtrans %}
+        </li>
+      </ul>
+    </div>
+    <!--
+         FIXME: When we wrap this img in a div of class col,
+         FIXME: the image ends up overlaping the footer.
+        -->
+        <img src="{{ svg_localized('images/backend') }}"
+              alt="{{ _("customer perspective")}}"
+              class="img-fluid">
+  </div> <!-- /container -->
+{% endblock body_content %}
diff --git a/template/news.html.j2 b/template/news.html.j2
new file mode 100644
index 0000000..311f4c1
--- /dev/null
+++ b/template/news.html.j2
@@ -0,0 +1,20 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+  <div class="container">
+    <div class="col">
+      <h1>{{ _("News")}}</h1>
+
+      {% include "news/2018-04.inc" %}
+      {% include "news/2017-10.inc" %}
+      {# include "news/2017-08.inc" #}
+      {# include "news/2017-04.inc" #}
+      {# include "news/2017-03.inc" #}
+      {# include "news/2017-02.inc" #}
+      {% include "news/2017-01.inc" %}
+
+      <a href="old-news.html"><h3>{{ _("More news")}}</h3></a>
+    </div>
+  </div>
+
+{% endblock body_content %}
diff --git a/template/old-news.html.j2 b/template/old-news.html.j2
new file mode 100644
index 0000000..611b4ae
--- /dev/null
+++ b/template/old-news.html.j2
@@ -0,0 +1,44 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+  <div class="jumbotron">
+    <div class="container text-center">
+      <h1>{{ _("Older News") }}</h1>
+      <div class="col-lg-12">
+        <p>
+          {% trans %}
+            This page documents the GNU Taler history.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-12">
+
+        {#
+        {% include "news/2016-12.inc" %}
+        #}
+        {% include "news/2016-10.inc" %}
+        {% include "news/2016-09.inc" %}
+        {% include "news/2016-08.inc" %}
+        {% include "news/2016-06.inc" %}
+        {% include "news/2015-12.inc" %}
+
+        {#
+        {% include "news/2015-11.inc" %}
+        #}
+
+        {% include "news/2015-02.inc" %}
+        {#
+        {% include "news/2014-12.inc" %}
+        #}
+        {% include "news/2014-11.inc" %}
+
+      </div>
+    </div>
+  </div> <!-- /container -->
+
+{% endblock body_content %}
diff --git a/template/press.html.j2 b/template/press.html.j2
new file mode 100644
index 0000000..323d096
--- /dev/null
+++ b/template/press.html.j2
@@ -0,0 +1,53 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+  <div class="container">
+    <h1>{{ _("GNU Taler in the Press")}}</h1>
+
+    <h2>{{ _("2018")}}</h2>
+    <ul>
+      <li><a 
href="https://www.coindesk.com/free-software-messiah-richard-stallman-we-can-do-better-than-bitcoin";>CoinDesk</a></li>
+      <li><a 
href="https://www.theguardian.com/commentisfree/2018/apr/03/facebook-abusing-data-law-privacy-big-tech-surveillance";>The
 Guardian</a></li>
+      <li><a 
href="https://fossbytes.com/richard-stallman-proposes-data-collection-ceasing/";>FOSSBYTES</a></li>
+      <li><a 
href="http://www.pro-linux.de/news/1/25771/stallman-radikaler-vorschlag-zum-schutz-der-privatsph%C3%83%C2%A4re.html";>Pro
 Linux</a></li>
+      <li><a 
href="https://www.developpez.com/actu/196326/Richard-Stallman-remet-en-cause-l-efficacite-du-RGPD-il-veut-plutot-une-loi-qui-empeche-les-systemes-de-collecter-des-donnees-personnelles/";>Developpez.com</a></li>
+    </ul>
+
+    <h2>{{ _("2017")}}</h2>
+    <ul>
+      <li><a 
href="https://news.ycombinator.com/item?id=15274110";>Y-combinator</a></li>
+      <li><a href="http://hackerpublicradio.org/eps.php?id=2222";>Hacker Public 
Radio</a></li>
+      <li><a href="https://www.secupay.com/de/Node/932";>Secupay</a></li>
+      <li><a 
href="https://www.developpez.com/actu/142082/Taler-le-systeme-de-paiement-electronique-anonyme-developpe-par-GNU-et-l-INRIA-passe-en-version-0-3-0/";>Developpez.com</a></li>
+      <li><a 
href="https://yourstory.com/2017/08/techie-tuesdays-richard-stallman/";>Techie 
Tuesdays</a></li>
+      <li><a 
href="https://www.heise.de/tp/features/Kryptowaehrung-will-sich-an-den-Oelpreis-binden-3702862.html";>Heise</a></li>
+    </ul>
+
+    <h2>{{ _("2016")}}</h2>
+    <ul>
+      <li><a 
href="https://www.theguardian.com/technology/2016/sep/01/online-publishers-readers-ad-block-surveillance-donate-anonymously";>The
 Guardian</a></li>
+      <li><a 
href="https://phoronix.com/scan.php?page=news_item&px=GNU-Taler-0.0.0";>Phoronix</a></li>
+      <li><a 
href="https://www.reddit.com/r/technology/comments/4mnkin/gnu_taler_000_is_a_free_software_electronic/";>Reddit</a></li>
+      <li><a 
href="http://www.heise.de/newsticker/meldung/GNU-Taler-Open-Source-Protokoll-fuer-Zahlungen-in-Version-0-0-0-erschienen-3228525.html";>Heise</a></li>
+      <li><a 
href="http://www.golem.de/news/halbanonymes-bezahlsystem-gnu-taler-soll-kryptowaehrungen-gerechter-machen-1606-121323.html";>Golem</a></li>
+      <li><a 
href="https://news.ycombinator.com/item?id=11840453";>Y-combinator</a></li>
+      <li><a 
href="https://np.reddit.com/r/Anarcho_Capitalism/comments/4mnen4/gnutards_came_up_with_an_alternative_to_bitcoin/";>Reddit</a></li>
+      <li><a 
href="http://www.theregister.co.uk/2016/06/06/gnu_cryptocurrency_aims_at_the_mainstream_economy_not_the_black_market/";>The
 Register</a></li>
+      <li><a 
href="http://www.opennet.ru/opennews/art.shtml?num=44544";>Opennet</a></li>
+      <li><a 
href="http://www.pro-linux.de/news/1/23626/gnu-startet-anonymes-bezahlsystem-taler.html";>Pro-Linux</a></li>
+      <li><a href="https://www.nixp.ru/news/13738.html";>nixp</a></li>
+      <li><a 
href="https://www.mittelstandswiki.de/2016/06/open-source-geld-gnu-taler-soll-landeswaehrungen-online-verbinden/";>Mittelstands
 Wiki</a></li>
+      <li><a 
href="https://www.genbeta.com/especial/el-usuario-merece-que-sea-obligatorio-que-se-respete-su-libertad-entrevista-a-richard-stallman";>Genbeta</a></li>
+      <li><a 
href="http://www.lupa.cz/clanky/stallman-vydavatele-musi-umoznit-ctenarum-platit-za-zpravy-anonymne/";>Lupz</a></li>
+    </ul>
+
+    <h2>{{ _("2015")}}</h2>
+    <ul>
+      <li><a 
href="https://www.reddit.com/r/Bitcoin/comments/3m037h/taler_a_gnu_attempt_at_replacing_bitcoin/";>Reddit</a></li>
+      <li><a 
href="https://news.ycombinator.com/item?id=10258312";>Y-combinator</a></li>
+      <li><a 
href="http://www.heise.de/tp/artikel/46/46089/1.html";>Heise</a></li>
+      <li><a 
href="https://bitcoinmagazine.com/21901/bitcoin-governments-without-privacy-taxes/";>Bitcoinmagazine</a></li>
+      <li><a 
href="http://www.econotimes.com/Will-identifiable-digital-currency-become-the-new-normal-88131";>EconoTimes</a></li>
+    </ul>
+
+  </div>
+{% endblock body_content %}
diff --git a/template/principles.html.j2 b/template/principles.html.j2
new file mode 100644
index 0000000..7b684b6
--- /dev/null
+++ b/template/principles.html.j2
@@ -0,0 +1,180 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+  <script>
+    function expand(n) {
+    var x = document.getElementById(n);
+    console.log(x);
+    x.setAttribute("style", "");
+    }
+  </script>
+
+  <style>
+    h2 {
+    margin-top: 1em;
+    }
+  </style>
+
+  <div class="container">
+    <div class="row">
+      <div class="col">
+        <h1>{{ _("GNU Taler: Design Principles") }}</h1>
+      </div>
+    </div>
+    <p>
+      {% trans %}
+        When designing GNU Taler, we had the following design principles in 
mind:
+      {% endtrans %}
+    </p>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("1. Free Software implementation") }}</h2>
+        <a href="https://www.gnu.org/graphics/freedom.html";>
+          <img style="width:20vw;float:right" 
src="../images/stallman.medium.png" alt="{{ _("... in the area of computing, 
freedom means not using proprietary software") }}">
+        </a>
+        <p>
+          {% trans %}
+            GNU Taler must be <a 
href="https://www.gnu.org/philosophy/free-sw.html";>Free Software</a>.
+            For merchants, our Free Software
+            reference implementation prevents vendor lock-in. As
+            the software of the payment provider itself is free, countries can
+            deploy the payment system without compromising sovereignty.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("2. Protect the privacy of buyers") }}</h2>
+        <!-- From https://www.pixabay.com/ -->
+        <img style="width:20vw;float:left;padding:15px" 
src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}">
+        <p>
+          {% trans %}
+            Privacy should be guaranteed via technical measures, as opposed to 
mere
+            policies. Especially with micropayments for online content, a 
disproportion-
+            ate amount of rather private data about buyers would be revealed, 
if the
+            payment system does not have privacy protections.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            In legislations with data protection regulations (such as the 
recently introduced GDPR in Europe),
+            merchants benefit from this as well, as
+            no data breach of customers can happen if this information is, by 
design,
+            not collected in the first place. Obviously some private data, 
such as the
+            shipping address for a physical delivery, must still be collected 
according to
+            business needs.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("3. Enable the state to tax income and crack down on illegal 
business activities") }}</h2>
+        <!-- From https://www.pxhere.com/ -->
+        <img style="width:20vw;float:right;padding:15px" 
src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}">
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("4. Prevent payment fraud") }}</h2>
+        <!-- From https://www.maxpixel.net/ -->
+        <img style="width:20vw;float:left;padding:15px" 
src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}">
+        <p>
+          {% trans %}
+            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.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("5. Only disclose the minimal amount of information 
necessary") }}</h2>
+        <img style="width:20vw;float:right;padding:15px" 
src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by 
default, General Data Protection Regulation (GDPR) compliant")}}">
+        <p>
+          {% trans %}
+            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, for example,
+            by keeping details about the merchant’s financials hidden from 
competitors.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("6. Be usable") }}</h2>
+        <img style="width:20vw;float:left;padding:15px" 
src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}">
+        <p>
+          {% trans %}
+            Specifically it must be usable for non-expert customers. Usability 
also
+            applies to the integration with merchants, and informs choices 
about the
+            architecture, such as encapsulating procedures that require 
cryptographic
+            operations into an isolated component with a simple API.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("7. Be efficient")}}</h2>
+        <img style="width:20vw;float:right;padding:15px" 
src="../images/efficient.png" alt="{{_("Energy efficiency")}}">
+        <p>
+          {% trans %}
+            Approaches such as proof-of-work are ruled out by this
+            requirement. Efficiency is necessary for GNU Taler to be used for
+            micropayments.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("8. Fault-tolerant design")}}</h2>
+        <img style="width:20vw;float:left;padding:15px" 
src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}">
+        <p>
+          {% trans %}
+            Taler should tolerate failure of individual components and systems,
+            including malicious operators compromising core secrets.
+            This manifests in architectural choices such
+            as the isolation of certain components, and auditing procedures.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <h2>{{ _("9. Foster competition")}}</h2>
+        <img style="width:20vw;float:right;padding:15px" 
src="../images/market.medium.jpg" alt="{{_("A competitive market")}}">
+        <p>
+          {% trans %}
+            It must be relatively easy for competitors to join the systems. 
While the
+            barriers for this in traditional financial systems are rather 
high, the technical
+            burden for new competitors to join must be minimized. Another 
design
+            choice that supports this is to split the whole system into 
smaller components
+            that can be operated, developed and improved upon independently,
+            instead of having one completely monolithic system.
+          {% endtrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endblock body_content %}
diff --git a/schemafuzz.html.j2 b/template/schemafuzz.html.j2
similarity index 88%
rename from schemafuzz.html.j2
rename to template/schemafuzz.html.j2
index d4bb277..2908ed6 100644
--- a/schemafuzz.html.j2
+++ b/template/schemafuzz.html.j2
@@ -1,11 +1,11 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<!-- Jumbotron -->
+  <!-- Jumbotron -->
 <div class="jumbotron">
   <div class="container text-center">
     <h1>{{ _("SchemaFuzz") }}</h1>
     <p>
-    Blah!
+      Blah!
     </p>
   </div>
 
diff --git a/template/team.html.j2 b/template/team.html.j2
new file mode 100644
index 0000000..9d319e3
--- /dev/null
+++ b/template/team.html.j2
@@ -0,0 +1,155 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+  <div class="container">
+    <div class="row">
+      <div class="col">
+        <h1>{{ _("GNU Taler: Team")}}</h1>
+        <p>
+          {% trans %}
+            GNU Taler is proudly brought to you by the humans on this page.
+            To contact the whole team, please write to
+          {% endtrans %}
+          <a href="mailto:address@hidden";>address@hidden</a>.
+        </p>
+      </div>
+    </div>
+    <div class="row mt-5"></div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h2><a href="http://grothoff.org/christian/";>Dr. Christian 
Grothoff</a></h2>
+        <img src="{{ url('team-images/christian-grothoff.jpg') }}" 
height="240" alt="Christian Grothoff" align="middle">
+        <p>{{ _("GNU maintainer. Network security &amp; privacy researcher. 
Software architect.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2><a href="http://www.digitalekho.com/about-us/index.html";>Leon 
Schumacher</a></h2>
+        <img src="{{ url('team-images/leon-schumacher.jpg') }}" height="240" 
alt="Leon Schumacher" align="middle">
+        <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director 
in different industries,") }} &#x2026;.</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Michael Widmer</h2>
+        <img src="{{ url('team-images/michael-widmer.jpg') }}" height="240" 
alt="Michael Widmer" align="middle">
+        <p>{{ _("Lawyer and banker.") }}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h2><a href="https://fdold.eu/";>Dr. Florian Dold</a></h2>
+        <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" 
alt="Florian Dold" align="middle">
+        <p>{{ _("GNU maintainer, lead developer.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Dr. Jeffrey Burdges</h2>
+        <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" 
alt="Jeffrey Burdges" align="middle">
+        <p>{{ _("Applied cryptography. Contact to W3c &amp; Tor.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2><a href="https://www.stallman.org/";>Dr. Richard M. 
Stallman</a></h2>
+        <img src="{{ url('team-images/richard-stallman.jpg') }}" height="240" 
alt="Richard Stallman" align="middle">
+        <p>{{ _("Founder of the GNU project. Software Freedom Advisor.") }}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h2>Marcello Stanisci</h2>
+        <img src="{{ url('team-images/marcello-stanisci.jpg') }}" height="240" 
alt="Marcello Stanisci" align="middle">
+        <p>{{ _("Software engineer.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Dr. Nana Karlstetter</h2>
+        <img src="{{ url('team-images/nana-karlstetter.jpg') }}" height="240" 
alt="Nana Karlstetter" align="middle">
+        <p>{{ _("Sustainable business development.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2><a href="http://www.onete.net/";>Dr. Cristina Onete</a></h2>
+        <img src="{{ url('team-images/cristina-onete.jpg') }}" height="240" 
alt="Cristina Onete" align="middle">
+        <p>{{ _("Theoretical foundations.") }}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h2>ng0</h2>
+        <p>{{ _("System administration, Taler Systems SA.") }}</p>
+      </div>
+    </div>
+    <!-- keep translators together -->
+    <div class="row">
+      <div class="col-lg-4">
+        <h2><a href="https://ar.linkedin.com/in/martinolivera";>Mart&#237;n 
Olivera</a></h2>
+        <p>{{ _("Translator (Spanish)") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Patricia Sunshine</h2>
+        <p>{{ _("Translator (Spanish)") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Fumiko</h2>
+        <p>{{ _("Translator (Spanish)") }}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h2>Greta Breveglieri</h2>
+        <p>{{ _("Translator (Italian)") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Ylenia Baldanza</h2>
+        <p>{{ _("Translator (Italian)") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Valeria Salerno</h2>
+        <p>{{ _("Translator (Italian)") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Stefan K&uuml;gel</h2>
+        <p>{{ _("Translator (German)") }}</p>
+      </div>
+    </div>
+    <!-- more 'remote' people -->
+    <div class="row">
+      <div class="col-lg-4">
+        <h2><a href="https://www.nitrokey.com/";>Jan Suhr</a></h2>
+        <p>{{ _("Hardware security module") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2><a href="http://www.goebel-consult.de/";>Hartmut Goebel</a></h2>
+        <p>{{ _("Risk management") }}</p>
+      </div>
+    </div>
+    <!-- students -->
+    <div class="row">
+      <div class="col-lg-4">
+        <h2><a href="http://sreeharsha.totakura.in/";>Sree Harsha 
Totakura</a></h2>
+        <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" 
height="240" alt="Sree Harsha Totakura" align="middle">
+        <p>{{ _("PhD Student, TU Munich. Currently teaching.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2><a href="https://www.sec.in.tum.de/julian-kirsch/";>Julian 
Kirsch</a></h2>
+        <p>{{ _("PhD student, TU Munich. Currently teaching.") }}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h2>Oliver Broome</h2>
+        <p>{{ _("Free software developer.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Shivam Kohli</h2>
+        <p>{{ _("Free software developer.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Benedikt M&uuml;ller</h2>
+        <p>{{ _("Free software developer.") }}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+        <h2>Dominique Hofmann</h2>
+        <p>{{ _("Free software developer.") }}</p>
+      </div>
+      <div class="col-lg-4">
+        <h2>Jan Str&uuml;bin</h2>
+        <p>{{ _("Free software developer.") }}</p>
+      </div>
+    </div>
+  </div>
+{% endblock body_content %}
diff --git a/wallet.html.j2 b/template/wallet.html.j2
similarity index 71%
rename from wallet.html.j2
rename to template/wallet.html.j2
index c18fc4e..94024e6 100644
--- a/wallet.html.j2
+++ b/template/wallet.html.j2
@@ -105,19 +105,34 @@ document.addEventListener('DOMContentLoaded', onLoad);
     <div class="row">
       <div class="col-lg-12">
         <p class="greenbox" id="box-present" style="display:none">
-          Congratulations, you have installed the Taler wallet.
-          Check out the <a href="https://demo.taler.net/";>demo</a>.
+          {% trans %}
+            Congratulations, you have installed the Taler wallet.
+            Check out the
+          {% endtrans %}
+          <a href="https://demo.taler.net/";>
+            {% trans %}
+              demo
+            {% endtrans %}
+          </a>.
         </p>
         <p class="bluebox" id="box-not-present" style="display:none">
-          You don't have a wallet installed yet.
+          {% trans %}
+            You don't have a wallet installed yet.
+          {% endtrans %}
         </p>
       </div> <!-- /col-lg-12 -->
     </div> <!-- /row -->
 
     <div class="row">
       <div class="col-lg-12">
-        Install the wallet for your browser below, then check out the
-        <a href="https://demo.taler.net";>demonstration</a>.
+        {% trans %}
+          Install the wallet for your browser below, then check out the
+        {% endtrans %}
+        <a href="https://demo.taler.net";>
+          {% trans %}
+            demonstration
+          {% endtrans %}
+        </a>.
       </div>
     </div> <!-- /row -->
 
@@ -126,20 +141,43 @@ document.addEventListener('DOMContentLoaded', onLoad);
         <h2><a 
href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc";>Google
 Chrome / Chromium 51+</a></h2>
 
         <p id="error-chrome" class="error">
-          <a href="https://www.google.com/chrome";>Google Chrome</a> or <a 
href="https://www.chromium.org/";>Chromium</a>
-          is required, but it appears you don't have it installed.
+          <a href="https://www.google.com/chrome";>Google Chrome</a>
+          {% trans %}
+            or
+          {% endtrans %}
+          <a href="https://www.chromium.org/";>Chromium</a>
+          {% trans %}
+            is required, but it appears you don't have it installed.
+          {% endtrans %}
         </p>
         <p id="error-chrome-version" class="error">
-          <a href="https://www.google.com/chrome";>Google Chrome</a> or <a 
href="https://www.chromium.org/";>Chromium</a>
-          version <span id="chrome-min-version"></span> or newer is required, 
but it appears you have an older version.</p>
+          <a href="https://www.google.com/chrome";>Google Chrome</a>
+          {% trans %}
+            or
+          {% endtrans %}
+          <a href="https://www.chromium.org/";>Chromium</a>
+          {% trans %}
+            version
+          {% endtrans %}
+          <span id="chrome-min-version"></span>
+          {% trans %}
+            or newer is required, but it appears you have an older version.
+          {% endtrans %}
+        </p>
         <div id="inline-install-chrome">
           <form target="_blank" 
action="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc";>
             <button action="submit">
-              Install wallet
+              {% trans %}
+                Install wallet
+              {% endtrans %}
             </button>
           </form>
           <noscript>
-            <em style="color:darkred;">JavaScript is disabled, installation 
won't work.</em>
+            <em style="color:darkred;">
+              {% trans %}
+                JavaScript is disabled, installation won't work.
+              {% endtrans %}
+            </em>
           </noscript>
           <div id="install-result"></div>
         </div>
@@ -153,7 +191,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
           </form>
         </div>
 
-<!--
+        <!--
         <h3>Firefox Beta</h3>
         <ol>
           <li><a 
href="/releases/taler-wallet/taler-wallet-stable.xpi">Download the wallet</a> 
(right click, Save Link As...)</li>
@@ -166,15 +204,30 @@ document.addEventListener('DOMContentLoaded', onLoad);
           <li>On the <code>about:config</code> page set 
<code>xpinstall.signatures.required</code> to <code>false</code></li>
           <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Install 
the wallet</a></li>
         </ol>
--->
+        -->
       </div> <!-- /col-lg-6 -->
 
       <div class="col-lg-6">
         <h2>Opera 36+</h2>
 
         <ol>
-          <li><a 
href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/";>Install
 Download Chrome Extension</a></li>
-          <li><a 
href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc";>Install
 GNU Taler</a> from the Chrome Web Store</li>
+          <li>
+            <a 
href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/";>
+              {% trans %}
+                Install Download Chrome Extension
+              {% endtrans %}
+            </a>
+          </li>
+          <li>
+            <a 
href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc";>
+              {% trans %}
+                Install GNU Taler
+              {% endtrans %}
+            </a>
+            {% trans %}
+              from the Chrome Web Store
+            {% endtrans %}
+          </li>
         </ol>
       </div> <!-- /col-lg-6 -->
 
@@ -183,8 +236,12 @@ document.addEventListener('DOMContentLoaded', onLoad);
     <div class="row">
 
       <div class="col-lg-6">
-        <h2>Other browsers</h2>
-        <p>Wallets for other browsers will be provided in the near future.</p>
+        <h2>{{ _("Other browsers") }}</h2>
+        <p>
+          {% trans %}
+            Wallets for other browsers will be provided in the near future.
+          {% endtrans %}
+        </p>
       </div> <!-- /col-lg-6 -->
 
     </div> <!-- /row -->

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]