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 (c78e327 -> 38ae181)


From: gnunet
Subject: [GNUnet-SVN] [taler-www] branch stable updated (c78e327 -> 38ae181)
Date: Thu, 29 Aug 2019 15:24:33 +0200

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

dold pushed a change to branch stable
in repository www.

    from c78e327  fix floatings
     add 348648c  fix translation markup
     new 38ae181  docs

The 1 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:
 common/navigation.j2.inc          |   2 +-
 docs.html.j2                      | 111 +++---
 features.html.j2                  |  75 +++-
 gsoc-codeless.html.j2             |  16 +-
 locale/de/LC_MESSAGES/messages.po | 717 +++++++++++++++++++++++++++----------
 locale/en/LC_MESSAGES/messages.po | 604 ++++++++++++++++++++++---------
 locale/es/LC_MESSAGES/messages.po | 716 +++++++++++++++++++++++++++----------
 locale/fr/LC_MESSAGES/messages.po | 638 ++++++++++++++++++++++++---------
 locale/it/LC_MESSAGES/messages.po | 728 +++++++++++++++++++++++++++-----------
 locale/pt/LC_MESSAGES/messages.po | 726 +++++++++++++++++++++++++++----------
 locale/ru/LC_MESSAGES/messages.po | 604 ++++++++++++++++++++++---------
 principles.html.j2                | 107 ++++--
 12 files changed, 3655 insertions(+), 1389 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 79716df..4d870dc 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -14,7 +14,7 @@
       <li class="{{ 'active' if filename == 'index.html' else '' }}"><a 
class="navbar-brand taler_home" href="https://taler.net/{{ lang 
}}/index.html">Taler</a></li>
       <li class="nav-item {{ 'active' if filename == 'features.html' else '' 
}}"><a class="nav-link" href="https://taler.net/{{ lang }}/features.html">{{ 
_("Features") }} </a></li>
       <li class="nav-item {{ 'active' if filename == 'principles.html' else '' 
}}"><a class="nav-link" href="https://taler.net/{{ lang }}/principles.html">{{ 
_("Principles") }} </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 == 'docs.html' else '' 
}}"><a class="nav-link" href="https://taler.net/{{ lang }}/docs.html">{{ 
_("Docs") }} </a></li>
       <li class="nav-item {{ 'active' if filename == 'team.html' else '' 
}}"><a class="nav-link" href="team.html">{{ _("Team") }}</a></li>
     </ul>
     <ul class="navbar-nav navbar-right">
diff --git a/docs.html.j2 b/docs.html.j2
index 8996693..2e541cf 100644
--- a/docs.html.j2
+++ b/docs.html.j2
@@ -2,6 +2,21 @@
 {% block body_content %}
 
 <div class="container">
+  <div class="row">
+    <div class="col">
+    <h1>GNU Taler: Documentation and Resources</h1>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col">
+    This is an overview of documentation and other resources for GNU Taler.  
The full documentation
+    contents can be found <a href="https://docs.taler.net/";>here</a>.
+    </div>
+  </div>
+
+  <div class="row mt-5">
+  </div>
 
 
   <div class="row justify-content-center text-center">
@@ -14,73 +29,63 @@
   </div>
 
   <div class="row">
-    <div class="col">
-      <a href="https://{{ docshost }}/merchant/backend/html/manual.html">
+    <div class="col-3">
+      <a href="https://{{ docshost }}/taler-merchant-manual.html">
       <img src="../icons/icon-backend.svg" height=60>
       <h3>Merchant Backend Administration</h3>
       </a>
       {{ _("Tutorial and manual for operating a merchant") }}.
-      {{ _("Also available as") }} <a href="https://{{ docshost 
}}/merchant/backend/pdf/manual.pdf">PDF</a>.
+      {{ _("Also available as") }} <a href="https://{{ docshost 
}}/taler-merchant-manual.pdf">PDF</a>.
     </div>
 
-    <div class="col">
-      <a href="https://{{ docshost 
}}/merchant/backend/html/merchant-api-curl.html">
+    <div class="col-3">
+      <a href="https://{{ docshost }}/taler-merchant-api-tutorial.html">
       <img src="../icons/icon-market.svg" height=60>
-      <h3>{{ _("Merchant API Tutorial (Command Line)") }}</h3>
+      <h3>{{ _("Merchant API Tutorial") }}</h3>
       </a>
       {% trans %}
-      Tutorial for processing Taler payments using the merchant backend's API, 
with command line (and cURL) examples.
+      Tutorial for processing Taler payments using the merchant backend API.
       Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/merchant/backend/pdf/merchant-api-curl.pdf">PDF</a>.
+      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
     </div>
 
-    <div class="col">
-      <a href="https://{{ docshost 
}}/merchant/backend/html/merchant-api-python.html">
-      <img src="../icons/icon-market.svg" height=60>
-      <h3>Merchant API Tutorial (Python)</h3>
-      </a>
-      {% trans %}
-      Tutorial for processing Taler payments using the merchant backend's API, 
with Python 3 examples.
-      Also available as 
-      {% endtrans %} <a href="https://{{ docshost 
}}/merchant/backend/pdf/merchant-api-python.pdf">PDF</a>.
-    </div>
-  </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row">
-    <div class="col">
-      <a href="https://{{ docshost }}/exchange/html/taler-exchange.html">
+    <div class="col-3">
+      <a href="https://{{ docshost }}/taler-exchange-manual.html">
       <img src="../icons/icon-exchange.svg" height=60>
       <h3>Exchange</h3>
       </a>
       {% trans %}
       Operator's manual for the GNU Taler exchange.
       Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/exchange/pdf/taler-exchange.pdf">PDF</a>.
+      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-exchange-manual.pdf">PDF</a>.
     </div>
 
-    <div class="col">
-      <a href="https://{{ docshost }}/bank/html/taler-bank.html">
+    <div class="col-3">
+      <a href="https://{{ docshost }}/taler-bank-manual.html">
       <img src="../icons/icon-bank.svg" height=60>
       <h3>{{ _("Bank Integration") }}</h3>
       </a>
       {% trans %}
       Manual for tightly integrating Taler with banking applications.
       Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/bank/pdf/taler-bank.pdf">PDF</a>.
+      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-bank-manual.pdf">PDF</a>.
     </div>
+  </div>
 
-    <div class="col">
-      <a href="https://{{ docshost }}/backoffice/html/manual.html">
+  <div class="row mt-5">
+  </div>
+
+  <div class="row">
+
+    <div class="col-3">
+      <a href="https://{{ docshost }}/taler-backoffice-manual.html">
       <img src="../icons/icon-backoffice.svg" height=60>
       <h3>{{ _("Back office") }}</h3>
       </a>
       {% trans %}
       Manual to run the back-office Web application.
       Also available as
-      {% endtrans %} <a href="https://{{ docshost 
}}/backoffice/pdf/manual.pdf">PDF</a>.
+      {% endtrans %} <a href="https://{{ docshost 
}}/pdf/taler-backoffice-manual.pdf">PDF</a>.
     </div>
   </div>
 
@@ -97,16 +102,16 @@
   </div>
 
   <div class="row">
-    <div class="col">
-      <a href="https://{{ docshost }}/api/index.html">
+    <div class="col-3">
+      <a href="https://{{ docshost }}/core/index.html">
       <img src="../icons/icon-api.svg" height=60>
       <h3>HTTP API</h3>
       </a>
       {{ _("Reference for the HTTP-based API for Taler components.") }}
       </div>
 
-    <div class="col">
-      <a href="https://{{ docshost }}/onboarding/html/onboarding.html">
+    <div class="col-3">
+      <a href="https://{{ docshost }}/onboarding.html">
         <img src="../icons/icon-developers.svg" height=60>
         <h3>Onboarding</h3>
       </a>
@@ -131,7 +136,7 @@
   </div>
 
   <div class="row">
-    <div class="col">
+    <div class="col-3">
       <a href="https://lists.gnu.org/mailman/listinfo/taler";>
         <img src="../icons/icon-share.svg" height=60>
         <h3>Mailing List</h3>
@@ -139,7 +144,7 @@
       {{ _("The official GNU Taler mailing list.") }}
     </div>
 
-    <div class="col">
+    <div class="col-3">
       <a href="https://webchat.freenode.net/?channels=taler";>
         <img src="../icons/icon-share.svg" height=60>
         <h3>IRC</h3>
@@ -147,7 +152,7 @@
       {{ _("Our IRC channel is #taler on freenode.") }}
     </div>
 
-    <div class="col">
+    <div class="col-3">
       <a href="https://gnunet.org/bugs/";>
         <img src="../icons/icon-share.svg" height=60>
         <h3>Bug Tracker</h3>
@@ -171,31 +176,7 @@
 
   <div class="row">
 
-    <div class="col">
-      <a href="https://{{ docshost }}/code/exchange/index.html">
-        <img src="../icons/icon-code.svg" height=60>
-        <h3>{{ _("Code (Exchange)") }}</h3>
-      </a>
-      {{ _("Documented source code (with Doxygen) for the exchange.") }}
-    </div>
-
-    <div class="col">
-      <a href="https://{{ docshost }}/code/merchant/index.html">
-        <img src="../icons/icon-code.svg" height=60>
-        <h3>{{ _("Code (Merchant backend)") }}</h3>
-      </a>
-      {{ _("Documented source code (with Doxygen) for the merchant.") }}
-    </div>
-
-    <div class="col">
-      <a>
-      <img src="../icons/icon-code.svg" height=60>
-        <h3>Code (Wallet)</h3>
-      </a>
-      {{ _("TBD: Documented source code (with TypeDoc) for the wallet.") }}
-    </div>
-
-    <div class="col">
+    <div class="col-3">
       <a href="https://git.taler.net";>
         <img src="../icons/icon-code.svg" height=60>
         <h3>{{ _("Git repositories") }}</h3>
diff --git a/features.html.j2 b/features.html.j2
index 5be9b6a..5d94cb1 100644
--- a/features.html.j2
+++ b/features.html.j2
@@ -11,21 +11,40 @@
   <div class="row">
     <div class="col">
 
-      <p>GNU Taler is a <span class="tlr">privacy-preserving</span> payment 
system.  Customers can stay
+      <p>
+      {% trans %}
+      GNU Taler is a <span class="tlr">privacy-preserving</span> payment 
system.  Customers can stay
 anonymous, but merchants can not hide their income through payments with GNU 
Taler.
-This helps to <span class="tlr">avoid tax evasion and money 
laundering</span>.</p>
+This helps to <span class="tlr">avoid tax evasion and money laundering</span>.
+       {% endtrans %}
+    </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>
+       {% trans %}
+       The primary use case of GNU Taler is <span class="tlr">payments</span>; 
it is <span class="tlr">not meant as a
+store</span> of value.  Payments are always backed by an existing currency. 
+       {% endtrans %}
+    </p>
 
-    <p>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>
+       {% trans %}
+       Payment are made after <span class="tlr">exchanging existing 
money</span> into <em>electronic money</em> with the help of
+       an Exchange service, that is, a payment service provider for Taler.
+      {% endtrans %}
+    </p>
 
-    <p>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>
+       {% trans %}
+       When making a payment, customers only need a charged wallet.  A 
merchant can accept payments <span class="tlr">without
+       making their customers register</span> on the merchant's Website.
+       {% endtrans %}
+    </p>
 
-    <p>GNU Taler is <span class="tlr">immune against many types of 
fraud</span>, such as phishing of credit card information
+    <p>
+       {% trans %}
+       GNU Taler is <span class="tlr">immune against many types of 
fraud</span>, such as phishing of credit card information
        or chargeback fraud.  In case of loss or theft, only the limited amount 
of money left in the wallet might be gone.
+       {% endtrans %}
     </p>
     </div>
     <div class="col">
@@ -39,28 +58,48 @@ store</span> of value.  Payments are always backed by an 
existing currency.</p>
   <div class="row">
     <div class="col-lg-6">
     <h2>{{ _("Paying with Taler") }}</h2>
+    <p>
     {% trans %}
-    <p>To pay with Taler, customers install an electronic wallet
+    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,
+    by some other means of payment.
+    {% endtrans %}
+    </p>
+    <p>
+    {% trans %}
+    Once the wallet is charged, payments on websites take only one click,
     are never falsely rejected by fraud detection and do not pose any risk
-    of phishing or identity theft.</p>
-    <p><a href="https://demo.taler.net";>Try it yourself with the interactive 
demo!</a></p>
+    of phishing or identity theft.
     {% endtrans %}
+    </p>
+    <p><a href="https://demo.taler.net";>
+    {% trans %}
+    Try it yourself with the interactive demo!
+    {% endtrans %}
+    </a></p>
     </div>
     <div class="col-lg-6">
     <h2>{{ _("Receiving payments with Taler") }}</h2>
+    <p>
     {% trans %}
-    <p>To receive Taler payments, a merchant needs a bank account
+    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>
+    on the merchant's premises or be hosted by a third party.
+    {% endtrans %}
+    </p>
+    <p>
+    {% trans %}
+    Merchant integration is simple, and customers can pay for products without 
even having to register an account.
+    {% endtrans %}
+    </p>
+    <p><a href="https://docs.taler.net";>
+    {% trans %}
+    See how merchant integration works in our developer documentation!
     {% endtrans %}
+    </a></p>
     </div>
   </div>
 </div>
diff --git a/gsoc-codeless.html.j2 b/gsoc-codeless.html.j2
index 257b797..1ffce88 100644
--- a/gsoc-codeless.html.j2
+++ b/gsoc-codeless.html.j2
@@ -31,12 +31,20 @@
         </li>
         <li>
              {% trans %}
-                  Merchant has the flexibility to add two types of inventory 
as follows:
+                  A merchant has the flexibility to add two types of inventory 
as follows:
+                  {% endtrans %}
                   <ul>
-                    <li>The merchant can upload digital inventory (like a PDF 
or HTML page) via the codeless payments frontend and the user can then purchase 
it and view the version hosted by the codeless payment frontend.</li>
-                    <li>The merchant can add any physical inventory available 
in his stocks. While adding these inventory, the seller is prompted to add 
minimum quantity of product that is required to be maintained in the stock. 
Whenever the stocks run below this limit the seller would be notified 
(currently this feature has not been added but soon email notification would be 
added).</li>
-                  </ul>
+                    <li>
+             {% trans %}
+             The merchant can upload digital inventory (like a PDF or HTML 
page) via the codeless payments frontend and the user can then purchase it and 
view the version hosted by the codeless payment frontend.
              {% endtrans %}
+             </li>
+                    <li>
+             {% trans %}
+             The merchant can add any physical inventory available in his 
stocks. While adding these inventory, the seller is prompted to add minimum 
quantity of product that is required to be maintained in the stock. Whenever 
the stocks run below this limit the seller would be notified (currently this 
feature has not been added but soon email notification would be added).
+             {% endtrans %}
+             </li>
+                  </ul>
         </li>
         <li>
              {% trans %}
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 71e2e16..547b22a 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+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"
@@ -22,16 +22,16 @@ msgid "GNU Taler Bibliography"
 msgstr "Bibliografie von GNU Taler"
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
 msgid "by"
 msgstr "von"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
 msgid "and"
 msgstr "und"
 
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
 msgid "available upon request"
 msgstr "erhältlich auf Anfrage"
 
@@ -80,10 +80,20 @@ msgstr ""
 "<tt>address@hidden</tt>, die GnuPG-verschlüsselt empfangen wird. "
 
 #: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
 msgid "Reporting bugs"
 msgstr "Funktionserweiterungen, Fehler und Bugs melden"
 
-#: contact.html.j2:38
+#: contact.html.j2:48
 #, fuzzy
 #| msgid ""
 #| "We track open feature requests and bugs in our\n"
