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 (9cb4211 -> 37b8b27)


From: gnunet
Subject: [GNUnet-SVN] [taler-www] branch stable updated (9cb4211 -> 37b8b27)
Date: Thu, 27 Jun 2019 00:31:11 +0200

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

dold pushed a change to branch stable
in repository www.

    from 9cb4211  Trigger build
     new c2c1641  redesign attempt
     new 37b8b27  more tweaks

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 about.html.j2                     |    8 +
 citizens.html.j2                  |  143 ----
 common/footer.j2.inc              |   50 +-
 common/navigation.j2.inc          |   21 +-
 design.html.j2                    |  150 ++++
 index.html.j2 => features.html.j2 |  121 ++--
 images/checkmark.png              |  Bin 0 -> 45757 bytes
 images/diagram-complex.png        |  Bin 0 -> 92907 bytes
 images/diagram-simple.png         |  Bin 0 -> 94255 bytes
 images/stock1.jpg                 |  Bin 0 -> 5614173 bytes
 index.html.j2                     |  162 +----
 locale/de/LC_MESSAGES/messages.po | 1364 ++++++++++++++++++++-----------------
 locale/en/LC_MESSAGES/messages.po |  557 +++++++--------
 locale/es/LC_MESSAGES/messages.po |  945 ++++++++++++++-----------
 locale/fr/LC_MESSAGES/messages.po |  568 ++++++++-------
 locale/it/LC_MESSAGES/messages.po |  962 +++++++++++++++-----------
 locale/pt/LC_MESSAGES/messages.po |  909 ++++++++++++++----------
 locale/ru/LC_MESSAGES/messages.po |  557 +++++++--------
 news.html.j2.inc => news.html.j2  |   13 +
 styles.css                        |   79 ++-
 web-common                        |    2 +-
 21 files changed, 3548 insertions(+), 3063 deletions(-)
 delete mode 100644 citizens.html.j2
 create mode 100644 design.html.j2
 copy index.html.j2 => features.html.j2 (67%)
 create mode 100644 images/checkmark.png
 create mode 100644 images/diagram-complex.png
 create mode 100644 images/diagram-simple.png
 create mode 100644 images/stock1.jpg
 rename news.html.j2.inc => news.html.j2 (63%)