@@ -101,11 +111,11 @@ msgstr ""
 " Bugs oder Funktionsanfragen können auch an die Mailing-Liste gesendet "
 "werden."
 
-#: contact.html.j2:49
+#: contact.html.j2:59
 msgid "Executive team"
 msgstr "Leitungsteam"
 
-#: contact.html.j2:51
+#: contact.html.j2:61
 #, fuzzy
 #| msgid ""
 #| "For non-technical commercial requests, please contact\n"
@@ -589,102 +599,74 @@ msgstr ""
 "digitalen Münzen auf dem jeweiligen Computer zum Zeitpunkt der "
 "Schadensentstehung."
 
-#: docs.html.j2:22
+#: docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:23
+#: docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
-msgstr ""
-
-#: docs.html.j2:31
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:42
+#: docs.html.j2:46
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
 msgstr ""
 
-#: docs.html.j2:58
+#: docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:67
+#: docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:69
+#: docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:78
+#: docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:80
+#: docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:105
+#: docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:113
+#: docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:139
+#: docs.html.j2:144
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "Die Mailing-Liste"
 
-#: docs.html.j2:147
+#: docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:155
+#: docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "Das Taler-Backend für Händler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:203
+#: docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
@@ -991,11 +973,72 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time</p>"
 msgstr ""
 
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"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>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+msgid ""
+"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+
+#: features.html.j2:37
+msgid ""
+"When making a payment, customers only need a charged wallet. A merchant can "
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
 msgid "Paying with Taler"
 msgstr "Bezahlen mit Taler"
 
-#: features.html.j2:42
+#: features.html.j2:62
+#, 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 ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+"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."
+
+#: features.html.j2:70
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet\n"
@@ -1005,13 +1048,9 @@ msgstr "Bezahlen mit Taler"
 #| "are never falsely rejected by fraud detection and do not pose any risk\n"
 #| "of phishing or identity theft.</p>\n"
 msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
 msgstr ""
 "Um mit dem Taler-Bezahlsystem einkaufen zu können, muss man eine "
 "elektronische Geldbörse auf einem Endgerät installieren. Vor der ersten "
@@ -1023,11 +1062,15 @@ msgstr ""
 "(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
 "Daten übermittelt."
 
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr "Verkaufen mit Taler"
 
-#: features.html.j2:55
+#: features.html.j2:85
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account\n"
@@ -1036,14 +1079,10 @@ msgstr "Verkaufen mit Taler"
 #| "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 "
+"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 "
@@ -1052,11 +1091,21 @@ msgstr ""
 "Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
 "Verkäufers oder gehostet laufen, um die Taler-Buchungen durchzuführen."
 
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
 msgid "Practical"
 msgstr "Praktisch"
 
-#: features.html.j2:77
+#: features.html.j2:116
 #, fuzzy
 #| msgid ""
 #| "Taler is easy to integrate with existing Web\n"
@@ -1072,11 +1121,11 @@ msgstr ""
 "Zahlungen sind kryptographisch verschlüsselt, innerhalb von Millisekunden "
 "bestätigt und extrem kostengünstig."
 
-#: features.html.j2:87
+#: features.html.j2:126
 msgid "Stable"
 msgstr "Stabil"
 
-#: features.html.j2:90
+#: features.html.j2:129
 #, fuzzy
 #| msgid ""
 #| "Taler does not introduce a new currency. Taler\n"
@@ -1096,11 +1145,11 @@ msgstr ""
 "also sagen, dass die kryptografischen Taler-Münzen herkömmlichen Währungen "
 "wie US-Dollar, Euro oder sogar Bitcoin entsprechen."
 
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
 msgid "Secure"
 msgstr "Sicher"
 
-#: features.html.j2:104
+#: features.html.j2:143
 #, fuzzy
 #| msgid ""
 #| "By design Taler does not suffer from many classes\n"
@@ -1116,11 +1165,11 @@ msgstr ""
 "Phishing und wird gleichzeitig jedoch niemals Käufern betrügerische "
 "Absichten unterstellen können."
 
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
 msgid "Taxable"
 msgstr "Besteuerbar"
 
-#: features.html.j2:119
+#: features.html.j2:158
 #, fuzzy
 #| msgid ""
 #| "When using Taler, merchant's revenue is transparent for tax\n"
@@ -1138,11 +1187,11 @@ msgstr ""
 "Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für illegale "
 "Geschäfte."
 
-#: features.html.j2:129
+#: features.html.j2:168
 msgid "Private"
 msgstr "Anonym"
 
-#: features.html.j2:131
+#: features.html.j2:170
 #, fuzzy
 #| msgid ""
 #| "When you pay with Taler, your identity does not\n"
@@ -1161,11 +1210,11 @@ msgstr ""
 "garantiert einen Nachweis über ihre Zahlung und den erfolgten "
 "Eigentumsübergang."
 
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
 msgid "Libre"
 msgstr "Frei"
 
-#: features.html.j2:145
+#: features.html.j2:184
 #, fuzzy
 #| msgid ""
 #| "Taler provides protocols and reference implementations that in\n"
@@ -1285,44 +1334,61 @@ msgid ""
 msgstr ""
 
 #: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
 msgstr ""
 
 #: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:66
+#: glossary.html.j2:80
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:68
+#: glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:72
+#: glossary.html.j2:86
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:74
+#: glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:78
+#: glossary.html.j2:92
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:80
+#: glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:84
+#: glossary.html.j2:98
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1332,156 +1398,196 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:95
+#: glossary.html.j2:109
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:97
+#: glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:103
+#: glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:107
+#: glossary.html.j2:129
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:109
+#: glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:113
+#: glossary.html.j2:135
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:115
+#: glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
 "account to cover obligations from coins in circulation"
 msgstr ""
 
-#: glossary.html.j2:119
+#: glossary.html.j2:141
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:121
+#: glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:125
+#: glossary.html.j2:147
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:127
+#: glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
 "the customer"
 msgstr ""
 
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "Documentation"
+msgid "revocation"
+msgstr "Dokumentation"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:133
+#: glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
-#: glossary.html.j2:137
+#: glossary.html.j2:165
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:139
+#: glossary.html.j2:167
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:143
+#: glossary.html.j2:171
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:145
+#: glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
 msgstr ""
 
-#: glossary.html.j2:149
+#: glossary.html.j2:177
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:151
+#: glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:155
+#: glossary.html.j2:183
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:157
+#: glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:161
+#: glossary.html.j2:189
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:163
+#: glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:167
+#: glossary.html.j2:195
 #, fuzzy
 #| msgid "Wallet"
 msgid "wallet"
 msgstr "Geldbörse"
 
-#: glossary.html.j2:169
+#: glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:173
+#: glossary.html.j2:201
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:175
+#: glossary.html.j2:203
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:179
+#: glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:181
+#: glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:185
+#: glossary.html.j2:213
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:187
+#: glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Vorteile für Staatsregierungen"
@@ -1850,18 +1956,26 @@ msgstr ""
 
 #: gsoc-codeless.html.j2:33
 msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
+msgstr ""
+
+#: gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1871,7 +1985,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1879,31 +1993,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1912,7 +2026,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1920,7 +2034,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1932,7 +2046,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1940,7 +2054,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1950,7 +2064,7 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
@@ -2427,6 +2541,192 @@ msgstr ""
 msgid "GNU Taler in the Press"
 msgstr "Taler in den Medien"
 
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "Taler in den Medien"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"Customers benefit from Free Software as the wallet software can be made to "
+"run on a variety of platforms, and the absence of user-hostile features such "
+"as tracking or telemetry can easily be assured."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "Wie schützt Taler meine privaten Daten?"
+
+#: principles.html.j2:70
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"In legislations with data protection regulations (such as the recently "
+"introduced GDPR in Europe), merchants benefit from this as well, as no data "
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Gesetz gegen Geldwäsche"
+
+#: principles.html.j2:99
+msgid ""
+"As a payment system must still be legal to operate and use, it must comply "
+"with these requirements. Furthermore, we consider levying of taxes as "
+"beneficial to society."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+msgid ""
+"This imposes requirements on the security of the system, as well as on the "
+"general design, as payment fraud can also happen through misleading user "
+"interface design or the lack of cryptographic evidence for certain processes."
+msgstr ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "General Data Protection Regulation (GDPR)"
+
+#: principles.html.j2:134
+msgid ""
+"The reason behind this goal is similar to (2). The privacy of buyers is "
+"given priority, but other parties such as merchants still benefit from it, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"Specifically it must be usable for non-expert customers. Usability also "
+"applies to the integration with merchants, and informs choices about the "
+"architecture, such as encapsulating procedures that require cryptographic "
+"operations into an isolated component with a simple API."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Effizient"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Effizient"
+
+#: principles.html.j2:168
+msgid ""
+"Approaches such as proof-of-work are ruled out by this requirement. "
+"Efficiency is necessary for GNU Taler to be used for micropayments."
+msgstr ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"Taler should tolerate failure of individual components and systems, "
+"including malicious operators compromising core secrets. This manifests in "
+"architectural choices such as the isolation of certain components, and "
+"auditing procedures."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+msgid ""
+"It must be relatively easy for competitors to join the systems. While the "
+"barriers for this in traditional financial systems are rather high, the "
+"technical burden for new competitors to join must be minimized. Another "
+"design choice that supports this is to split the whole system into smaller "
+"components that can be operated, developed and improved upon independently, "
+"instead of having one completely monolithic system."
+msgstr ""
+
 #: schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
@@ -2446,67 +2746,74 @@ msgstr ""
 "Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
 "verschiedenen Branchen..."
 
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
 
 #: team.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Theoretische Grundlagen."
+msgid "GNU mainatiner, lead developer."
+msgstr ""
 
 #: team.html.j2:38
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
+
+#: team.html.j2:43
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
 
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
-
 #: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Doktorand, Inria."
-
-#: team.html.j2:55
 msgid "Software engineer."
 msgstr "Software-Ingenieur."
 
-#: team.html.j2:62
+#: team.html.j2:55
 msgid "Sustainable business development."
 msgstr "Nachhaltige Unternehmensentwicklung."
 
+#: team.html.j2:60
+msgid "Theoretical foundations."
+msgstr "Theoretische Grundlagen."
+
 #: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Software-Ingenieur. Arbeitet an libebics."
+msgid "System administration, Taler Systems SA."
+msgstr ""
 
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr "Übersetzer (Spanisch)."
 
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
 msgid "Translator (Italian)"
 msgstr "Übersetzer (Italienisch)."
 
-#: team.html.j2:98
+#: team.html.j2:99
 #, fuzzy
 #| msgid "Translator (Spanish)"
 msgid "Translator (German)"
 msgstr "Übersetzer (Deutsch)."
 
-#: team.html.j2:104
+#: team.html.j2:106
 msgid "Hardware security module"
 msgstr "Hardware-Sicherheitsmodul"
 
-#: team.html.j2:108
+#: team.html.j2:110
 msgid "Risk management"
 msgstr "Risikomanagement"
 
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
+
+#: team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
 
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler für Entwickler"
 
 #: common/base.j2:5
 msgid "GNU Taler"
@@ -2561,28 +2868,9 @@ msgid "Docs"
 msgstr ""
 
 #, fuzzy
-#~| msgid "Developers"
-#~ msgid "Developer Resources"
-#~ msgstr "Entwickler"
-
-#, fuzzy
-#~| msgid "About us"
-#~ msgid "About"
-#~ msgstr "Über uns"
-
-#, fuzzy
-#~| msgid "Investors"
-#~ msgid "For Investors"
-#~ msgstr "Investoren"
-
-#~ msgid "Citizens"
-#~ msgstr "Bürger"
-
-#~ msgid "Merchants"
-#~ msgstr "Händler"
-
-#~ msgid "Governments"
-#~ msgstr "Regierungen"
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "Das Taler-Backend für Händler"
 
 #, fuzzy
 #~| msgid ""
@@ -2599,7 +2887,8 @@ msgstr ""
 #~ "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>"
+#~ "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 "
@@ -2623,7 +2912,10 @@ msgstr ""
 #~ "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>"
+#~ "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 "
@@ -2632,6 +2924,39 @@ msgstr ""
 #~ "Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
 #~ "Verkäufers oder gehostet laufen, um die Taler-Buchungen durchzuführen."
 
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Doktorand, Inria."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Software-Ingenieur. Arbeitet an libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
+
+#, fuzzy
+#~| msgid "Developers"
+#~ msgid "Developer Resources"
+#~ msgstr "Entwickler"
+
+#, fuzzy
+#~| msgid "About us"
+#~ msgid "About"
+#~ msgstr "Über uns"
+
+#, fuzzy
+#~| msgid "Investors"
+#~ msgid "For Investors"
+#~ msgstr "Investoren"
+
+#~ msgid "Citizens"
+#~ msgstr "Bürger"
+
+#~ msgid "Merchants"
+#~ msgstr "Händler"
+
+#~ msgid "Governments"
+#~ msgstr "Regierungen"
+
 #, fuzzy
 #~| msgid ""
 #~| "Taler uses modern cryptography, ensuring that there\n"
diff --git a/locale/en/LC_MESSAGES/messages.po 
b/locale/en/LC_MESSAGES/messages.po
index 66d6589..37c55bb 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+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"
@@ -22,16 +22,16 @@ msgid "GNU Taler Bibliography"
 msgstr ""
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
 msgid "by"
 msgstr ""
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
 msgid "and"
 msgstr ""
 
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
 msgid "available upon request"
 msgstr ""
 
@@ -62,21 +62,31 @@ msgid ""
 msgstr ""
 
 #: contact.html.j2:36
-msgid "Reporting bugs"
+msgid "General inquiries"
 msgstr ""
 
 #: contact.html.j2:38
 msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
+msgid "Reporting bugs"
+msgstr ""
+
+#: contact.html.j2:48
+msgid ""
 "We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
 "bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
 "also report bugs or feature requests to the mailing list."
 msgstr ""
 
-#: contact.html.j2:49
+#: contact.html.j2:59
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:51
+#: contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -308,98 +318,72 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:22
+#: docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:23
+#: docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:31
+#: docs.html.j2:46
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
 msgstr ""
 
-#: docs.html.j2:58
+#: docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:67
+#: docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:69
+#: docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:78
+#: docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:80
+#: docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:105
+#: docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:113
+#: docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:139
+#: docs.html.j2:144
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:147
+#: docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:155
+#: docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-msgid "Code (Merchant backend)"
-msgstr ""
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:203
+#: docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
@@ -613,53 +597,103 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time</p>"
 msgstr ""
 
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"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>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+msgid ""
+"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+
+#: features.html.j2:37
+msgid ""
+"When making a payment, customers only need a charged wallet. A merchant can "
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:42
+#: features.html.j2:62
+msgid ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+
+#: features.html.j2:70
 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>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
 msgstr ""
 
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:55
+#: features.html.j2:85
 msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"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
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
 msgid "Practical"
 msgstr ""
 
-#: features.html.j2:77
+#: features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
 "extremely low transaction costs."
 msgstr ""
 
-#: features.html.j2:87
+#: features.html.j2:126
 msgid "Stable"
 msgstr ""
 
-#: features.html.j2:90
+#: features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -667,44 +701,44 @@ msgid ""
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
 msgid "Secure"
 msgstr ""
 
-#: features.html.j2:104
+#: features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
 "rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
 msgid "Taxable"
 msgstr ""
 
-#: features.html.j2:119
+#: features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
 
-#: features.html.j2:129
+#: features.html.j2:168
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:131
+#: features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
 "money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
 msgid "Libre"
 msgstr ""
 
-#: features.html.j2:145
+#: features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -811,44 +845,61 @@ msgid ""
 msgstr ""
 
 #: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
 msgstr ""
 
 #: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:66
+#: glossary.html.j2:80
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:68
+#: glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:72
+#: glossary.html.j2:86
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:74
+#: glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:78
+#: glossary.html.j2:92
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:80
+#: glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:84
+#: glossary.html.j2:98
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -858,154 +909,192 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:95
+#: glossary.html.j2:109
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:97
+#: glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:103
+#: glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:107
+#: glossary.html.j2:129
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:109
+#: glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:113
+#: glossary.html.j2:135
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:115
+#: glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
 "account to cover obligations from coins in circulation"
 msgstr ""
 
-#: glossary.html.j2:119
+#: glossary.html.j2:141
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:121
+#: glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:125
+#: glossary.html.j2:147
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:127
+#: glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
 "the customer"
 msgstr ""
 
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+msgid "revocation"
+msgstr ""
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:133
+#: glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
-#: glossary.html.j2:137
+#: glossary.html.j2:165
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:139
+#: glossary.html.j2:167
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:143
+#: glossary.html.j2:171
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:145
+#: glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
 msgstr ""
 
-#: glossary.html.j2:149
+#: glossary.html.j2:177
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:151
+#: glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:155
+#: glossary.html.j2:183
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:157
+#: glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:161
+#: glossary.html.j2:189
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:163
+#: glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:167
+#: glossary.html.j2:195
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:169
+#: glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:173
+#: glossary.html.j2:201
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:175
+#: glossary.html.j2:203
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:179
+#: glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:181
+#: glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:185
+#: glossary.html.j2:213
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:187
+#: glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1205,18 +1294,26 @@ msgstr ""
 
 #: gsoc-codeless.html.j2:33
 msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
+msgstr ""
+
+#: gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1226,7 +1323,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1234,31 +1331,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1267,7 +1364,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1275,7 +1372,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1287,7 +1384,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1295,7 +1392,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1305,7 +1402,7 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
@@ -1564,6 +1661,180 @@ msgstr ""
 msgid "GNU Taler in the Press"
 msgstr ""
 
+#: principles.html.j2:22
+msgid "GNU Taler: Design Principles"
+msgstr ""
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"Customers benefit from Free Software as the wallet software can be made to "
+"run on a variety of platforms, and the absence of user-hostile features such "
+"as tracking or telemetry can easily be assured."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+msgid "You deserve some privacy"
+msgstr ""
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"In legislations with data protection regulations (such as the recently "
+"introduced GDPR in Europe), merchants benefit from this as well, as no data "
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+msgid "Money laundering"
+msgstr ""
+
+#: principles.html.j2:99
+msgid ""
+"As a payment system must still be legal to operate and use, it must comply "
+"with these requirements. Furthermore, we consider levying of taxes as "
+"beneficial to society."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+msgid ""
+"This imposes requirements on the security of the system, as well as on the "
+"general design, as payment fraud can also happen through misleading user "
+"interface design or the lack of cryptographic evidence for certain processes."
+msgstr ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr ""
+
+#: principles.html.j2:134
+msgid ""
+"The reason behind this goal is similar to (2). The privacy of buyers is "
+"given priority, but other parties such as merchants still benefit from it, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"Specifically it must be usable for non-expert customers. Usability also "
+"applies to the integration with merchants, and informs choices about the "
+"architecture, such as encapsulating procedures that require cryptographic "
+"operations into an isolated component with a simple API."
+msgstr ""
+
+#: principles.html.j2:162
+msgid "7. Be efficient"
+msgstr ""
+
+#: principles.html.j2:166
+msgid "Energy efficiency"
+msgstr ""
+
+#: principles.html.j2:168
+msgid ""
+"Approaches such as proof-of-work are ruled out by this requirement. "
+"Efficiency is necessary for GNU Taler to be used for micropayments."
+msgstr ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"Taler should tolerate failure of individual components and systems, "
+"including malicious operators compromising core secrets. This manifests in "
+"architectural choices such as the isolation of certain components, and "
+"auditing procedures."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+msgid ""
+"It must be relatively easy for competitors to join the systems. While the "
+"barriers for this in traditional financial systems are rather high, the "
+"technical burden for new competitors to join must be minimized. Another "
+"design choice that supports this is to split the whole system into smaller "
+"components that can be operated, developed and improved upon independently, "
+"instead of having one completely monolithic system."
+msgstr ""
+
 #: schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
@@ -1580,64 +1851,69 @@ msgid ""
 "industries, …."
 msgstr ""
 
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
 msgstr ""
 
 #: team.html.j2:33
-msgid "Theoretical foundations."
+msgid "GNU mainatiner, lead developer."
 msgstr ""
 
 #: team.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr ""
 
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
+#: team.html.j2:43
+msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
 #: team.html.j2:50
-msgid "PhD Student, Inria.."
+msgid "Software engineer."
 msgstr ""
 
 #: team.html.j2:55
-msgid "Software engineer."
+msgid "Sustainable business development."
 msgstr ""
 
-#: team.html.j2:62
-msgid "Sustainable business development."
+#: team.html.j2:60
+msgid "Theoretical foundations."
 msgstr ""
 
 #: team.html.j2:66
-msgid "Software engineer. Works on libebics."
+msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
 msgid "Translator (Italian)"
 msgstr ""
 
-#: team.html.j2:98
+#: team.html.j2:99
 msgid "Translator (German)"
 msgstr ""
 
-#: team.html.j2:104
+#: team.html.j2:106
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:108
+#: team.html.j2:110
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+msgid "Free software developer."
 msgstr ""
 
 #: common/base.j2:5
diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index a236093..6cb665b 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
 "PO-Revision-Date: 2017-08-10 06:24+0200\n"
 "Last-Translator: \n"
 "Language-Team: es <address@hidden>\n"
@@ -23,16 +23,16 @@ msgid "GNU Taler Bibliography"
 msgstr "Bibliografía de GNU Taler"
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
 msgid "by"
 msgstr "por"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
 msgid "and"
 msgstr "y"
 
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
 msgid "available upon request"
 msgstr "disponible bajo petición"
 
@@ -70,10 +70,20 @@ msgstr ""
 "electrónicos cifrados con GnuPG."
 
 #: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
 msgid "Reporting bugs"
 msgstr "Reportar errores"
 
-#: contact.html.j2:38
+#: contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
 "bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
@@ -84,11 +94,11 @@ msgstr ""
 "a>, que se comparte con el proyecto GNUnet. También puede reportar bugs o "
 "solicitudes a través de la lista de correo."
 
-#: contact.html.j2:49
+#: contact.html.j2:59
 msgid "Executive team"
 msgstr "Comité Ejecutivo"
 
-#: contact.html.j2:51
+#: contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -443,104 +453,74 @@ msgstr ""
 "proporcional a los fondos que tuviesen en circulación durante el período en "
 "que la computadora estuviese comprometida."
 
-#: docs.html.j2:22
+#: docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:23
+#: docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
-msgstr ""
-
-#: docs.html.j2:31
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:42
+#: docs.html.j2:46
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
 msgstr ""
 
-#: docs.html.j2:58
+#: docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:67
+#: docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:69
+#: docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:78
+#: docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:80
+#: docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:105
+#: docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:113
+#: docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:139
+#: docs.html.j2:144
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "Lista de correo"
 
-#: docs.html.j2:147
+#: docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:155
+#: docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:177
-#, fuzzy
-#| msgid "exchange"
-msgid "Code (Exchange)"
-msgstr "Plataforma de intercambio"
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "Backend del comerciante de GNU Taler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:203
+#: docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
@@ -792,11 +772,48 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time</p>"
 msgstr ""
 
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"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>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+msgid ""
+"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+
+#: features.html.j2:37
+msgid ""
+"When making a payment, customers only need a charged wallet. A merchant can "
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
 msgid "Paying with Taler"
 msgstr "Pagando con Taler"
 
-#: features.html.j2:42
+#: features.html.j2:62
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -806,13 +823,9 @@ msgstr "Pagando con Taler"
 #| "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>"
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
 msgstr ""
 "<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 "
@@ -821,11 +834,36 @@ msgstr ""
 "clic, nunca son rechazados equivocadamente por detección de fraude, y no "
 "representan ningún riesgo de phishing o robo de identidad.</p>"
 
-#: features.html.j2:54
+#: features.html.j2:70
+#, 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 ""
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
+msgstr ""
+"<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:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr "Recibiendo pagos con Taler"
 
-#: features.html.j2:55
+#: features.html.j2:85
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -834,14 +872,10 @@ msgstr "Recibiendo pagos con Taler"
 #| "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 "
+"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 "
@@ -850,11 +884,21 @@ msgstr ""
 "puede ejecutarse en el hardware del comerciante, o puede estar alojado por "
 "un tercero. </ P>"
 
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
 msgid "Practical"
 msgstr "Práctico"
 
-#: features.html.j2:77
+#: features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -864,11 +908,11 @@ msgstr ""
 "asegurados criptográficamente y se confirman en milisegundos con costos de "
 "transacción extremadamente bajos."
 
-#: features.html.j2:87
+#: features.html.j2:126
 msgid "Stable"
 msgstr "Estable"
 
-#: features.html.j2:90
+#: features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -881,11 +925,11 @@ msgstr ""
 "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
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
 msgid "Secure"
 msgstr "Seguro"
 
-#: features.html.j2:104
+#: features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -896,11 +940,11 @@ msgstr ""
 "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
+#: features.html.j2:155 governments.html.j2:25
 msgid "Taxable"
 msgstr "Imponible"
 
-#: features.html.j2:119
+#: features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -911,11 +955,11 @@ msgstr ""
 "mayoría de las monedas electrónicas, Taler ayuda a prevenir los mercados "
 "negros. Taler no es adecuado para actividades ilegales."
 
-#: features.html.j2:129
+#: features.html.j2:168
 msgid "Private"
 msgstr "Privado"
 
-#: features.html.j2:131
+#: features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
@@ -925,11 +969,11 @@ msgstr ""
 "pagos en efectivo, nadie puede rastrear cómo gasta su dinero electrónico. "
 "Sin embargo, obtiene una prueba de pago legalmente válida."
 
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
 msgid "Libre"
 msgstr "Libre"
 
-#: features.html.j2:145
+#: features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1065,27 +1109,44 @@ msgstr ""
 "comerciantes."
 
 #: glossary.html.j2:60
+msgid "expired"
+msgstr ""
+
+#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
 msgid "extension"
 msgstr "Extensión"
 
-#: glossary.html.j2:62
+#: glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr "Implementación de una `billetera` para navegadores web"
 
-#: glossary.html.j2:66
+#: glossary.html.j2:80
 msgid "fresh coin"
 msgstr "Moneda fresca"
 
-#: glossary.html.j2:68
+#: glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 "Una `moneda` es fresca si su clave pública sólo es conocida por el cliente"
 
-#: glossary.html.j2:72
+#: glossary.html.j2:86
 msgid "master key"
 msgstr "Clave maestra o 'master key'"
 
-#: glossary.html.j2:74
+#: glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1093,21 +1154,21 @@ msgstr ""
 "La clave offline utilizada por la plataforma de intercambio para certificar "
 "claves de denominación y claves de firma de mensajes"
 
-#: glossary.html.j2:78
+#: glossary.html.j2:92
 msgid "message signing key"
 msgstr "Clave de firma de mensajes"
 
-#: glossary.html.j2:80
+#: glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 "Clave utilizada por la plataforma de intercambio para firmar mensajes en "
 "línea, que no sean monedas"
 
-#: glossary.html.j2:84
+#: glossary.html.j2:98
 msgid "offer"
 msgstr "Oferta"
 
-#: glossary.html.j2:86
+#: glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1123,41 +1184,52 @@ msgstr ""
 "otras palabras, una vez que el backend agrega la información que falta a la "
 "oferta y la firma, la convierte en una propuesta."
 
-#: glossary.html.j2:95
+#: glossary.html.j2:109
 msgid "owner"
 msgstr "Propiedad"
 
-#: glossary.html.j2:97
+#: glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 "Una `moneda` es propiedad de la entidad que conoce la clave privada de la "
 "moneda."
 
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
 msgid "proof"
 msgstr "Prueba"
 
-#: glossary.html.j2:103
+#: glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 "Mensaje que demuestra criptográficamente que una afirmación es correcta"
 
-#: glossary.html.j2:107
+#: glossary.html.j2:129
 msgid "proposal"
 msgstr "Propuesta"
 
-#: glossary.html.j2:109
+#: glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 "Una oferta que ha sido completada y firmado por el backend del comerciante."
 
-#: glossary.html.j2:113
+#: glossary.html.j2:135
 msgid "reserve"
 msgstr "Reserva"
 
-#: glossary.html.j2:115
+#: glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
@@ -1167,11 +1239,11 @@ msgstr ""
 "plataforma de intercambio listo para un «retiro», o los fondos previstos en "
 "la cuenta bancaria para cubrir las obligaciones de las monedas en circulación"
 
-#: glossary.html.j2:119
+#: glossary.html.j2:141
 msgid "refreshing"
 msgstr "Renovación de moneda"
 
-#: glossary.html.j2:121
+#: glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1179,11 +1251,11 @@ msgstr ""
 "Operación mediante la cual se convierte una `moneda` `sucia` en una o más "
 "monedas `frescas`"
 
-#: glossary.html.j2:125
+#: glossary.html.j2:147
 msgid "refund"
 msgstr "Reembolso"
 
-#: glossary.html.j2:127
+#: glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1193,11 +1265,25 @@ msgstr ""
 "obtuvo de una operación de `depósito', dando nuevamente al cliente el "
 "derecho a estos fondos"
 
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "denomination"
+msgid "revocation"
+msgstr "Denominación"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
 msgid "sharing"
 msgstr "Compartir"
 
-#: glossary.html.j2:133
+#: glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
@@ -1206,19 +1292,19 @@ msgstr ""
 "acceso a la clave privada de la moneda, lo que permite a todos los "
 "copropietarios gastar la moneda en cualquier momento."
 
-#: glossary.html.j2:137
+#: glossary.html.j2:165
 msgid "signing key"
 msgstr "Clave de firmado"
 
-#: glossary.html.j2:139
+#: glossary.html.j2:167
 msgid "see message signing key."
 msgstr "Ver clave de firma de mensajes"
 
-#: glossary.html.j2:143
+#: glossary.html.j2:171
 msgid "spending"
 msgstr "Gasto"
 
-#: glossary.html.j2:145
+#: glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1226,19 +1312,19 @@ msgstr ""
 "Operación mediante la cual un cliente concede a un comerciante el derecho de "
 "`depositar` monedas a cambio de mercancía"
 
-#: glossary.html.j2:149
+#: glossary.html.j2:177
 msgid "transfer"
 msgstr "Transferencia"
 
-#: glossary.html.j2:151
+#: glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr "Método de envío de fondos entre cuentas `bancarias`"
 
-#: glossary.html.j2:155
+#: glossary.html.j2:183
 msgid "transaction"
 msgstr "Transacción"
 
-#: glossary.html.j2:157
+#: glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1246,38 +1332,38 @@ msgstr ""
 "Método mediante el cual la propiedad se transfiere exclusivamente de una "
 "entidad a otra"
 
-#: glossary.html.j2:161
+#: glossary.html.j2:189
 msgid "transaction id"
 msgstr "Identificador de la transacción o `transaction id`"
 
-#: glossary.html.j2:163
+#: glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr "Número único por el cual un comerciante identifica una `transacción`"
 