diff --git a/about.html.j2 b/about.html.j2
index 2543db5..c931eed 100644
--- a/about.html.j2
+++ b/about.html.j2
@@ -2,6 +2,14 @@
 {% 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">
diff --git a/citizens.html.j2 b/citizens.html.j2
deleted file mode 100644
index 4b6a175..0000000
--- a/citizens.html.j2
+++ /dev/null
@@ -1,143 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="jumbotron">
-  <div class="container text-center">
-  <h1>{{ _("Advantages for Citizens") }}</h1>
-  <!-- p><a class="btn btn-lg btn-success" href="#" role="button">Get started 
today</a></p -->
-  <div class="col-lg-12">
-    <p>
-      {% trans %}
-      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.
-      {% endtrans %}
-    </p>
-  </div>
-  </div>
-</div>
-
-<div class="container adorn_h3_bracket">
-  <!-- Example row of columns -->
-  <div class="row">
-    <div class="col-lg-6">
-      <h3>{{ _("Secure") }}</h3>
-
-      <p>{{ _("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.") }}</p>
-
-    </div>
-    <div class="col-lg-6">
-      <h3>{{ _("Private") }}</h3>
-
-      <p>{{ _("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.")  }}</p>
-
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-6">
-      <h3>{{ _("Convenient") }}</h3>
-
-      <p>{{ _("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.")
-               }}</p>
-
-    </div>
-    <div class="col-lg-6">
-      <h3>{{ _("Stable") }}</h3>
-
-      <p>{{ _("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.") }}</p>
-
-    </div>
-  </div>
-</div>
-
-<div class="container-fluid c_acronym">
-<div class="container">
-  <div class="row">
-    <div class="col-lg-6">
-      <h2>{{ _("Wallet Browser Extension") }}</h2>
-      <p>
-        {% trans %}
-        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.
-        {% endtrans %}
-      </p>
-    </div>
-    <div class="col-lg-6">
-      <h2>{{ _("Taler Demo") }}</h2>
-      <p>
-        {% trans %}
-        You can see how Taler works in practice by visiting our <a 
href="https://demo.taler.net";>demo page</a>.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-</div>
-</div>
-
-
-<div class="container">
-
-  <div class="col-lg-6">
-    <h2 id="overview">{{ _("The Taler Wallet for customers") }}</h2>
-
-    <p>{{ _("Customers interact with the Taler system using
-             the Taler wallet:") }}</p>
-
-    <ul>
-
-        <li>{{ _("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.") }}</li>
-
-        <li>{{ _("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.") }}</li>
-
-        <li>{{ _("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.")
-                  }}</li>
-
-      </ul>
-   </div>
-
-   <div class="col-lg-6">
-     <img src="{{ svg_localized('images/citizen') }}"
-          alt="{{ _("customer perspective") }}"
-          style="float: right; margin: 5px 5px 5px 5px;" width="100%">
-   </div>
-
-</div>
-<!-- /container -->
-{% endblock body_content %}
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index c516f6d..290e5c0 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,32 +1,32 @@
 <footer id="footer">
-  <div class="container-fluid cushion-below">
-    <div class="container">
-      <div class="row">
-        <div class="col-12 col-sm-4">
-          <ul class="footer-list">
-            <li><p><a href="about.html">{{ _("About") }}</a></p></li>
-            <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
-            <li><p><a href="investors.html">{{ _("For Investors") 
}}</a></p></li>
-          </ul>
-        </div>
-        <div class="col-12 col-sm-4">
-          <ul class="footer-list">
-            <li><p><a href="citizens.html">{{ _("Citizens")}} </a></p></li>
-            <li><p><a href="merchants.html">{{ _("Merchants") }}</a></p></li>
-            <li><p><a href="governments.html">{{ _("Governments") }} 
</a></p></li>
-          </ul>
-        </div>
-        <div class="col-12 col-sm-4">
-          <ul class="footer-list">
-            <li><p><a href="developers.html">{{ _("Developer Resources") 
}}</a></p></li>
-            <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
-            <li><p><a href="bibliography.html">{{ _("Bibliography") 
}}</a></p></li>
-          </ul>
-        </div>
+  <div class="container">
+    <div class="row justify-content-center">
+      <div class="col-12">
+        <hr style="border-top: 1px solid #00000069; padding-bottom: 1em" />
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12 col-sm-4">
+        <ul class="footer-list">
+          <li><p><a href="about.html">{{ _("About") }}</a></p></li>
+          <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
+        </ul>
+      </div>
+      <div class="col-12 col-sm-4">
+        <ul class="footer-list">
+          <li><p><a href="investors.html">{{ _("For Investors") }}</a></p></li>
+          <li><p><a href="developers.html">{{ _("Developer Resources") 
}}</a></p></li>
+        </ul>
+      </div>
+      <div class="col-12 col-sm-4">
+        <ul class="footer-list">
+          <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
+          <li><p><a href="bibliography.html">{{ _("Bibliography") 
}}</a></p></li>
+        </ul>
       </div>
     </div>
   </div>
-  <div class="container text-center">
+  <div class="text-center mt-5">
     <p>&copy; <a href="https://gnunet.org/en/ev.html";>GNUnet e.V.</a> 
{{_("and") }}
               Taler Systems SA 2015-2019</p>
     <p>We are grateful for support and free hosting of this site by
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 26f4bd9..420e57e 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md 
navbar-inverse navbar-dark" style="background-color: black; border-radius: 
0px;"> <!-- bg-dark -->
+<nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md 
navbar-light" style="border-radius: 0px;">
   <div class="container-fluid">
     <button class="navbar-toggler navbar-toggler-right"
             type="button"
@@ -12,21 +12,10 @@
     <div class="collapse navbar-collapse" id="navbarMain">
     <ul class="navbar-nav mr-auto">
       <li class="{{ 'active' if filename == 'index.html' else '' }}"><a 
class="navbar-brand taler_home" href="index.html">Taler</a></li>
-      <li class="nav-item {{ 'active' if filename == 'citizens.html' else '' 
}}"><a class="nav-link" href="citizens.html">{{ _("Citizens") }} </a></li>
-      <li class="nav-item {{ 'active' if filename == 'merchants.html' else '' 
}}"><a class="nav-link" href="merchants.html">{{ _("Merchants") }} </a></li>
-      <li class="nav-item {{ 'active' if filename == 'governments.html' else 
'' }}"><a class="nav-link" href="governments.html">{{ _("Governments") 
}}</a></li>
-      <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") 
}}</a>
-        <ul class="dropdown-menu">
-          <li><a class="dropdown-item" href="architecture.html">{{ _("System 
Architecture") }}</a></li>
-          <li><a class="dropdown-item" href="faq.html">{{ _("FAQ") }}</a></li>
-          <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") 
}}</a></li>
-          <li><a class="dropdown-item" href="developers.html">{{ _("Developer 
Introduction") }} </a></li>
-          <li><a class="dropdown-item" href="copyright.html">{{ _("Copyright 
for Contributors") }} </a></li>
-          <li><a class="dropdown-item" href="bibliography.html">{{ 
_("Bibliography") }}</a></li>
-          <li><a class="dropdown-item" href="gsoc-codeless.html">{{ _("Gsoc 
2018: Codeless Payments") }}</a></li>
-        </ul>
-      </li>
+      <li class="nav-item {{ 'active' if filename == 'features.html' else '' 
}}"><a class="nav-link" href="features.html">{{ _("Features") }} </a></li>
+      <li class="nav-item {{ 'active' if filename == 'design.html' else '' 
}}"><a class="nav-link" href="design.html">{{ _("Design") }} </a></li>
+      <li class="nav-item"><a class="nav-link" 
href="https://docs.taler.net/";>{{ _("Docs") }} </a></li>
+      <li class="nav-item {{ 'active' if filename == 'about.html' else '' 
}}"><a class="nav-link" href="about.html">{{ _("Team") }}</a></li>
     </ul>
     <ul class="navbar-nav navbar-right">
       <li class="nav-item dropdown">
diff --git a/design.html.j2 b/design.html.j2
new file mode 100644
index 0000000..896dbe5
--- /dev/null
+++ b/design.html.j2
@@ -0,0 +1,150 @@
+{% 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</h1>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col">
+      <p>The complete design of GNU Taler is comprehensively described in a <a 
href="thesis.pdf">PhD Thesis by Florian Dold</a>.</p>
+      <p>When designing GNU Taler, we had the following design goals in 
mind.</p>
+
+      <h2>1. Free Software implementation <a 
onclick="expand('x1')">(+)</a></h2>
+      <div id="x1" style="display: none">
+      <p>
+        Free refers to “free as in free speech”, as opposed to “free as in 
free beer”.
+        More specifically, the four essential freedoms of free software must
+        be respected, namely users must have the freedom to (1) run the 
software,
+        (2) study and modify it, (3) redistribute copies, and (4) distribute 
copies of
+        the modified version.
+      </p>
+      <p>
+        For merchants this prevents vendor lock-in, as another payment 
provider can
+        take over, should the current one provide inadequate quality of 
service. As
+        the software of the payment provider itself is free, smaller or 
disadvantaged
+        countries or organizations can run the payment system without being
+        controlled by a foreign company. Customers benefit from this freedom,
+        as the wallet software can be made to run on a variety of platforms, 
and
+        user-hostile features such as tracking or telemetry could easily be 
removed
+        from wallet software.
+      </p>
+      <p>
+        This rules out the mandatory usage of specialized hardware such as 
smart
+        cards or other hardware security modules, as the software they run 
cannot
+        be modified by the user. These components can, however, be voluntarily
+        used by merchants, customers or payment processors to increase their
+        operational security.
+      </p>
+      </div>
+
+      <h2>2. Protect the privacy of buyers <a 
onclick="expand('x2')">(+)</a></h2>
+      <div id="x2" style="display: none">
+      <p>
+        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.
+      </p>
+      <p>
+        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.
+      </p>
+      </div>
+
+      <h2>3. Enable the state to tax income and crack down on illegal business 
activities <a onclick="expand('x3')">(+)</a></h2>
+      <div id="x3" style="display: none">
+      <p>
+        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.
+      </p>
+      </div>
+
+      <h2>4. Prevent payment fraud <a onclick="expand('x4')">(+)</a></h2>
+      <div id="x4" style="display: none">
+      <p>
+        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.
+      </p>
+      </div>
+
+      <h2>5. Only disclose the minimal amount of information nec-
+essary <a onclick="expand('x5')">(+)</a></h2>
+      <div id="x5" style="display: none">
+      <p>
+        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.
+      </p>
+      </div>
+
+      <h2>6. Be usable <a onclick="expand('x6')">(+)</a></h2>
+      <div id="x6" style="display: none">
+      <p>
+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.
+      </p>
+      </div>
+
+      <h2>7. Be efficient <a onclick="expand('x7')">(+)</a></h2>
+      <div id="x7" style="display: none">
+      <p>
+Approaches such as proof-of-work are ruled out by this requirement. Effi-
+ciency is necessary for GNU Taler to be used for micropayments.
+      </p>
+      </div>
+
+      <h2>8. Avoid single points of failure <a 
onclick="expand('x8')">(+)</a></h2>
+      <div id="x8" style="display: none">
+      <p>
+While the design we present later is rather centralized, avoiding single
+points of failure is still a goal. This manifests in architectural choices such
+as the isolation of certain components, and auditing procedures.
+      </p>
+      </div>
+
+      <h2>9. Foster competition <a onclick="expand('x9')">(+)</a></h2>
+      <div id="x9" style="display: none">
+      <p>
+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 compo-
+nents that can be operated, developed and improved upon independently,
+instead of having one completely monolithic system.
+      </p>
+      </div>
+
+    </div>
+    <div class="col">
+      <img class="img-fluid" src="../images/diagram-complex.png">
+    </div>
+  </div>
+</div>
+
+{% endblock body_content %}
diff --git a/index.html.j2 b/features.html.j2
similarity index 67%
copy from index.html.j2
copy to features.html.j2
index af1444d..5be9b6a 100644
--- a/index.html.j2
+++ b/features.html.j2
@@ -1,29 +1,75 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<!-- Jumbotron -->
-<div class="jumbotron">
-  <div style="height: 40vh">
-    <img alt="{{ _("GNU Taler logo")}}" style="width:100%;height:100%" 
class="center-block" src="{{ svg_localized('images/logo-2018-dold') }}" />
+
+
+<div class="container">
+  <div class="row">
+    <div class="col">
+    <h1>GNU Taler: Features</h1>
+    </div>
   </div>
+  <div class="row">
+    <div class="col">
 
-  <div class="container text-center">
-    <h1>{{ _("One-Click Cash Payments!") }}</h1>
-
-    <p>
-      {% trans %}
-      GNU Taler is an electronic payment system under development.
-      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>.
-      {% endtrans %}
-    </p>
+      <p>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>.</p>
+
+    <p> 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.</p>
+
+    <p>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.</p>
+
+    <p>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.</p>
 
+    <p>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.
+    </p>
+    </div>
+    <div class="col">
+      <img class="img-fluid" src="../images/diagram-simple.png">
+    </div>
   </div>
 </div>
 
-<div class="container adorn_h3_bracket">
+<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>
+    {% trans %}
+    <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>
+    {% endtrans %}
+    </div>
+    <div class="col-lg-6">
+    <h2>{{ _("Receiving payments with Taler") }}</h2>
+    {% trans %}
+    <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>
+    {% endtrans %}
+    </div>
+  </div>
+</div>
+</div>
+
+<div class="container">
+
+  <div class="row adorn_h3_bracket">
+
     <div class="col-lg-4">
       <h3>{{ _("Practical") }}</h3>
 
@@ -65,7 +111,7 @@
 
     </div>
   </div>
-  <div class="row">
+  <div class="row adorn_h3_bracket">
     <div class="col-lg-4">
       <h3>{{ _("Taxable") }}</h3>
 
@@ -104,47 +150,10 @@
         package, it will always remain free software.
         {% endtrans %}
       </p>
-
     </div>
-  </div>
-</div>
 
-<div class="container-fluid c_acronym">
-<div class="container">
-  <div class="row">
-    <div class="col-lg-6">
-    <h2>{{ _("Paying with Taler") }}</h2>
-    {% trans %}
-    <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>
-    {% endtrans %}
-    </div>
-    <div class="col-lg-6">
-    <h2>{{ _("Receiving payments with Taler") }}</h2>
-    {% trans %}
-    <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>
-    {% endtrans %}
-    </div>
   </div>
-</div>
-</div>
 
+</div>
 
-<div class="container">
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>{{ _("Taler News") }}</h2>
-      {% include "news.html.j2.inc" %}
-    </div>
-  </div>
-</div> <!-- /container -->
 {% endblock body_content %}
diff --git a/images/checkmark.png b/images/checkmark.png
new file mode 100644
index 0000000..bb14d29
Binary files /dev/null and b/images/checkmark.png differ
diff --git a/images/diagram-complex.png b/images/diagram-complex.png
new file mode 100644
index 0000000..71d0fdb
Binary files /dev/null and b/images/diagram-complex.png differ
diff --git a/images/diagram-simple.png b/images/diagram-simple.png
new file mode 100644
index 0000000..d6ad292
Binary files /dev/null and b/images/diagram-simple.png differ
diff --git a/images/stock1.jpg b/images/stock1.jpg
new file mode 100644
index 0000000..958388b
Binary files /dev/null and b/images/stock1.jpg differ
diff --git a/index.html.j2 b/index.html.j2
index af1444d..2f5a42c 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -1,150 +1,46 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<!-- Jumbotron -->
-<div class="jumbotron">
-  <div style="height: 40vh">
-    <img alt="{{ _("GNU Taler logo")}}" style="width:100%;height:100%" 
class="center-block" src="{{ svg_localized('images/logo-2018-dold') }}" />
-  </div>
-
-  <div class="container text-center">
-    <h1>{{ _("One-Click Cash Payments!") }}</h1>
-
-    <p>
-      {% trans %}
-      GNU Taler is an electronic payment system under development.
-      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>.
-      {% endtrans %}
-    </p>
-
-  </div>
-</div>
-
-<div class="container adorn_h3_bracket">
-  <div class="row">
-    <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 class="container">
 
+  <div class="row justify-content-center">
+    <div class="col-8">
+     <img src="../images/logo-2018-dold.svg">
     </div>
   </div>
-  <div class="row">
-    <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 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 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 class="row mt-5">
   </div>
-</div>
 
-<div class="container-fluid c_acronym">
-<div class="container">
   <div class="row">
-    <div class="col-lg-6">
-    <h2>{{ _("Paying with Taler") }}</h2>
-    {% trans %}
-    <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>
-    {% endtrans %}
-    </div>
-    <div class="col-lg-6">
-    <h2>{{ _("Receiving payments with Taler") }}</h2>
-    {% trans %}
-    <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>
-    {% endtrans %}
+    <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/stock1.jpg" style="border-radius: 
1cm;" />
     </div>
   </div>
 </div>
-</div>
 
-
-<div class="container">
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>{{ _("Taler News") }}</h2>
-      {% include "news.html.j2.inc" %}
-    </div>
-  </div>
-</div> <!-- /container -->
 {% endblock body_content %}
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 4d7b47f..430c309 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-01-16 23:15+0100\n"
+"POT-Creation-Date: 2019-06-25 21:47+0200\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"
@@ -13,14 +13,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.4.0\n"
 
-#: about.html.j2:8
+#: about.html.j2:16
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
 "GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
 
-#: about.html.j2:13
+#: about.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
@@ -28,65 +28,65 @@ msgstr ""
 "Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
 "verschiedenen Branchen..."
 
-#: about.html.j2:20
+#: about.html.j2:28
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
 
-#: about.html.j2:25
+#: about.html.j2:33
 msgid "Theoretical foundations."
 msgstr "Theoretische Grundlagen."
 
-#: about.html.j2:30
+#: about.html.j2:38
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
 
-#: about.html.j2:37
+#: about.html.j2:45
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
 
-#: about.html.j2:42
+#: about.html.j2:50
 msgid "PhD Student, Inria.."
 msgstr "Doktorand, Inria."
 
-#: about.html.j2:47
+#: about.html.j2:55
 msgid "Software engineer."
 msgstr "Software-Ingenieur."
 
-#: about.html.j2:54
+#: about.html.j2:62
 msgid "Sustainable business development."
 msgstr "Nachhaltige Unternehmensentwicklung."
 
-#: about.html.j2:58
+#: about.html.j2:66
 msgid "Software engineer. Works on libebics."
 msgstr "Software-Ingenieur. Arbeitet an libebics."
 
-#: about.html.j2:64 about.html.j2:68 about.html.j2:72
+#: about.html.j2:72 about.html.j2:76 about.html.j2:80
 msgid "Translator (Spanish)"
 msgstr "Übersetzer (Spanisch)."
 
-#: about.html.j2:78 about.html.j2:82 about.html.j2:86
+#: about.html.j2:86 about.html.j2:90 about.html.j2:94
 msgid "Translator (Italian)"
 msgstr "Übersetzer (Italienisch)."
 
-#: about.html.j2:90
+#: about.html.j2:98
 #, fuzzy
 #| msgid "Translator (Spanish)"
 msgid "Translator (German)"
 msgstr "Übersetzer (Deutsch)."
 
-#: about.html.j2:96
+#: about.html.j2:104
 msgid "Hardware security module"
 msgstr "Hardware-Sicherheitsmodul"
 
-#: about.html.j2:100
+#: about.html.j2:108
 msgid "Risk management"
 msgstr "Risikomanagement"
 
-#: about.html.j2:104
+#: about.html.j2:112
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
 
-#: about.html.j2:110
+#: about.html.j2:118
 msgid "Software engineer. Works on Android wallet."
 msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
 
@@ -112,249 +112,6 @@ msgstr "und"
 msgid "available upon request"
 msgstr "erhältlich auf Anfrage"
 
-#: citizens.html.j2:5
-msgid "Advantages for Citizens"
-msgstr "Vorteile für Taler-Nutzer"
-
-#: citizens.html.j2:9
-#, 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."
-
-#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
-#: merchants.html.j2:41
-msgid "Secure"
-msgstr "Sicher"
-
-#: citizens.html.j2:27
-#, 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."
-
-#: citizens.html.j2:37 index.html.j2:83
-msgid "Private"
-msgstr "Anonym"
-
-#: citizens.html.j2:39
-#, 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."
-
-#: citizens.html.j2:50
-msgid "Convenient"
-msgstr "Bequem"
-
-#: citizens.html.j2:52
-#, 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."
-
-#: citizens.html.j2:61 index.html.j2:41
-msgid "Stable"
-msgstr "Stabil"
-
-#: citizens.html.j2:63
-#, 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."
-
-#: citizens.html.j2:79
-msgid "Wallet Browser Extension"
-msgstr "Die Taler-Geldbörse als Browser-Erweiterung"
-
-#: citizens.html.j2:81
-#, 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."
-
-#: citizens.html.j2:88
-msgid "Taler Demo"
-msgstr "Demoversion von Taler"
-
-#: citizens.html.j2:90
-#, 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."
-
-#: citizens.html.j2:103
-msgid "The Taler Wallet for customers"
-msgstr "Die Taler-Geldbörse für Käufer"
-
-#: citizens.html.j2:105
-#, 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:"
-
-#: citizens.html.j2:110
-#, 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."
-
-#: citizens.html.j2:118
-#, 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."
-
-#: citizens.html.j2:125
-#, 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."
-
-#: citizens.html.j2:137 merchants.html.j2:179
-msgid "customer perspective"
-msgstr ""
-
 #: contact.html.j2:6
 msgid "Contact information"
 msgstr "Kontakt"
@@ -646,11 +403,19 @@ msgstr ""
 "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:132
+#: developers.html.j2:131
+msgid "Technical Presentation"
+msgstr ""
+
+#: developers.html.j2:134 investors.html.j2:88
+msgid "Download"
+msgstr ""
+
+#: developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:135
+#: developers.html.j2:155
 #, fuzzy
 #| msgid ""
 #| "The Taler system consists of protocols executed among\n"
@@ -664,13 +429,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:142
+#: developers.html.j2:162
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:145
+#: developers.html.j2:165
 #, fuzzy
 #| msgid ""
 #| "A customer instructs his <b>bank</b> to\n"
@@ -692,7 +457,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:157
+#: developers.html.j2:177
 #, fuzzy
 #| msgid ""
 #| "Once the exchange has received the wire\n"
@@ -728,7 +493,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:175
+#: developers.html.j2:195
 #, fuzzy
 #| msgid ""
 #| "Once the customer has the digital coins in his\n"
@@ -774,7 +539,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:197
+#: developers.html.j2:217
 #, fuzzy
 #| msgid ""
 #| "Merchants receiving digital\n"
@@ -817,7 +582,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:220
+#: developers.html.j2:240
 #, fuzzy
 #| msgid ""
 #| "Finally, the exchange transfers funds\n"
@@ -844,7 +609,7 @@ msgstr ""
 "Möglichkeit, ihre angemeldeten Forderungen und deren Überweisung an die "
 "Geschäftsbank bei der Taler-Wechselstube abzufragen."
 
-#: developers.html.j2:234
+#: developers.html.j2:254
 #, fuzzy
 #| msgid ""
 #| "Most importantly, the exchange keeps\n"
@@ -874,7 +639,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:249
+#: developers.html.j2:269
 #, fuzzy
 #| msgid ""
 #| "Without the auditor, the exchange operators\n"
@@ -1094,141 +859,444 @@ msgstr ""
 "privaten Daten, weil die Taler-Wechselstube dadurch keine Kenntnis davon "
 "erlangt, welche der Münzen von welchen Käufern sie signiert."
 
-#: financial-news.html.j2:6
-msgid "Financial News"
-msgstr "Nachrichten aus der Finanzwelt"
+#: faq.html.j2:77
+msgid "How much does it cost?"
+msgstr ""
 
-#: financial-news.html.j2:9
+#: faq.html.j2:78
 msgid ""
-"This page explains (only in English) how Taler can change ongoing "
-"developments in the financial industry."
+"<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>"
 msgstr ""
 
-#: glossary.html.j2:6
-msgid "auditor"
+#: faq.html.j2:93
+msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: glossary.html.j2:8
+#: faq.html.j2:94
 msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
+"<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>"
 msgstr ""
 
-#: glossary.html.j2:12
-msgid "bank"
+#: faq.html.j2:107
+msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: glossary.html.j2:14
+#: faq.html.j2:108
 msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: glossary.html.j2:18
-msgid "coin"
+"<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>"
 msgstr ""
 
-#: glossary.html.j2:20
+#: faq.html.j2:116
 msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
 msgstr ""
 
-#: glossary.html.j2:24
-msgid "contract"
+#: faq.html.j2:117
+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 "
+"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>"
 msgstr ""
 
-#: glossary.html.j2:26
-msgid "the proposal signed by the wallet."
+#: faq.html.j2:127
+msgid ""
+"To whom would consumers complain to in case of non-conversion or non-"
+"compliance?"
 msgstr ""
 
-#: glossary.html.j2:30
-#, fuzzy
-#| msgid "Documentation"
-msgid "denomination"
-msgstr "Dokumentation"
-
-#: glossary.html.j2:32
+#: faq.html.j2:128
 msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
+"<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>"
 msgstr ""
 
-#: glossary.html.j2:36
-msgid "denomination key"
+#: faq.html.j2:138
+msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: glossary.html.j2:38
+#: faq.html.j2:139
 msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
+"<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>"
 msgstr ""
 
-#: glossary.html.j2:42
-msgid "deposit"
+#: faq.html.j2:151
+msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: glossary.html.j2:44
+#: faq.html.j2:153
 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`"
+"<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>"
 msgstr ""
 
-#: glossary.html.j2:48
-msgid "dirty"
-msgstr ""
+#: features.html.j2:41
+msgid "Paying with Taler"
+msgstr "Bezahlen mit Taler"
 
-#: glossary.html.j2:50
+#: features.html.j2:42
+#, 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 ""
-"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"
+"<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."
 
-#: glossary.html.j2:54
-msgid "exchange"
-msgstr ""
+#: features.html.j2:54
+msgid "Receiving payments with Taler"
+msgstr "Verkaufen mit Taler"
 
-#: glossary.html.j2:56
+#: features.html.j2:55
+#, 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 ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
+"<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."
 
-#: glossary.html.j2:60
-msgid "extension"
-msgstr ""
+#: features.html.j2:74
+msgid "Practical"
+msgstr "Praktisch"
 
-#: glossary.html.j2:62
-msgid "implementation of a `wallet` for browsers"
+#: features.html.j2:77
+#, fuzzy
+#| msgid ""
+#| "Taler is easy to integrate with existing Web\n"
+#| "applications. Payments are cryptographically\n"
+#| "secured and are confirmed within milliseconds with\n"
+#| "extremely low transaction costs.\n"
+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 ""
+"Taler integriert sich einfach und leicht in bestehende Webanwendungen. Die "
+"Zahlungen sind kryptographisch verschlüsselt, innerhalb von Millisekunden "
+"bestätigt und extrem kostengünstig."
 
-#: glossary.html.j2:66
-msgid "fresh coin"
-msgstr ""
+#: features.html.j2:87
+msgid "Stable"
+msgstr "Stabil"
 
-#: glossary.html.j2:68
-msgid "a `coin` is fresh if its public key is only known to the customer"
+#: features.html.j2:90
+#, fuzzy
+#| msgid ""
+#| "Taler does not introduce a new currency. Taler\n"
+#| "uses a digital wallet storing coins and payment service\n"
+#| "providers with escrow accounts in existing currencies.\n"
+#| "Thus, Taler's cryptographic coins correspond to existing\n"
+#| "currencies, such as US Dollars, Euros or even Bitcoins.\n"
+msgid ""
+"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."
 msgstr ""
+"Als Bezahlsystem stellt Taler noch keine neue Währung dar. Taler verbindet "
+"elektronische Geldbörsen, die digitale Münzen enthalten, und Anbieter für "
+"die Zahlungsabwicklung in bestehenden Währungen auf Treuhandkonten. Man kann "
+"also sagen, dass die kryptografischen Taler-Münzen herkömmlichen Währungen "
+"wie US-Dollar, Euro oder sogar Bitcoin entsprechen."
 
-#: glossary.html.j2:72
-msgid "master key"
-msgstr ""
+#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+msgid "Secure"
+msgstr "Sicher"
 
-#: glossary.html.j2:74
+#: features.html.j2:104
+#, fuzzy
+#| msgid ""
+#| "By design Taler does not suffer from many classes\n"
+#| "of security problems such as phishing or counterfeit.\n"
+#| "Despite its security features, Taler never rejects a legitimate\n"
+#| "customer due to a fraud-detection false positive.\n"
 msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: glossary.html.j2:78
-msgid "message signing key"
+"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 ""
+"Schon vom Konzept her verhindert Taler Falschgeld oder Sicherheitslücken wie "
+"Phishing und wird gleichzeitig jedoch niemals Käufern betrügerische "
+"Absichten unterstellen können."
 
-#: glossary.html.j2:80
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
+#: features.html.j2:116 governments.html.j2:25
+msgid "Taxable"
+msgstr "Besteuerbar"
 
-#: glossary.html.j2:84
-msgid "offer"
+#: features.html.j2:119
+#, fuzzy
+#| msgid ""
+#| "When using Taler, merchant's revenue is transparent for tax\n"
+#| "collection authorities.  Unlike cash and most digital currencies,\n"
+#| "Taler helps prevent black markets.  Taler is not suitable for\n"
+#| "illegal activities.\n"
+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 ""
+"Taler macht das Einkommen von Verkäufern (Einzelpersonen und "
+"Handelsunternehmen) den Steuerbehörden einsehbar. Im Gegensatz zu Bargeld "
+"und den meisten virtuellen Währungen unterbindet Taler somit jede Art von "
+"Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für illegale "
+"Geschäfte."
+
+#: features.html.j2:129
+msgid "Private"
+msgstr "Anonym"
+
+#: features.html.j2:131
+#, fuzzy
+#| msgid ""
+#| "When you pay with Taler, your identity does not\n"
+#| "have to be revealed to the merchant. Just like\n"
+#| "payments in cash, nobody else can track how you\n"
+#| "spent your electronic money. However, you obtain a\n"
+#| "legally valid proof of payment.\n"
+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 ""
+"Taler hält die Identität der Käufer geheim, auch gegenüber den Verkäufern. "
+"Genauso wie beim Kauf mit Bargeld kann niemand Auskunft darüber erlangen, "
+"was mit dem Taler-Bezahlsystem gekauft wurde. Die Käufer erhalten jedoch "
+"garantiert einen Nachweis über ihre Zahlung und den erfolgten "
+"Eigentumsübergang."
+
+#: features.html.j2:142 governments.html.j2:88
+msgid "Libre"
+msgstr "Frei"
+
+#: features.html.j2:145
+#, fuzzy
+#| msgid ""
+#| "Taler provides protocols and reference implementations that in\n"
+#| "principle enables anybody to run their own payment infrastructure,\n"
+#| "be it individuals, organizations or whole countries.  Since the\n"
+#| "reference implementation is a <a href=\"http://www.gnu.org/\";>GNU</a>\n"
+#| "package, it will always remain free software.\n"
+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."
+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
+msgid "Financial News"
+msgstr "Nachrichten aus der Finanzwelt"
+
+#: 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
+msgid "auditor"
+msgstr ""
+
+#: glossary.html.j2:8
+msgid ""
+"trusted third party that verifies that the `exchange` is operating correctly"
+msgstr ""
+
+#: glossary.html.j2:12
+msgid "bank"
+msgstr ""
+
+#: glossary.html.j2:14
+msgid ""
+"traditional financial service provider who offers wire `transfers` between "
+"accounts"
+msgstr ""
+
+#: glossary.html.j2:18
+msgid "coin"
+msgstr ""
+
+#: 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
+msgid "contract"
+msgstr ""
+
+#: glossary.html.j2:26
+msgid "the proposal signed by the wallet."
+msgstr ""
+
+#: glossary.html.j2:30
+#, fuzzy
+#| msgid "Documentation"
+msgid "denomination"
+msgstr "Dokumentation"
+
+#: glossary.html.j2:32
+msgid ""
+"unit of currency, specifies both the currency and the face value of a `coin`"
+msgstr ""
+
+#: glossary.html.j2:36
+msgid "denomination key"
+msgstr ""
+
+#: glossary.html.j2:38
+msgid ""
+"RSA key used by the exchange to certify that a given `coin` is valid and of "
+"a particular `denomination`"
+msgstr ""
+
+#: glossary.html.j2:42
+msgid "deposit"
+msgstr ""
+
+#: glossary.html.j2:44
+msgid ""
+"operation by which a merchant passes coins to an exchange, expecting the "
+"exchange to credit his `bank` account in the future using a wire `transfer`"
+msgstr ""
+
+#: glossary.html.j2:48
+msgid "dirty"
+msgstr ""
+
+#: glossary.html.j2:50
+msgid ""
+"a `coin` is dirty if its public key may be known to an entity other than the "
+"customer, thereby creating the danger of some entity being able to link "
+"multiple transactions of coin's owner if the coin is not refreshed first"
+msgstr ""
+
+#: glossary.html.j2:54
+msgid "exchange"
+msgstr ""
+
+#: glossary.html.j2:56
+msgid ""
+"Taler's payment service provider. Issues electronic `coins` during "
+"`withdrawal` and redeems them when they are `deposited` by merchants."
+msgstr ""
+
+#: glossary.html.j2:60
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:62
+msgid "implementation of a `wallet` for browsers"
+msgstr ""
+
+#: glossary.html.j2:66
+msgid "fresh coin"
+msgstr ""
+
+#: glossary.html.j2:68
+msgid "a `coin` is fresh if its public key is only known to the customer"
+msgstr ""
+
+#: glossary.html.j2:72
+msgid "master key"
+msgstr ""
+
+#: glossary.html.j2:74
+msgid ""
+"offline key used by the exchange to certify denomination keys and message "
+"signing keys"
+msgstr ""
+
+#: glossary.html.j2:78
+msgid "message signing key"
+msgstr ""
+
+#: glossary.html.j2:80
+msgid "key used by the exchange to sign online messages, other than coins"
+msgstr ""
+
+#: glossary.html.j2:84
+msgid "offer"
 msgstr ""
 
 #: glossary.html.j2:86
@@ -1420,10 +1488,6 @@ msgstr ""
 "zuverlässige Kontrollorgane auftreten. Damit trägt dieses Bezahlsystem auch "
 "zur digitalen Selbstbestimmung von Einzelpersonen im Finanzsektor bei."
 
-#: governments.html.j2:25 index.html.j2:70
-msgid "Taxable"
-msgstr "Besteuerbar"
-
 #: governments.html.j2:28
 #, fuzzy
 #| msgid ""
@@ -1542,10 +1606,6 @@ msgstr ""
 "treuhänderisch verwalteten Konten stets korrekt gebucht werden. Dies sorgt "
 "dafür, dass keine einzige Wechselstube betrügerisch handelt."
 
-#: governments.html.j2:88 index.html.j2:96
-msgid "Libre"
-msgstr "Frei"
-
 #: governments.html.j2:91
 #, fuzzy
 #| msgid ""
@@ -1871,204 +1931,6 @@ msgstr ""
 msgid "Screenshots"
 msgstr ""
 
-#: index.html.j2:6
-#, fuzzy
-#| msgid "GNU Taler"
-msgid "GNU Taler logo"
-msgstr "Das Taler-Bezahlsystem"
-
-#: index.html.j2:10
-msgid "One-Click Cash Payments!"
-msgstr "Bezahlen mit einem Klick!"
-
-#: index.html.j2:13
-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>."
-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>."
-
-#: index.html.j2:28
-msgid "Practical"
-msgstr "Praktisch"
-
-#: index.html.j2:31
-#, fuzzy
-#| msgid ""
-#| "Taler is easy to integrate with existing Web\n"
-#| "applications. Payments are cryptographically\n"
-#| "secured and are confirmed within milliseconds with\n"
-#| "extremely low transaction costs.\n"
-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 ""
-"Taler integriert sich einfach und leicht in bestehende Webanwendungen. Die "
-"Zahlungen sind kryptographisch verschlüsselt, innerhalb von Millisekunden "
-"bestätigt und extrem kostengünstig."
-
-#: index.html.j2:44
-#, fuzzy
-#| msgid ""
-#| "Taler does not introduce a new currency. Taler\n"
-#| "uses a digital wallet storing coins and payment service\n"
-#| "providers with escrow accounts in existing currencies.\n"
-#| "Thus, Taler's cryptographic coins correspond to existing\n"
-#| "currencies, such as US Dollars, Euros or even Bitcoins.\n"
-msgid ""
-"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."
-msgstr ""
-"Als Bezahlsystem stellt Taler noch keine neue Währung dar. Taler verbindet "
-"elektronische Geldbörsen, die digitale Münzen enthalten, und Anbieter für "
-"die Zahlungsabwicklung in bestehenden Währungen auf Treuhandkonten. Man kann "
-"also sagen, dass die kryptografischen Taler-Münzen herkömmlichen Währungen "
-"wie US-Dollar, Euro oder sogar Bitcoin entsprechen."
-
-#: index.html.j2:58
-#, fuzzy
-#| msgid ""
-#| "By design Taler does not suffer from many classes\n"
-#| "of security problems such as phishing or counterfeit.\n"
-#| "Despite its security features, Taler never rejects a legitimate\n"
-#| "customer due to a fraud-detection false positive.\n"
-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 ""
-"Schon vom Konzept her verhindert Taler Falschgeld oder Sicherheitslücken wie "
-"Phishing und wird gleichzeitig jedoch niemals Käufern betrügerische "
-"Absichten unterstellen können."
-
-#: index.html.j2:73
-#, fuzzy
-#| msgid ""
-#| "When using Taler, merchant's revenue is transparent for tax\n"
-#| "collection authorities.  Unlike cash and most digital currencies,\n"
-#| "Taler helps prevent black markets.  Taler is not suitable for\n"
-#| "illegal activities.\n"
-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 ""
-"Taler macht das Einkommen von Verkäufern (Einzelpersonen und "
-"Handelsunternehmen) den Steuerbehörden einsehbar. Im Gegensatz zu Bargeld "
-"und den meisten virtuellen Währungen unterbindet Taler somit jede Art von "
-"Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für illegale "
-"Geschäfte."
-
-#: index.html.j2:85
-#, fuzzy
-#| msgid ""
-#| "When you pay with Taler, your identity does not\n"
-#| "have to be revealed to the merchant. Just like\n"
-#| "payments in cash, nobody else can track how you\n"
-#| "spent your electronic money. However, you obtain a\n"
-#| "legally valid proof of payment.\n"
-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 ""
-"Taler hält die Identität der Käufer geheim, auch gegenüber den Verkäufern. "
-"Genauso wie beim Kauf mit Bargeld kann niemand Auskunft darüber erlangen, "
-"was mit dem Taler-Bezahlsystem gekauft wurde. Die Käufer erhalten jedoch "
-"garantiert einen Nachweis über ihre Zahlung und den erfolgten "
-"Eigentumsübergang."
-
-#: index.html.j2:99
-#, fuzzy
-#| msgid ""
-#| "Taler provides protocols and reference implementations that in\n"
-#| "principle enables anybody to run their own payment infrastructure,\n"
-#| "be it individuals, organizations or whole countries.  Since the\n"
-#| "reference implementation is a <a href=\"http://www.gnu.org/\";>GNU</a>\n"
-#| "package, it will always remain free software.\n"
-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."
-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."
-
-#: index.html.j2:116
-msgid "Paying with Taler"
-msgstr "Bezahlen mit Taler"
-
-#: index.html.j2:117
-#, 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>"
-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."
-
-#: index.html.j2:128
-msgid "Receiving payments with Taler"
-msgstr "Verkaufen mit Taler"
-
-#: index.html.j2:129
-#, 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>"
-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."
-
-#: index.html.j2:145
-msgid "Taler News"
-msgstr "Taler-News"
-
 #: investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "In Taler investieren!"
@@ -2205,10 +2067,6 @@ msgstr ""
 msgid "The Business Case"
 msgstr "Der Businessplan"
 
-#: investors.html.j2:88
-msgid "Download"
-msgstr ""
-
 #: investors.html.j2:91
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -2524,7 +2382,11 @@ msgstr ""
 "die Überweisungen an Girokonten der Geschäftsbanken mit den genauen "
 "Bedingungen jedes Kaufvertrags und nach Geschäftsvorfällen geordnet anzeigen."
 
-#: news.html.j2.inc:9
+#: merchants.html.j2:183
+msgid "customer perspective"
+msgstr ""
+
+#: news.html.j2:16
 msgid "More news"
 msgstr ""
 
@@ -2554,85 +2416,376 @@ msgstr "Das Taler-Bezahlsystem"
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
 
-#: common/footer.j2.inc:7
+#: common/footer.j2.inc:11
 #, fuzzy
 #| msgid "About us"
 msgid "About"
 msgstr "Über uns"
 
-#: common/footer.j2.inc:8
+#: common/footer.j2.inc:12
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:9
+#: common/footer.j2.inc:17
 #, fuzzy
 #| msgid "Investors"
 msgid "For Investors"
 msgstr "Investoren"
 
-#: common/footer.j2.inc:14 common/navigation.j2.inc:5
-msgid "Citizens"
-msgstr "Bürger"
-
-#: common/footer.j2.inc:15 common/navigation.j2.inc:6
-msgid "Merchants"
-msgstr "Händler"
-
-#: common/footer.j2.inc:16 common/navigation.j2.inc:7
-msgid "Governments"
-msgstr "Regierungen"
-
-#: common/footer.j2.inc:21
+#: common/footer.j2.inc:18
 #, fuzzy
 #| msgid "Developers"
 msgid "Developer Resources"
 msgstr "Entwickler"
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:12
+#: common/footer.j2.inc:23
 msgid "FAQ"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:16
+#: common/footer.j2.inc:24
 #, fuzzy
 #| msgid "GNU Taler Bibliography"
 msgid "Bibliography"
 msgstr "Bibliografie von GNU Taler"
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:34
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:9
+#: common/navigation.j2.inc:15
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:16
+msgid "Design"
+msgstr ""
+
+#: common/navigation.j2.inc:17
+msgid "Docs"
+msgstr ""
+
+#: common/navigation.j2.inc:18
 #, fuzzy
-#| msgid "Developers"
-msgid "Resources"
-msgstr "Entwickler"
+#| msgid "The Team"
+msgid "Team"
+msgstr "Das Taler-Team"
+
+#~ msgid "Citizens"
+#~ msgstr "Bürger"
+
+#~ msgid "Merchants"
+#~ msgstr "Händler"
+
+#~ msgid "Governments"
+#~ msgstr "Regierungen"
 
-#: common/navigation.j2.inc:11
 #, fuzzy
-#| msgid "Taler System Architecture"
-msgid "System Architecture"
-msgstr "Systemarchitektur von Taler"
+#~| 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>"
+#~ 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."
 
-#: common/navigation.j2.inc:13
-msgid "Glossary"
-msgstr ""
+#, 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>"
+#~ 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."
 
-#: common/navigation.j2.inc:14
 #, fuzzy
-#| msgid "Developers"
-msgid "Developer Introduction"
-msgstr "Entwickler"
+#~| 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."
 
-#: common/navigation.j2.inc:15
-msgid "Copyright for Contributors"
-msgstr ""
+#, 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."
 
-#: common/navigation.j2.inc:17
-msgid "Gsoc 2018: Codeless Payments"
-msgstr ""
+#~ 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"
@@ -2662,8 +2815,5 @@ msgstr ""
 #~ msgid "About&nbsp;us"
 #~ msgstr "Über&nbsp;uns"
 
-#~ msgid "News"
-#~ msgstr "Nachrichten"
-
 #~ msgid "Latest Videos"
 #~ msgstr "Neuste Videos"
diff --git a/locale/en/LC_MESSAGES/messages.po 
b/locale/en/LC_MESSAGES/messages.po
index 462f643..30bbb77 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-01-16 23:15+0100\n"
+"POT-Creation-Date: 2019-06-25 21:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <address@hidden>\n"
@@ -13,75 +13,75 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:8
+#: about.html.j2:16
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
 
-#: about.html.j2:13
+#: about.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
 msgstr ""
 
-#: about.html.j2:20
+#: about.html.j2:28
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr ""
 
-#: about.html.j2:25
+#: about.html.j2:33
 msgid "Theoretical foundations."
 msgstr ""
 
-#: about.html.j2:30
+#: about.html.j2:38
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
-#: about.html.j2:37
+#: about.html.j2:45
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:42
+#: about.html.j2:50
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:47
+#: about.html.j2:55
 msgid "Software engineer."
 msgstr ""
 
-#: about.html.j2:54
+#: about.html.j2:62
 msgid "Sustainable business development."
 msgstr ""
 
-#: about.html.j2:58
+#: about.html.j2:66
 msgid "Software engineer. Works on libebics."
 msgstr ""
 
-#: about.html.j2:64 about.html.j2:68 about.html.j2:72
+#: about.html.j2:72 about.html.j2:76 about.html.j2:80
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: about.html.j2:78 about.html.j2:82 about.html.j2:86
+#: about.html.j2:86 about.html.j2:90 about.html.j2:94
 msgid "Translator (Italian)"
 msgstr ""
 
-#: about.html.j2:90
+#: about.html.j2:98
 msgid "Translator (German)"
 msgstr ""
 
-#: about.html.j2:96
+#: about.html.j2:104
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:100
+#: about.html.j2:108
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:104
+#: about.html.j2:112
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:110
+#: about.html.j2:118
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
@@ -107,125 +107,6 @@ msgstr ""
 msgid "available upon request"
 msgstr ""
 
-#: citizens.html.j2:5
-msgid "Advantages for Citizens"
-msgstr ""
-
-#: citizens.html.j2:9
-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 ""
-
-#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
-#: merchants.html.j2:41
-msgid "Secure"
-msgstr ""
-
-#: citizens.html.j2:27
-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 ""
-
-#: citizens.html.j2:37 index.html.j2:83
-msgid "Private"
-msgstr ""
-
-#: citizens.html.j2:39
-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 ""
-
-#: citizens.html.j2:50
-msgid "Convenient"
-msgstr ""
-
-#: citizens.html.j2:52
-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 ""
-
-#: citizens.html.j2:61 index.html.j2:41
-msgid "Stable"
-msgstr ""
-
-#: citizens.html.j2:63
-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 ""
-
-#: citizens.html.j2:79
-msgid "Wallet Browser Extension"
-msgstr ""
-
-#: citizens.html.j2:81
-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 ""
-
-#: citizens.html.j2:88
-msgid "Taler Demo"
-msgstr ""
-
-#: citizens.html.j2:90
-msgid ""
-"You can see how Taler works in practice by visiting our <a href=\"https://";
-"demo.taler.net\">demo page</a>."
-msgstr ""
-
-#: citizens.html.j2:103
-msgid "The Taler Wallet for customers"
-msgstr ""
-
-#: citizens.html.j2:105
-msgid "Customers interact with the Taler system using the Taler wallet:"
-msgstr ""
-
-#: citizens.html.j2:110
-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 ""
-
-#: citizens.html.j2:118
-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 ""
-
-#: citizens.html.j2:125
-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 ""
-
-#: citizens.html.j2:137 merchants.html.j2:179
-msgid "customer perspective"
-msgstr ""
-
 #: contact.html.j2:6
 msgid "Contact information"
 msgstr ""
@@ -399,22 +280,30 @@ msgid ""
 "\"https://lcov.taler.net/\";>lcov.taler.net</a>."
 msgstr ""
 
-#: developers.html.j2:132
+#: developers.html.j2:131
+msgid "Technical Presentation"
+msgstr ""
+
+#: developers.html.j2:134 investors.html.j2:88
+msgid "Download"
+msgstr ""
+
+#: developers.html.j2:150
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:135
+#: developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
 "the following steps:"
 msgstr ""
 
-#: developers.html.j2:142
+#: developers.html.j2:162
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:145
+#: developers.html.j2:165
 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 "
@@ -422,7 +311,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:157
+#: developers.html.j2:177
 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 "
@@ -434,7 +323,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:175
+#: developers.html.j2:195
 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 "
@@ -449,7 +338,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:197
+#: developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -463,7 +352,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:220
+#: developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -472,7 +361,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:234
+#: developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -482,7 +371,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:249
+#: developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -591,6 +480,215 @@ msgid ""
 "knowing which coin it signed for which customer.</p>"
 msgstr ""
 
+#: faq.html.j2:77
+msgid "How much does it cost?"
+msgstr ""
+
+#: faq.html.j2:78
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:93
+msgid "Does Taler work with international payments?"
+msgstr ""
+
+#: faq.html.j2:94
+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>"
+msgstr ""
+
+#: faq.html.j2:107
+msgid "How does Taler relate to the (European) Electronic Money Directive?"
+msgstr ""
+
+#: faq.html.j2:108
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:116
+msgid ""
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
+msgstr ""
+
+#: faq.html.j2:117
+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 "
+"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>"
+msgstr ""
+
+#: faq.html.j2:127
+msgid ""
+"To whom would consumers complain to in case of non-conversion or non-"
+"compliance?"
+msgstr ""
+
+#: faq.html.j2:128
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:138
+msgid "Are there any projects already using Taler?"
+msgstr ""
+
+#: faq.html.j2:139
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:151
+msgid "Does Taler support recurring payments?"
+msgstr ""
+
+#: faq.html.j2:153
+msgid ""
+"<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>"
+msgstr ""
+
+#: features.html.j2:41
+msgid "Paying with Taler"
+msgstr ""
+
+#: features.html.j2:42
+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 ""
+
+#: features.html.j2:54
+msgid "Receiving payments with Taler"
+msgstr ""
+
+#: features.html.j2:55
+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 ""
+
+#: features.html.j2:74
+msgid "Practical"
+msgstr ""
+
+#: features.html.j2:77
+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:87
+msgid "Stable"
+msgstr ""
+
+#: features.html.j2:90
+msgid ""
+"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."
+msgstr ""
+
+#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+msgid "Secure"
+msgstr ""
+
+#: features.html.j2:104
+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:116 governments.html.j2:25
+msgid "Taxable"
+msgstr ""
+
+#: features.html.j2:119
+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:129
+msgid "Private"
+msgstr ""
+
+#: features.html.j2:131
+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:142 governments.html.j2:88
+msgid "Libre"
+msgstr ""
+
+#: features.html.j2:145
+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."
+msgstr ""
+
 #: financial-news.html.j2:6
 msgid "Financial News"
 msgstr ""
@@ -897,10 +995,6 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:25 index.html.j2:70
-msgid "Taxable"
-msgstr ""
-
 #: governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
@@ -942,10 +1036,6 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:88 index.html.j2:96
-msgid "Libre"
-msgstr ""
-
 #: governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
@@ -1195,103 +1285,6 @@ msgstr ""
 msgid "Screenshots"
 msgstr ""
 
-#: index.html.j2:6
-msgid "GNU Taler logo"
-msgstr ""
-
-#: index.html.j2:10
-msgid "One-Click Cash Payments!"
-msgstr ""
-
-#: index.html.j2:13
-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>."
-msgstr ""
-
-#: index.html.j2:28
-msgid "Practical"
-msgstr ""
-
-#: index.html.j2:31
-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 ""
-
-#: index.html.j2:44
-msgid ""
-"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."
-msgstr ""
-
-#: index.html.j2:58
-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 ""
-
-#: index.html.j2:73
-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 ""
-
-#: index.html.j2:85
-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 ""
-
-#: index.html.j2:99
-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."
-msgstr ""
-
-#: index.html.j2:116
-msgid "Paying with Taler"
-msgstr ""
-
-#: index.html.j2:117
-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>"
-msgstr ""
-
-#: index.html.j2:128
-msgid "Receiving payments with Taler"
-msgstr ""
-
-#: index.html.j2:129
-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>"
-msgstr ""
-
-#: index.html.j2:145
-msgid "Taler News"
-msgstr ""
-
 #: investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr ""
@@ -1356,10 +1349,6 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:88
-msgid "Download"
-msgstr ""
-
 #: investors.html.j2:91
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1531,7 +1520,11 @@ msgid ""
 "each contract."
 msgstr ""
 
-#: news.html.j2.inc:9
+#: merchants.html.j2:183
+msgid "customer perspective"
+msgstr ""
+
+#: news.html.j2:16
 msgid "More news"
 msgstr ""
 
@@ -1559,68 +1552,48 @@ msgstr ""
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
 
-#: common/footer.j2.inc:7
+#: common/footer.j2.inc:11
 msgid "About"
 msgstr ""
 
-#: common/footer.j2.inc:8
+#: common/footer.j2.inc:12
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:9
+#: common/footer.j2.inc:17
 msgid "For Investors"
 msgstr ""
 
-#: common/footer.j2.inc:14 common/navigation.j2.inc:5
-msgid "Citizens"
-msgstr ""
-
-#: common/footer.j2.inc:15 common/navigation.j2.inc:6
-msgid "Merchants"
-msgstr ""
-
-#: common/footer.j2.inc:16 common/navigation.j2.inc:7
-msgid "Governments"
-msgstr ""
-
-#: common/footer.j2.inc:21
+#: common/footer.j2.inc:18
 msgid "Developer Resources"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:12
+#: common/footer.j2.inc:23
 msgid "FAQ"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:16
+#: common/footer.j2.inc:24
 msgid "Bibliography"
 msgstr ""
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:34
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:9
-msgid "Resources"
-msgstr ""
-
-#: common/navigation.j2.inc:11
-msgid "System Architecture"
-msgstr ""
-
-#: common/navigation.j2.inc:13
-msgid "Glossary"
+#: common/navigation.j2.inc:15
+msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:14
-msgid "Developer Introduction"
+#: common/navigation.j2.inc:16
+msgid "Design"
 msgstr ""
 
-#: common/navigation.j2.inc:15
-msgid "Copyright for Contributors"
+#: common/navigation.j2.inc:17
+msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:17
-msgid "Gsoc 2018: Codeless Payments"
+#: common/navigation.j2.inc:18
+msgid "Team"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index a5ee6ec..15b9565 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-01-16 23:15+0100\n"
+"POT-Creation-Date: 2019-06-25 21:47+0200\n"
 "PO-Revision-Date: 2017-08-10 06:24+0200\n"
 "Last-Translator: \n"
 "Language-Team: es <address@hidden>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Generated-By: Babel 2.3.4\n"
 "X-Generator: Poedit 2.0.2\n"
 
-#: about.html.j2:8
+#: about.html.j2:16
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
@@ -22,7 +22,7 @@ msgstr ""
 "Responsable del mantenimiento de GNU. Especialista en seguridad de redes. "
 "Investigador en privacidad informática. Arquitecto de Software."
 
-#: about.html.j2:13
+#: about.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
@@ -30,63 +30,63 @@ msgstr ""
 "Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
 "de TI en diferentes industrias."
 
-#: about.html.j2:20
+#: about.html.j2:28
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Criptografía aplicada. Contacto para W3C &amp; Tor."
 
-#: about.html.j2:25
+#: about.html.j2:33
 msgid "Theoretical foundations."
 msgstr "Fundamentos teóricos."
 
-#: about.html.j2:30
+#: about.html.j2:38
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fundador del proyecto GNU. Orientación ética y licencias."
 
-#: about.html.j2:37
+#: about.html.j2:45
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
 
-#: about.html.j2:42
+#: about.html.j2:50
 msgid "PhD Student, Inria.."
 msgstr "Estudiante de doctorado, INRIA."
 
-#: about.html.j2:47
+#: about.html.j2:55
 msgid "Software engineer."
 msgstr "Ingeniero de Software."
 
-#: about.html.j2:54
+#: about.html.j2:62
 msgid "Sustainable business development."
 msgstr "Desarrollo de negocios sostenibles."
 
-#: about.html.j2:58
+#: about.html.j2:66
 msgid "Software engineer. Works on libebics."
 msgstr "Ingeniero de Software. Trabaja en libebics."
 
-#: about.html.j2:64 about.html.j2:68 about.html.j2:72
+#: about.html.j2:72 about.html.j2:76 about.html.j2:80
 msgid "Translator (Spanish)"
 msgstr "Traductor (español)"
 
-#: about.html.j2:78 about.html.j2:82 about.html.j2:86
+#: about.html.j2:86 about.html.j2:90 about.html.j2:94
 msgid "Translator (Italian)"
 msgstr "Traductora (italiano)"
 
-#: about.html.j2:90
+#: about.html.j2:98
 msgid "Translator (German)"
 msgstr "Traductor (alemán)"
 
-#: about.html.j2:96
+#: about.html.j2:104
 msgid "Hardware security module"
 msgstr "Módulo de seguridad de hardware"
 
-#: about.html.j2:100
+#: about.html.j2:108
 msgid "Risk management"
 msgstr "Gestión de riesgos"
 
-#: about.html.j2:104
+#: about.html.j2:112
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
 
-#: about.html.j2:110
+#: about.html.j2:118
 msgid "Software engineer. Works on Android wallet."
 msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
 
@@ -112,177 +112,6 @@ msgstr "y"
 msgid "available upon request"
 msgstr "disponible bajo petición"
 
-#: citizens.html.j2:5
-msgid "Advantages for Citizens"
-msgstr "Ventajas para los ciudadanos"
-
-#: citizens.html.j2:9
-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."
-
-#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
-#: merchants.html.j2:41
-msgid "Secure"
-msgstr "Seguro"
-
-#: citizens.html.j2:27
-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."
-
-#: citizens.html.j2:37 index.html.j2:83
-msgid "Private"
-msgstr "Privado"
-
-#: citizens.html.j2:39
-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."
-
-#: citizens.html.j2:50
-msgid "Convenient"
-msgstr "Práctico"
-
-#: citizens.html.j2:52
-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."
-
-#: citizens.html.j2:61 index.html.j2:41
-msgid "Stable"
-msgstr "Estable"
-
-#: citizens.html.j2:63
-#, 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."
-
-#: citizens.html.j2:79
-msgid "Wallet Browser Extension"
-msgstr "Extensión Wallet para el Navegador Web"
-
-#: citizens.html.j2:81
-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."
-
-#: citizens.html.j2:88
-msgid "Taler Demo"
-msgstr "Demo Taler"
-
-#: citizens.html.j2:90
-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>."
-
-#: citizens.html.j2:103
-msgid "The Taler Wallet for customers"
-msgstr "La Billetera Taler para clientes"
-
-#: citizens.html.j2:105
-msgid "Customers interact with the Taler system using the Taler wallet:"
-msgstr ""
-"Los clientes interactúan con el sistema Taler utilizando la billetera Taler:"
-
-#: citizens.html.j2:110
-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."
-
-#: citizens.html.j2:118
-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."
-
-#: citizens.html.j2:125
-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."
-
-#: citizens.html.j2:137 merchants.html.j2:179
-msgid "customer perspective"
-msgstr "Perspectiva del consumidor"
-
 #: contact.html.j2:6
 msgid "Contact information"
 msgstr "Contacto"
@@ -526,11 +355,19 @@ msgstr ""
 "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:132
+#: developers.html.j2:131
+msgid "Technical Presentation"
+msgstr ""
+
+#: developers.html.j2:134 investors.html.j2:88
+msgid "Download"
+msgstr ""
+
+#: developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Diagrama general del sistema Taler"
 
-#: developers.html.j2:135
+#: developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -540,11 +377,11 @@ msgstr ""
 "tal como se ilustra en la imagen en la derecha. Las transacciones típicas "
 "involucran los siguientes pasos:"
 
-#: developers.html.j2:142
+#: developers.html.j2:162
 msgid "system overview"
 msgstr "Diagrama general del sistema"
 
-#: developers.html.j2:145
+#: developers.html.j2:165
 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 "
@@ -557,7 +394,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:157
+#: developers.html.j2:177
 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 "
@@ -578,7 +415,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:175
+#: developers.html.j2:195
 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 "
@@ -605,7 +442,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:197
+#: developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -632,7 +469,7 @@ msgstr ""
 "comerciantes el pago de los impuestos aplicables (y que éstos no se incurran "
 "en contratos ilegales)."
 
-#: developers.html.j2:220
+#: developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -649,7 +486,7 @@ msgstr ""
 "bancarias y las monedas (y derechos a cobrar) individuales que fueron "
 "depositadas."
 
-#: developers.html.j2:234
+#: developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -666,7 +503,7 @@ msgstr ""
 "que su saldo bancario coincida con el valor total de las monedas que "
 "permanecen en circulación."
 
-#: developers.html.j2:249
+#: developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -815,6 +652,266 @@ msgstr ""
 "ya que impide que se conozcan las monedas utilizadas o los clientes "
 "involucrados.</p>"
 
+#: faq.html.j2:77
+msgid "How much does it cost?"
+msgstr ""
+
+#: faq.html.j2:78
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:93
+msgid "Does Taler work with international payments?"
+msgstr ""
+
+#: faq.html.j2:94
+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>"
+msgstr ""
+
+#: faq.html.j2:107
+msgid "How does Taler relate to the (European) Electronic Money Directive?"
+msgstr ""
+
+#: faq.html.j2:108
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:116
+msgid ""
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
+msgstr ""
+
+#: faq.html.j2:117
+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 "
+"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>"
+msgstr ""
+
+#: faq.html.j2:127
+msgid ""
+"To whom would consumers complain to in case of non-conversion or non-"
+"compliance?"
+msgstr ""
+
+#: faq.html.j2:128
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:138
+msgid "Are there any projects already using Taler?"
+msgstr ""
+
+#: faq.html.j2:139
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:151
+msgid "Does Taler support recurring payments?"
+msgstr ""
+
+#: faq.html.j2:153
+msgid ""
+"<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>"
+msgstr ""
+
+#: features.html.j2:41
+msgid "Paying with Taler"
+msgstr "Pagando con Taler"
+
+#: features.html.j2:42
+#, 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>"
+
+#: features.html.j2:54
+msgid "Receiving payments with Taler"
+msgstr "Recibiendo pagos con Taler"
+
+#: features.html.j2:55
+#, 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>"
+
+#: features.html.j2:74
+msgid "Practical"
+msgstr "Práctico"
+
+#: features.html.j2:77
+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 ""
+"Taler es fácil de integrar con aplicaciones web existentes. Los pagos están "
+"asegurados criptográficamente y se confirman en milisegundos con costos de "
+"transacción extremadamente bajos."
+
+#: features.html.j2:87
+msgid "Stable"
+msgstr "Estable"
+
+#: features.html.j2:90
+msgid ""
+"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."
+msgstr ""
+"Taler no introduce una nueva moneda. Taler utiliza una billetera electrónica "
+"que almacena monedas y proveedores de servicios de pago con cuentas de "
+"depósito en monedas existentes. Así, las monedas criptográficas de Taler "
+"corresponden a monedas existentes, tales como dólares estadounidenses, euros "
+"o incluso bitcoins."
+
+#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+msgid "Secure"
+msgstr "Seguro"
+
+#: features.html.j2:104
+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 ""
+"Por diseño Taler no es blanco de problemas de seguridad como phishing o "
+"falsificación. Gracias a sus características de seguridad, Taler nunca "
+"rechaza a un cliente legítimo debido a un falso positivo en la detección de "
+"fraude."
+
+#: features.html.j2:116 governments.html.j2:25
+msgid "Taxable"
+msgstr "Imponible"
+
+#: features.html.j2:119
+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 ""
+"Al usar Taler, los ingresos del comerciante son transparentes para las "
+"autoridades de recaudación de impuestos. A diferencia del efectivo y la "
+"mayoría de las monedas electrónicas, Taler ayuda a prevenir los mercados "
+"negros. Taler no es adecuado para actividades ilegales."
+
+#: features.html.j2:129
+msgid "Private"
+msgstr "Privado"
+
+#: features.html.j2:131
+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 ""
+"Al pagar con Taler, su identidad no tiene que ser revelada. Al igual que los "
+"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:142 governments.html.j2:88
+msgid "Libre"
+msgstr "Libre"
+
+#: features.html.j2:145
+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."
+msgstr ""
+"Taler ofrece protocolos e implementaciones de referencia que en principio "
+"permiten a cualquiera ejecutar su propia infraestructura de pagos, ya sean "
+"individuos, organizaciones o países. Dado que la implementación de "
+"referencia es un paquete <a href=\"http://www.gnu.org/\";>GNU</a>, siempre "
+"permanecerá como software libre."
+
 #: financial-news.html.j2:6
 msgid "Financial News"
 msgstr "Noticias Financieras"
@@ -1187,10 +1284,6 @@ msgstr ""
 "como reguladores de confianza. Taler contribuye a la soberanía digital en la "
 "infraestructura financiera crítica."
 
-#: governments.html.j2:25 index.html.j2:70
-msgid "Taxable"
-msgstr "Imponible"
-
 #: governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
@@ -1262,10 +1355,6 @@ msgstr ""
 "garantía se gestiona honestamente. Esto asegura que la plataforma de "
 "intercambio no amenace la economía mediante el fraude."
 
-#: governments.html.j2:88 index.html.j2:96
-msgid "Libre"
-msgstr "Libre"
-
 #: governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
@@ -1549,152 +1638,6 @@ msgstr ""
 msgid "Screenshots"
 msgstr ""
 
-#: index.html.j2:6
-msgid "GNU Taler logo"
-msgstr "Logotipo de GNU Taler"
-
-#: index.html.j2:10
-msgid "One-Click Cash Payments!"
-msgstr "¡Pagos en efectivo a un solo click!"
-
-#: index.html.j2:13
-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>."
-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>."
-
-#: index.html.j2:28
-msgid "Practical"
-msgstr "Práctico"
-
-#: index.html.j2:31
-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 ""
-"Taler es fácil de integrar con aplicaciones web existentes. Los pagos están "
-"asegurados criptográficamente y se confirman en milisegundos con costos de "
-"transacción extremadamente bajos."
-
-#: index.html.j2:44
-msgid ""
-"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."
-msgstr ""
-"Taler no introduce una nueva moneda. Taler utiliza una billetera electrónica "
-"que almacena monedas y proveedores de servicios de pago con cuentas de "
-"depósito en monedas existentes. Así, las monedas criptográficas de Taler "
-"corresponden a monedas existentes, tales como dólares estadounidenses, euros "
-"o incluso bitcoins."
-
-#: index.html.j2:58
-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 ""
-"Por diseño Taler no es blanco de problemas de seguridad como phishing o "
-"falsificación. Gracias a sus características de seguridad, Taler nunca "
-"rechaza a un cliente legítimo debido a un falso positivo en la detección de "
-"fraude."
-
-#: index.html.j2:73
-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 ""
-"Al usar Taler, los ingresos del comerciante son transparentes para las "
-"autoridades de recaudación de impuestos. A diferencia del efectivo y la "
-"mayoría de las monedas electrónicas, Taler ayuda a prevenir los mercados "
-"negros. Taler no es adecuado para actividades ilegales."
-
-#: index.html.j2:85
-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 ""
-"Al pagar con Taler, su identidad no tiene que ser revelada. Al igual que los "
-"pagos en efectivo, nadie puede rastrear cómo gasta su dinero electrónico. "
-"Sin embargo, obtiene una prueba de pago legalmente válida."
-
-#: index.html.j2:99
-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."
-msgstr ""
-"Taler ofrece protocolos e implementaciones de referencia que en principio "
-"permiten a cualquiera ejecutar su propia infraestructura de pagos, ya sean "
-"individuos, organizaciones o países. Dado que la implementación de "
-"referencia es un paquete <a href=\"http://www.gnu.org/\";>GNU</a>, siempre "
-"permanecerá como software libre."
-
-#: index.html.j2:116
-msgid "Paying with Taler"
-msgstr "Pagando con Taler"
-
-#: index.html.j2:117
-#, 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>"
-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>"
-
-#: index.html.j2:128
-msgid "Receiving payments with Taler"
-msgstr "Recibiendo pagos con Taler"
-
-#: index.html.j2:129
-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>"
-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>"
-
-#: index.html.j2:145
-msgid "Taler News"
-msgstr "Noticias de Taler"
-
 #: investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "¡Invierta en Taler!"
@@ -1786,10 +1729,6 @@ msgstr ""
 msgid "The Business Case"
 msgstr "El Caso de los Negocios"
 
-#: investors.html.j2:88
-msgid "Download"
-msgstr ""
-
 #: investors.html.j2:91
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -2029,7 +1968,11 @@ msgstr ""
 "<b>relacionar</b> las transferencias bancarias con los pagos electrónicos "
 "correspondientes, incluyendo los términos exactos de cada contrato."
 
-#: news.html.j2.inc:9
+#: merchants.html.j2:183
+msgid "customer perspective"
+msgstr "Perspectiva del consumidor"
+
+#: news.html.j2:16
 msgid "More news"
 msgstr ""
 
@@ -2059,43 +2002,31 @@ msgstr "GNU Taler"
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "Reservas Electrónicas Gravales, Anónimas y Libres"
 
-#: common/footer.j2.inc:7
+#: common/footer.j2.inc:11
 msgid "About"
 msgstr "Acerca de GNU Taler"
 
-#: common/footer.j2.inc:8
+#: common/footer.j2.inc:12
 msgid "Contact"
 msgstr "Contacto"
 
-#: common/footer.j2.inc:9
+#: common/footer.j2.inc:17
 msgid "For Investors"
 msgstr "Inversionistas"
 
-#: common/footer.j2.inc:14 common/navigation.j2.inc:5
-msgid "Citizens"
-msgstr "Ciudadanos"
-
-#: common/footer.j2.inc:15 common/navigation.j2.inc:6
-msgid "Merchants"
-msgstr "Comerciantes"
-
-#: common/footer.j2.inc:16 common/navigation.j2.inc:7
-msgid "Governments"
-msgstr "Gobiernos"
-
-#: common/footer.j2.inc:21
+#: common/footer.j2.inc:18
 msgid "Developer Resources"
 msgstr "Recursos de desarrollo"
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:12
+#: common/footer.j2.inc:23
 msgid "FAQ"
 msgstr "Preguntas frecuentes"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:16
+#: common/footer.j2.inc:24
 msgid "Bibliography"
 msgstr "Bibliografía"
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:34
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
@@ -2103,29 +2034,253 @@ msgstr ""
 "Está página fue creada usando únicamente <a href='https://www.gnu.org/home.";
 "es.html'>software libre</a>"
 
-#: common/navigation.j2.inc:9
-msgid "Resources"
-msgstr "Recursos"
+#: common/navigation.j2.inc:15
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:16
+msgid "Design"
+msgstr ""
 
-#: common/navigation.j2.inc:11
-msgid "System Architecture"
-msgstr "Arquitectura del sistema"
+#: common/navigation.j2.inc:17
+msgid "Docs"
+msgstr ""
 
-#: common/navigation.j2.inc:13
-msgid "Glossary"
-msgstr "Glosario"
+#: common/navigation.j2.inc:18
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "El Equipo"
 
-#: common/navigation.j2.inc:14
-msgid "Developer Introduction"
-msgstr "Introducción para desarrolladores"
+#~ msgid "Citizens"
+#~ msgstr "Ciudadanos"
 
-#: common/navigation.j2.inc:15
-msgid "Copyright for Contributors"
-msgstr "Copyright para contribuidores"
+#~ msgid "Merchants"
+#~ msgstr "Comerciantes"
 
-#: common/navigation.j2.inc:17
-msgid "Gsoc 2018: Codeless Payments"
-msgstr ""
+#~ msgid "Governments"
+#~ msgstr "Gobiernos"
+
+#, 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>"
+#~ 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 ""
+#~ "<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>"
+#~ 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 ""
+#~ "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."
+
+#, 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"
+
+#, 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"
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index bae8c98..554de07 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-01-16 23:15+0100\n"
+"POT-Creation-Date: 2019-06-25 21:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fr <address@hidden>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:8
+#: about.html.j2:16
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
@@ -22,80 +22,80 @@ msgstr ""
 "Mégalomane local, C'est à dire, qui voudrait créer un nouveau système de "
 "paiement et un nouvel Internet ?"
 
-#: about.html.j2:13
+#: about.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
 msgstr ""
 
-#: about.html.j2:20
+#: about.html.j2:28
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "mathématicien"
 
-#: about.html.j2:25
+#: about.html.j2:33
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Fatale (en théorie)"
 
-#: about.html.j2:30
+#: about.html.j2:38
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Enthousiaste Ethique"
 
-#: about.html.j2:37
+#: about.html.j2:45
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Principalement inoffensif"
 
-#: about.html.j2:42
+#: about.html.j2:50
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:47
+#: about.html.j2:55
 #, fuzzy
 #| msgid "Software engineer. Works on libebics."
 msgid "Software engineer."
 msgstr "EBICS."
 
-#: about.html.j2:54
+#: about.html.j2:62
 #, fuzzy
 msgid "Sustainable business development."
 msgstr "Basse fréquence"
 
-#: about.html.j2:58
+#: about.html.j2:66
 msgid "Software engineer. Works on libebics."
 msgstr "EBICS."
 
-#: about.html.j2:64 about.html.j2:68 about.html.j2:72
+#: about.html.j2:72 about.html.j2:76 about.html.j2:80
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traductrice"
 
-#: about.html.j2:78 about.html.j2:82 about.html.j2:86
+#: about.html.j2:86 about.html.j2:90 about.html.j2:94
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traductrice"
 
-#: about.html.j2:90
+#: about.html.j2:98
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traductrice"
 
-#: about.html.j2:96
+#: about.html.j2:104
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:100
+#: about.html.j2:108
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:104
+#: about.html.j2:112
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
 
-#: about.html.j2:110
+#: about.html.j2:118
 #, fuzzy
 #| msgid "Software engineer. Works on libebics."
 msgid "Software engineer. Works on Android wallet."
@@ -125,127 +125,6 @@ msgstr ""
 msgid "available upon request"
 msgstr ""
 
-#: citizens.html.j2:5
-msgid "Advantages for Citizens"
-msgstr ""
-
-#: citizens.html.j2:9
-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 ""
-
-#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
-#: merchants.html.j2:41
-msgid "Secure"
-msgstr "Sûr"
-
-#: citizens.html.j2:27
-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 ""
-
-#: citizens.html.j2:37 index.html.j2:83
-msgid "Private"
-msgstr ""
-
-#: citizens.html.j2:39
-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 ""
-
-#: citizens.html.j2:50
-msgid "Convenient"
-msgstr ""
-
-#: citizens.html.j2:52
-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 ""
-
-#: citizens.html.j2:61 index.html.j2:41
-#, fuzzy
-#| msgid "Taxable"
-msgid "Stable"
-msgstr "Taxable"
-
-#: citizens.html.j2:63
-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 ""
-
-#: citizens.html.j2:79
-msgid "Wallet Browser Extension"
-msgstr ""
-
-#: citizens.html.j2:81
-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 ""
-
-#: citizens.html.j2:88
-msgid "Taler Demo"
-msgstr ""
-
-#: citizens.html.j2:90
-msgid ""
-"You can see how Taler works in practice by visiting our <a href=\"https://";
-"demo.taler.net\">demo page</a>."
-msgstr ""
-
-#: citizens.html.j2:103
-msgid "The Taler Wallet for customers"
-msgstr ""
-
-#: citizens.html.j2:105
-msgid "Customers interact with the Taler system using the Taler wallet:"
-msgstr ""
-
-#: citizens.html.j2:110
-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 ""
-
-#: citizens.html.j2:118
-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 ""
-
-#: citizens.html.j2:125
-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 ""
-
-#: citizens.html.j2:137 merchants.html.j2:179
-msgid "customer perspective"
-msgstr ""
-
 #: contact.html.j2:6
 msgid "Contact information"
 msgstr ""
@@ -419,24 +298,32 @@ msgid ""
 "\"https://lcov.taler.net/\";>lcov.taler.net</a>."
 msgstr ""
 
-#: developers.html.j2:132
+#: developers.html.j2:131
+msgid "Technical Presentation"
+msgstr ""
+
+#: developers.html.j2:134 investors.html.j2:88
+msgid "Download"
+msgstr ""
+
+#: developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:135
+#: developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
 "the following steps:"
 msgstr ""
 
-#: developers.html.j2:142
+#: developers.html.j2:162
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:145
+#: developers.html.j2:165
 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 "
@@ -444,7 +331,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:157
+#: developers.html.j2:177
 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 "
@@ -456,7 +343,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:175
+#: developers.html.j2:195
 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 "
@@ -471,7 +358,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:197
+#: developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -485,7 +372,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:220
+#: developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -494,7 +381,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:234
+#: developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -504,7 +391,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:249
+#: developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -613,6 +500,219 @@ msgid ""
 "knowing which coin it signed for which customer.</p>"
 msgstr ""
 
+#: faq.html.j2:77
+msgid "How much does it cost?"
+msgstr ""
+
+#: faq.html.j2:78
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:93
+msgid "Does Taler work with international payments?"
+msgstr ""
+
+#: faq.html.j2:94
+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>"
+msgstr ""
+
+#: faq.html.j2:107
+msgid "How does Taler relate to the (European) Electronic Money Directive?"
+msgstr ""
+
+#: faq.html.j2:108
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:116
+msgid ""
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
+msgstr ""
+
+#: faq.html.j2:117
+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 "
+"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>"
+msgstr ""
+
+#: faq.html.j2:127
+msgid ""
+"To whom would consumers complain to in case of non-conversion or non-"
+"compliance?"
+msgstr ""
+
+#: faq.html.j2:128
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:138
+msgid "Are there any projects already using Taler?"
+msgstr ""
+
+#: faq.html.j2:139
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:151
+msgid "Does Taler support recurring payments?"
+msgstr ""
+
+#: faq.html.j2:153
+msgid ""
+"<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>"
+msgstr ""
+
+#: features.html.j2:41
+msgid "Paying with Taler"
+msgstr ""
+
+#: features.html.j2:42
+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 ""
+
+#: features.html.j2:54
+msgid "Receiving payments with Taler"
+msgstr ""
+
+#: features.html.j2:55
+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 ""
+
+#: features.html.j2:74
+#, fuzzy
+#| msgid "Ethical"
+msgid "Practical"
+msgstr "Ethique"
+
+#: features.html.j2:77
+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:87
+#, fuzzy
+#| msgid "Taxable"
+msgid "Stable"
+msgstr "Taxable"
+
+#: features.html.j2:90
+msgid ""
+"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."
+msgstr ""
+
+#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+msgid "Secure"
+msgstr "Sûr"
+
+#: features.html.j2:104
+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:116 governments.html.j2:25
+msgid "Taxable"
+msgstr "Taxable"
+
+#: features.html.j2:119
+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:129
+msgid "Private"
+msgstr ""
+
+#: features.html.j2:131
+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:142 governments.html.j2:88
+msgid "Libre"
+msgstr "Libre"
+
+#: features.html.j2:145
+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."
+msgstr ""
+
 #: financial-news.html.j2:6
 msgid "Financial News"
 msgstr ""
@@ -921,10 +1021,6 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:25 index.html.j2:70
-msgid "Taxable"
-msgstr "Taxable"
-
 #: governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
@@ -966,10 +1062,6 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:88 index.html.j2:96
-msgid "Libre"
-msgstr "Libre"
-
 #: governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
@@ -1221,105 +1313,6 @@ msgstr ""
 msgid "Screenshots"
 msgstr ""
 
-#: index.html.j2:6
-msgid "GNU Taler logo"
-msgstr ""
-
-#: index.html.j2:10
-msgid "One-Click Cash Payments!"
-msgstr ""
-
-#: index.html.j2:13
-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>."
-msgstr ""
-
-#: index.html.j2:28
-#, fuzzy
-#| msgid "Ethical"
-msgid "Practical"
-msgstr "Ethique"
-
-#: index.html.j2:31
-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 ""
-
-#: index.html.j2:44
-msgid ""
-"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."
-msgstr ""
-
-#: index.html.j2:58
-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 ""
-
-#: index.html.j2:73
-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 ""
-
-#: index.html.j2:85
-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 ""
-
-#: index.html.j2:99
-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."
-msgstr ""
-
-#: index.html.j2:116
-msgid "Paying with Taler"
-msgstr ""
-
-#: index.html.j2:117
-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>"
-msgstr ""
-
-#: index.html.j2:128
-msgid "Receiving payments with Taler"
-msgstr ""
-
-#: index.html.j2:129
-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>"
-msgstr ""
-
-#: index.html.j2:145
-msgid "Taler News"
-msgstr ""
-
 #: investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr ""
@@ -1384,10 +1377,6 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:88
-msgid "Download"
-msgstr ""
-
 #: investors.html.j2:91
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1561,7 +1550,11 @@ msgid ""
 "each contract."
 msgstr ""
 
-#: news.html.j2.inc:9
+#: merchants.html.j2:183
+msgid "customer perspective"
+msgstr ""
+
+#: news.html.j2:16
 msgid "More news"
 msgstr ""
 
@@ -1589,72 +1582,55 @@ msgstr ""
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
 
-#: common/footer.j2.inc:7
+#: common/footer.j2.inc:11
 msgid "About"
 msgstr ""
 
-#: common/footer.j2.inc:8
+#: common/footer.j2.inc:12
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:9
+#: common/footer.j2.inc:17
 msgid "For Investors"
 msgstr ""
 
-#: common/footer.j2.inc:14 common/navigation.j2.inc:5
-msgid "Citizens"
-msgstr ""
-
-#: common/footer.j2.inc:15 common/navigation.j2.inc:6
-#, fuzzy
-msgid "Merchants"
-msgstr "Documentation"
-
-#: common/footer.j2.inc:16 common/navigation.j2.inc:7
-msgid "Governments"
-msgstr ""
-
-#: common/footer.j2.inc:21
+#: common/footer.j2.inc:18
 msgid "Developer Resources"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:12
+#: common/footer.j2.inc:23
 msgid "FAQ"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:16
+#: common/footer.j2.inc:24
 msgid "Bibliography"
 msgstr ""
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:34
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:9
-msgid "Resources"
-msgstr ""
-
-#: common/navigation.j2.inc:11
-msgid "System Architecture"
+#: common/navigation.j2.inc:15
+msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:13
-msgid "Glossary"
+#: common/navigation.j2.inc:16
+msgid "Design"
 msgstr ""
 
-#: common/navigation.j2.inc:14
-msgid "Developer Introduction"
+#: common/navigation.j2.inc:17
+msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:15
-msgid "Copyright for Contributors"
+#: common/navigation.j2.inc:18
+msgid "Team"
 msgstr ""
 
-#: common/navigation.j2.inc:17
-msgid "Gsoc 2018: Codeless Payments"
-msgstr ""
+#, fuzzy
+#~ msgid "Merchants"
+#~ msgstr "Documentation"
 
 #~ msgid "Performance Analysis"
 #~ msgstr "Analyse de performances"
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index 6d9c6bb..47b4d9d 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-01-16 23:15+0100\n"
+"POT-Creation-Date: 2019-06-25 21:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: it <address@hidden>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: about.html.j2:8
+#: about.html.j2:16
 #, fuzzy
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
@@ -22,7 +22,7 @@ msgstr ""
 "Ricercatore in reti e sicurezza, ingegnere del software; autore di software "
 "GNU"
 
-#: about.html.j2:13
+#: about.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
@@ -30,75 +30,75 @@ msgstr ""
 "Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
 "diversi settori"
 
-#: about.html.j2:20
+#: about.html.j2:28
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Matematico e crittografo. Attivo nel W3C &amp; Tor"
 
-#: about.html.j2:25
+#: about.html.j2:33
 #, fuzzy
 msgid "Theoretical foundations."
 msgstr "Teorica della sicurezza dei protocolli"
 
-#: about.html.j2:30
+#: about.html.j2:38
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
 
-#: about.html.j2:37
+#: about.html.j2:45
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
 
-#: about.html.j2:42
+#: about.html.j2:50
 msgid "PhD Student, Inria.."
 msgstr ""
 "Dottorando a Inria Rennes.. Programmatore e architetto del protocollo Taler."
 
-#: about.html.j2:47
+#: about.html.j2:55
 msgid "Software engineer."
 msgstr "Programmatore."
 
-#: about.html.j2:54
+#: about.html.j2:62
 msgid "Sustainable business development."
 msgstr "Sviluppo di business sostenibile."
 
-#: about.html.j2:58
+#: about.html.j2:66
 #, fuzzy
 msgid "Software engineer. Works on libebics."
 msgstr "Programmatore. Attualmente coinvolto in libebics."
 
-#: about.html.j2:64 about.html.j2:68 about.html.j2:72
+#: about.html.j2:72 about.html.j2:76 about.html.j2:80
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traduttore per lo spagnolo."
 
-#: about.html.j2:78 about.html.j2:82 about.html.j2:86
+#: about.html.j2:86 about.html.j2:90 about.html.j2:94
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traduttrice per l'italiano."
 
-#: about.html.j2:90
+#: about.html.j2:98
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traduttore per lo spagnolo."
 
-#: about.html.j2:96
+#: about.html.j2:104
 msgid "Hardware security module"
 msgstr "Sicurezza hardware."
 
-#: about.html.j2:100
+#: about.html.j2:108
 msgid "Risk management"
 msgstr "Gestione del rischio."
 
-#: about.html.j2:104
+#: about.html.j2:112
 #, 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."
 
-#: about.html.j2:110
+#: about.html.j2:118
 msgid "Software engineer. Works on Android wallet."
 msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
 
@@ -124,180 +124,6 @@ msgstr "e"
 msgid "available upon request"
 msgstr "disponibile su richiesta"
 
-#: citizens.html.j2:5
-msgid "Advantages for Citizens"
-msgstr "Vantaggi per il cittadino"
-
-#: citizens.html.j2:9
-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."
-
-#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
-#: merchants.html.j2:41
-msgid "Secure"
-msgstr "Sicuro"
-
-#: citizens.html.j2:27
-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."
-
-#: citizens.html.j2:37 index.html.j2:83
-msgid "Private"
-msgstr "Privato"
-
-#: citizens.html.j2:39
-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."
-
-#: citizens.html.j2:50
-msgid "Convenient"
-msgstr "Comodo"
-
-#: citizens.html.j2:52
-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."
-
-#: citizens.html.j2:61 index.html.j2:41
-msgid "Stable"
-msgstr "Stabile"
-
-#: citizens.html.j2:63
-#, 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."
-
-#: citizens.html.j2:79
-msgid "Wallet Browser Extension"
-msgstr "Portafoglio: un'estensione del browser."
-
-#: citizens.html.j2:81
-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."
-
-#: citizens.html.j2:88
-msgid "Taler Demo"
-msgstr "Dimostrazione di Taler"
-
-#: citizens.html.j2:90
-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>."
-
-#: citizens.html.j2:103
-msgid "The Taler Wallet for customers"
-msgstr "I clienti e il portafoglio"
-
-#: citizens.html.j2:105
-msgid "Customers interact with the Taler system using the Taler wallet:"
-msgstr "I clienti interagiscono con Taler usando il portafoglio"
-
-#: citizens.html.j2:110
-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."
-
-#: citizens.html.j2:118
-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."
-
-#: citizens.html.j2:125
-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."
-
-#: citizens.html.j2:137 merchants.html.j2:179
-msgid "customer perspective"
-msgstr ""
-
 #: contact.html.j2:6
 msgid "Contact information"
 msgstr "Contatti"
@@ -539,11 +365,19 @@ msgstr ""
 "disponibili al seguente link <a href=\"https://lcov.taler.net/\";>lcov.taler."
 "net</a>."
 
-#: developers.html.j2:132
+#: developers.html.j2:131
+msgid "Technical Presentation"
+msgstr ""
+
+#: developers.html.j2:134 investors.html.j2:88
+msgid "Download"
+msgstr "Scarica"
+
+#: developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Panoramica del sistema Taler"
 
-#: developers.html.j2:135
+#: developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -553,13 +387,13 @@ msgstr ""
 "mostrato nell'illustrazione a destra. Le transazioni tipiche comportano le "
 "seguenti operazioni:"
 
-#: developers.html.j2:142
+#: developers.html.j2:162
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Panoramica del sistema"
 
-#: developers.html.j2:145
+#: developers.html.j2:165
 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 "
@@ -571,7 +405,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:157
+#: developers.html.j2:177
 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 "
@@ -592,7 +426,7 @@ msgstr ""
 "valore totale dei fondi (ad eccezione delle commissioni che il cambio può "
 "addebitare per il servizio)."
 
-#: developers.html.j2:175
+#: developers.html.j2:195
 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 "
@@ -619,7 +453,7 @@ msgstr ""
 "piccola parte delle sue monete digitali (il sistema pensa ai clienti che "
 "ricevono del resto)."
 
-#: developers.html.j2:197
+#: developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -644,7 +478,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:220
+#: developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -659,7 +493,7 @@ msgstr ""
 "relazione tra i trasferimenti bancari e le singole richieste di risarcimento "
 "che erano state depositate."
 
-#: developers.html.j2:234
+#: developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -675,7 +509,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:249
+#: developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -821,6 +655,268 @@ msgstr ""
 "L'uso della blind signature protegge la tua privacy in quanto impedisce al "
 "cambio di sapere quale moneta ha firmato e per quale cliente.</p> "
 
+#: faq.html.j2:77
+msgid "How much does it cost?"
+msgstr ""
+
+#: faq.html.j2:78
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:93
+msgid "Does Taler work with international payments?"
+msgstr ""
+
+#: faq.html.j2:94
+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>"
+msgstr ""
+
+#: faq.html.j2:107
+msgid "How does Taler relate to the (European) Electronic Money Directive?"
+msgstr ""
+
+#: faq.html.j2:108
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:116
+msgid ""
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
+msgstr ""
+
+#: faq.html.j2:117
+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 "
+"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>"
+msgstr ""
+
+#: faq.html.j2:127
+msgid ""
+"To whom would consumers complain to in case of non-conversion or non-"
+"compliance?"
+msgstr ""
+
+#: faq.html.j2:128
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:138
+msgid "Are there any projects already using Taler?"
+msgstr ""
+
+#: faq.html.j2:139
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:151
+msgid "Does Taler support recurring payments?"
+msgstr ""
+
+#: faq.html.j2:153
+msgid ""
+"<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>"
+msgstr ""
+
+#: features.html.j2:41
+msgid "Paying with Taler"
+msgstr "Pagare con Taler"
+
+#: features.html.j2:42
+#, 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> "
+
+#: features.html.j2:54
+msgid "Receiving payments with Taler"
+msgstr "Ricevere pagamenti con Taler"
+
+#: features.html.j2:55
+#, 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> "
+
+#: features.html.j2:74
+msgid "Practical"
+msgstr "Pratico"
+
+#: features.html.j2:77
+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 ""
+"Taler è facile da integrare con le applicazioni Web esistenti. I pagamenti "
+"sono protetti da crittografia e vengono confermati entro pochi millisecondi "
+"con costi di transazione estremamente bassi. "
+
+#: features.html.j2:87
+msgid "Stable"
+msgstr "Stabile"
+
+#: features.html.j2:90
+msgid ""
+"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."
+msgstr ""
+"Taler non introduce una nuova valuta. Taler utilizza un portafoglio digitale "
+"contenente monete e fornitori di servizi di pagamento con conti di deposito, "
+"in valute esistenti. Pertanto, le monete crittografate di Taler "
+"corrispondono a valute attuali, come i dollari USA, gli Euro o perfino i "
+"Bitcoins. "
+
+#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+msgid "Secure"
+msgstr "Sicuro"
+
+#: features.html.j2:104
+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 ""
+"Per via della sua progettazione, Taler non soffre di molti generi di "
+"problemi legati alla sicurezza come phishing o falsificazione. Grazie alle "
+"sue misure di sicurezza, Taler non respinge mai un cliente legittimo a causa "
+"di un falso positivo in intercettazione di frode. "
+
+#: features.html.j2:116 governments.html.j2:25
+msgid "Taxable"
+msgstr "Tassabile"
+
+#: features.html.j2:119
+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 ""
+"Quando si utilizza Taler, le entrate del commerciante sono trasparenti alle "
+"autorità di riscossione fiscale. A differenza dei contanti e della maggior "
+"parte delle valute digitali, Taler aiuta a prevenire il mercato nero. Taler "
+"non è adatto ad attività illegali. "
+
+#: features.html.j2:129
+msgid "Private"
+msgstr "Privato"
+
+#: features.html.j2:131
+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 ""
+"Quando paghi con Taler, la tua identità non deve essere rivelata. Proprio "
+"come i pagamenti in contanti, nessuno può tracciare come hai speso la tua "
+"moneta elettronica. Tuttavia, si ottiene una conferma di pagamento "
+"legalmentevalida. "
+
+#: features.html.j2:142 governments.html.j2:88
+#, fuzzy
+msgid "Libre"
+msgstr "Libero"
+
+#: features.html.j2:145
+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."
+msgstr ""
+"Taler fornisce protocolli e implementazioni di riferimento che in linea di "
+"principio permettono a chiunque di gestire la propria infrastruttura di "
+"pagamento, siano essi individui, organizzazioni o intere nazioni. Dal "
+"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
 msgid "Financial News"
 msgstr ""
@@ -1195,10 +1291,6 @@ msgstr ""
 "autorità di controllo di fiducia. Taler contribuisce alla sovranità digitale "
 "nella critica infrastruttura finanziaria. "
 
-#: governments.html.j2:25 index.html.j2:70
-msgid "Taxable"
-msgstr "Tassabile"
-
 #: governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
@@ -1269,11 +1361,6 @@ msgstr ""
 "conto di garanzia sia gestito onestamente. Ciò garantisce che il cambio non "
 "minacci l'economia per via fraudolenta. "
 
-#: governments.html.j2:88 index.html.j2:96
-#, fuzzy
-msgid "Libre"
-msgstr "Libero"
-
 #: governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
@@ -1557,155 +1644,6 @@ msgstr ""
 msgid "Screenshots"
 msgstr ""
 
-#: index.html.j2:6
-#, fuzzy
-#| msgid "GNU Taler Bibliography"
-msgid "GNU Taler logo"
-msgstr "Logo GNU Taler"
-
-#: index.html.j2:10
-msgid "One-Click Cash Payments!"
-msgstr "Pagamenti in contanti con un solo click! "
-
-#: index.html.j2:13
-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>."
-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>. "
-
-#: index.html.j2:28
-msgid "Practical"
-msgstr "Pratico"
-
-#: index.html.j2:31
-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 ""
-"Taler è facile da integrare con le applicazioni Web esistenti. I pagamenti "
-"sono protetti da crittografia e vengono confermati entro pochi millisecondi "
-"con costi di transazione estremamente bassi. "
-
-#: index.html.j2:44
-msgid ""
-"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."
-msgstr ""
-"Taler non introduce una nuova valuta. Taler utilizza un portafoglio digitale "
-"contenente monete e fornitori di servizi di pagamento con conti di deposito, "
-"in valute esistenti. Pertanto, le monete crittografate di Taler "
-"corrispondono a valute attuali, come i dollari USA, gli Euro o perfino i "
-"Bitcoins. "
-
-#: index.html.j2:58
-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 ""
-"Per via della sua progettazione, Taler non soffre di molti generi di "
-"problemi legati alla sicurezza come phishing o falsificazione. Grazie alle "
-"sue misure di sicurezza, Taler non respinge mai un cliente legittimo a causa "
-"di un falso positivo in intercettazione di frode. "
-
-#: index.html.j2:73
-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 ""
-"Quando si utilizza Taler, le entrate del commerciante sono trasparenti alle "
-"autorità di riscossione fiscale. A differenza dei contanti e della maggior "
-"parte delle valute digitali, Taler aiuta a prevenire il mercato nero. Taler "
-"non è adatto ad attività illegali. "
-
-#: index.html.j2:85
-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 ""
-"Quando paghi con Taler, la tua identità non deve essere rivelata. Proprio "
-"come i pagamenti in contanti, nessuno può tracciare come hai speso la tua "
-"moneta elettronica. Tuttavia, si ottiene una conferma di pagamento "
-"legalmentevalida. "
-
-#: index.html.j2:99
-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."
-msgstr ""
-"Taler fornisce protocolli e implementazioni di riferimento che in linea di "
-"principio permettono a chiunque di gestire la propria infrastruttura di "
-"pagamento, siano essi individui, organizzazioni o intere nazioni. Dal "
-"momento che l'implementazione di riferimento è un pacchetto <a href=\"http://";
-"wwww.gnu.org/\"GNU</a>, rimarrà sempre software libero. "
-
-#: index.html.j2:116
-msgid "Paying with Taler"
-msgstr "Pagare con Taler"
-
-#: index.html.j2:117
-#, 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>"
-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> "
-
-#: index.html.j2:128
-msgid "Receiving payments with Taler"
-msgstr "Ricevere pagamenti con Taler"
-
-#: index.html.j2:129
-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>"
-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> "
-
-#: index.html.j2:145
-msgid "Taler News"
-msgstr "Notizie su Taler"
-
 #: investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "Investi in Taler! "
@@ -1797,10 +1735,6 @@ msgstr ""
 msgid "The Business Case"
 msgstr "Il Caso Aziendale"
 
-#: investors.html.j2:88
-msgid "Download"
-msgstr "Scarica"
-
 #: investors.html.j2:91
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -2042,7 +1976,11 @@ msgstr ""
 "bonifici a set di transazioni commerciali, includendo i termini esatti di "
 "ogni contratto. "
 
-#: news.html.j2.inc:9
+#: merchants.html.j2:183
+msgid "customer perspective"
+msgstr ""
+
+#: news.html.j2:16
 msgid "More news"
 msgstr "Altre notizie"
 
@@ -2070,46 +2008,33 @@ msgstr "GNU Taler"
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "Tassabili Anonime Libere Elettroniche Riserve"
 
-#: common/footer.j2.inc:7
+#: common/footer.j2.inc:11
 msgid "About"
 msgstr "Chi siamo"
 
-#: common/footer.j2.inc:8
+#: common/footer.j2.inc:12
 msgid "Contact"
 msgstr "Contatti"
 
-#: common/footer.j2.inc:9
+#: common/footer.j2.inc:17
 msgid "For Investors"
 msgstr "Per gli investitori"
 
-#: common/footer.j2.inc:14 common/navigation.j2.inc:5
-msgid "Citizens"
-msgstr "Cittadini"
-
-#: common/footer.j2.inc:15 common/navigation.j2.inc:6
-#, fuzzy
-msgid "Merchants"
-msgstr "Commercianti"
-
-#: common/footer.j2.inc:16 common/navigation.j2.inc:7
-msgid "Governments"
-msgstr "Pubbliche Amministrazioni"
-
-#: common/footer.j2.inc:21
+#: common/footer.j2.inc:18
 msgid "Developer Resources"
 msgstr "Risorse per i programmatori"
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:12
+#: common/footer.j2.inc:23
 msgid "FAQ"
 msgstr "FAQ"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:16
+#: common/footer.j2.inc:24
 #, fuzzy
 #| msgid "GNU Taler Bibliography"
 msgid "Bibliography"
 msgstr "Bibliografia"
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:34
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
@@ -2117,31 +2042,260 @@ msgstr ""
 "Questa pagina è stata creata utilizzando solo <a href='https://www.gnu.";
 "org/'>Software Libero</a>. "
 
-#: common/navigation.j2.inc:9
-msgid "Resources"
-msgstr "Risorse"
+#: common/navigation.j2.inc:15
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:16
+msgid "Design"
+msgstr ""
+
+#: common/navigation.j2.inc:17
+msgid "Docs"
+msgstr ""
 
-#: common/navigation.j2.inc:11
+#: common/navigation.j2.inc:18
 #, fuzzy
-#| msgid "Taler System Architecture"
-msgid "System Architecture"
-msgstr "Architettura di sistema"
+#| msgid "The Team"
+msgid "Team"
+msgstr "La Squadra"
 
-#: common/navigation.j2.inc:13
-msgid "Glossary"
-msgstr "Glossario"
+#~ msgid "Citizens"
+#~ msgstr "Cittadini"
 
-#: common/navigation.j2.inc:14
-msgid "Developer Introduction"
-msgstr "Introduzione per i programmatori"
+#, fuzzy
+#~ msgid "Merchants"
+#~ msgstr "Commercianti"
 
-#: common/navigation.j2.inc:15
-msgid "Copyright for Contributors"
-msgstr "Diritti d'autore per i collaboratori"
+#~ msgid "Governments"
+#~ msgstr "Pubbliche Amministrazioni"
 
-#: common/navigation.j2.inc:17
-msgid "Gsoc 2018: Codeless Payments"
-msgstr ""
+#, 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>"
+#~ 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> "
+
+#~ 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>"
+#~ 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 ""
+#~ "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."
+
+#, 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"
+
+#, fuzzy
+#~| msgid "Taler System Architecture"
+#~ msgid "System Architecture"
+#~ msgstr "Architettura di sistema"
+
+#~ msgid "Glossary"
+#~ msgstr "Glossario"
+
+#~ msgid "Developer Introduction"
+#~ msgstr "Introduzione per i programmatori"
+
+#~ msgid "Copyright for Contributors"
+#~ msgstr "Diritti d'autore per i collaboratori"
+
+#, fuzzy
+#~| msgid "GNU Taler Bibliography"
+#~ msgid "GNU Taler logo"
+#~ msgstr "Logo GNU Taler"
+
+#~ msgid "Taler News"
+#~ msgstr "Notizie su Taler"
+
+#, 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"
diff --git a/locale/pt/LC_MESSAGES/messages.po 
b/locale/pt/LC_MESSAGES/messages.po
index e740846..a6afab1 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU taler master\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-01-16 23:15+0100\n"
+"POT-Creation-Date: 2019-06-25 21:47+0200\n"
 "PO-Revision-Date: 2018-01-28 15:27-0200\n"
 "Last-Translator: Rafael Fontenelle <address@hidden>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "Generated-By: Babel 2.5.3\n"
 
-#: about.html.j2:8
+#: about.html.j2:16
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
@@ -26,7 +26,7 @@ msgstr ""
 "Mantenedor do GNU. Pesquisador de segurança de rede &amp; privacidade. "
 "Arquiteto de software."
 
-#: about.html.j2:13
+#: about.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
@@ -34,64 +34,64 @@ msgstr ""
 "Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
 "diferentes indústrias, …."
 
-#: about.html.j2:20
+#: about.html.j2:28
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr "Criptografia aplicada. Contato para W3c &amp; Tor."
 
-#: about.html.j2:25
+#: about.html.j2:33
 msgid "Theoretical foundations."
 msgstr "Fundações teóricas."
 
-#: about.html.j2:30
+#: about.html.j2:38
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fundador do projeto GNU. Orientação ética e licenciamento."
 
-#: about.html.j2:37
+#: about.html.j2:45
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 "Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
 
-#: about.html.j2:42
+#: about.html.j2:50
 msgid "PhD Student, Inria.."
 msgstr "Estudante de PhD, Inria."
 
-#: about.html.j2:47
+#: about.html.j2:55
 msgid "Software engineer."
 msgstr "Engenheiro de software."
 
-#: about.html.j2:54
+#: about.html.j2:62
 msgid "Sustainable business development."
 msgstr "Desenvolvimento empresarial sustentável."
 
-#: about.html.j2:58
+#: about.html.j2:66
 msgid "Software engineer. Works on libebics."
 msgstr "Engenheiro de software. Funciona em libebics."
 
-#: about.html.j2:64 about.html.j2:68 about.html.j2:72
+#: about.html.j2:72 about.html.j2:76 about.html.j2:80
 msgid "Translator (Spanish)"
 msgstr "Tradutor (Espanhol)"
 
-#: about.html.j2:78 about.html.j2:82 about.html.j2:86
+#: about.html.j2:86 about.html.j2:90 about.html.j2:94
 msgid "Translator (Italian)"
 msgstr "Tradutor (Italiano)"
 
-#: about.html.j2:90
+#: about.html.j2:98
 msgid "Translator (German)"
 msgstr "Tradutor (Alemão)"
 
-#: about.html.j2:96
+#: about.html.j2:104
 msgid "Hardware security module"
 msgstr "Módulo de segurança de hardware"
 
-#: about.html.j2:100
+#: about.html.j2:108
 msgid "Risk management"
 msgstr "Gerenciamento de risco"
 
-#: about.html.j2:104
+#: about.html.j2:112
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudante PhD, Universidade Técnica de Munique. Atualmente lecionando."
 
-#: about.html.j2:110
+#: about.html.j2:118
 msgid "Software engineer. Works on Android wallet."
 msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
 
@@ -117,166 +117,6 @@ msgstr "e"
 msgid "available upon request"
 msgstr "disponível mediante solicitação"
 
-#: citizens.html.j2:5
-msgid "Advantages for Citizens"
-msgstr "Vantagens para cidadãos"
-
-#: citizens.html.j2:9
-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."
-
-#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
-#: merchants.html.j2:41
-msgid "Secure"
-msgstr "Seguro"
-
-#: citizens.html.j2:27
-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."
-
-#: citizens.html.j2:37 index.html.j2:83
-msgid "Private"
-msgstr "Privado"
-
-#: citizens.html.j2:39
-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."
-
-#: citizens.html.j2:50
-msgid "Convenient"
-msgstr "Conveniente"
-
-#: citizens.html.j2:52
-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."
-
-#: citizens.html.j2:61 index.html.j2:41
-msgid "Stable"
-msgstr "Estável"
-
-#: citizens.html.j2:63
-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."
-
-#: citizens.html.j2:79
-msgid "Wallet Browser Extension"
-msgstr "Extensão de carteira para navegador"
-
-#: citizens.html.j2:81
-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."
-
-#: citizens.html.j2:88
-msgid "Taler Demo"
-msgstr "Demonstração do Taler"
-
-#: citizens.html.j2:90
-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>."
-
-#: citizens.html.j2:103
-msgid "The Taler Wallet for customers"
-msgstr "A carteira do Taler para clientes"
-
-#: citizens.html.j2:105
-msgid "Customers interact with the Taler system using the Taler wallet:"
-msgstr "Os clientes interagem com o sistema Taler usando a carteira do Taler:"
-
-#: citizens.html.j2:110
-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."
-
-#: citizens.html.j2:118
-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."
-
-#: citizens.html.j2:125
-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."
-
-#: citizens.html.j2:137 merchants.html.j2:179
-msgid "customer perspective"
-msgstr "perspectiva do cliente"
-
 #: contact.html.j2:6
 msgid "Contact information"
 msgstr "Informações de contato"
@@ -515,11 +355,19 @@ msgstr ""
 "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:132
+#: developers.html.j2:131
+msgid "Technical Presentation"
+msgstr ""
+
+#: developers.html.j2:134 investors.html.j2:88
+msgid "Download"
+msgstr "Baixar"
+
+#: developers.html.j2:150
 msgid "Taler system overview"
 msgstr "Visão geral do sistema Taler"
 
-#: developers.html.j2:135
+#: developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -529,11 +377,11 @@ msgstr ""
 "ilustrado na ilustração à direita. As transações típicas envolvem as "
 "seguintes etapas:"
 
-#: developers.html.j2:142
+#: developers.html.j2:162
 msgid "system overview"
 msgstr "visão geral do sistema"
 
-#: developers.html.j2:145
+#: developers.html.j2:165
 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 "
@@ -545,7 +393,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:157
+#: developers.html.j2:177
 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 "
@@ -565,7 +413,7 @@ msgstr ""
 "moeda ou o valor total dos fundos (exceto as taxas que a bolsa pode cobrar "
 "pelo serviço)."
 
-#: developers.html.j2:175
+#: developers.html.j2:195
 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 "
@@ -591,7 +439,7 @@ msgstr ""
 "gastar qualquer fração de suas moedas digitais (o sistema cuida dos clientes "
 "obtendo troco)."
 
-#: developers.html.j2:197
+#: developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -616,7 +464,7 @@ msgstr ""
 "que o Estado imponha que os comerciantes paguem tributos aplicáveis (e não "
 "se envolvam em contratos ilegais)."
 
-#: developers.html.j2:220
+#: developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -631,7 +479,7 @@ msgstr ""
 "entre as transferências bancárias e as reivindicações individuais que foram "
 "depositadas."
 
-#: developers.html.j2:234
+#: developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -647,7 +495,7 @@ msgstr ""
 "câmbio e verificar se o saldo bancário corresponde ao valor total das moedas "
 "restantes em circulação."
 
-#: developers.html.j2:249
+#: developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -791,6 +639,266 @@ msgstr ""
 "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:77
+msgid "How much does it cost?"
+msgstr ""
+
+#: faq.html.j2:78
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:93
+msgid "Does Taler work with international payments?"
+msgstr ""
+
+#: faq.html.j2:94
+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>"
+msgstr ""
+
+#: faq.html.j2:107
+msgid "How does Taler relate to the (European) Electronic Money Directive?"
+msgstr ""
+
+#: faq.html.j2:108
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:116
+msgid ""
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
+msgstr ""
+
+#: faq.html.j2:117
+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 "
+"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>"
+msgstr ""
+
+#: faq.html.j2:127
+msgid ""
+"To whom would consumers complain to in case of non-conversion or non-"
+"compliance?"
+msgstr ""
+
+#: faq.html.j2:128
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:138
+msgid "Are there any projects already using Taler?"
+msgstr ""
+
+#: faq.html.j2:139
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:151
+msgid "Does Taler support recurring payments?"
+msgstr ""
+
+#: faq.html.j2:153
+msgid ""
+"<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>"
+msgstr ""
+
+#: features.html.j2:41
+msgid "Paying with Taler"
+msgstr "Pagando com o Taler"
+
+#: features.html.j2:42
+#, 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>"
+
+#: features.html.j2:54
+msgid "Receiving payments with Taler"
+msgstr "Recebendo pagamentos com o Taler"
+
+#: features.html.j2:55
+#, 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>"
+
+#: features.html.j2:74
+msgid "Practical"
+msgstr "Prático"
+
+#: features.html.j2:77
+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 ""
+"O Taler é fácil de integrar com os aplicativos web existentes. Os pagamentos "
+"são protegidos criptograficamente e são confirmados em milissegundos com "
+"custos de transação extremamente baixos."
+
+#: features.html.j2:87
+msgid "Stable"
+msgstr "Estável"
+
+#: features.html.j2:90
+msgid ""
+"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."
+msgstr ""
+"O Taler não introduz uma nova moeda. A Taler usa uma carteira digital que "
+"armazena moedas e prestadores de serviços de pagamento com contas de "
+"custódia em moedas existentes. Assim, as moedas criptográficas do Taler "
+"correspondem às moedas existentes, como Dólares dos EUA, Euros ou até "
+"Bitcoins."
+
+#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+msgid "Secure"
+msgstr "Seguro"
+
+#: features.html.j2:104
+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 ""
+"Por design, o Taler não sofre de muitas classes de problemas de segurança, "
+"como phishing ou falsificação. Graças às suas características de segurança, "
+"o Taler nunca rejeita um cliente legítimo devido a um falso positivo de "
+"detecção de fraude."
+
+#: features.html.j2:116 governments.html.j2:25
+msgid "Taxable"
+msgstr "Tributável"
+
+#: features.html.j2:119
+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 ""
+"Ao usar o Taler, a receita do comerciante é transparente para as autoridades "
+"de cobrança de tributos. Ao contrário do dinheiro e da maioria das moedas "
+"digitais, o Taler ajuda a evitar os mercados negros. O Taler não é adequado "
+"para atividades ilegais."
+
+#: features.html.j2:129
+msgid "Private"
+msgstr "Privado"
+
+#: features.html.j2:131
+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 ""
+"Quando você paga com o Taler, sua identidade não precisa ser revelada. Assim "
+"como pagamentos em dinheiro, ninguém mais pode acompanhar a forma como "
+"gastou seu dinheiro eletrônico. No entanto, você obtém uma prova de "
+"pagamento legalmente válida."
+
+#: features.html.j2:142 governments.html.j2:88
+msgid "Libre"
+msgstr "Livre"
+
+#: features.html.j2:145
+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."
+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, "
+"seja indivíduos, organizações ou países inteiros. Uma vez que a "
+"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
 msgid "Financial News"
 msgstr "Notícias financeiras"
@@ -1159,10 +1267,6 @@ msgstr ""
 "estrutura financeira e agem como reguladores confiáveis. O Taler contribui "
 "para a soberania digital na infraestrutura financeira crítica."
 
-#: governments.html.j2:25 index.html.j2:70
-msgid "Taxable"
-msgstr "Tributável"
-
 #: governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
@@ -1231,10 +1335,6 @@ msgstr ""
 "de depósito seja gerenciada com honestidade. Isso garante que o câmbio não "
 "ameace a economia devido à fraude."
 
-#: governments.html.j2:88 index.html.j2:96
-msgid "Libre"
-msgstr "Livre"
-
 #: governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
@@ -1516,144 +1616,6 @@ msgstr ""
 msgid "Screenshots"
 msgstr ""
 
-#: index.html.j2:6
-msgid "GNU Taler logo"
-msgstr "Logo do GNU Taler"
-
-#: index.html.j2:10
-msgid "One-Click Cash Payments!"
-msgstr "Pagamentos em dinheiro<br/>com um clique!"
-
-#: index.html.j2:13
-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>."
-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>."
-
-#: index.html.j2:28
-msgid "Practical"
-msgstr "Prático"
-
-#: index.html.j2:31
-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 ""
-"O Taler é fácil de integrar com os aplicativos web existentes. Os pagamentos "
-"são protegidos criptograficamente e são confirmados em milissegundos com "
-"custos de transação extremamente baixos."
-
-#: index.html.j2:44
-msgid ""
-"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."
-msgstr ""
-"O Taler não introduz uma nova moeda. A Taler usa uma carteira digital que "
-"armazena moedas e prestadores de serviços de pagamento com contas de "
-"custódia em moedas existentes. Assim, as moedas criptográficas do Taler "
-"correspondem às moedas existentes, como Dólares dos EUA, Euros ou até "
-"Bitcoins."
-
-#: index.html.j2:58
-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 ""
-"Por design, o Taler não sofre de muitas classes de problemas de segurança, "
-"como phishing ou falsificação. Graças às suas características de segurança, "
-"o Taler nunca rejeita um cliente legítimo devido a um falso positivo de "
-"detecção de fraude."
-
-#: index.html.j2:73
-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 ""
-"Ao usar o Taler, a receita do comerciante é transparente para as autoridades "
-"de cobrança de tributos. Ao contrário do dinheiro e da maioria das moedas "
-"digitais, o Taler ajuda a evitar os mercados negros. O Taler não é adequado "
-"para atividades ilegais."
-
-#: index.html.j2:85
-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 ""
-"Quando você paga com o Taler, sua identidade não precisa ser revelada. Assim "
-"como pagamentos em dinheiro, ninguém mais pode acompanhar a forma como "
-"gastou seu dinheiro eletrônico. No entanto, você obtém uma prova de "
-"pagamento legalmente válida."
-
-#: index.html.j2:99
-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."
-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, "
-"seja indivíduos, organizações ou países inteiros. Uma vez que a "
-"implementação de referência é um pacote <a href=\"http://www.gnu.org/\";>GNU</"
-"a>, ele sempre permanecerá como software livre."
-
-#: index.html.j2:116
-msgid "Paying with Taler"
-msgstr "Pagando com o Taler"
-
-#: index.html.j2:117
-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>"
-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>"
-
-#: index.html.j2:128
-msgid "Receiving payments with Taler"
-msgstr "Recebendo pagamentos com o Taler"
-
-#: index.html.j2:129
-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>"
-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>"
-
-#: index.html.j2:145
-msgid "Taler News"
-msgstr "Notícias do Taler"
-
 #: investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr "Invista no Taler!"
@@ -1742,10 +1704,6 @@ msgstr ""
 msgid "The Business Case"
 msgstr "O caso de negócio"
 
-#: investors.html.j2:88
-msgid "Download"
-msgstr "Baixar"
-
 #: investors.html.j2:91
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1976,7 +1934,11 @@ msgstr ""
 "transferências eletrônicas para conjuntos de transações comerciais, "
 "incluindo os termos exatos de cada contrato."
 
-#: news.html.j2.inc:9
+#: merchants.html.j2:183
+msgid "customer perspective"
+msgstr "perspectiva do cliente"
+
+#: news.html.j2:16
 msgid "More news"
 msgstr "Mais notícias"
 
@@ -2004,43 +1966,31 @@ msgstr "GNU Taler"
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "Reservas eletrônicas livres, anônimas, tributáveis"
 
-#: common/footer.j2.inc:7
+#: common/footer.j2.inc:11
 msgid "About"
 msgstr "Sobre"
 
-#: common/footer.j2.inc:8
+#: common/footer.j2.inc:12
 msgid "Contact"
 msgstr "Contato"
 
-#: common/footer.j2.inc:9
+#: common/footer.j2.inc:17
 msgid "For Investors"
 msgstr "Para investidores"
 
-#: common/footer.j2.inc:14 common/navigation.j2.inc:5
-msgid "Citizens"
-msgstr "Cidadãos"
-
-#: common/footer.j2.inc:15 common/navigation.j2.inc:6
-msgid "Merchants"
-msgstr "Comerciantes"
-
-#: common/footer.j2.inc:16 common/navigation.j2.inc:7
-msgid "Governments"
-msgstr "Governos"
-
-#: common/footer.j2.inc:21
+#: common/footer.j2.inc:18
 msgid "Developer Resources"
 msgstr "Recursos para desenvolvedores"
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:12
+#: common/footer.j2.inc:23
 msgid "FAQ"
 msgstr "FAQ"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:16
+#: common/footer.j2.inc:24
 msgid "Bibliography"
 msgstr "Bibliografia"
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:34
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
@@ -2048,29 +1998,236 @@ msgstr ""
 "Essa página foi criada usando apenas <a href='https://www.gnu.org/'>software "
 "livre</a>."
 
-#: common/navigation.j2.inc:9
-msgid "Resources"
-msgstr "Recursos"
+#: common/navigation.j2.inc:15
+msgid "Features"
+msgstr ""
+
+#: common/navigation.j2.inc:16
+msgid "Design"
+msgstr ""
+
+#: common/navigation.j2.inc:17
+msgid "Docs"
+msgstr ""
 
-#: common/navigation.j2.inc:11
-msgid "System Architecture"
-msgstr "Arquitetura do sistema"
+#: common/navigation.j2.inc:18
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "A equipe"
 
-#: common/navigation.j2.inc:13
-msgid "Glossary"
-msgstr "Glossário"
+#~ msgid "Citizens"
+#~ msgstr "Cidadãos"
 
-#: common/navigation.j2.inc:14
-msgid "Developer Introduction"
-msgstr "Introdução para desenvolvedores"
+#~ msgid "Merchants"
+#~ msgstr "Comerciantes"
 
-#: common/navigation.j2.inc:15
-msgid "Copyright for Contributors"
-msgstr "Direitos autorais para contribuidores"
+#~ msgid "Governments"
+#~ msgstr "Governos"
 
-#: common/navigation.j2.inc:17
-msgid "Gsoc 2018: Codeless Payments"
-msgstr ""
+#~ 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>"
+#~ 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>"
+
+#~ 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>"
+#~ 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 ""
+#~ "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"
+
+#, 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"
diff --git a/locale/ru/LC_MESSAGES/messages.po 
b/locale/ru/LC_MESSAGES/messages.po
index 82dea62..52b3d6d 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-01-16 23:15+0100\n"
+"POT-Creation-Date: 2019-06-25 21:47+0200\n"
 "PO-Revision-Date: 2017-12-29 11:14+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ru <address@hidden>\n"
@@ -19,75 +19,75 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: about.html.j2:8
+#: about.html.j2:16
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
 
-#: about.html.j2:13
+#: about.html.j2:21
 msgid ""
 "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
 "industries, …."
 msgstr ""
 
-#: about.html.j2:20
+#: about.html.j2:28
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr ""
 
-#: about.html.j2:25
+#: about.html.j2:33
 msgid "Theoretical foundations."
 msgstr ""
 
-#: about.html.j2:30
+#: about.html.j2:38
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
-#: about.html.j2:37
+#: about.html.j2:45
 msgid "PhD Student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:42
+#: about.html.j2:50
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:47
+#: about.html.j2:55
 msgid "Software engineer."
 msgstr ""
 
-#: about.html.j2:54
+#: about.html.j2:62
 msgid "Sustainable business development."
 msgstr ""
 
-#: about.html.j2:58
+#: about.html.j2:66
 msgid "Software engineer. Works on libebics."
 msgstr ""
 
-#: about.html.j2:64 about.html.j2:68 about.html.j2:72
+#: about.html.j2:72 about.html.j2:76 about.html.j2:80
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: about.html.j2:78 about.html.j2:82 about.html.j2:86
+#: about.html.j2:86 about.html.j2:90 about.html.j2:94
 msgid "Translator (Italian)"
 msgstr ""
 
-#: about.html.j2:90
+#: about.html.j2:98
 msgid "Translator (German)"
 msgstr ""
 
-#: about.html.j2:96
+#: about.html.j2:104
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:100
+#: about.html.j2:108
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:104
+#: about.html.j2:112
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:110
+#: about.html.j2:118
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
@@ -113,125 +113,6 @@ msgstr ""
 msgid "available upon request"
 msgstr ""
 
-#: citizens.html.j2:5
-msgid "Advantages for Citizens"
-msgstr ""
-
-#: citizens.html.j2:9
-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 ""
-
-#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
-#: merchants.html.j2:41
-msgid "Secure"
-msgstr ""
-
-#: citizens.html.j2:27
-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 ""
-
-#: citizens.html.j2:37 index.html.j2:83
-msgid "Private"
-msgstr ""
-
-#: citizens.html.j2:39
-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 ""
-
-#: citizens.html.j2:50
-msgid "Convenient"
-msgstr ""
-
-#: citizens.html.j2:52
-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 ""
-
-#: citizens.html.j2:61 index.html.j2:41
-msgid "Stable"
-msgstr ""
-
-#: citizens.html.j2:63
-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 ""
-
-#: citizens.html.j2:79
-msgid "Wallet Browser Extension"
-msgstr ""
-
-#: citizens.html.j2:81
-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 ""
-
-#: citizens.html.j2:88
-msgid "Taler Demo"
-msgstr ""
-
-#: citizens.html.j2:90
-msgid ""
-"You can see how Taler works in practice by visiting our <a href=\"https://";
-"demo.taler.net\">demo page</a>."
-msgstr ""
-
-#: citizens.html.j2:103
-msgid "The Taler Wallet for customers"
-msgstr ""
-
-#: citizens.html.j2:105
-msgid "Customers interact with the Taler system using the Taler wallet:"
-msgstr ""
-
-#: citizens.html.j2:110
-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 ""
-
-#: citizens.html.j2:118
-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 ""
-
-#: citizens.html.j2:125
-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 ""
-
-#: citizens.html.j2:137 merchants.html.j2:179
-msgid "customer perspective"
-msgstr ""
-
 #: contact.html.j2:6
 msgid "Contact information"
 msgstr ""
@@ -405,22 +286,30 @@ msgid ""
 "\"https://lcov.taler.net/\";>lcov.taler.net</a>."
 msgstr ""
 
-#: developers.html.j2:132
+#: developers.html.j2:131
+msgid "Technical Presentation"
+msgstr ""
+
+#: developers.html.j2:134 investors.html.j2:88
+msgid "Download"
+msgstr ""
+
+#: developers.html.j2:150
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:135
+#: developers.html.j2:155
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
 "the following steps:"
 msgstr ""
 
-#: developers.html.j2:142
+#: developers.html.j2:162
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:145
+#: developers.html.j2:165
 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 "
@@ -428,7 +317,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:157
+#: developers.html.j2:177
 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 "
@@ -440,7 +329,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:175
+#: developers.html.j2:195
 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 "
@@ -455,7 +344,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:197
+#: developers.html.j2:217
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -469,7 +358,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:220
+#: developers.html.j2:240
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -478,7 +367,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:234
+#: developers.html.j2:254
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -488,7 +377,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:249
+#: developers.html.j2:269
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -597,6 +486,215 @@ msgid ""
 "knowing which coin it signed for which customer.</p>"
 msgstr ""
 
+#: faq.html.j2:77
+msgid "How much does it cost?"
+msgstr ""
+
+#: faq.html.j2:78
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:93
+msgid "Does Taler work with international payments?"
+msgstr ""
+
+#: faq.html.j2:94
+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>"
+msgstr ""
+
+#: faq.html.j2:107
+msgid "How does Taler relate to the (European) Electronic Money Directive?"
+msgstr ""
+
+#: faq.html.j2:108
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:116
+msgid ""
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
+msgstr ""
+
+#: faq.html.j2:117
+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 "
+"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>"
+msgstr ""
+
+#: faq.html.j2:127
+msgid ""
+"To whom would consumers complain to in case of non-conversion or non-"
+"compliance?"
+msgstr ""
+
+#: faq.html.j2:128
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:138
+msgid "Are there any projects already using Taler?"
+msgstr ""
+
+#: faq.html.j2:139
+msgid ""
+"<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>"
+msgstr ""
+
+#: faq.html.j2:151
+msgid "Does Taler support recurring payments?"
+msgstr ""
+
+#: faq.html.j2:153
+msgid ""
+"<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>"
+msgstr ""
+
+#: features.html.j2:41
+msgid "Paying with Taler"
+msgstr ""
+
+#: features.html.j2:42
+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 ""
+
+#: features.html.j2:54
+msgid "Receiving payments with Taler"
+msgstr ""
+
+#: features.html.j2:55
+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 ""
+
+#: features.html.j2:74
+msgid "Practical"
+msgstr ""
+
+#: features.html.j2:77
+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:87
+msgid "Stable"
+msgstr ""
+
+#: features.html.j2:90
+msgid ""
+"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."
+msgstr ""
+
+#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+msgid "Secure"
+msgstr ""
+
+#: features.html.j2:104
+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:116 governments.html.j2:25
+msgid "Taxable"
+msgstr ""
+
+#: features.html.j2:119
+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:129
+msgid "Private"
+msgstr ""
+
+#: features.html.j2:131
+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:142 governments.html.j2:88
+msgid "Libre"
+msgstr ""
+
+#: features.html.j2:145
+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."
+msgstr ""
+
 #: financial-news.html.j2:6
 msgid "Financial News"
 msgstr ""
@@ -903,10 +1001,6 @@ msgid ""
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
-#: governments.html.j2:25 index.html.j2:70
-msgid "Taxable"
-msgstr ""
-
 #: governments.html.j2:28
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
@@ -948,10 +1042,6 @@ msgid ""
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:88 index.html.j2:96
-msgid "Libre"
-msgstr ""
-
 #: governments.html.j2:91
 msgid ""
 "Taler is free software implementing an open protocol standard. Thus, Taler "
@@ -1201,103 +1291,6 @@ msgstr ""
 msgid "Screenshots"
 msgstr ""
 
-#: index.html.j2:6
-msgid "GNU Taler logo"
-msgstr ""
-
-#: index.html.j2:10
-msgid "One-Click Cash Payments!"
-msgstr ""
-
-#: index.html.j2:13
-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>."
-msgstr ""
-
-#: index.html.j2:28
-msgid "Practical"
-msgstr ""
-
-#: index.html.j2:31
-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 ""
-
-#: index.html.j2:44
-msgid ""
-"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."
-msgstr ""
-
-#: index.html.j2:58
-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 ""
-
-#: index.html.j2:73
-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 ""
-
-#: index.html.j2:85
-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 ""
-
-#: index.html.j2:99
-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."
-msgstr ""
-
-#: index.html.j2:116
-msgid "Paying with Taler"
-msgstr ""
-
-#: index.html.j2:117
-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>"
-msgstr ""
-
-#: index.html.j2:128
-msgid "Receiving payments with Taler"
-msgstr ""
-
-#: index.html.j2:129
-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>"
-msgstr ""
-
-#: index.html.j2:145
-msgid "Taler News"
-msgstr ""
-
 #: investors.html.j2:6
 msgid "Invest in Taler!"
 msgstr ""
@@ -1362,10 +1355,6 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
-#: investors.html.j2:88
-msgid "Download"
-msgstr ""
-
 #: investors.html.j2:91
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1537,7 +1526,11 @@ msgid ""
 "each contract."
 msgstr ""
 
-#: news.html.j2.inc:9
+#: merchants.html.j2:183
+msgid "customer perspective"
+msgstr ""
+
+#: news.html.j2:16
 msgid "More news"
 msgstr ""
 
@@ -1565,68 +1558,48 @@ msgstr ""
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
 
-#: common/footer.j2.inc:7
+#: common/footer.j2.inc:11
 msgid "About"
 msgstr ""
 
-#: common/footer.j2.inc:8
+#: common/footer.j2.inc:12
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:9
+#: common/footer.j2.inc:17
 msgid "For Investors"
 msgstr ""
 
-#: common/footer.j2.inc:14 common/navigation.j2.inc:5
-msgid "Citizens"
-msgstr ""
-
-#: common/footer.j2.inc:15 common/navigation.j2.inc:6
-msgid "Merchants"
-msgstr ""
-
-#: common/footer.j2.inc:16 common/navigation.j2.inc:7
-msgid "Governments"
-msgstr ""
-
-#: common/footer.j2.inc:21
+#: common/footer.j2.inc:18
 msgid "Developer Resources"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:12
+#: common/footer.j2.inc:23
 msgid "FAQ"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:16
+#: common/footer.j2.inc:24
 msgid "Bibliography"
 msgstr ""
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:34
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:9
-msgid "Resources"
-msgstr ""
-
-#: common/navigation.j2.inc:11
-msgid "System Architecture"
-msgstr ""
-
-#: common/navigation.j2.inc:13
-msgid "Glossary"
+#: common/navigation.j2.inc:15
+msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:14
-msgid "Developer Introduction"
+#: common/navigation.j2.inc:16
+msgid "Design"
 msgstr ""
 
-#: common/navigation.j2.inc:15
-msgid "Copyright for Contributors"
+#: common/navigation.j2.inc:17
+msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:17
-msgid "Gsoc 2018: Codeless Payments"
+#: common/navigation.j2.inc:18
+msgid "Team"
 msgstr ""
diff --git a/news.html.j2.inc b/news.html.j2
similarity index 63%
rename from news.html.j2.inc
rename to news.html.j2
index 8650fe1..8984afa 100644
--- a/news.html.j2.inc
+++ b/news.html.j2
@@ -1,3 +1,10 @@
+{% 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" #}
@@ -7,3 +14,9 @@
 {% include "news/2017-01.inc" %}
 
 <a href="old-news.html"><h3>{{ _("More news")}}</h3></a>
+  </div>
+
+</div>
+
+
+{% endblock body_content %}
diff --git a/styles.css b/styles.css
index 7664838..d0d424d 100644
--- a/styles.css
+++ b/styles.css
@@ -1,8 +1,3 @@
-body .jumbotron {
-  background-color: white;
-}
-
-
 .lang-slector {
        float: right;
        padding-top: 2mm;
@@ -20,38 +15,27 @@ ul nav {
     border-radius: 0px;
 }
 
-a nav active {
-    background-color: black;
-    color: white;
-}
-
 .c_acronym {
   background-color: #A5C663;
 }
 
 
-#body_content a,
-#body_content a:link,
-#body_content a:visited {
+a,
+a:link,
+a:visited {
     text-decoration: underline;
     color: black;
 }
 
-#body_content a:hover {
-  transition: background-color 0.3s;
-  background-color: rgba(200, 200, 200, 0.5);
+nav a,
+nav a:link,
+nav a:visited {
+    text-decoration: none;
 }
 
-footer a,
-footer a:link,
-footer a:visited {
-    text-decoration: underline;
-    color: white;
-}
-
-footer a:hover {
+#body_content a:hover {
   transition: background-color 0.3s;
-  background-color: rgba(100, 100, 100, 0.5);
+  background-color: rgba(200, 200, 200, 0.5);
 }
 
 .c_intro {
@@ -73,6 +57,18 @@ footer a:hover {
 #mybody {
   /* override ugly bootstrap defaults */
   color: black;
+  position: relative;
+  min-height: 100%;
+}
+
+#body_content {
+  height: 100%;
+}
+
+footer {
+  position: relative;
+  bottom: 0;
+  height: 340px;
 }
 
 .btn-dark {
@@ -87,8 +83,6 @@ footer a:hover {
 footer {
   padding-top: 2em;
   margin-top: 2em;
-  background-color: #222;
-  color: white;
 }
 
 
@@ -140,3 +134,34 @@ footer {
   -webkit-filter: invert(100%);
   filter: invert(100%);
 }
+
+
+.checkmark {
+  height: 1em;
+  margin-right: 0.3em;
+  vertical-align: baseline;
+  position: relative;
+  top: 0.2em;
+}
+
+.checklist {
+  list-style-type: none;
+  padding-left: 0px;
+}
+
+.tlr {
+  display: inline-block;
+  position: relative;
+}
+
+.tlr::before {
+  content: "";
+  position: absolute;
+  width: 100%;
+  height: 25%;
+  bottom: 0;
+  left: 0.2em;
+  background: rgba(170, 57, 57, 0.3);
+  z-index: -1;
+}
+
diff --git a/web-common b/web-common
index dc9d5ab..caf5a98 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bfb
+Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c

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



reply via email to

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