-#: glossary.html.j2:167
+#: glossary.html.j2:195
 msgid "wallet"
 msgstr "Billetera "
 
-#: glossary.html.j2:169
+#: glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 "Software que opera en la computadora de un cliente; que retira, almacena y "
 "gasta monedas"
 
-#: glossary.html.j2:173
+#: glossary.html.j2:201
 msgid "wire transfer"
 msgstr "Transferencia bancaria"
 
-#: glossary.html.j2:175
+#: glossary.html.j2:203
 msgid "see `transfer`"
 msgstr "Ver 'transferencia'"
 
-#: glossary.html.j2:179
+#: glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr "Identificador de transferencias bancarias"
 
-#: glossary.html.j2:181
+#: glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1285,17 +1371,32 @@ msgstr ""
 "Asunto de una `transferencia` bancaria; generalmente una serie aleatoria "
 "para identificar de forma única la `transferencia`"
 
-#: glossary.html.j2:185
+#: glossary.html.j2:213
 msgid "withdrawal"
 msgstr "Retiro"
 
-#: glossary.html.j2:187
+#: glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 "Operación mediante la cual una `billetera` puede convertir fondos de una "
 "reserva en monedas nuevas"
 
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Ventajas para los gobiernos"
@@ -1565,18 +1666,26 @@ msgstr ""
 
 #: gsoc-codeless.html.j2:33
 msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1586,7 +1695,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1594,31 +1703,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1627,7 +1736,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1635,7 +1744,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1647,7 +1756,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1655,7 +1764,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1665,7 +1774,7 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
@@ -2021,6 +2130,192 @@ msgstr ""
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler en la Prensa"
 
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "GNU Taler en la Prensa"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"Customers benefit from Free Software as the wallet software can be made to "
+"run on a variety of platforms, and the absence of user-hostile features such "
+"as tracking or telemetry can easily be assured."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "¿De qué manera Taler protege mi privacidad?"
+
+#: principles.html.j2:70
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"In legislations with data protection regulations (such as the recently "
+"introduced GDPR in Europe), merchants benefit from this as well, as no data "
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Anti Lavado de dinero o 'Anti money laundering' (AML)"
+
+#: principles.html.j2:99
+msgid ""
+"As a payment system must still be legal to operate and use, it must comply "
+"with these requirements. Furthermore, we consider levying of taxes as "
+"beneficial to society."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+msgid ""
+"This imposes requirements on the security of the system, as well as on the "
+"general design, as payment fraud can also happen through misleading user "
+"interface design or the lack of cryptographic evidence for certain processes."
+msgstr ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "Regulación General de Protección de Datos (GDPR)"
+
+#: principles.html.j2:134
+msgid ""
+"The reason behind this goal is similar to (2). The privacy of buyers is "
+"given priority, but other parties such as merchants still benefit from it, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"Specifically it must be usable for non-expert customers. Usability also "
+"applies to the integration with merchants, and informs choices about the "
+"architecture, such as encapsulating procedures that require cryptographic "
+"operations into an isolated component with a simple API."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Eficiente"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Eficiente"
+
+#: principles.html.j2:168
+msgid ""
+"Approaches such as proof-of-work are ruled out by this requirement. "
+"Efficiency is necessary for GNU Taler to be used for micropayments."
+msgstr ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"Taler should tolerate failure of individual components and systems, "
+"including malicious operators compromising core secrets. This manifests in "
+"architectural choices such as the isolation of certain components, and "
+"auditing procedures."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+msgid ""
+"It must be relatively easy for competitors to join the systems. While the "
+"barriers for this in traditional financial systems are rather high, the "
+"technical burden for new competitors to join must be minimized. Another "
+"design choice that supports this is to split the whole system into smaller "
+"components that can be operated, developed and improved upon independently, "
+"instead of having one completely monolithic system."
+msgstr ""
+
 #: schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
@@ -2041,65 +2336,72 @@ msgstr ""
 "Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
 "de TI en diferentes industrias."
 
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Criptografía aplicada. Contacto para W3C &amp; Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
 
 #: team.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Fundamentos teóricos."
+msgid "GNU mainatiner, lead developer."
+msgstr ""
 
 #: team.html.j2:38
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Criptografía aplicada. Contacto para W3C &amp; Tor."
+
+#: team.html.j2:43
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fundador del proyecto GNU. Orientación ética y licencias."
 
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
-
 #: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Estudiante de doctorado, INRIA."
-
-#: team.html.j2:55
 msgid "Software engineer."
 msgstr "Ingeniero de Software."
 
-#: team.html.j2:62
+#: team.html.j2:55
 msgid "Sustainable business development."
 msgstr "Desarrollo de negocios sostenibles."
 
+#: team.html.j2:60
+msgid "Theoretical foundations."
+msgstr "Fundamentos teóricos."
+
 #: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Ingeniero de Software. Trabaja en libebics."
+msgid "System administration, Taler Systems SA."
+msgstr ""
 
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr "Traductor (español)"
 
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
 msgid "Translator (Italian)"
 msgstr "Traductora (italiano)"
 
-#: team.html.j2:98
+#: team.html.j2:99
 msgid "Translator (German)"
 msgstr "Traductor (alemán)"
 
-#: team.html.j2:104
+#: team.html.j2:106
 msgid "Hardware security module"
 msgstr "Módulo de seguridad de hardware"
 
-#: team.html.j2:108
+#: team.html.j2:110
 msgid "Risk management"
 msgstr "Gestión de riesgos"
 
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
+
+#: team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
 
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler para programadores"
 
 #: common/base.j2:5
 msgid "GNU Taler"
@@ -2153,23 +2455,15 @@ msgstr ""
 msgid "Docs"
 msgstr ""
 
-#~ msgid "Developer Resources"
-#~ msgstr "Recursos de desarrollo"
-
-#~ msgid "About"
-#~ msgstr "Acerca de GNU Taler"
-
-#~ msgid "For Investors"
-#~ msgstr "Inversionistas"
-
-#~ msgid "Citizens"
-#~ msgstr "Ciudadanos"
-
-#~ msgid "Merchants"
-#~ msgstr "Comerciantes"
+#, fuzzy
+#~| msgid "exchange"
+#~ msgid "Code (Exchange)"
+#~ msgstr "Plataforma de intercambio"
 
-#~ msgid "Governments"
-#~ msgstr "Gobiernos"
+#, fuzzy
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "Backend del comerciante de GNU Taler"
 
 #, fuzzy
 #~| msgid ""
@@ -2185,7 +2479,8 @@ msgstr ""
 #~ "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>"
+#~ "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 "
@@ -2194,12 +2489,22 @@ msgstr ""
 #~ "un clic, nunca son rechazados equivocadamente por detección de fraude, y "
 #~ "no representan ningún riesgo de phishing o robo de identidad.</p>"
 
+#, 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>"
+#~ "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 "
@@ -2208,6 +2513,33 @@ msgstr ""
 #~ "por parte de Taler puede ejecutarse en el hardware del comerciante, o "
 #~ "puede estar alojado por un tercero. </ P>"
 
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Estudiante de doctorado, INRIA."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Ingeniero de Software. Trabaja en libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
+
+#~ msgid "Developer Resources"
+#~ msgstr "Recursos de desarrollo"
+
+#~ msgid "About"
+#~ msgstr "Acerca de GNU Taler"
+
+#~ msgid "For Investors"
+#~ msgstr "Inversionistas"
+
+#~ msgid "Citizens"
+#~ msgstr "Ciudadanos"
+
+#~ msgid "Merchants"
+#~ msgstr "Comerciantes"
+
+#~ msgid "Governments"
+#~ msgstr "Gobiernos"
+
 #~ msgid ""
 #~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
 #~ "Your digital wallet is safer than your physical wallet. At most, you can "
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 275261b..7a71f16 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+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"
@@ -24,16 +24,16 @@ msgid "GNU Taler Bibliography"
 msgstr ""
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
 msgid "by"
 msgstr ""
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
 msgid "and"
 msgstr ""
 
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
 msgid "available upon request"
 msgstr ""
 
@@ -64,21 +64,31 @@ msgid ""
 msgstr ""
 
 #: contact.html.j2:36
-msgid "Reporting bugs"
+msgid "General inquiries"
 msgstr ""
 
 #: contact.html.j2:38
 msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
+msgid "Reporting bugs"
+msgstr ""
+
+#: contact.html.j2:48
+msgid ""
 "We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
 "bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
 "also report bugs or feature requests to the mailing list."
 msgstr ""
 
-#: contact.html.j2:49
+#: contact.html.j2:59
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:51
+#: contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -312,98 +322,72 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:22
+#: docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:23
+#: docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:31
+#: docs.html.j2:46
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
 msgstr ""
 
-#: docs.html.j2:58
+#: docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:67
+#: docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:69
+#: docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:78
+#: docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:80
+#: docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:105
+#: docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:113
+#: docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:139
+#: docs.html.j2:144
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:147
+#: docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:155
+#: docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-msgid "Code (Merchant backend)"
-msgstr ""
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:203
+#: docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
@@ -617,57 +601,107 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time</p>"
 msgstr ""
 
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"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>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+msgid ""
+"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+
+#: features.html.j2:37
+msgid ""
+"When making a payment, customers only need a charged wallet. A merchant can "
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:42
+#: features.html.j2:62
 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>"
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
 msgstr ""
 
-#: features.html.j2:54
+#: features.html.j2:70
+msgid ""
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
+msgstr ""
+
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:55
+#: features.html.j2:85
 msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"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
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
 #, fuzzy
 #| msgid "Ethical"
 msgid "Practical"
 msgstr "Ethique"
 
-#: features.html.j2:77
+#: features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
 "extremely low transaction costs."
 msgstr ""
 
-#: features.html.j2:87
+#: features.html.j2:126
 #, fuzzy
 #| msgid "Taxable"
 msgid "Stable"
 msgstr "Taxable"
 
-#: features.html.j2:90
+#: features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -675,44 +709,44 @@ msgid ""
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
 msgid "Secure"
 msgstr "Sûr"
 
-#: features.html.j2:104
+#: features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
 "rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
 msgid "Taxable"
 msgstr "Taxable"
 
-#: features.html.j2:119
+#: features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
 
-#: features.html.j2:129
+#: features.html.j2:168
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:131
+#: features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
 "money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
 msgid "Libre"
 msgstr "Libre"
 
-#: features.html.j2:145
+#: features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -821,44 +855,61 @@ msgid ""
 msgstr ""
 
 #: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
 msgstr ""
 
 #: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:66
+#: glossary.html.j2:80
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:68
+#: glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:72
+#: glossary.html.j2:86
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:74
+#: glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:78
+#: glossary.html.j2:92
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:80
+#: glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:84
+#: glossary.html.j2:98
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -868,154 +919,194 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:95
+#: glossary.html.j2:109
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:97
+#: glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:103
+#: glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:107
+#: glossary.html.j2:129
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:109
+#: glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:113
+#: glossary.html.j2:135
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:115
+#: glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
 "account to cover obligations from coins in circulation"
 msgstr ""
 
-#: glossary.html.j2:119
+#: glossary.html.j2:141
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:121
+#: glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:125
+#: glossary.html.j2:147
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:127
+#: glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
 "the customer"
 msgstr ""
 
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "Documentation"
+msgid "revocation"
+msgstr "Documentation"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:133
+#: glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
-#: glossary.html.j2:137
+#: glossary.html.j2:165
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:139
+#: glossary.html.j2:167
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:143
+#: glossary.html.j2:171
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:145
+#: glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
 msgstr ""
 
-#: glossary.html.j2:149
+#: glossary.html.j2:177
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:151
+#: glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:155
+#: glossary.html.j2:183
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:157
+#: glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:161
+#: glossary.html.j2:189
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:163
+#: glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:167
+#: glossary.html.j2:195
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:169
+#: glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:173
+#: glossary.html.j2:201
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:175
+#: glossary.html.j2:203
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:179
+#: glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:181
+#: glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:185
+#: glossary.html.j2:213
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:187
+#: glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1217,18 +1308,26 @@ msgstr ""
 
 #: gsoc-codeless.html.j2:33
 msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1238,7 +1337,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1246,31 +1345,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1279,7 +1378,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1287,7 +1386,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1299,7 +1398,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1307,7 +1406,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1317,7 +1416,7 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
@@ -1578,6 +1677,184 @@ msgstr ""
 msgid "GNU Taler in the Press"
 msgstr ""
 
+#: principles.html.j2:22
+msgid "GNU Taler: Design Principles"
+msgstr ""
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"Customers benefit from Free Software as the wallet software can be made to "
+"run on a variety of platforms, and the absence of user-hostile features such "
+"as tracking or telemetry can easily be assured."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+msgid "You deserve some privacy"
+msgstr ""
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"In legislations with data protection regulations (such as the recently "
+"introduced GDPR in Europe), merchants benefit from this as well, as no data "
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+msgid "Money laundering"
+msgstr ""
+
+#: principles.html.j2:99
+msgid ""
+"As a payment system must still be legal to operate and use, it must comply "
+"with these requirements. Furthermore, we consider levying of taxes as "
+"beneficial to society."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+msgid ""
+"This imposes requirements on the security of the system, as well as on the "
+"general design, as payment fraud can also happen through misleading user "
+"interface design or the lack of cryptographic evidence for certain processes."
+msgstr ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr ""
+
+#: principles.html.j2:134
+msgid ""
+"The reason behind this goal is similar to (2). The privacy of buyers is "
+"given priority, but other parties such as merchants still benefit from it, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"Specifically it must be usable for non-expert customers. Usability also "
+"applies to the integration with merchants, and informs choices about the "
+"architecture, such as encapsulating procedures that require cryptographic "
+"operations into an isolated component with a simple API."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Efficace"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Efficace"
+
+#: principles.html.j2:168
+msgid ""
+"Approaches such as proof-of-work are ruled out by this requirement. "
+"Efficiency is necessary for GNU Taler to be used for micropayments."
+msgstr ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"Taler should tolerate failure of individual components and systems, "
+"including malicious operators compromising core secrets. This manifests in "
+"architectural choices such as the isolation of certain components, and "
+"auditing procedures."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+msgid ""
+"It must be relatively easy for competitors to join the systems. While the "
+"barriers for this in traditional financial systems are rather high, the "
+"technical burden for new competitors to join must be minimized. Another "
+"design choice that supports this is to split the whole system into smaller "
+"components that can be operated, developed and improved upon independently, "
+"instead of having one completely monolithic system."
+msgstr ""
+
 #: schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
@@ -1597,78 +1874,83 @@ msgid ""
 "industries, …."
 msgstr ""
 
-#: team.html.j2:28
-#, fuzzy
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "mathématicien"
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
 
 #: team.html.j2:33
-#, fuzzy
-msgid "Theoretical foundations."
-msgstr "Fatale (en théorie)"
+msgid "GNU mainatiner, lead developer."
+msgstr ""
 
 #: team.html.j2:38
 #, fuzzy
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Enthousiaste Ethique"
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "mathématicien"
 
-#: team.html.j2:45
+#: team.html.j2:43
 #, fuzzy
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Principalement inoffensif"
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Enthousiaste Ethique"
 
 #: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-
-#: team.html.j2:55
 #, fuzzy
 #| msgid "Software engineer. Works on libebics."
 msgid "Software engineer."
 msgstr "EBICS."
 
-#: team.html.j2:62
+#: team.html.j2:55
 #, fuzzy
 msgid "Sustainable business development."
 msgstr "Basse fréquence"
 
+#: team.html.j2:60
+#, fuzzy
+msgid "Theoretical foundations."
+msgstr "Fatale (en théorie)"
+
 #: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "EBICS."
+msgid "System administration, Taler Systems SA."
+msgstr ""
 
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traductrice"
 
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traductrice"
 
-#: team.html.j2:98
+#: team.html.j2:99
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traductrice"
 
-#: team.html.j2:104
+#: team.html.j2:106
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:108
+#: team.html.j2:110
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:112
+#: team.html.j2:118
+#, fuzzy
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Principalement inoffensif"
+
+#: team.html.j2:122
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
 
-#: team.html.j2:118
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
 #, fuzzy
-#| msgid "Software engineer. Works on libebics."
-msgid "Software engineer. Works on Android wallet."
-msgstr "EBICS."
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler pour les développeurs"
 
 #: common/base.j2:5
 msgid "GNU Taler"
@@ -1718,6 +2000,14 @@ msgstr ""
 msgid "Docs"
 msgstr ""
 
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "EBICS."
+
+#, fuzzy
+#~| msgid "Software engineer. Works on libebics."
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "EBICS."
+
 #, fuzzy
 #~ msgid "Merchants"
 #~ msgstr "Documentation"
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index ca91d72..c5c064f 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+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"
@@ -22,16 +22,16 @@ msgid "GNU Taler Bibliography"
 msgstr "Bibliografia GNU Taler"
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
 msgid "by"
 msgstr "di"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
 msgid "and"
 msgstr "e"
 
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
 msgid "available upon request"
 msgstr "disponibile su richiesta"
 
@@ -68,10 +68,20 @@ msgstr ""
 "net</tt> Sono particolarmente gradite e-mail criptate via GnuPG."
 
 #: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
 msgid "Reporting bugs"
 msgstr "Riporta un bug"
 
-#: contact.html.j2:38
+#: contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
 "bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
@@ -82,11 +92,11 @@ msgstr ""
 "GNUnet. Bugs e nuove funzionalità possono essere riportate anche nella "
 "mailing-list."
 
-#: contact.html.j2:49
+#: contact.html.j2:59
 msgid "Executive team"
 msgstr "Dirigenza"
 
-#: contact.html.j2:51
+#: contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -434,104 +444,74 @@ msgstr ""
 "sono compromessi, il danno finanziario è limitato alla rispettiva parte ed è "
 "proporzionale ai fondi in circolazione durante quel periodo."
 
-#: docs.html.j2:22
+#: docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:23
+#: docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
-msgstr ""
-
-#: docs.html.j2:31
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:42
+#: docs.html.j2:46
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
 msgstr ""
 
-#: docs.html.j2:58
+#: docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:67
+#: docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:69
+#: docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:78
+#: docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:80
+#: docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:105
+#: docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:113
+#: docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:139
+#: docs.html.j2:144
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "La mailing list"
 
-#: docs.html.j2:147
+#: docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:155
+#: docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:177
-#, fuzzy
-#| msgid "exchange"
-msgid "Code (Exchange)"
-msgstr "cambio"
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "Il backend del commerciante GNU Taler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:203
+#: docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
@@ -782,11 +762,70 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time</p>"
 msgstr ""
 
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"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>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+msgid ""
+"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+
+#: features.html.j2:37
+msgid ""
+"When making a payment, customers only need a charged wallet. A merchant can "
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
 msgid "Paying with Taler"
 msgstr "Pagare con Taler"
 
-#: features.html.j2:42
+#: features.html.j2:62
+#, 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 ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+"<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:70
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -796,13 +835,9 @@ msgstr "Pagare con Taler"
 #| "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>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
 msgstr ""
 "<p>Per pagare con Taler, i clienti installano un portafoglio elettronico sul "
 "proprio dispositivo. Prima del primo pagamento, il saldo del portafoglio "
@@ -812,11 +847,15 @@ msgstr ""
 "intercettazione di frodi e non presentano alcun rischio di phishing o furto "
 "di identità.</p> "
 
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr "Ricevere pagamenti con Taler"
 
-#: features.html.j2:55
+#: features.html.j2:85
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -825,14 +864,10 @@ msgstr "Ricevere pagamenti con Taler"
 #| "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 "
+"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 "
@@ -840,11 +875,21 @@ msgstr ""
 "backend del commerciante per l'elaborazione della transazione di Taler può "
 "essere eseguito nella sede del commerciante o essere ospitato da terzi.</p> "
 
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
 msgid "Practical"
 msgstr "Pratico"
 
-#: features.html.j2:77
+#: features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -854,11 +899,11 @@ msgstr ""
 "sono protetti da crittografia e vengono confermati entro pochi millisecondi "
 "con costi di transazione estremamente bassi. "
 
-#: features.html.j2:87
+#: features.html.j2:126
 msgid "Stable"
 msgstr "Stabile"
 
-#: features.html.j2:90
+#: features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -871,11 +916,11 @@ msgstr ""
 "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
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
 msgid "Secure"
 msgstr "Sicuro"
 
-#: features.html.j2:104
+#: features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -886,11 +931,11 @@ msgstr ""
 "sue misure di sicurezza, Taler non respinge mai un cliente legittimo a causa "
 "di un falso positivo in intercettazione di frode. "
 
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
 msgid "Taxable"
 msgstr "Tassabile"
 
-#: features.html.j2:119
+#: features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -901,11 +946,11 @@ msgstr ""
 "parte delle valute digitali, Taler aiuta a prevenire il mercato nero. Taler "
 "non è adatto ad attività illegali. "
 
-#: features.html.j2:129
+#: features.html.j2:168
 msgid "Private"
 msgstr "Privato"
 
-#: features.html.j2:131
+#: features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
@@ -916,12 +961,12 @@ msgstr ""
 "moneta elettronica. Tuttavia, si ottiene una conferma di pagamento "
 "legalmentevalida. "
 
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
 #, fuzzy
 msgid "Libre"
 msgstr "Libero"
 
-#: features.html.j2:145
+#: features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1057,28 +1102,45 @@ msgstr ""
 "'depositate' dai commercianti"
 
 #: glossary.html.j2:60
+msgid "expired"
+msgstr ""
+
+#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
 msgid "extension"
 msgstr "estensione"
 
-#: glossary.html.j2:62
+#: glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr "implementazione di un 'portafoglio' per i browsers"
 
-#: glossary.html.j2:66
+#: glossary.html.j2:80
 msgid "fresh coin"
 msgstr "moneta fresca"
 
-#: glossary.html.j2:68
+#: glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 "la 'moneta' è fresca se la sua chiave pubblica è conosciuta soltanto dal "
 "cliente"
 
-#: glossary.html.j2:72
+#: glossary.html.j2:86
 msgid "master key"
 msgstr "chiave master"
 
-#: glossary.html.j2:74
+#: glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1086,21 +1148,21 @@ msgstr ""
 "chiave offline utilizzata dal cambio per certificare le chiavi di "
 "denominazione e le chiavi di firma dei messaggi "
 
-#: glossary.html.j2:78
+#: glossary.html.j2:92
 msgid "message signing key"
 msgstr "chiave di firma del messaggio"
 
-#: glossary.html.j2:80
+#: glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 "chiave utilizzata dal cambio per firmare messaggi online, diversi dalle "
 "monete "
 
-#: glossary.html.j2:84
+#: glossary.html.j2:98
 msgid "offer"
 msgstr "offerta"
 
-#: glossary.html.j2:86
+#: glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1116,21 +1178,32 @@ msgstr ""
 "altre parole, dopo che il backend aggiunge le informazioni mancanti "
 "all'offerta e la firma, essa diventa una proposta."
 
-#: glossary.html.j2:95
+#: glossary.html.j2:109
 msgid "owner"
 msgstr "possessore"
 
-#: glossary.html.j2:97
+#: glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 "la 'moneta' è di proprietà dell'entità che conosce la chiave privata della "
 "moneta"
 
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
 msgid "proof"
 msgstr "prova"
 
-#: glossary.html.j2:103
+#: glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
@@ -1138,19 +1211,19 @@ msgstr ""
 "messaggio che dimostra crittograficamente che una particolare richiesta di "
 "risarchimento è corretta "
 
-#: glossary.html.j2:107
+#: glossary.html.j2:129
 msgid "proposal"
 msgstr "proposta"
 
-#: glossary.html.j2:109
+#: glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr "una bozza completata e firmata dal backend del commerciante"
 
-#: glossary.html.j2:113
+#: glossary.html.j2:135
 msgid "reserve"
 msgstr "riserva"
 
-#: glossary.html.j2:115
+#: glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
@@ -1160,11 +1233,11 @@ msgstr ""
 "per il 'prelievo', sia i fondi conservati sul conto bancario del cambio per "
 "coprire gli obblighi derivanti dalle monete in circolazione "
 
-#: glossary.html.j2:119
+#: glossary.html.j2:141
 msgid "refreshing"
 msgstr "aggiornamento"
 
-#: glossary.html.j2:121
+#: glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1172,11 +1245,11 @@ msgstr ""
 "operazione mediante la quale una moneta 'sporca' viene convertita in una o "
 "più monete 'fresche' "
 
-#: glossary.html.j2:125
+#: glossary.html.j2:147
 msgid "refund"
 msgstr "rimborso"
 
-#: glossary.html.j2:127
+#: glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1186,11 +1259,25 @@ msgstr ""
 "ottenere i fondi da un operazione di 'deposito', resitituendo il diritto ai "
 "fondi al cliente"
 
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "denomination"
+msgid "revocation"
+msgstr "denominazione"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
 msgid "sharing"
 msgstr "condivisione"
 
-#: glossary.html.j2:133
+#: glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
@@ -1199,19 +1286,19 @@ msgstr ""
 "l'accesso alla chiave privata della moneta, consentendo così a tutti i co-"
 "possessori di spendere la moneta in qualsiasi momento"
 
-#: glossary.html.j2:137
+#: glossary.html.j2:165
 msgid "signing key"
 msgstr "chiave di firma"
 
-#: glossary.html.j2:139
+#: glossary.html.j2:167
 msgid "see message signing key."
 msgstr "vedi 'chiave di firma del messaggio' "
 
-#: glossary.html.j2:143
+#: glossary.html.j2:171
 msgid "spending"
 msgstr "spesa"
 
-#: glossary.html.j2:145
+#: glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1219,19 +1306,19 @@ msgstr ""
 "operazione mediante la quale un cliente dà ad un commerciante il diritto di "
 "'depositare le monete in cambio di merce"
 
-#: glossary.html.j2:149
+#: glossary.html.j2:177
 msgid "transfer"
 msgstr "trasferimento"
 
-#: glossary.html.j2:151
+#: glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr "metodo per l'invio di fondi tra conti 'bancari' "
 
-#: glossary.html.j2:155
+#: glossary.html.j2:183
 msgid "transaction"
 msgstr "transazione"
 
-#: glossary.html.j2:157
+#: glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1239,39 +1326,39 @@ msgstr ""
 "metodo in base al quale la proprietà è trasferita esclusivamente da "
 "un'entità ad un'altra "
 
-#: glossary.html.j2:161
+#: glossary.html.j2:189
 msgid "transaction id"
 msgstr "ID di transazione"
 
-#: glossary.html.j2:163
+#: glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 "numero univoco con il quale un commerciante identifica una  'transazione' "
 
-#: glossary.html.j2:167
+#: glossary.html.j2:195
 msgid "wallet"
 msgstr "portafoglio"
 
-#: glossary.html.j2:169
+#: glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 "software in esecuzione sul computer di un cliente; prelieva, conserva e "
 "spende monete"
 
-#: glossary.html.j2:173
+#: glossary.html.j2:201
 msgid "wire transfer"
 msgstr "bonifico bancario"
 
-#: glossary.html.j2:175
+#: glossary.html.j2:203
 msgid "see `transfer`"
 msgstr "vedi 'trasferimento' "
 
-#: glossary.html.j2:179
+#: glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr "identificatore del bonifico bancario"
 
-#: glossary.html.j2:181
+#: glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1279,17 +1366,32 @@ msgstr ""
 "oggetto di un 'bonifico bancario'; solitamente una stringa casuale per "
 "identificare in modo univoco il 'trasferimento' "
 
-#: glossary.html.j2:185
+#: glossary.html.j2:213
 msgid "withdrawal"
 msgstr "prelievo"
 
-#: glossary.html.j2:187
+#: glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 "operazione mediante la quale un 'portafoglio' può convertire i fondi da una "
 "riserva a monete fresche"
 
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Vantaggi per le Pubbliche Amministrazioni"
@@ -1558,18 +1660,26 @@ msgstr ""
 
 #: gsoc-codeless.html.j2:33
 msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
 msgstr ""
 
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1579,7 +1689,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1587,31 +1697,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1620,7 +1730,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1628,7 +1738,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1640,7 +1750,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1648,7 +1758,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1658,7 +1768,7 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
@@ -2014,6 +2124,192 @@ msgstr "Questa pagina documenta la storia di GNU Taler. 
"
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler nella Stampa"
 
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "GNU Taler nella Stampa"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"Customers benefit from Free Software as the wallet software can be made to "
+"run on a variety of platforms, and the absence of user-hostile features such "
+"as tracking or telemetry can easily be assured."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "Come protegge Taler la mia privacy?"
+
+#: principles.html.j2:70
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"In legislations with data protection regulations (such as the recently "
+"introduced GDPR in Europe), merchants benefit from this as well, as no data "
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Antiriciclaggio (AML) "
+
+#: principles.html.j2:99
+msgid ""
+"As a payment system must still be legal to operate and use, it must comply "
+"with these requirements. Furthermore, we consider levying of taxes as "
+"beneficial to society."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+msgid ""
+"This imposes requirements on the security of the system, as well as on the "
+"general design, as payment fraud can also happen through misleading user "
+"interface design or the lack of cryptographic evidence for certain processes."
+msgstr ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "Regolamento generale sulla protezione dei dati (GDPR) "
+
+#: principles.html.j2:134
+msgid ""
+"The reason behind this goal is similar to (2). The privacy of buyers is "
+"given priority, but other parties such as merchants still benefit from it, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"Specifically it must be usable for non-expert customers. Usability also "
+"applies to the integration with merchants, and informs choices about the "
+"architecture, such as encapsulating procedures that require cryptographic "
+"operations into an isolated component with a simple API."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Efficiente"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Efficiente"
+
+#: principles.html.j2:168
+msgid ""
+"Approaches such as proof-of-work are ruled out by this requirement. "
+"Efficiency is necessary for GNU Taler to be used for micropayments."
+msgstr ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"Taler should tolerate failure of individual components and systems, "
+"including malicious operators compromising core secrets. This manifests in "
+"architectural choices such as the isolation of certain components, and "
+"auditing procedures."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+msgid ""
+"It must be relatively easy for competitors to join the systems. While the "
+"barriers for this in traditional financial systems are rather high, the "
+"technical burden for new competitors to join must be minimized. Another "
+"design choice that supports this is to split the whole system into smaller "
+"components that can be operated, developed and improved upon independently, "
+"instead of having one completely monolithic system."
+msgstr ""
+
 #: schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
@@ -2035,77 +2331,82 @@ msgstr ""
 "Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
 "diversi settori"
 
-#: team.html.j2:28
-#, fuzzy
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Matematico e crittografo. Attivo nel W3C &amp; Tor"
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
 
 #: team.html.j2:33
-#, fuzzy
-msgid "Theoretical foundations."
-msgstr "Teorica della sicurezza dei protocolli"
+msgid "GNU mainatiner, lead developer."
+msgstr ""
 
 #: team.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."
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Matematico e crittografo. Attivo nel W3C &amp; Tor"
 
-#: team.html.j2:45
+#: team.html.j2:43
 #, fuzzy
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
 
 #: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-"Dottorando a Inria Rennes.. Programmatore e architetto del protocollo Taler."
-
-#: team.html.j2:55
 msgid "Software engineer."
 msgstr "Programmatore."
 
-#: team.html.j2:62
+#: team.html.j2:55
 msgid "Sustainable business development."
 msgstr "Sviluppo di business sostenibile."
 
-#: team.html.j2:66
+#: team.html.j2:60
 #, fuzzy
-msgid "Software engineer. Works on libebics."
-msgstr "Programmatore. Attualmente coinvolto in libebics."
+msgid "Theoretical foundations."
+msgstr "Teorica della sicurezza dei protocolli"
 
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:66
+msgid "System administration, Taler Systems SA."
+msgstr ""
+
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traduttore per lo spagnolo."
 
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traduttrice per l'italiano."
 
-#: team.html.j2:98
+#: team.html.j2:99
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traduttore per lo spagnolo."
 
-#: team.html.j2:104
+#: team.html.j2:106
 msgid "Hardware security module"
 msgstr "Sicurezza hardware."
 
-#: team.html.j2:108
+#: team.html.j2:110
 msgid "Risk management"
 msgstr "Gestione del rischio."
 
-#: team.html.j2:112
+#: team.html.j2:118
+#, fuzzy
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
+
+#: team.html.j2:122
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 "Dottorando alla TU di Monaco di Baviera. Linux, FreeBSD, siti web e il deep "
 "state nel tempo libero."
 
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler per programmatori"
 
 #: common/base.j2:5
 msgid "GNU Taler"
@@ -2161,24 +2462,15 @@ msgstr ""
 msgid "Docs"
 msgstr ""
 
-#~ msgid "Developer Resources"
-#~ msgstr "Risorse per i programmatori"
-
-#~ msgid "About"
-#~ msgstr "Chi siamo"
-
-#~ msgid "For Investors"
-#~ msgstr "Per gli investitori"
-
-#~ msgid "Citizens"
-#~ msgstr "Cittadini"
-
 #, fuzzy
-#~ msgid "Merchants"
-#~ msgstr "Commercianti"
+#~| msgid "exchange"
+#~ msgid "Code (Exchange)"
+#~ msgstr "cambio"
 
-#~ msgid "Governments"
-#~ msgstr "Pubbliche Amministrazioni"
+#, fuzzy
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "Il backend del commerciante GNU Taler"
 
 #, fuzzy
 #~| msgid ""
@@ -2194,7 +2486,8 @@ msgstr ""
 #~ "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>"
+#~ "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 "
@@ -2204,12 +2497,22 @@ msgstr ""
 #~ "falsamente respinti per intercettazione di frodi e non presentano alcun "
 #~ "rischio di phishing o furto di identità.</p> "
 
+#, 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>"
+#~ "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 "
@@ -2218,6 +2521,37 @@ msgstr ""
 #~ "transazione di Taler può essere eseguito nella sede del commerciante o "
 #~ "essere ospitato da terzi.</p> "
 
+#~ msgid "PhD Student, Inria.."
+#~ msgstr ""
+#~ "Dottorando a Inria Rennes.. Programmatore e architetto del protocollo "
+#~ "Taler."
+
+#, fuzzy
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Programmatore. Attualmente coinvolto in libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
+
+#~ msgid "Developer Resources"
+#~ msgstr "Risorse per i programmatori"
+
+#~ msgid "About"
+#~ msgstr "Chi siamo"
+
+#~ msgid "For Investors"
+#~ msgstr "Per gli investitori"
+
+#~ msgid "Citizens"
+#~ msgstr "Cittadini"
+
+#, fuzzy
+#~ msgid "Merchants"
+#~ msgstr "Commercianti"
+
+#~ msgid "Governments"
+#~ msgstr "Pubbliche Amministrazioni"
+
 #~ msgid ""
 #~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
 #~ "Your digital wallet is safer than your physical wallet. At most, you can "
diff --git a/locale/pt/LC_MESSAGES/messages.po 
b/locale/pt/LC_MESSAGES/messages.po
index f60bc4d..59df9a6 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
 "PO-Revision-Date: 2018-01-28 15:27-0200\n"
 "Last-Translator: Rafael Fontenelle <address@hidden>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -27,16 +27,16 @@ msgid "GNU Taler Bibliography"
 msgstr "Bibliografia do GNU Taler"
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
 msgid "by"
 msgstr "por"
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
 msgid "and"
 msgstr "e"
 
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
 msgid "available upon request"
 msgstr "disponível mediante solicitação"
 
@@ -73,10 +73,20 @@ msgstr ""
 "tt>. Todos nós apoiamos o recebimento de e-mails criptografados pelo GnuPG."
 
 #: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
 msgid "Reporting bugs"
 msgstr "Relatando bugs"
 
-#: contact.html.j2:38
+#: contact.html.j2:48
 msgid ""
 "We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
 "bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
@@ -87,11 +97,11 @@ msgstr ""
 "o projeto GNUnet. Você também pode relatar bugs ou solicitações de recursos "
 "para a lista de discussões."
 
-#: contact.html.j2:49
+#: contact.html.j2:59
 msgid "Executive team"
 msgstr "Equipe executiva"
 
-#: contact.html.j2:51
+#: contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -432,104 +442,74 @@ msgstr ""
 "comprometidos, o dano financeiro é limitado à respectiva parte e "
 "proporcional aos fundos em circulação durante o período do comprometimento."
 
-#: docs.html.j2:22
+#: docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:23
+#: docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
-msgstr ""
-
-#: docs.html.j2:31
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:42
+#: docs.html.j2:46
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
 msgstr ""
 
-#: docs.html.j2:58
+#: docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:67
+#: docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:69
+#: docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:78
+#: docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:80
+#: docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:105
+#: docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:113
+#: docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:139
+#: docs.html.j2:144
 #, fuzzy
 #| msgid "The mailing list"
 msgid "The official GNU Taler mailing list."
 msgstr "A lista de discussão"
 
-#: docs.html.j2:147
+#: docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:155
+#: docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:177
-#, fuzzy
-#| msgid "exchange"
-msgid "Code (Exchange)"
-msgstr "câmbio <i>(exchange)</i>"
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "O backend de comerciante do GNU Taler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:203
+#: docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
@@ -778,11 +758,48 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time</p>"
 msgstr ""
 
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"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>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+msgid ""
+"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+
+#: features.html.j2:37
+msgid ""
+"When making a payment, customers only need a charged wallet. A merchant can "
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
 msgid "Paying with Taler"
 msgstr "Pagando com o Taler"
 
-#: features.html.j2:42
+#: features.html.j2:62
 #, fuzzy
 #| msgid ""
 #| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -792,13 +809,9 @@ msgstr "Pagando com o Taler"
 #| "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>"
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
 msgstr ""
 "<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 "
@@ -807,11 +820,36 @@ msgstr ""
 "nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
 "risco de phishing ou roubo de identidade.</p>"
 
-#: features.html.j2:54
+#: features.html.j2:70
+#, 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 ""
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
+msgstr ""
+"<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:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr "Recebendo pagamentos com o Taler"
 
-#: features.html.j2:55
+#: features.html.j2:85
 #, fuzzy
 #| msgid ""
 #| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -820,14 +858,10 @@ msgstr "Recebendo pagamentos com o Taler"
 #| "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 "
+"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 "
@@ -835,11 +869,21 @@ msgstr ""
 "comerciante para o processamento de transações da Taler pode ser executado "
 "nas instalações do comerciante ou ser hospedado por um terceiro.</p>"
 
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
 msgid "Practical"
 msgstr "Prático"
 
-#: features.html.j2:77
+#: features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
@@ -849,11 +893,11 @@ msgstr ""
 "são protegidos criptograficamente e são confirmados em milissegundos com "
 "custos de transação extremamente baixos."
 
-#: features.html.j2:87
+#: features.html.j2:126
 msgid "Stable"
 msgstr "Estável"
 
-#: features.html.j2:90
+#: features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -866,11 +910,11 @@ msgstr ""
 "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
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
 msgid "Secure"
 msgstr "Seguro"
 
-#: features.html.j2:104
+#: features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -881,11 +925,11 @@ msgstr ""
 "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
+#: features.html.j2:155 governments.html.j2:25
 msgid "Taxable"
 msgstr "Tributável"
 
-#: features.html.j2:119
+#: features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -896,11 +940,11 @@ msgstr ""
 "digitais, o Taler ajuda a evitar os mercados negros. O Taler não é adequado "
 "para atividades ilegais."
 
-#: features.html.j2:129
+#: features.html.j2:168
 msgid "Private"
 msgstr "Privado"
 
-#: features.html.j2:131
+#: features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
@@ -911,11 +955,11 @@ msgstr ""
 "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
+#: features.html.j2:181 governments.html.j2:88
 msgid "Libre"
 msgstr "Livre"
 
-#: features.html.j2:145
+#: features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1047,28 +1091,45 @@ msgstr ""
 "durante o “saque” e as resgata quando são “depositadas” pelos comerciantes."
 
 #: glossary.html.j2:60
+msgid "expired"
+msgstr ""
+
+#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
 msgid "extension"
 msgstr "extensão <i>(extension)</i>"
 
-#: glossary.html.j2:62
+#: glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr "implementação de uma “carteira” para navegadores."
 
-#: glossary.html.j2:66
+#: glossary.html.j2:80
 msgid "fresh coin"
 msgstr "moeda nova <i>(fresh coin)</i>"
 
-#: glossary.html.j2:68
+#: glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 "uma “moeda” é nova se a sua chave pública só for conhecida apenas pelo "
 "cliente."
 
-#: glossary.html.j2:72
+#: glossary.html.j2:86
 msgid "master key"
 msgstr "chave mestre <i>(master key)</i>"
 
-#: glossary.html.j2:74
+#: glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
@@ -1076,19 +1137,19 @@ msgstr ""
 "chave offline usada pelo câmbio para certificar chaves de denominação e "
 "chaves de assinatura de mensagem."
 
-#: glossary.html.j2:78
+#: glossary.html.j2:92
 msgid "message signing key"
 msgstr "chave de assinatura de mensagem <i>(message signing key)</i>"
 
-#: glossary.html.j2:80
+#: glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr "chave usada pelo câmbio para assinar mensagens online, além de moedas."
 
-#: glossary.html.j2:84
+#: glossary.html.j2:98
 msgid "offer"
 msgstr "oferta <i>(offer)</i>"
 
-#: glossary.html.j2:86
+#: glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1104,21 +1165,32 @@ msgstr ""
 "após o backend adicionar a informação faltando à oferta e a assiná-la, torna-"
 "se uma proposta."
 
-#: glossary.html.j2:95
+#: glossary.html.j2:109
 msgid "owner"
 msgstr "proprietário <i>(owner)</i>"
 
-#: glossary.html.j2:97
+#: glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 "uma “moeda” é de propriedade da entidade que conhece a chave privada da "
 "moeda."
 
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
 msgid "proof"
 msgstr "prova <i>(proof)</i>"
 
-#: glossary.html.j2:103
+#: glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
@@ -1126,19 +1198,19 @@ msgstr ""
 "mensagem que demonstra criptograficamente que uma reivindicação particular "
 "é .correta"
 
-#: glossary.html.j2:107
+#: glossary.html.j2:129
 msgid "proposal"
 msgstr "proposta <i>(proposal)</i>"
 
-#: glossary.html.j2:109
+#: glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr "um esboço que foi concluído e assinado pelo backend do comerciante."
 
-#: glossary.html.j2:113
+#: glossary.html.j2:135
 msgid "reserve"
 msgstr "reserva <i>(reserve)</i>"
 
-#: glossary.html.j2:115
+#: glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
@@ -1148,11 +1220,11 @@ msgstr ""
 "para “saque”, ou os fundos mantidos na conta bancária do câmbio para cobrir "
 "obrigações de moedas em circulação."
 
-#: glossary.html.j2:119
+#: glossary.html.j2:141
 msgid "refreshing"
 msgstr "renovação <i>(refreshing)</i>"
 
-#: glossary.html.j2:121
+#: glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
@@ -1160,11 +1232,11 @@ msgstr ""
 "operação através da qual uma moeda “suja” é convertida em uma ou mais moedas "
 "“frescas”."
 
-#: glossary.html.j2:125
+#: glossary.html.j2:147
 msgid "refund"
 msgstr "restituição <i>(refund)</i>"
 
-#: glossary.html.j2:127
+#: glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1174,11 +1246,25 @@ msgstr ""
 "de uma operação de “depósito”, dando o direito aos fundos de volta ao "
 "cliente."
 
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "denomination"
+msgid "revocation"
+msgstr "denominação <i>(denomination)</i>"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
 msgid "sharing"
 msgstr "compartilhamento <i>(sharing)</i>"
 
-#: glossary.html.j2:133
+#: glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
@@ -1187,19 +1273,19 @@ msgstr ""
 "acesso à chave privada da moeda, permitindo que todos os coproprietários "
 "gastem a moeda a qualquer momento."
 
-#: glossary.html.j2:137
+#: glossary.html.j2:165
 msgid "signing key"
 msgstr "chave de assinatura <i>(signing key)</i>"
 
-#: glossary.html.j2:139
+#: glossary.html.j2:167
 msgid "see message signing key."
 msgstr "ver chave de assinatura de mensagem."
 
-#: glossary.html.j2:143
+#: glossary.html.j2:171
 msgid "spending"
 msgstr "gasto <i>(spending)</i>"
 
-#: glossary.html.j2:145
+#: glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
@@ -1207,19 +1293,19 @@ msgstr ""
 "operação pela qual um cliente dá a um comerciante o direito de “depositar” "
 "moedas em troca de mercadorias."
 
-#: glossary.html.j2:149
+#: glossary.html.j2:177
 msgid "transfer"
 msgstr "transferência <i>(transfer)</i>"
 
-#: glossary.html.j2:151
+#: glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr "método de envio de fundos entre contas de “banco”."
 
-#: glossary.html.j2:155
+#: glossary.html.j2:183
 msgid "transaction"
 msgstr "transação <i>(transaction)</i>"
 
-#: glossary.html.j2:157
+#: glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
@@ -1227,39 +1313,39 @@ msgstr ""
 "método pelo qual a propriedade é transferida exclusivamente de uma entidade "
 "para outra."
 
-#: glossary.html.j2:161
+#: glossary.html.j2:189
 msgid "transaction id"
 msgstr "id de transação <i>(transaction id)</i>"
 
-#: glossary.html.j2:163
+#: glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr "número único pelo qual um comerciante identifica uma “transação”."
 
-#: glossary.html.j2:167
+#: glossary.html.j2:195
 msgid "wallet"
 msgstr "carteira <i>(wallet)</i>"
 
-#: glossary.html.j2:169
+#: glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 "software sendo executado no computador de um cliente; saca, armazena e gasta "
 "moedas."
 
-#: glossary.html.j2:173
+#: glossary.html.j2:201
 msgid "wire transfer"
 msgstr "transferência eletrônica <i>(wire transfer)</i>"
 
-#: glossary.html.j2:175
+#: glossary.html.j2:203
 msgid "see `transfer`"
 msgstr "veja “transferência”."
 
-#: glossary.html.j2:179
+#: glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 "identificador de transferência eletrônica <i>(wire transfer identifier)</i>"
 
-#: glossary.html.j2:181
+#: glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
@@ -1267,17 +1353,32 @@ msgstr ""
 "assunto de uma “transferência” bancária; geralmente, uma string aleatória "
 "para identificar de forma única a “transferência”."
 
-#: glossary.html.j2:185
+#: glossary.html.j2:213
 msgid "withdrawal"
 msgstr "saque <i>(withdrawal)</i>"
 
-#: glossary.html.j2:187
+#: glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 "operação através da qual uma “carteira” pode converter fundos de uma reserva "
 "para moedas novas."
 
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr "Vantagens para governos"
@@ -1542,18 +1643,26 @@ msgstr ""
 
 #: gsoc-codeless.html.j2:33
 msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
+msgstr ""
+
+#: gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1563,7 +1672,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1571,31 +1680,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1604,7 +1713,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1612,7 +1721,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1624,7 +1733,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1632,7 +1741,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1642,7 +1751,7 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
@@ -1984,6 +2093,192 @@ msgstr "Essa página documenta o histórico do GNU Taler."
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler na imprensa"
 
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "GNU Taler na imprensa"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"Customers benefit from Free Software as the wallet software can be made to "
+"run on a variety of platforms, and the absence of user-hostile features such "
+"as tracking or telemetry can easily be assured."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "Como o Taler protege minha privacidade?"
+
+#: principles.html.j2:70
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"In legislations with data protection regulations (such as the recently "
+"introduced GDPR in Europe), merchants benefit from this as well, as no data "
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Antilavagem de dinheiro (AML)"
+
+#: principles.html.j2:99
+msgid ""
+"As a payment system must still be legal to operate and use, it must comply "
+"with these requirements. Furthermore, we consider levying of taxes as "
+"beneficial to society."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+msgid ""
+"This imposes requirements on the security of the system, as well as on the "
+"general design, as payment fraud can also happen through misleading user "
+"interface design or the lack of cryptographic evidence for certain processes."
+msgstr ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "Regulação de Proteção de Dados Pessoais (GDPR)"
+
+#: principles.html.j2:134
+msgid ""
+"The reason behind this goal is similar to (2). The privacy of buyers is "
+"given priority, but other parties such as merchants still benefit from it, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"Specifically it must be usable for non-expert customers. Usability also "
+"applies to the integration with merchants, and informs choices about the "
+"architecture, such as encapsulating procedures that require cryptographic "
+"operations into an isolated component with a simple API."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Eficiente"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Eficiente"
+
+#: principles.html.j2:168
+msgid ""
+"Approaches such as proof-of-work are ruled out by this requirement. "
+"Efficiency is necessary for GNU Taler to be used for micropayments."
+msgstr ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"Taler should tolerate failure of individual components and systems, "
+"including malicious operators compromising core secrets. This manifests in "
+"architectural choices such as the isolation of certain components, and "
+"auditing procedures."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+msgid ""
+"It must be relatively easy for competitors to join the systems. While the "
+"barriers for this in traditional financial systems are rather high, the "
+"technical burden for new competitors to join must be minimized. Another "
+"design choice that supports this is to split the whole system into smaller "
+"components that can be operated, developed and improved upon independently, "
+"instead of having one completely monolithic system."
+msgstr ""
+
 #: schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
@@ -2004,66 +2299,73 @@ msgstr ""
 "Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
 "diferentes indústrias, …."
 
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Criptografia aplicada. Contato para W3c &amp; Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
 
 #: team.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Fundações teóricas."
+msgid "GNU mainatiner, lead developer."
+msgstr ""
 
 #: team.html.j2:38
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Criptografia aplicada. Contato para W3c &amp; Tor."
+
+#: team.html.j2:43
 msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr "Fundador do projeto GNU. Orientação ética e licenciamento."
 
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr ""
-"Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
-
 #: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Estudante de PhD, Inria."
-
-#: team.html.j2:55
 msgid "Software engineer."
 msgstr "Engenheiro de software."
 
-#: team.html.j2:62
+#: team.html.j2:55
 msgid "Sustainable business development."
 msgstr "Desenvolvimento empresarial sustentável."
 
+#: team.html.j2:60
+msgid "Theoretical foundations."
+msgstr "Fundações teóricas."
+
 #: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Engenheiro de software. Funciona em libebics."
+msgid "System administration, Taler Systems SA."
+msgstr ""
 
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr "Tradutor (Espanhol)"
 
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
 msgid "Translator (Italian)"
 msgstr "Tradutor (Italiano)"
 
-#: team.html.j2:98
+#: team.html.j2:99
 msgid "Translator (German)"
 msgstr "Tradutor (Alemão)"
 
-#: team.html.j2:104
+#: team.html.j2:106
 msgid "Hardware security module"
 msgstr "Módulo de segurança de hardware"
 
-#: team.html.j2:108
+#: team.html.j2:110
 msgid "Risk management"
 msgstr "Gerenciamento de risco"
 
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+"Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
+
+#: team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudante PhD, Universidade Técnica de Munique. Atualmente lecionando."
 
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler para desenvolvedores"
 
 #: common/base.j2:5
 msgid "GNU Taler"
@@ -2117,31 +2419,32 @@ msgstr ""
 msgid "Docs"
 msgstr ""
 
-#~ msgid "Developer Resources"
-#~ msgstr "Recursos para desenvolvedores"
-
-#~ msgid "About"
-#~ msgstr "Sobre"
-
-#~ msgid "For Investors"
-#~ msgstr "Para investidores"
-
-#~ msgid "Citizens"
-#~ msgstr "Cidadãos"
-
-#~ msgid "Merchants"
-#~ msgstr "Comerciantes"
+#, fuzzy
+#~| msgid "exchange"
+#~ msgid "Code (Exchange)"
+#~ msgstr "câmbio <i>(exchange)</i>"
 
-#~ msgid "Governments"
-#~ msgstr "Governos"
+#, fuzzy
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "O backend de comerciante do GNU Taler"
 
+#, fuzzy
+#~| msgid ""
+#~| "<p>To pay with Taler, customers install an electronic wallet on their "
+#~| "device. Before the first payment, the desired currency must be added to "
+#~| "the wallet's balance by some other means of payment.</p> <p>Once the "
+#~| "wallet is charged, payments on websites take only one click, are never "
+#~| "falsely rejected by fraud detection and do not pose any risk of phishing "
+#~| "or identity theft.</p>"
 #~ msgid ""
 #~ "<p>To pay with Taler, customers install an electronic wallet on their "
 #~ "device. Before the first payment, the desired currency must be added to "
 #~ "the wallet's balance by some other means of payment.</p> <p>Once the "
 #~ "wallet is charged, payments on websites take only one click, are never "
 #~ "falsely rejected by fraud detection and do not pose any risk of phishing "
-#~ "or identity theft.</p>"
+#~ "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 "
@@ -2150,12 +2453,22 @@ msgstr ""
 #~ "um clique, nunca são falsamente rejeitados pela detecção de fraude e não "
 #~ "apresentam risco de phishing ou roubo de identidade.</p>"
 
+#, 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>"
+#~ "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 "
@@ -2164,6 +2477,33 @@ msgstr ""
 #~ "executado nas instalações do comerciante ou ser hospedado por um terceiro."
 #~ "</p>"
 
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Estudante de PhD, Inria."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Engenheiro de software. Funciona em libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
+
+#~ msgid "Developer Resources"
+#~ msgstr "Recursos para desenvolvedores"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "For Investors"
+#~ msgstr "Para investidores"
+
+#~ msgid "Citizens"
+#~ msgstr "Cidadãos"
+
+#~ msgid "Merchants"
+#~ msgstr "Comerciantes"
+
+#~ msgid "Governments"
+#~ msgstr "Governos"
+
 #~ msgid ""
 #~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
 #~ "Your digital wallet is safer than your physical wallet. At most, you can "
diff --git a/locale/ru/LC_MESSAGES/messages.po 
b/locale/ru/LC_MESSAGES/messages.po
index b493b0a..aca8ea9 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+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"
@@ -28,16 +28,16 @@ msgid "GNU Taler Bibliography"
 msgstr ""
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
 msgid "by"
 msgstr ""
 
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
 msgid "and"
 msgstr ""
 
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
 msgid "available upon request"
 msgstr ""
 
@@ -68,21 +68,31 @@ msgid ""
 msgstr ""
 
 #: contact.html.j2:36
-msgid "Reporting bugs"
+msgid "General inquiries"
 msgstr ""
 
 #: contact.html.j2:38
 msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
+msgid "Reporting bugs"
+msgstr ""
+
+#: contact.html.j2:48
+msgid ""
 "We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
 "bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
 "also report bugs or feature requests to the mailing list."
 msgstr ""
 
-#: contact.html.j2:49
+#: contact.html.j2:59
 msgid "Executive team"
 msgstr ""
 
-#: contact.html.j2:51
+#: contact.html.j2:61
 msgid ""
 "For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
 "tt>."
@@ -314,98 +324,72 @@ msgid ""
 "circulation during the period of the compromise."
 msgstr ""
 
-#: docs.html.j2:22
+#: docs.html.j2:37
 msgid "Tutorial and manual for operating a merchant"
 msgstr ""
 
-#: docs.html.j2:23
+#: docs.html.j2:38
 msgid "Also available as"
 msgstr ""
 
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
 msgstr ""
 
-#: docs.html.j2:31
+#: docs.html.j2:46
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
 msgstr ""
 
-#: docs.html.j2:58
+#: docs.html.j2:57
 msgid "Operator's manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
-#: docs.html.j2:67
+#: docs.html.j2:66
 msgid "Bank Integration"
 msgstr ""
 
-#: docs.html.j2:69
+#: docs.html.j2:68
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
 "available as"
 msgstr ""
 
-#: docs.html.j2:78
+#: docs.html.j2:83
 msgid "Back office"
 msgstr ""
 
-#: docs.html.j2:80
+#: docs.html.j2:85
 msgid "Manual to run the back-office Web application. Also available as"
 msgstr ""
 
-#: docs.html.j2:105
+#: docs.html.j2:110
 msgid "Reference for the HTTP-based API for Taler components."
 msgstr ""
 
-#: docs.html.j2:113
+#: docs.html.j2:118
 msgid ""
 "Description of our taler.net setup and how to contribute. Also available as"
 msgstr ""
 
-#: docs.html.j2:139
+#: docs.html.j2:144
 msgid "The official GNU Taler mailing list."
 msgstr ""
 
-#: docs.html.j2:147
+#: docs.html.j2:152
 msgid "Our IRC channel is #taler on freenode."
 msgstr ""
 
-#: docs.html.j2:155
+#: docs.html.j2:160
 msgid "Our bug tracker for bugs and feature request."
 msgstr ""
 
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-msgid "Code (Merchant backend)"
-msgstr ""
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
 msgid "Git repositories"
 msgstr ""
 
-#: docs.html.j2:203
+#: docs.html.j2:184
 msgid "Git repositories for all of GNU Taler."
 msgstr ""
 
@@ -619,53 +603,103 @@ msgid ""
 "feature that we are targeting for Taler 1.0. at this time</p>"
 msgstr ""
 
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"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>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+msgid ""
+"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+
+#: features.html.j2:37
+msgid ""
+"When making a payment, customers only need a charged wallet. A merchant can "
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
 msgid "Paying with Taler"
 msgstr ""
 
-#: features.html.j2:42
+#: features.html.j2:62
+msgid ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+
+#: features.html.j2:70
 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>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
 msgstr ""
 
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
 msgid "Receiving payments with Taler"
 msgstr ""
 
-#: features.html.j2:55
+#: features.html.j2:85
 msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"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
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
 msgid "Practical"
 msgstr ""
 
-#: features.html.j2:77
+#: features.html.j2:116
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
 "extremely low transaction costs."
 msgstr ""
 
-#: features.html.j2:87
+#: features.html.j2:126
 msgid "Stable"
 msgstr ""
 
-#: features.html.j2:90
+#: features.html.j2:129
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
@@ -673,44 +707,44 @@ msgid ""
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
 msgid "Secure"
 msgstr ""
 
-#: features.html.j2:104
+#: features.html.j2:143
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
 "rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
 msgid "Taxable"
 msgstr ""
 
-#: features.html.j2:119
+#: features.html.j2:158
 msgid ""
 "When using Taler, merchant's revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
 
-#: features.html.j2:129
+#: features.html.j2:168
 msgid "Private"
 msgstr ""
 
-#: features.html.j2:131
+#: features.html.j2:170
 msgid ""
 "When you pay with Taler, your identity does not have to be revealed. Just "
 "like payments in cash, nobody else can track how you spent your electronic "
 "money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
 msgid "Libre"
 msgstr ""
 
-#: features.html.j2:145
+#: features.html.j2:184
 msgid ""
 "Taler provides protocols and reference implementations that in principle "
 "enables anybody to run their own payment infrastructure, be it individuals, "
@@ -817,44 +851,61 @@ msgid ""
 msgstr ""
 
 #: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
 msgstr ""
 
 #: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
 msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
-#: glossary.html.j2:66
+#: glossary.html.j2:80
 msgid "fresh coin"
 msgstr ""
 
-#: glossary.html.j2:68
+#: glossary.html.j2:82
 msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
-#: glossary.html.j2:72
+#: glossary.html.j2:86
 msgid "master key"
 msgstr ""
 
-#: glossary.html.j2:74
+#: glossary.html.j2:88
 msgid ""
 "offline key used by the exchange to certify denomination keys and message "
 "signing keys"
 msgstr ""
 
-#: glossary.html.j2:78
+#: glossary.html.j2:92
 msgid "message signing key"
 msgstr ""
 
-#: glossary.html.j2:80
+#: glossary.html.j2:94
 msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
-#: glossary.html.j2:84
+#: glossary.html.j2:98
 msgid "offer"
 msgstr ""
 
-#: glossary.html.j2:86
+#: glossary.html.j2:100
 msgid ""
 "specification of the details of a transaction, specifies the payment "
 "obligations for the customer (i.e. the amount), the deliverables of the "
@@ -864,154 +915,192 @@ msgid ""
 "and signs it, it becomes a proposal."
 msgstr ""
 
-#: glossary.html.j2:95
+#: glossary.html.j2:109
 msgid "owner"
 msgstr ""
 
-#: glossary.html.j2:97
+#: glossary.html.j2:111
 msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
 msgid "proof"
 msgstr ""
 
-#: glossary.html.j2:103
+#: glossary.html.j2:125
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
 "correct"
 msgstr ""
 
-#: glossary.html.j2:107
+#: glossary.html.j2:129
 msgid "proposal"
 msgstr ""
 
-#: glossary.html.j2:109
+#: glossary.html.j2:131
 msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
-#: glossary.html.j2:113
+#: glossary.html.j2:135
 msgid "reserve"
 msgstr ""
 
-#: glossary.html.j2:115
+#: glossary.html.j2:137
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
 "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
 "account to cover obligations from coins in circulation"
 msgstr ""
 
-#: glossary.html.j2:119
+#: glossary.html.j2:141
 msgid "refreshing"
 msgstr ""
 
-#: glossary.html.j2:121
+#: glossary.html.j2:143
 msgid ""
 "operation by which a `dirty` `coin` is converted into one or more `fresh` "
 "coins"
 msgstr ""
 
-#: glossary.html.j2:125
+#: glossary.html.j2:147
 msgid "refund"
 msgstr ""
 
-#: glossary.html.j2:127
+#: glossary.html.j2:149
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
 "obtained from a `deposit` operation, giving the right to the funds back to "
 "the customer"
 msgstr ""
 
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+msgid "revocation"
+msgstr ""
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
 msgid "sharing"
 msgstr ""
 
-#: glossary.html.j2:133
+#: glossary.html.j2:161
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
 "private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
-#: glossary.html.j2:137
+#: glossary.html.j2:165
 msgid "signing key"
 msgstr ""
 
-#: glossary.html.j2:139
+#: glossary.html.j2:167
 msgid "see message signing key."
 msgstr ""
 
-#: glossary.html.j2:143
+#: glossary.html.j2:171
 msgid "spending"
 msgstr ""
 
-#: glossary.html.j2:145
+#: glossary.html.j2:173
 msgid ""
 "operation by which a customer gives a merchant the right to `deposit` coins "
 "in return for merchandise"
 msgstr ""
 
-#: glossary.html.j2:149
+#: glossary.html.j2:177
 msgid "transfer"
 msgstr ""
 
-#: glossary.html.j2:151
+#: glossary.html.j2:179
 msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
-#: glossary.html.j2:155
+#: glossary.html.j2:183
 msgid "transaction"
 msgstr ""
 
-#: glossary.html.j2:157
+#: glossary.html.j2:185
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
 "another"
 msgstr ""
 
-#: glossary.html.j2:161
+#: glossary.html.j2:189
 msgid "transaction id"
 msgstr ""
 
-#: glossary.html.j2:163
+#: glossary.html.j2:191
 msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
-#: glossary.html.j2:167
+#: glossary.html.j2:195
 msgid "wallet"
 msgstr ""
 
-#: glossary.html.j2:169
+#: glossary.html.j2:197
 msgid ""
 "software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
-#: glossary.html.j2:173
+#: glossary.html.j2:201
 msgid "wire transfer"
 msgstr ""
 
-#: glossary.html.j2:175
+#: glossary.html.j2:203
 msgid "see `transfer`"
 msgstr ""
 
-#: glossary.html.j2:179
+#: glossary.html.j2:207
 msgid "wire transfer identifier"
 msgstr ""
 
-#: glossary.html.j2:181
+#: glossary.html.j2:209
 msgid ""
 "subject of a wire `transfer`; usually a random string to uniquely identify "
 "the `transfer`"
 msgstr ""
 
-#: glossary.html.j2:185
+#: glossary.html.j2:213
 msgid "withdrawal"
 msgstr ""
 
-#: glossary.html.j2:187
+#: glossary.html.j2:215
 msgid ""
 "operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1211,18 +1300,26 @@ msgstr ""
 
 #: gsoc-codeless.html.j2:33
 msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
+msgstr ""
+
+#: gsoc-codeless.html.j2:50
 msgid ""
 "The buyers will access the seller's frontend where the code for the 'Buy "
 "Now' button is present. When this button is triggered, they are redirected "
@@ -1232,7 +1329,7 @@ msgid ""
 "frontend."
 msgstr ""
 
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
 msgid ""
 "The other use case of the codeless payment backend is to handle the event "
 "when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1240,31 +1337,31 @@ msgid ""
 "successful payment, the users are redirected to the fulfilment page."
 msgstr ""
 
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
 msgid "Dynamic Merchant Instance"
 msgstr ""
 
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
 msgid "Use Case Diagram"
 msgstr ""
 
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
 msgid "Link to the contributions made"
 msgstr ""
 
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
 msgid "Codeless Payment Backend"
 msgstr ""
 
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
 msgid "Documentation to dynamically manage Merchant Instances"
 msgstr ""
 
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
 msgid "Future Work"
 msgstr ""
 
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
 msgid ""
 "The backend of codeless payment is very robust and can be easily extended as "
 "per the requirements. It is adaptive to add new features to this framework. "
@@ -1273,7 +1370,7 @@ msgid ""
 "of future work is as follows:"
 msgstr ""
 
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
 msgid ""
 "To send email notification to the merchant when the stocks run below a "
 "certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1281,7 +1378,7 @@ msgid ""
 "notification system is designed."
 msgstr ""
 
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
 msgid ""
 "To add API access to the merchant backend via the codeless payment service. "
 "Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1293,7 +1390,7 @@ msgid ""
 "codeless payments service."
 msgstr ""
 
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
 msgid ""
 "Mapping every seller account to a separate merchant backend instance. This "
 "is not required for a simple version of codeless payments, but as soon as "
@@ -1301,7 +1398,7 @@ msgid ""
 "service then can also double as a hosting service for merchants."
 msgstr ""
 
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
 msgid ""
 "To add various analytics for the merchant. Various analysis could be "
 "performed on the orders placed for the respective merchant. Some of the "
@@ -1311,7 +1408,7 @@ msgid ""
 "research have to be done before proceeding to the implementation."
 msgstr ""
 
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
 msgid "Screenshots"
 msgstr ""
 
@@ -1570,6 +1667,180 @@ msgstr ""
 msgid "GNU Taler in the Press"
 msgstr ""
 
+#: principles.html.j2:22
+msgid "GNU Taler: Design Principles"
+msgstr ""
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"Customers benefit from Free Software as the wallet software can be made to "
+"run on a variety of platforms, and the absence of user-hostile features such "
+"as tracking or telemetry can easily be assured."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+msgid "You deserve some privacy"
+msgstr ""
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"In legislations with data protection regulations (such as the recently "
+"introduced GDPR in Europe), merchants benefit from this as well, as no data "
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+msgid "Money laundering"
+msgstr ""
+
+#: principles.html.j2:99
+msgid ""
+"As a payment system must still be legal to operate and use, it must comply "
+"with these requirements. Furthermore, we consider levying of taxes as "
+"beneficial to society."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+msgid ""
+"This imposes requirements on the security of the system, as well as on the "
+"general design, as payment fraud can also happen through misleading user "
+"interface design or the lack of cryptographic evidence for certain processes."
+msgstr ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr ""
+
+#: principles.html.j2:134
+msgid ""
+"The reason behind this goal is similar to (2). The privacy of buyers is "
+"given priority, but other parties such as merchants still benefit from it, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"Specifically it must be usable for non-expert customers. Usability also "
+"applies to the integration with merchants, and informs choices about the "
+"architecture, such as encapsulating procedures that require cryptographic "
+"operations into an isolated component with a simple API."
+msgstr ""
+
+#: principles.html.j2:162
+msgid "7. Be efficient"
+msgstr ""
+
+#: principles.html.j2:166
+msgid "Energy efficiency"
+msgstr ""
+
+#: principles.html.j2:168
+msgid ""
+"Approaches such as proof-of-work are ruled out by this requirement. "
+"Efficiency is necessary for GNU Taler to be used for micropayments."
+msgstr ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"Taler should tolerate failure of individual components and systems, "
+"including malicious operators compromising core secrets. This manifests in "
+"architectural choices such as the isolation of certain components, and "
+"auditing procedures."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+msgid ""
+"It must be relatively easy for competitors to join the systems. While the "
+"barriers for this in traditional financial systems are rather high, the "
+"technical burden for new competitors to join must be minimized. Another "
+"design choice that supports this is to split the whole system into smaller "
+"components that can be operated, developed and improved upon independently, "
+"instead of having one completely monolithic system."
+msgstr ""
+
 #: schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr ""
@@ -1586,64 +1857,69 @@ msgid ""
 "industries, …."
 msgstr ""
 
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
 msgstr ""
 
 #: team.html.j2:33
-msgid "Theoretical foundations."
+msgid "GNU mainatiner, lead developer."
 msgstr ""
 
 #: team.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
 msgstr ""
 
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
+#: team.html.j2:43
+msgid "Founder of the GNU project. Ethical guidance and licensing."
 msgstr ""
 
 #: team.html.j2:50
-msgid "PhD Student, Inria.."
+msgid "Software engineer."
 msgstr ""
 
 #: team.html.j2:55
-msgid "Software engineer."
+msgid "Sustainable business development."
 msgstr ""
 
-#: team.html.j2:62
-msgid "Sustainable business development."
+#: team.html.j2:60
+msgid "Theoretical foundations."
 msgstr ""
 
 #: team.html.j2:66
-msgid "Software engineer. Works on libebics."
+msgid "System administration, Taler Systems SA."
 msgstr ""
 
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
 msgid "Translator (Italian)"
 msgstr ""
 
-#: team.html.j2:98
+#: team.html.j2:99
 msgid "Translator (German)"
 msgstr ""
 
-#: team.html.j2:104
+#: team.html.j2:106
 msgid "Hardware security module"
 msgstr ""
 
-#: team.html.j2:108
+#: team.html.j2:110
 msgid "Risk management"
 msgstr ""
 
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:122
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+msgid "Free software developer."
 msgstr ""
 
 #: common/base.j2:5
diff --git a/principles.html.j2 b/principles.html.j2
index 854ebce..e1b94e1 100644
--- a/principles.html.j2
+++ b/principles.html.j2
@@ -18,129 +18,194 @@ h2 {
 <div class="container">
   <div class="row">
     <div class="col">
-      <h1>GNU Taler: Design Principles</h1>
+      <h1>
+      {% trans %}
+      GNU Taler: Design Principles
+      {% endtrans %}
+      </h1>
     </div>
   </div>
-  <p>When designing GNU Taler, we had the following design principles in 
mind:</p>
+  <p>
+  {% trans %}
+  When designing GNU Taler, we had the following design principles in mind:
+  {% endtrans %}
+  </p>
   <div class="row">
     <div class="col-lg-12">
-      <h2>1. Free Software implementation</h2>
-      <a href="https://www.gnu.org/graphics/freedom.html";><img 
style="width:20vw;float:right" src="../images/stallman.medium.png" alt="... in 
the are of computing, freedom means not using proprietary software"></a>
+      <h2>
+      {% trans %}
+         1. Free Software implementation
+      {% endtrans %}
+      </h2>
+      <a href="https://www.gnu.org/graphics/freedom.html";><img 
style="width:20vw;float:right" src="../images/stallman.medium.png" 
alt="{{_("... in the are of computing, freedom means not using proprietary 
software")}}"></a>
       <p>
+        {% trans %}
         GNU Taler must be <a 
href="https://www.gnu.org/philosophy/free-sw.html";>Free Software</a>.
         For merchants, our Free Software
         reference implementation prevents vendor lock-in. As
         the software of the payment provider itself is free, countries can
         deploy the payment system without compromising sovereignty.
+        {% endtrans %}
        </p>
        <p>
+        {% trans %}
         Customers benefit from Free Software
         as the wallet software can be made to run on a variety of platforms, 
and
         the absence of user-hostile features such as tracking or telemetry can 
easily be
         assured.
+        {% endtrans %}
       </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>2. Protect the privacy of buyers</h2>
+      <h2>
+      {% trans %}
+      2. Protect the privacy of buyers
+      {% endtrans %}
+      </h2>
       <!-- From https://www.pixabay.com/ -->
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/anonymous.jpg" alt="You deserve some privacy">
+      <img style="width:20vw;float:left;padding:15px" 
src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}">
       <p>
+        {% trans %}
         Privacy should be guaranteed via technical measures, as opposed to mere
         policies. Especially with micropayments for online content, a 
disproportion-
         ate amount of rather private data about buyers would be revealed, if 
the
         payment system does not have privacy protections.
+        {% endtrans %}
       </p>
       <p>
+        {% trans %}
         In legislations with data protection regulations (such as the recently 
introduced GDPR in Europe),
         merchants benefit from this as well, as
         no data breach of customers can happen if this information is, by 
design,
         not collected in the first place. Obviously some private data, such as 
the
         shipping address for a physical delivery, must still be collected 
according to
         business needs.
-      </p>
+        {% endtrans %}
+     </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>3. Enable the state to tax income and crack down on illegal business 
activities</h2>
+      <h2>
+      {% trans %}
+         3. Enable the state to tax income and crack down on illegal business 
activities
+      {% endtrans %}
+      </h2>
       <!-- From https://www.pxhere.com/ -->
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/money-laundering.medium.jpg" alt="Money laundering">
+      <img style="width:20vw;float:right;padding:15px" 
src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}">
       <p>
+      {% trans %}
         As a payment system must still be legal to operate and use, it must 
comply
         with these requirements. Furthermore, we consider levying of taxes as
         beneficial to society.
+      {% endtrans %}
       </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>4. Prevent payment fraud</h2>
+      <h2>
+      {% trans %}
+      4. Prevent payment fraud
+      {% endtrans %}
+      </h2>
       <!-- From https://www.maxpixel.net/ -->
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/fraud.medium.jpg" alt="Phishing attack">
+      <img style="width:20vw;float:left;padding:15px" 
src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}">
       <p>
+      {% trans %}
         This imposes requirements on the security of the system, as well as on 
the
         general design, as payment fraud can also happen through misleading 
user
         interface design or the lack of cryptographic evidence for certain 
processes.
+      {% endtrans %}
       </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>5. Only disclose the minimal amount of information necessary</h2>
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/gdpr.medium.jpg" alt="Privacy by design, privacy by default, 
General Data Protection Regulation (GDPR) compliant"></a>
+      <h2>
+      {% trans %}
+      5. Only disclose the minimal amount of information necessary
+      {% endtrans %}
+      </h2>
+      <img style="width:20vw;float:right;padding:15px" 
src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by 
default, General Data Protection Regulation (GDPR) compliant")}}"></a>
       <p>
+      {% trans %}
         The reason behind this goal is similar to (2). The privacy of buyers 
is given
         priority, but other parties such as merchants still benefit from it, 
for example,
         by keeping details about the merchant’s financials hidden from 
competitors.
+      {% endtrans %}
       </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>6. Be usable</h2>
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/buy.medium.jpg" alt="Buy with one click"></a>
+      <h2>{% trans %}
+      6. Be usable
+      {% endtrans %}
+      </h2>
+      <img style="width:20vw;float:left;padding:15px" 
src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}"></a>
       <p>
+      {% trans %}
 Specifically it must be usable for non-expert customers. Usability also
 applies to the integration with merchants, and informs choices about the
 architecture, such as encapsulating procedures that require cryptographic
 operations into an isolated component with a simple API.
+      {% endtrans %}
       </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>7. Be efficient</h2>
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/efficient.png" alt="Energy efficiency"></a>
+      <h2>
+      {% trans %}
+      7. Be efficient
+      {% endtrans %}
+      </h2>
+      <img style="width:20vw;float:right;padding:15px" 
src="../images/efficient.png" alt="{{_("Energy efficiency")}}"></a>
       <p>
+      {% trans %}
          Approaches such as proof-of-work are ruled out by this requirement. 
Efficiency is necessary for GNU Taler to be used for micropayments.
+      {% endtrans %}
       </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>8. Fault-tolerant design</a></h2>
-      <img style="width:20vw;float:left;padding:15px" 
src="../images/life-safer.medium.jpg" alt="Life Safers"></a>
+      <h2>
+      {% trans %}
+      8. Fault-tolerant design
+      {% endtrans %}
+      </a></h2>
+      <img style="width:20vw;float:left;padding:15px" 
src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}"></a>
       <p>
+      {% trans %}
         Taler should tolerate failure of individual components and systems,
         including malicious operators compromising core secrets.
         This manifests in architectural choices such
         as the isolation of certain components, and auditing procedures.
+      {% endtrans %}
       </p>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-12">
-      <h2>9. Foster competition</h2>
-      <img style="width:20vw;float:right;padding:15px" 
src="../images/market.medium.jpg" alt="A competitive market"></a>
+      <h2>
+      {% trans %}
+      9. Foster competition
+      {% endtrans %}
+      </h2>
+      <img style="width:20vw;float:right;padding:15px" 
src="../images/market.medium.jpg" alt="{{_("A competitive market")}}"></a>
       <p>
+      {% trans %}
 It must be relatively easy for competitors to join the systems. While the
 barriers for this in traditional financial systems are rather high, the 
technical
 burden for new competitors to join must be minimized. Another design
 choice that supports this is to split the whole system into smaller components
 that can be operated, developed and improved upon independently,
 instead of having one completely monolithic system.
+      {% endtrans %}
       </p>
       </div>
     </div>

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



reply via email to

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