gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [taler-www] branch master updated (40bb083 -> 292c011)


From: gnunet
Subject: [GNUnet-SVN] [taler-www] branch master updated (40bb083 -> 292c011)
Date: Fri, 10 Feb 2017 16:54:07 +0100

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

grothoff pushed a change to branch master
in repository www.

    from 40bb083  add documentation, missing licensing statements, some DE fixes
     new 2d19f9b  starting to revamp main web site
     new 7b58a49  reorganizing news
     new 706be64  reorganizing financial news
     new 292c011  updates to pages based on discussions with Leon and Sva

The 4 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:
 citizens.html.j2                  |  122 ++-
 common/navigation.j2.inc          |    2 +-
 developers.html.j2                |  279 +++---
 financial-news.html.j2            |  206 ----
 financial-news.html.j2.inc        |   13 +
 financial-news/2013-09-15.inc     |   13 +
 financial-news/2014-09-10.inc     |   17 +
 financial-news/2014-11-13.inc     |   12 +
 financial-news/2014-12-05.inc     |   21 +
 financial-news/2014-12-06.inc     |    8 +
 financial-news/2015-03-17.inc     |    9 +
 financial-news/2015-04-30.inc     |   12 +
 financial-news/2015-12-22.inc     |   10 +
 financial-news/2016-07-23.inc     |    9 +
 financial-news/2016-10-15.inc     |    7 +
 financial-news/2016-10-21.inc     |    8 +
 financial-news/2016-10-24.inc     |   10 +
 financial-news/2016-10-26.inc     |   10 +
 governments.html.j2               |  175 ++--
 index.html.j2                     |  115 ++-
 investors.html.j2                 |   93 +-
 locale/de/LC_MESSAGES/messages.po | 1948 +++++++++++++++---------------------
 locale/en/LC_MESSAGES/messages.po | 1286 +++++++++++++-----------
 locale/es/LC_MESSAGES/messages.po | 1969 +++++++++++++++----------------------
 locale/fr/LC_MESSAGES/messages.po | 1943 +++++++++++++++---------------------
 locale/it/LC_MESSAGES/messages.po | 1963 +++++++++++++++---------------------
 merchants.html.j2                 |  164 +--
 news.html.j2                      |  120 ---
 news.html.j2.inc                  |   10 +
 news/2014-11.inc                  |    2 +
 news/2014-12.inc                  |    8 +
 news/2015-02.inc                  |    4 +
 news/2015-11.inc                  |    9 +
 news/2015-12.inc                  |    5 +
 news/2016-06.inc                  |   21 +
 news/2016-08.inc                  |    3 +
 news/2016-09.inc                  |    7 +
 news/2016-10.inc                  |    4 +
 news/2017-01.inc                  |    3 +
 39 files changed, 4570 insertions(+), 6050 deletions(-)
 delete mode 100644 financial-news.html.j2
 create mode 100644 financial-news.html.j2.inc
 create mode 100644 financial-news/2013-09-15.inc
 create mode 100644 financial-news/2014-09-10.inc
 create mode 100644 financial-news/2014-11-13.inc
 create mode 100644 financial-news/2014-12-05.inc
 create mode 100644 financial-news/2014-12-06.inc
 create mode 100644 financial-news/2015-03-17.inc
 create mode 100644 financial-news/2015-04-30.inc
 create mode 100644 financial-news/2015-12-22.inc
 create mode 100644 financial-news/2016-07-23.inc
 create mode 100644 financial-news/2016-10-15.inc
 create mode 100644 financial-news/2016-10-21.inc
 create mode 100644 financial-news/2016-10-24.inc
 create mode 100644 financial-news/2016-10-26.inc
 delete mode 100644 news.html.j2
 create mode 100644 news.html.j2.inc
 create mode 100644 news/2014-11.inc
 create mode 100644 news/2014-12.inc
 create mode 100644 news/2015-02.inc
 create mode 100644 news/2015-11.inc
 create mode 100644 news/2015-12.inc
 create mode 100644 news/2016-06.inc
 create mode 100644 news/2016-08.inc
 create mode 100644 news/2016-09.inc
 create mode 100644 news/2016-10.inc
 create mode 100644 news/2017-01.inc

diff --git a/citizens.html.j2 b/citizens.html.j2
index bc1019a..4c1e7fb 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -11,8 +11,17 @@
       {% include "common/navigation.j2.inc" %}
       <!-- Jumbotron -->
       <div class="jumbotron">
-        <h1>{{ _("Advantages for citizens") }}</h1>
+        <h1>{{ _("Advantages for Citizens") }}</h1>
         <!-- p><a class="btn btn-lg btn-success" href="#" role="button">Get 
started today</a></p -->
+        <div class="col-lg-12">
+
+         <p>{{ _("Taler largely functions like digital cash.  You
+                  withdraw money from your bank account into your
+                  electronic wallet, and can henceforth spend digital
+                  cash.  The electronic wallet can carry multiple
+                  currencies.") }}</p>
+
+       </div>
       </div>
 
       <!-- Example row of columns -->
@@ -20,81 +29,100 @@
         <div class="col-lg-6">
           <h2>{{ _("Security") }}</h2>
 
-          <p>{{ _("Taler is the electronic equivalent of cash, except harder 
to fake.
-             If your digital wallet is lost -- say because
-             your computer is irreparably damaged or compromised -- only the 
amount of coin
-             stored in your wallet will be lost. Unlike a physical wallet, you 
can make
-             backups of your digital wallet which can provide security against 
data loss.
-             So your digital wallet works mostly just like
-             a physical wallet, except online and without the need to manually 
count coins.") }}</p>
+          <p>{{ _("Taler uses modern cryptography, ensuring that there
+                   is no counterfeit.  Your digital wallet is safer
+                   than your physical wallet.  At most, you can lose
+                   its contents because your computer or mobile is
+                   irreparably damaged or compromised.  Unlike a
+                   physical wallet, you can make backups to secure
+                   against data loss.") }}</p>
+
         </div>
         <div class="col-lg-6">
           <h2>{{ _("Privacy") }}</h2>
 
-          <p>{{ _("Your transactions are private, neither the exchange nor 
merchant needs to
-             learn your identity. There is no need to give our credit card 
numbers or
-             other sensitive information, and the merchant will only be able 
to do
-             exactly the transaction you confirmed using your digital 
wallet.") }}</p>
+          <p>{{ _("Your transactions are private, neither the exchange
+                   nor merchant needs to learn your identity. There is
+                   no need to give out credit card numbers or other
+                   sensitive information. The merchant will only be
+                   able to do exactly the transaction you agreed to.")
+                   }}</p>
+
         </div>
       </div>
       <div class="row">
         <div class="col-lg-6">
           <h2>{{ _("Convenience") }}</h2>
 
-          <p>{{ _("You will be able to withdraw digital coins to replenish 
your wallet using
-             your credit card or SEPA transactions, similar to how you pay or 
withdraw
-             cash today.") }}</p>
+          <p>{{ _("You will be able to withdraw money to replenish the
+                   digital coins in your wallet using your credit card
+                   or wire transfers.  Afterwards you can pay with
+                   one-click using the Taler wallet, which optionally
+                   keeps your transaction history on your computer.")
+                   }}</p>
+
         </div>
         <div class="col-lg-6">
           <h2>{{ _("Stability") }}</h2>
 
-          <p>{{ _("Coins in your digital wallet will be of the same 
denomination as the
-             cash in your physical wallet. So you will not have to worry about
-             currency fluctuations or conversion rates. Like a physical wallet,
-             you can carry digital coins of different currencies in your 
digital
-             wallet at the same time.") }}</p>
+          <p>{{ _("Coins in your digital wallet will be of the same
+                   denomination as the cash in your physical wallet.
+                   Taler is not a crypto-currency, so you do not have
+                   to worry about cryto-currency related value
+                   fluctuations.  Banking with Taler is subject to the
+                   usual government protections for finanical
+                   services.") }}</p>
+
         </div>
       </div>
       <div class="col-lg-12">
         <h2 id="overview">{{ _("Taler as seen by customers") }}</h2>
 
         <p>{{ _("Customers interact with the Taler system mostly using
-          a free wallet implementation, which may be an extension or plugin
-          to their browser or a custom application on their computer(s).
-          Typical steps performed by customers are:
-        ") }}</p>
+                 a free wallet implementation, which may be an
+                 extension or plugin to their browser or a custom
+                 application on their computer(s).  Typical steps
+                 performed by customers are: ") }}</p>
+       
         <p>
         </p>
         <img src="{{ url('images/customer.svg') }}" alt="customer perspective" 
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
-          <ol>
-            <li>{{ _("The customer selects an exchange (i.e. by visiting the
-              respective website or selecting from a list of exchanges in the
-              application) and asks the wallet to create bank transfer
-              instructions to withdraw a certain amount of electronic cash.
-              The bank transfer instructions will contain an
-              access code that must be included in the subject of the
-              transaction, as well as the wire details for the exchange (i.e.
-              a SEPA account number).") }}</li>
+        <ol>
+         
+            <li>{{ _("The customer selects an exchange (i.e. by
+                      visiting the respective website or selecting
+                      from a list of exchanges in the application) and
+                      asks the wallet to create bank transfer
+                      instructions to withdraw a certain amount of
+                      electronic cash.  The bank transfer instructions
+                      will contain an access code that must be
+                      included in the subject of the transaction, as
+                      well as the wire details for the exchange (i.e.
+                      a SEPA account number).") }}</li>
 
              <li>{{ _("The customer then instructs his <b>bank</b> to
-               transfer funds from his account to the Taler exchange using
-               these instructions provided by the wallet (top left).") }}</li>
+                       transfer funds from his account to the Taler
+                       exchange using these instructions provided by
+                       the wallet (top left).") }}</li>
 
              <li>{{ _("Once the funds have arrived, the wallet will
-               automatically withdraw the electronic coins.  The
-               customer can use the wallet to review his remaining balance
-               at any time. He can also make backups to secure his digital
-               coins against hardware failures.") }}</li>
+                       automatically withdraw the electronic coins.
+                       The customer can use the wallet to review his
+                       remaining balance at any time. He can also make
+                       backups to secure his digital coins against
+                       hardware failures.") }}</li>
 
              <li>{{ _("When visiting a merchant that supports Taler,
-               an additional payment option for Taler is enabled in the 
checkout system.
-               If the customer selects payments via Taler, the wallet
-               displays the secured contract from the merchant and asks
-               for confirmation.  Taler does not require the customer
-               to provide any identity information to the merchant.
-               Transaction histories and digitally
-               signed contracts can be preserved in the wallet for future
-               review by the customer, or even use in court.") }}</li>
+                       an additional payment option for Taler is
+                       enabled in the checkout system.  If the
+                       customer selects payments via Taler, the wallet
+                       displays the secured contract from the merchant
+                       and asks for confirmation.  Taler does not
+                       require the customer to provide any identity
+                       information to the merchant.  Transaction
+                       histories and digitally signed contracts can be
+                       preserved in the wallet for future review by
+                       the customer, or even use in court.") }}</li>
           </ol>
         <p></p>
       </div>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index d0b9d91..6bb279e 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -14,7 +14,7 @@
            <li class="m_citizens"><a href="{{ url_localized('citizens.html') 
}}">{{ _("Citizens") }}</a></li>
             <li class="m_merchants"><a href="{{ 
url_localized('merchants.html') }}">{{ _("Merchants") }}</a></li>
             <li class="m_governments"><a href="{{ 
url_localized('governments.html') }}">{{ _("Governments") }}</a></li>
-            <li class="m_investors"><a href="{{ 
url_localized('investors.html') }}">{{ _("Operators") }}</a></li>
+            <li class="m_investors"><a href="{{ 
url_localized('investors.html') }}">{{ _("Investors") }}</a></li>
             <li class="m_developers"><a href="{{ 
url_localized('developers.html') }}">{{ _("Developers") }}</a></li>
             <li class="m_about"><a href="{{ url_localized('about.html') }}">{{ 
_("About&nbsp;us") }}</a></li>
           </ul>
diff --git a/developers.html.j2 b/developers.html.j2
index 253343f..f602327 100644
--- a/developers.html.j2
+++ b/developers.html.j2
@@ -20,32 +20,37 @@
           <h2>{{ _("Free") }}</h2>
 
           <p>{{ _("Taler is free software implementing an open
-            protocol. Anybody is welcome to inspect our code and
-            integrate our reference implementation into their
-            applications.  Different components of Taler are being
-            made available under different licenses. The Affero
-            GPLv3+ is used for the exchange, the LGPLv3+ is used for
-            reference code demonstrating integration with merchant
-            platforms, and licenses like Apache/Mozilla/GPLv3+ are
-            used for wallets and related customer-facing software.
-            We are open for constructive suggestions for maximizing
-            the adoption of this libre payment platform.
-          ") }}</p>
+                   protocol. Anybody is welcome to inspect our code
+                   and integrate our reference implementation into
+                   their applications.  Different components of Taler
+                   are being made available under different
+                   licenses. The Affero GPLv3+ is used for the
+                   exchange, the LGPLv3+ is used for reference code
+                   demonstrating integration with merchant platforms,
+                   and licenses like Apache/Mozilla/GPLv3+ are used
+                   for wallets and related customer-facing software.
+                   We are open for constructive suggestions for
+                   maximizing the adoption of this libre payment
+                   platform.  ") }}</p>
+
         </div>
         <div class="col-lg-6">
           <h2>{{ _("RESTful") }}</h2>
 
          <p>{{ _("Taler is designed to work on the Internet.  To
-           ensure that Taler payments can work with restrictive
-           network setups, Taler uses a RESTful protocol over HTTP or
-           HTTPS. Taler's security does not depend upon the use of
-           HTTPS, but obviously merchants may choose to offer HTTPS
-           for consistency and because it generally is better for
-           privacy compared to HTTP.  Taler uses JSON to encode
-           structure data, making it easy to integrate Taler with
-           existing Web applications.  Taler's protocol is documented
-           in detail <a href='https://api.taler.net/'>here</a>.
-          ") }}</p>
+                  ensure that Taler payments can work with
+                  restrictive network setups, Taler uses a RESTful
+                  protocol over HTTP or HTTPS. Taler's security does
+                  not depend upon the use of HTTPS, but obviously
+                  merchants may choose to offer HTTPS for consistency
+                  and because it generally is better for privacy
+                  compared to HTTP.  Taler uses JSON to encode
+                  structure data, making it easy to integrate Taler
+                  with existing Web applications.  Taler's protocol
+                  is documented in
+                  detail <a href='https://api.taler.net/'>here</a>.
+                  ") }}</p>
+         
         </div>
       </div>
       <div class="row">
@@ -53,32 +58,33 @@
           <h2>{{ _("Code") }}</h2>
 
          <p>{{ _("Taler is currently primarily developed by a
-           research team at Inria and TU Munich. However,
-           contributions from anyone are welcome.  Our Git
-           repositories can be cloned using the Git and HTTP access
-           methods against <tt>git.taler.net</tt> with the name of
-           the respective repository. A list of public repositories
-           can be found in
-           our <a href='https://git.taler.net/'>GitWeb</a>.
-          ") }}</p>
+                  research team at Inria and GNUnet e.V. However,
+                  contributions from anyone are welcome.  Our Git
+                  repositories can be cloned using the Git and HTTP
+                  access methods against <tt>git.taler.net</tt> with
+                  the name of the respective repository. A list of
+                  public repositories can be found in
+                  our <a href='https://git.taler.net/'>GitWeb</a>.
+                  ") }}</p>
+
         </div>
         <div class="col-lg-4">
           <h2>{{ _("Documentation") }}</h2>
 
           <p>{{ _("In addition to this website,
-            the <a href='https://git.taler.net/'>documented
-            code</a> and the <a href='https://api.taler.net/'>API
-            documentation</a>, we are in the process of preparing a
-            comprehensive design document which will be published here
-            soon.
-          ") }}</p>
+                   the <a href='https://git.taler.net/'>documented
+                   code</a> and
+                   the <a href='https://api.taler.net/'>API
+                   documentation</a>, we are in the process of
+                   preparing a comprehensive design document which
+                   will be published here soon.  ") }}</p>
         </div>
          <div class="col-lg-4">
           <h2>{{ _("Discussion") }}</h2>
 
           <p>{{ _("We have a mailinglist for developer discussions.
-            You can subscribe to it or read the list archive at
-            <a 
href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>.")
 }}</p>
+                   You can subscribe to it or read the list archive at
+                   <a 
href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>.")
 }}</p>
         </div>
       </div>
 
@@ -86,134 +92,141 @@
         <div class="col-lg-4">
           <h2>{{ _("Regression Testing") }}</h2>
 
-          <p>{{ _("We
-            have <a href='https://buildbot.net/'>Buildbot</a>
-            automation tests to detect regressions and check for
-            portability at
+          <p>{{ _("We have
+                   <a href='https://buildbot.net/'>Buildbot</a>
+                   automation tests to detect regressions and check
+                   for portability at
             <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.
           ") }}</p>
         </div>
         <div class="col-lg-4" note="not yet operational">
           <h2>{{ _("Code Coverage Analysis") }}</h2>
 
-          <p>{{ _("We
-            use <a href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>
-            to analyze the code coverage of our tests, the results are
-            available
-            at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.
-          ") }}</p>
+          <p>{{ _("We use
+                   <a 
href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>
+                   to analyze the code coverage of our tests, the
+                   results are available
+                   at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.
+                   ") }}</p>
         </div>
         <div class="col-lg-4">
           <h2>{{ _("Performance Analysis") }}</h2>
 
           <p>{{ _("We
-            use <a href='https://gnunet.org/gauger'>Gauger</a> for
-            performance regression analysis of the exchange backend
-            at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.
-          ") }}</p>
+                   use <a href='https://gnunet.org/gauger'>Gauger</a>
+                   for performance regression analysis of the exchange
+                   backend
+                   at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.
+                   ") }}</p>
         </div>
       </div>
 
       <div class="col-lg-12">
         <h2 id="overview">{{ _("Taler system overview") }}</h2>
 
-        <p>{{ _("The Taler system consists of protocols executed
-          among a number of actors with the help
-          of <a href='https://www.fsf.org/'>Free Software</a> as
-          illustrated in the illustration on the right.  Typical
-          transactions involve the following steps:
-        ") }}</p>
+        <p>{{ _("The Taler system consists of protocols executed among
+                 a number of actors with the help
+                 of <a href='https://www.fsf.org/'>Free Software</a>
+                 as illustrated in the illustration on the right.
+                 Typical transactions involve the following steps: ")
+                 }}</p>
 
           <img src="{{ url('images/system.svg') }}" alt="system overview" 
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
           <ol>
              <li>{{ _("A customer instructs his <b>bank</b> to
-               transfer funds from his account to the Taler exchange
-               (top left).  In the subject of the transaction, he
-               includes an authentication token from his
-               electronic <b>wallet</b>. In Taler terminology, the
-               customer creates a reserve at the exchange.
-             ") }}</li>
-
-             <li>{{ _("Once the exchange has received the
-               transfer, it allows the customer's electronic wallet
-               to <b>withdraw</b> electronic coins.  The electronic
-               coins are digital representations of the original
-               currency from the transfer. It is important to note
-               that the exchange does not learn the &quot;serial numbers&quot;
-               of the coins created in this process, so it cannot tell
-               later which customer purchased what at which merchant.
-               The use of Taler does not change the currency or the
-               total value of the funds (except for fees which the
-               exchange may charge for the service).
-             ") }}</li>
-
-             <li>{{ _("Once the customer has the digital coins in
-               his wallet, the wallet can be used to <b>spend</b> the
-               coins with merchant portals that support the Taler
-               payment system and accept the respective exchange as a
-               business partner (bottom arrow). This creates a digital
-               contract signed by the customer's coins and the
-               merchant.  If necessary, the customer can later use
-               this digitally signed contract in a court of law to
-               prove the exact terms of the contract and that he paid
-               the respective amount. The customer does not learn the
-               banking details of the merchant, and Taler does not
-               require the merchant to learn the identity of the
-               customer. Naturally, the customer can spend any
-               fraction of his digital coins (the system takes care of
-               customers getting change).
-             ") }}</li>
+                       transfer funds from his account to the Taler
+                       exchange (top left).  In the subject of the
+                       transaction, he includes an authentication
+                       token from his electronic <b>wallet</b>. In
+                       Taler terminology, the customer creates a
+                       reserve at the exchange.  ") }}</li>
+
+             <li>{{ _("Once the exchange has received the wire
+                       transfer, it allows the customer's electronic
+                       wallet to <b>withdraw</b> electronic coins.
+                       The electronic coins are digital
+                       representations of the original currency from
+                       the transfer. It is important to note that the
+                       exchange does not learn the &quot;serial
+                       numbers&quot; of the coins created in this
+                       process, so it cannot tell later which customer
+                       purchased what at which merchant.  The use of
+                       Taler does not change the currency or the total
+                       value of the funds (except for fees which the
+                       exchange may charge for the service).  ")
+                       }}</li>
+
+             <li>{{ _("Once the customer has the digital coins in his
+                       wallet, the wallet can be used to <b>spend</b>
+                       the coins with merchant portals that support
+                       the Taler payment system and accept the
+                       respective exchange as a business partner
+                       (bottom arrow). This creates a digital contract
+                       signed by the customer's coins and the
+                       merchant.  If necessary, the customer can later
+                       use this digitally signed contract in a court
+                       of law to prove the exact terms of the contract
+                       and that he paid the respective amount. The
+                       customer does not learn the banking details of
+                       the merchant, and Taler does not require the
+                       merchant to learn the identity of the
+                       customer. Naturally, the customer can spend any
+                       fraction of his digital coins (the system takes
+                       care of customers getting change).  ") }}</li>
 
              <li>{{ _("Merchants receiving digital
-               coins <b>deposit</b> the respective receipts that
-               resulted from the contract signing with the customer at
-               the exchange to redeem the coins.  The deposit step
-               does not reveal the details of the contract between the
-               customer and the merchant or the identity of the
-               customer to the exchange in any way. However, the
-               exchange does learn the identity of the merchant via
-               the provided bank routing information.  The merchant
-               can, for example when compelled by the state for
-               taxation, provide information linking the individual
-               deposit to the respective contract signed by the
-               customer. Thus, the exchange's database allows the
-               state to enforce that merchants pay applicable taxes
-               (and do not engage in illegal contracts).
-             ") }}</li>
+                       coins <b>deposit</b> the respective receipts
+                       that resulted from the contract signing with
+                       the customer at the exchange to redeem the
+                       coins.  The deposit step does not reveal the
+                       details of the contract between the customer
+                       and the merchant or the identity of the
+                       customer to the exchange in any way. However,
+                       the exchange does learn the identity of the
+                       merchant via the provided bank routing
+                       information.  The merchant can, for example
+                       when compelled by the state for taxation,
+                       provide information linking the individual
+                       deposit to the respective contract signed by
+                       the customer. Thus, the exchange's database
+                       allows the state to enforce that merchants pay
+                       applicable taxes (and do not engage in illegal
+                       contracts).  ") }}</li>
 
              <li>{{ _("Finally, the exchange transfers funds
-               corresponding to the digital coins redeemed by the
-               merchants to the merchant's <b>bank</b> account. The
-               exchange may combine multiple small transactions into
-               one larger bank transfer.  The merchant can query the
-               exchange about the relationship between the bank
-               transfers and the individual claims that were
-               deposited.
-             ") }}</li>
+                       corresponding to the digital coins redeemed by
+                       the merchants to the merchant's <b>bank</b>
+                       account. The exchange may combine multiple
+                       small transactions into one larger bank
+                       transfer.  The merchant can query the exchange
+                       about the relationship between the bank
+                       transfers and the individual claims that were
+                       deposited.  ") }}</li>
 
              <li>{{ _("Most importantly, the exchange keeps
-               cryptographic proofs that allow it to demonstrate that
-               it is operating correctly to third parties.  The system
-               requires an external <b>auditor</b>, such as a
-               government-appointed financial regulatory body, to
-               frequently verify the exchange's databases and check that
-               its bank balance matches the total value of the
-               remaining coins in circulation.
-             ") }}</li>
+                       cryptographic proofs that allow it to
+                       demonstrate that it is operating correctly to
+                       third parties.  The system requires an
+                       external <b>auditor</b>, such as a
+                       government-appointed financial regulatory body,
+                       to frequently verify the exchange's databases
+                       and check that its bank balance matches the
+                       total value of the remaining coins in
+                       circulation.  ") }}</li>
 
              <li>{{ _("Without the auditor, the exchange operators
-               could embezzle funds they are holding in
-               reserve. Customers and merchants cannot cheat each
-               other or the exchange. If any party's computers are
-               compromised, the financial damage is limited to the
-               respective party and proportional to the funds they
-               have in circulation during the period of the
-               compromise.
-             ") }}</li>
+                       could embezzle funds they are holding in
+                       reserve. Customers and merchants cannot cheat
+                       each other or the exchange. If any party's
+                       computers are compromised, the financial damage
+                       is limited to the respective party and
+                       proportional to the funds they have in
+                       circulation during the period of the
+                       compromise.  ") }}</li>
           </ol>
         <p></p>
       </div>
-      {% include "common/footer.j2.inc" %}:w
+       {% include "common/footer.j2.inc" %}:w
     </div> <!-- /container -->
   </body>
 </html>
diff --git a/financial-news.html.j2 b/financial-news.html.j2
deleted file mode 100644
index 878b1d9..0000000
--- a/financial-news.html.j2
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>{{ _("GNU Taler") }} - {{ _("Financial News") }}</title>
-    <meta name="description" content="">
-      {% include "common/header.j2.inc" %}
-  </head>
-  <body>
-    <div class="container">
-      {% include "common/navigation.j2.inc" %}
-      <!-- Jumbotron -->
-      <div class="jumbotron">
-        <h1 lang="en">{{ _("Financial News") }}</h1>
-      </div>
-      <div class="row">
-
-        <div class="col-lg-12">
-          <h2>24-10-2016: Alipay gains acceptance in US and Europe</h2>
-          <p>With Alipay being increasingly accepted in retail stores in US 
and Europe,
-            European banks continue to lose market share to big technology
-            providers.<br>
-             With GNU Taler, we could establish an open standard with a level
-            playing field preserving the independence of national economies
-            by establishing a commons that protects critical infrastructure
-            from domination by a handful of global players.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.nfcworld.com/2016/10/24/347979/alipay-gains-acceptance-us-europe/?utm_content=buffer16d78&utm_medium=social&utm_source=twitter.com&utm_campaign=buffer";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>21-10-2016: Indian banks warn 3.2 million customers</h2>
-          <p>A major data breach of Indian banks forced these institutions to 
warn 3.2 million
-            customers that their accounts might have been compromised and that 
they need
-            to obtain new bank cards and PIN numbers.<br>
-             With GNU Taler, banks can implement privacy by design and 
minimize data collection,
-            minimizing the impact of security breaches and satisfying GDPR 
regulations in Europe.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.heise.de/newsticker/meldung/Vermutliche-Datenpanne-Indische-Banken-warnen-3-2-Millionen-Kunden-3356582.html";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>15-10-2016: Thousands of online stores found skimming</h2>
-          <p>Security researchers found evidence of adversaries targeting 
online shops offering credit cards
-             to steal and resell credit card credentials.<br>
-             With GNU Taler, shops would never receive sensitive personal 
information such as credit cards,
-             thus hacked online shops would not create such hassles for 
consumers.
-          </p>
-          <p><a class="btn btn-info" 
href="https://gwillem.gitlab.io/2016/10/11/5900-online-stores-found-skimming/"; 
role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>23-07-2016: How banks are refusing to shoulder responsibility 
for fraud</h2>
-          <p>Banks are naturally unhappy about shouldering the cost for fraud, 
and use
-            various tricks to impose the costs on their customers without 
providing
-            adequate help to minimize fraud.<br>
-             With GNU Taler, cryptography ensures that identity theft and many 
related
-            types of fraud are no longer possible, allowing banks to offer 
customers
-            a payment experience where neither side needs to worry about fraud.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.telegraph.co.uk/personal-banking/current-accounts/how-banks-are-refusing-to-shoulder-responsibility-for-fraud/";
 role="button">Source</a></p>
-        </div>
-
-       <div class="col-lg-12">
-          <h2>24-10-2016: ApplePay starts in France</h2>
-          <p>With ApplePay starting in France, pressure on
-            European banks increase as they are set to
-            lose market share to big technology providers.<br>
-             With GNU Taler, we could establish an open standard with a level
-            playing field preserving the independence of national economies
-            by establishing a commons that protects critical infrastructure
-            from domination by a handful of global players.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.heise.de/newsticker/meldung/Apple-Pay-startet-in-Frankreich-3272412.html";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>22-12-2015: Sicherheitsforscher hacken das EC-Bezahlsystem</h2>
-          <p>Security researchers found serious security flaws in the German 
&quot;electronic cash&quot; system
-             which enable criminals to withdraw funds from merchant accounts 
based on the information printed
-             on receipts and other information obtained from public sources or 
point-of-sales terminals purchased
-             online.<br>
-             The German &quot;electronic cash&quot; system is based on the 
&quot;Poseidon&quot; protocol, for
-             which there is no publicly accessible specification or reference 
implementation. This has allowed
-             such major security holes to persist for decades.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.zeit.de/digital/datenschutz/2015-12/electronic-cash-bezahlsystem-terminals-gehackt";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>30-4-2015: 1970 Researchers Predicted Debit Cards Would be Great 
for Surveillance</h2>
-          <p>&quot;Suppose you were an advisor to the head of the KGB,
-          the Soviet Secret Police. Suppose you are given the
-          assignment of designing a system for the surveillance of all
-          citizens and visitors within the boundaries of the USSR. The
-          system is not to be too obtrusive or obvious. What would be
-          your decision?&quot;<br>
-          The think tank RAND essentially answered this question with
-          a blueprint for modern payment systems.  Taler offers an
-          escape from the financial panopticon.
-          </p>
-          <p><a class="btn btn-info" 
href="http://paleofuture.gizmodo.com/1970s-researchers-predicted-debit-cards-would-be-great-1699216972";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>17-3-2015: Pointing Fingers in Apple Pay Fraud</h2>
-          <p>Apple Pay may be easy to use, but the simplistic
-            user identification creates opportunities for fraud,
-            resulting in much higher fraud rates than even with traditional
-            credit card systems.<br>
-            Taler does not require user identification, enabling
-            ease of use while also being effective against fraud.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.nytimes.com/2015/03/17/business/banks-find-fraud-abounds-in-apple-pay.html?_r=0";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>6-12-2014: Visa and MasterCard's uncompetitive business 
practices</h2>
-          <p>The Visa and MasterCard duopoly has eliminated competition among
-             banks, setting fees that take away a significant share of profits 
from
-             small merchants.<br>
-             Taler is an open standard with free software
-             implementations, so merchants do not have to fear a lack of 
competition.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.ocregister.com/articles/gas-644344-card-fees.html"; 
role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>5-12-2014: US judge rules banks can sue merchant for bad 
security</h2>
-          <p>Merchants taking credit card data from customers now have to 
additionally
-             fear banks suing them for losses.  It is not suggested that the 
merchant
-             in question was not in compliance with PCI DSS security audit 
procedures.<br>
-             With Taler, merchants never handle sensitive personal credit 
data, and
-             thus neither customers, exchanges nor governments would even have 
standing to
-             sue merchants in court.  Thus, if a merchant system were to be 
compromised,
-             the damage would be limited to the merchant's own operations.
-          <p><a class="btn btn-info" 
href="http://arstechnica.com/tech-policy/2014/12/judge-rules-that-banks-can-sue-target-for-2013-credit-card-hack/";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>5-12-2014: PayPal for Android gains fingerprint support</h2>
-          <p>Following Visa and MasterCard's move to biometrics, PayPal
-             now supports authenticating purchases with fingerprint
-             recognition.
-             Hence, police can now <a 
href="http://www.findlaw.co.uk/law/government/civil_rights/500374.html";>forcefully
 take user's fingerprints</a> and
-             <a 
href="http://www.wired.com/2013/09/the-unexpected-result-of-fingerprint-authentication-that-you-cant-take-the-fifth/";>access
 their mobile computers</a> and possibly empty their electronic wallets
-             <a 
href="http://www.cbc.ca/news/world/american-shakedown-police-won-t-charge-you-but-they-ll-grab-your-money-1.2760736";>in
 addition to their physical wallets</a>.<br>
-             For Taler, we advise users to protect their digital wallets using
-             passphrases.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.digitalspy.co.uk/tech/news/a614631/paypal-for-android-gains-fingerprint-support-on-samsung-devices.html";
 role="button">Source</a></p>
-        </div>
-
-        <div class="col-lg-12">
-          <h2>10-9-2014: PayPal accounts hacked with a click</h2>
-          <p>Yasser Ali reports a now patched vulnerability in PayPal that 
would
-             have allowed him to reset other user's passwords and take over 
their
-             accounts. This is unlikely to be the last vulnerability found in
-             account-based payment systems.<br>
-             In Taler, customers do not have accounts with usernames, passwords
-             or associated e-mail addresses.  Instead, Taler uses reserves 
which
-             are represented by a private key on the owner's computer.  Users
-             create a reserve by depositing currency at a Taler exchange, and 
can then
-             withdraw digital coins from that reserve using the respective 
private
-             key.  There is no limit on the number of reserves a user can 
have, and
-             even hacking the Taler exchange would not provide an adversary 
with access to
-             user's reserves (as the Taler exchange does not have the private 
keys).
-             Stealing in Taler requires breaking into each customer's computer 
to
-             extract the reserve keys or the coins from the digital wallet.
-          </p>
-          <p><a class="btn btn-info" 
href="http://yasserali.com/hacking-paypal-accounts-with-one-click/"; 
role="button">Source</a></p>
-        </div>
-        <div class="col-lg-12">
-          <h2>13-11-2014: Visa and MasterCard's to move from passwords to 
biometrics</h2>
-          <p>Visa and MasterCard are planning to &quot;simplify hated 
verification
-             systems&quot; by moving from passwords to security codes on 
mobiles
-             and biometrics.  Continuing their flawed insistence on verifying 
identity,
-             Visa and MasterCard will thus build a very personal picture of 
their
-             customers, from shopping habbits down to their cardiac rhythm.<br>
-             Taler does not require a customer's identity to verify a payment, 
as the
-             payment system cryptographically verifies the coins.  Thus, Taler 
does
-             not have to intrude into any personal detail of a citizen's life, 
and
-             certainly not their private medical data.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.theguardian.com/money/2014/nov/13/mastercard-visa-kill-off-verification-systems";
 role="button">Source</a></p>
-        </div>
-        <div class="col-lg-12">
-          <h2>15-9-2013: NSA follows the Money</h2>
-          <p>Despite the EU allowing the NSA access to financial transaction 
data to
-             track terrorists and organized crime, the NSA saw it necessary to
-             target international payment processors including SWIFT and Visa.
-             As terrorism and organized crime are covered by legal means, 
industrial
-             espionage to improve the US economy is the only remaining US 
national
-             interest within the NSA's mandate that would explain this illegal 
activity.<br>
-             With Taler, exchanges will only learn the value of a merchant's 
transactions,
-             not who paid or for what (governments may learn what was sold).  
Thus,
-             the Taler exchange is a significantly less interesting target for 
industrial
-             espionage.
-          </p>
-          <p><a class="btn btn-info" 
href="http://www.spiegel.de/international/world/spiegel-exclusive-nsa-spies-on-international-bank-transactions-a-922276.html";
 role="button">Source</a></p>
-        </div>
-     </div>
-      {% include "common/footer.j2.inc" %}
-    </div> <!-- /container -->
-  </body>
-</html>
diff --git a/financial-news.html.j2.inc b/financial-news.html.j2.inc
new file mode 100644
index 0000000..a4c0b8f
--- /dev/null
+++ b/financial-news.html.j2.inc
@@ -0,0 +1,13 @@
+{% include "financial-news/2016-10-26.inc" %}
+{% include "financial-news/2016-10-24.inc" %}
+{% include "financial-news/2016-10-21.inc" %}
+{% include "financial-news/2016-10-15.inc" %}
+{% include "financial-news/2016-07-23.inc" %}
+{% include "financial-news/2015-12-22.inc" %}
+{% include "financial-news/2015-04-30.inc" %}
+{% include "financial-news/2015-03-17.inc" %}
+{% include "financial-news/2014-12-06.inc" %}
+{% include "financial-news/2014-12-05.inc" %}
+{% include "financial-news/2014-11-13.inc" %}
+{% include "financial-news/2014-09-10.inc" %}
+{% include "financial-news/2013-09-15.inc" %}
diff --git a/financial-news/2013-09-15.inc b/financial-news/2013-09-15.inc
new file mode 100644
index 0000000..2f13aec
--- /dev/null
+++ b/financial-news/2013-09-15.inc
@@ -0,0 +1,13 @@
+          <h3>15-9-2013: NSA follows the Money</h3>
+          <p>Despite the EU allowing the NSA access to financial transaction 
data to
+             track terrorists and organized crime, the NSA saw it necessary to
+             target international payment processors including SWIFT and Visa.
+             As terrorism and organized crime are covered by legal means, 
industrial
+             espionage to improve the US economy is the only remaining US 
national
+             interest within the NSA's mandate that would explain this illegal 
activity.<br>
+             With Taler, exchanges will only learn the value of a merchant's 
transactions,
+             not who paid or for what (governments may learn what was sold).  
Thus,
+             the Taler exchange is a significantly less interesting target for 
industrial
+             espionage.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.spiegel.de/international/world/spiegel-exclusive-nsa-spies-on-international-bank-transactions-a-922276.html";
 role="button">Source</a></p>
diff --git a/financial-news/2014-09-10.inc b/financial-news/2014-09-10.inc
new file mode 100644
index 0000000..2b886bc
--- /dev/null
+++ b/financial-news/2014-09-10.inc
@@ -0,0 +1,17 @@
+          <h3>10-9-2014: PayPal accounts hacked with a click</h3>
+          <p>Yasser Ali reports a now patched vulnerability in PayPal that 
would
+             have allowed him to reset other user's passwords and take over 
their
+             accounts. This is unlikely to be the last vulnerability found in
+             account-based payment systems.<br>
+             In Taler, customers do not have accounts with usernames, passwords
+             or associated e-mail addresses.  Instead, Taler uses reserves 
which
+             are represented by a private key on the owner's computer.  Users
+             create a reserve by depositing currency at a Taler exchange, and 
can then
+             withdraw digital coins from that reserve using the respective 
private
+             key.  There is no limit on the number of reserves a user can 
have, and
+             even hacking the Taler exchange would not provide an adversary 
with access to
+             user's reserves (as the Taler exchange does not have the private 
keys).
+             Stealing in Taler requires breaking into each customer's computer 
to
+             extract the reserve keys or the coins from the digital wallet.
+          </p>
+          <p><a class="btn btn-info" 
href="http://yasserali.com/hacking-paypal-accounts-with-one-click/"; 
role="button">Source</a></p>
diff --git a/financial-news/2014-11-13.inc b/financial-news/2014-11-13.inc
new file mode 100644
index 0000000..39a496e
--- /dev/null
+++ b/financial-news/2014-11-13.inc
@@ -0,0 +1,12 @@
+          <h3>13-11-2014: Visa and MasterCard's to move from passwords to 
biometrics</h3>
+          <p>Visa and MasterCard are planning to &quot;simplify hated 
verification
+             systems&quot; by moving from passwords to security codes on 
mobiles
+             and biometrics.  Continuing their flawed insistence on verifying 
identity,
+             Visa and MasterCard will thus build a very personal picture of 
their
+             customers, from shopping habbits down to their cardiac rhythm.<br>
+             Taler does not require a customer's identity to verify a payment, 
as the
+             payment system cryptographically verifies the coins.  Thus, Taler 
does
+             not have to intrude into any personal detail of a citizen's life, 
and
+             certainly not their private medical data.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.theguardian.com/money/2014/nov/13/mastercard-visa-kill-off-verification-systems";
 role="button">Source</a></p>
diff --git a/financial-news/2014-12-05.inc b/financial-news/2014-12-05.inc
new file mode 100644
index 0000000..9e65b07
--- /dev/null
+++ b/financial-news/2014-12-05.inc
@@ -0,0 +1,21 @@
+          <h3>5-12-2014: PayPal for Android gains fingerprint support</h3>
+          <p>Following Visa and MasterCard's move to biometrics, PayPal
+             now supports authenticating purchases with fingerprint
+             recognition.
+             Hence, police can now <a 
href="http://www.findlaw.co.uk/law/government/civil_rights/500374.html";>forcefully
 take user's fingerprints</a> and
+             <a 
href="http://www.wired.com/2013/09/the-unexpected-result-of-fingerprint-authentication-that-you-cant-take-the-fifth/";>access
 their mobile computers</a> and possibly empty their electronic wallets
+             <a 
href="http://www.cbc.ca/news/world/american-shakedown-police-won-t-charge-you-but-they-ll-grab-your-money-1.2760736";>in
 addition to their physical wallets</a>.<br>
+             For Taler, we advise users to protect their digital wallets using
+             passphrases.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.digitalspy.co.uk/tech/news/a614631/paypal-for-android-gains-fingerprint-support-on-samsung-devices.html";
 role="button">Source</a></p>
+
+          <h3>5-12-2014: US judge rules banks can sue merchant for bad 
security</h3>
+          <p>Merchants taking credit card data from customers now have to 
additionally
+             fear banks suing them for losses.  It is not suggested that the 
merchant
+             in question was not in compliance with PCI DSS security audit 
procedures.<br>
+             With Taler, merchants never handle sensitive personal credit 
data, and
+             thus neither customers, exchanges nor governments would even have 
standing to
+             sue merchants in court.  Thus, if a merchant system were to be 
compromised,
+             the damage would be limited to the merchant's own operations.
+          <p><a class="btn btn-info" 
href="http://arstechnica.com/tech-policy/2014/12/judge-rules-that-banks-can-sue-target-for-2013-credit-card-hack/";
 role="button">Source</a></p>
diff --git a/financial-news/2014-12-06.inc b/financial-news/2014-12-06.inc
new file mode 100644
index 0000000..bc0a6e7
--- /dev/null
+++ b/financial-news/2014-12-06.inc
@@ -0,0 +1,8 @@
+          <h3>6-12-2014: Visa and MasterCard's uncompetitive business 
practices</h3>
+          <p>The Visa and MasterCard duopoly has eliminated competition among
+             banks, setting fees that take away a significant share of profits 
from
+             small merchants.<br>
+             Taler is an open standard with free software
+             implementations, so merchants do not have to fear a lack of 
competition.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.ocregister.com/articles/gas-644344-card-fees.html"; 
role="button">Source</a></p>
diff --git a/financial-news/2015-03-17.inc b/financial-news/2015-03-17.inc
new file mode 100644
index 0000000..8cdebfe
--- /dev/null
+++ b/financial-news/2015-03-17.inc
@@ -0,0 +1,9 @@
+          <h3>17-3-2015: Pointing Fingers in Apple Pay Fraud</h3>
+          <p>Apple Pay may be easy to use, but the simplistic
+            user identification creates opportunities for fraud,
+            resulting in much higher fraud rates than even with traditional
+            credit card systems.<br>
+            Taler does not require user identification, enabling
+            ease of use while also being effective against fraud.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.nytimes.com/2015/03/17/business/banks-find-fraud-abounds-in-apple-pay.html?_r=0";
 role="button">Source</a></p>
diff --git a/financial-news/2015-04-30.inc b/financial-news/2015-04-30.inc
new file mode 100644
index 0000000..bd0e23d
--- /dev/null
+++ b/financial-news/2015-04-30.inc
@@ -0,0 +1,12 @@
+          <h3>30-4-2015: 1970 Researchers Predicted Debit Cards Would be Great 
for Surveillance</h3>
+          <p>&quot;Suppose you were an advisor to the head of the KGB,
+          the Soviet Secret Police. Suppose you are given the
+          assignment of designing a system for the surveillance of all
+          citizens and visitors within the boundaries of the USSR. The
+          system is not to be too obtrusive or obvious. What would be
+          your decision?&quot;<br>
+          The think tank RAND essentially answered this question with
+          a blueprint for modern payment systems.  Taler offers an
+          escape from the financial panopticon.
+          </p>
+          <p><a class="btn btn-info" 
href="http://paleofuture.gizmodo.com/1970s-researchers-predicted-debit-cards-would-be-great-1699216972";
 role="button">Source</a></p>
diff --git a/financial-news/2015-12-22.inc b/financial-news/2015-12-22.inc
new file mode 100644
index 0000000..c66cb4a
--- /dev/null
+++ b/financial-news/2015-12-22.inc
@@ -0,0 +1,10 @@
+          <h3>22-12-2015: Sicherheitsforscher hacken das EC-Bezahlsystem</h3>
+          <p>Security researchers found serious security flaws in the German 
&quot;electronic cash&quot; system
+             which enable criminals to withdraw funds from merchant accounts 
based on the information printed
+             on receipts and other information obtained from public sources or 
point-of-sales terminals purchased
+             online.<br>
+             The German &quot;electronic cash&quot; system is based on the 
&quot;Poseidon&quot; protocol, for
+             which there is no publicly accessible specification or reference 
implementation. This has allowed
+             such major security holes to persist for decades.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.zeit.de/digital/datenschutz/2015-12/electronic-cash-bezahlsystem-terminals-gehackt";
 role="button">Source</a></p>
diff --git a/financial-news/2016-07-23.inc b/financial-news/2016-07-23.inc
new file mode 100644
index 0000000..49955bd
--- /dev/null
+++ b/financial-news/2016-07-23.inc
@@ -0,0 +1,9 @@
+          <h3>23-07-2016: How banks are refusing to shoulder responsibility 
for fraud</h3>
+          <p>Banks are naturally unhappy about shouldering the cost for fraud, 
and use
+            various tricks to impose the costs on their customers without 
providing
+            adequate help to minimize fraud.<br>
+             With GNU Taler, cryptography ensures that identity theft and many 
related
+            types of fraud are no longer possible, allowing banks to offer 
customers
+            a payment experience where neither side needs to worry about fraud.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.telegraph.co.uk/personal-banking/current-accounts/how-banks-are-refusing-to-shoulder-responsibility-for-fraud/";
 role="button">Source</a></p>
diff --git a/financial-news/2016-10-15.inc b/financial-news/2016-10-15.inc
new file mode 100644
index 0000000..2954dc1
--- /dev/null
+++ b/financial-news/2016-10-15.inc
@@ -0,0 +1,7 @@
+          <h3>15-10-2016: Thousands of online stores found skimming</h3>
+          <p>Security researchers found evidence of adversaries targeting 
online shops offering credit cards
+             to steal and resell credit card credentials.<br>
+             With GNU Taler, shops would never receive sensitive personal 
information such as credit cards,
+             thus hacked online shops would not create such hassles for 
consumers.
+          </p>
+          <p><a class="btn btn-info" 
href="https://gwillem.gitlab.io/2016/10/11/5900-online-stores-found-skimming/"; 
role="button">Source</a></p>
diff --git a/financial-news/2016-10-21.inc b/financial-news/2016-10-21.inc
new file mode 100644
index 0000000..47cad2c
--- /dev/null
+++ b/financial-news/2016-10-21.inc
@@ -0,0 +1,8 @@
+          <h3>21-10-2016: Indian banks warn 3.2 million customers</h3>
+          <p>A major data breach of Indian banks forced these institutions to 
warn 3.2 million
+            customers that their accounts might have been compromised and that 
they need
+            to obtain new bank cards and PIN numbers.<br>
+             With GNU Taler, banks can implement privacy by design and 
minimize data collection,
+            minimizing the impact of security breaches and satisfying GDPR 
regulations in Europe.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.heise.de/newsticker/meldung/Vermutliche-Datenpanne-Indische-Banken-warnen-3-2-Millionen-Kunden-3356582.html";
 role="button">Source</a></p>
diff --git a/financial-news/2016-10-24.inc b/financial-news/2016-10-24.inc
new file mode 100644
index 0000000..f7bee43
--- /dev/null
+++ b/financial-news/2016-10-24.inc
@@ -0,0 +1,10 @@
+          <h3>24-10-2016: ApplePay starts in France</h3>
+          <p>With ApplePay starting in France, pressure on
+            European banks increase as they are set to
+            lose market share to big technology providers.<br>
+             With GNU Taler, we could establish an open standard with a level
+            playing field preserving the independence of national economies
+            by establishing a commons that protects critical infrastructure
+            from domination by a handful of global players.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.heise.de/newsticker/meldung/Apple-Pay-startet-in-Frankreich-3272412.html";
 role="button">Source</a></p>
diff --git a/financial-news/2016-10-26.inc b/financial-news/2016-10-26.inc
new file mode 100644
index 0000000..146aab1
--- /dev/null
+++ b/financial-news/2016-10-26.inc
@@ -0,0 +1,10 @@
+          <h3>24-10-2016: Alipay gains acceptance in US and Europe</h3>
+          <p>With Alipay being increasingly accepted in retail stores in US 
and Europe,
+            European banks continue to lose market share to big technology
+            providers.<br>
+             With GNU Taler, we could establish an open standard with a level
+            playing field preserving the independence of national economies
+            by establishing a commons that protects critical infrastructure
+            from domination by a handful of global players.
+          </p>
+          <p><a class="btn btn-info" 
href="http://www.nfcworld.com/2016/10/24/347979/alipay-gains-acceptance-us-europe/?utm_content=buffer16d78&utm_medium=social&utm_source=twitter.com&utm_campaign=buffer";
 role="button">Source</a></p>
diff --git a/governments.html.j2 b/governments.html.j2
index 49880c1..a9b332f 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+3<!DOCTYPE html>
 <html lang="{{ _('en') }}">
   <head>
     <meta charset="UTF-8"/>
@@ -11,8 +11,21 @@
       {% include "common/navigation.j2.inc" %}
       <!-- Jumbotron -->
       <div class="jumbotron">
-        <h1>{{ _("Advantages for governments") }}</h1>
+        <h1>{{ _("Advantages for Governments") }}</h1>
         <!-- p><a class="btn btn-lg btn-success" href="#" role="button">Get 
started today</a></p -->
+       <div class="col-lg-12">
+
+          <p>{{ _("Taler provides accountability to ensure business
+                   accepting payments operate legally, while also
+                   respecting civil liberties of citizens spending
+                   digital cash.  Taler is a commons, a payment system
+                   based on open standards and free software.  Taler
+                   needs governments to set a financial framework and
+                   to act as trusted regulators.  Taler contributes to
+                   digital sovereignty in the critial financial
+                   infrastructure.") }}</p>
+
+        </div>
       </div>
 
       <!-- Example row of columns -->
@@ -20,81 +33,119 @@
         <div class="col-lg-6">
           <h2>{{ _("Taxable") }}</h2>
 
-          <p>{{ _("Taler is an electronic payment system that was built with 
the goal of supporting taxation.
-             With Taler, the receiver of any form of payment is known, and the 
payment information comes
-             attached with some details about what the payment was made for 
(but not the identity of the customer).  Thus, governments can use this
-             data to tax buisnesses and individuals based on their income, 
making tax evasion and
-             black markets less viable.") }}</p>
-        </div>
-        <div class="col-lg-6">
+          <p>{{ _("Taler was
+                  built with the goal of fighting corruption and supporting 
taxation.  
+                  With Taler, the receiver of any form of payment is
+                  easily identified by the government, and the merchant
+                   can be compelled to provide the contract that was accepted
+                   by the customer.  Governments can use this data to
+                  tax businesses and individuals based on their
+                  income, making tax evasion and black markets less
+                  viable.") }}</p>
+
+          <p>{{ _("Thus, despite offering anonymity for citizens
+                   spending digital cash to buy goods and services,
+                   Taler also ensures that the state can observe
+                   incoming funds. This can be used to ensure
+                   businesses engage only in legal activities, and do
+                   not evade income tax, sales tax or value-added tax.
+                   However, this observational capability does not
+                   extend to the immediate personal domain.  In
+                   particular, sharing access to funds within a family
+                   or synchronizing wallets across multiple devices is not
+                   subject to monitoring.")  }}</p> </div>
+
+       <div class="col-lg-6">
           <h2>{{ _("Secure") }}</h2>
 
-          <p>{{ _("Taler's payments are cryptographically secured. Thus, 
customers, merchants and
-             the exchange can mathematically demonstrate their lawful behavior 
in court in case
-             of disputes. Financial damages are strictly limited, improving 
economic security
-             for individuals, merchants, the exchange and the state.  Most 
importantly, an
-             independent auditor can ensure that there is no &quot;bad 
exchange&quot;
-             within the Taler system who might threaten the economy due to 
fraud.") }}</p>
-       </div>
-      </div>
-      <div class="row">
-        <div class="col-lg-6">
-          <h2>{{ _("Libre") }}</h2>
+          <p>{{ _("Taler's payments are cryptographically
+                   secured. Thus, customers, merchants and the
+                   exchange can mathematically demonstrate their
+                   lawful behavior in court in case of
+                   disputes. Financial damages are strictly limited,
+                   improving economic security for individuals,
+                   merchants, the exchange and the state.") }}
+
+         <p>{{ _("By design, the Taler payment service provider is
+                   subject to financial regulation. Financial
+                   regulation and regular audits are critical to
+                   establish trust. In particular, the Taler design
+                   mandates the existence of an independent auditor
+                   who checks cryptographic proofs that accumulate at
+                   the payment service provider to ensure that the
+                   escrow account is managed honestly.  This ensures
+                   that the payment service provider does not threaten
+                   the economy due to fraud.") }}</p> </div> </div>
+                   <div class="row"> <div class="col-lg-6"> <h2>{{
+                   _("Libre") }}</h2>
+
+          <p>{{ _("Taler is free software implementing an open
+                   protocol standard.  Thus, Taler will enable
+                   competition and avoid the monopolization of payment
+                   systems that threatens global political and
+                   financial stability today.") }}</p>
+
 
-          <p>{{ _("Taler is free software implementing an open protocol 
standard.  Thus, Taler will
-             enable competition and avoid the monopolization of payment 
systems that threatens
-             global political and financial stability today.") }}</p>
         </div>
         <div class="col-lg-6">
           <h2>{{ _("Efficient") }}</h2>
 
-          <p>{{ _("Taler is designed to be efficient.  Unlike timeline-based 
payment systems like
-             BitCoin, Taler will not threaten the availability of national 
electric grids or
-             (significantly) contribute to environmental pollution.") }}</p>
+          <p>{{ _("Taler has an efficient design.  Unlike
+                   timeline-based payment systems, such as BitCoin,
+                   Taler will not threaten the availability of
+                   national electric grids or (significantly)
+                   contribute to environmental pollution.") }}</p>
+
         </div>
       </div>
       <div class="col-lg-12">
         <h2 id="overview">{{ _("Taler as seen by governments") }}</h2>
 
-        <p>{{ _("Governments can observe traditional wire
-          transfers entering and leaving the Taler system, and
-          require merchants and exchange operators to provide certain
-          information during financial audits.  Exchange operators
-          are expected to be permanently checked by auditors,
-          while merchants may be required to reveal information
-          during regular tax audits.
-          Information available to the government includes:
-        ") }}</p>
+        <p>{{ _("Governments can observe traditional wire transfers
+                 entering and leaving the Taler system, and require
+                 merchants and exchange operators to provide certain
+                 information during financial audits.  Exchange
+                 operators are expected to be permanently checked by
+                 auditors, while merchants may be required to reveal
+                 information during regular tax audits.  Information
+                 available to the government includes: ") }}</p>
+       
         <p>
           <img src="{{ url('images/government.svg') }}" alt="government 
perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%">
           </p><ul>
-            <li>{{ _("From the banking system:
-              The total amount of digital currency
-              obtained by a customer. The government could impose
-              limits on how many digital coins a customer may
-              withdraw within a given timeframe.") }}</li>
-
-             <li>{{ _("From the banking system:
-               The total amount of income received
-               by any merchant via the Taler system.") }}</li>
-
-             <li>{{ _("From auditing the exchange:
-               The amounts of digital coins legitimately withdrawn by
-               customers from the exchange, the value of non-redeemed digital 
coins
-               in customer's wallets, the value and corresponding wire details
-               of deposit operations performed by merchants with the exchange, 
and
-               the income of the exchange from transaction fees.") }}</li>
-
-            <li>{{ _("From auditing merchants:
-               For each deposit operation, the exact details of the
-               underlying contract that was signed between
-               customer and merchant.  However, this information would
-               typically not include the identity of the customer.
-               Note that while the customer can decide to prove that it was his
-               transaction (i.e. in court when suing the merchant if the
-               merchant failed to deliver on the contract),
-               merchant, exchange and government cannot find out the customer's
-               identity from the information that Taler collects.") }}</li>
+         
+            <li>{{ _("From the banking system: The total amount of
+                     digital currency obtained by a customer. The
+                     government could impose limits on how many
+                     digital coins a customer may withdraw within a
+                     given timeframe.") }}</li>
+
+             <li>{{ _("From the banking system: The total amount of
+                       income received by any merchant via the Taler
+                       system.") }}</li>
+
+             <li>{{ _("From auditing the exchange: The amounts of
+                       digital coins legitimately withdrawn by
+                       customers from the exchange, the value of
+                       non-redeemed digital coins in customer's
+                       wallets, the value and corresponding wire
+                       details of deposit operations performed by
+                       merchants with the exchange, and the income of
+                       the exchange from transaction fees.") }}</li>
+
+            <li>{{ _("From auditing merchants: For each deposit
+                      operation, the exact details of the underlying
+                      contract that was signed between customer and
+                      merchant.  However, this information would
+                      typically not include the identity of the
+                      customer.  Note that while the customer can
+                      decide to prove that it was his transaction
+                      (i.e. in court when suing the merchant if the
+                      merchant failed to deliver on the contract),
+                      merchant, exchange and government cannot find
+                      out the customer's identity from the information
+                      that Taler collects.") }}</li>
+
           </ul>
         <p></p>
       </div>
diff --git a/index.html.j2 b/index.html.j2
index 58a869c..ea49f8d 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8"/>
     <title>{{ _("GNU Taler") }}</title>
-    <meta name="description" content="Anonymous electronic payments for civil 
society"/>
+    <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic 
Reserves') }}" />
       {% include "common/header.j2.inc" %}
   </head>
   <body>
@@ -14,71 +14,90 @@
         <img align="middle" alt="Taler logo" width="33%" src="{{ 
url('images/logo-2015-medium.png') }}" style="margin: 0px 0px -120px 0px;">
       </div>
       <div class="jumbotron">
-         <h1>{{ _("Electronic payments for a liberal society!") }}</h1>
-        <p>{{ _("Taler is a new electronic payment system under development
-          at <a href=\"http://www.inria.fr/\";>Inria</a>.  Today, this website 
only
-           presents the advantages our system is expected to provide.  We 
expect to
-           make the payment system operational in 2017.") }}</p>
+         <h1>{{ _("Independent One-Click Payments!") }}</h1>
+
+        <p>{{ _("Taler is an electronic payment system under
+                 development
+                 at <a href=\"http://www.inria.fr/\";>Inria</a>.  This
+                 community Web site provides extensive documentation
+                 about the system, which we expect to make
+                 operational in 2017.") }}</p>
+        
       </div>
       <div class="row">
         <div class="col-lg-4">
-          <h2>{{ _("Taxable") }}</h2>
+          <h2>{{ _("<b>T</b>axable") }}</h2>
+
          <p>{{ _("Unlike BitCoin or cash payments, Taler ensures that
-            governments can learn their citizen's total income and thus collect
-            sales, value-added or income taxes. Taler is thus a currency for 
the
-            mainstream economy, and not the black market.") }}</p>
+                  governments can learn their citizen's total income
+                  and thus collect sales, value-added or income
+                  taxes. Taler is a currency for the mainstream
+                  economy, and not the black market.") }}</p>
+
         </div>
         <div class="col-lg-4">
-          <h2>{{ _("Anonymous") }}</h2>
-         <p>{{ _("When you pay with Taler, your identity does not have to
-            be revealed to the merchant. The bank, government and exchange 
will also
-            never learn how you spent your electronic money. However, you can
-            prove that you paid in court if necessary.") }}</p>
+          <h2>{{ _("<b>A</b>nonymous") }}</h2>
+
+         <p>{{ _("When you pay with Taler, your identity does not
+                  have to be revealed to the merchant. Just like
+                  payments in cash, nobody else can track how you
+                  spent your electronic money. However, you obtain a
+                  legally valid proof of payment.") }}</p>
+
         </div>
         <div class="col-lg-4">
-          <h2>{{ _("Libre") }}</h2>
-         <p>{{ _("Taler is free software from <a 
href=\"http://www.gnu.org/\";>the GNU project</a> implementing an open protocol.
-            Anybody is welcome to inspect our code and integrate our reference
-            implementation into their applications.") }}</p>
+          <h2>{{ _("<b>L</b>ibre") }}</h2>
+
+         <p>{{ _("Taler is free software
+                  from <a href=\"http://www.gnu.org/\";>the GNU
+                  project</a> implementing an open protocol.  Anybody
+                  is welcome to inspect our code and integrate our
+                  reference implementation into their applications.")
+                  }}</p>
+
         </div>
       </div>
       <div class="row">
         <div class="col-lg-4">
-          <h2>{{ _("Electronic") }}</h2>
-         <p>{{ _("Taler is designed to work on the Internet. Using a
-           so-called RESTful protocol over HTTP or HTTPS, Taler is easy to
-           integrate with existing Web applications.") }}</p>
+          <h2>{{ _("<b>E</b>lectronic") }}</h2>
+         
+         <p>{{ _("Taler is easy to integrate with existing Web
+                  applications. Payments are cryptographically
+                  secured and are confirmed within milliseconds with
+                  extremely low transaction costs.") }}</p>
+
         </div>
         <div class="col-lg-4">
-          <h2>{{ _("Reserves") }}</h2>
-         <p>{{ _("Taler uses an electronic exchange holding financial
-             reserves in existing currencies. This means that Taler is not
-            a new currency with the inherent currency fluctuation risks, but
-            instead the cryptographic coins correspond to existing currencies, 
such as
-            US Dollars, Euros or even BitCoins.") }}</p>
+          <h2>{{ _("<b>R</b>eserves") }}</h2>
+
+         <p>{{ _("Taler does not introduce a new currency with
+                  fluctuation risks, and instead uses a digital
+                  wallet holding coins in reserve. Taler's
+                  cryptographic coins correspond to existing
+                  currencies, such as US Dollars, Euros or even
+                  BitCoins.") }}</p>
+         
         </div>
         <div class="col-lg-4">
-          <h2>{{ _("News") }}</h2>
-         <p>{{ _("Taler Web payments paper published.") }}</p>
-          <p><a class="btn btn-primary" href="news" role="button">{{ _("More 
news »") }}</a></p>
+          <h2>{{ _("Latest Videos") }}</h2>
+         <p>{{ _("Florian Dold talks about Taler at 50p!") }}</p>
+         <video id="video" poster="/videos/dold50p.png" autobuffer="" 
height="180" width="320" controls="controls">
+            <source src="/videos/dold50p.webm" type="video/webm">
+            <source src="/videos/dold50p.ogv=216" type="video/ogv">
+          </video>
+          <a rel="license" 
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";><img 
alt="Creative Commons License" style="border-width:0" 
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/"; 
property="dct:title">GNU Taler</span>" by <span 
xmlns:cc="http://creativecommons.org/ns#"; property="cc:attributionName">Florian 
Dold, produced by 50p</span> is licensed under a <a rel="license" 
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";>Creati [...]
         </div>
       </div>
-       <div class="col-lg-12">
-         <h2 id="taxability">{{ _("Taler technology: About taxability, change 
and privacy") }}</h2>
-         <p>{{ _("One of the key goals of Taler is to provide anonymity for
-           citizens buying goods and services, while ensuring that the state 
can
-           observe incoming transactions to ensure businesses engage only in
-           legal activities and do not evade taxes (such as income tax,
-           sales tax or value-added tax).  However, we also want to stay
-           out of the immediate personal domain, so sharing funds within a
-           family or copying coins between devices should not be subject to
-           monitoring by the state.
-         ") }}</p>
-         <p>{{ _("As a result, Taler does not intrude into the
-           personal economic domain, offers good privacy, taxability
-           for transactions and the ability to give change.
-         ") }}</p>
-       </div>
+      <div class="row">
+        <div class="col-lg-6">
+          <h2>{{ _("Taler News") }}</h2>
+         {% include "news.html.j2.inc" %}
+       </div>
+        <div class="col-lg-6">
+          <h2>{{ _("Financial News") }}</h2>
+         {% include "financial-news.html.j2.inc" %}
+       </div>  
+      </div>
       {% include "common/footer.j2.inc" %}
     </div> <!-- /container -->
   </body>
diff --git a/investors.html.j2 b/investors.html.j2
index 1ffedaa..aa77152 100644
--- a/investors.html.j2
+++ b/investors.html.j2
@@ -11,69 +11,88 @@
       {% include "common/navigation.j2.inc" %}
       <!-- Jumbotron -->
       <div class="jumbotron">
-        <h1>{{ _("Operate a Taler exchange!") }}</h1>
-      </div>
+        <h1>{{ _("Invest in Taler!") }}</h1>
+        <div class="col-lg-12">
+         <p>{{ _("We have created a company, Taler Systems SA in 
+                   Luxemburgh.<br>
+                   Please contact <tt>address@hidden</tt>
+                   if you want to invest in Taler.") }}</p>
+       </div>
+      </div>   
       <div class="row">
         <div class="col-lg-4">
-          <h2>{{ _("Efficient") }}</h2>
+          <h2>{{ _("The Team") }}</h2>
+
+          <p>{{ _("Our team combines world-class business leaders,
+                   cryptographers, software engineers, civil-rights
+                   activits and academics. We are unified by a vision
+                   of how payments should work and the goal of
+                   imposing this vision upon the world.") }}</p>
 
-          <p>{{ _("Taler uses efficient cryptographic primitives (such as RSA 
2048 and
-             EdDSA) and is thus expected to be able to handle large transaction
-             volumes, only limited by the input/output capabilities of the
-             database. Thus, running a Taler exchange should be profitable even
-             with very low (less than 1 cent) transaction fees (at appropriate
-             transaction volume).") }}</p>
+         <p>{{ _("We are currently supported by Inria, the French
+                   national institute for research in informatics and
+                   automation, and the Renewable Freedom Foundation.") }}</p>
         </div>
         <div class="col-lg-4">
-          <h2>{{ _("Secure") }}</h2>
+          <h2>{{ _("The Technology") }}</h2>
 
-          <p>{{ _("All transactions in Taler are secured using modern 
cryptography and
-             trust in all parties is minimized. Financial damage is bounded
-             (for customers, merchants and the exchange) even
-             in the case that systems are compromised and private keys are 
stolen.
-             Databases can be audited for consistency, resulting in either the
-             detection of compromised systems or the demonstration that
-             participants were honest.") }}</p>
+          <p>{{ _("All transactions in Taler are secured using modern
+                   cryptography and trust in all parties is
+                   minimized. Financial damage is bounded (for
+                   customers, merchants and the exchange) even in the
+                   case that systems are compromised and private keys
+                   are stolen.  Databases can be audited for
+                   consistency, resulting in either the detection of
+                   compromised systems or the demonstration that
+                   participants were honest. Actual transaction costs
+                   are fractions of a cent.") }}</p>
         </div>
         <div class="col-lg-4">
-          <h2>{{ _("Business model") }}</h2>
+          <h2>{{ _("The Business") }}</h2>
 
-          <p>{{ _("The basic business model for Taler is the operation of an 
exchange.  An exchange converts money from traditional payment systems 
(Mastercard,
-             SEPA, Visa, BitCoin, ACH, SWIFT, etc.) to anonymous electronic
-             coins in the same currency. The customer can then redeem the 
electronic
-             coins at a merchant, who can exchange them for money represented 
using
-             traditional payment systems at the exchange.  The exchange can 
then charge
-             fees (to the customer, merchant or both) to facilitate the 
transactions.") }}</p>
+          <p>{{ _("The scalable business model for Taler is the operation
+                   of the payment service provider, which converts money from
+                   traditional payment systems (Mastercard, SEPA,
+                   Visa, BitCoin, ACH, SWIFT, etc.) to anonymous
+                   electronic coins in the same currency. The customer
+                   can then redeem the electronic coins at a merchant,
+                   who can exchange them for money represented using
+                   traditional payment systems at the exchange.  The
+                   exchange charges fees (to the customer,
+                   merchant or both) to facilitate the transactions.")
+            }}</p>
         </div>
       </div>
       <div class="col-lg-12">
-        <h2 id="overview">{{ _("Taler as seen by the exchange operator") 
}}</h2>
+        <h2 id="overview">{{ _("Taler as seen by the payment service 
operator") }}</h2>
 
-        <p>{{ _("The exchange operator primarily operates a Web service
-          portal and keeps databases with transaction details and
-          cryptographic proofs.  Its operational expenses are thus related to
-          its interactions with the banking system and the operation of
-          the computing infrastructure, while its income is based on
-          transaction fees it may charge for the various interactions.
-          Key interactions of the exchange include:
-        ") }}</p>
+        <p>{{ _("The payment service operator runs a <em>Taler
+                 exchange</em>, which is a Web service portal that
+                 keeps databases with transaction details and
+                 cryptographic proofs.  Its operational expenses are
+                 thus related to its interactions with the banking
+                 system and the operation of the computing
+                 infrastructure, while its income is based on
+                 transaction fees it may charge for the various
+                 interactions.  Key interactions of the exchange
+                 include: ") }}</p>
 
         <p>
           <img src="{{ url('images/exchange.svg') }}" alt="operator 
perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%">
           </p><ul>
             <li>{{ _("Create a <b>reserve</b> based on an incoming
-              wire transfer from a customer.") }}</li>
+                      wire transfer from a customer.") }}</li>
 
             <li>{{ _("Allow customers to withdraw (and refresh)
-               digital coins from their reserve.") }}</li>
+                      digital coins from their reserve.") }}</li>
 
             <li>{{ _("Accept and validate deposits from merchants.") }}</li>
 
             <li>{{ _("Execute wire transfers to merchants in
-               response to validated deposits.") }}</li>
+                      response to validated deposits.") }}</li>
 
             <li>{{ _("Preserve and provide cryptographic proofs of
-               correct operation for audits by financial regulators.") }}</li>
+                      correct operation for audits by financial regulators.") 
}}</li>
           </ul>
         <p></p>
       </div>
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 2dae645..39e2aa8 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-08 06:20+0100\n"
+"POT-Creation-Date: 2017-02-10 15:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language: de\n"
@@ -15,14 +15,14 @@ msgstr ""
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:2 citizens.html.j2:2 developers.html.j2:2
-#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2 news.html.j2:2
+#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2
 #: wallet.html.j2:2
 msgid "en"
 msgstr "de"
 
 #: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
-#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
-#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
+#: governments.html.j2:5 index.html.j2:5 investors.html.j2:5
+#: merchants.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr "GNU Taler"
 
@@ -115,200 +115,133 @@ msgid "Citizens"
 msgstr "Bürger"
 
 #: citizens.html.j2:14
-msgid "Advantages for citizens"
-msgstr "Vorteile für Bürger"
+msgid "Advantages for Citizens"
+msgstr ""
+
+#: citizens.html.j2:18
+msgid ""
+"Taler largely functions like digital cash.  You\n"
+"\t           withdraw money from your bank account into your\n"
+"\t           electronic wallet, and can henceforth spend digital\n"
+"\t           cash.  The electronic wallet can carry multiple\n"
+"\t           currencies."
+msgstr ""
 
-#: citizens.html.j2:21
+#: citizens.html.j2:30
 msgid "Security"
 msgstr "Sicherheit"
 
-#: citizens.html.j2:23
-msgid ""
-"Taler is the electronic equivalent of cash, except harder to fake.\n"
-"             If your digital wallet is lost -- say because\n"
-"             your computer is irreparably damaged or compromised -- only "
-"the amount of coin\n"
-"             stored in your wallet will be lost. Unlike a physical "
-"wallet, you can make\n"
-"             backups of your digital wallet which can provide security "
-"against data loss.\n"
-"             So your digital wallet works mostly just like\n"
-"             a physical wallet, except online and without the need to "
-"manually count coins."
-msgstr ""
-"Taler ist das elektronische Äquivalent zu fälschungssicherem\n"
-"\t     Bargeld. Beim Verlust der digitalen Geldbörse, sei es durch\n"
-"\t     Schäden am Rechner oder durch einen gezielten Angriff, geht nur "
-"genau der\n"
-"\t     Betrag verloren, der sich in der Geldbörse befand. Allerdings ist "
-"die digitale\n"
-"\t     Ausgabe einer Geldbörse ungleich einfacher gegen Verlust zu "
-"sichern, indem\n"
-"\t     regelmäßig ein Backup angefertigt wird. Zusammengefasst\n"
-"\t     bedeutet das, dass die digitale Geldbörse nahezu wie ihr\n"
-"\t     aus dem Alltag bekannter Bruder funktioniert, außer dass sie\n"
-"\t     sich online befindet und dass das lästige Münzenzählen\n"
-"\t     bis auf Weiteres entfällt."
-
 #: citizens.html.j2:32
+msgid ""
+"Taler uses modern cryptography, ensuring that there\n"
+"                   is no counterfeit.  Your digital wallet is safer\n"
+"                   than your physical wallet.  At most, you can lose\n"
+"                   its contents because your computer or mobile is\n"
+"                   irreparably damaged or compromised.  Unlike a\n"
+"                   physical wallet, you can make backups to secure\n"
+"                   against data loss."
+msgstr ""
+
+#: citizens.html.j2:42
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: citizens.html.j2:34
+#: citizens.html.j2:44
 msgid ""
-"Your transactions are private, neither the exchange nor merchant needs to"
-"\n"
-"             learn your identity. There is no need to give our credit "
-"card numbers or\n"
-"             other sensitive information, and the merchant will only be "
-"able to do\n"
-"             exactly the transaction you confirmed using your digital "
-"wallet."
-msgstr ""
-"Von Ihnen durchgeführte Transaktionen sind generell\n"
-"\t     privat, weder die Wechselstube noch der Händler kennt\n"
-"\t     Ihre Identität. Weder Kreditkartennummern, noch andere\n"
-"\t     sensitive Informationen müssen herausgegeben werden, und der\n"
-"\t     Händler ist in der Lage, einzig von Ihnen bestätigte\n"
-"\t     Transaktionen durchzuführen."
+"Your transactions are private, neither the exchange\n"
+"                   nor merchant needs to learn your identity. There is\n"
+"                   no need to give out credit card numbers or other\n"
+"                   sensitive information. The merchant will only be\n"
+"                   able to do exactly the transaction you agreed to."
+msgstr ""
 
-#: citizens.html.j2:42
+#: citizens.html.j2:55
 msgid "Convenience"
 msgstr "Bequemlichkeit"
 
-#: citizens.html.j2:44
+#: citizens.html.j2:57
 msgid ""
-"You will be able to withdraw digital coins to replenish your wallet using"
-"\n"
-"             your credit card or SEPA transactions, similar to how you "
-"pay or withdraw\n"
-"             cash today."
+"You will be able to withdraw money to replenish the\n"
+"                   digital coins in your wallet using your credit card\n"
+"                   or wire transfers.  Afterwards you can pay with\n"
+"                   one-click using the Taler wallet, which optionally\n"
+"                   keeps your transaction history on your computer."
 msgstr ""
-"Um Geld in Ihre digitale Geldbörse zu transferieren\n"
-"\t     verwenden Sie wie gewohnt entweder Ihre Kreditkarte oder "
-"alternativ\n"
-"\t     eine SEPA-Überweisung."
 
-#: citizens.html.j2:49
+#: citizens.html.j2:66
 msgid "Stability"
 msgstr "Stabilität"
 
-#: citizens.html.j2:51
-msgid ""
-"Coins in your digital wallet will be of the same denomination as the\n"
-"             cash in your physical wallet. So you will not have to worry "
-"about\n"
-"             currency fluctuations or conversion rates. Like a physical "
-"wallet,\n"
-"             you can carry digital coins of different currencies in your "
-"digital\n"
-"             wallet at the same time."
-msgstr ""
-"Münzen in Ihrer digitalen Geldbörse besitzen\n"
-"\t     die gleichen Nennwerte wie das Geld in Ihrer echten Geldbörse.\n"
-"\t     Auf diese Weise müssen Sie sich nicht um\n"
-"\t     Währungsschwankungen oder Wechselkurse sorgen. Wie auch im\n"
-"\t     echten Leben können Sie digitale Münzen verschiedener\n"
-"\t     Währungen in Ihrer digitalen Geldbörse mit sich führen."
-
-#: citizens.html.j2:59
+#: citizens.html.j2:68
+msgid ""
+"Coins in your digital wallet will be of the same\n"
+"                   denomination as the cash in your physical wallet.\n"
+"                   Taler is not a crypto-currency, so you do not have\n"
+"                   to worry about cryto-currency related value\n"
+"                   fluctuations.  Banking with Taler is subject to the\n"
+"                   usual government protections for finanical\n"
+"                   services."
+msgstr ""
+
+#: citizens.html.j2:79
 msgid "Taler as seen by customers"
 msgstr "Taler aus Kundensicht"
 
-#: citizens.html.j2:61
+#: citizens.html.j2:81
 msgid ""
 "Customers interact with the Taler system mostly using\n"
-"          a free wallet implementation, which may be an extension or "
-"plugin\n"
-"          to their browser or a custom application on their computer(s).\n"
-"          Typical steps performed by customers are:\n"
-"        "
-msgstr ""
-"Um Taler zu verwenden, benutzen Kunden eine Geldbörsen, die als "
-"Browsererweiterung oder eigenständige Anwendung auf dem Kundencomputer "
-"läuft.  Typische Schritte die Kunden durchfüren sind:"
-
-#: citizens.html.j2:70
-msgid ""
-"The customer selects an exchange (i.e. by visiting the\n"
-"              respective website or selecting from a list of exchanges in"
-" the\n"
-"              application) and asks the wallet to create bank transfer\n"
-"              instructions to withdraw a certain amount of electronic "
-"cash.\n"
-"              The bank transfer instructions will contain an\n"
-"              access code that must be included in the subject of the\n"
-"              transaction, as well as the wire details for the exchange "
-"(i.e.\n"
-"              a SEPA account number)."
-msgstr ""
-"Der Kunde wählt eine Wechselstube\n"
-"             (z.B. durch Besuch der entsprechenden Webseite oder durch "
-"Wahl aus einer\n"
-"              Liste in der Geldbörsenanwendung) und fordert dann seine\n"
-"              Geldbörsenanwendung auf, Instruktionen für das abheben "
-"eines\n"
-"              bestimmten Betrages zu generieren.  Das Ergebnis könnten "
-"dann\n"
-"              z.B. SEPA Überweisungsdaten sein, wo ein bestimmter "
-"Zugangscode\n"
-"              im Betreff der Überweisung stehen muss."
+"                 a free wallet implementation, which may be an\n"
+"                 extension or plugin to their browser or a custom\n"
+"                 application on their computer(s).  Typical steps\n"
+"                 performed by customers are: "
+msgstr ""
 
-#: citizens.html.j2:79
+#: citizens.html.j2:92
+msgid ""
+"The customer selects an exchange (i.e. by\n"
+"                      visiting the respective website or selecting\n"
+"                      from a list of exchanges in the application) and\n"
+"                      asks the wallet to create bank transfer\n"
+"                      instructions to withdraw a certain amount of\n"
+"                      electronic cash.  The bank transfer instructions\n"
+"                      will contain an access code that must be\n"
+"                      included in the subject of the transaction, as\n"
+"                      well as the wire details for the exchange (i.e.\n"
+"                      a SEPA account number)."
+msgstr ""
+
+#: citizens.html.j2:103
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange "
-"using\n"
-"               these instructions provided by the wallet (top left)."
+"                       transfer funds from his account to the Taler\n"
+"                       exchange using these instructions provided by\n"
+"                       the wallet (top left)."
 msgstr ""
-"Der Kunde weist dann seine\n"
-"               Bank an, den entsprechenden Geldtransfer auf Basis dieser\n"
-"               Instruktionen zu veranlassen."
 
-#: citizens.html.j2:83
+#: citizens.html.j2:108
 msgid ""
 "Once the funds have arrived, the wallet will\n"
-"               automatically withdraw the electronic coins.  The\n"
-"               customer can use the wallet to review his remaining "
-"balance\n"
-"               at any time. He can also make backups to secure his "
-"digital\n"
-"               coins against hardware failures."
-msgstr ""
-"Sobald die Überweisung\n"
-"               angekommen ist, hebt die Geldbörse automatisch die\n"
-"               elektronischen Münzen ab.  Der Kunde kann seinen\n"
-"               akutellen elektronischen Barbestand jederzeit über\n"
-"               die Geldbörsenanwendung überprüfen. Es\n"
-"               ist auch möglich, die Daten aus der Geldbörse\n"
-"               per Backup zu sichern."
-
-#: citizens.html.j2:89
+"                       automatically withdraw the electronic coins.\n"
+"                       The customer can use the wallet to review his\n"
+"                       remaining balance at any time. He can also make\n"
+"                       backups to secure his digital coins against\n"
+"                       hardware failures."
+msgstr ""
+
+#: citizens.html.j2:115
 msgid ""
 "When visiting a merchant that supports Taler,\n"
-"               an additional payment option for Taler is enabled in the "
-"checkout system.\n"
-"               If the customer selects payments via Taler, the wallet\n"
-"               displays the secured contract from the merchant and asks\n"
-"               for confirmation.  Taler does not require the customer\n"
-"               to provide any identity information to the merchant.\n"
-"               Transaction histories and digitally\n"
-"               signed contracts can be preserved in the wallet for future"
-"\n"
-"               review by the customer, or even use in court."
-msgstr ""
-"Beim Besuch eines Händlers\n"
-"               der Taler unterstützt, wird Taler als zusätzliche\n"
-"               Bezahloption angezeigt.  Wenn der Kunde diese auswählt,\n"
-"               zeigt die Geldbörsenanwendung einen\n"
-"               vom Händler sicher übertragnen Vertragstext an\n"
-"               und fragt den Kunden diesen zu bestätigen.  Taler\n"
-"               ülbermittelt in beim Vertragsabschluss keine\n"
-"               personenbezogenen Daten. Historische "
-"Transaktionsinformationen\n"
-"               und der dazugehörige Vertragstext können von der\n"
-"               Geldbörse lokal gespeichert werden, unter anderem zur\n"
-"               spätern Durchsetzung von Verträgen vor Gericht."
+"                       an additional payment option for Taler is\n"
+"                       enabled in the checkout system.  If the\n"
+"                       customer selects payments via Taler, the wallet\n"
+"                       displays the secured contract from the merchant\n"
+"                       and asks for confirmation.  Taler does not\n"
+"                       require the customer to provide any identity\n"
+"                       information to the merchant.  Transaction\n"
+"                       histories and digitally signed contracts can be\n"
+"                       preserved in the wallet for future review by\n"
+"                       the customer, or even use in court."
+msgstr ""
 
 #: developers.html.j2:5
 msgid "Developers"
@@ -325,421 +258,253 @@ msgstr "Frei"
 #: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
-"            protocol. Anybody is welcome to inspect our code and\n"
-"            integrate our reference implementation into their\n"
-"            applications.  Different components of Taler are being\n"
-"            made available under different licenses. The Affero\n"
-"            GPLv3+ is used for the exchange, the LGPLv3+ is used for\n"
-"            reference code demonstrating integration with merchant\n"
-"            platforms, and licenses like Apache/Mozilla/GPLv3+ are\n"
-"            used for wallets and related customer-facing software.\n"
-"            We are open for constructive suggestions for maximizing\n"
-"            the adoption of this libre payment platform.\n"
-"          "
+"                   protocol. Anybody is welcome to inspect our code\n"
+"                   and integrate our reference implementation into\n"
+"                   their applications.  Different components of Taler\n"
+"                   are being made available under different\n"
+"                   licenses. The Affero GPLv3+ is used for the\n"
+"                   exchange, the LGPLv3+ is used for reference code\n"
+"                   demonstrating integration with merchant platforms,\n"
+"                   and licenses like Apache/Mozilla/GPLv3+ are used\n"
+"                   for wallets and related customer-facing software.\n"
+"                   We are open for constructive suggestions for\n"
+"                   maximizing the adoption of this libre payment\n"
+"                   platform.  "
 msgstr ""
-"Taler ist freie Software, welche ein offenes\n"
-"\t    Protokoll implementiert. Der Code ist frei verfügbar\n"
-"\t    und jeder ist eingeladen unsere Referenzimplementierung in\n"
-"\t    eigene Projekte zu übernehmen. Die unterschiedlichen\n"
-"\t    Komponenten Talers sind unter verschiedenen Lizenzen\n"
-"\t    erhältlich. Die Wechselstube fällt unter Affero\n"
-"\t    GPLv3+, Referenzcode, welcher die Integration mit\n"
-"\t    Händlerplattformen demonstriert, läuft unter\n"
-"\t    LGPLv3+ und die Geldbörsen sowie weitere Software auf\n"
-"\t    Seiten der Endkunden verwenden Apache-/Mozilla-\n"
-"\t    ähnliche GPLv3+. Wir sind offen für konstruktive\n"
-"\t    Vorschläge und freuen uns über Beiträge,\n"
-"\t    welche zur weiten Verbreitung dieser freien\n"
-"\t    Bezahlplattform führen.\n"
-"          "
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid "RESTful"
 msgstr "REST-basiert"
 
-#: developers.html.j2:38
+#: developers.html.j2:40
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
-"\t    ensure that Taler payments can work with restrictive\n"
-"\t    network setups, Taler uses a RESTful protocol over HTTP or\n"
-"\t    HTTPS. Taler's security does not depend upon the use of\n"
-"\t    HTTPS, but obviously merchants may choose to offer HTTPS\n"
-"\t    for consistency and because it generally is better for\n"
-"\t    privacy compared to HTTP.  Taler uses JSON to encode\n"
-"\t    structure data, making it easy to integrate Taler with\n"
-"\t    existing Web applications.  Taler's protocol is documented\n"
-"\t    in detail <a href='https://api.taler.net/'>here</a>.\n"
-"          "
-msgstr ""
-"Taler wurde zur Verwendung im Internet\n"
-"\t    konzipiert. Um sicherzustellen, dass Bezahlvorgänge\n"
-"\t    mit Taler auch in restriktiven Netzwerkumgebungen\n"
-"\t    funktionieren können, verwendet Taler ein\n"
-"\t    REST-basiertes Protokoll über HTTP oder HTTPS. Talers\n"
-"\t    Sicherheit hängt nicht von der Verwendung von HTTPS\n"
-"\t    ab, aber die Verwendung von HTTPS auf Seiten der\n"
-"\t    Händler sollte aus Konsistenzgründen und\n"
-"\t    aufgrund der besseren Privatsphäre, die HTTPS\n"
-"\t    gegenüber HTTP bietet, erfolgen. Da Taler zur\n"
-"\t    Kodierung von Datenstrukturen JSON verwendet, ist die\n"
-"\t    Integration von Taler in existierende Webapplikationen\n"
-"\t    sehr einfach. Das Taler-Protokoll ist im\n"
-"\t    Detail <a href='https://api.taler.net/'>hier</a>\n"
-"\t    dokumentiert.\n"
-"          "
-
-#: developers.html.j2:53
+"\t           ensure that Taler payments can work with\n"
+"\t           restrictive network setups, Taler uses a RESTful\n"
+"\t           protocol over HTTP or HTTPS. Taler's security does\n"
+"\t           not depend upon the use of HTTPS, but obviously\n"
+"\t           merchants may choose to offer HTTPS for consistency\n"
+"\t           and because it generally is better for privacy\n"
+"\t           compared to HTTP.  Taler uses JSON to encode\n"
+"\t           structure data, making it easy to integrate Taler\n"
+"\t           with existing Web applications.  Taler's protocol\n"
+"\t           is documented in\n"
+"\t           detail <a href='https://api.taler.net/'>here</a>.\n"
+"\t           "
+msgstr ""
+
+#: developers.html.j2:58
 msgid "Code"
 msgstr "Code"
 
-#: developers.html.j2:55
+#: developers.html.j2:60
 msgid ""
 "Taler is currently primarily developed by a\n"
-"\t    research team at Inria and TU Munich. However,\n"
-"\t    contributions from anyone are welcome.  Our Git\n"
-"\t    repositories can be cloned using the Git and HTTP access\n"
-"\t    methods against <tt>git.taler.net</tt> with the name of\n"
-"\t    the respective repository. A list of public repositories\n"
-"\t    can be found in\n"
-"\t    our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
+"\t           research team at Inria and GNUnet e.V. However,\n"
+"\t           contributions from anyone are welcome.  Our Git\n"
+"\t           repositories can be cloned using the Git and HTTP\n"
+"\t           access methods against <tt>git.taler.net</tt> with\n"
+"\t           the name of the respective repository. A list of\n"
+"\t           public repositories can be found in\n"
+"\t           our <a href='https://git.taler.net/'>GitWeb</a>.\n"
+"\t           "
 msgstr ""
-"Taler wird aktuell hauptsächlich von einer\n"
-"\t    Forschergruppe bei Inria und der Technischen\n"
-"\t    Universität München entwickelt. Trotzdem sind\n"
-"\t    Beiträge von jedem wilkommen. Unser Git-Repository\n"
-"\t    kann man sowohl über Git als auch über HTTP\n"
-"\t    klonen, indem man auf <tt>git.taler.net</tt> mit dem\n"
-"\t    entsprechenden Repository-Namen zugreift. Eine Liste von\n"
-"\t    öffentlichen Repositories ist in unserem\n"
-"\t    <a href='https://git.taler.net/'>GitWeb</a> zu finden.\n"
-"          "
 
-#: developers.html.j2:66
+#: developers.html.j2:72
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: developers.html.j2:68
+#: developers.html.j2:74
 msgid ""
 "In addition to this website,\n"
-"            the <a href='https://git.taler.net/'>documented\n"
-"            code</a> and the <a href='https://api.taler.net/'>API\n"
-"            documentation</a>, we are in the process of preparing a\n"
-"            comprehensive design document which will be published here\n"
-"            soon.\n"
-"          "
+"                   the <a href='https://git.taler.net/'>documented\n"
+"                   code</a> and\n"
+"                   the <a href='https://api.taler.net/'>API\n"
+"                   documentation</a>, we are in the process of\n"
+"                   preparing a comprehensive design document which\n"
+"                   will be published here soon.  "
 msgstr ""
-"Zusätzlich zu dieser Webseite,\n"
-"            dem <a href='https://git.taler.net/'>dokumentierten\n"
-"            Code</a> und\n"
-"            der <a href='https://api.taler.net/'>API-Dokumentation</a>\n"
-"            bereiten wir ein umfassendes Design-Dokument vor, welches\n"
-"            in Kürze hier verfügbar sein wird.\n"
-"          "
 
-#: developers.html.j2:77
+#: developers.html.j2:83
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: developers.html.j2:79
+#: developers.html.j2:85
 msgid ""
 "We have a mailinglist for developer discussions.\n"
-"            You can subscribe to it or read the list archive at\n"
-"            <a "
+"                   You can subscribe to it or read the list archive at\n"
+"                   <a "
 
"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgstr ""
-"Wir haben eine Mailingliste für Diskussionen mit den Entwicklern.\n"
-"            Die Webseite der Liste zum eintragen als auch das "
-"Listenarchiv sind hier:\n"
-"            <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:87
+#: developers.html.j2:93
 msgid "Regression Testing"
 msgstr "Regressionstests"
 
-#: developers.html.j2:89
+#: developers.html.j2:95
 msgid ""
-"We\n"
-"            have <a href='https://buildbot.net/'>Buildbot</a>\n"
-"            automation tests to detect regressions and check for\n"
-"            portability at\n"
+"We have\n"
+"                   <a href='https://buildbot.net/'>Buildbot</a>\n"
+"                   automation tests to detect regressions and check\n"
+"                   for portability at\n"
 "            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>."
 "\n"
 "          "
 msgstr ""
-"Wir automatisieren Tests mit Hilfe\n"
-"            von <a href='https://buildbot.net/'>Buildbot</a> um\n"
-"            Regressionen zu finden und den Code auf Portabilität\n"
-"            zu testen.  Die Ergebnisse sind unter\n"
-"            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a> "
-"zu finden.\n"
-"          "
 
-#: developers.html.j2:97
+#: developers.html.j2:103
 msgid "Code Coverage Analysis"
 msgstr "Testabdeckungsanalyse"
 
-#: developers.html.j2:99
-#, fuzzy
+#: developers.html.j2:105
 msgid ""
-"We\n"
-"            use <a "
+"We use\n"
+"                   <a "
 "href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-"            to analyze the code coverage of our tests, the results are\n"
-"            available\n"
-"            at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
+"                   to analyze the code coverage of our tests, the\n"
+"                   results are available\n"
+"                   at <a "
+"href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
+"                   "
 msgstr ""
-"Wir\n"
-"            benutzen <a "
-"href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-"            um die Abdeckung unseres Codes durch unsere Tests zu\n"
-"            verstehen. Die Ergebnisse sind unter\n"
-"            <a href='https://lcov.taler.net/'>lcov.taler.net</a> zu "
-"finden.\n"
-"          "
 
-#: developers.html.j2:107
+#: developers.html.j2:113
 msgid "Performance Analysis"
 msgstr "Performanzanalyse"
 
-#: developers.html.j2:109
+#: developers.html.j2:115
 msgid ""
 "We\n"
-"            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
-"            performance regression analysis of the exchange backend\n"
-"            at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
-msgstr ""
-"Wir\n"
-"            benutzen <a href='https://gnunet.org/gauger'>Gauger</a> um\n"
-"            Performanzprobleme der Datenbankbackends der\n"
-"            Wechselstube zu verstehen.  Die Ergebnisse sind\n"
-"            unter <a "
+"                   use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
+"                   for performance regression analysis of the exchange\n"
+"                   backend\n"
+"                   at <a "
 "href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
+"                   "
+msgstr ""
 
-#: developers.html.j2:118
+#: developers.html.j2:125
 msgid "Taler system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:120
+#: developers.html.j2:127
 msgid ""
-"The Taler system consists of protocols executed\n"
-"          among a number of actors with the help\n"
-"          of <a href='https://www.fsf.org/'>Free Software</a> as\n"
-"          illustrated in the illustration on the right.  Typical\n"
-"          transactions involve the following steps:\n"
-"        "
+"The Taler system consists of protocols executed among\n"
+"                 a number of actors with the help\n"
+"                 of <a href='https://www.fsf.org/'>Free Software</a>\n"
+"                 as illustrated in the illustration on the right.\n"
+"                 Typical transactions involve the following steps: "
 msgstr ""
-"Das Taler System besteht aus Protokollen die von\n"
-"          verschiedenen Teilnehmern unter Verwendung von\n"
-"          <a href='https://www.fsf.org/'>Freier Software</a>\n"
-"          ausgeführt werden.  Die Illustration auf der rechten\n"
-"          Seite veranschaulicht die folgenden für die\n"
-"          Durchführung einer Transaktion typischen Schritte:\n"
-"        "
 
-#: developers.html.j2:129
+#: developers.html.j2:136
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange\n"
-"               (top left).  In the subject of the transaction, he\n"
-"               includes an authentication token from his\n"
-"               electronic <b>wallet</b>. In Taler terminology, the\n"
-"               customer creates a reserve at the exchange.\n"
-"             "
-msgstr ""
-"Ein Kunde weist seine <b>Bank</b> an,\n"
-"               Gelder aus seinem Konto an die Taler Wechselstube zu\n"
-"               übertragen (oben links).  Im Betreff gibt er ein\n"
-"               von seiner elektronischen <b>Geldbörse</b>\n"
-"               erzeugtes Authentifizierungstoken an. In der\n"
-"               Terminologie von Taler sagen wir, der Kunde legt eine\n"
-"               Reserve bei der Wechselstube an.\n"
-"             "
-
-#: developers.html.j2:137
-#, fuzzy
-msgid ""
-"Once the exchange has received the\n"
-"               transfer, it allows the customer's electronic wallet\n"
-"               to <b>withdraw</b> electronic coins.  The electronic\n"
-"               coins are digital representations of the original\n"
-"               currency from the transfer. It is important to note\n"
-"               that the exchange does not learn the &quot;serial "
-"numbers&quot;\n"
-"               of the coins created in this process, so it cannot tell\n"
-"               later which customer purchased what at which merchant.\n"
-"               The use of Taler does not change the currency or the\n"
-"               total value of the funds (except for fees which the\n"
-"               exchange may charge for the service).\n"
-"             "
-msgstr ""
-"Sobald die Wechselstube den\n"
-"               Transfer bekommen hat, erlaubt es der elektronischen\n"
-"               Geldbörse das <b>abheben</b> elektronischer\n"
-"               Münzen. Diese elektronischen Münzen sind\n"
-"               digitale Räpresentationen der ursprünglichen\n"
-"               Währung der Überweisung. Hierbei ist es\n"
-"               wichtig, dass die Wechselstube nicht die\n"
-"               &quot;Seriennummern&quot; der bei diesem Prozess erzeugten"
-"\n"
-"               Münzen lernt. Somit kann die Wechselstube\n"
-"               später nicht feststellen, welcher Kunde bei\n"
-"               welchem Hänlder was einkauft.  Die Benutzung von\n"
-"               Taler ändert weder die Währung noch den\n"
-"               Gesamtwert (ausgenommen natürlich die\n"
-"               Geb&amp;uum;hren, die die Wechselstube für ihre\n"
-"               Dienste verlangen könnte).\n"
-"             "
-
-#: developers.html.j2:150
-msgid ""
-"Once the customer has the digital coins in\n"
-"               his wallet, the wallet can be used to <b>spend</b> the\n"
-"               coins with merchant portals that support the Taler\n"
-"               payment system and accept the respective exchange as a\n"
-"               business partner (bottom arrow). This creates a digital\n"
-"               contract signed by the customer's coins and the\n"
-"               merchant.  If necessary, the customer can later use\n"
-"               this digitally signed contract in a court of law to\n"
-"               prove the exact terms of the contract and that he paid\n"
-"               the respective amount. The customer does not learn the\n"
-"               banking details of the merchant, and Taler does not\n"
-"               require the merchant to learn the identity of the\n"
-"               customer. Naturally, the customer can spend any\n"
-"               fraction of his digital coins (the system takes care of\n"
-"               customers getting change).\n"
-"             "
-msgstr ""
-"Sobald der Kunde digitale Münzen in\n"
-"               seiner elektronischen Geldbörse hat, kann er diese\n"
-"               bei Händlern die Taler unterstützen und die\n"
-"               entsprechende Wechselstube\n"
-"               akzeptieren <b>ausgeben</b>. Dabei wird ein Vertrag\n"
-"               cryptographisch signiert durch die Münzen des\n"
-"               Kunden und den Schlüssel des Händlers.  Falls\n"
-"               notwendig, kann der Kunde kann diesen Vertrag\n"
-"               später vor Gericht vorlegen als Beweis für\n"
-"               den unterzeichneten Vertrag und die Zahlung des\n"
-"               Betrages.  Der Kunde lernt hierbei nicht die\n"
-"               Kontoinformationen des Händlers, und Taler\n"
-"               verlangt vom Händler nicht, dass er die\n"
-"               Identität des Kunden bestimmt.  Natürlich\n"
-"               kann der Kunde auch Bruchteile seines Barbestandes\n"
-"               ausgeben (das System sorgt ggf.  dafür das der\n"
-"               Kunde wenn nötig Wechselgelt erhält).\n"
-"             "
-
-#: developers.html.j2:167
-#, fuzzy
+"                       transfer funds from his account to the Taler\n"
+"                       exchange (top left).  In the subject of the\n"
+"                       transaction, he includes an authentication\n"
+"                       token from his electronic <b>wallet</b>. In\n"
+"                       Taler terminology, the customer creates a\n"
+"                       reserve at the exchange.  "
+msgstr ""
+
+#: developers.html.j2:144
+msgid ""
+"Once the exchange has received the wire\n"
+"                       transfer, it allows the customer's electronic\n"
+"                       wallet to <b>withdraw</b> electronic coins.\n"
+"                       The electronic coins are digital\n"
+"                       representations of the original currency from\n"
+"                       the transfer. It is important to note that the\n"
+"                       exchange does not learn the &quot;serial\n"
+"                       numbers&quot; of the coins created in this\n"
+"                       process, so it cannot tell later which customer\n"
+"                       purchased what at which merchant.  The use of\n"
+"                       Taler does not change the currency or the total\n"
+"                       value of the funds (except for fees which the\n"
+"                       exchange may charge for the service).  "
+msgstr ""
+
+#: developers.html.j2:159
+msgid ""
+"Once the customer has the digital coins in his\n"
+"                       wallet, the wallet can be used to <b>spend</b>\n"
+"                       the coins with merchant portals that support\n"
+"                       the Taler payment system and accept the\n"
+"                       respective exchange as a business partner\n"
+"                       (bottom arrow). This creates a digital contract\n"
+"                       signed by the customer's coins and the\n"
+"                       merchant.  If necessary, the customer can later\n"
+"                       use this digitally signed contract in a court\n"
+"                       of law to prove the exact terms of the contract\n"
+"                       and that he paid the respective amount. The\n"
+"                       customer does not learn the banking details of\n"
+"                       the merchant, and Taler does not require the\n"
+"                       merchant to learn the identity of the\n"
+"                       customer. Naturally, the customer can spend any\n"
+"                       fraction of his digital coins (the system takes\n"
+"                       care of customers getting change).  "
+msgstr ""
+
+#: developers.html.j2:177
 msgid ""
 "Merchants receiving digital\n"
-"               coins <b>deposit</b> the respective receipts that\n"
-"               resulted from the contract signing with the customer at\n"
-"               the exchange to redeem the coins.  The deposit step\n"
-"               does not reveal the details of the contract between the\n"
-"               customer and the merchant or the identity of the\n"
-"               customer to the exchange in any way. However, the\n"
-"               exchange does learn the identity of the merchant via\n"
-"               the provided bank routing information.  The merchant\n"
-"               can, for example when compelled by the state for\n"
-"               taxation, provide information linking the individual\n"
-"               deposit to the respective contract signed by the\n"
-"               customer. Thus, the exchange's database allows the\n"
-"               state to enforce that merchants pay applicable taxes\n"
-"               (and do not engage in illegal contracts).\n"
-"             "
-msgstr ""
-"Händler die digitale\n"
-"               Münzen erhalten <b>deponieren</b> die Belege aus\n"
-"               dem Vertragsabschluss bei der Wechselstube um den\n"
-"               Gegenwert zu erhalten. Beim Deponieren werden weder die\n"
-"               Vertragsdetails zwischen Kunde und Händler noch\n"
-"               die Identitält des Kunden der Wechselstube\n"
-"               bekannt. Die Wechselstube lernt jedoch die\n"
-"               Identität des Händlers da dieser seine\n"
-"               Kontoinformationen im Klartext zur Verfügung\n"
-"               stellen muss.  Falls der Staat es später verlangt,\n"
-"               kann der Händler beweisen, welcher Vertrag dem\n"
-"               Depotvorgang zugrundelag, z.B.  damit der Staat die\n"
-"               richtige Steuerkategorie bestimmen kann.  Somit\n"
-"               erlaubten es die Informationen der Wechselstube dem\n"
-"               Staat Händler zum abführen von Steuern zu\n"
-"               zwingen (und kriminelle Verträge entsprechend zu\n"
-"               ahnden).\n"
-"             "
-
-#: developers.html.j2:184
+"                       coins <b>deposit</b> the respective receipts\n"
+"                       that resulted from the contract signing with\n"
+"                       the customer at the exchange to redeem the\n"
+"                       coins.  The deposit step does not reveal the\n"
+"                       details of the contract between the customer\n"
+"                       and the merchant or the identity of the\n"
+"                       customer to the exchange in any way. However,\n"
+"                       the exchange does learn the identity of the\n"
+"                       merchant via the provided bank routing\n"
+"                       information.  The merchant can, for example\n"
+"                       when compelled by the state for taxation,\n"
+"                       provide information linking the individual\n"
+"                       deposit to the respective contract signed by\n"
+"                       the customer. Thus, the exchange's database\n"
+"                       allows the state to enforce that merchants pay\n"
+"                       applicable taxes (and do not engage in illegal\n"
+"                       contracts).  "
+msgstr ""
+
+#: developers.html.j2:196
 msgid ""
 "Finally, the exchange transfers funds\n"
-"               corresponding to the digital coins redeemed by the\n"
-"               merchants to the merchant's <b>bank</b> account. The\n"
-"               exchange may combine multiple small transactions into\n"
-"               one larger bank transfer.  The merchant can query the\n"
-"               exchange about the relationship between the bank\n"
-"               transfers and the individual claims that were\n"
-"               deposited.\n"
-"             "
-msgstr ""
-"Abschließend überweist die\n"
-"               Wechselstube dem Händler den entsprechenden\n"
-"               Betrag auf sein <b>Bankkonto</b>.  Die Wechselstube\n"
-"               könnte dabei mehrere kleine Transaktionen zu einem\n"
-"               gößerem Transfer zusammenfassen.  Der\n"
-"               Händler kann in diesem Fall bei der\n"
-"               Wechselstube nachfragen, um Informationen zur\n"
-"               Relation der Transfers und den dazugehörigen\n"
-"               Depotvorgängen zu erhalten.\n"
-"             "
-
-#: developers.html.j2:194
+"                       corresponding to the digital coins redeemed by\n"
+"                       the merchants to the merchant's <b>bank</b>\n"
+"                       account. The exchange may combine multiple\n"
+"                       small transactions into one larger bank\n"
+"                       transfer.  The merchant can query the exchange\n"
+"                       about the relationship between the bank\n"
+"                       transfers and the individual claims that were\n"
+"                       deposited.  "
+msgstr ""
+
+#: developers.html.j2:206
 msgid ""
 "Most importantly, the exchange keeps\n"
-"               cryptographic proofs that allow it to demonstrate that\n"
-"               it is operating correctly to third parties.  The system\n"
-"               requires an external <b>auditor</b>, such as a\n"
-"               government-appointed financial regulatory body, to\n"
-"               frequently verify the exchange's databases and check that\n"
-"               its bank balance matches the total value of the\n"
-"               remaining coins in circulation.\n"
-"             "
-msgstr ""
-"Die Wechselstube speichert\n"
-"               kryptographische Beweise die es ihr erlauben,\n"
-"               gegenüber Dritten zu beweisen, dass Sie korrekt\n"
-"               gearbeitet hat.  Es wird erwartet, dass die\n"
-"               Wechselstube gegenüber der Finanzaufsicht\n"
-"               nachweisen muss, dass sie genügend Rücklagen\n"
-"               zur Deckung aller noch ausstehenden Münzen\n"
-"               besitzt.\n"
-"             "
-
-#: developers.html.j2:204
+"                       cryptographic proofs that allow it to\n"
+"                       demonstrate that it is operating correctly to\n"
+"                       third parties.  The system requires an\n"
+"                       external <b>auditor</b>, such as a\n"
+"                       government-appointed financial regulatory body,\n"
+"                       to frequently verify the exchange's databases\n"
+"                       and check that its bank balance matches the\n"
+"                       total value of the remaining coins in\n"
+"                       circulation.  "
+msgstr ""
+
+#: developers.html.j2:217
 msgid ""
 "Without the auditor, the exchange operators\n"
-"               could embezzle funds they are holding in\n"
-"               reserve. Customers and merchants cannot cheat each\n"
-"               other or the exchange. If any party's computers are\n"
-"               compromised, the financial damage is limited to the\n"
-"               respective party and proportional to the funds they\n"
-"               have in circulation during the period of the\n"
-"               compromise.\n"
-"             "
-msgstr ""
-"Ohne die Finanzaufsicht wäre es dem\n"
-"               Betreiber der Münzerei möglich, Gelder aus\n"
-"               der Reserve zu entwenden.  Wenn die Computer von einem\n"
-"               der Teilnehmer kompromitiert werden, hat immer nur der\n"
-"               kompromitierte Teilnehmer den finanziellen Schaden.\n"
-"               Dieser ist weiterhin begrenzt auf den Gesamtumsatz mit\n"
-"               Taler im fraglichen Zeitraum.\n"
-"             "
-
-#: financial-news.html.j2:5 financial-news.html.j2:14
-msgid "Financial News"
+"                       could embezzle funds they are holding in\n"
+"                       reserve. Customers and merchants cannot cheat\n"
+"                       each other or the exchange. If any party's\n"
+"                       computers are compromised, the financial damage\n"
+"                       is limited to the respective party and\n"
+"                       proportional to the funds they have in\n"
+"                       circulation during the period of the\n"
+"                       compromise.  "
 msgstr ""
 
 #: governments.html.j2:5
@@ -747,792 +512,564 @@ msgid "Governments"
 msgstr "Regierungen"
 
 #: governments.html.j2:14
-msgid "Advantages for governments"
-msgstr "Vorteile für Regierungen"
+msgid "Advantages for Governments"
+msgstr ""
+
+#: governments.html.j2:18
+msgid ""
+"Taler provides accountability to ensure business\n"
+"                   accepting payments operate legally, while also\n"
+"                   respecting civil liberties of citizens spending\n"
+"                   digital cash.  Taler is a commons, a payment system\n"
+"                   based on open standards and free software.  Taler\n"
+"                   needs governments to set a financial framework and\n"
+"                   to act as trusted regulators.  Taler contributes to\n"
+"                   digital sovereignty in the critial financial\n"
+"                   infrastructure."
+msgstr ""
 
-#: governments.html.j2:21 index.html.j2:25
+#: governments.html.j2:34
 #, fuzzy
 msgid "Taxable"
 msgstr "Taxierbar"
 
-#: governments.html.j2:23
-msgid ""
-"Taler is an electronic payment system that was built with the goal of "
-"supporting taxation.\n"
-"             With Taler, the receiver of any form of payment is known, "
-"and the payment information comes\n"
-"             attached with some details about what the payment was made "
-"for (but not the identity of the customer).  Thus, governments can use "
-"this\n"
-"             data to tax buisnesses and individuals based on their "
-"income, making tax evasion and\n"
-"             black markets less viable."
-msgstr ""
-"Taler ist ein elektronisches Zahlungssystem, welches die Besteuerung "
-"einzelner\n"
-"\t     Transaktionen ermöglicht. Im System sind die Empfänger für jeden "
-"Zahlungsvorgang\n"
-"\t     bekannt, genauso wie bestimmte Details über den Zweck der "
-"Transaktion (aber nicht die Identität des Kunden). Dadurch\n"
-"\t     ermöglicht Taler es Regierungen, sowohl Firmen als auch "
-"Privatpersonen auf Basis\n"
-"\t     ihres Einkommens zu besteuern und erschwert gleichzeitig noch "
-"Steuervermeidungen sowie den\n"
-"\t     Schwarzmarkthandel."
-
-#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
+#: governments.html.j2:36
+msgid ""
+"Taler was\n"
+"\t           built with the goal of fighting corruption and supporting "
+"taxation.  \n"
+"\t           With Taler, the receiver of any form of payment is\n"
+"\t           easily identified by the government, and the merchant\n"
+"                   can be compelled to provide the contract that was "
+"accepted\n"
+"                   by the customer.  Governments can use this data to\n"
+"\t           tax businesses and individuals based on their\n"
+"\t           income, making tax evasion and black markets less\n"
+"\t           viable."
+msgstr ""
+
+#: governments.html.j2:46
+msgid ""
+"Thus, despite offering anonymity for citizens\n"
+"                   spending digital cash to buy goods and services,\n"
+"                   Taler also ensures that the state can observe\n"
+"                   incoming funds. This can be used to ensure\n"
+"                   businesses engage only in legal activities, and do\n"
+"                   not evade income tax, sales tax or value-added tax.\n"
+"                   However, this observational capability does not\n"
+"                   extend to the immediate personal domain.  In\n"
+"                   particular, sharing access to funds within a family\n"
+"                   or synchronizing wallets across multiple devices is "
+"not\n"
+"                   subject to monitoring."
+msgstr ""
+
+#: governments.html.j2:59 merchants.html.j2:43
 msgid "Secure"
 msgstr "Sicher"
 
-#: governments.html.j2:32
-msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, "
-"merchants and\n"
-"             the exchange can mathematically demonstrate their lawful "
-"behavior in court in case\n"
-"             of disputes. Financial damages are strictly limited, "
-"improving economic security\n"
-"             for individuals, merchants, the exchange and the state.  "
-"Most importantly, an\n"
-"             independent auditor can ensure that there is no &quot;bad "
-"exchange&quot;\n"
-"             within the Taler system who might threaten the economy due "
-"to fraud."
-msgstr ""
-"Talers Zahlvorgänge sind kryptographisch gesichert.\n"
-"\t     Dieser Umstand ermöglicht es Kunden, Händlern und der "
-"Wecheslstube,\n"
-"\t     wenn nötig ihre Gesetzmäßigkeit in einem Gerichtsprozess "
-"mathematisch\n"
-"\t     nachzuweisen. Finanzielle Schäden sind streng\n"
-"\t     begrenzt, was der ökonomischen Sicherheit von Privatpersonen,\n"
-"\t     Händlern und der Wechselstube entgegen kommt. Herauszuheben ist "
-"auch die\n"
-"\t     Tatsache, dass ein unabhängiger Rechnungsprüfer in der Lage\n"
-"\t     ist, die Existenz einer veruntreuenden Bank innerhalb des Taler-"
-"Systems\n"
-"\t     auszuschließen."
-
-#: governments.html.j2:42 index.html.j2:39
+#: governments.html.j2:61
+msgid ""
+"Taler's payments are cryptographically\n"
+"                   secured. Thus, customers, merchants and the\n"
+"                   exchange can mathematically demonstrate their\n"
+"                   lawful behavior in court in case of\n"
+"                   disputes. Financial damages are strictly limited,\n"
+"                   improving economic security for individuals,\n"
+"                   merchants, the exchange and the state."
+msgstr ""
+
+#: governments.html.j2:69
+msgid ""
+"By design, the Taler payment service provider is\n"
+"                   subject to financial regulation. Financial\n"
+"                   regulation and regular audits are critical to\n"
+"                   establish trust. In particular, the Taler design\n"
+"                   mandates the existence of an independent auditor\n"
+"                   who checks cryptographic proofs that accumulate at\n"
+"                   the payment service provider to ensure that the\n"
+"                   escrow account is managed honestly.  This ensures\n"
+"                   that the payment service provider does not threaten\n"
+"                   the economy due to fraud."
+msgstr ""
+
+#: governments.html.j2:80
 msgid "Libre"
 msgstr "Libre"
 
-#: governments.html.j2:44
+#: governments.html.j2:82
 msgid ""
-"Taler is free software implementing an open protocol standard.  Thus, "
-"Taler will\n"
-"             enable competition and avoid the monopolization of payment "
-"systems that threatens\n"
-"             global political and financial stability today."
+"Taler is free software implementing an open\n"
+"                   protocol standard.  Thus, Taler will enable\n"
+"                   competition and avoid the monopolization of payment\n"
+"                   systems that threatens global political and\n"
+"                   financial stability today."
 msgstr ""
-"Taler ist freie Software, welche einen offenen\n"
-"\t     Protokollstandard implementiert. Taler ermöglicht daher einen\n"
-"\t     offenen Wettbewerb und vermeidet das Problem der Monopolisierung "
-"von\n"
-"\t     Zahlungssystemen, welche heute in globalem Ausmaß die politische\n"
-"\t     sowie aber auch die finanzielle Stabilität bedroht."
 
-#: governments.html.j2:49 investors.html.j2:18
+#: governments.html.j2:91
 msgid "Efficient"
 msgstr "Effizient"
 
-#: governments.html.j2:51
+#: governments.html.j2:93
 msgid ""
-"Taler is designed to be efficient.  Unlike timeline-based payment systems"
-" like\n"
-"             BitCoin, Taler will not threaten the availability of "
-"national electric grids or\n"
-"             (significantly) contribute to environmental pollution."
+"Taler has an efficient design.  Unlike\n"
+"                   timeline-based payment systems, such as BitCoin,\n"
+"                   Taler will not threaten the availability of\n"
+"                   national electric grids or (significantly)\n"
+"                   contribute to environmental pollution."
 msgstr ""
-"Taler wurde im Gedanken der Effizienz erschaffen. Anders\n"
-"\t     als Zeitachsen-basierte Bezahlsysteme wie BitCoin bedroht Taler\n"
-"\t     nicht die Verfügbarkeit nationaler Energieversorgungsnetze und\n"
-"\t     wird auch nicht (signifikant) zur Umweltverschmutzung beitragen."
 
-#: governments.html.j2:57
+#: governments.html.j2:102
 msgid "Taler as seen by governments"
 msgstr "Taler aus Regierungsperspektive"
 
-#: governments.html.j2:59
-#, fuzzy
+#: governments.html.j2:104
 msgid ""
-"Governments can observe traditional wire\n"
-"          transfers entering and leaving the Taler system, and\n"
-"          require merchants and exchange operators to provide certain\n"
-"          information during financial audits.  Exchange operators\n"
-"          are expected to be permanently checked by auditors,\n"
-"          while merchants may be required to reveal information\n"
-"          during regular tax audits.\n"
-"          Information available to the government includes:\n"
-"        "
-msgstr ""
-"Regierungen sehen die\n"
-"          Banküberweisungen von und an die Wechselstube\n"
-"          und können von Händlern und Wechselstubenbetreibern\n"
-"          weitere Informationen bei Betriebsprüfungen verlangen.\n"
-"          Wechselstubenbetreiber werden dauernd überprüft,\n"
-"          wohingegen Händler im Wesentlichen bei der Steuerprüfung\n"
-"          weitere Informationen bereistellen.  Informationen die der\n"
-"          Regierung bereitgestellt werden können sind:"
-
-#: governments.html.j2:71
-msgid ""
-"From the banking system:\n"
-"              The total amount of digital currency\n"
-"              obtained by a customer. The government could impose\n"
-"              limits on how many digital coins a customer may\n"
-"              withdraw within a given timeframe."
-msgstr ""
-"Vom Bankensystem:\n"
-"              Der Gesamtbetrag an digitalen Münzen den\n"
-"              ein Kunde abgehoben hat. Die Regierung kann den\n"
-"              Betrag digitaler Münzen den ein Kunde in einem\n"
-"              bestimmten Zeitraum abheben kann beschränken."
-
-#: governments.html.j2:77
-msgid ""
-"From the banking system:\n"
-"               The total amount of income received\n"
-"               by any merchant via the Taler system."
-msgstr ""
-"Vom Bankensystem:\n"
-"               Das Gesamteinkommen jedes Händlers\n"
-"               welches durch Taler vermittelt wurde."
-
-#: governments.html.j2:81
-msgid ""
-"From auditing the exchange:\n"
-"               The amounts of digital coins legitimately withdrawn by\n"
-"               customers from the exchange, the value of non-redeemed "
-"digital coins\n"
-"               in customer's wallets, the value and corresponding wire "
-"details\n"
-"               of deposit operations performed by merchants with the "
-"exchange, and\n"
-"               the income of the exchange from transaction fees."
-msgstr ""
-"Durch Prüfung bei der Wecheslstube:\n"
-"               Der Gesamtbetrag an digitalen Münzen der legitim von\n"
-"               Kunden abgehoben wurde, der Wert noch nicht eingereichter\n"
-"               digitaler Münzen in Geldbörsen von Kunden, der\n"
-"               Wert und die dazugehörigen Banktransaktionsdaten\n"
-"               aus Einzahlungen von Händlern, sowie das Einkommen des\n"
-"               Wechselstubenbetreibers aus Transaktionsgebühren.\n"
-"               "
-
-#: governments.html.j2:88
-#, fuzzy
+"Governments can observe traditional wire transfers\n"
+"                 entering and leaving the Taler system, and require\n"
+"                 merchants and exchange operators to provide certain\n"
+"                 information during financial audits.  Exchange\n"
+"                 operators are expected to be permanently checked by\n"
+"                 auditors, while merchants may be required to reveal\n"
+"                 information during regular tax audits.  Information\n"
+"                 available to the government includes: "
+msgstr ""
+
+#: governments.html.j2:117
+msgid ""
+"From the banking system: The total amount of\n"
+"  \t              digital currency obtained by a customer. The\n"
+"  \t              government could impose limits on how many\n"
+"  \t              digital coins a customer may withdraw within a\n"
+"  \t              given timeframe."
+msgstr ""
+
+#: governments.html.j2:123
+msgid ""
+"From the banking system: The total amount of\n"
+"                       income received by any merchant via the Taler\n"
+"                       system."
+msgstr ""
+
+#: governments.html.j2:127
 msgid ""
-"From auditing merchants:\n"
-"               For each deposit operation, the exact details of the\n"
-"               underlying contract that was signed between\n"
-"               customer and merchant.  However, this information would\n"
-"               typically not include the identity of the customer.\n"
-"               Note that while the customer can decide to prove that it "
-"was his\n"
-"               transaction (i.e. in court when suing the merchant if the\n"
-"               merchant failed to deliver on the contract),\n"
-"               merchant, exchange and government cannot find out the "
-"customer's\n"
-"               identity from the information that Taler collects."
-msgstr ""
-"Aus Betriebsprüfungen bei Händlern:\n"
-"               Für jede Einzahlung bei der Wecheslstube, den\n"
-"               dazugehörigen vom Kunden gezeichneten\n"
-"               Vertragsabschluss.  Allerdings ist die Identität des\n"
-"               Kunden normalerweise nicht Bestandteil des Vertrages.\n"
-"               Der Kunde kann sich jedoch entscheiden, seine Anonymität\n"
-"               aufzugeben um z.B. den Händler vor Gericht zu verklagen,\n"
-"               falls der Händler den Vertrag nicht erfüllt.\n"
-"               Händler und Regierung können ihrerseits jedoch\n"
-"               den Kunden nicht allein auf Grundlage der von Taler\n"
-"               gesammelten Informationen ermitteln."
+"From auditing the exchange: The amounts of\n"
+"                       digital coins legitimately withdrawn by\n"
+"                       customers from the exchange, the value of\n"
+"                       non-redeemed digital coins in customer's\n"
+"                       wallets, the value and corresponding wire\n"
+"                       details of deposit operations performed by\n"
+"                       merchants with the exchange, and the income of\n"
+"                       the exchange from transaction fees."
+msgstr ""
+
+#: governments.html.j2:136
+msgid ""
+"From auditing merchants: For each deposit\n"
+"                      operation, the exact details of the underlying\n"
+"                      contract that was signed between customer and\n"
+"                      merchant.  However, this information would\n"
+"                      typically not include the identity of the\n"
+"                      customer.  Note that while the customer can\n"
+"                      decide to prove that it was his transaction\n"
+"                      (i.e. in court when suing the merchant if the\n"
+"                      merchant failed to deliver on the contract),\n"
+"                      merchant, exchange and government cannot find\n"
+"                      out the customer's identity from the information\n"
+"                      that Taler collects."
+msgstr ""
+
+#: index.html.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr ""
 
 #: index.html.j2:17
-msgid "Electronic payments for a liberal society!"
-msgstr "Elektronisches Bezahlen für eine freiheitliche Gesellschaft!"
+msgid "Independent One-Click Payments!"
+msgstr ""
 
-#: index.html.j2:18
+#: index.html.j2:19
 msgid ""
-"Taler is a new electronic payment system under development\n"
-"\t   at <a href=\"http://www.inria.fr/\";>Inria</a>.  Today, this website "
-"only\n"
-"\t    presents the advantages our system is expected to provide.  We "
-"expect to\n"
-"\t    make the payment system operational in 2017."
+"Taler is an electronic payment system under\n"
+"\t          development\n"
+"\t          at <a href=\"http://www.inria.fr/\";>Inria</a>.  This\n"
+"\t          community Web site provides extensive documentation\n"
+"\t          about the system, which we expect to make\n"
+"\t          operational in 2017."
+msgstr ""
+
+#: index.html.j2:29
+msgid "<b>T</b>axable"
 msgstr ""
 
-#: index.html.j2:26
+#: index.html.j2:31
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
-"\t     governments can learn their citizen's total income and thus "
-"collect\n"
-"\t     sales, value-added or income taxes. Taler is thus a currency for "
-"the\n"
-"\t     mainstream economy, and not the black market."
-msgstr ""
-"Anders als bei BitCoin oder Barzahlungen kann im\n"
-"\t     Taler-System die Einkommen von Bürgern leicht nachvollzogen werden"
-"\n"
-"\t     und aufgrund dieser Basis dann Umsatz-, Mehrwert- und "
-"Einkommensteuern\n"
-"\t     erhoben werden. Taler richtet sich daher an die reguläre\n"
-"\t     Wirtschaft und ist zur Verwendung auf dem Schwarzmarkt ungeeignet."
-
-#: index.html.j2:32
-msgid "Anonymous"
-msgstr "Anonym"
-
-#: index.html.j2:33
-msgid ""
-"When you pay with Taler, your identity does not have to\n"
-"\t     be revealed to the merchant. The bank, government and exchange "
-"will also\n"
-"\t     never learn how you spent your electronic money. However, you can\n"
-"\t     prove that you paid in court if necessary."
-msgstr ""
-"Ein Zahlungsvorgang mit Taler hat nicht das Offenlegen\n"
-"\t     der Identität des Käufers gegenüber dem Händler zur\n"
-"\t     Folge. Das bedeutet insbesondere, dass Banken, Regierungen und\n"
-"\t     Wechelstuben den konkreten Verwendungszweck einer\n"
-"\t     Transaktion nicht in Erfahrung bringen können. Trotzdem sind "
-"Zahlende in\n"
-"\t     der Lage, die von ihnen durchgeführten Transaktionen im Falle\n"
-"\t     eines Gerichtsprozesses kryptographisch nachzuweisen."
-
-#: index.html.j2:40
-msgid ""
-"Taler is free software from <a href=\"http://www.gnu.org/\";>the GNU "
-"project</a> implementing an open protocol.\n"
-"\t     Anybody is welcome to inspect our code and integrate our reference"
-"\n"
-"\t     implementation into their applications."
+"\t           governments can learn their citizen's total income\n"
+"\t           and thus collect sales, value-added or income\n"
+"\t           taxes. Taler is a currency for the mainstream\n"
+"\t           economy, and not the black market."
 msgstr ""
 
-#: index.html.j2:47
-msgid "Electronic"
-msgstr "Elektronisch"
+#: index.html.j2:39
+msgid "<b>A</b>nonymous"
+msgstr ""
 
-#: index.html.j2:48
+#: index.html.j2:41
 msgid ""
-"Taler is designed to work on the Internet. Using a\n"
-"\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
-"\t    integrate with existing Web applications."
+"When you pay with Taler, your identity does not\n"
+"\t           have to be revealed to the merchant. Just like\n"
+"\t           payments in cash, nobody else can track how you\n"
+"\t           spent your electronic money. However, you obtain a\n"
+"\t           legally valid proof of payment."
 msgstr ""
-"Taler wurde zur Verwendung im Internet konzipiert. Durch\n"
-"\t    Einsatz eines REST-basierten Protokolls über HTTP oder HTTPS ist\n"
-"\t    Taler einfach in existierende Webapplikationen einzubinden."
 
-#: index.html.j2:53
-msgid "Reserves"
-msgstr "Reserven"
+#: index.html.j2:49
+msgid "<b>L</b>ibre"
+msgstr ""
 
-#: index.html.j2:54
+#: index.html.j2:51
 msgid ""
-"Taler uses an electronic exchange holding financial\n"
-"             reserves in existing currencies. This means that Taler is "
-"not\n"
-"\t     a new currency with the inherent currency fluctuation risks, but\n"
-"\t     instead the cryptographic coins correspond to existing currencies,"
-" such as\n"
-"\t     US Dollars, Euros or even BitCoins."
-msgstr ""
-"Bei Taler kommt eine elektronische Wechselstube zum\n"
-"\t     Einsatz, welche die finanziellen Reserven in bestehenden\n"
-"\t     Währungen hält. Dies bedeutet, dass Taler selbst keine neue\n"
-"\t     Währung darstellt: Elektronische Münzen in Taler sind nur\n"
-"\t     die kryptographische Repräsentation bestehender\n"
-"\t     Währungen, wie zum Beispiel Euro, US-Dollar oder auch BitCoin.\n"
-"          "
-
-#: index.html.j2:61 news.html.j2:5 news.html.j2:14
-msgid "News"
+"Taler is free software\n"
+"\t           from <a href=\"http://www.gnu.org/\";>the GNU\n"
+"\t           project</a> implementing an open protocol.  Anybody\n"
+"\t           is welcome to inspect our code and integrate our\n"
+"\t           reference implementation into their applications."
 msgstr ""
 
 #: index.html.j2:62
-msgid "Taler Web payments paper published."
-msgstr "Taler Web Bezahldienste Publikation erschienen."
-
-#: index.html.j2:63
-msgid "More news »"
-msgstr "Mehr Neuigkeiten »"
-
-#: index.html.j2:67
-msgid "Taler technology: About taxability, change and privacy"
-msgstr "Die Technologie hinter Technik: Steuern, Wechselgeld und Privatsphäre"
-
-#: index.html.j2:68
-msgid ""
-"One of the key goals of Taler is to provide anonymity for\n"
-"           citizens buying goods and services, while ensuring that the "
-"state can\n"
-"           observe incoming transactions to ensure businesses engage only"
-" in\n"
-"           legal activities and do not evade taxes (such as income tax,\n"
-"           sales tax or value-added tax).  However, we also want to stay\n"
-"           out of the immediate personal domain, so sharing funds within "
-"a\n"
-"           family or copying coins between devices should not be subject "
-"to\n"
-"           monitoring by the state.\n"
-"         "
-msgstr ""
-"Eins der Schlüsselziele Talers ist\n"
-"\t   es, die Anonymität der Bürger beim Tätigen von\n"
-"\t   Einkäufen innerhalb des Systems zu schützen. Gleichzeitig\n"
-"\t   sieht Taler aber auch vor, dass der Staat Einsicht in eingehende\n"
-"\t   Transaktionen nehmen kann und so die Legalität der\n"
-"\t   Geschäfte, sowie die ordnungsgemäße Besteuerung\n"
-"\t   (beispielsweise Einkommen-, Umsatz-, Mehrwertsteuer) sichergestellt\n"
-"\t   werden können. Nichtsdestotrotz nimmt Taler keinen Einfluss auf\n"
-"\t   das nähere persönliche Umfeld: So sind wir beispielsweise\n"
-"\t   davon überzeugt, dass der Staat in Transaktionen wie das\n"
-"\t   Transferieren von Geld innerhalb einer Familie oder etwa das "
-"Kopieren\n"
-"\t   von Münzen zwischen den Geräten einer einzelnen Person\n"
-"\t   explizit keine Einsicht nehmen darf.\n"
-"\t "
-
-#: index.html.j2:77
-msgid ""
-"As a result, Taler does not intrude into the\n"
-"           personal economic domain, offers good privacy, taxability\n"
-"           for transactions and the ability to give change.\n"
-"         "
-msgstr ""
-"Die oben dargelegten Eigenschaften haben\n"
-"\t   daher zur Folge, dass Taler sich nicht in persönliche Bereiche\n"
-"\t   einmischt, gleichzeitig aber die Privatsphäre der Nutzer\n"
-"\t   schützt und trotzdem die Möglichkeit der Besteuerung von\n"
-"\t   Transaktionen sowie die des Generierens von Wechselgeld\n"
-"\t   ermöglicht.\n"
-"\t "
+msgid "<b>E</b>lectronic"
+msgstr ""
+
+#: index.html.j2:64
+msgid ""
+"Taler is easy to integrate with existing Web\n"
+"\t           applications. Payments are cryptographically\n"
+"\t           secured and are confirmed within milliseconds with\n"
+"\t           extremely low transaction costs."
+msgstr ""
+
+#: index.html.j2:71
+msgid "<b>R</b>eserves"
+msgstr ""
+
+#: index.html.j2:73
+msgid ""
+"Taler does not introduce a new currency with\n"
+"\t           fluctuation risks, and instead uses a digital\n"
+"\t           wallet holding coins in reserve. Taler's\n"
+"\t           cryptographic coins correspond to existing\n"
+"\t           currencies, such as US Dollars, Euros or even\n"
+"\t           BitCoins."
+msgstr ""
+
+#: index.html.j2:82
+msgid "Latest Videos"
+msgstr ""
+
+#: index.html.j2:83
+msgid "Florian Dold talks about Taler at 50p!"
+msgstr ""
+
+#: index.html.j2:93
+msgid "Taler News"
+msgstr ""
+
+#: index.html.j2:97
+msgid "Financial News"
+msgstr ""
 
 #: investors.html.j2:5
 msgid "Investors"
 msgstr "Investoren"
 
 #: investors.html.j2:14
-msgid "Operate a Taler exchange!"
-msgstr "Betreiben Sie eine Taler Wechelstube!"
-
-#: investors.html.j2:20
-msgid ""
-"Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
-"             EdDSA) and is thus expected to be able to handle large "
-"transaction\n"
-"             volumes, only limited by the input/output capabilities of "
-"the\n"
-"             database. Thus, running a Taler exchange should be "
-"profitable even\n"
-"             with very low (less than 1 cent) transaction fees (at "
-"appropriate\n"
-"             transaction volume)."
-msgstr ""
-"Taler verwendet effiziente kryptographische\n"
-"\t     Datenstrukturen (wie RSA 2048 und EdDSA) und ist daher in der "
-"Lage,\n"
-"\t     große Transaktionsvolumen zu bewältigen, welche allein\n"
-"\t     durch die Ein-/Ausgabe-Geschwindigkeit der zugrundeliegenden "
-"Datenbank\n"
-"\t     begrenzt wird. Taler ist daher auch dann profitabel, wenn eine\n"
-"\t     Wechselstube mit Transaktionsgebühren im Bereich von\n"
-"\t     Bruchteilen eines Cents betrieben wird (entsprechendes\n"
-"\t     Transaktionsvolumen vorausgesetzt)."
-
-#: investors.html.j2:30
-msgid ""
-"All transactions in Taler are secured using modern cryptography and\n"
-"             trust in all parties is minimized. Financial damage is "
-"bounded\n"
-"             (for customers, merchants and the exchange) even\n"
-"             in the case that systems are compromised and private keys "
-"are stolen.\n"
-"             Databases can be audited for consistency, resulting in "
-"either the\n"
-"             detection of compromised systems or the demonstration that\n"
-"             participants were honest."
-msgstr ""
-"Alle Transaktionen in Taler sind durch moderne\n"
-"\t     Kryptographiemethoden gesichert und das nötige aufzubringende\n"
-"\t     Vertrauen in Systemteilnehmer wurde minimalisiert. Finanzieller\n"
-"\t     Schaden (für Kunden, Händler und die Wechselstube) wird\n"
-"\t     durch das System begrenzt, selbst wenn Teilnehmer komprommitiert\n"
-"\t     und private Schlüssel entwendet werden. Datenbanken\n"
-"\t     können auf ihre Konsistenz hin überprüft werden, was\n"
-"\t     das Entdecken von Angriffen auf das System erleichtert oder\n"
-"\t     alternativ aufzeigt, ob Veruntreuungen durch die Systemteilnehmer\n"
-"\t     stattgefunden haben."
+msgid "Invest in Taler!"
+msgstr ""
+
+#: investors.html.j2:16
+msgid ""
+"We have created a company, Taler Systems SA in \n"
+"                   Luxemburgh.<br>\n"
+"                   Please contact <tt>address@hidden</tt>\n"
+"                   if you want to invest in Taler."
+msgstr ""
+
+#: investors.html.j2:24
+msgid "The Team"
+msgstr ""
+
+#: investors.html.j2:26
+msgid ""
+"Our team combines world-class business leaders,\n"
+"                   cryptographers, software engineers, civil-rights\n"
+"                   activits and academics. We are unified by a vision\n"
+"                   of how payments should work and the goal of\n"
+"                   imposing this vision upon the world."
+msgstr ""
+
+#: investors.html.j2:32
+msgid ""
+"We are currently supported by Inria, the French\n"
+"                   national institute for research in informatics and\n"
+"                   automation, and the Renewable Freedom Foundation."
+msgstr ""
+
+#: investors.html.j2:37
+msgid "The Technology"
+msgstr ""
 
 #: investors.html.j2:39
-msgid "Business model"
-msgstr "Geschäftsmodell"
-
-#: investors.html.j2:41
-msgid ""
-"The basic business model for Taler is the operation of an exchange.  An "
-"exchange converts money from traditional payment systems (Mastercard,\n"
-"             SEPA, Visa, BitCoin, ACH, SWIFT, etc.) to anonymous "
-"electronic\n"
-"             coins in the same currency. The customer can then redeem the"
-" electronic\n"
-"             coins at a merchant, who can exchange them for money "
-"represented using\n"
-"             traditional payment systems at the exchange.  The exchange "
-"can then charge\n"
-"             fees (to the customer, merchant or both) to facilitate the "
-"transactions."
-msgstr ""
-"Das Geschäftsmodell hinter Taler besteht im Betreiben\n"
-"\t     einer Wechelstube. Aufgabe der Wechselstube ist es, Geld\n"
-"\t     traditioneller Bezahlungsysteme (Mastercard, SEPA, Visa, BitCoin, "
-"ACH,\n"
-"\t     SWIFT, etc.) in anonyme Taler-Münzen der selben Währung zu\n"
-"\t     konvertieren. Der Kunde kann die Münzen anschließend bei\n"
-"\t     einem Händler einlösen, der sie seinerseits bei der\n"
-"\t     Wecheslstube gegen Geld der traditionellen Bezahlungssysteme\n"
-"\t     einlösen. "
-
-#: investors.html.j2:50
-msgid "Taler as seen by the exchange operator"
-msgstr "Taler aus Betreiberperspektive"
-
-#: investors.html.j2:52
-msgid ""
-"The exchange operator primarily operates a Web service\n"
-"          portal and keeps databases with transaction details and\n"
-"          cryptographic proofs.  Its operational expenses are thus "
-"related to\n"
-"          its interactions with the banking system and the operation of\n"
-"          the computing infrastructure, while its income is based on\n"
-"          transaction fees it may charge for the various interactions.\n"
-"          Key interactions of the exchange include:\n"
-"        "
-msgstr ""
-"Der Betreiber einer Wechselstube\n"
-"          betreibt primär eine Webseite sowie Datenbanken mit\n"
-"          Transaktionsinformationen und kryptografischen Beweisen.  Seine"
-"\n"
-"          Ausgaben sind im Wesentlichen beschränkt auf die Interaktion\n"
-"          mit dem Bankensystem und dem Betrieb der Rechnerinfrastruktur.\n"
-"          Die Betreibereinnahmen kommen aus Gebühren die der Betreiber\n"
-"          für die verschiedenen Interaktionen verlangen kann.  Die\n"
-"          wesentlichen Interaktionen der Wechselstube sind:"
+msgid ""
+"All transactions in Taler are secured using modern\n"
+"                   cryptography and trust in all parties is\n"
+"                   minimized. Financial damage is bounded (for\n"
+"                   customers, merchants and the exchange) even in the\n"
+"                   case that systems are compromised and private keys\n"
+"                   are stolen.  Databases can be audited for\n"
+"                   consistency, resulting in either the detection of\n"
+"                   compromised systems or the demonstration that\n"
+"                   participants were honest. Actual transaction costs\n"
+"                   are fractions of a cent."
+msgstr ""
 
-#: investors.html.j2:64
+#: investors.html.j2:51
+msgid "The Business"
+msgstr ""
+
+#: investors.html.j2:53
 msgid ""
-"Create a <b>reserve</b> based on an incoming\n"
-"              wire transfer from a customer."
+"The scalable business model for Taler is the operation\n"
+"                   of the payment service provider, which converts money "
+"from\n"
+"                   traditional payment systems (Mastercard, SEPA,\n"
+"                   Visa, BitCoin, ACH, SWIFT, etc.) to anonymous\n"
+"                   electronic coins in the same currency. The customer\n"
+"                   can then redeem the electronic coins at a merchant,\n"
+"                   who can exchange them for money represented using\n"
+"                   traditional payment systems at the exchange.  The\n"
+"                   exchange charges fees (to the customer,\n"
+"                   merchant or both) to facilitate the transactions."
 msgstr ""
-"Erzeuge eine Währungsreserve auf Grundlage einer eingehenden "
-"Banküberweisung eines Kunden."
 
 #: investors.html.j2:67
+msgid "Taler as seen by the payment service operator"
+msgstr ""
+
+#: investors.html.j2:69
+msgid ""
+"The payment service operator runs a <em>Taler\n"
+"                 exchange</em>, which is a Web service portal that\n"
+"                 keeps databases with transaction details and\n"
+"                 cryptographic proofs.  Its operational expenses are\n"
+"                 thus related to its interactions with the banking\n"
+"                 system and the operation of the computing\n"
+"                 infrastructure, while its income is based on\n"
+"                 transaction fees it may charge for the various\n"
+"                 interactions.  Key interactions of the exchange\n"
+"                 include: "
+msgstr ""
+
+#: investors.html.j2:83
+msgid ""
+"Create a <b>reserve</b> based on an incoming\n"
+"                      wire transfer from a customer."
+msgstr ""
+
+#: investors.html.j2:86
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
-"               digital coins from their reserve."
+"                      digital coins from their reserve."
 msgstr ""
-"Ermögliche es Kunden digitale Münzen von ihrer Wärungsreserve\n"
-"               abzuheben bzw. bestehende Münzen aufzufrischen."
 
-#: investors.html.j2:70
+#: investors.html.j2:89
 msgid "Accept and validate deposits from merchants."
 msgstr "Annahme und Validierung von Einzahlungen durch Händler."
 
-#: investors.html.j2:72
+#: investors.html.j2:91
 msgid ""
 "Execute wire transfers to merchants in\n"
-"               response to validated deposits."
+"                      response to validated deposits."
 msgstr ""
-"Durchführung von Banküberweisungen an Händler auf Basis der validierten "
-"Einzahlungen"
 
-#: investors.html.j2:75
+#: investors.html.j2:94
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
-"               correct operation for audits by financial regulators."
+"                      correct operation for audits by financial "
+"regulators."
 msgstr ""
-"Konservierung und Bereitstellung kryptographischer Beweise\n"
-"              zum korrekten Verhalten der Wechselstube zwecks\n"
-"              Überprüfung durch die Finanzaufsicht."
 
 #: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Händler"
 
 #: merchants.html.j2:14
-msgid "Advantages for merchants"
-msgstr "Vorteile für Händler"
+msgid "Advantages for Merchants"
+msgstr ""
+
+#: merchants.html.j2:17
+msgid ""
+"Taler is a cost-effective electronic payment system\n"
+"\t           which provides you with cryptographic proof that\n"
+"\t           the payment worked correctly within milliseconds.\n"
+"\t           Your Web customers pay with previously unknown\n"
+"\t           levels of convenience without risk of fraud."
+msgstr ""
 
-#: merchants.html.j2:18
+#: merchants.html.j2:28
 msgid "Fast"
 msgstr "Schnell"
 
-#: merchants.html.j2:20
-msgid ""
-"Processing transactions with Taler is fast, allowing you\n"
-"\t     to confirm the transaction with your customer virtually "
-"immediately.\n"
-"\t     Your customers will appreciate that they do not have to type in "
-"credit\n"
-"\t     card information and play the &quot;verified by&quot; game.  By "
-"making payments\n"
-"\t     significantly more convenient for your customers, you may be able "
-"to\n"
-"\t     use Taler for small transactions that would not work with credit "
-"card\n"
-"\t     payments due to the mental overhead for customers."
-msgstr ""
-"Das Verarbeiten von Transaktionen mit Taler ist sehr\n"
-"\t     schnell, was das Bestätigen von Transaktionen mit dem Kunden\n"
-"\t     nahezu in Echtzeit ermöglicht. Ihre Kunden werden es Ihnen\n"
-"\t     danken, dass sie keinerlei Kreditkarteninformationen angeben\n"
-"\t     müssen und dass lästige &quot;verified by&quot;-Spielereien "
-"entfallen.\n"
-"\t     Indem Sie Bezahlvorgänge signifikant bequemer gestalten\n"
-"\t     können, sind Sie in der Lage, Taler auch für kleine\n"
-"\t     Transaktionen zu verwenden, welche beim Verwenden herkömmlicher\n"
-"\t     Kreditkarten aufgrund psychologischen Mehraufwands auf Seiten des\n"
-"\t     Kunden kaum durchführbar wären."
-
-#: merchants.html.j2:31
-msgid ""
-"You never learn sensitive customer information. You need\n"
-"\t     to ensure that your website provides the correct account "
-"information\n"
-"\t     for your business, and that you correctly validate the payment\n"
-"\t     confirmations from the Taler exchange.  As a result, you will have"
-"\n"
-"\t     cryptographic proof of payment for the specific contracts you "
-"entered\n"
-"\t     with your customers, and cryptographically signed confirmations "
-"from\n"
-"\t     the Taler exchange about the deposits. Taler does not require you "
-"to\n"
-"\t     undergo any particular security audits, processes or procedures, "
-"as\n"
-"\t     you never handle sensitive customer information.  Your systems "
-"will\n"
-"\t     have cryptographically signed contracts which you can use in court"
-" in\n"
-"\t     case of disputes."
-msgstr ""
-"Händler erhalten keine sensitiven Informationen\n"
-"\t     über ihre Kunden. Sie müssen lediglich sicherstellen, dass\n"
-"\t     Ihre Internetseite die korrekten Accountinformationen für Ihr\n"
-"\t     Unternehmen zur Verfügung stellt und dass Sie die\n"
-"\t     Zahlungsbestätigungen der Taler-Wechselstube korrekt\n"
-"\t     validieren. Auf diese Weise stellen Sie sicher, dass sie sowohl "
-"einen\n"
-"\t     kryptographischen Beweis über die Korrektheit der Transaktion im\n"
-"\t     mit dem Kunden eingegangenen Vertrag, als auch eine\n"
-"\t     kryptographische Signatur über die Existenz des bei der\n"
-"\t     Wechselstube eingelagerten Transaktionsvolumens erhalten. Zur\n"
-"\t     Verwendung von Taler müssen keine Akkreditierungen jeglicher\n"
-"\t     Form erlangt werden, da Ihre Systeme niemals mit den sensitiven\n"
-"\t     Daten des Kunden in Kontakt kommen. Stattdessen arbeiten Sie mit\n"
-"\t     kryptographisch signierten Verträgen, welche im Falle von\n"
-"\t     Streitigkeiten vor Gericht geltend gemacht werden können."
-
-#: merchants.html.j2:44
+#: merchants.html.j2:30
+msgid ""
+"Processing transactions with Taler is fast,\n"
+"\t           allowing you to confirm the transaction with your\n"
+"\t           customer virtually immediately.  Your customers\n"
+"\t           will appreciate that they do not have to type in\n"
+"\t           credit card information and play the &quot;verified\n"
+"\t           by&quot; game.  By making payments significantly\n"
+"\t           more convenient for your customers, you may be able\n"
+"\t           to use Taler for small transactions that would not\n"
+"\t           work with credit card payments due to the mental\n"
+"\t           overhead for customers."
+msgstr ""
+
+#: merchants.html.j2:45
+msgid ""
+"You will have cryptographic proof of payment from\n"
+"\t           the Taler payment service provider. Taler does not\n"
+"\t           require you to undergo any particular security\n"
+"\t           audits (such as PCI DSS), processes or procedures,\n"
+"\t           as you never handle sensitive customer account\n"
+"\t           information.  Your systems will have customer\n"
+"\t           contracts wih qualified signatures for all\n"
+"\t           transactions which you can use in court in case of\n"
+"\t           disputes."
+msgstr ""
+
+#: merchants.html.j2:57
 msgid "Free Software"
 msgstr "Freie Software"
 
-#: merchants.html.j2:46
+#: merchants.html.j2:59
 msgid ""
 "Taler is free software, and you can use the\n"
-"\t     liberally-licensed reference code as a starting point to integrate"
-"\n"
-"\t     Taler into your services. To use Taler, you do not need to pay "
-"license\n"
-"\t     fees, and the free software development model will ensure that you"
-" can\n"
-"\t     select from many competent developers to help you with your\n"
-"\t     integration."
-msgstr ""
-"Taler ist freie Software, weswegen Sie die sehr liberal\n"
-"\t     lizenzierte Referenzimplementierung als Ausgangspunkt verwenden\n"
-"\t     können, um Taler-Transaktionen in Ihrem System\n"
-"\t     zu ermöglichen. Durch die Verwendung von Taler fallen keine\n"
-"\t     Lizenzgebühren an und das Entwicklungsmodell freier Software\n"
-"\t     stellt sicher, dass Sie zahlreiche kompetente Entwickler zurate\n"
-"\t     ziehen können, welche Ihnen beim Integrationsvorgang zur\n"
-"\t     Seite stehen."
-
-#: merchants.html.j2:56
+"\t           liberally-licensed reference code as a starting\n"
+"\t           point to integrate Taler into your services. To use\n"
+"\t           Taler, you do not need to pay license fees, and the\n"
+"\t           free software development model will ensure that\n"
+"\t           you can select from many competent integrators for\n"
+"\t           support."
+msgstr ""
+
+#: merchants.html.j2:71
 msgid "Low Fees"
 msgstr "Niedrige Gebühren"
 
-#: merchants.html.j2:58
-msgid ""
-"Taler is designed to minimize the work the exchange needs to\n"
-"\t     perform.  Combined with Taler's strong security which prevents "
-"fraud,\n"
-"\t     exchanges can operate with very low overhead and thus low "
-"transaction\n"
-"\t     fees.  Given Taler's free software exchange reference "
-"implementation,\n"
-"\t     competition among exchanges will ensure fair, low transaction fees"
-" for\n"
-"\t     merchants."
-msgstr ""
-"Taler wurde konzipiert, die Arbeit der\n"
-"\t     Münzanstalt möglichst gering zu halten. Zusammen mit den\n"
-"\t     Konzepten starker Kryptographie, die Missbrauch und Betrug "
-"vorbeugt,\n"
-"\t     können Münzanstalten mit sehr geringem Mehraufwand operieren,\n"
-"\t     was den Transaktionskosten zugute kommt. Aufgrund der als freie\n"
-"\t     Software zugänglich gemachten Referenzimplementierung einer\n"
-"\t     Münzanstalt sorgt der Wettbewerb für faire, niedrige\n"
-"\t     Transaktionsgebühren gegenüber Händlern."
-
-#: merchants.html.j2:66
+#: merchants.html.j2:73
+msgid ""
+"Taler is designed to minimize the work the exchange\n"
+"\t           needs to perform.  Combined with Taler's strong\n"
+"\t           security which prevents fraud, payment service\n"
+"\t           providers can operate with very low overhead and\n"
+"\t           thus low transaction fees."
+msgstr ""
+
+#: merchants.html.j2:81
 msgid "Flexible"
 msgstr "Flexibel"
 
-#: merchants.html.j2:68
+#: merchants.html.j2:83
 msgid ""
-"Taler can be used for different currencies (such as Euros\n"
-"\t     or US Dollars) and different payment models limited only by what "
-"the\n"
-"\t     exchange supports in its interactions."
+"Taler can be used for different currencies (such as\n"
+"\t           Euros, US Dollars or BitCoins) and different\n"
+"\t           payment models limited only by what the payment\n"
+"\t           service provider supports in its interactions."
 msgstr ""
-"Taler kann unabhängig von verschiedenen\n"
-"\t     Währungen (wie zum Beispiel Euro oder US-Dollar) und\n"
-"\t     Bezahlmodellen eingesetzt werden. Die einzige Beschränkung\n"
-"\t     stellt hierbei der Interaktionsreichtum der Münzanstalt dar."
 
-#: merchants.html.j2:73
+#: merchants.html.j2:91
 msgid "Ethical"
 msgstr "Ethisch"
 
-#: merchants.html.j2:75
+#: merchants.html.j2:93
 msgid ""
-"Taler does not support tax evasion or money laundering, and is\n"
-"             also not a pyramid scheme or speculative investment.  "
-"Taler's\n"
-"             protocols are efficient and do not waste energy. Taler "
-"encourages\n"
-"             competition by providing an open standard and free software\n"
-"             reference implementations."
+"Taler prevents tax evasion and money laundering.\n"
+"                   Taler's protocols are efficient and do not waste\n"
+"                   energy. Taler encourages transparency by providing\n"
+"                   an open standard and free software reference\n"
+"                   implementations."
 msgstr ""
-"Taler unterstützt weder Steuervermeidung noch\n"
-"\t     Geldwäsche, ist kein Schneeballsystem und fungiert ebensowenig als"
-"\n"
-"\t     eine spekulative Wertanlage. Die Taler zugrunde liegenden "
-"Protokolle\n"
-"\t     sind effizient und verbrauchen nicht mehr Energie, als nötig.\n"
-"\t     Außerdem unterstützt Taler den Wettbewerb durch das\n"
-"\t     Bereitstellen einer Referenzimplementierung auf Basis einer freien"
-"\n"
-"\t     Software-Lizenz."
 
-#: merchants.html.j2:83
+#: merchants.html.j2:102
 msgid "Taler as seen by merchants"
 msgstr "Taler aus Händlerperspektive"
 
-#: merchants.html.j2:85
+#: merchants.html.j2:104
 msgid ""
-"Merchants supporting the Taler system need to integrate\n"
-"          some relatively simple logic into their transaction processing\n"
-"          system.\n"
-"          Typical steps performed by the merchant system are:\n"
-"        "
+"Merchants supporting the Taler system need to\n"
+"                 integrate some relatively simple logic into their\n"
+"                 transaction processing system.  Typical steps\n"
+"                 performed by the merchant system are: "
 msgstr ""
-"Händer die Taler als Bezahlsystem\n"
-"          anbieten wollen, müssen ein paar relativ einfache Erweiterungen"
-"\n"
-"          an ihrem Transaktionssystem vornehmen. Die typischen Schritte "
-"die\n"
-"          ein Händler bei Taler durchfüren muss sind:"
 
-#: merchants.html.j2:94
+#: merchants.html.j2:113
 msgid ""
 "The new logic detects when a customer's system\n"
-"              supports Taler and then needs to send a cryptographically "
-"signed\n"
-"              version of the proposed contract in a simple JSON format to"
-"\n"
-"              the customer.\n"
-"              The message also includes salted, hashed wire details for\n"
-"              the merchant, as well as restrictions as to which exchange "
-"operators\n"
-"              the merchant is willing to deal with."
-msgstr ""
-"Die Händlerwebseite muss\n"
-"              prüfen ob der Kunde eine Taler Geldbörsenanwendung\n"
-"              benutzt und dieser einen kryptographisch unterzeichneten\n"
-"              Vertragstext in einem JSON-Format übertragen.  Der\n"
-"              Vertragstext muss auch einen Hash der Kontoinformationen\n"
-"              des Händlers sowie Restriktionen für die vom\n"
-"              Händler unterstützten Münzanstalten beinhalten.\n"
-"              "
+"                      supports Taler and then needs to send a\n"
+"                      cryptographically signed version of the proposed\n"
+"                      contract in a simple JSON format to the\n"
+"                      customer.  The message also includes salted,\n"
+"                      hashed wire details for the merchant, as well as\n"
+"                      restrictions as to which exchange operators the\n"
+"                      merchant is willing to deal with."
+msgstr ""
 
-#: merchants.html.j2:102
+#: merchants.html.j2:122
 msgid ""
-"The customer sends a signed response which states\n"
-"               that certain digital coins now belong to the merchant to "
-"both\n"
-"               signal acceptance of the deal as well as to pay the "
-"respective\n"
-"               amount (bottom)."
+"The customer sends a signed response which\n"
+"                      states that certain digital coins now belong to\n"
+"                      the merchant to both signal acceptance of the\n"
+"                      deal as well as to pay the respective amount\n"
+"                      (bottom)."
 msgstr ""
-"Der Kunde schickt eine kryptografisch\n"
-"               signierte Antwort die besagt, dass der Wert bestimmter "
-"digitaler\n"
-"               Münzen jetzt dem Händler gehört. Dadurch erfolgen\n"
-"               die Akzeptanz des Vertrages als auch die\n"
-"               Bezahlung der Rechnung immer gleichzeitig (unten)."
 
-#: merchants.html.j2:107
+#: merchants.html.j2:128
 msgid ""
 "The merchant then forwards the signed messages\n"
-"               received from the customer to the exchange, together with "
-"its\n"
-"               wire details and the salt (without hashing).  The exchange"
-" verifies\n"
-"               the details and sends a signed confirmation (or an error\n"
-"               message) to the merchant.  The merchant checks that the\n"
-"               exchange's signature is valid, sends a confirmation to the"
-"\n"
-"               customer and executes the contract-specific business logic."
-msgstr ""
-"Der Händler leitet dann die\n"
-"               Unterschriften weiter an die Münzanstalt, zusammen mit "
-"seinen\n"
-"               ungehashten Kontodaten.  Diese prüft die Daten und "
-"antwortet\n"
-"               mit einer kryptografisch signierten Bestätigung (oder "
-"einer\n"
-"               Fehlernachricht).  Der Händler pr&amp;uumml;ft seinerseits"
-" die\n"
-"               Signatur, schickt eine Bestätigung an den Kunden und\n"
-"               führt seine vertragsspezifische Geschäftslogik aus."
-
-#: merchants.html.j2:115
-msgid ""
-"The exchange performs wire transfers corresponding to\n"
-"               the claims deposited by the merchant. Note that the "
-"exchange may\n"
-"               charge fees for the deposit operation, hence merchants may"
-"\n"
-"               impose limits restricting the set of exchange operators "
-"they are\n"
-"               willing to deal with, for example by imposing a bound on\n"
-"               deposit fees."
-msgstr ""
-"Die Münzanstalt überweist\n"
-"               dem Händler die Beträge aus dem Vertrag. Da die\n"
-"               Münzanstalt für diese Dienstleistung Gebühren\n"
-"               einbehalten kann, ist es wichtig dass die Händler ihre\n"
-"               Zusammenarbeit auf eine Menge von Münzanstalten\n"
-"               einschränken können, z.B. durch Angabe einer Obergrenze\n"
-"               für die Transaktionskosten."
-
-#: merchants.html.j2:125
+"                       received from the customer to the exchange,\n"
+"                       together with its wire details and the salt\n"
+"                       (without hashing).  The exchange verifies the\n"
+"                       details and sends a signed confirmation (or an\n"
+"                       error message) to the merchant.  The merchant\n"
+"                       checks that the exchange's signature is valid,\n"
+"                       sends a confirmation to the customer and\n"
+"                       executes the contract-specific business\n"
+"                       logic."
+msgstr ""
+
+#: merchants.html.j2:139
+msgid ""
+"The exchange performs wire transfers\n"
+"                       corresponding to the claims deposited by the\n"
+"                       merchant. Note that the exchange may charge\n"
+"                       fees for the deposit operation, hence merchants\n"
+"                       may impose limits restricting the set of\n"
+"                       exchange operators they are willing to deal\n"
+"                       with, for example by imposing a bound on\n"
+"                       deposit fees."
+msgstr ""
+
+#: merchants.html.j2:151
 msgid "Manuals for merchants"
 msgstr "Handbücher für Händler"
 
+#: merchants.html.j2:154
+msgid "The GNU Taler merchant backend operator tutorial"
+msgstr ""
+
+#: merchants.html.j2:157
+msgid "The GNU Taler Web shop integration tutorial (PHP)"
+msgstr ""
+
 #: wallet.html.j2:5
 msgid "Wallet"
 msgstr ""
@@ -1552,3 +1089,54 @@ msgstr ""
 #~ msgid "About&nbsp;us"
 #~ msgstr "Über uns"
 
+#~ msgid "News"
+#~ msgstr ""
+
+#~ msgid "Taler Web payments paper published."
+#~ msgstr "Taler Web Bezahldienste Publikation erschienen."
+
+#~ msgid "More news »"
+#~ msgstr "Mehr Neuigkeiten »"
+
+#~ msgid "Taler technology: About taxability, change and privacy"
+#~ msgstr "Die Technologie hinter Technik: Steuern, Wechselgeld und 
Privatsphäre"
+
+#~ msgid "1-2017: Taler Documentation pages updated"
+#~ msgstr ""
+
+#~ msgid "Operate a Taler exchange!"
+#~ msgstr "Betreiben Sie eine Taler Wechelstube!"
+
+#~ msgid "Electronic payments for a liberal society!"
+#~ msgstr "Elektronisches Bezahlen für eine freiheitliche Gesellschaft!"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonym"
+
+#~ msgid "Electronic"
+#~ msgstr "Elektronisch"
+
+#~ msgid "Reserves"
+#~ msgstr "Reserven"
+
+#~ msgid "Advantages for citizens"
+#~ msgstr "Vorteile für Bürger"
+
+#~ msgid "Independent One-Click Payment!"
+#~ msgstr ""
+
+#~ msgid "Advantages for merchants"
+#~ msgstr "Vorteile für Händler"
+
+#~ msgid "Advantages for governments"
+#~ msgstr "Vorteile für Regierungen"
+
+#~ msgid "Invest in GNU Taler!"
+#~ msgstr ""
+
+#~ msgid "Business model"
+#~ msgstr "Geschäftsmodell"
+
+#~ msgid "Taler as seen by the exchange operator"
+#~ msgstr "Taler aus Betreiberperspektive"
+
diff --git a/locale/en/LC_MESSAGES/messages.po 
b/locale/en/LC_MESSAGES/messages.po
index e5c5c8d..38600ed 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-08 06:20+0100\n"
+"POT-Creation-Date: 2017-02-10 15:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language: en\n"
@@ -15,14 +15,14 @@ msgstr ""
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:2 citizens.html.j2:2 developers.html.j2:2
-#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2 news.html.j2:2
+#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2
 #: wallet.html.j2:2
 msgid "en"
 msgstr ""
 
 #: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
-#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
-#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
+#: governments.html.j2:5 index.html.j2:5 investors.html.j2:5
+#: merchants.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
@@ -107,134 +107,132 @@ msgid "Citizens"
 msgstr ""
 
 #: citizens.html.j2:14
-msgid "Advantages for citizens"
+msgid "Advantages for Citizens"
 msgstr ""
 
-#: citizens.html.j2:21
+#: citizens.html.j2:18
+msgid ""
+"Taler largely functions like digital cash.  You\n"
+"\t           withdraw money from your bank account into your\n"
+"\t           electronic wallet, and can henceforth spend digital\n"
+"\t           cash.  The electronic wallet can carry multiple\n"
+"\t           currencies."
+msgstr ""
+
+#: citizens.html.j2:30
 msgid "Security"
 msgstr ""
 
-#: citizens.html.j2:23
+#: citizens.html.j2:32
 msgid ""
-"Taler is the electronic equivalent of cash, except harder to fake.\n"
-"             If your digital wallet is lost -- say because\n"
-"             your computer is irreparably damaged or compromised -- only "
-"the amount of coin\n"
-"             stored in your wallet will be lost. Unlike a physical "
-"wallet, you can make\n"
-"             backups of your digital wallet which can provide security "
-"against data loss.\n"
-"             So your digital wallet works mostly just like\n"
-"             a physical wallet, except online and without the need to "
-"manually count coins."
+"Taler uses modern cryptography, ensuring that there\n"
+"                   is no counterfeit.  Your digital wallet is safer\n"
+"                   than your physical wallet.  At most, you can lose\n"
+"                   its contents because your computer or mobile is\n"
+"                   irreparably damaged or compromised.  Unlike a\n"
+"                   physical wallet, you can make backups to secure\n"
+"                   against data loss."
 msgstr ""
 
-#: citizens.html.j2:32
+#: citizens.html.j2:42
 msgid "Privacy"
 msgstr ""
 
-#: citizens.html.j2:34
+#: citizens.html.j2:44
 msgid ""
-"Your transactions are private, neither the exchange nor merchant needs to"
-"\n"
-"             learn your identity. There is no need to give our credit "
-"card numbers or\n"
-"             other sensitive information, and the merchant will only be "
-"able to do\n"
-"             exactly the transaction you confirmed using your digital "
-"wallet."
+"Your transactions are private, neither the exchange\n"
+"                   nor merchant needs to learn your identity. There is\n"
+"                   no need to give out credit card numbers or other\n"
+"                   sensitive information. The merchant will only be\n"
+"                   able to do exactly the transaction you agreed to."
 msgstr ""
 
-#: citizens.html.j2:42
+#: citizens.html.j2:55
 msgid "Convenience"
 msgstr ""
 
-#: citizens.html.j2:44
+#: citizens.html.j2:57
 msgid ""
-"You will be able to withdraw digital coins to replenish your wallet using"
-"\n"
-"             your credit card or SEPA transactions, similar to how you "
-"pay or withdraw\n"
-"             cash today."
+"You will be able to withdraw money to replenish the\n"
+"                   digital coins in your wallet using your credit card\n"
+"                   or wire transfers.  Afterwards you can pay with\n"
+"                   one-click using the Taler wallet, which optionally\n"
+"                   keeps your transaction history on your computer."
 msgstr ""
 
-#: citizens.html.j2:49
-msgid "Stability "
+#: citizens.html.j2:66
+msgid "Stability"
 msgstr ""
 
-#: citizens.html.j2:51
+#: citizens.html.j2:68
 msgid ""
-"Coins in your digital wallet will be of the same denomination as the\n"
-"             cash in your physical wallet. So you will not have to worry "
-"about\n"
-"             currency fluctuations or conversion rates. Like a physical "
-"wallet,\n"
-"             you can carry digital coins of different currencies in your "
-"digital\n"
-"             wallet at the same time."
+"Coins in your digital wallet will be of the same\n"
+"                   denomination as the cash in your physical wallet.\n"
+"                   Taler is not a crypto-currency, so you do not have\n"
+"                   to worry about cryto-currency related value\n"
+"                   fluctuations.  Banking with Taler is subject to the\n"
+"                   usual government protections for finanical\n"
+"                   services."
 msgstr ""
 
-#: citizens.html.j2:59
+#: citizens.html.j2:79
 msgid "Taler as seen by customers"
 msgstr ""
 
-#: citizens.html.j2:61
+#: citizens.html.j2:81
 msgid ""
 "Customers interact with the Taler system mostly using\n"
-"          a free wallet implementation, which may be an extension or "
-"plugin\n"
-"          to their browser or a custom application on their computer(s).\n"
-"          Typical steps performed by customers are:\n"
-"        "
+"                 a free wallet implementation, which may be an\n"
+"                 extension or plugin to their browser or a custom\n"
+"                 application on their computer(s).  Typical steps\n"
+"                 performed by customers are: "
 msgstr ""
 
-#: citizens.html.j2:70
+#: citizens.html.j2:92
 msgid ""
-"The customer selects an exchange (i.e. by visiting the\n"
-"              respective website or selecting from a list of exchanges in"
-" the\n"
-"              application) and asks the wallet to create bank transfer\n"
-"              instructions to withdraw a certain amount of electronic "
-"cash.\n"
-"              The bank transfer instructions will contain an\n"
-"              access code that must be included in the subject of the\n"
-"              transaction, as well as the wire details for the exchange "
-"(i.e.\n"
-"              a SEPA account number)."
+"The customer selects an exchange (i.e. by\n"
+"                      visiting the respective website or selecting\n"
+"                      from a list of exchanges in the application) and\n"
+"                      asks the wallet to create bank transfer\n"
+"                      instructions to withdraw a certain amount of\n"
+"                      electronic cash.  The bank transfer instructions\n"
+"                      will contain an access code that must be\n"
+"                      included in the subject of the transaction, as\n"
+"                      well as the wire details for the exchange (i.e.\n"
+"                      a SEPA account number)."
 msgstr ""
 
-#: citizens.html.j2:79
+#: citizens.html.j2:103
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange "
-"using\n"
-"               these instructions provided by the wallet (top left)."
+"                       transfer funds from his account to the Taler\n"
+"                       exchange using these instructions provided by\n"
+"                       the wallet (top left)."
 msgstr ""
 
-#: citizens.html.j2:83
+#: citizens.html.j2:108
 msgid ""
 "Once the funds have arrived, the wallet will\n"
-"               automatically withdraw the electronic coins.  The\n"
-"               customer can use the wallet to review his remaining "
-"balance\n"
-"               at any time. He can also make backups to secure his "
-"digital\n"
-"               coins against hardware failures."
+"                       automatically withdraw the electronic coins.\n"
+"                       The customer can use the wallet to review his\n"
+"                       remaining balance at any time. He can also make\n"
+"                       backups to secure his digital coins against\n"
+"                       hardware failures."
 msgstr ""
 
-#: citizens.html.j2:89
+#: citizens.html.j2:115
 msgid ""
 "When visiting a merchant that supports Taler,\n"
-"               an additional payment option for Taler is enabled in the "
-"checkout system.\n"
-"               If the customer selects payments via Taler, the wallet\n"
-"               displays the secured contract from the merchant and asks\n"
-"               for confirmation.  Taler does not require the customer\n"
-"               to provide any identity information to the merchant.\n"
-"               Transaction histories and digitally\n"
-"               signed contracts can be preserved in the wallet for future"
-"\n"
-"               review by the customer, or even use in court."
+"                       an additional payment option for Taler is\n"
+"                       enabled in the checkout system.  If the\n"
+"                       customer selects payments via Taler, the wallet\n"
+"                       displays the secured contract from the merchant\n"
+"                       and asks for confirmation.  Taler does not\n"
+"                       require the customer to provide any identity\n"
+"                       information to the merchant.  Transaction\n"
+"                       histories and digitally signed contracts can be\n"
+"                       preserved in the wallet for future review by\n"
+"                       the customer, or even use in court."
 msgstr ""
 
 #: developers.html.j2:5
@@ -252,248 +250,253 @@ msgstr ""
 #: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
-"            protocol. Anybody is welcome to inspect our code and\n"
-"            integrate our reference implementation into their\n"
-"            applications.  Different components of Taler are being\n"
-"            made available under different licenses. The Affero\n"
-"            GPLv3+ is used for the exchange, the LGPLv3+ is used for\n"
-"            reference code demonstrating integration with merchant\n"
-"            platforms, and licenses like Apache/Mozilla/GPLv3+ are\n"
-"            used for wallets and related customer-facing software.\n"
-"            We are open for constructive suggestions for maximizing\n"
-"            the adoption of this libre payment platform.\n"
-"          "
+"                   protocol. Anybody is welcome to inspect our code\n"
+"                   and integrate our reference implementation into\n"
+"                   their applications.  Different components of Taler\n"
+"                   are being made available under different\n"
+"                   licenses. The Affero GPLv3+ is used for the\n"
+"                   exchange, the LGPLv3+ is used for reference code\n"
+"                   demonstrating integration with merchant platforms,\n"
+"                   and licenses like Apache/Mozilla/GPLv3+ are used\n"
+"                   for wallets and related customer-facing software.\n"
+"                   We are open for constructive suggestions for\n"
+"                   maximizing the adoption of this libre payment\n"
+"                   platform.  "
 msgstr ""
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid "RESTful"
 msgstr ""
 
-#: developers.html.j2:38
+#: developers.html.j2:40
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
-"\t    ensure that Taler payments can work with restrictive\n"
-"\t    network setups, Taler uses a RESTful protocol over HTTP or\n"
-"\t    HTTPS. Taler's security does not depend upon the use of\n"
-"\t    HTTPS, but obviously merchants may choose to offer HTTPS\n"
-"\t    for consistency and because it generally is better for\n"
-"\t    privacy compared to HTTP.  Taler uses JSON to encode\n"
-"\t    structure data, making it easy to integrate Taler with\n"
-"\t    existing Web applications.  Taler's protocol is documented\n"
-"\t    in detail <a href='https://api.taler.net/'>here</a>.\n"
-"          "
-msgstr ""
-
-#: developers.html.j2:53
+"\t           ensure that Taler payments can work with\n"
+"\t           restrictive network setups, Taler uses a RESTful\n"
+"\t           protocol over HTTP or HTTPS. Taler's security does\n"
+"\t           not depend upon the use of HTTPS, but obviously\n"
+"\t           merchants may choose to offer HTTPS for consistency\n"
+"\t           and because it generally is better for privacy\n"
+"\t           compared to HTTP.  Taler uses JSON to encode\n"
+"\t           structure data, making it easy to integrate Taler\n"
+"\t           with existing Web applications.  Taler's protocol\n"
+"\t           is documented in\n"
+"\t           detail <a href='https://api.taler.net/'>here</a>.\n"
+"\t           "
+msgstr ""
+
+#: developers.html.j2:58
 msgid "Code"
 msgstr ""
 
-#: developers.html.j2:55
+#: developers.html.j2:60
 msgid ""
 "Taler is currently primarily developed by a\n"
-"\t    research team at Inria and TU Munich. However,\n"
-"\t    contributions from anyone are welcome.  Our Git\n"
-"\t    repositories can be cloned using the Git and HTTP access\n"
-"\t    methods against <tt>git.taler.net</tt> with the name of\n"
-"\t    the respective repository. A list of public repositories\n"
-"\t    can be found in\n"
-"\t    our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
+"\t           research team at Inria and GNUnet e.V. However,\n"
+"\t           contributions from anyone are welcome.  Our Git\n"
+"\t           repositories can be cloned using the Git and HTTP\n"
+"\t           access methods against <tt>git.taler.net</tt> with\n"
+"\t           the name of the respective repository. A list of\n"
+"\t           public repositories can be found in\n"
+"\t           our <a href='https://git.taler.net/'>GitWeb</a>.\n"
+"\t           "
 msgstr ""
 
-#: developers.html.j2:66
+#: developers.html.j2:72
 msgid "Documentation"
 msgstr ""
 
-#: developers.html.j2:68
+#: developers.html.j2:74
 msgid ""
 "In addition to this website,\n"
-"            the <a href='https://git.taler.net/'>documented\n"
-"            code</a> and the <a href='https://api.taler.net/'>API\n"
-"            documentation</a>, we are in the process of preparing a\n"
-"            comprehensive design document which will be published here\n"
-"            soon.\n"
-"          "
+"                   the <a href='https://git.taler.net/'>documented\n"
+"                   code</a> and\n"
+"                   the <a href='https://api.taler.net/'>API\n"
+"                   documentation</a>, we are in the process of\n"
+"                   preparing a comprehensive design document which\n"
+"                   will be published here soon.  "
 msgstr ""
 
-#: developers.html.j2:77
+#: developers.html.j2:83
 msgid "Discussion"
 msgstr ""
 
-#: developers.html.j2:79
+#: developers.html.j2:85
 msgid ""
 "We have a mailinglist for developer discussions.\n"
-"            You can subscribe to it or read the list archive at\n"
-"            <a "
+"                   You can subscribe to it or read the list archive at\n"
+"                   <a "
 
"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgstr ""
 
-#: developers.html.j2:87
+#: developers.html.j2:93
 msgid "Regression Testing"
 msgstr ""
 
-#: developers.html.j2:89
+#: developers.html.j2:95
 msgid ""
-"We\n"
-"            have <a href='https://buildbot.net/'>Buildbot</a>\n"
-"            automation tests to detect regressions and check for\n"
-"            portability at\n"
+"We have\n"
+"                   <a href='https://buildbot.net/'>Buildbot</a>\n"
+"                   automation tests to detect regressions and check\n"
+"                   for portability at\n"
 "            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>."
 "\n"
 "          "
 msgstr ""
 
-#: developers.html.j2:97
+#: developers.html.j2:103
 msgid "Code Coverage Analysis"
 msgstr ""
 
-#: developers.html.j2:99
+#: developers.html.j2:105
 msgid ""
-"We\n"
-"            use <a "
+"We use\n"
+"                   <a "
 "href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-"            to analyze the code coverage of our tests, the results are\n"
-"            available\n"
-"            at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
+"                   to analyze the code coverage of our tests, the\n"
+"                   results are available\n"
+"                   at <a "
+"href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
+"                   "
 msgstr ""
 
-#: developers.html.j2:107
+#: developers.html.j2:113
 msgid "Performance Analysis"
 msgstr ""
 
-#: developers.html.j2:109
+#: developers.html.j2:115
 msgid ""
 "We\n"
-"            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
-"            performance regression analysis of the exchange backend\n"
-"            at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
+"                   use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
+"                   for performance regression analysis of the exchange\n"
+"                   backend\n"
+"                   at <a "
+"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
+"                   "
 msgstr ""
 
-#: developers.html.j2:118
+#: developers.html.j2:125
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:120
+#: developers.html.j2:127
 msgid ""
-"The Taler system consists of protocols executed\n"
-"          among a number of actors with the help\n"
-"          of <a href='https://www.fsf.org/'>Free Software</a> as\n"
-"          illustrated in the illustration on the right.  Typical\n"
-"          transactions involve the following steps:\n"
-"        "
+"The Taler system consists of protocols executed among\n"
+"                 a number of actors with the help\n"
+"                 of <a href='https://www.fsf.org/'>Free Software</a>\n"
+"                 as illustrated in the illustration on the right.\n"
+"                 Typical transactions involve the following steps: "
 msgstr ""
 
-#: developers.html.j2:129
+#: developers.html.j2:136
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange\n"
-"               (top left).  In the subject of the transaction, he\n"
-"               includes an authentication token from his\n"
-"               electronic <b>wallet</b>. In Taler terminology, the\n"
-"               customer creates a reserve at the exchange.\n"
-"             "
-msgstr ""
-
-#: developers.html.j2:137
-msgid ""
-"Once the exchange has received the\n"
-"               transfer, it allows the customer's electronic wallet\n"
-"               to <b>withdraw</b> electronic coins.  The electronic\n"
-"               coins are digital representations of the original\n"
-"               currency from the transfer. It is important to note\n"
-"               that the exchange does not learn the &quot;serial "
-"numbers&quot;\n"
-"               of the coins created in this process, so it cannot tell\n"
-"               later which customer purchased what at which merchant.\n"
-"               The use of Taler does not change the currency or the\n"
-"               total value of the funds (except for fees which the\n"
-"               exchange may charge for the service).\n"
-"             "
-msgstr ""
-
-#: developers.html.j2:150
-msgid ""
-"Once the customer has the digital coins in\n"
-"               his wallet, the wallet can be used to <b>spend</b> the\n"
-"               coins with merchant portals that support the Taler\n"
-"               payment system and accept the respective exchange as a\n"
-"               business partner (bottom arrow). This creates a digital\n"
-"               contract signed by the customer's coins and the\n"
-"               merchant.  If necessary, the customer can later use\n"
-"               this digitally signed contract in a court of law to\n"
-"               prove the exact terms of the contract and that he paid\n"
-"               the respective amount. The customer does not learn the\n"
-"               banking details of the merchant, and Taler does not\n"
-"               require the merchant to learn the identity of the\n"
-"               customer. Naturally, the customer can spend any\n"
-"               fraction of his digital coins (the system takes care of\n"
-"               customers getting change).\n"
-"             "
-msgstr ""
-
-#: developers.html.j2:167
+"                       transfer funds from his account to the Taler\n"
+"                       exchange (top left).  In the subject of the\n"
+"                       transaction, he includes an authentication\n"
+"                       token from his electronic <b>wallet</b>. In\n"
+"                       Taler terminology, the customer creates a\n"
+"                       reserve at the exchange.  "
+msgstr ""
+
+#: developers.html.j2:144
+msgid ""
+"Once the exchange has received the wire\n"
+"                       transfer, it allows the customer's electronic\n"
+"                       wallet to <b>withdraw</b> electronic coins.\n"
+"                       The electronic coins are digital\n"
+"                       representations of the original currency from\n"
+"                       the transfer. It is important to note that the\n"
+"                       exchange does not learn the &quot;serial\n"
+"                       numbers&quot; of the coins created in this\n"
+"                       process, so it cannot tell later which customer\n"
+"                       purchased what at which merchant.  The use of\n"
+"                       Taler does not change the currency or the total\n"
+"                       value of the funds (except for fees which the\n"
+"                       exchange may charge for the service).  "
+msgstr ""
+
+#: developers.html.j2:159
+msgid ""
+"Once the customer has the digital coins in his\n"
+"                       wallet, the wallet can be used to <b>spend</b>\n"
+"                       the coins with merchant portals that support\n"
+"                       the Taler payment system and accept the\n"
+"                       respective exchange as a business partner\n"
+"                       (bottom arrow). This creates a digital contract\n"
+"                       signed by the customer's coins and the\n"
+"                       merchant.  If necessary, the customer can later\n"
+"                       use this digitally signed contract in a court\n"
+"                       of law to prove the exact terms of the contract\n"
+"                       and that he paid the respective amount. The\n"
+"                       customer does not learn the banking details of\n"
+"                       the merchant, and Taler does not require the\n"
+"                       merchant to learn the identity of the\n"
+"                       customer. Naturally, the customer can spend any\n"
+"                       fraction of his digital coins (the system takes\n"
+"                       care of customers getting change).  "
+msgstr ""
+
+#: developers.html.j2:177
 msgid ""
 "Merchants receiving digital\n"
-"               coins <b>deposit</b> the respective receipts that\n"
-"               resulted from the contract signing with the customer at\n"
-"               the exchange to redeem the coins.  The deposit step\n"
-"               does not reveal the details of the contract between the\n"
-"               customer and the merchant or the identity of the\n"
-"               customer to the exchange in any way. However, the\n"
-"               exchange does learn the identity of the merchant via\n"
-"               the provided bank routing information.  The merchant\n"
-"               can, for example when compelled by the state for\n"
-"               taxation, provide information linking the individual\n"
-"               deposit to the respective contract signed by the\n"
-"               customer. Thus, the exchange's database allows the\n"
-"               state to enforce that merchants pay applicable taxes\n"
-"               (and do not engage in illegal contracts).\n"
-"             "
-msgstr ""
-
-#: developers.html.j2:184
+"                       coins <b>deposit</b> the respective receipts\n"
+"                       that resulted from the contract signing with\n"
+"                       the customer at the exchange to redeem the\n"
+"                       coins.  The deposit step does not reveal the\n"
+"                       details of the contract between the customer\n"
+"                       and the merchant or the identity of the\n"
+"                       customer to the exchange in any way. However,\n"
+"                       the exchange does learn the identity of the\n"
+"                       merchant via the provided bank routing\n"
+"                       information.  The merchant can, for example\n"
+"                       when compelled by the state for taxation,\n"
+"                       provide information linking the individual\n"
+"                       deposit to the respective contract signed by\n"
+"                       the customer. Thus, the exchange's database\n"
+"                       allows the state to enforce that merchants pay\n"
+"                       applicable taxes (and do not engage in illegal\n"
+"                       contracts).  "
+msgstr ""
+
+#: developers.html.j2:196
 msgid ""
 "Finally, the exchange transfers funds\n"
-"               corresponding to the digital coins redeemed by the\n"
-"               merchants to the merchant's <b>bank</b> account. The\n"
-"               exchange may combine multiple small transactions into\n"
-"               one larger bank transfer.  The merchant can query the\n"
-"               exchange about the relationship between the bank\n"
-"               transfers and the individual claims that were\n"
-"               deposited.\n"
-"             "
+"                       corresponding to the digital coins redeemed by\n"
+"                       the merchants to the merchant's <b>bank</b>\n"
+"                       account. The exchange may combine multiple\n"
+"                       small transactions into one larger bank\n"
+"                       transfer.  The merchant can query the exchange\n"
+"                       about the relationship between the bank\n"
+"                       transfers and the individual claims that were\n"
+"                       deposited.  "
 msgstr ""
 
-#: developers.html.j2:194
+#: developers.html.j2:206
 msgid ""
 "Most importantly, the exchange keeps\n"
-"               cryptographic proofs that allow it to demonstrate that\n"
-"               it is operating correctly to third parties.  The system\n"
-"               requires an external <b>auditor</b>, such as a\n"
-"               government-appointed financial regulatory body, to\n"
-"               frequently verify the exchange's databases and check that\n"
-"               its bank balance matches the total value of the\n"
-"               remaining coins in circulation.\n"
-"             "
+"                       cryptographic proofs that allow it to\n"
+"                       demonstrate that it is operating correctly to\n"
+"                       third parties.  The system requires an\n"
+"                       external <b>auditor</b>, such as a\n"
+"                       government-appointed financial regulatory body,\n"
+"                       to frequently verify the exchange's databases\n"
+"                       and check that its bank balance matches the\n"
+"                       total value of the remaining coins in\n"
+"                       circulation.  "
 msgstr ""
 
-#: developers.html.j2:204
+#: developers.html.j2:217
 msgid ""
 "Without the auditor, the exchange operators\n"
-"               could embezzle funds they are holding in\n"
-"               reserve. Customers and merchants cannot cheat each\n"
-"               other or the exchange. If any party's computers are\n"
-"               compromised, the financial damage is limited to the\n"
-"               respective party and proportional to the funds they\n"
-"               have in circulation during the period of the\n"
-"               compromise.\n"
-"             "
-msgstr ""
-
-#: financial-news.html.j2:5 financial-news.html.j2:14
-msgid "Financial News"
+"                       could embezzle funds they are holding in\n"
+"                       reserve. Customers and merchants cannot cheat\n"
+"                       each other or the exchange. If any party's\n"
+"                       computers are compromised, the financial damage\n"
+"                       is limited to the respective party and\n"
+"                       proportional to the funds they have in\n"
+"                       circulation during the period of the\n"
+"                       compromise.  "
 msgstr ""
 
 #: governments.html.j2:5
@@ -501,246 +504,269 @@ msgid "Governments"
 msgstr ""
 
 #: governments.html.j2:14
-msgid "Advantages for governments"
+msgid "Advantages for Governments"
 msgstr ""
 
-#: governments.html.j2:21 index.html.j2:25
+#: governments.html.j2:18
+msgid ""
+"Taler provides accountability to ensure business\n"
+"                   accepting payments operate legally, while also\n"
+"                   respecting civil liberties of citizens spending\n"
+"                   digital cash.  Taler is a commons, a payment system\n"
+"                   based on open standards and free software.  Taler\n"
+"                   needs governments to set a financial framework and\n"
+"                   to act as trusted regulators.  Taler contributes to\n"
+"                   digital sovereignty in the critial financial\n"
+"                   infrastructure."
+msgstr ""
+
+#: governments.html.j2:34
 msgid "Taxable"
 msgstr ""
 
-#: governments.html.j2:23
-msgid ""
-"Taler is an electronic payment system that was built with the goal of "
-"supporting taxation.\n"
-"             With Taler, the receiver of any form of payment is known, "
-"and the payment information comes\n"
-"             attached with some details about what the payment was made "
-"for (but not the identity of the customer).  Thus, governments can use "
-"this\n"
-"             data to tax buisnesses and individuals based on their "
-"income, making tax evasion and\n"
-"             black markets less viable."
+#: governments.html.j2:36
+msgid ""
+"Taler was\n"
+"\t           built with the goal of fighting corruption and supporting "
+"taxation.  \n"
+"\t           With Taler, the receiver of any form of payment is\n"
+"\t           easily identified by the government, and the merchant\n"
+"                   can be compelled to provide the contract that was "
+"accepted\n"
+"                   by the customer.  Governments can use this data to\n"
+"\t           tax businesses and individuals based on their\n"
+"\t           income, making tax evasion and black markets less\n"
+"\t           viable."
+msgstr ""
+
+#: governments.html.j2:46
+msgid ""
+"Thus, despite offering anonymity for citizens\n"
+"                   spending digital cash to buy goods and services,\n"
+"                   Taler also ensures that the state can observe\n"
+"                   incoming funds. This can be used to ensure\n"
+"                   businesses engage only in legal activities, and do\n"
+"                   not evade income tax, sales tax or value-added tax.\n"
+"                   However, this observational capability does not\n"
+"                   extend to the immediate personal domain.  In\n"
+"                   particular, sharing access to funds within a family\n"
+"                   or synchronizing wallets across multiple devices is "
+"not\n"
+"                   subject to monitoring."
 msgstr ""
 
-#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
+#: governments.html.j2:59 merchants.html.j2:43
 msgid "Secure"
 msgstr ""
 
-#: governments.html.j2:32
+#: governments.html.j2:61
+msgid ""
+"Taler's payments are cryptographically\n"
+"                   secured. Thus, customers, merchants and the\n"
+"                   exchange can mathematically demonstrate their\n"
+"                   lawful behavior in court in case of\n"
+"                   disputes. Financial damages are strictly limited,\n"
+"                   improving economic security for individuals,\n"
+"                   merchants, the exchange and the state."
+msgstr ""
+
+#: governments.html.j2:69
 msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, "
-"merchants and\n"
-"             the exchange can mathematically demonstrate their lawful "
-"behavior in court in case\n"
-"             of disputes. Financial damages are strictly limited, "
-"improving economic security\n"
-"             for individuals, merchants, the exchange and the state.  "
-"Most importantly, an\n"
-"             independent auditor can ensure that there is no &quot;bad "
-"exchange&quot;\n"
-"             within the Taler system who might threaten the economy due "
-"to fraud."
+"By design, the Taler payment service provider is\n"
+"                   subject to financial regulation. Financial\n"
+"                   regulation and regular audits are critical to\n"
+"                   establish trust. In particular, the Taler design\n"
+"                   mandates the existence of an independent auditor\n"
+"                   who checks cryptographic proofs that accumulate at\n"
+"                   the payment service provider to ensure that the\n"
+"                   escrow account is managed honestly.  This ensures\n"
+"                   that the payment service provider does not threaten\n"
+"                   the economy due to fraud."
 msgstr ""
 
-#: governments.html.j2:42 index.html.j2:39
+#: governments.html.j2:80
 msgid "Libre"
 msgstr ""
 
-#: governments.html.j2:44
+#: governments.html.j2:82
 msgid ""
-"Taler is free software implementing an open protocol standard.  Thus, "
-"Taler will\n"
-"             enable competition and avoid the monopolization of payment "
-"systems that threatens\n"
-"             global political and financial stability today."
+"Taler is free software implementing an open\n"
+"                   protocol standard.  Thus, Taler will enable\n"
+"                   competition and avoid the monopolization of payment\n"
+"                   systems that threatens global political and\n"
+"                   financial stability today."
 msgstr ""
 
-#: governments.html.j2:49 investors.html.j2:18
+#: governments.html.j2:91
 msgid "Efficient"
 msgstr ""
 
-#: governments.html.j2:51
+#: governments.html.j2:93
 msgid ""
-"Taler is designed to be efficient.  Unlike timeline-based payment systems"
-" like\n"
-"             BitCoin, Taler will not threaten the availability of "
-"national electric grids or\n"
-"             (significantly) contribute to environmental pollution."
+"Taler has an efficient design.  Unlike\n"
+"                   timeline-based payment systems, such as BitCoin,\n"
+"                   Taler will not threaten the availability of\n"
+"                   national electric grids or (significantly)\n"
+"                   contribute to environmental pollution."
 msgstr ""
 
-#: governments.html.j2:57
+#: governments.html.j2:102
 msgid "Taler as seen by governments"
 msgstr ""
 
-#: governments.html.j2:59
+#: governments.html.j2:104
 msgid ""
-"Governments can observe traditional wire\n"
-"          transfers entering and leaving the Taler system, and\n"
-"          require merchants and exchange operators to provide certain\n"
-"          information during financial audits.  Exchange operators\n"
-"          are expected to be permanently checked by auditors,\n"
-"          while merchants may be required to reveal information\n"
-"          during regular tax audits.\n"
-"          Information available to the government includes:\n"
-"        "
+"Governments can observe traditional wire transfers\n"
+"                 entering and leaving the Taler system, and require\n"
+"                 merchants and exchange operators to provide certain\n"
+"                 information during financial audits.  Exchange\n"
+"                 operators are expected to be permanently checked by\n"
+"                 auditors, while merchants may be required to reveal\n"
+"                 information during regular tax audits.  Information\n"
+"                 available to the government includes: "
 msgstr ""
 
-#: governments.html.j2:71
+#: governments.html.j2:117
 msgid ""
-"From the banking system:\n"
-"              The total amount of digital currency\n"
-"              obtained by a customer. The government could impose\n"
-"              limits on how many digital coins a customer may\n"
-"              withdraw within a given timeframe."
+"From the banking system: The total amount of\n"
+"  \t              digital currency obtained by a customer. The\n"
+"  \t              government could impose limits on how many\n"
+"  \t              digital coins a customer may withdraw within a\n"
+"  \t              given timeframe."
 msgstr ""
 
-#: governments.html.j2:77
+#: governments.html.j2:123
 msgid ""
-"From the banking system:\n"
-"               The total amount of income received\n"
-"               by any merchant via the Taler system."
+"From the banking system: The total amount of\n"
+"                       income received by any merchant via the Taler\n"
+"                       system."
 msgstr ""
 
-#: governments.html.j2:81
+#: governments.html.j2:127
 msgid ""
-"From auditing the exchange:\n"
-"               The amounts of digital coins legitimately withdrawn by\n"
-"               customers from the exchange, the value of non-redeemed "
-"digital coins\n"
-"               in customer's wallets, the value and corresponding wire "
-"details\n"
-"               of deposit operations performed by merchants with the "
-"exchange, and\n"
-"               the income of the exchange from transaction fees."
+"From auditing the exchange: The amounts of\n"
+"                       digital coins legitimately withdrawn by\n"
+"                       customers from the exchange, the value of\n"
+"                       non-redeemed digital coins in customer's\n"
+"                       wallets, the value and corresponding wire\n"
+"                       details of deposit operations performed by\n"
+"                       merchants with the exchange, and the income of\n"
+"                       the exchange from transaction fees."
 msgstr ""
 
-#: governments.html.j2:88
+#: governments.html.j2:136
 msgid ""
-"From auditing merchants:\n"
-"               For each deposit operation, the exact details of the\n"
-"               underlying contract that was signed between\n"
-"               customer and merchant.  However, this information would\n"
-"               typically not include the identity of the customer.\n"
-"               Note that while the customer can decide to prove that it "
-"was his\n"
-"               transaction (i.e. in court when suing the merchant if the\n"
-"               merchant failed to deliver on the contract),\n"
-"               merchant, exchange and government cannot find out the "
-"customer's\n"
-"               identity from the information that Taler collects."
+"From auditing merchants: For each deposit\n"
+"                      operation, the exact details of the underlying\n"
+"                      contract that was signed between customer and\n"
+"                      merchant.  However, this information would\n"
+"                      typically not include the identity of the\n"
+"                      customer.  Note that while the customer can\n"
+"                      decide to prove that it was his transaction\n"
+"                      (i.e. in court when suing the merchant if the\n"
+"                      merchant failed to deliver on the contract),\n"
+"                      merchant, exchange and government cannot find\n"
+"                      out the customer's identity from the information\n"
+"                      that Taler collects."
 msgstr ""
 
-#: index.html.j2:17
-msgid "Electronic payments for a liberal society!"
+#: index.html.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
 
-#: index.html.j2:18
-msgid ""
-"Taler is a new electronic payment system under development\n"
-"\t   at <a href=\"http://www.inria.fr/\";>Inria</a>.  Today, this website "
-"only\n"
-"\t    presents the advantages our system is expected to provide.  We "
-"expect to\n"
-"\t    make the payment system operational in 2017."
+#: index.html.j2:17
+msgid "Independent One-Click Payments!"
 msgstr ""
 
-#: index.html.j2:26
+#: index.html.j2:19
 msgid ""
-"Unlike BitCoin or cash payments, Taler ensures that\n"
-"\t     governments can learn their citizen's total income and thus "
-"collect\n"
-"\t     sales, value-added or income taxes. Taler is thus a currency for "
-"the\n"
-"\t     mainstream economy, and not the black market."
+"Taler is an electronic payment system under\n"
+"\t          development\n"
+"\t          at <a href=\"http://www.inria.fr/\";>Inria</a>.  This\n"
+"\t          community Web site provides extensive documentation\n"
+"\t          about the system, which we expect to make\n"
+"\t          operational in 2017."
 msgstr ""
 
-#: index.html.j2:32
-msgid "Anonymous"
+#: index.html.j2:29
+msgid "<b>T</b>axable"
 msgstr ""
 
-#: index.html.j2:33
+#: index.html.j2:31
 msgid ""
-"When you pay with Taler, your identity does not have to\n"
-"\t     be revealed to the merchant. The bank, government and exchange "
-"will also\n"
-"\t     never learn how you spent your electronic money. However, you can\n"
-"\t     prove that you paid in court if necessary."
+"Unlike BitCoin or cash payments, Taler ensures that\n"
+"\t           governments can learn their citizen's total income\n"
+"\t           and thus collect sales, value-added or income\n"
+"\t           taxes. Taler is a currency for the mainstream\n"
+"\t           economy, and not the black market."
 msgstr ""
 
-#: index.html.j2:40
+#: index.html.j2:39
+msgid "<b>A</b>nonymous"
+msgstr ""
+
+#: index.html.j2:41
 msgid ""
-"Taler is free software from <a href=\"http://www.gnu.org/\";>the GNU "
-"project</a> implementing an open protocol.\n"
-"\t     Anybody is welcome to inspect our code and integrate our reference"
-"\n"
-"\t     implementation into their applications."
+"When you pay with Taler, your identity does not\n"
+"\t           have to be revealed to the merchant. Just like\n"
+"\t           payments in cash, nobody else can track how you\n"
+"\t           spent your electronic money. However, you obtain a\n"
+"\t           legally valid proof of payment."
 msgstr ""
 
-#: index.html.j2:47
-msgid "Electronic"
+#: index.html.j2:49
+msgid "<b>L</b>ibre"
 msgstr ""
 
-#: index.html.j2:48
+#: index.html.j2:51
 msgid ""
-"Taler is designed to work on the Internet. Using a\n"
-"\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
-"\t    integrate with existing Web applications."
+"Taler is free software\n"
+"\t           from <a href=\"http://www.gnu.org/\";>the GNU\n"
+"\t           project</a> implementing an open protocol.  Anybody\n"
+"\t           is welcome to inspect our code and integrate our\n"
+"\t           reference implementation into their applications."
 msgstr ""
 
-#: index.html.j2:53
-msgid "Reserves"
+#: index.html.j2:62
+msgid "<b>E</b>lectronic"
 msgstr ""
 
-#: index.html.j2:54
+#: index.html.j2:64
 msgid ""
-"Taler uses an electronic exchange holding financial\n"
-"             reserves in existing currencies. This means that Taler is "
-"not\n"
-"\t     a new currency with the inherent currency fluctuation risks, but\n"
-"\t     instead the cryptographic coins correspond to existing currencies,"
-" such as\n"
-"\t     US Dollars, Euros or even BitCoins."
+"Taler is easy to integrate with existing Web\n"
+"\t           applications. Payments are cryptographically\n"
+"\t           secured and are confirmed within milliseconds with\n"
+"\t           extremely low transaction costs."
 msgstr ""
 
-#: index.html.j2:61 news.html.j2:5 news.html.j2:14
-msgid "News"
+#: index.html.j2:71
+msgid "<b>R</b>eserves"
 msgstr ""
 
-#: index.html.j2:62
-msgid "Taler Web payments paper published."
+#: index.html.j2:73
+msgid ""
+"Taler does not introduce a new currency with\n"
+"\t           fluctuation risks, and instead uses a digital\n"
+"\t           wallet holding coins in reserve. Taler's\n"
+"\t           cryptographic coins correspond to existing\n"
+"\t           currencies, such as US Dollars, Euros or even\n"
+"\t           BitCoins."
 msgstr ""
 
-#: index.html.j2:63
-msgid "More news »"
+#: index.html.j2:82
+msgid "Latest Videos"
 msgstr ""
 
-#: index.html.j2:67
-msgid "Taler technology: About taxability, change and privacy"
+#: index.html.j2:83
+msgid "Florian Dold talks about Taler at 50p!"
 msgstr ""
 
-#: index.html.j2:68
-msgid ""
-"One of the key goals of Taler is to provide anonymity for\n"
-"           citizens buying goods and services, while ensuring that the "
-"state can\n"
-"           observe incoming transactions to ensure businesses engage only"
-" in\n"
-"           legal activities and do not evade taxes (such as income tax,\n"
-"           sales tax or value-added tax).  However, we also want to stay\n"
-"           out of the immediate personal domain, so sharing funds within "
-"a\n"
-"           family or copying coins between devices should not be subject "
-"to\n"
-"           monitoring by the state.\n"
-"         "
+#: index.html.j2:93
+msgid "Taler News"
 msgstr ""
 
-#: index.html.j2:77
-msgid ""
-"As a result, Taler does not intrude into the\n"
-"           personal economic domain, offers good privacy, taxability\n"
-"           for transactions and the ability to give change.\n"
-"         "
+#: index.html.j2:97
+msgid "Financial News"
 msgstr ""
 
 #: investors.html.j2:5
@@ -748,100 +774,119 @@ msgid "Investors"
 msgstr ""
 
 #: investors.html.j2:14
-msgid "Operate a Taler exchange!"
+msgid "Invest in Taler!"
 msgstr ""
 
-#: investors.html.j2:20
+#: investors.html.j2:16
 msgid ""
-"Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
-"             EdDSA) and is thus expected to be able to handle large "
-"transaction\n"
-"             volumes, only limited by the input/output capabilities of "
-"the\n"
-"             database. Thus, running a Taler exchange should be "
-"profitable even\n"
-"             with very low (less than 1 cent) transaction fees (at "
-"appropriate\n"
-"             transaction volume)."
+"We have created a company, Taler Systems SA in \n"
+"                   Luxemburgh.<br>\n"
+"                   Please contact <tt>address@hidden</tt>\n"
+"                   if you want to invest in Taler."
 msgstr ""
 
-#: investors.html.j2:30
+#: investors.html.j2:24
+msgid "The Team"
+msgstr ""
+
+#: investors.html.j2:26
+msgid ""
+"Our team combines world-class business leaders,\n"
+"                   cryptographers, software engineers, civil-rights\n"
+"                   activits and academics. We are unified by a vision\n"
+"                   of how payments should work and the goal of\n"
+"                   imposing this vision upon the world."
+msgstr ""
+
+#: investors.html.j2:32
 msgid ""
-"All transactions in Taler are secured using modern cryptography and\n"
-"             trust in all parties is minimized. Financial damage is "
-"bounded\n"
-"             (for customers, merchants and the exchange) even\n"
-"             in the case that systems are compromised and private keys "
-"are stolen.\n"
-"             Databases can be audited for consistency, resulting in "
-"either the\n"
-"             detection of compromised systems or the demonstration that\n"
-"             participants were honest."
+"We are currently supported by Inria, the French\n"
+"                   national institute for research in informatics and\n"
+"                   automation, and the Renewable Freedom Foundation."
+msgstr ""
+
+#: investors.html.j2:37
+msgid "The Technology"
 msgstr ""
 
 #: investors.html.j2:39
-msgid "Business model"
+msgid ""
+"All transactions in Taler are secured using modern\n"
+"                   cryptography and trust in all parties is\n"
+"                   minimized. Financial damage is bounded (for\n"
+"                   customers, merchants and the exchange) even in the\n"
+"                   case that systems are compromised and private keys\n"
+"                   are stolen.  Databases can be audited for\n"
+"                   consistency, resulting in either the detection of\n"
+"                   compromised systems or the demonstration that\n"
+"                   participants were honest. Actual transaction costs\n"
+"                   are fractions of a cent."
 msgstr ""
 
-#: investors.html.j2:41
+#: investors.html.j2:51
+msgid "The Business"
+msgstr ""
+
+#: investors.html.j2:53
 msgid ""
-"The basic business model for Taler is the operation of an exchange.  An "
-"exchange converts money from traditional payment systems (Mastercard,\n"
-"             SEPA, Visa, BitCoin, ACH, SWIFT, etc.) to anonymous "
-"electronic\n"
-"             coins in the same currency. The customer can then redeem the"
-" electronic\n"
-"             coins at a merchant, who can exchange them for money "
-"represented using\n"
-"             traditional payment systems at the exchange.  The exchange "
-"can then charge\n"
-"             fees (to the customer, merchant or both) to facilitate the "
-"transactions."
+"The scalable business model for Taler is the operation\n"
+"                   of the payment service provider, which converts money "
+"from\n"
+"                   traditional payment systems (Mastercard, SEPA,\n"
+"                   Visa, BitCoin, ACH, SWIFT, etc.) to anonymous\n"
+"                   electronic coins in the same currency. The customer\n"
+"                   can then redeem the electronic coins at a merchant,\n"
+"                   who can exchange them for money represented using\n"
+"                   traditional payment systems at the exchange.  The\n"
+"                   exchange charges fees (to the customer,\n"
+"                   merchant or both) to facilitate the transactions."
 msgstr ""
 
-#: investors.html.j2:50
-msgid "Taler as seen by the exchange operator"
+#: investors.html.j2:67
+msgid "Taler as seen by the payment service operator"
 msgstr ""
 
-#: investors.html.j2:52
+#: investors.html.j2:69
 msgid ""
-"The exchange operator primarily operates a Web service\n"
-"          portal and keeps databases with transaction details and\n"
-"          cryptographic proofs.  Its operational expenses are thus "
-"related to\n"
-"          its interactions with the banking system and the operation of\n"
-"          the computing infrastructure, while its income is based on\n"
-"          transaction fees it may charge for the various interactions.\n"
-"          Key interactions of the exchange include:\n"
-"        "
+"The payment service operator runs a <em>Taler\n"
+"                 exchange</em>, which is a Web service portal that\n"
+"                 keeps databases with transaction details and\n"
+"                 cryptographic proofs.  Its operational expenses are\n"
+"                 thus related to its interactions with the banking\n"
+"                 system and the operation of the computing\n"
+"                 infrastructure, while its income is based on\n"
+"                 transaction fees it may charge for the various\n"
+"                 interactions.  Key interactions of the exchange\n"
+"                 include: "
 msgstr ""
 
-#: investors.html.j2:64
+#: investors.html.j2:83
 msgid ""
 "Create a <b>reserve</b> based on an incoming\n"
-"              wire transfer from a customer."
+"                      wire transfer from a customer."
 msgstr ""
 
-#: investors.html.j2:67
+#: investors.html.j2:86
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
-"               digital coins from their reserve."
+"                      digital coins from their reserve."
 msgstr ""
 
-#: investors.html.j2:70
+#: investors.html.j2:89
 msgid "Accept and validate deposits from merchants."
 msgstr ""
 
-#: investors.html.j2:72
+#: investors.html.j2:91
 msgid ""
 "Execute wire transfers to merchants in\n"
-"               response to validated deposits."
+"                      response to validated deposits."
 msgstr ""
 
-#: investors.html.j2:75
+#: investors.html.j2:94
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
-"               correct operation for audits by financial regulators."
+"                      correct operation for audits by financial "
+"regulators."
 msgstr ""
 
 #: merchants.html.j2:5
@@ -849,180 +894,171 @@ msgid "Merchants"
 msgstr ""
 
 #: merchants.html.j2:14
-msgid "Advantages for merchants"
+msgid "Advantages for Merchants"
+msgstr ""
+
+#: merchants.html.j2:17
+msgid ""
+"Taler is a cost-effective electronic payment system\n"
+"\t           which provides you with cryptographic proof that\n"
+"\t           the payment worked correctly within milliseconds.\n"
+"\t           Your Web customers pay with previously unknown\n"
+"\t           levels of convenience without risk of fraud."
 msgstr ""
 
-#: merchants.html.j2:18
+#: merchants.html.j2:28
 msgid "Fast"
 msgstr ""
 
-#: merchants.html.j2:20
+#: merchants.html.j2:30
 msgid ""
-"Processing transactions with Taler is fast, allowing you\n"
-"\t     to confirm the transaction with your customer virtually "
-"immediately.\n"
-"\t     Your customers will appreciate that they do not have to type in "
-"credit\n"
-"\t     card information and play the &quot;verified by&quot; game.  By "
-"making payments\n"
-"\t     significantly more convenient for your customers, you may be able "
-"to\n"
-"\t     use Taler for small transactions that would not work with credit "
-"card\n"
-"\t     payments due to the mental overhead for customers."
+"Processing transactions with Taler is fast,\n"
+"\t           allowing you to confirm the transaction with your\n"
+"\t           customer virtually immediately.  Your customers\n"
+"\t           will appreciate that they do not have to type in\n"
+"\t           credit card information and play the &quot;verified\n"
+"\t           by&quot; game.  By making payments significantly\n"
+"\t           more convenient for your customers, you may be able\n"
+"\t           to use Taler for small transactions that would not\n"
+"\t           work with credit card payments due to the mental\n"
+"\t           overhead for customers."
 msgstr ""
 
-#: merchants.html.j2:31
+#: merchants.html.j2:45
 msgid ""
-"You never learn sensitive customer information. You need\n"
-"\t     to ensure that your website provides the correct account "
-"information\n"
-"\t     for your business, and that you correctly validate the payment\n"
-"\t     confirmations from the Taler exchange.  As a result, you will have"
-"\n"
-"\t     cryptographic proof of payment for the specific contracts you "
-"entered\n"
-"\t     with your customers, and cryptographically signed confirmations "
-"from\n"
-"\t     the Taler exchange about the deposits. Taler does not require you "
-"to\n"
-"\t     undergo any particular security audits, processes or procedures, "
-"as\n"
-"\t     you never handle sensitive customer information.  Your systems "
-"will\n"
-"\t     have cryptographically signed contracts which you can use in court"
-" in\n"
-"\t     case of disputes."
-msgstr ""
-
-#: merchants.html.j2:44
+"You will have cryptographic proof of payment from\n"
+"\t           the Taler payment service provider. Taler does not\n"
+"\t           require you to undergo any particular security\n"
+"\t           audits (such as PCI DSS), processes or procedures,\n"
+"\t           as you never handle sensitive customer account\n"
+"\t           information.  Your systems will have customer\n"
+"\t           contracts wih qualified signatures for all\n"
+"\t           transactions which you can use in court in case of\n"
+"\t           disputes."
+msgstr ""
+
+#: merchants.html.j2:57
 msgid "Free Software"
 msgstr ""
 
-#: merchants.html.j2:46
+#: merchants.html.j2:59
 msgid ""
 "Taler is free software, and you can use the\n"
-"\t     liberally-licensed reference code as a starting point to integrate"
-"\n"
-"\t     Taler into your services. To use Taler, you do not need to pay "
-"license\n"
-"\t     fees, and the free software development model will ensure that you"
-" can\n"
-"\t     select from many competent developers to help you with your\n"
-"\t     integration."
+"\t           liberally-licensed reference code as a starting\n"
+"\t           point to integrate Taler into your services. To use\n"
+"\t           Taler, you do not need to pay license fees, and the\n"
+"\t           free software development model will ensure that\n"
+"\t           you can select from many competent integrators for\n"
+"\t           support."
 msgstr ""
 
-#: merchants.html.j2:56
+#: merchants.html.j2:71
 msgid "Low Fees"
 msgstr ""
 
-#: merchants.html.j2:58
+#: merchants.html.j2:73
 msgid ""
-"Taler is designed to minimize the work the exchange needs to\n"
-"\t     perform.  Combined with Taler's strong security which prevents "
-"fraud,\n"
-"\t     exchanges can operate with very low overhead and thus low "
-"transaction\n"
-"\t     fees.  Given Taler's free software exchange reference "
-"implementation,\n"
-"\t     competition among exchanges will ensure fair, low transaction fees"
-" for\n"
-"\t     merchants."
+"Taler is designed to minimize the work the exchange\n"
+"\t           needs to perform.  Combined with Taler's strong\n"
+"\t           security which prevents fraud, payment service\n"
+"\t           providers can operate with very low overhead and\n"
+"\t           thus low transaction fees."
 msgstr ""
 
-#: merchants.html.j2:66
+#: merchants.html.j2:81
 msgid "Flexible"
 msgstr ""
 
-#: merchants.html.j2:68
+#: merchants.html.j2:83
 msgid ""
-"Taler can be used for different currencies (such as Euros\n"
-"\t     or US Dollars) and different payment models limited only by what "
-"the\n"
-"\t     exchange supports in its interactions."
+"Taler can be used for different currencies (such as\n"
+"\t           Euros, US Dollars or BitCoins) and different\n"
+"\t           payment models limited only by what the payment\n"
+"\t           service provider supports in its interactions."
 msgstr ""
 
-#: merchants.html.j2:73
+#: merchants.html.j2:91
 msgid "Ethical"
 msgstr ""
 
-#: merchants.html.j2:75
+#: merchants.html.j2:93
 msgid ""
-"Taler does not support tax evasion or money laundering, and is\n"
-"             also not a pyramid scheme or speculative investment.  "
-"Taler's\n"
-"             protocols are efficient and do not waste energy. Taler "
-"encourages\n"
-"             competition by providing an open standard and free software\n"
-"             reference implementations."
+"Taler prevents tax evasion and money laundering.\n"
+"                   Taler's protocols are efficient and do not waste\n"
+"                   energy. Taler encourages transparency by providing\n"
+"                   an open standard and free software reference\n"
+"                   implementations."
 msgstr ""
 
-#: merchants.html.j2:83
+#: merchants.html.j2:102
 msgid "Taler as seen by merchants"
 msgstr ""
 
-#: merchants.html.j2:85
+#: merchants.html.j2:104
 msgid ""
-"Merchants supporting the Taler system need to integrate\n"
-"          some relatively simple logic into their transaction processing\n"
-"          system.\n"
-"          Typical steps performed by the merchant system are:\n"
-"        "
+"Merchants supporting the Taler system need to\n"
+"                 integrate some relatively simple logic into their\n"
+"                 transaction processing system.  Typical steps\n"
+"                 performed by the merchant system are: "
 msgstr ""
 
-#: merchants.html.j2:94
+#: merchants.html.j2:113
 msgid ""
 "The new logic detects when a customer's system\n"
-"              supports Taler and then needs to send a cryptographically "
-"signed\n"
-"              version of the proposed contract in a simple JSON format to"
-"\n"
-"              the customer.\n"
-"              The message also includes salted, hashed wire details for\n"
-"              the merchant, as well as restrictions as to which exchange "
-"operators\n"
-"              the merchant is willing to deal with."
+"                      supports Taler and then needs to send a\n"
+"                      cryptographically signed version of the proposed\n"
+"                      contract in a simple JSON format to the\n"
+"                      customer.  The message also includes salted,\n"
+"                      hashed wire details for the merchant, as well as\n"
+"                      restrictions as to which exchange operators the\n"
+"                      merchant is willing to deal with."
 msgstr ""
 
-#: merchants.html.j2:102
+#: merchants.html.j2:122
 msgid ""
-"The customer sends a signed response which states\n"
-"               that certain digital coins now belong to the merchant to "
-"both\n"
-"               signal acceptance of the deal as well as to pay the "
-"respective\n"
-"               amount (bottom)."
+"The customer sends a signed response which\n"
+"                      states that certain digital coins now belong to\n"
+"                      the merchant to both signal acceptance of the\n"
+"                      deal as well as to pay the respective amount\n"
+"                      (bottom)."
 msgstr ""
 
-#: merchants.html.j2:107
+#: merchants.html.j2:128
 msgid ""
 "The merchant then forwards the signed messages\n"
-"               received from the customer to the exchange, together with "
-"its\n"
-"               wire details and the salt (without hashing).  The exchange"
-" verifies\n"
-"               the details and sends a signed confirmation (or an error\n"
-"               message) to the merchant.  The merchant checks that the\n"
-"               exchange's signature is valid, sends a confirmation to the"
-"\n"
-"               customer and executes the contract-specific business logic."
+"                       received from the customer to the exchange,\n"
+"                       together with its wire details and the salt\n"
+"                       (without hashing).  The exchange verifies the\n"
+"                       details and sends a signed confirmation (or an\n"
+"                       error message) to the merchant.  The merchant\n"
+"                       checks that the exchange's signature is valid,\n"
+"                       sends a confirmation to the customer and\n"
+"                       executes the contract-specific business\n"
+"                       logic."
+msgstr ""
+
+#: merchants.html.j2:139
+msgid ""
+"The exchange performs wire transfers\n"
+"                       corresponding to the claims deposited by the\n"
+"                       merchant. Note that the exchange may charge\n"
+"                       fees for the deposit operation, hence merchants\n"
+"                       may impose limits restricting the set of\n"
+"                       exchange operators they are willing to deal\n"
+"                       with, for example by imposing a bound on\n"
+"                       deposit fees."
+msgstr ""
+
+#: merchants.html.j2:151
+msgid "Manuals for merchants"
 msgstr ""
 
-#: merchants.html.j2:115
-msgid ""
-"The exchange performs wire transfers corresponding to\n"
-"               the claims deposited by the merchant. Note that the "
-"exchange may\n"
-"               charge fees for the deposit operation, hence merchants may"
-"\n"
-"               impose limits restricting the set of exchange operators "
-"they are\n"
-"               willing to deal with, for example by imposing a bound on\n"
-"               deposit fees."
+#: merchants.html.j2:154
+msgid "The GNU Taler merchant backend operator tutorial"
 msgstr ""
 
-#: merchants.html.j2:125
-msgid "Manuals for merchants"
+#: merchants.html.j2:157
+msgid "The GNU Taler Web shop integration tutorial (PHP)"
 msgstr ""
 
 #: wallet.html.j2:5
@@ -1044,3 +1080,57 @@ msgstr ""
 #~ msgid "About&nbsp;us"
 #~ msgstr ""
 
+#~ msgid "Stability "
+#~ msgstr ""
+
+#~ msgid "News"
+#~ msgstr ""
+
+#~ msgid "Taler Web payments paper published."
+#~ msgstr ""
+
+#~ msgid "More news »"
+#~ msgstr ""
+
+#~ msgid "Taler technology: About taxability, change and privacy"
+#~ msgstr ""
+
+#~ msgid "1-2017: Taler Documentation pages updated"
+#~ msgstr ""
+
+#~ msgid "Operate a Taler exchange!"
+#~ msgstr ""
+
+#~ msgid "Electronic payments for a liberal society!"
+#~ msgstr ""
+
+#~ msgid "Anonymous"
+#~ msgstr ""
+
+#~ msgid "Electronic"
+#~ msgstr ""
+
+#~ msgid "Reserves"
+#~ msgstr ""
+
+#~ msgid "Advantages for citizens"
+#~ msgstr ""
+
+#~ msgid "Independent One-Click Payment!"
+#~ msgstr ""
+
+#~ msgid "Advantages for merchants"
+#~ msgstr ""
+
+#~ msgid "Advantages for governments"
+#~ msgstr ""
+
+#~ msgid "Invest in GNU Taler!"
+#~ msgstr ""
+
+#~ msgid "Business model"
+#~ msgstr ""
+
+#~ msgid "Taler as seen by the exchange operator"
+#~ msgstr ""
+
diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index c0871ab..e835c16 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-08 06:20+0100\n"
+"POT-Creation-Date: 2017-02-10 15:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language: es\n"
@@ -15,14 +15,14 @@ msgstr ""
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:2 citizens.html.j2:2 developers.html.j2:2
-#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2 news.html.j2:2
+#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2
 #: wallet.html.j2:2
 msgid "en"
 msgstr "es"
 
 #: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
-#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
-#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
+#: governments.html.j2:5 index.html.j2:5 investors.html.j2:5
+#: merchants.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
@@ -126,211 +126,133 @@ msgid "Citizens"
 msgstr "Ciudadanos"
 
 #: citizens.html.j2:14
-msgid "Advantages for citizens"
-msgstr "Ventajas para los ciudadanos"
+msgid "Advantages for Citizens"
+msgstr ""
+
+#: citizens.html.j2:18
+msgid ""
+"Taler largely functions like digital cash.  You\n"
+"\t           withdraw money from your bank account into your\n"
+"\t           electronic wallet, and can henceforth spend digital\n"
+"\t           cash.  The electronic wallet can carry multiple\n"
+"\t           currencies."
+msgstr ""
 
-#: citizens.html.j2:21
+#: citizens.html.j2:30
 msgid "Security"
 msgstr "Seguridad"
 
-#: citizens.html.j2:23
-msgid ""
-"Taler is the electronic equivalent of cash, except harder to fake.\n"
-"             If your digital wallet is lost -- say because\n"
-"             your computer is irreparably damaged or compromised -- only "
-"the amount of coin\n"
-"             stored in your wallet will be lost. Unlike a physical "
-"wallet, you can make\n"
-"             backups of your digital wallet which can provide security "
-"against data loss.\n"
-"             So your digital wallet works mostly just like\n"
-"             a physical wallet, except online and without the need to "
-"manually count coins."
-msgstr ""
-"Taler es el equivalente electrónico del dinero en efectivo, salvo que\n"
-"             es más difícil de falsificar. Si pierdes tu billetera "
-"electrónica -- digamos\n"
-"             que tu computadora se ha dañado de modo irreparable -- sólo "
-"pierdes la cantidad de dinero\n"
-"             que estaba en esa billetera. A diferencia de una billetera "
-"física, puedes hacer\n"
-"             copias de seguridad de tu billetera digital lo que te "
-"garantiza seguridad frente a\n"
-"             la pérdida de datos. Así que tu billetera electrónica "
-"funciona más o menos como una\n"
-"             billetera física, sólo que está conectada y que no necesitas"
-" contar a mano las monedas.\n"
-"          "
-
 #: citizens.html.j2:32
+msgid ""
+"Taler uses modern cryptography, ensuring that there\n"
+"                   is no counterfeit.  Your digital wallet is safer\n"
+"                   than your physical wallet.  At most, you can lose\n"
+"                   its contents because your computer or mobile is\n"
+"                   irreparably damaged or compromised.  Unlike a\n"
+"                   physical wallet, you can make backups to secure\n"
+"                   against data loss."
+msgstr ""
+
+#: citizens.html.j2:42
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: citizens.html.j2:34
+#: citizens.html.j2:44
 msgid ""
-"Your transactions are private, neither the exchange nor merchant needs to"
-"\n"
-"             learn your identity. There is no need to give our credit "
-"card numbers or\n"
-"             other sensitive information, and the merchant will only be "
-"able to do\n"
-"             exactly the transaction you confirmed using your digital "
-"wallet."
-msgstr ""
-"Tus transacciones son privadas, ni el casa de cambio\n"
-"             ni el comerciante necesitan conocer tu identidad. No es "
-"necesario dar\n"
-"             nuestros números de tarjeta de crédito u otra información "
-"sensible,\n"
-"             y el comerciante sólo será capaz de realizar exactamente la "
-"transacción que\n"
-"             confirmaste usando tu billetera electrónica."
+"Your transactions are private, neither the exchange\n"
+"                   nor merchant needs to learn your identity. There is\n"
+"                   no need to give out credit card numbers or other\n"
+"                   sensitive information. The merchant will only be\n"
+"                   able to do exactly the transaction you agreed to."
+msgstr ""
 
-#: citizens.html.j2:42
+#: citizens.html.j2:55
 msgid "Convenience"
 msgstr "Conveniencia"
 
-#: citizens.html.j2:44
+#: citizens.html.j2:57
 msgid ""
-"You will be able to withdraw digital coins to replenish your wallet using"
-"\n"
-"             your credit card or SEPA transactions, similar to how you "
-"pay or withdraw\n"
-"             cash today."
-msgstr ""
-"Podrás retirar billetes digitales para recargar tu billetera usando tu\n"
-"       tarjeta de crédito o transacciones SEPA (transferencias bancarias "
-"europeas),\n"
-"       similar a como pagas o retiras efectivo hoy en día."
-
-#: citizens.html.j2:49
-msgid "Stability "
-msgstr "Estabilidad"
-
-#: citizens.html.j2:51
-msgid ""
-"Coins in your digital wallet will be of the same denomination as the\n"
-"             cash in your physical wallet. So you will not have to worry "
-"about\n"
-"             currency fluctuations or conversion rates. Like a physical "
-"wallet,\n"
-"             you can carry digital coins of different currencies in your "
-"digital\n"
-"             wallet at the same time."
-msgstr ""
-"Las monedas en tu billetera digital serán de la misma denominación\n"
-"       que el efectivo en tu billetera física. Es decir que no deberás "
-"preocuparte\n"
-"       por las fluctuaciones de las monedas o las tasas de conversión.\n"
-"       Como en una billetera física, en tu billetera digital puedes tener"
-" dinero\n"
-"       de diferentes tipos de moneda al mismo tiempo."
-
-#: citizens.html.j2:59
+"You will be able to withdraw money to replenish the\n"
+"                   digital coins in your wallet using your credit card\n"
+"                   or wire transfers.  Afterwards you can pay with\n"
+"                   one-click using the Taler wallet, which optionally\n"
+"                   keeps your transaction history on your computer."
+msgstr ""
+
+#: citizens.html.j2:66
+msgid "Stability"
+msgstr ""
+
+#: citizens.html.j2:68
+msgid ""
+"Coins in your digital wallet will be of the same\n"
+"                   denomination as the cash in your physical wallet.\n"
+"                   Taler is not a crypto-currency, so you do not have\n"
+"                   to worry about cryto-currency related value\n"
+"                   fluctuations.  Banking with Taler is subject to the\n"
+"                   usual government protections for finanical\n"
+"                   services."
+msgstr ""
+
+#: citizens.html.j2:79
 msgid "Taler as seen by customers"
 msgstr "Taler visto por sus clientes"
 
-#: citizens.html.j2:61
+#: citizens.html.j2:81
 msgid ""
 "Customers interact with the Taler system mostly using\n"
-"          a free wallet implementation, which may be an extension or "
-"plugin\n"
-"          to their browser or a custom application on their computer(s).\n"
-"          Typical steps performed by customers are:\n"
-"        "
-msgstr ""
-"Los clientes interactúan con el sistema Taler básicamente\n"
-"          usando una implementación libre de una billetera, que puede ser"
-" una\n"
-"          extensión o plugin en sus navegadores o una aplicación "
-"específica\n"
-"          en su/s computadora/s.\n"
-"          Los pasos típicos que realizan los clientes son:\n"
-"        "
-
-#: citizens.html.j2:70
-msgid ""
-"The customer selects an exchange (i.e. by visiting the\n"
-"              respective website or selecting from a list of exchanges in"
-" the\n"
-"              application) and asks the wallet to create bank transfer\n"
-"              instructions to withdraw a certain amount of electronic "
-"cash.\n"
-"              The bank transfer instructions will contain an\n"
-"              access code that must be included in the subject of the\n"
-"              transaction, as well as the wire details for the exchange "
-"(i.e.\n"
-"              a SEPA account number)."
-msgstr ""
-"El cliente selecciona un casa de cambio (por ejemplo\n"
-"\t\t\tvisitando el sitio correspondiente o seleccionando de una lista de "
-"Casas\n"
-"      de Moneda en la aplicación) y pide que se cree una transferencia "
-"bancaria\n"
-"      para extraer una cierta cantidad de dinero electrónico.\n"
-"      Las instrucciones de la transferencia bancaria contendrán un código"
-" de acceso\n"
-"      que debe incluirse en el objeto de la transacción, como también los"
-" detalles\n"
-"      de la emisión (por ej. un número de cuenta SEPA, o CBU)."
+"                 a free wallet implementation, which may be an\n"
+"                 extension or plugin to their browser or a custom\n"
+"                 application on their computer(s).  Typical steps\n"
+"                 performed by customers are: "
+msgstr ""
 
-#: citizens.html.j2:79
+#: citizens.html.j2:92
+msgid ""
+"The customer selects an exchange (i.e. by\n"
+"                      visiting the respective website or selecting\n"
+"                      from a list of exchanges in the application) and\n"
+"                      asks the wallet to create bank transfer\n"
+"                      instructions to withdraw a certain amount of\n"
+"                      electronic cash.  The bank transfer instructions\n"
+"                      will contain an access code that must be\n"
+"                      included in the subject of the transaction, as\n"
+"                      well as the wire details for the exchange (i.e.\n"
+"                      a SEPA account number)."
+msgstr ""
+
+#: citizens.html.j2:103
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange "
-"using\n"
-"               these instructions provided by the wallet (top left)."
+"                       transfer funds from his account to the Taler\n"
+"                       exchange using these instructions provided by\n"
+"                       the wallet (top left)."
 msgstr ""
-"El cliente entonces solicita a su <b>banco</b> que\n"
-"               transfiera fondos de su cuenta a la casa de cambio Taler\n"
-"               con las instrucciones provistas por la billetera (arriba a"
-" la izquierda)."
 
-#: citizens.html.j2:83
+#: citizens.html.j2:108
 msgid ""
 "Once the funds have arrived, the wallet will\n"
-"               automatically withdraw the electronic coins.  The\n"
-"               customer can use the wallet to review his remaining "
-"balance\n"
-"               at any time. He can also make backups to secure his "
-"digital\n"
-"               coins against hardware failures."
-msgstr ""
-"Una vez recibidos los fondos, la billetera\n"
-"               contendrá automáticamente las monedas electrónicas. El "
-"cliente\n"
-"               puede revisar el balance en su billetera en cualquier "
-"momento.\n"
-"               También puede hacer copias de seguridad de su dinero "
-"electrónico\n"
-"               previendo fallas de hardware."
-
-#: citizens.html.j2:89
+"                       automatically withdraw the electronic coins.\n"
+"                       The customer can use the wallet to review his\n"
+"                       remaining balance at any time. He can also make\n"
+"                       backups to secure his digital coins against\n"
+"                       hardware failures."
+msgstr ""
+
+#: citizens.html.j2:115
 msgid ""
 "When visiting a merchant that supports Taler,\n"
-"               an additional payment option for Taler is enabled in the "
-"checkout system.\n"
-"               If the customer selects payments via Taler, the wallet\n"
-"               displays the secured contract from the merchant and asks\n"
-"               for confirmation.  Taler does not require the customer\n"
-"               to provide any identity information to the merchant.\n"
-"               Transaction histories and digitally\n"
-"               signed contracts can be preserved in the wallet for future"
-"\n"
-"               review by the customer, or even use in court."
+"                       an additional payment option for Taler is\n"
+"                       enabled in the checkout system.  If the\n"
+"                       customer selects payments via Taler, the wallet\n"
+"                       displays the secured contract from the merchant\n"
+"                       and asks for confirmation.  Taler does not\n"
+"                       require the customer to provide any identity\n"
+"                       information to the merchant.  Transaction\n"
+"                       histories and digitally signed contracts can be\n"
+"                       preserved in the wallet for future review by\n"
+"                       the customer, or even use in court."
 msgstr ""
-"Al visitar un comerciante que soporta Taler,\n"
-"               se habilita en el sistema de pago la opción adicional de\n"
-"       pagar con Taler. Si el clente selecciona esta opción, la billetera"
-"\n"
-"       muestra el contrato proveniente del comerciante, y pide\n"
-"       una confirmación. Taler no necesita que el cliente entregue "
-"ninguna\n"
-"       información de identidad al comerciante. El registro de las "
-"transacciones\n"
-"       y los contratos firmados digitalmente pueden preservarse en la\n"
-"       billetera para una revisión posterior del cliente, o incluso ante "
-"la Justicia."
 
 #: developers.html.j2:5
 msgid "Developers"
@@ -347,405 +269,253 @@ msgstr "Libre"
 #: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
-"            protocol. Anybody is welcome to inspect our code and\n"
-"            integrate our reference implementation into their\n"
-"            applications.  Different components of Taler are being\n"
-"            made available under different licenses. The Affero\n"
-"            GPLv3+ is used for the exchange, the LGPLv3+ is used for\n"
-"            reference code demonstrating integration with merchant\n"
-"            platforms, and licenses like Apache/Mozilla/GPLv3+ are\n"
-"            used for wallets and related customer-facing software.\n"
-"            We are open for constructive suggestions for maximizing\n"
-"            the adoption of this libre payment platform.\n"
-"          "
+"                   protocol. Anybody is welcome to inspect our code\n"
+"                   and integrate our reference implementation into\n"
+"                   their applications.  Different components of Taler\n"
+"                   are being made available under different\n"
+"                   licenses. The Affero GPLv3+ is used for the\n"
+"                   exchange, the LGPLv3+ is used for reference code\n"
+"                   demonstrating integration with merchant platforms,\n"
+"                   and licenses like Apache/Mozilla/GPLv3+ are used\n"
+"                   for wallets and related customer-facing software.\n"
+"                   We are open for constructive suggestions for\n"
+"                   maximizing the adoption of this libre payment\n"
+"                   platform.  "
 msgstr ""
-"Taler es software libre que utiliza un\n"
-"            protocolo abierto. Cualquiera que lo desee es bienvenido a\n"
-"            inspeccionar nuestro código e integrar nuestra implementación"
-"\n"
-"            de referencia en sus aplicaciones.  Los diferentes "
-"componentes\n"
-"            de Taler estaán disponibles bajo diferentes licencias. La\n"
-"            licencia Affero GPLv3+ se usa para la casa de cambio, la\n"
-"            licencia LGPLv3+ para el código de referencia demostrando la\n"
-"            integración con las plataformas de comercio, y licencias como"
-"\n"
-"            Apache/Mozilla/GPLv3+ se usan para las billeteras y\n"
-"            aplicaciones de cara al cliente.  Estamos abiertos a recibir\n"
-"            sugerencias constructivas para maximizar la adopción de esta\n"
-"            plataforma de pagos libre.\n"
-"          "
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid "RESTful"
 msgstr " Basado en REST"
 
-#: developers.html.j2:38
+#: developers.html.j2:40
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
-"\t    ensure that Taler payments can work with restrictive\n"
-"\t    network setups, Taler uses a RESTful protocol over HTTP or\n"
-"\t    HTTPS. Taler's security does not depend upon the use of\n"
-"\t    HTTPS, but obviously merchants may choose to offer HTTPS\n"
-"\t    for consistency and because it generally is better for\n"
-"\t    privacy compared to HTTP.  Taler uses JSON to encode\n"
-"\t    structure data, making it easy to integrate Taler with\n"
-"\t    existing Web applications.  Taler's protocol is documented\n"
-"\t    in detail <a href='https://api.taler.net/'>here</a>.\n"
-"          "
-msgstr ""
-"Taler esta diseñado para funcionar en\n"
-"            Internet. Para garantizar que los pagos Taler pueden\n"
-"            funcionar con configuraciones de redes restrictivas, Taler\n"
-"            usa un protocolo REST sobre HTTP o HTTPS. La seguridad de\n"
-"            Taler no depende del uso de HTTPS, aunque obviamente los\n"
-"            comerciantes pueden ofrecer HTTPS para consistencia y\n"
-"            porque es generalmente mejor para la privacidad comparado\n"
-"            con HTTP. Taler usa JSON para codificar datos\n"
-"            estructurados, lo que simplifica integrar Taler con\n"
-"            aplicaciones web existentes.  El protocolo de Taler está\n"
-"            documentado\n"
-"            detalladamente <a href='https://api.taler.net/'>aquí</a>.\n"
-"          "
-
-#: developers.html.j2:53
+"\t           ensure that Taler payments can work with\n"
+"\t           restrictive network setups, Taler uses a RESTful\n"
+"\t           protocol over HTTP or HTTPS. Taler's security does\n"
+"\t           not depend upon the use of HTTPS, but obviously\n"
+"\t           merchants may choose to offer HTTPS for consistency\n"
+"\t           and because it generally is better for privacy\n"
+"\t           compared to HTTP.  Taler uses JSON to encode\n"
+"\t           structure data, making it easy to integrate Taler\n"
+"\t           with existing Web applications.  Taler's protocol\n"
+"\t           is documented in\n"
+"\t           detail <a href='https://api.taler.net/'>here</a>.\n"
+"\t           "
+msgstr ""
+
+#: developers.html.j2:58
 msgid "Code"
 msgstr "Código"
 
-#: developers.html.j2:55
+#: developers.html.j2:60
 msgid ""
 "Taler is currently primarily developed by a\n"
-"\t    research team at Inria and TU Munich. However,\n"
-"\t    contributions from anyone are welcome.  Our Git\n"
-"\t    repositories can be cloned using the Git and HTTP access\n"
-"\t    methods against <tt>git.taler.net</tt> with the name of\n"
-"\t    the respective repository. A list of public repositories\n"
-"\t    can be found in\n"
-"\t    our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
+"\t           research team at Inria and GNUnet e.V. However,\n"
+"\t           contributions from anyone are welcome.  Our Git\n"
+"\t           repositories can be cloned using the Git and HTTP\n"
+"\t           access methods against <tt>git.taler.net</tt> with\n"
+"\t           the name of the respective repository. A list of\n"
+"\t           public repositories can be found in\n"
+"\t           our <a href='https://git.taler.net/'>GitWeb</a>.\n"
+"\t           "
 msgstr ""
-"Taler se desarrolla principalmente por un\n"
-"\t    equipo de investigación en Inria y TU Munich. Sin embargo,\n"
-"\t    las contribuciones de cualquiera son bienvenidas.\n"
-"\t    Nuestros repositorios Git se pueden clonar usando los\n"
-"\t    métodos de acceso Git y HTTP en <tt>git.taler.net</tt> con\n"
-"\t    el nombre del repositorio respectivo. La lista de\n"
-"\t    repositorios públicos puede verse\n"
-"\t    en <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
 
-#: developers.html.j2:66
+#: developers.html.j2:72
 msgid "Documentation"
 msgstr "Documentación"
 
-#: developers.html.j2:68
+#: developers.html.j2:74
 msgid ""
 "In addition to this website,\n"
-"            the <a href='https://git.taler.net/'>documented\n"
-"            code</a> and the <a href='https://api.taler.net/'>API\n"
-"            documentation</a>, we are in the process of preparing a\n"
-"            comprehensive design document which will be published here\n"
-"            soon.\n"
-"          "
+"                   the <a href='https://git.taler.net/'>documented\n"
+"                   code</a> and\n"
+"                   the <a href='https://api.taler.net/'>API\n"
+"                   documentation</a>, we are in the process of\n"
+"                   preparing a comprehensive design document which\n"
+"                   will be published here soon.  "
 msgstr ""
-"Además de este sitio,\n"
-"            la <a href='https://git.taler.net/'>documentación en el\n"
-"            código</a> y\n"
-"            la <a href='https://api.taler.net/'>documentación de la\n"
-"            API</a>, estamos en proceso de elaborar documentación de\n"
-"            diseño detallada, que será publicada aquí\n"
-"            próximamente.\n"
-"          "
 
-#: developers.html.j2:77
+#: developers.html.j2:83
 msgid "Discussion"
 msgstr "Debates"
 
-#: developers.html.j2:79
+#: developers.html.j2:85
 msgid ""
 "We have a mailinglist for developer discussions.\n"
-"            You can subscribe to it or read the list archive at\n"
-"            <a "
+"                   You can subscribe to it or read the list archive at\n"
+"                   <a "
 
"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgstr ""
-"Tenemos una lista de correos para debates de desarrolladores.\n"
-"            Puedes suscribirte o leer el archivo de la lista en\n"
-"            <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:87
+#: developers.html.j2:93
 msgid "Regression Testing"
 msgstr "Pruebas de regresión"
 
-#: developers.html.j2:89
+#: developers.html.j2:95
 msgid ""
-"We\n"
-"            have <a href='https://buildbot.net/'>Buildbot</a>\n"
-"            automation tests to detect regressions and check for\n"
-"            portability at\n"
+"We have\n"
+"                   <a href='https://buildbot.net/'>Buildbot</a>\n"
+"                   automation tests to detect regressions and check\n"
+"                   for portability at\n"
 "            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>."
 "\n"
 "          "
 msgstr ""
-"Tenemos test automatizados\n"
-"            con <a href='https://buildbot.net/'>Buildbot</a> para\n"
-"            detectar regresiones y chequeos de portabilidad en\n"
-"            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>."
-"\n"
-"          "
 
-#: developers.html.j2:97
+#: developers.html.j2:103
 msgid "Code Coverage Analysis"
 msgstr "Análisis de cobertura de código"
 
-#: developers.html.j2:99
+#: developers.html.j2:105
 msgid ""
-"We\n"
-"            use <a "
+"We use\n"
+"                   <a "
 "href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-"            to analyze the code coverage of our tests, the results are\n"
-"            available\n"
-"            at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
+"                   to analyze the code coverage of our tests, the\n"
+"                   results are available\n"
+"                   at <a "
+"href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
+"                   "
 msgstr ""
-"Usamos <a href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-"            para analizar la cobertura del código de nuestros tests,\n"
-"            los resultados están disponibles en\n"
-"            <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
 
-#: developers.html.j2:107
+#: developers.html.j2:113
 msgid "Performance Analysis"
 msgstr "Performance"
 
-#: developers.html.j2:109
+#: developers.html.j2:115
 msgid ""
 "We\n"
-"            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
-"            performance regression analysis of the exchange backend\n"
-"            at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
+"                   use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
+"                   for performance regression analysis of the exchange\n"
+"                   backend\n"
+"                   at <a "
+"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
+"                   "
 msgstr ""
-"Usamos <a href='https://gnunet.org/gauger'>Gauger</a>\n"
-"            para análisis de regresión del rendimiento del sistema\n"
-"            backend (casa de cambio) en\n"
-"            <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
 
-#: developers.html.j2:118
+#: developers.html.j2:125
 msgid "Taler system overview"
 msgstr "Diagrama general del sistema Taler"
 
-#: developers.html.j2:120
+#: developers.html.j2:127
 msgid ""
-"The Taler system consists of protocols executed\n"
-"          among a number of actors with the help\n"
-"          of <a href='https://www.fsf.org/'>Free Software</a> as\n"
-"          illustrated in the illustration on the right.  Typical\n"
-"          transactions involve the following steps:\n"
-"        "
+"The Taler system consists of protocols executed among\n"
+"                 a number of actors with the help\n"
+"                 of <a href='https://www.fsf.org/'>Free Software</a>\n"
+"                 as illustrated in the illustration on the right.\n"
+"                 Typical transactions involve the following steps: "
 msgstr ""
-"El sistema Taler consta de protocolos entre varios actores con la ayuda "
-"de\n"
-"          <a href='https://www.fsf.org/'>Software Libre</a> como se ve\n"
-"          en la figura de la derecha.  Las transacciones típicas\n"
-"          consisten de los siguientes pasos:\n"
-"        "
 
-#: developers.html.j2:129
+#: developers.html.j2:136
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange\n"
-"               (top left).  In the subject of the transaction, he\n"
-"               includes an authentication token from his\n"
-"               electronic <b>wallet</b>. In Taler terminology, the\n"
-"               customer creates a reserve at the exchange.\n"
-"             "
-msgstr ""
-"El cliente instruye a su <b>banco</b> a\n"
-"               transferir fondos de su cuenta a la casa de cambio\n"
-"               Taler (arriba a la izquierda). En la referencia de la\n"
-"               transacción incluye un token de autenticación de\n"
-"               su <b>billetera</b> electrónica. En la terminología\n"
-"               Taler, el cliente crea una reserva en la casa de\n"
-"               cambio.\n"
-"             "
-
-#: developers.html.j2:137
-msgid ""
-"Once the exchange has received the\n"
-"               transfer, it allows the customer's electronic wallet\n"
-"               to <b>withdraw</b> electronic coins.  The electronic\n"
-"               coins are digital representations of the original\n"
-"               currency from the transfer. It is important to note\n"
-"               that the exchange does not learn the &quot;serial "
-"numbers&quot;\n"
-"               of the coins created in this process, so it cannot tell\n"
-"               later which customer purchased what at which merchant.\n"
-"               The use of Taler does not change the currency or the\n"
-"               total value of the funds (except for fees which the\n"
-"               exchange may charge for the service).\n"
-"             "
-msgstr ""
-"Una vez que la casa de cambio ha recibido\n"
-"               la transferencia, permite que la billetera del\n"
-"               cliente <b>retire</b> monedas electrónicas.  Las\n"
-"               modedas electrónicas son representaciones digitales de\n"
-"               la moneda original de la transferencia. Es importante\n"
-"               destacar que la casa de cambio no registra los "
-"&quot;números\n"
-"               de serie&quot; de los billetes creados en este proceso, "
-"por\n"
-"               lo que no puede decir luego qué cliente compró qué cosa\n"
-"               a qué comerciante.  El uso de Taler no cambia la cambio\n"
-"               ni el valor total de los fondos (excepto por tasas de\n"
-"               cambio que la casa de cambio pueda cobrar por este\n"
-"               servicio).\n"
-"             "
-
-#: developers.html.j2:150
-msgid ""
-"Once the customer has the digital coins in\n"
-"               his wallet, the wallet can be used to <b>spend</b> the\n"
-"               coins with merchant portals that support the Taler\n"
-"               payment system and accept the respective exchange as a\n"
-"               business partner (bottom arrow). This creates a digital\n"
-"               contract signed by the customer's coins and the\n"
-"               merchant.  If necessary, the customer can later use\n"
-"               this digitally signed contract in a court of law to\n"
-"               prove the exact terms of the contract and that he paid\n"
-"               the respective amount. The customer does not learn the\n"
-"               banking details of the merchant, and Taler does not\n"
-"               require the merchant to learn the identity of the\n"
-"               customer. Naturally, the customer can spend any\n"
-"               fraction of his digital coins (the system takes care of\n"
-"               customers getting change).\n"
-"             "
-msgstr ""
-"Una vez que el cliente tiene las monedas\n"
-"               digitales en su billetera, puede usarla\n"
-"               para <b>gastar</b> esas monedas con portales de\n"
-"               comerciantes que acepten el sistema de pagos Taler y\n"
-"               acepten a la casa de cambio referida como partner\n"
-"               (flecha de abajo). Esto crea un contrato digital\n"
-"               firmado por las monedas del cliente y el comerciante.\n"
-"               De ser necesario, los clientes pueden llegar a usar\n"
-"               este contrato firmado digitalmente ante la Justicia\n"
-"               para probar los términos exactos del contrato y que se\n"
-"               pagó la cantidad especificada. El cliente no dispone de\n"
-"               los datos bancarios del comerciante, y Taler no\n"
-"               requiere que el comerciante sepa la identidad del\n"
-"               cliente. Naturalmente, el cliente puede gastar\n"
-"               cualquier fracción de sus monedas digitales (el sistema\n"
-"               se ocupa del proceso de obtener cambio).\n"
-"             "
-
-#: developers.html.j2:167
+"                       transfer funds from his account to the Taler\n"
+"                       exchange (top left).  In the subject of the\n"
+"                       transaction, he includes an authentication\n"
+"                       token from his electronic <b>wallet</b>. In\n"
+"                       Taler terminology, the customer creates a\n"
+"                       reserve at the exchange.  "
+msgstr ""
+
+#: developers.html.j2:144
+msgid ""
+"Once the exchange has received the wire\n"
+"                       transfer, it allows the customer's electronic\n"
+"                       wallet to <b>withdraw</b> electronic coins.\n"
+"                       The electronic coins are digital\n"
+"                       representations of the original currency from\n"
+"                       the transfer. It is important to note that the\n"
+"                       exchange does not learn the &quot;serial\n"
+"                       numbers&quot; of the coins created in this\n"
+"                       process, so it cannot tell later which customer\n"
+"                       purchased what at which merchant.  The use of\n"
+"                       Taler does not change the currency or the total\n"
+"                       value of the funds (except for fees which the\n"
+"                       exchange may charge for the service).  "
+msgstr ""
+
+#: developers.html.j2:159
+msgid ""
+"Once the customer has the digital coins in his\n"
+"                       wallet, the wallet can be used to <b>spend</b>\n"
+"                       the coins with merchant portals that support\n"
+"                       the Taler payment system and accept the\n"
+"                       respective exchange as a business partner\n"
+"                       (bottom arrow). This creates a digital contract\n"
+"                       signed by the customer's coins and the\n"
+"                       merchant.  If necessary, the customer can later\n"
+"                       use this digitally signed contract in a court\n"
+"                       of law to prove the exact terms of the contract\n"
+"                       and that he paid the respective amount. The\n"
+"                       customer does not learn the banking details of\n"
+"                       the merchant, and Taler does not require the\n"
+"                       merchant to learn the identity of the\n"
+"                       customer. Naturally, the customer can spend any\n"
+"                       fraction of his digital coins (the system takes\n"
+"                       care of customers getting change).  "
+msgstr ""
+
+#: developers.html.j2:177
 msgid ""
 "Merchants receiving digital\n"
-"               coins <b>deposit</b> the respective receipts that\n"
-"               resulted from the contract signing with the customer at\n"
-"               the exchange to redeem the coins.  The deposit step\n"
-"               does not reveal the details of the contract between the\n"
-"               customer and the merchant or the identity of the\n"
-"               customer to the exchange in any way. However, the\n"
-"               exchange does learn the identity of the merchant via\n"
-"               the provided bank routing information.  The merchant\n"
-"               can, for example when compelled by the state for\n"
-"               taxation, provide information linking the individual\n"
-"               deposit to the respective contract signed by the\n"
-"               customer. Thus, the exchange's database allows the\n"
-"               state to enforce that merchants pay applicable taxes\n"
-"               (and do not engage in illegal contracts).\n"
-"             "
-msgstr ""
-"Los comerciantes que reciben monedas electrónicas\n"
-"               <b>depositan</b> los recibos respectivos resultantes de\n"
-"               los contratos firmados con el cliente en la casa de\n"
-"               cambio para canjear las monedas.  Al realizar el\n"
-"               depósito no se revelan los detalles del contrato entre\n"
-"               el cliente y la casa de cambio, de ninguna manera. Sin\n"
-"               embargo, la casa de cambio sí conoce la identidad del\n"
-"               comerciante a través de la información provista de\n"
-"               ruteo al banco. El comerciante, por ejemplo cuando es\n"
-"               requerido por el Estado para pagar impuestos, puede\n"
-"               proveer información individual del respectivo contrato\n"
-"               firmado por el cliente.  Así, la base de datos de la\n"
-"               casa de cambio permite al Estado la imposición a los\n"
-"               comerciantes de las tasas que corresponda aplicar (y\n"
-"               revisar que los contratos no sean ilegales).\n"
-"             "
-
-#: developers.html.j2:184
+"                       coins <b>deposit</b> the respective receipts\n"
+"                       that resulted from the contract signing with\n"
+"                       the customer at the exchange to redeem the\n"
+"                       coins.  The deposit step does not reveal the\n"
+"                       details of the contract between the customer\n"
+"                       and the merchant or the identity of the\n"
+"                       customer to the exchange in any way. However,\n"
+"                       the exchange does learn the identity of the\n"
+"                       merchant via the provided bank routing\n"
+"                       information.  The merchant can, for example\n"
+"                       when compelled by the state for taxation,\n"
+"                       provide information linking the individual\n"
+"                       deposit to the respective contract signed by\n"
+"                       the customer. Thus, the exchange's database\n"
+"                       allows the state to enforce that merchants pay\n"
+"                       applicable taxes (and do not engage in illegal\n"
+"                       contracts).  "
+msgstr ""
+
+#: developers.html.j2:196
 msgid ""
 "Finally, the exchange transfers funds\n"
-"               corresponding to the digital coins redeemed by the\n"
-"               merchants to the merchant's <b>bank</b> account. The\n"
-"               exchange may combine multiple small transactions into\n"
-"               one larger bank transfer.  The merchant can query the\n"
-"               exchange about the relationship between the bank\n"
-"               transfers and the individual claims that were\n"
-"               deposited.\n"
-"             "
-msgstr ""
-"Por último, la casa de cambio transfiere\n"
-"               los fondos correspondientes a las monedas digitales\n"
-"               canjeadas por el comerciante a la cuenta\n"
-"               de <b>banco</b> del comerciante.  La casa de cambio\n"
-"               puede combinar múltiples transacciones pequeñas en una\n"
-"               transferencia de banco más grande. El comerciante puede\n"
-"               solicitarle a la casa de cambio la relación entre la\n"
-"               transferencia bancaria y los operaciones individuales\n"
-"               que se depositaron.\n"
-"             "
-
-#: developers.html.j2:194
+"                       corresponding to the digital coins redeemed by\n"
+"                       the merchants to the merchant's <b>bank</b>\n"
+"                       account. The exchange may combine multiple\n"
+"                       small transactions into one larger bank\n"
+"                       transfer.  The merchant can query the exchange\n"
+"                       about the relationship between the bank\n"
+"                       transfers and the individual claims that were\n"
+"                       deposited.  "
+msgstr ""
+
+#: developers.html.j2:206
 msgid ""
 "Most importantly, the exchange keeps\n"
-"               cryptographic proofs that allow it to demonstrate that\n"
-"               it is operating correctly to third parties.  The system\n"
-"               requires an external <b>auditor</b>, such as a\n"
-"               government-appointed financial regulatory body, to\n"
-"               frequently verify the exchange's databases and check that\n"
-"               its bank balance matches the total value of the\n"
-"               remaining coins in circulation.\n"
-"             "
-msgstr ""
-"Lo más importante es que la casa de cambio\n"
-"               mantiene pruebas criptográficas que permiten demostrar\n"
-"               a terceros que opera correctamente.  El sistema\n"
-"               requiere un <b>auditor</b> externo, como una entidad de\n"
-"               regulación financiera avalada por el gobierno, para\n"
-"               verificar fecuentemente las bases de datos de la casa\n"
-"               de cambio y chequear que su balance bancario coincide\n"
-"               con el valor total de las monedas que hay en\n"
-"               circulación.\n"
-"             "
-
-#: developers.html.j2:204
+"                       cryptographic proofs that allow it to\n"
+"                       demonstrate that it is operating correctly to\n"
+"                       third parties.  The system requires an\n"
+"                       external <b>auditor</b>, such as a\n"
+"                       government-appointed financial regulatory body,\n"
+"                       to frequently verify the exchange's databases\n"
+"                       and check that its bank balance matches the\n"
+"                       total value of the remaining coins in\n"
+"                       circulation.  "
+msgstr ""
+
+#: developers.html.j2:217
 msgid ""
 "Without the auditor, the exchange operators\n"
-"               could embezzle funds they are holding in\n"
-"               reserve. Customers and merchants cannot cheat each\n"
-"               other or the exchange. If any party's computers are\n"
-"               compromised, the financial damage is limited to the\n"
-"               respective party and proportional to the funds they\n"
-"               have in circulation during the period of the\n"
-"               compromise.\n"
-"             "
-msgstr ""
-"Sin el auditor, los operadores de la casa\n"
-"               de cambio podrían robar los fondos que mantienen en las\n"
-"               reservas. Los clientes y comerciantes no pueden\n"
-"               engañarse uno a otro, o a la casa de cambio. Si el\n"
-"               ordenador de una de las partes se viera comprometido,\n"
-"               el daño financiero se limita a la parte respectiva y\n"
-"               proporcional a los fondos que tienen en circulación\n"
-"               durante el período del inconveniente.\n"
-"             "
-
-#: financial-news.html.j2:5 financial-news.html.j2:14
-msgid "Financial News"
+"                       could embezzle funds they are holding in\n"
+"                       reserve. Customers and merchants cannot cheat\n"
+"                       each other or the exchange. If any party's\n"
+"                       computers are compromised, the financial damage\n"
+"                       is limited to the respective party and\n"
+"                       proportional to the funds they have in\n"
+"                       circulation during the period of the\n"
+"                       compromise.  "
 msgstr ""
 
 #: governments.html.j2:5
@@ -753,801 +523,564 @@ msgid "Governments"
 msgstr "Gobiernos"
 
 #: governments.html.j2:14
-msgid "Advantages for governments"
-msgstr "Ventajas para los gobiernos"
+msgid "Advantages for Governments"
+msgstr ""
 
-#: governments.html.j2:21 index.html.j2:25
+#: governments.html.j2:18
+msgid ""
+"Taler provides accountability to ensure business\n"
+"                   accepting payments operate legally, while also\n"
+"                   respecting civil liberties of citizens spending\n"
+"                   digital cash.  Taler is a commons, a payment system\n"
+"                   based on open standards and free software.  Taler\n"
+"                   needs governments to set a financial framework and\n"
+"                   to act as trusted regulators.  Taler contributes to\n"
+"                   digital sovereignty in the critial financial\n"
+"                   infrastructure."
+msgstr ""
+
+#: governments.html.j2:34
 msgid "Taxable"
 msgstr "Imponible"
 
-#: governments.html.j2:23
-msgid ""
-"Taler is an electronic payment system that was built with the goal of "
-"supporting taxation.\n"
-"             With Taler, the receiver of any form of payment is known, "
-"and the payment information comes\n"
-"             attached with some details about what the payment was made "
-"for (but not the identity of the customer).  Thus, governments can use "
-"this\n"
-"             data to tax buisnesses and individuals based on their "
-"income, making tax evasion and\n"
-"             black markets less viable."
-msgstr ""
-"Taler es un sistema de pago electrónico construido con el objetivo de dar"
-" soporte impositivo.\n"
-"       Con Taler, el receptor de cualquier forma de pago es conocido, y "
-"la información del pago viene adjunta\n"
-"       con algunos detalles respecto a cómo fue hecho el pago (pero sin "
-"la identidad del cliente). De este modo,\n"
-"       los gobiernos pueden usar estos datos para cobrar impuestos a "
-"empresas e individuos en base a sus ingresos,\n"
-"       haciendo que la evasión impositiva y los mercados negros sean "
-"menos viables."
-
-#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
+#: governments.html.j2:36
+msgid ""
+"Taler was\n"
+"\t           built with the goal of fighting corruption and supporting "
+"taxation.  \n"
+"\t           With Taler, the receiver of any form of payment is\n"
+"\t           easily identified by the government, and the merchant\n"
+"                   can be compelled to provide the contract that was "
+"accepted\n"
+"                   by the customer.  Governments can use this data to\n"
+"\t           tax businesses and individuals based on their\n"
+"\t           income, making tax evasion and black markets less\n"
+"\t           viable."
+msgstr ""
+
+#: governments.html.j2:46
+msgid ""
+"Thus, despite offering anonymity for citizens\n"
+"                   spending digital cash to buy goods and services,\n"
+"                   Taler also ensures that the state can observe\n"
+"                   incoming funds. This can be used to ensure\n"
+"                   businesses engage only in legal activities, and do\n"
+"                   not evade income tax, sales tax or value-added tax.\n"
+"                   However, this observational capability does not\n"
+"                   extend to the immediate personal domain.  In\n"
+"                   particular, sharing access to funds within a family\n"
+"                   or synchronizing wallets across multiple devices is "
+"not\n"
+"                   subject to monitoring."
+msgstr ""
+
+#: governments.html.j2:59 merchants.html.j2:43
 msgid "Secure"
 msgstr "Seguro"
 
-#: governments.html.j2:32
-msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, "
-"merchants and\n"
-"             the exchange can mathematically demonstrate their lawful "
-"behavior in court in case\n"
-"             of disputes. Financial damages are strictly limited, "
-"improving economic security\n"
-"             for individuals, merchants, the exchange and the state.  "
-"Most importantly, an\n"
-"             independent auditor can ensure that there is no &quot;bad "
-"exchange&quot;\n"
-"             within the Taler system who might threaten the economy due "
-"to fraud."
-msgstr ""
-"Los pagos Taler están asegurados criptográficamente. Así, los clientes, "
-"comerciantes y la casa\n"
-"       de cambio pueden demostrar matemáticamente su comportamiento legal"
-" en la Justicia en caso de disputas.\n"
-"       Los daños financieros están estrictamente limitados, mejorando la "
-"seguridad económica para individuos,\n"
-"       comerciantes, la casa de cambio y el Estado. Lo más importante, un"
-" auditor independiente puede asegurar\n"
-"       que no hay &quot;mala casa de cambio&quot; dentro del sistema "
-"Taler, que pueda amenazar la economía\n"
-"       debido al fraude."
-
-#: governments.html.j2:42 index.html.j2:39
+#: governments.html.j2:61
+msgid ""
+"Taler's payments are cryptographically\n"
+"                   secured. Thus, customers, merchants and the\n"
+"                   exchange can mathematically demonstrate their\n"
+"                   lawful behavior in court in case of\n"
+"                   disputes. Financial damages are strictly limited,\n"
+"                   improving economic security for individuals,\n"
+"                   merchants, the exchange and the state."
+msgstr ""
+
+#: governments.html.j2:69
+msgid ""
+"By design, the Taler payment service provider is\n"
+"                   subject to financial regulation. Financial\n"
+"                   regulation and regular audits are critical to\n"
+"                   establish trust. In particular, the Taler design\n"
+"                   mandates the existence of an independent auditor\n"
+"                   who checks cryptographic proofs that accumulate at\n"
+"                   the payment service provider to ensure that the\n"
+"                   escrow account is managed honestly.  This ensures\n"
+"                   that the payment service provider does not threaten\n"
+"                   the economy due to fraud."
+msgstr ""
+
+#: governments.html.j2:80
 msgid "Libre"
 msgstr "Libre"
 
-#: governments.html.j2:44
+#: governments.html.j2:82
 msgid ""
-"Taler is free software implementing an open protocol standard.  Thus, "
-"Taler will\n"
-"             enable competition and avoid the monopolization of payment "
-"systems that threatens\n"
-"             global political and financial stability today."
+"Taler is free software implementing an open\n"
+"                   protocol standard.  Thus, Taler will enable\n"
+"                   competition and avoid the monopolization of payment\n"
+"                   systems that threatens global political and\n"
+"                   financial stability today."
 msgstr ""
-"Taler es software libre implementando un protocolo abierto estándar. Así,"
-" Taler habilitará la\n"
-"       competencia y evitará la monopolización de los sistemas de pago "
-"que amenaza la estabilidad política y\n"
-"       financiera global hoy día."
 
-#: governments.html.j2:49 investors.html.j2:18
+#: governments.html.j2:91
 msgid "Efficient"
 msgstr "Eficiente"
 
-#: governments.html.j2:51
+#: governments.html.j2:93
 msgid ""
-"Taler is designed to be efficient.  Unlike timeline-based payment systems"
-" like\n"
-"             BitCoin, Taler will not threaten the availability of "
-"national electric grids or\n"
-"             (significantly) contribute to environmental pollution."
+"Taler has an efficient design.  Unlike\n"
+"                   timeline-based payment systems, such as BitCoin,\n"
+"                   Taler will not threaten the availability of\n"
+"                   national electric grids or (significantly)\n"
+"                   contribute to environmental pollution."
 msgstr ""
-"Taler se diseñó para ser eficiente. A diferencia de los sistemas de pago "
-"basados en una línea\n"
-"       de tiempo como BitCoin, Taler no amenaza la disponibilidad de las "
-"redes eléctricas nacionales ni\n"
-"       contribuye (significativamente) a la contaminación ambiental."
 
-#: governments.html.j2:57
+#: governments.html.j2:102
 msgid "Taler as seen by governments"
 msgstr "Taler desde el punto de vista del gobierno"
 
-#: governments.html.j2:59
-msgid ""
-"Governments can observe traditional wire\n"
-"          transfers entering and leaving the Taler system, and\n"
-"          require merchants and exchange operators to provide certain\n"
-"          information during financial audits.  Exchange operators\n"
-"          are expected to be permanently checked by auditors,\n"
-"          while merchants may be required to reveal information\n"
-"          during regular tax audits.\n"
-"          Information available to the government includes:\n"
-"        "
-msgstr ""
-"Los gobiernos pueden observar las transferencias bancarias tradicionales\n"
-"          entrando y saliendo del sistema Taler, y requerir que los "
-"comerciantes y operadores\n"
-"          de casas de cambio presenten cierta información durante las "
-"auditorías financieras.\n"
-"          Los operadores de casa de cambio deberían ser continuamente "
-"auditados, mientras que\n"
-"          se puede requerir a los comerciantes que revelen información "
-"durante las auditorías\n"
-"          impositivas regulares.\n"
-"          La información disponible para el gobierno incluye:\n"
-"        "
-
-#: governments.html.j2:71
-msgid ""
-"From the banking system:\n"
-"              The total amount of digital currency\n"
-"              obtained by a customer. The government could impose\n"
-"              limits on how many digital coins a customer may\n"
-"              withdraw within a given timeframe."
-msgstr ""
-"Del sistema bancario:\n"
-"       El monto total de dinero digital obtenido por un cliente. El "
-"gobierno podría imponer\n"
-"       límites a la cantidad de dinero digital que un cliente puede "
-"retirar en un periodo determinado."
-
-#: governments.html.j2:77
-msgid ""
-"From the banking system:\n"
-"               The total amount of income received\n"
-"               by any merchant via the Taler system."
-msgstr ""
-"Del sistema bancario:\n"
-"               El monto total de ingresos recibidos por cualquier "
-"comerciante\n"
-"               a través del sistema Taler."
-
-#: governments.html.j2:81
-msgid ""
-"From auditing the exchange:\n"
-"               The amounts of digital coins legitimately withdrawn by\n"
-"               customers from the exchange, the value of non-redeemed "
-"digital coins\n"
-"               in customer's wallets, the value and corresponding wire "
-"details\n"
-"               of deposit operations performed by merchants with the "
-"exchange, and\n"
-"               the income of the exchange from transaction fees."
-msgstr ""
-" Al auditar la casa de cambio:\n"
-"               La cantidad de monedas digitales emitidas legítimamente "
-"por los clientes,\n"
-"       el valor de las monedas digitales no canjeadas en las billeteras "
-"de los clientes,\n"
-"       el valor y los correspondientes detalles de las operaciones de "
-"depósitos realizadas\n"
-"       por los comerciantes con la casa de cambio, y el ingreso de la "
-"casa de cambio por\n"
-"       las tasas de transacción realizadas."
-
-#: governments.html.j2:88
-msgid ""
-"From auditing merchants:\n"
-"               For each deposit operation, the exact details of the\n"
-"               underlying contract that was signed between\n"
-"               customer and merchant.  However, this information would\n"
-"               typically not include the identity of the customer.\n"
-"               Note that while the customer can decide to prove that it "
-"was his\n"
-"               transaction (i.e. in court when suing the merchant if the\n"
-"               merchant failed to deliver on the contract),\n"
-"               merchant, exchange and government cannot find out the "
-"customer's\n"
-"               identity from the information that Taler collects."
-msgstr ""
-"Al auditar a los comerciantes:\n"
-"               Por cada operación de depósito, los detalles exactos de "
-"cada contrato\n"
-"       respectivamente firmado entre cliente y comerciante. Sin embargo "
-"esta información\n"
-"       no incluiría la identidad del cliente. Nótese que mientras el "
-"cliente puede\n"
-"       decidir probar que fue suya una transacción (por ej. frente a la "
-"Justicia\n"
-"       reclamando al comerciante si hubiera un problema en el producto o "
-"servicio\n"
-"       acordado en el contrato), ni el comerciante, ni la casa de cambio "
-"ni el gobierno\n"
-"       pueden descubrir la identidad del cliente a partir de la "
-"información que\n"
-"       recolecta Taler."
+#: governments.html.j2:104
+msgid ""
+"Governments can observe traditional wire transfers\n"
+"                 entering and leaving the Taler system, and require\n"
+"                 merchants and exchange operators to provide certain\n"
+"                 information during financial audits.  Exchange\n"
+"                 operators are expected to be permanently checked by\n"
+"                 auditors, while merchants may be required to reveal\n"
+"                 information during regular tax audits.  Information\n"
+"                 available to the government includes: "
+msgstr ""
+
+#: governments.html.j2:117
+msgid ""
+"From the banking system: The total amount of\n"
+"  \t              digital currency obtained by a customer. The\n"
+"  \t              government could impose limits on how many\n"
+"  \t              digital coins a customer may withdraw within a\n"
+"  \t              given timeframe."
+msgstr ""
+
+#: governments.html.j2:123
+msgid ""
+"From the banking system: The total amount of\n"
+"                       income received by any merchant via the Taler\n"
+"                       system."
+msgstr ""
+
+#: governments.html.j2:127
+msgid ""
+"From auditing the exchange: The amounts of\n"
+"                       digital coins legitimately withdrawn by\n"
+"                       customers from the exchange, the value of\n"
+"                       non-redeemed digital coins in customer's\n"
+"                       wallets, the value and corresponding wire\n"
+"                       details of deposit operations performed by\n"
+"                       merchants with the exchange, and the income of\n"
+"                       the exchange from transaction fees."
+msgstr ""
+
+#: governments.html.j2:136
+msgid ""
+"From auditing merchants: For each deposit\n"
+"                      operation, the exact details of the underlying\n"
+"                      contract that was signed between customer and\n"
+"                      merchant.  However, this information would\n"
+"                      typically not include the identity of the\n"
+"                      customer.  Note that while the customer can\n"
+"                      decide to prove that it was his transaction\n"
+"                      (i.e. in court when suing the merchant if the\n"
+"                      merchant failed to deliver on the contract),\n"
+"                      merchant, exchange and government cannot find\n"
+"                      out the customer's identity from the information\n"
+"                      that Taler collects."
+msgstr ""
+
+#: index.html.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr ""
 
 #: index.html.j2:17
-msgid "Electronic payments for a liberal society!"
-msgstr "¡Pagos electrónicos para una sociedad libre!"
+msgid "Independent One-Click Payments!"
+msgstr ""
 
-#: index.html.j2:18
+#: index.html.j2:19
 msgid ""
-"Taler is a new electronic payment system under development\n"
-"\t   at <a href=\"http://www.inria.fr/\";>Inria</a>.  Today, this website "
-"only\n"
-"\t    presents the advantages our system is expected to provide.  We "
-"expect to\n"
-"\t    make the payment system operational in 2017."
+"Taler is an electronic payment system under\n"
+"\t          development\n"
+"\t          at <a href=\"http://www.inria.fr/\";>Inria</a>.  This\n"
+"\t          community Web site provides extensive documentation\n"
+"\t          about the system, which we expect to make\n"
+"\t          operational in 2017."
+msgstr ""
+
+#: index.html.j2:29
+msgid "<b>T</b>axable"
 msgstr ""
 
-#: index.html.j2:26
+#: index.html.j2:31
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
-"\t     governments can learn their citizen's total income and thus "
-"collect\n"
-"\t     sales, value-added or income taxes. Taler is thus a currency for "
-"the\n"
-"\t     mainstream economy, and not the black market."
-msgstr ""
-"A diferencia de BitCoin o los pagos en efectivo, Taler garantiza que\n"
-"\t     los gobiernos puedan revisar los ingresos de sus ciudadanos y así "
-"recaudar\n"
-"\t     impuestos a las ventas, al valor agregado o a los ingresos brutos."
-" Taler es\n"
-"\t     por lo tanto una moneda para la economía oficial y no para el "
-"mercado negro."
-
-#: index.html.j2:32
-msgid "Anonymous"
-msgstr "Anónimo"
-
-#: index.html.j2:33
-msgid ""
-"When you pay with Taler, your identity does not have to\n"
-"\t     be revealed to the merchant. The bank, government and exchange "
-"will also\n"
-"\t     never learn how you spent your electronic money. However, you can\n"
-"\t     prove that you paid in court if necessary."
-msgstr ""
-"Al pagar con Taler, no es necesario revelar tu identidad\n"
-"\t     al comerciante. El banco, el gobierno o la casa de cambio nunca "
-"sabrán en\n"
-"\t     qué gastas tu dinero electrónico. Sin embargo puedes probar que "
-"pagaste,\n"
-"\t     ante la Justicia, si fuera necesario."
-
-#: index.html.j2:40
-msgid ""
-"Taler is free software from <a href=\"http://www.gnu.org/\";>the GNU "
-"project</a> implementing an open protocol.\n"
-"\t     Anybody is welcome to inspect our code and integrate our reference"
-"\n"
-"\t     implementation into their applications."
+"\t           governments can learn their citizen's total income\n"
+"\t           and thus collect sales, value-added or income\n"
+"\t           taxes. Taler is a currency for the mainstream\n"
+"\t           economy, and not the black market."
 msgstr ""
 
-#: index.html.j2:47
-msgid "Electronic"
-msgstr "Electrónico"
+#: index.html.j2:39
+msgid "<b>A</b>nonymous"
+msgstr ""
 
-#: index.html.j2:48
+#: index.html.j2:41
 msgid ""
-"Taler is designed to work on the Internet. Using a\n"
-"\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
-"\t    integrate with existing Web applications."
+"When you pay with Taler, your identity does not\n"
+"\t           have to be revealed to the merchant. Just like\n"
+"\t           payments in cash, nobody else can track how you\n"
+"\t           spent your electronic money. However, you obtain a\n"
+"\t           legally valid proof of payment."
 msgstr ""
-"Taler se diseñó para funcionar sobre Internet. Usando un protocolo "
-"RESTful\n"
-"\t    sobre HTTP o HTTPS, Taler es fácil de integrar con las aplicaciones"
-" web existentes."
 
-#: index.html.j2:53
-msgid "Reserves"
-msgstr "Reservas"
+#: index.html.j2:49
+msgid "<b>L</b>ibre"
+msgstr ""
 
-#: index.html.j2:54
+#: index.html.j2:51
 msgid ""
-"Taler uses an electronic exchange holding financial\n"
-"             reserves in existing currencies. This means that Taler is "
-"not\n"
-"\t     a new currency with the inherent currency fluctuation risks, but\n"
-"\t     instead the cryptographic coins correspond to existing currencies,"
-" such as\n"
-"\t     US Dollars, Euros or even BitCoins."
+"Taler is free software\n"
+"\t           from <a href=\"http://www.gnu.org/\";>the GNU\n"
+"\t           project</a> implementing an open protocol.  Anybody\n"
+"\t           is welcome to inspect our code and integrate our\n"
+"\t           reference implementation into their applications."
 msgstr ""
-"Taler incluye una casa de cambio electrónica conteniendo las reservas "
-"financieras en\n"
-"             monedas existentes. Es decir que Taler no es una nueva "
-"moneda con los riesgos inherentes\n"
-"\t     de fluctuación, sino que las monedas criptográficas se "
-"corresponden con otras monedas\n"
-"\t     existentes hoy en día, como dólares, euros o incluso bitcoins."
 
-#: index.html.j2:61 news.html.j2:5 news.html.j2:14
-msgid "News"
+#: index.html.j2:62
+msgid "<b>E</b>lectronic"
 msgstr ""
 
-#: index.html.j2:62
-msgid "Taler Web payments paper published."
-msgstr "Taler 0.0.0."
-
-#: index.html.j2:63
-msgid "More news »"
-msgstr "Ver más »"
-
-#: index.html.j2:67
-msgid "Taler technology: About taxability, change and privacy"
-msgstr "La tecnología Taler: soporte impositivo, dar cambio y privacidad"
-
-#: index.html.j2:68
-msgid ""
-"One of the key goals of Taler is to provide anonymity for\n"
-"           citizens buying goods and services, while ensuring that the "
-"state can\n"
-"           observe incoming transactions to ensure businesses engage only"
-" in\n"
-"           legal activities and do not evade taxes (such as income tax,\n"
-"           sales tax or value-added tax).  However, we also want to stay\n"
-"           out of the immediate personal domain, so sharing funds within "
-"a\n"
-"           family or copying coins between devices should not be subject "
-"to\n"
-"           monitoring by the state.\n"
-"         "
-msgstr ""
-"Uno de los principales objectivos de Taler es proveer anonimato\n"
-"           a los ciudadanos que compren bienes y servicio, mientras se "
-"garantiza que el\n"
-"           Estado observa las transacciones de ingreso para asegurar que "
-"se refieren a\n"
-"           actividades lícitas y no evaden impuestos (como impuesto a los"
-" ingresos brutos,\n"
-"           a las ventas o al valor agregado).  Sin embargo también "
-"queremos extender el\n"
-"           dominio personal inmediato, de modo que se puedan compartir "
-"fondos dentro\n"
-"           de una familia o copiar monedas entre dispositivos sin que sea"
-" necesaria\n"
-"           una revisión estatal.\n"
-"         "
-
-#: index.html.j2:77
-msgid ""
-"As a result, Taler does not intrude into the\n"
-"           personal economic domain, offers good privacy, taxability\n"
-"           for transactions and the ability to give change.\n"
-"         "
-msgstr ""
-"Por lo tanto, Taler no se inmiscuye en el dominio económico\n"
-"           personal, ofrece buena privacidad, la posibilidad de "
-"recaudación impositiva\n"
-"           para transacciones y la capacidad de dar cambio.\n"
-"         "
+#: index.html.j2:64
+msgid ""
+"Taler is easy to integrate with existing Web\n"
+"\t           applications. Payments are cryptographically\n"
+"\t           secured and are confirmed within milliseconds with\n"
+"\t           extremely low transaction costs."
+msgstr ""
+
+#: index.html.j2:71
+msgid "<b>R</b>eserves"
+msgstr ""
+
+#: index.html.j2:73
+msgid ""
+"Taler does not introduce a new currency with\n"
+"\t           fluctuation risks, and instead uses a digital\n"
+"\t           wallet holding coins in reserve. Taler's\n"
+"\t           cryptographic coins correspond to existing\n"
+"\t           currencies, such as US Dollars, Euros or even\n"
+"\t           BitCoins."
+msgstr ""
+
+#: index.html.j2:82
+msgid "Latest Videos"
+msgstr ""
+
+#: index.html.j2:83
+msgid "Florian Dold talks about Taler at 50p!"
+msgstr ""
+
+#: index.html.j2:93
+msgid "Taler News"
+msgstr ""
+
+#: index.html.j2:97
+msgid "Financial News"
+msgstr ""
 
 #: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
 #: investors.html.j2:14
-msgid "Operate a Taler exchange!"
-msgstr "¡Opere una Casa de Cambio Taler!"
-
-#: investors.html.j2:20
-msgid ""
-"Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
-"             EdDSA) and is thus expected to be able to handle large "
-"transaction\n"
-"             volumes, only limited by the input/output capabilities of "
-"the\n"
-"             database. Thus, running a Taler exchange should be "
-"profitable even\n"
-"             with very low (less than 1 cent) transaction fees (at "
-"appropriate\n"
-"             transaction volume)."
-msgstr ""
-"Taler usa primitivas criptográficas eficientes (como RSA 2048 y\n"
-"             EdDSA) y de este modo es capaz de manejar grandes volumenes "
-"de transacciones,\n"
-"             sólo limitados por la capacidad de entrada/salida de la base"
-" de datos.\n"
-"             Así, operar una casa de cambio Taler debría ser rentable aún"
-" con tasas de transacción\n"
-"             muy bajas (menores a 1 centavo, con volúmenes de transacción"
-" apropiados)."
-
-#: investors.html.j2:30
-msgid ""
-"All transactions in Taler are secured using modern cryptography and\n"
-"             trust in all parties is minimized. Financial damage is "
-"bounded\n"
-"             (for customers, merchants and the exchange) even\n"
-"             in the case that systems are compromised and private keys "
-"are stolen.\n"
-"             Databases can be audited for consistency, resulting in "
-"either the\n"
-"             detection of compromised systems or the demonstration that\n"
-"             participants were honest."
-msgstr ""
-"Todas las transacciones en Taler están segurizadas usando criptografía "
-"moderna\n"
-"             por lo que la confianza necesaria entre todas las partes se "
-"minimiza. El daño financiero\n"
-"             se limita (para clientes, comerciantes y casas de cambio) "
-"aún en casos en lo que los sistemas\n"
-"             sean atacados y se roben las claves privadas.\n"
-"             Las bases de datos pueden auditarse por consistencia, "
-"resultando ya sea en la detección de los\n"
-"             sistemas comprometidos o en la demostración de que los "
-"participantes actuaron honestamente."
+msgid "Invest in Taler!"
+msgstr ""
+
+#: investors.html.j2:16
+msgid ""
+"We have created a company, Taler Systems SA in \n"
+"                   Luxemburgh.<br>\n"
+"                   Please contact <tt>address@hidden</tt>\n"
+"                   if you want to invest in Taler."
+msgstr ""
+
+#: investors.html.j2:24
+msgid "The Team"
+msgstr ""
+
+#: investors.html.j2:26
+msgid ""
+"Our team combines world-class business leaders,\n"
+"                   cryptographers, software engineers, civil-rights\n"
+"                   activits and academics. We are unified by a vision\n"
+"                   of how payments should work and the goal of\n"
+"                   imposing this vision upon the world."
+msgstr ""
+
+#: investors.html.j2:32
+msgid ""
+"We are currently supported by Inria, the French\n"
+"                   national institute for research in informatics and\n"
+"                   automation, and the Renewable Freedom Foundation."
+msgstr ""
+
+#: investors.html.j2:37
+msgid "The Technology"
+msgstr ""
 
 #: investors.html.j2:39
-msgid "Business model"
-msgstr "Modelo de negocios"
-
-#: investors.html.j2:41
-msgid ""
-"The basic business model for Taler is the operation of an exchange.  An "
-"exchange converts money from traditional payment systems (Mastercard,\n"
-"             SEPA, Visa, BitCoin, ACH, SWIFT, etc.) to anonymous "
-"electronic\n"
-"             coins in the same currency. The customer can then redeem the"
-" electronic\n"
-"             coins at a merchant, who can exchange them for money "
-"represented using\n"
-"             traditional payment systems at the exchange.  The exchange "
-"can then charge\n"
-"             fees (to the customer, merchant or both) to facilitate the "
-"transactions."
-msgstr ""
-"El modelo de negocios básico para Taler consiste en la operación de una "
-"casa de cambio. La casa de cambio convierte dinero de los sistemas de "
-"pagos tradicionales\n"
-"             (Mastercard, SEPA, Visa, BitCoin, ACH, SWIFT, etc.) a "
-"monedas electrónicas\n"
-"             anónimas en el mismo tipo de divisa. El cliente puede "
-"entonces canjear las monedas electrónicas\n"
-"             con un comerciante, el cual los cambiará por dinero mediante"
-" los sistemas tradicionales\n"
-"             de pago en la casa de cambio. La casa de cambio puede cobrar"
-" por este servicio\n"
-"             (al cliente, al comerciante o a ambos) para facilitar las "
-"transacciones."
-
-#: investors.html.j2:50
-msgid "Taler as seen by the exchange operator"
-msgstr "Taler desde el punto de vista del operador de casa de cambio"
-
-#: investors.html.j2:52
-msgid ""
-"The exchange operator primarily operates a Web service\n"
-"          portal and keeps databases with transaction details and\n"
-"          cryptographic proofs.  Its operational expenses are thus "
-"related to\n"
-"          its interactions with the banking system and the operation of\n"
-"          the computing infrastructure, while its income is based on\n"
-"          transaction fees it may charge for the various interactions.\n"
-"          Key interactions of the exchange include:\n"
-"        "
-msgstr ""
-"El operador de casa de cambio opera fundamentalmente un portal de\n"
-"          servicios web y mantiene bases de datos con detalles de las "
-"transacciones y\n"
-"          pruebas criptográficas. Sus gastos operativos se originan en "
-"las\n"
-"          interacciones con el sistema bancario y la infrastructura "
-"informática,\n"
-"          mientras que sus ingresos se basan en tasas de servicio por "
-"transacción\n"
-"          que pueden cobrar de sus varias interacciones.\n"
-"          Las interacciones principales de la casa de cambio incluyen:\n"
-"        "
-
-#: investors.html.j2:64
 msgid ""
-"Create a <b>reserve</b> based on an incoming\n"
-"              wire transfer from a customer."
-msgstr "Crear <b>reservas</b> basadas en un giro o transferencia desde un 
cliente."
+"All transactions in Taler are secured using modern\n"
+"                   cryptography and trust in all parties is\n"
+"                   minimized. Financial damage is bounded (for\n"
+"                   customers, merchants and the exchange) even in the\n"
+"                   case that systems are compromised and private keys\n"
+"                   are stolen.  Databases can be audited for\n"
+"                   consistency, resulting in either the detection of\n"
+"                   compromised systems or the demonstration that\n"
+"                   participants were honest. Actual transaction costs\n"
+"                   are fractions of a cent."
+msgstr ""
+
+#: investors.html.j2:51
+msgid "The Business"
+msgstr ""
+
+#: investors.html.j2:53
+msgid ""
+"The scalable business model for Taler is the operation\n"
+"                   of the payment service provider, which converts money "
+"from\n"
+"                   traditional payment systems (Mastercard, SEPA,\n"
+"                   Visa, BitCoin, ACH, SWIFT, etc.) to anonymous\n"
+"                   electronic coins in the same currency. The customer\n"
+"                   can then redeem the electronic coins at a merchant,\n"
+"                   who can exchange them for money represented using\n"
+"                   traditional payment systems at the exchange.  The\n"
+"                   exchange charges fees (to the customer,\n"
+"                   merchant or both) to facilitate the transactions."
+msgstr ""
 
 #: investors.html.j2:67
+msgid "Taler as seen by the payment service operator"
+msgstr ""
+
+#: investors.html.j2:69
+msgid ""
+"The payment service operator runs a <em>Taler\n"
+"                 exchange</em>, which is a Web service portal that\n"
+"                 keeps databases with transaction details and\n"
+"                 cryptographic proofs.  Its operational expenses are\n"
+"                 thus related to its interactions with the banking\n"
+"                 system and the operation of the computing\n"
+"                 infrastructure, while its income is based on\n"
+"                 transaction fees it may charge for the various\n"
+"                 interactions.  Key interactions of the exchange\n"
+"                 include: "
+msgstr ""
+
+#: investors.html.j2:83
+msgid ""
+"Create a <b>reserve</b> based on an incoming\n"
+"                      wire transfer from a customer."
+msgstr ""
+
+#: investors.html.j2:86
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
-"               digital coins from their reserve."
+"                      digital coins from their reserve."
 msgstr ""
-"Permitir a los clientes retirar (y obtener nuevas) monedas electrónicas "
-"de sus reservas."
 
-#: investors.html.j2:70
+#: investors.html.j2:89
 msgid "Accept and validate deposits from merchants."
 msgstr "Aceptar y validar depósitos de los comerciantes."
 
-#: investors.html.j2:72
+#: investors.html.j2:91
 msgid ""
 "Execute wire transfers to merchants in\n"
-"               response to validated deposits."
+"                      response to validated deposits."
 msgstr ""
-"Realizar transferencias a los comerciantes en respuesta a sus depósitos "
-"validados."
 
-#: investors.html.j2:75
+#: investors.html.j2:94
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
-"               correct operation for audits by financial regulators."
+"                      correct operation for audits by financial "
+"regulators."
 msgstr ""
-"Preservar y proveer pruebas criptográficas de su correcta operación para\n"
-"            ser auditados por reguladores financieros."
 
 #: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Comerciantes"
 
 #: merchants.html.j2:14
-msgid "Advantages for merchants"
-msgstr "Ventajas para comerciantes"
+msgid "Advantages for Merchants"
+msgstr ""
+
+#: merchants.html.j2:17
+msgid ""
+"Taler is a cost-effective electronic payment system\n"
+"\t           which provides you with cryptographic proof that\n"
+"\t           the payment worked correctly within milliseconds.\n"
+"\t           Your Web customers pay with previously unknown\n"
+"\t           levels of convenience without risk of fraud."
+msgstr ""
 
-#: merchants.html.j2:18
+#: merchants.html.j2:28
 msgid "Fast"
 msgstr "Rápido"
 
-#: merchants.html.j2:20
-msgid ""
-"Processing transactions with Taler is fast, allowing you\n"
-"\t     to confirm the transaction with your customer virtually "
-"immediately.\n"
-"\t     Your customers will appreciate that they do not have to type in "
-"credit\n"
-"\t     card information and play the &quot;verified by&quot; game.  By "
-"making payments\n"
-"\t     significantly more convenient for your customers, you may be able "
-"to\n"
-"\t     use Taler for small transactions that would not work with credit "
-"card\n"
-"\t     payments due to the mental overhead for customers."
-msgstr ""
-"Procesar transacciones con Taler es rápido, permitiendo confirmar la "
-"transacción\n"
-"             con el cliente inmediatamente. Sus clientes valorarán que no"
-" necesitan ingresar información\n"
-"             de sus tarjetas de crédito y jugar al juego de "
-"&quot;Verificado por&quot;.\n"
-"             Al hacer los pagos más fáciles para sus clientes, podrá usar"
-" Taler\n"
-"             para pequeñas transacciones que no se concretarían con "
-"tarjetas de crédito\n"
-"             debido a la complicación que representaría para los clientes."
-
-#: merchants.html.j2:31
-msgid ""
-"You never learn sensitive customer information. You need\n"
-"\t     to ensure that your website provides the correct account "
-"information\n"
-"\t     for your business, and that you correctly validate the payment\n"
-"\t     confirmations from the Taler exchange.  As a result, you will have"
-"\n"
-"\t     cryptographic proof of payment for the specific contracts you "
-"entered\n"
-"\t     with your customers, and cryptographically signed confirmations "
-"from\n"
-"\t     the Taler exchange about the deposits. Taler does not require you "
-"to\n"
-"\t     undergo any particular security audits, processes or procedures, "
-"as\n"
-"\t     you never handle sensitive customer information.  Your systems "
-"will\n"
-"\t     have cryptographically signed contracts which you can use in court"
-" in\n"
-"\t     case of disputes."
-msgstr ""
-"Ud. nunca verá información sensible del cliente. Sólo debe asegurarse\n"
-"             que su sitio web provee la información correcta de cuentas "
-"para su negocio, y que\n"
-"             valida correctamente las confirmaciones de pago de la casa "
-"de cambio Taler con la que opere.\n"
-"             Como conrapartida, tendrá una prueba criptográfica de los "
-"pagos recibidos por los contratos\n"
-"             que Ud. acordó con sus clientes, confirmados mediante firma "
-"digital de la casa de cambio\n"
-"             Taler respecto de sus depósitos. Taler no necesita que Ud. "
-"realize auditorías\n"
-"             de seguridad o procedimientos específicos, y nunca deberá "
-"manejar datos sensibles de sus clientes.\n"
-"             Sus sistemas tendrán contratos firmados digitalmente que Ud."
-" puede usar en la Justicia en caso de\n"
-"             disputas."
-
-#: merchants.html.j2:44
+#: merchants.html.j2:30
+msgid ""
+"Processing transactions with Taler is fast,\n"
+"\t           allowing you to confirm the transaction with your\n"
+"\t           customer virtually immediately.  Your customers\n"
+"\t           will appreciate that they do not have to type in\n"
+"\t           credit card information and play the &quot;verified\n"
+"\t           by&quot; game.  By making payments significantly\n"
+"\t           more convenient for your customers, you may be able\n"
+"\t           to use Taler for small transactions that would not\n"
+"\t           work with credit card payments due to the mental\n"
+"\t           overhead for customers."
+msgstr ""
+
+#: merchants.html.j2:45
+msgid ""
+"You will have cryptographic proof of payment from\n"
+"\t           the Taler payment service provider. Taler does not\n"
+"\t           require you to undergo any particular security\n"
+"\t           audits (such as PCI DSS), processes or procedures,\n"
+"\t           as you never handle sensitive customer account\n"
+"\t           information.  Your systems will have customer\n"
+"\t           contracts wih qualified signatures for all\n"
+"\t           transactions which you can use in court in case of\n"
+"\t           disputes."
+msgstr ""
+
+#: merchants.html.j2:57
 msgid "Free Software"
 msgstr "Software Libre"
 
-#: merchants.html.j2:46
+#: merchants.html.j2:59
 msgid ""
 "Taler is free software, and you can use the\n"
-"\t     liberally-licensed reference code as a starting point to integrate"
-"\n"
-"\t     Taler into your services. To use Taler, you do not need to pay "
-"license\n"
-"\t     fees, and the free software development model will ensure that you"
-" can\n"
-"\t     select from many competent developers to help you with your\n"
-"\t     integration."
-msgstr ""
-"Taler es software libre, y puedes usar el código de referencia con "
-"licencia\n"
-"             libre como punto de partida para integrar Taler en tus "
-"servicios.\n"
-"             Para usar Taler, no se necesita pagar gastos de licencia y "
-"el modelo de desarrollo\n"
-"             del software libre garantiza el poder seleccionar muchos "
-"programadores competentes\n"
-"             que ayuden con su integración."
-
-#: merchants.html.j2:56
+"\t           liberally-licensed reference code as a starting\n"
+"\t           point to integrate Taler into your services. To use\n"
+"\t           Taler, you do not need to pay license fees, and the\n"
+"\t           free software development model will ensure that\n"
+"\t           you can select from many competent integrators for\n"
+"\t           support."
+msgstr ""
+
+#: merchants.html.j2:71
 msgid "Low Fees"
 msgstr "Bajo costo"
 
-#: merchants.html.j2:58
-msgid ""
-"Taler is designed to minimize the work the exchange needs to\n"
-"\t     perform.  Combined with Taler's strong security which prevents "
-"fraud,\n"
-"\t     exchanges can operate with very low overhead and thus low "
-"transaction\n"
-"\t     fees.  Given Taler's free software exchange reference "
-"implementation,\n"
-"\t     competition among exchanges will ensure fair, low transaction fees"
-" for\n"
-"\t     merchants."
-msgstr ""
-"Taler esta diseñado para minimizar el trabajo de la Casa de Moneda.\n"
-"             Combinado con la fuerte seguridad de Taler que previene el "
-"fraude, las casas de moneda\n"
-"             pueden operar con costos muy bajos y por lo tanto con bajas "
-"tasas de servicio.\n"
-"             Puesto que se implementa la casa de moneda de Taler con "
-"software libre,\n"
-"             seguramente se estimulará la competencia entre casas de "
-"moneda para ofrecer\n"
-"             bajos cargos por el servicio a los comerciantes."
-
-#: merchants.html.j2:66
+#: merchants.html.j2:73
+msgid ""
+"Taler is designed to minimize the work the exchange\n"
+"\t           needs to perform.  Combined with Taler's strong\n"
+"\t           security which prevents fraud, payment service\n"
+"\t           providers can operate with very low overhead and\n"
+"\t           thus low transaction fees."
+msgstr ""
+
+#: merchants.html.j2:81
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:68
+#: merchants.html.j2:83
 msgid ""
-"Taler can be used for different currencies (such as Euros\n"
-"\t     or US Dollars) and different payment models limited only by what "
-"the\n"
-"\t     exchange supports in its interactions."
+"Taler can be used for different currencies (such as\n"
+"\t           Euros, US Dollars or BitCoins) and different\n"
+"\t           payment models limited only by what the payment\n"
+"\t           service provider supports in its interactions."
 msgstr ""
-"Taler se puede usar con diferentes monedas (como Euros o Dólares) y\n"
-"             diferentes modelos de pago sólo limitado por las "
-"interacciones a las que dé soporte\n"
-"             la casa de moneda elegida."
 
-#: merchants.html.j2:73
+#: merchants.html.j2:91
 msgid "Ethical"
 msgstr "Ético"
 
-#: merchants.html.j2:75
+#: merchants.html.j2:93
 msgid ""
-"Taler does not support tax evasion or money laundering, and is\n"
-"             also not a pyramid scheme or speculative investment.  "
-"Taler's\n"
-"             protocols are efficient and do not waste energy. Taler "
-"encourages\n"
-"             competition by providing an open standard and free software\n"
-"             reference implementations."
+"Taler prevents tax evasion and money laundering.\n"
+"                   Taler's protocols are efficient and do not waste\n"
+"                   energy. Taler encourages transparency by providing\n"
+"                   an open standard and free software reference\n"
+"                   implementations."
 msgstr ""
-"Taler no da soporte a la evasión de impuestos o el lavado de dinero, y "
-"tampoco\n"
-"             promueve un sistema piramidal o de inversión especulativa. "
-"Los protocolos de Taler\n"
-"             son eficientes y no derrochan energía. Taler fomenta la "
-"competencia proveyendo\n"
-"             un estándar abierto e implementaciones de software libre."
 
-#: merchants.html.j2:83
+#: merchants.html.j2:102
 msgid "Taler as seen by merchants"
 msgstr "Taler desde el punto de vista del comerciante"
 
-#: merchants.html.j2:85
+#: merchants.html.j2:104
 msgid ""
-"Merchants supporting the Taler system need to integrate\n"
-"          some relatively simple logic into their transaction processing\n"
-"          system.\n"
-"          Typical steps performed by the merchant system are:\n"
-"        "
+"Merchants supporting the Taler system need to\n"
+"                 integrate some relatively simple logic into their\n"
+"                 transaction processing system.  Typical steps\n"
+"                 performed by the merchant system are: "
 msgstr ""
-"Los comerciantes que trabajen con el sistema Taler necesitan integrar\n"
-"          cierta lógica relativamente simple en su sistema de "
-"procesamiento de transacciones.\n"
-"          Los pasos típicos que realiza el comerciante son:\n"
-"        "
 
-#: merchants.html.j2:94
+#: merchants.html.j2:113
 msgid ""
 "The new logic detects when a customer's system\n"
-"              supports Taler and then needs to send a cryptographically "
-"signed\n"
-"              version of the proposed contract in a simple JSON format to"
-"\n"
-"              the customer.\n"
-"              The message also includes salted, hashed wire details for\n"
-"              the merchant, as well as restrictions as to which exchange "
-"operators\n"
-"              the merchant is willing to deal with."
-msgstr ""
-"La nueva lógica detecta que el sistema de un cliente soporta Taler\n"
-"              y necesita enviarle una versión firmadaa digitalmente del "
-"contrato propuesto\n"
-"              al cliente en un simple formato JSON.\n"
-"              El mensaje incluye también detalles de la cuenta bancaria "
-"del comerciante,\n"
-"              junto a las restricciones con las que opera la casa de "
-"moneda con la que\n"
-"              desea operar el comerciante."
+"                      supports Taler and then needs to send a\n"
+"                      cryptographically signed version of the proposed\n"
+"                      contract in a simple JSON format to the\n"
+"                      customer.  The message also includes salted,\n"
+"                      hashed wire details for the merchant, as well as\n"
+"                      restrictions as to which exchange operators the\n"
+"                      merchant is willing to deal with."
+msgstr ""
 
-#: merchants.html.j2:102
+#: merchants.html.j2:122
 msgid ""
-"The customer sends a signed response which states\n"
-"               that certain digital coins now belong to the merchant to "
-"both\n"
-"               signal acceptance of the deal as well as to pay the "
-"respective\n"
-"               amount (bottom)."
+"The customer sends a signed response which\n"
+"                      states that certain digital coins now belong to\n"
+"                      the merchant to both signal acceptance of the\n"
+"                      deal as well as to pay the respective amount\n"
+"                      (bottom)."
 msgstr ""
-"El cliente envía una respuesta firmada que establece\n"
-"               que ciertas monedas electrónicas ahora pertenecen al "
-"comerciante\n"
-"               como señal de aceptación del acuerdo y que sirven asimismo"
-" de\n"
-"               pago por el monto respectivo (abajo)."
 
-#: merchants.html.j2:107
+#: merchants.html.j2:128
 msgid ""
 "The merchant then forwards the signed messages\n"
-"               received from the customer to the exchange, together with "
-"its\n"
-"               wire details and the salt (without hashing).  The exchange"
-" verifies\n"
-"               the details and sends a signed confirmation (or an error\n"
-"               message) to the merchant.  The merchant checks that the\n"
-"               exchange's signature is valid, sends a confirmation to the"
-"\n"
-"               customer and executes the contract-specific business logic."
-msgstr ""
-"El comerciante entonces reenvía los mensajes firmados del cliente\n"
-"               a la casa de moneda, junto al identificador de transacción"
-" (sin encriptar).\n"
-"               La casa de moneda verifica los detalles y responde al "
-"comerciante con una\n"
-"               confirmación firmada (o un mensaje de error).\n"
-"               El comerciante revisa la validez de la firma de la casa de"
-" moneda y a su vez\n"
-"               envía confirmación al cliente y ejecuta la lógica de "
-"negocio específica del contrato."
-
-#: merchants.html.j2:115
-msgid ""
-"The exchange performs wire transfers corresponding to\n"
-"               the claims deposited by the merchant. Note that the "
-"exchange may\n"
-"               charge fees for the deposit operation, hence merchants may"
-"\n"
-"               impose limits restricting the set of exchange operators "
-"they are\n"
-"               willing to deal with, for example by imposing a bound on\n"
-"               deposit fees."
-msgstr ""
-"La casa de moneda realiza las transferenciaas bancarias\n"
-"               correspondientes a las solicitudes depositadas por el "
-"comerciante.\n"
-"               Nótese que la casa de moneda puede cobrar comisiones por "
-"la operación de\n"
-"               depósito, por eso los comerciantes pueden imponer límites "
-"a los posibles\n"
-"               operadores de casa de moneda con los que desean operar, "
-"por ejemplo definiendo\n"
-"               un límite máximo a las comisiones por depósito."
-
-#: merchants.html.j2:125
+"                       received from the customer to the exchange,\n"
+"                       together with its wire details and the salt\n"
+"                       (without hashing).  The exchange verifies the\n"
+"                       details and sends a signed confirmation (or an\n"
+"                       error message) to the merchant.  The merchant\n"
+"                       checks that the exchange's signature is valid,\n"
+"                       sends a confirmation to the customer and\n"
+"                       executes the contract-specific business\n"
+"                       logic."
+msgstr ""
+
+#: merchants.html.j2:139
+msgid ""
+"The exchange performs wire transfers\n"
+"                       corresponding to the claims deposited by the\n"
+"                       merchant. Note that the exchange may charge\n"
+"                       fees for the deposit operation, hence merchants\n"
+"                       may impose limits restricting the set of\n"
+"                       exchange operators they are willing to deal\n"
+"                       with, for example by imposing a bound on\n"
+"                       deposit fees."
+msgstr ""
+
+#: merchants.html.j2:151
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
 
+#: merchants.html.j2:154
+msgid "The GNU Taler merchant backend operator tutorial"
+msgstr ""
+
+#: merchants.html.j2:157
+msgid "The GNU Taler Web shop integration tutorial (PHP)"
+msgstr ""
+
 #: wallet.html.j2:5
 msgid "Wallet"
 msgstr ""
@@ -1567,3 +1100,57 @@ msgstr ""
 #~ msgid "About&nbsp;us"
 #~ msgstr "Quiénes somos"
 
+#~ msgid "Stability "
+#~ msgstr "Estabilidad"
+
+#~ msgid "News"
+#~ msgstr ""
+
+#~ msgid "Taler Web payments paper published."
+#~ msgstr "Taler 0.0.0."
+
+#~ msgid "More news »"
+#~ msgstr "Ver más »"
+
+#~ msgid "Taler technology: About taxability, change and privacy"
+#~ msgstr "La tecnología Taler: soporte impositivo, dar cambio y privacidad"
+
+#~ msgid "1-2017: Taler Documentation pages updated"
+#~ msgstr ""
+
+#~ msgid "Operate a Taler exchange!"
+#~ msgstr "¡Opere una Casa de Cambio Taler!"
+
+#~ msgid "Electronic payments for a liberal society!"
+#~ msgstr "¡Pagos electrónicos para una sociedad libre!"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anónimo"
+
+#~ msgid "Electronic"
+#~ msgstr "Electrónico"
+
+#~ msgid "Reserves"
+#~ msgstr "Reservas"
+
+#~ msgid "Advantages for citizens"
+#~ msgstr "Ventajas para los ciudadanos"
+
+#~ msgid "Independent One-Click Payment!"
+#~ msgstr ""
+
+#~ msgid "Advantages for merchants"
+#~ msgstr "Ventajas para comerciantes"
+
+#~ msgid "Advantages for governments"
+#~ msgstr "Ventajas para los gobiernos"
+
+#~ msgid "Invest in GNU Taler!"
+#~ msgstr ""
+
+#~ msgid "Business model"
+#~ msgstr "Modelo de negocios"
+
+#~ msgid "Taler as seen by the exchange operator"
+#~ msgstr "Taler desde el punto de vista del operador de casa de cambio"
+
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index a0a04ed..682a21b 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-08 06:20+0100\n"
+"POT-Creation-Date: 2017-02-10 15:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language: fr\n"
@@ -15,14 +15,14 @@ msgstr ""
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:2 citizens.html.j2:2 developers.html.j2:2
-#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2 news.html.j2:2
+#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2
 #: wallet.html.j2:2
 msgid "en"
 msgstr "fr"
 
 #: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
-#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
-#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
+#: governments.html.j2:5 index.html.j2:5 investors.html.j2:5
+#: merchants.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
@@ -124,212 +124,133 @@ msgid "Citizens"
 msgstr "Citoyens"
 
 #: citizens.html.j2:14
-msgid "Advantages for citizens"
-msgstr "Avantages pour les citoyens"
+msgid "Advantages for Citizens"
+msgstr ""
+
+#: citizens.html.j2:18
+msgid ""
+"Taler largely functions like digital cash.  You\n"
+"\t           withdraw money from your bank account into your\n"
+"\t           electronic wallet, and can henceforth spend digital\n"
+"\t           cash.  The electronic wallet can carry multiple\n"
+"\t           currencies."
+msgstr ""
 
-#: citizens.html.j2:21
+#: citizens.html.j2:30
 msgid "Security"
 msgstr "Sécurité"
 
-#: citizens.html.j2:23
-msgid ""
-"Taler is the electronic equivalent of cash, except harder to fake.\n"
-"             If your digital wallet is lost -- say because\n"
-"             your computer is irreparably damaged or compromised -- only "
-"the amount of coin\n"
-"             stored in your wallet will be lost. Unlike a physical "
-"wallet, you can make\n"
-"             backups of your digital wallet which can provide security "
-"against data loss.\n"
-"             So your digital wallet works mostly just like\n"
-"             a physical wallet, except online and without the need to "
-"manually count coins."
-msgstr ""
-"Taler est l’équivalent  électronique de la monnaie, sauf\n"
-"\t     qu’il est plus difficile de le falsifier. Si vous  perdez votre\n"
-"\t     portefeuille électronique -- parce que votre ordinateur est\n"
-"\t     totalement HS ou en panne -- seul le  montant de la monnaie "
-"stockée\n"
-"\t     dans votre portefeuille sera perdu. Contrairement  à un "
-"portefeuille\n"
-"\t     classique, vous pouvez faire des mises à jour de votre  "
-"portefeuille\n"
-"             numérique qui sécurise contre la perte de données. Donc "
-"votre\n"
-"             portefeuille numérique fonctionne comme un portefeuille "
-"classique, mais en\n"
-"             ligne et sans avoir à compter manuellement votre monnaie. "
-
 #: citizens.html.j2:32
+msgid ""
+"Taler uses modern cryptography, ensuring that there\n"
+"                   is no counterfeit.  Your digital wallet is safer\n"
+"                   than your physical wallet.  At most, you can lose\n"
+"                   its contents because your computer or mobile is\n"
+"                   irreparably damaged or compromised.  Unlike a\n"
+"                   physical wallet, you can make backups to secure\n"
+"                   against data loss."
+msgstr ""
+
+#: citizens.html.j2:42
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: citizens.html.j2:34
+#: citizens.html.j2:44
 msgid ""
-"Your transactions are private, neither the exchange nor merchant needs to"
-"\n"
-"             learn your identity. There is no need to give our credit "
-"card numbers or\n"
-"             other sensitive information, and the merchant will only be "
-"able to do\n"
-"             exactly the transaction you confirmed using your digital "
-"wallet."
-msgstr ""
-"Vos transactions sont privées, ni la bureau de change, ni les\n"
-"\t     commerçants n'ont besoin de connaitre votre identité. Vous n'avez "
-"pas\n"
-"\t     besoin de communiquer votre numéro de carte de crédit ou tout "
-"autre\n"
-"\t     information sensible, et le commerçant ne pourra qu'effectuer la\n"
-"\t     transaction que vous aurez confirmée en utilisant votre "
-"portefeuille\n"
-"\t     numérique."
+"Your transactions are private, neither the exchange\n"
+"                   nor merchant needs to learn your identity. There is\n"
+"                   no need to give out credit card numbers or other\n"
+"                   sensitive information. The merchant will only be\n"
+"                   able to do exactly the transaction you agreed to."
+msgstr ""
 
-#: citizens.html.j2:42
+#: citizens.html.j2:55
 msgid "Convenience"
 msgstr "Avantage"
 
-#: citizens.html.j2:44
+#: citizens.html.j2:57
 msgid ""
-"You will be able to withdraw digital coins to replenish your wallet using"
-"\n"
-"             your credit card or SEPA transactions, similar to how you "
-"pay or withdraw\n"
-"             cash today."
-msgstr ""
-"Vous pourrez retirer de la monnaie numérique pour\n"
-"\t     recharger votre portefeuille en utilisant votre carte de crédit ou"
-" des\n"
-"\t     transactions SEPA, de la même manière que vous payez ou retirer du"
-"\n"
-"\t     liquide aujourd'hui."
-
-#: citizens.html.j2:49
-msgid "Stability "
-msgstr "Stabilité"
-
-#: citizens.html.j2:51
-msgid ""
-"Coins in your digital wallet will be of the same denomination as the\n"
-"             cash in your physical wallet. So you will not have to worry "
-"about\n"
-"             currency fluctuations or conversion rates. Like a physical "
-"wallet,\n"
-"             you can carry digital coins of different currencies in your "
-"digital\n"
-"             wallet at the same time."
-msgstr ""
-"La dénomination de votre monnaie dans votre portefeuille\n"
-"\t     numérique sera la même que celle de votre portefeuille classique. "
-"Vous\n"
-"\t     n'aurez donc pas à vous inquiéter des fluctuations des cours des\n"
-"\t     monnaies ou des taux de conversion. Comme un portefeuille "
-"classique,\n"
-"\t     vous pouvez avoir en même temps des monnaies de différentes "
-"devises\n"
-"\t     dans votre portefeuille numérique."
-
-#: citizens.html.j2:59
+"You will be able to withdraw money to replenish the\n"
+"                   digital coins in your wallet using your credit card\n"
+"                   or wire transfers.  Afterwards you can pay with\n"
+"                   one-click using the Taler wallet, which optionally\n"
+"                   keeps your transaction history on your computer."
+msgstr ""
+
+#: citizens.html.j2:66
+msgid "Stability"
+msgstr ""
+
+#: citizens.html.j2:68
+msgid ""
+"Coins in your digital wallet will be of the same\n"
+"                   denomination as the cash in your physical wallet.\n"
+"                   Taler is not a crypto-currency, so you do not have\n"
+"                   to worry about cryto-currency related value\n"
+"                   fluctuations.  Banking with Taler is subject to the\n"
+"                   usual government protections for finanical\n"
+"                   services."
+msgstr ""
+
+#: citizens.html.j2:79
 msgid "Taler as seen by customers"
 msgstr "Taler du point de vu des clients"
 
-#: citizens.html.j2:61
+#: citizens.html.j2:81
 msgid ""
 "Customers interact with the Taler system mostly using\n"
-"          a free wallet implementation, which may be an extension or "
-"plugin\n"
-"          to their browser or a custom application on their computer(s).\n"
-"          Typical steps performed by customers are:\n"
-"        "
-msgstr ""
-"Les clients intéragessent avec Taler pricipalement à l'aide\n"
-"        d'une implémentation libre du porte-monnaie, qui peut être un "
-"plugin ou extension pour navigateur\n"
-"        ou une application dédiée sur leur ordinateur."
-
-#: citizens.html.j2:70
-msgid ""
-"The customer selects an exchange (i.e. by visiting the\n"
-"              respective website or selecting from a list of exchanges in"
-" the\n"
-"              application) and asks the wallet to create bank transfer\n"
-"              instructions to withdraw a certain amount of electronic "
-"cash.\n"
-"              The bank transfer instructions will contain an\n"
-"              access code that must be included in the subject of the\n"
-"              transaction, as well as the wire details for the exchange "
-"(i.e.\n"
-"              a SEPA account number)."
-msgstr ""
-"Le client choisit un bureau de change (en visitant le son site ou\n"
-"             en le choisissant parmis une liste fournie par le porte-"
-"monnaie) et demande\n"
-"             au porte-monnaie de préparer un virement banquaire pour "
-"retirer une certaine\n"
-"             quantité d'argent électronique.\n"
-"             Les instructions de transfer de la banque contiennent un "
-"code d'acces qui doit\n"
-"             être inclus dans le sujet du transfere, de même que dans les"
-" détails du\n"
-"             virement du bureau de change."
+"                 a free wallet implementation, which may be an\n"
+"                 extension or plugin to their browser or a custom\n"
+"                 application on their computer(s).  Typical steps\n"
+"                 performed by customers are: "
+msgstr ""
 
-#: citizens.html.j2:79
+#: citizens.html.j2:92
+msgid ""
+"The customer selects an exchange (i.e. by\n"
+"                      visiting the respective website or selecting\n"
+"                      from a list of exchanges in the application) and\n"
+"                      asks the wallet to create bank transfer\n"
+"                      instructions to withdraw a certain amount of\n"
+"                      electronic cash.  The bank transfer instructions\n"
+"                      will contain an access code that must be\n"
+"                      included in the subject of the transaction, as\n"
+"                      well as the wire details for the exchange (i.e.\n"
+"                      a SEPA account number)."
+msgstr ""
+
+#: citizens.html.j2:103
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange "
-"using\n"
-"               these instructions provided by the wallet (top left)."
+"                       transfer funds from his account to the Taler\n"
+"                       exchange using these instructions provided by\n"
+"                       the wallet (top left)."
 msgstr ""
-"Le client demande ensuite à sa <b>banque</b>\n"
-"             de transfèrer les fonds de son compte vers le bureau de "
-"change en utilisant\n"
-"             les informations fournies par le porte-monnaie (en haur à "
-"gauche)."
 
-#: citizens.html.j2:83
+#: citizens.html.j2:108
 msgid ""
 "Once the funds have arrived, the wallet will\n"
-"               automatically withdraw the electronic coins.  The\n"
-"               customer can use the wallet to review his remaining "
-"balance\n"
-"               at any time. He can also make backups to secure his "
-"digital\n"
-"               coins against hardware failures."
+"                       automatically withdraw the electronic coins.\n"
+"                       The customer can use the wallet to review his\n"
+"                       remaining balance at any time. He can also make\n"
+"                       backups to secure his digital coins against\n"
+"                       hardware failures."
 msgstr ""
-"Une fois que les fonds sont arrivés, le porte-monnaie\n"
-"               retirera automatiquement les pièces électroniques. Le "
-"client peut\n"
-"               utiliser le porte-monnaie à tout moment pour connaitre son"
-" contenu."
 
-#: citizens.html.j2:89
+#: citizens.html.j2:115
 msgid ""
 "When visiting a merchant that supports Taler,\n"
-"               an additional payment option for Taler is enabled in the "
-"checkout system.\n"
-"               If the customer selects payments via Taler, the wallet\n"
-"               displays the secured contract from the merchant and asks\n"
-"               for confirmation.  Taler does not require the customer\n"
-"               to provide any identity information to the merchant.\n"
-"               Transaction histories and digitally\n"
-"               signed contracts can be preserved in the wallet for future"
-"\n"
-"               review by the customer, or even use in court."
-msgstr ""
-"Lorsqu'un un marchand qui supporte\n"
-"               Taler comme système de payement est visité une option de "
-"payement\n"
-"               supplémentaire est visible. Si le client choisit cette "
-"option,\n"
-"               le porte-monnaie affiche le contract du marchant et "
-"demande\n"
-"               une confirmation. Taler ne requiert pas du client qu'il\n"
-"               fournisse des informations sur son identité au marchant.\n"
-"               Les historiques de transactions et les contracts signés\n"
-"               numériquement sont stockés dans le porte-monnaie pour "
-"pouvoir\n"
-"               être revu par le client plus tard, ou même dans un "
-"tribunal."
+"                       an additional payment option for Taler is\n"
+"                       enabled in the checkout system.  If the\n"
+"                       customer selects payments via Taler, the wallet\n"
+"                       displays the secured contract from the merchant\n"
+"                       and asks for confirmation.  Taler does not\n"
+"                       require the customer to provide any identity\n"
+"                       information to the merchant.  Transaction\n"
+"                       histories and digitally signed contracts can be\n"
+"                       preserved in the wallet for future review by\n"
+"                       the customer, or even use in court."
+msgstr ""
 
 #: developers.html.j2:5
 msgid "Developers"
@@ -346,403 +267,253 @@ msgstr "Libre"
 #: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
-"            protocol. Anybody is welcome to inspect our code and\n"
-"            integrate our reference implementation into their\n"
-"            applications.  Different components of Taler are being\n"
-"            made available under different licenses. The Affero\n"
-"            GPLv3+ is used for the exchange, the LGPLv3+ is used for\n"
-"            reference code demonstrating integration with merchant\n"
-"            platforms, and licenses like Apache/Mozilla/GPLv3+ are\n"
-"            used for wallets and related customer-facing software.\n"
-"            We are open for constructive suggestions for maximizing\n"
-"            the adoption of this libre payment platform.\n"
-"          "
+"                   protocol. Anybody is welcome to inspect our code\n"
+"                   and integrate our reference implementation into\n"
+"                   their applications.  Different components of Taler\n"
+"                   are being made available under different\n"
+"                   licenses. The Affero GPLv3+ is used for the\n"
+"                   exchange, the LGPLv3+ is used for reference code\n"
+"                   demonstrating integration with merchant platforms,\n"
+"                   and licenses like Apache/Mozilla/GPLv3+ are used\n"
+"                   for wallets and related customer-facing software.\n"
+"                   We are open for constructive suggestions for\n"
+"                   maximizing the adoption of this libre payment\n"
+"                   platform.  "
 msgstr ""
-"Taler est un logiciel libre exécutant un\n"
-"\t    protocol ouvert.  Vous êtes les bienvenus pour inspecter\n"
-"\t    notre code et intégrer nos applications référence dans vos\n"
-"\t    applications. Différents composants de Taler sont\n"
-"\t    disponibles sous plusieurs licences. L'Affero GPLv3+ est\n"
-"\t    utilisé pour la monnaie, le LGPLv3+ est utilisé pour le\n"
-"\t    code référence montrant l'intégration sur des plateformes\n"
-"\t    machandes, et des licences comme Apache/Mozilla/GPLv3+\n"
-"\t    sont utilisées pour les portefeuilles et le lien\n"
-"\t    client-logiciel orienté. Nous sommes ouverts à toute\n"
-"\t    suggestion constructive pour exploiter au maximum cette\n"
-"\t    plateforme de paiement libre.\n"
-"          "
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid "RESTful"
 msgstr "Avec REST"
 
-#: developers.html.j2:38
+#: developers.html.j2:40
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
-"\t    ensure that Taler payments can work with restrictive\n"
-"\t    network setups, Taler uses a RESTful protocol over HTTP or\n"
-"\t    HTTPS. Taler's security does not depend upon the use of\n"
-"\t    HTTPS, but obviously merchants may choose to offer HTTPS\n"
-"\t    for consistency and because it generally is better for\n"
-"\t    privacy compared to HTTP.  Taler uses JSON to encode\n"
-"\t    structure data, making it easy to integrate Taler with\n"
-"\t    existing Web applications.  Taler's protocol is documented\n"
-"\t    in detail <a href='https://api.taler.net/'>here</a>.\n"
-"          "
-msgstr ""
-"Taler est conçu pour fonctionner sur\n"
-"\t    Internet. Afin de s'asurer que les paiement Taler\n"
-"\t    fonctionnent sur des installations réseaux restrictives,\n"
-"\t    Taler utilise le protocole RESTful sur HTTP ou HTTPS. La\n"
-"\t    sécurité Taler ne dépend pas de l'utilisation de HTTPS,\n"
-"\t    mais naturellement les commerçants voudront choisir HTTPS\n"
-"\t    pour l'uniformité et car c'est généralement meilleur pour\n"
-"\t    la confidentialité comparé à HTTP. Taler utilise JSON pour\n"
-"\t    coder les données structure, rendant Taler facile à\n"
-"\t    intégrer avec des application Web existantes. Le protocole\n"
-"\t    Taler est documenté en\n"
-"\t    détail <a href='https://api.taler.net/'>ici</a>.\n"
-"          "
-
-#: developers.html.j2:53
+"\t           ensure that Taler payments can work with\n"
+"\t           restrictive network setups, Taler uses a RESTful\n"
+"\t           protocol over HTTP or HTTPS. Taler's security does\n"
+"\t           not depend upon the use of HTTPS, but obviously\n"
+"\t           merchants may choose to offer HTTPS for consistency\n"
+"\t           and because it generally is better for privacy\n"
+"\t           compared to HTTP.  Taler uses JSON to encode\n"
+"\t           structure data, making it easy to integrate Taler\n"
+"\t           with existing Web applications.  Taler's protocol\n"
+"\t           is documented in\n"
+"\t           detail <a href='https://api.taler.net/'>here</a>.\n"
+"\t           "
+msgstr ""
+
+#: developers.html.j2:58
 msgid "Code"
 msgstr "Code"
 
-#: developers.html.j2:55
+#: developers.html.j2:60
 msgid ""
 "Taler is currently primarily developed by a\n"
-"\t    research team at Inria and TU Munich. However,\n"
-"\t    contributions from anyone are welcome.  Our Git\n"
-"\t    repositories can be cloned using the Git and HTTP access\n"
-"\t    methods against <tt>git.taler.net</tt> with the name of\n"
-"\t    the respective repository. A list of public repositories\n"
-"\t    can be found in\n"
-"\t    our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
+"\t           research team at Inria and GNUnet e.V. However,\n"
+"\t           contributions from anyone are welcome.  Our Git\n"
+"\t           repositories can be cloned using the Git and HTTP\n"
+"\t           access methods against <tt>git.taler.net</tt> with\n"
+"\t           the name of the respective repository. A list of\n"
+"\t           public repositories can be found in\n"
+"\t           our <a href='https://git.taler.net/'>GitWeb</a>.\n"
+"\t           "
 msgstr ""
-"Taler est actuellement principalement développé\n"
-"\t    par une équipe de recherche à Inria et TU\n"
-"\t    Munich. Néanmoins, les contributions de tous sont les\n"
-"\t    bienvenues. Notre Stockage Git peut être cloné en\n"
-"\t    utilisant les méthodes d'accès Git et HTTP\n"
-"\t    sur <tt>git.taler.net</tt> avec le nom du stockage\n"
-"\t    respectif. Une liste des lieux de stockage publics se\n"
-"\t    trouve sur\n"
-"\t    notre <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
 
-#: developers.html.j2:66
+#: developers.html.j2:72
 msgid "Documentation"
 msgstr "Documentation"
 
-#: developers.html.j2:68
+#: developers.html.j2:74
 msgid ""
 "In addition to this website,\n"
-"            the <a href='https://git.taler.net/'>documented\n"
-"            code</a> and the <a href='https://api.taler.net/'>API\n"
-"            documentation</a>, we are in the process of preparing a\n"
-"            comprehensive design document which will be published here\n"
-"            soon.\n"
-"          "
+"                   the <a href='https://git.taler.net/'>documented\n"
+"                   code</a> and\n"
+"                   the <a href='https://api.taler.net/'>API\n"
+"                   documentation</a>, we are in the process of\n"
+"                   preparing a comprehensive design document which\n"
+"                   will be published here soon.  "
 msgstr ""
-"En supplément de ce site web, le\n"
-"\t    <a href='https://git.taler.net/'>documented code</a> et\n"
-"\t     l'<a href='https://api.taler.net/'>API documentation</a>,\n"
-"\t     nous préparons un document exhaustif qui sera publié ici\n"
-"\t    prochainement.\n"
-"          "
 
-#: developers.html.j2:77
+#: developers.html.j2:83
 msgid "Discussion"
 msgstr "Discussion"
 
-#: developers.html.j2:79
+#: developers.html.j2:85
 msgid ""
 "We have a mailinglist for developer discussions.\n"
-"            You can subscribe to it or read the list archive at\n"
-"            <a "
+"                   You can subscribe to it or read the list archive at\n"
+"                   <a "
 
"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgstr ""
-"Nous avons une liste pour le discours public des developers.\n"
-"            On peut s'inscrire ou lire les archives à\n"
-"            <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:87
+#: developers.html.j2:93
 msgid "Regression Testing"
 msgstr "Tests de régression"
 
-#: developers.html.j2:89
+#: developers.html.j2:95
 msgid ""
-"We\n"
-"            have <a href='https://buildbot.net/'>Buildbot</a>\n"
-"            automation tests to detect regressions and check for\n"
-"            portability at\n"
+"We have\n"
+"                   <a href='https://buildbot.net/'>Buildbot</a>\n"
+"                   automation tests to detect regressions and check\n"
+"                   for portability at\n"
 "            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>."
 "\n"
 "          "
 msgstr ""
-"Des tests de régression automatiques ont été mis en place grace à\n"
-"            <a href='https://buildbot.net/'>Buildbot</a> et sont\n"
-"            disponibles à\n"
-"            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>."
-"\n"
-"          "
 
-#: developers.html.j2:97
+#: developers.html.j2:103
 msgid "Code Coverage Analysis"
 msgstr "Mesure de couverture du code"
 
-#: developers.html.j2:99
+#: developers.html.j2:105
 msgid ""
-"We\n"
-"            use <a "
+"We use\n"
+"                   <a "
 "href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-"            to analyze the code coverage of our tests, the results are\n"
-"            available\n"
-"            at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
+"                   to analyze the code coverage of our tests, the\n"
+"                   results are available\n"
+"                   at <a "
+"href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
+"                   "
 msgstr ""
-"<a href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a> est "
-"utilisé\n"
-"            pour analyser la couverture du code par nos tests. Les "
-"résultats sont disponibles à\n"
-"            <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
 
-#: developers.html.j2:107
+#: developers.html.j2:113
 msgid "Performance Analysis"
 msgstr "Analyse de performances"
 
-#: developers.html.j2:109
+#: developers.html.j2:115
 msgid ""
 "We\n"
-"            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
-"            performance regression analysis of the exchange backend\n"
-"            at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
+"                   use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
+"                   for performance regression analysis of the exchange\n"
+"                   backend\n"
+"                   at <a "
+"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
+"                   "
 msgstr ""
-"Nous\n"
-"            utilisons <a href='https://gnunet.org/gauger'>Gauger</a>\n"
-"            pour une analyse des régression de performances du bureau\n"
-"            de change, la parie serveur de Taler.  les résultats sont\n"
-"            disponibles\n"
-"            à <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
 
-#: developers.html.j2:118
+#: developers.html.j2:125
 msgid "Taler system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:120
+#: developers.html.j2:127
 msgid ""
-"The Taler system consists of protocols executed\n"
-"          among a number of actors with the help\n"
-"          of <a href='https://www.fsf.org/'>Free Software</a> as\n"
-"          illustrated in the illustration on the right.  Typical\n"
-"          transactions involve the following steps:\n"
-"        "
+"The Taler system consists of protocols executed among\n"
+"                 a number of actors with the help\n"
+"                 of <a href='https://www.fsf.org/'>Free Software</a>\n"
+"                 as illustrated in the illustration on the right.\n"
+"                 Typical transactions involve the following steps: "
 msgstr ""
-"Le system de Taler consiste de protocols exécutés\n"
-"          entre plusieurs acteurs à l'aide\n"
-"          de <a href='https://www.fsf.org/'>Logiciel Libre</a>.  Une\n"
-"          transaction typique comporte les étapes suivantes :\n"
-"        "
 
-#: developers.html.j2:129
+#: developers.html.j2:136
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange\n"
-"               (top left).  In the subject of the transaction, he\n"
-"               includes an authentication token from his\n"
-"               electronic <b>wallet</b>. In Taler terminology, the\n"
-"               customer creates a reserve at the exchange.\n"
-"             "
-msgstr ""
-"Un client demande à sa <b>banque</b> de\n"
-"               transfèrer des fonds de son compte en banque vers le\n"
-"               bureau de change de Taler (en haut à gauche). Dans le\n"
-"               sujet de la transaction, est inclus un jeton\n"
-"               d'authentification du <b>porte-monnaie</b> électronique\n"
-"               du client. Dans la terminologie de Taler, le client\n"
-"               crée une réserve dans le bureau de change.\n"
-"             "
-
-#: developers.html.j2:137
-msgid ""
-"Once the exchange has received the\n"
-"               transfer, it allows the customer's electronic wallet\n"
-"               to <b>withdraw</b> electronic coins.  The electronic\n"
-"               coins are digital representations of the original\n"
-"               currency from the transfer. It is important to note\n"
-"               that the exchange does not learn the &quot;serial "
-"numbers&quot;\n"
-"               of the coins created in this process, so it cannot tell\n"
-"               later which customer purchased what at which merchant.\n"
-"               The use of Taler does not change the currency or the\n"
-"               total value of the funds (except for fees which the\n"
-"               exchange may charge for the service).\n"
-"             "
-msgstr ""
-"Une fois que le bureau de change a reçu le\n"
-"               transfère, il permets au porte-monnaie électronique du\n"
-"               client de <b>retirer</b> des pièces électroniques. Les\n"
-"               pièces électroniques sont des représentations\n"
-"               numériques des devises transfèrées initialement.  Il\n"
-"               est important de noter que le bureau de change ne\n"
-"               connait pas le &quot;numéro de serie&quot; des pièces "
-"ainsi\n"
-"               crées, il luis sera donc impossible de savoir quel\n"
-"               client a payer un marchant. L'utilisation de Taler ne\n"
-"               change pas la devise ni la valeur totale des fonds (à\n"
-"               l'exeption des frais que le bureau de change peut\n"
-"               prendre comme son service).\n"
-"             "
-
-#: developers.html.j2:150
-msgid ""
-"Once the customer has the digital coins in\n"
-"               his wallet, the wallet can be used to <b>spend</b> the\n"
-"               coins with merchant portals that support the Taler\n"
-"               payment system and accept the respective exchange as a\n"
-"               business partner (bottom arrow). This creates a digital\n"
-"               contract signed by the customer's coins and the\n"
-"               merchant.  If necessary, the customer can later use\n"
-"               this digitally signed contract in a court of law to\n"
-"               prove the exact terms of the contract and that he paid\n"
-"               the respective amount. The customer does not learn the\n"
-"               banking details of the merchant, and Taler does not\n"
-"               require the merchant to learn the identity of the\n"
-"               customer. Naturally, the customer can spend any\n"
-"               fraction of his digital coins (the system takes care of\n"
-"               customers getting change).\n"
-"             "
-msgstr ""
-"Une fois que le client a les pièces dans\n"
-"               sont porte-monnaie, celui-ci peut être utilisé\n"
-"               pour <b>dépenser</b> les pièces avec un portail\n"
-"               marchand qui supporte Taler comme systeme de payement\n"
-"               et accepte le bureau de change comme partenaire\n"
-"               commercial (flèche du bas). Celà crée un contract signé\n"
-"               numériquement par le marchant et les pièces du\n"
-"               client. Si celà s'avère nécéssaire, le client peut\n"
-"               ensuite utiliser ce contract signé numériquement face\n"
-"               au tribunaux pour prouver les termes exacts du contract\n"
-"               et qu'il à payé le montant convenu. Le client n'a pas\n"
-"               connaissance des coordonées banquaires du marchant, et\n"
-"               Taler ne requière pas que le marchant ai connaissance\n"
-"               de l'identité du client. Naturellement, le client peut\n"
-"               dépenser seulement une partie de chaque pièce (le\n"
-"               système se chargant de rendre la monnaie).\n"
-"             "
-
-#: developers.html.j2:167
+"                       transfer funds from his account to the Taler\n"
+"                       exchange (top left).  In the subject of the\n"
+"                       transaction, he includes an authentication\n"
+"                       token from his electronic <b>wallet</b>. In\n"
+"                       Taler terminology, the customer creates a\n"
+"                       reserve at the exchange.  "
+msgstr ""
+
+#: developers.html.j2:144
+msgid ""
+"Once the exchange has received the wire\n"
+"                       transfer, it allows the customer's electronic\n"
+"                       wallet to <b>withdraw</b> electronic coins.\n"
+"                       The electronic coins are digital\n"
+"                       representations of the original currency from\n"
+"                       the transfer. It is important to note that the\n"
+"                       exchange does not learn the &quot;serial\n"
+"                       numbers&quot; of the coins created in this\n"
+"                       process, so it cannot tell later which customer\n"
+"                       purchased what at which merchant.  The use of\n"
+"                       Taler does not change the currency or the total\n"
+"                       value of the funds (except for fees which the\n"
+"                       exchange may charge for the service).  "
+msgstr ""
+
+#: developers.html.j2:159
+msgid ""
+"Once the customer has the digital coins in his\n"
+"                       wallet, the wallet can be used to <b>spend</b>\n"
+"                       the coins with merchant portals that support\n"
+"                       the Taler payment system and accept the\n"
+"                       respective exchange as a business partner\n"
+"                       (bottom arrow). This creates a digital contract\n"
+"                       signed by the customer's coins and the\n"
+"                       merchant.  If necessary, the customer can later\n"
+"                       use this digitally signed contract in a court\n"
+"                       of law to prove the exact terms of the contract\n"
+"                       and that he paid the respective amount. The\n"
+"                       customer does not learn the banking details of\n"
+"                       the merchant, and Taler does not require the\n"
+"                       merchant to learn the identity of the\n"
+"                       customer. Naturally, the customer can spend any\n"
+"                       fraction of his digital coins (the system takes\n"
+"                       care of customers getting change).  "
+msgstr ""
+
+#: developers.html.j2:177
 msgid ""
 "Merchants receiving digital\n"
-"               coins <b>deposit</b> the respective receipts that\n"
-"               resulted from the contract signing with the customer at\n"
-"               the exchange to redeem the coins.  The deposit step\n"
-"               does not reveal the details of the contract between the\n"
-"               customer and the merchant or the identity of the\n"
-"               customer to the exchange in any way. However, the\n"
-"               exchange does learn the identity of the merchant via\n"
-"               the provided bank routing information.  The merchant\n"
-"               can, for example when compelled by the state for\n"
-"               taxation, provide information linking the individual\n"
-"               deposit to the respective contract signed by the\n"
-"               customer. Thus, the exchange's database allows the\n"
-"               state to enforce that merchants pay applicable taxes\n"
-"               (and do not engage in illegal contracts).\n"
-"             "
-msgstr ""
-"Les marchands recevant des pièces\n"
-"               numériques les <b>déposent</b>, avec les reçus\n"
-"               résultants des signatures du contract avec le client,\n"
-"               auprès du bureau de change pour récupérer les\n"
-"               pièces. L'étape de dépos ne révèle pas les détails du\n"
-"               contract entre le client et le marchant ou l'identité\n"
-"               du client au bureau de change de quelque façon que ce\n"
-"               soit. Néanmoins, le bureau de change prends\n"
-"               connaissance de l'identité du marchant grace au\n"
-"               coordonées banquaires fournies pour le virement. Le\n"
-"               marchant peut ensuite, par exemple lorsque l'état lui\n"
-"               demande pour établire les taxes, fournir des\n"
-"               informations reliant chaque dépos à son contrat\n"
-"               spécifique, signé par le client. Ainsi La base de\n"
-"               donnée du bureau de change permet à l'état de s'assurer\n"
-"               que les marchants payent les taxes appliables (et ne\n"
-"               s'engagent pas dans des activités illégales).\n"
-"             "
-
-#: developers.html.j2:184
+"                       coins <b>deposit</b> the respective receipts\n"
+"                       that resulted from the contract signing with\n"
+"                       the customer at the exchange to redeem the\n"
+"                       coins.  The deposit step does not reveal the\n"
+"                       details of the contract between the customer\n"
+"                       and the merchant or the identity of the\n"
+"                       customer to the exchange in any way. However,\n"
+"                       the exchange does learn the identity of the\n"
+"                       merchant via the provided bank routing\n"
+"                       information.  The merchant can, for example\n"
+"                       when compelled by the state for taxation,\n"
+"                       provide information linking the individual\n"
+"                       deposit to the respective contract signed by\n"
+"                       the customer. Thus, the exchange's database\n"
+"                       allows the state to enforce that merchants pay\n"
+"                       applicable taxes (and do not engage in illegal\n"
+"                       contracts).  "
+msgstr ""
+
+#: developers.html.j2:196
 msgid ""
 "Finally, the exchange transfers funds\n"
-"               corresponding to the digital coins redeemed by the\n"
-"               merchants to the merchant's <b>bank</b> account. The\n"
-"               exchange may combine multiple small transactions into\n"
-"               one larger bank transfer.  The merchant can query the\n"
-"               exchange about the relationship between the bank\n"
-"               transfers and the individual claims that were\n"
-"               deposited.\n"
-"             "
-msgstr ""
-"Finalement, le bureau de change transfère\n"
-"               les fonds correspondants aux pièces déposées par le\n"
-"               marchant sur le compte en <b>banque</b> du marchant. Le\n"
-"               bureau de change peut combiner plusieurs petites\n"
-"               transactions en un transfère plus conséquant.  Le\n"
-"               marchant peut demander auprès du bureau de change le\n"
-"               lien entre chaque transfère banquaire et les dépos\n"
-"               individuels effectués.\n"
-"             "
-
-#: developers.html.j2:194
+"                       corresponding to the digital coins redeemed by\n"
+"                       the merchants to the merchant's <b>bank</b>\n"
+"                       account. The exchange may combine multiple\n"
+"                       small transactions into one larger bank\n"
+"                       transfer.  The merchant can query the exchange\n"
+"                       about the relationship between the bank\n"
+"                       transfers and the individual claims that were\n"
+"                       deposited.  "
+msgstr ""
+
+#: developers.html.j2:206
 msgid ""
 "Most importantly, the exchange keeps\n"
-"               cryptographic proofs that allow it to demonstrate that\n"
-"               it is operating correctly to third parties.  The system\n"
-"               requires an external <b>auditor</b>, such as a\n"
-"               government-appointed financial regulatory body, to\n"
-"               frequently verify the exchange's databases and check that\n"
-"               its bank balance matches the total value of the\n"
-"               remaining coins in circulation.\n"
-"             "
-msgstr ""
-"Plus important, le bureau de change\n"
-"               conserve les preuves cryptographiques qui lui\n"
-"               permettent de démontrer aux autres parties qu'il opère\n"
-"               correctement.  Le systeme requiere un <b>auditeur</b>\n"
-"               externe, tel q'une authorité de régulation financière\n"
-"               gouvernementale, qui vérifie régulièrement la base de\n"
-"               donnée du bureau de change et vérifie que son solde\n"
-"               banquaire correspond à la valeur totale de toutes les\n"
-"               pièces en circulation.\n"
-"             "
-
-#: developers.html.j2:204
+"                       cryptographic proofs that allow it to\n"
+"                       demonstrate that it is operating correctly to\n"
+"                       third parties.  The system requires an\n"
+"                       external <b>auditor</b>, such as a\n"
+"                       government-appointed financial regulatory body,\n"
+"                       to frequently verify the exchange's databases\n"
+"                       and check that its bank balance matches the\n"
+"                       total value of the remaining coins in\n"
+"                       circulation.  "
+msgstr ""
+
+#: developers.html.j2:217
 msgid ""
 "Without the auditor, the exchange operators\n"
-"               could embezzle funds they are holding in\n"
-"               reserve. Customers and merchants cannot cheat each\n"
-"               other or the exchange. If any party's computers are\n"
-"               compromised, the financial damage is limited to the\n"
-"               respective party and proportional to the funds they\n"
-"               have in circulation during the period of the\n"
-"               compromise.\n"
-"             "
-msgstr ""
-"Sans auditeur, l'entité opérant le bureau\n"
-"               de change pourrait voler les fonds que le bureau de\n"
-"               change garde en réserve. Clients et marchants ne\n"
-"               peuvent se voler l'un l'autre via le bureau de\n"
-"               change. Si les ordinateurs d'une partie sont compromis,\n"
-"               les dégas financiers sont limités a cette partie\n"
-"               seulement et proportionels aux fonds qu'ils ont en\n"
-"               circulation au moment de l compromission.\n"
-"             "
-
-#: financial-news.html.j2:5 financial-news.html.j2:14
-msgid "Financial News"
+"                       could embezzle funds they are holding in\n"
+"                       reserve. Customers and merchants cannot cheat\n"
+"                       each other or the exchange. If any party's\n"
+"                       computers are compromised, the financial damage\n"
+"                       is limited to the respective party and\n"
+"                       proportional to the funds they have in\n"
+"                       circulation during the period of the\n"
+"                       compromise.  "
 msgstr ""
 
 #: governments.html.j2:5
@@ -750,790 +521,564 @@ msgid "Governments"
 msgstr "Gouvernements"
 
 #: governments.html.j2:14
-msgid "Advantages for governments"
-msgstr "Avantage pour les gouvernements"
+msgid "Advantages for Governments"
+msgstr ""
 
-#: governments.html.j2:21 index.html.j2:25
+#: governments.html.j2:18
+msgid ""
+"Taler provides accountability to ensure business\n"
+"                   accepting payments operate legally, while also\n"
+"                   respecting civil liberties of citizens spending\n"
+"                   digital cash.  Taler is a commons, a payment system\n"
+"                   based on open standards and free software.  Taler\n"
+"                   needs governments to set a financial framework and\n"
+"                   to act as trusted regulators.  Taler contributes to\n"
+"                   digital sovereignty in the critial financial\n"
+"                   infrastructure."
+msgstr ""
+
+#: governments.html.j2:34
 msgid "Taxable"
 msgstr "Taxable"
 
-#: governments.html.j2:23
-msgid ""
-"Taler is an electronic payment system that was built with the goal of "
-"supporting taxation.\n"
-"             With Taler, the receiver of any form of payment is known, "
-"and the payment information comes\n"
-"             attached with some details about what the payment was made "
-"for (but not the identity of the customer).  Thus, governments can use "
-"this\n"
-"             data to tax buisnesses and individuals based on their "
-"income, making tax evasion and\n"
-"             black markets less viable."
-msgstr ""
-"Taler est un système de paiement électronique qui a été créé dans le but "
-"d'aide à la taxation. Avec Taler, le créditeur de toute forme de paiement"
-" est connu, et les informations du paiement arrivent avec les détails "
-"concernant le motif du paiement. Donc, les gouvernements peuvent utiliser"
-" cette donnée pour taxer les entreprises et les particuliers en se basant"
-" sur leurs revenus, permettant ainsi de diminuer l'évasion fiscale et le "
-"marché noir."
-
-#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
+#: governments.html.j2:36
+msgid ""
+"Taler was\n"
+"\t           built with the goal of fighting corruption and supporting "
+"taxation.  \n"
+"\t           With Taler, the receiver of any form of payment is\n"
+"\t           easily identified by the government, and the merchant\n"
+"                   can be compelled to provide the contract that was "
+"accepted\n"
+"                   by the customer.  Governments can use this data to\n"
+"\t           tax businesses and individuals based on their\n"
+"\t           income, making tax evasion and black markets less\n"
+"\t           viable."
+msgstr ""
+
+#: governments.html.j2:46
+msgid ""
+"Thus, despite offering anonymity for citizens\n"
+"                   spending digital cash to buy goods and services,\n"
+"                   Taler also ensures that the state can observe\n"
+"                   incoming funds. This can be used to ensure\n"
+"                   businesses engage only in legal activities, and do\n"
+"                   not evade income tax, sales tax or value-added tax.\n"
+"                   However, this observational capability does not\n"
+"                   extend to the immediate personal domain.  In\n"
+"                   particular, sharing access to funds within a family\n"
+"                   or synchronizing wallets across multiple devices is "
+"not\n"
+"                   subject to monitoring."
+msgstr ""
+
+#: governments.html.j2:59 merchants.html.j2:43
 msgid "Secure"
 msgstr "Sûr"
 
-#: governments.html.j2:32
-msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, "
-"merchants and\n"
-"             the exchange can mathematically demonstrate their lawful "
-"behavior in court in case\n"
-"             of disputes. Financial damages are strictly limited, "
-"improving economic security\n"
-"             for individuals, merchants, the exchange and the state.  "
-"Most importantly, an\n"
-"             independent auditor can ensure that there is no &quot;bad "
-"exchange&quot;\n"
-"             within the Taler system who might threaten the economy due "
-"to fraud."
-msgstr ""
-"Les paiements Taler sont sécurisés cryptographiquement. Ainsi, les "
-"clients, les commerçants et les fabricants de monnaies peuvent "
-"mathématiquement prouver la légalité de leurs activités en cas de "
-"litiges. Les dommages financiers sont strictement limités, améliorant la "
-"sécurité économique pour les particuliers, les commerçants, la monnaie et"
-" l'état. Plus important, un auditeur indépendant peut s'assurer qu'il n'y"
-" a pas de &quot;fausse monnaie&quot; à l'intérieur du système Taler qui "
-"pourrait menacer l'économie en raison de fraude."
-
-#: governments.html.j2:42 index.html.j2:39
+#: governments.html.j2:61
+msgid ""
+"Taler's payments are cryptographically\n"
+"                   secured. Thus, customers, merchants and the\n"
+"                   exchange can mathematically demonstrate their\n"
+"                   lawful behavior in court in case of\n"
+"                   disputes. Financial damages are strictly limited,\n"
+"                   improving economic security for individuals,\n"
+"                   merchants, the exchange and the state."
+msgstr ""
+
+#: governments.html.j2:69
+msgid ""
+"By design, the Taler payment service provider is\n"
+"                   subject to financial regulation. Financial\n"
+"                   regulation and regular audits are critical to\n"
+"                   establish trust. In particular, the Taler design\n"
+"                   mandates the existence of an independent auditor\n"
+"                   who checks cryptographic proofs that accumulate at\n"
+"                   the payment service provider to ensure that the\n"
+"                   escrow account is managed honestly.  This ensures\n"
+"                   that the payment service provider does not threaten\n"
+"                   the economy due to fraud."
+msgstr ""
+
+#: governments.html.j2:80
 msgid "Libre"
 msgstr "Libre"
 
-#: governments.html.j2:44
+#: governments.html.j2:82
 msgid ""
-"Taler is free software implementing an open protocol standard.  Thus, "
-"Taler will\n"
-"             enable competition and avoid the monopolization of payment "
-"systems that threatens\n"
-"             global political and financial stability today."
+"Taler is free software implementing an open\n"
+"                   protocol standard.  Thus, Taler will enable\n"
+"                   competition and avoid the monopolization of payment\n"
+"                   systems that threatens global political and\n"
+"                   financial stability today."
 msgstr ""
-"Taler est un logiciel libre exécutant un protocol standard ouvert. Ainsi,"
-" Taler permettra la concurrence et interdira le monopole de système de "
-"paiement qui menace la stabilité politique et financière globale "
-"actuellement."
 
-#: governments.html.j2:49 investors.html.j2:18
+#: governments.html.j2:91
 msgid "Efficient"
 msgstr "Efficace"
 
-#: governments.html.j2:51
+#: governments.html.j2:93
 msgid ""
-"Taler is designed to be efficient.  Unlike timeline-based payment systems"
-" like\n"
-"             BitCoin, Taler will not threaten the availability of "
-"national electric grids or\n"
-"             (significantly) contribute to environmental pollution."
+"Taler has an efficient design.  Unlike\n"
+"                   timeline-based payment systems, such as BitCoin,\n"
+"                   Taler will not threaten the availability of\n"
+"                   national electric grids or (significantly)\n"
+"                   contribute to environmental pollution."
 msgstr ""
-"Taler est conçu pour être efficace. Contrairement à des systèmes de "
-"paiement chronologiques comme BitCoin, Taler ne menacera pas la "
-"disponibilité des réseaux électriques nationaux ou (de manière "
-"siginifcative) ne participera pas à la pollution environnementale."
 
-#: governments.html.j2:57
+#: governments.html.j2:102
 msgid "Taler as seen by governments"
 msgstr "Taler, du point de vu des gouvernements"
 
-#: governments.html.j2:59
-msgid ""
-"Governments can observe traditional wire\n"
-"          transfers entering and leaving the Taler system, and\n"
-"          require merchants and exchange operators to provide certain\n"
-"          information during financial audits.  Exchange operators\n"
-"          are expected to be permanently checked by auditors,\n"
-"          while merchants may be required to reveal information\n"
-"          during regular tax audits.\n"
-"          Information available to the government includes:\n"
-"        "
-msgstr ""
-"Les gouvernements peuvent observer les transfères traditionels\n"
-"          entrant et sortant du system Taler, et requierent des "
-"marchantes et des\n"
-"          opérateurs du bureau de change qu'ils fournissent certaines "
-"informations\n"
-"          lors d'audits financiers. Les opérateur du bureau de change "
-"doivent être constamment\n"
-"          surveillé par les auditeurs, tandis que l'on peut demander\n"
-"          aux marchants de révéler des informations suplémentaires lors\n"
-"          des vérification fiscales.\n"
-"          Les informations disponibles aux gouvernements incluent :\n"
-"        "
-
-#: governments.html.j2:71
-msgid ""
-"From the banking system:\n"
-"              The total amount of digital currency\n"
-"              obtained by a customer. The government could impose\n"
-"              limits on how many digital coins a customer may\n"
-"              withdraw within a given timeframe."
-msgstr ""
-"Depuis le systeme banquaire :\n"
-"              Le montant total de monaie virtuelle acquise par un client."
-"\n"
-"              Le gouvernement pourrait imposer une limite sur la valeure "
-"maximale\n"
-"              de pièces numériques qu'un client peut retirer dans un "
-"certain délais.\n"
-"             "
-
-#: governments.html.j2:77
-msgid ""
-"From the banking system:\n"
-"               The total amount of income received\n"
-"               by any merchant via the Taler system."
-msgstr ""
-"Depuis le système banquaire:\n"
-"               Le montant total reçu par chaque marchant via le système "
-"Taler"
-
-#: governments.html.j2:81
-msgid ""
-"From auditing the exchange:\n"
-"               The amounts of digital coins legitimately withdrawn by\n"
-"               customers from the exchange, the value of non-redeemed "
-"digital coins\n"
-"               in customer's wallets, the value and corresponding wire "
-"details\n"
-"               of deposit operations performed by merchants with the "
-"exchange, and\n"
-"               the income of the exchange from transaction fees."
-msgstr ""
-"Depuis les audits du bureau de change :\n"
-"               Le montant total des pièces électroniques retirées "
-"légalement\n"
-"               par les clients auprès du bureau de change, la valeur des "
-"pièces dans les\n"
-"               porte-monnaie des clients, la valeur et les tranfères "
-"correspondants.\n"
-"             "
-
-#: governments.html.j2:88
-msgid ""
-"From auditing merchants:\n"
-"               For each deposit operation, the exact details of the\n"
-"               underlying contract that was signed between\n"
-"               customer and merchant.  However, this information would\n"
-"               typically not include the identity of the customer.\n"
-"               Note that while the customer can decide to prove that it "
-"was his\n"
-"               transaction (i.e. in court when suing the merchant if the\n"
-"               merchant failed to deliver on the contract),\n"
-"               merchant, exchange and government cannot find out the "
-"customer's\n"
-"               identity from the information that Taler collects."
-msgstr ""
-"Grace à l'audit des marchands :\n"
-"               Pour chaque opération de dépos, les détails exacts du "
-"contrat\n"
-"               qui à été signé entre le marchant et le client. Néanmoins,"
-" cette\n"
-"               information n'inclurais pas, en général, l'identité du "
-"client.\n"
-"               Il est bon de notter que le client peut décider de prouver"
-" qu'il\n"
-"               s'agit bien d'une transaction qu'il à effectué (par "
-"exemple dans un tribunal\n"
-"               si le marchant n'a pas remplis sa part du contrat). Le "
-"marchant, le bureau de change et\n"
-"               le gouvernement ne peuvent pas retrouver l'identité du "
-"client via les\n"
-"               données collectées par Taler. "
+#: governments.html.j2:104
+msgid ""
+"Governments can observe traditional wire transfers\n"
+"                 entering and leaving the Taler system, and require\n"
+"                 merchants and exchange operators to provide certain\n"
+"                 information during financial audits.  Exchange\n"
+"                 operators are expected to be permanently checked by\n"
+"                 auditors, while merchants may be required to reveal\n"
+"                 information during regular tax audits.  Information\n"
+"                 available to the government includes: "
+msgstr ""
 
-#: index.html.j2:17
-msgid "Electronic payments for a liberal society!"
-msgstr "Paiements électroniques pour une société libre!"
+#: governments.html.j2:117
+msgid ""
+"From the banking system: The total amount of\n"
+"  \t              digital currency obtained by a customer. The\n"
+"  \t              government could impose limits on how many\n"
+"  \t              digital coins a customer may withdraw within a\n"
+"  \t              given timeframe."
+msgstr ""
 
-#: index.html.j2:18
+#: governments.html.j2:123
 msgid ""
-"Taler is a new electronic payment system under development\n"
-"\t   at <a href=\"http://www.inria.fr/\";>Inria</a>.  Today, this website "
-"only\n"
-"\t    presents the advantages our system is expected to provide.  We "
-"expect to\n"
-"\t    make the payment system operational in 2017."
+"From the banking system: The total amount of\n"
+"                       income received by any merchant via the Taler\n"
+"                       system."
 msgstr ""
 
-#: index.html.j2:26
+#: governments.html.j2:127
 msgid ""
-"Unlike BitCoin or cash payments, Taler ensures that\n"
-"\t     governments can learn their citizen's total income and thus "
-"collect\n"
-"\t     sales, value-added or income taxes. Taler is thus a currency for "
-"the\n"
-"\t     mainstream economy, and not the black market."
-msgstr ""
-"Contrairement à BitCoin ou les paiements en liquide,\n"
-"\t     Taler permet aux gouvernements de tracer facilement les revenus de"
-"\n"
-"\t     leurs citoyens et donc de collecter les ventes, les plus values ou"
-" les\n"
-"\t     impots sur le revenu. Taler est donc une devise pour l'économie\n"
-"\t     dominante officielle et non pour le marché noir."
-
-#: index.html.j2:32
-msgid "Anonymous"
-msgstr "Anonyme"
-
-#: index.html.j2:33
-msgid ""
-"When you pay with Taler, your identity does not have to\n"
-"\t     be revealed to the merchant. The bank, government and exchange "
-"will also\n"
-"\t     never learn how you spent your electronic money. However, you can\n"
-"\t     prove that you paid in court if necessary."
-msgstr ""
-"Quand vous payez avec Taler, votre identité ne doit pas\n"
-"\t     être révélée au commerçant. La banque, le gouvernement et le "
-"bureau\n"
-"             de change ne sauront pas non plus comment vous avez dépensé "
-"votre\n"
-"\t     monnaie électronique. Cependant, vous pouvez prouver que vous avez"
-"\n"
-"\t     payé par voie légale si nécessaire."
+"From auditing the exchange: The amounts of\n"
+"                       digital coins legitimately withdrawn by\n"
+"                       customers from the exchange, the value of\n"
+"                       non-redeemed digital coins in customer's\n"
+"                       wallets, the value and corresponding wire\n"
+"                       details of deposit operations performed by\n"
+"                       merchants with the exchange, and the income of\n"
+"                       the exchange from transaction fees."
+msgstr ""
 
-#: index.html.j2:40
+#: governments.html.j2:136
 msgid ""
-"Taler is free software from <a href=\"http://www.gnu.org/\";>the GNU "
-"project</a> implementing an open protocol.\n"
-"\t     Anybody is welcome to inspect our code and integrate our reference"
-"\n"
-"\t     implementation into their applications."
+"From auditing merchants: For each deposit\n"
+"                      operation, the exact details of the underlying\n"
+"                      contract that was signed between customer and\n"
+"                      merchant.  However, this information would\n"
+"                      typically not include the identity of the\n"
+"                      customer.  Note that while the customer can\n"
+"                      decide to prove that it was his transaction\n"
+"                      (i.e. in court when suing the merchant if the\n"
+"                      merchant failed to deliver on the contract),\n"
+"                      merchant, exchange and government cannot find\n"
+"                      out the customer's identity from the information\n"
+"                      that Taler collects."
 msgstr ""
 
-#: index.html.j2:47
-msgid "Electronic"
-msgstr "Électronique"
+#: index.html.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr ""
 
-#: index.html.j2:48
+#: index.html.j2:17
+msgid "Independent One-Click Payments!"
+msgstr ""
+
+#: index.html.j2:19
 msgid ""
-"Taler is designed to work on the Internet. Using a\n"
-"\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
-"\t    integrate with existing Web applications."
+"Taler is an electronic payment system under\n"
+"\t          development\n"
+"\t          at <a href=\"http://www.inria.fr/\";>Inria</a>.  This\n"
+"\t          community Web site provides extensive documentation\n"
+"\t          about the system, which we expect to make\n"
+"\t          operational in 2017."
 msgstr ""
-"Taler est conçu pour fonctionner sur Internet. En\n"
-"\t    utilisant le protocole RESTful sur HTTP ou HTTPS, Taler est facile "
-"à\n"
-"\t    intégrer avec des application Web existantes.."
 
-#: index.html.j2:53
-msgid "Reserves"
-msgstr "Réserve"
+#: index.html.j2:29
+msgid "<b>T</b>axable"
+msgstr ""
 
-#: index.html.j2:54
+#: index.html.j2:31
 msgid ""
-"Taler uses an electronic exchange holding financial\n"
-"             reserves in existing currencies. This means that Taler is "
-"not\n"
-"\t     a new currency with the inherent currency fluctuation risks, but\n"
-"\t     instead the cryptographic coins correspond to existing currencies,"
-" such as\n"
-"\t     US Dollars, Euros or even BitCoins."
+"Unlike BitCoin or cash payments, Taler ensures that\n"
+"\t           governments can learn their citizen's total income\n"
+"\t           and thus collect sales, value-added or income\n"
+"\t           taxes. Taler is a currency for the mainstream\n"
+"\t           economy, and not the black market."
 msgstr ""
-"Taler fonctionne comme une trésorerie. Cela signifie que\n"
-"\t     Taler n'est pas une nouvelle devise avec les risques inhérents aux"
-"\n"
-"\t     fluctuations monétaires, mais la monnaie digitale équivaut plutot "
-"aux\n"
-"\t     monnaies existantes, comme le dollar Américain, l'Euro ou même le\n"
-"\t     BitCoin."
 
-#: index.html.j2:61 news.html.j2:5 news.html.j2:14
-msgid "News"
+#: index.html.j2:39
+msgid "<b>A</b>nonymous"
+msgstr ""
+
+#: index.html.j2:41
+msgid ""
+"When you pay with Taler, your identity does not\n"
+"\t           have to be revealed to the merchant. Just like\n"
+"\t           payments in cash, nobody else can track how you\n"
+"\t           spent your electronic money. However, you obtain a\n"
+"\t           legally valid proof of payment."
+msgstr ""
+
+#: index.html.j2:49
+msgid "<b>L</b>ibre"
+msgstr ""
+
+#: index.html.j2:51
+msgid ""
+"Taler is free software\n"
+"\t           from <a href=\"http://www.gnu.org/\";>the GNU\n"
+"\t           project</a> implementing an open protocol.  Anybody\n"
+"\t           is welcome to inspect our code and integrate our\n"
+"\t           reference implementation into their applications."
 msgstr ""
 
 #: index.html.j2:62
-#, fuzzy
-msgid "Taler Web payments paper published."
-msgstr "Taler 0.0.0."
-
-#: index.html.j2:63
-msgid "More news »"
-msgstr "En savoir plus »"
-
-#: index.html.j2:67
-msgid "Taler technology: About taxability, change and privacy"
-msgstr "La technologie de Taler: Taxabilité, rendu de monnaie et vie privée"
-
-#: index.html.j2:68
-msgid ""
-"One of the key goals of Taler is to provide anonymity for\n"
-"           citizens buying goods and services, while ensuring that the "
-"state can\n"
-"           observe incoming transactions to ensure businesses engage only"
-" in\n"
-"           legal activities and do not evade taxes (such as income tax,\n"
-"           sales tax or value-added tax).  However, we also want to stay\n"
-"           out of the immediate personal domain, so sharing funds within "
-"a\n"
-"           family or copying coins between devices should not be subject "
-"to\n"
-"           monitoring by the state.\n"
-"         "
-msgstr ""
-"Un des buts principaux de Taler est de\n"
-"           fournir de l'anonymité pour les citoyens achetans des biens et"
-" des\n"
-"           services, tout en s'assurant que l'état peut observer les "
-"transactions\n"
-"           entrantes pour s'assurer que les activitées des entreprises "
-"soient\n"
-"           légales et qu'elle payent leur taxes. Néanmoins, nous voulons\n"
-"           aussi rester à l'écart du domaine personel. L'échange de fonds"
-"\n"
-"           dans le domaine familial et la copie de pièces entre plusieurs"
-"\n"
-"           dispositif ne devrais pas être assijeti à une surveillance "
-"étatique.\n"
-"         "
+msgid "<b>E</b>lectronic"
+msgstr ""
 
-#: index.html.j2:77
+#: index.html.j2:64
 msgid ""
-"As a result, Taler does not intrude into the\n"
-"           personal economic domain, offers good privacy, taxability\n"
-"           for transactions and the ability to give change.\n"
-"         "
+"Taler is easy to integrate with existing Web\n"
+"\t           applications. Payments are cryptographically\n"
+"\t           secured and are confirmed within milliseconds with\n"
+"\t           extremely low transaction costs."
+msgstr ""
+
+#: index.html.j2:71
+msgid "<b>R</b>eserves"
+msgstr ""
+
+#: index.html.j2:73
+msgid ""
+"Taler does not introduce a new currency with\n"
+"\t           fluctuation risks, and instead uses a digital\n"
+"\t           wallet holding coins in reserve. Taler's\n"
+"\t           cryptographic coins correspond to existing\n"
+"\t           currencies, such as US Dollars, Euros or even\n"
+"\t           BitCoins."
+msgstr ""
+
+#: index.html.j2:82
+msgid "Latest Videos"
+msgstr ""
+
+#: index.html.j2:83
+msgid "Florian Dold talks about Taler at 50p!"
+msgstr ""
+
+#: index.html.j2:93
+msgid "Taler News"
+msgstr ""
+
+#: index.html.j2:97
+msgid "Financial News"
 msgstr ""
-"En conséquence, Taler n'envahit pas les\n"
-"         finances personelles, protège la vie privée, offre une "
-"taxabilité\n"
-"         des transactions et la possibilité de rendre la monnaie."
 
 #: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
 #: investors.html.j2:14
-#, fuzzy
-msgid "Operate a Taler exchange!"
-msgstr "Investissez dans Taler !"
-
-#: investors.html.j2:20
-msgid ""
-"Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
-"             EdDSA) and is thus expected to be able to handle large "
-"transaction\n"
-"             volumes, only limited by the input/output capabilities of "
-"the\n"
-"             database. Thus, running a Taler exchange should be "
-"profitable even\n"
-"             with very low (less than 1 cent) transaction fees (at "
-"appropriate\n"
-"             transaction volume)."
-msgstr ""
-"Taler utilise des cryptographes primaires efficaces\n"
-"\t     (comme RSA 2048 et EdDSA) et doit être capable de gérer des "
-"volumes de\n"
-"\t     transaction importants, seulement limités par les capacités\n"
-"\t     entrée/sortie de la base de donnée."
-
-#: investors.html.j2:30
-msgid ""
-"All transactions in Taler are secured using modern cryptography and\n"
-"             trust in all parties is minimized. Financial damage is "
-"bounded\n"
-"             (for customers, merchants and the exchange) even\n"
-"             in the case that systems are compromised and private keys "
-"are stolen.\n"
-"             Databases can be audited for consistency, resulting in "
-"either the\n"
-"             detection of compromised systems or the demonstration that\n"
-"             participants were honest."
-msgstr ""
-"Toutes les transactions dans Taler sont sécurisées en\n"
-"\t     utilisant la cryptographie moderne et la confiance dans tous les\n"
-"\t     acteurs est minimisée. Les pertes financières sont limitées (pour "
-"les\n"
-"\t     clients, les commerçants et la banque) même dans le cas ou le "
-"système\n"
-"\t     est compromis ou si les clés privées sont volées. Les bases de "
-"données\n"
-"\t     peuvent être auditées sur leur régularité, avec pour résultat soit"
-" la\n"
-"\t     détection de systèmes compromis ou faisant la démonstration que "
-"les\n"
-"\t     participants sont honnêtes."
+msgid "Invest in Taler!"
+msgstr ""
+
+#: investors.html.j2:16
+msgid ""
+"We have created a company, Taler Systems SA in \n"
+"                   Luxemburgh.<br>\n"
+"                   Please contact <tt>address@hidden</tt>\n"
+"                   if you want to invest in Taler."
+msgstr ""
+
+#: investors.html.j2:24
+msgid "The Team"
+msgstr ""
+
+#: investors.html.j2:26
+msgid ""
+"Our team combines world-class business leaders,\n"
+"                   cryptographers, software engineers, civil-rights\n"
+"                   activits and academics. We are unified by a vision\n"
+"                   of how payments should work and the goal of\n"
+"                   imposing this vision upon the world."
+msgstr ""
+
+#: investors.html.j2:32
+msgid ""
+"We are currently supported by Inria, the French\n"
+"                   national institute for research in informatics and\n"
+"                   automation, and the Renewable Freedom Foundation."
+msgstr ""
+
+#: investors.html.j2:37
+msgid "The Technology"
+msgstr ""
 
 #: investors.html.j2:39
-msgid "Business model"
-msgstr "Business model"
-
-#: investors.html.j2:41
-msgid ""
-"The basic business model for Taler is the operation of an exchange.  An "
-"exchange converts money from traditional payment systems (Mastercard,\n"
-"             SEPA, Visa, BitCoin, ACH, SWIFT, etc.) to anonymous "
-"electronic\n"
-"             coins in the same currency. The customer can then redeem the"
-" electronic\n"
-"             coins at a merchant, who can exchange them for money "
-"represented using\n"
-"             traditional payment systems at the exchange.  The exchange "
-"can then charge\n"
-"             fees (to the customer, merchant or both) to facilitate the "
-"transactions."
-msgstr ""
-"The business model basique pour Taler est une opération\n"
-"\t     bancaire. Un bureau de change convertie la monnaie d'un système de"
-" paiement\n"
-"\t     traditionnel (Mastercard, SEPA, Visa, BitCoin, ACH, SWIFT, etc.) "
-"vers\n"
-"\t     une monnaie électronique anonyme dans la même devise. The client "
-"peut\n"
-"\t     alors transférer sa monnaie électronique vers un commerçant, qui "
-"peut\n"
-"\t     l'échanger contre de la monnaie en utilisant les système de "
-"paiement\n"
-"\t     traditionnels à la bureau de change. La bureau de change peut "
-"ajouter des frais (au\n"
-"\t     client, commerçant ou au deux) pour faciliter la transaction."
-
-#: investors.html.j2:50
-msgid "Taler as seen by the exchange operator"
-msgstr "Taler du point de vu de l'exploitant"
-
-#: investors.html.j2:52
-msgid ""
-"The exchange operator primarily operates a Web service\n"
-"          portal and keeps databases with transaction details and\n"
-"          cryptographic proofs.  Its operational expenses are thus "
-"related to\n"
-"          its interactions with the banking system and the operation of\n"
-"          the computing infrastructure, while its income is based on\n"
-"          transaction fees it may charge for the various interactions.\n"
-"          Key interactions of the exchange include:\n"
-"        "
-msgstr ""
-"L'exploitant d'un bureau de change opère principalement un un portail de\n"
-"          service web et garde une base de donnée des détails des "
-"transactions\n"
-"          et des preuves cryptographiques. Ses coûts operationels sont "
-"donc liés\n"
-"          à ses interactions avec le système banquaire et à "
-"l'infrastructure\n"
-"          informatique, tandis que ses revenus sont basés sur les frais "
-"de\n"
-"          transaction qu'il peut facurer pour les diverses opérations. "
-"Les opérations\n"
-"          clées du bureau de change incluent:"
-
-#: investors.html.j2:64
 msgid ""
-"Create a <b>reserve</b> based on an incoming\n"
-"              wire transfer from a customer."
-msgstr "Création d'une <b>réserve</b> basé sur un transfère banquaire d'un 
client."
+"All transactions in Taler are secured using modern\n"
+"                   cryptography and trust in all parties is\n"
+"                   minimized. Financial damage is bounded (for\n"
+"                   customers, merchants and the exchange) even in the\n"
+"                   case that systems are compromised and private keys\n"
+"                   are stolen.  Databases can be audited for\n"
+"                   consistency, resulting in either the detection of\n"
+"                   compromised systems or the demonstration that\n"
+"                   participants were honest. Actual transaction costs\n"
+"                   are fractions of a cent."
+msgstr ""
+
+#: investors.html.j2:51
+msgid "The Business"
+msgstr ""
+
+#: investors.html.j2:53
+msgid ""
+"The scalable business model for Taler is the operation\n"
+"                   of the payment service provider, which converts money "
+"from\n"
+"                   traditional payment systems (Mastercard, SEPA,\n"
+"                   Visa, BitCoin, ACH, SWIFT, etc.) to anonymous\n"
+"                   electronic coins in the same currency. The customer\n"
+"                   can then redeem the electronic coins at a merchant,\n"
+"                   who can exchange them for money represented using\n"
+"                   traditional payment systems at the exchange.  The\n"
+"                   exchange charges fees (to the customer,\n"
+"                   merchant or both) to facilitate the transactions."
+msgstr ""
 
 #: investors.html.j2:67
+msgid "Taler as seen by the payment service operator"
+msgstr ""
+
+#: investors.html.j2:69
+msgid ""
+"The payment service operator runs a <em>Taler\n"
+"                 exchange</em>, which is a Web service portal that\n"
+"                 keeps databases with transaction details and\n"
+"                 cryptographic proofs.  Its operational expenses are\n"
+"                 thus related to its interactions with the banking\n"
+"                 system and the operation of the computing\n"
+"                 infrastructure, while its income is based on\n"
+"                 transaction fees it may charge for the various\n"
+"                 interactions.  Key interactions of the exchange\n"
+"                 include: "
+msgstr ""
+
+#: investors.html.j2:83
+msgid ""
+"Create a <b>reserve</b> based on an incoming\n"
+"                      wire transfer from a customer."
+msgstr ""
+
+#: investors.html.j2:86
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
-"               digital coins from their reserve."
+"                      digital coins from their reserve."
 msgstr ""
-"Permetre aux utilisateurs de <b>retirer</b> (et rafraichir) des\n"
-"               pièces numériques de leur réserve."
 
-#: investors.html.j2:70
+#: investors.html.j2:89
 msgid "Accept and validate deposits from merchants."
 msgstr "Accepter et valider les dépos de marchands."
 
-#: investors.html.j2:72
+#: investors.html.j2:91
 msgid ""
 "Execute wire transfers to merchants in\n"
-"               response to validated deposits."
+"                      response to validated deposits."
 msgstr ""
-"Exection des transfères banquaires\n"
-"              vers les marchands en réponse aux dépos validés."
 
-#: investors.html.j2:75
+#: investors.html.j2:94
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
-"               correct operation for audits by financial regulators."
+"                      correct operation for audits by financial "
+"regulators."
 msgstr ""
-"Préserver et fournir les preuves cryptographiques\n"
-"              des opérations requises pour les audits pes les authorités "
-"financières."
 
 #: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Commerçants"
 
 #: merchants.html.j2:14
-msgid "Advantages for merchants"
-msgstr "Avantages pour les marchandes"
+msgid "Advantages for Merchants"
+msgstr ""
 
-#: merchants.html.j2:18
+#: merchants.html.j2:17
+msgid ""
+"Taler is a cost-effective electronic payment system\n"
+"\t           which provides you with cryptographic proof that\n"
+"\t           the payment worked correctly within milliseconds.\n"
+"\t           Your Web customers pay with previously unknown\n"
+"\t           levels of convenience without risk of fraud."
+msgstr ""
+
+#: merchants.html.j2:28
 msgid "Fast"
 msgstr "Rapide"
 
-#: merchants.html.j2:20
-msgid ""
-"Processing transactions with Taler is fast, allowing you\n"
-"\t     to confirm the transaction with your customer virtually "
-"immediately.\n"
-"\t     Your customers will appreciate that they do not have to type in "
-"credit\n"
-"\t     card information and play the &quot;verified by&quot; game.  By "
-"making payments\n"
-"\t     significantly more convenient for your customers, you may be able "
-"to\n"
-"\t     use Taler for small transactions that would not work with credit "
-"card\n"
-"\t     payments due to the mental overhead for customers."
-msgstr ""
-"Effectuer des transactions avec Taler est rapide, vous\n"
-"\t     permettant de confirmer la transaction avec votre client "
-"virtuellement\n"
-"\t     immédiatement. Vos clients apprécieront de ne pas avoir à donner "
-"leurs\n"
-"\t     coordonnées bancaires et d'effectuer le jeu des &quot;vérifié\n"
-"\t     par&quot;. En rendant les paiements significativement plus aisés "
-"pour\n"
-"\t     vos clients, vous aurez la possibilité d'utiliser Taler pour de\n"
-"\t     petites transactions qui ne sont pas possibles par carte de crédit"
-"\n"
-"\t     pour des raisons culturelles ou sociologiques pour vos clients."
+#: merchants.html.j2:30
+msgid ""
+"Processing transactions with Taler is fast,\n"
+"\t           allowing you to confirm the transaction with your\n"
+"\t           customer virtually immediately.  Your customers\n"
+"\t           will appreciate that they do not have to type in\n"
+"\t           credit card information and play the &quot;verified\n"
+"\t           by&quot; game.  By making payments significantly\n"
+"\t           more convenient for your customers, you may be able\n"
+"\t           to use Taler for small transactions that would not\n"
+"\t           work with credit card payments due to the mental\n"
+"\t           overhead for customers."
+msgstr ""
 
-#: merchants.html.j2:31
+#: merchants.html.j2:45
 msgid ""
-"You never learn sensitive customer information. You need\n"
-"\t     to ensure that your website provides the correct account "
-"information\n"
-"\t     for your business, and that you correctly validate the payment\n"
-"\t     confirmations from the Taler exchange.  As a result, you will have"
-"\n"
-"\t     cryptographic proof of payment for the specific contracts you "
-"entered\n"
-"\t     with your customers, and cryptographically signed confirmations "
-"from\n"
-"\t     the Taler exchange about the deposits. Taler does not require you "
-"to\n"
-"\t     undergo any particular security audits, processes or procedures, "
-"as\n"
-"\t     you never handle sensitive customer information.  Your systems "
-"will\n"
-"\t     have cryptographically signed contracts which you can use in court"
-" in\n"
-"\t     case of disputes."
-msgstr ""
-"Vous n'aurez pas accès aux données sensibles du client.\n"
-"\t     Vous devez vous assurer que votre site internet fournit les\n"
-"\t     informations bancaires correctes pour votre business, et que vous\n"
-"\t     validez correctement les confirmations de paiement à partire de la"
-"\n"
-"\t     monnaie Taler. Vous aurez comme résultat une preuve de paiement\n"
-"\t     cryptographiée pour les contrats spécifiques que vous aurez passé "
-"avec\n"
-"\t     votre client, et les confirmations signées cryptographiquement par"
-" la\n"
-"\t     monnaie Taler concernant les dépots. Taler ne vous oblige pas à "
-"suivre\n"
-"\t     des audits, des process ou des vérifications de sécurité "
-"particuliers,\n"
-"\t     puisque nous ne détenez aucune donnée sensible du client. Votre\n"
-"\t     système aura signé cryptographiquement des contrats que vous "
-"pourrez\n"
-"\t     utiliser en cas de litige auprès d'un tribunal."
-
-#: merchants.html.j2:44
+"You will have cryptographic proof of payment from\n"
+"\t           the Taler payment service provider. Taler does not\n"
+"\t           require you to undergo any particular security\n"
+"\t           audits (such as PCI DSS), processes or procedures,\n"
+"\t           as you never handle sensitive customer account\n"
+"\t           information.  Your systems will have customer\n"
+"\t           contracts wih qualified signatures for all\n"
+"\t           transactions which you can use in court in case of\n"
+"\t           disputes."
+msgstr ""
+
+#: merchants.html.j2:57
 msgid "Free Software"
 msgstr "Logiciel Libre"
 
-#: merchants.html.j2:46
+#: merchants.html.j2:59
 msgid ""
 "Taler is free software, and you can use the\n"
-"\t     liberally-licensed reference code as a starting point to integrate"
-"\n"
-"\t     Taler into your services. To use Taler, you do not need to pay "
-"license\n"
-"\t     fees, and the free software development model will ensure that you"
-" can\n"
-"\t     select from many competent developers to help you with your\n"
-"\t     integration."
-msgstr ""
-"Taler est un logiciel libre, et vous pouvez utiliser un\n"
-"\t     code de réféence licence libre comme point de départ pour intégrer"
-"\n"
-"\t     Taler dans vos services. Pour utiliser Taler, vous n'avez pas "
-"besoin\n"
-"\t     de payer de licence et le modèle de développement de licence libre"
-"\n"
-"\t     vous garanti de pouvoir sélectionner des développeurs compétents "
-"pour\n"
-"\t     vous aider dans l'intégration."
+"\t           liberally-licensed reference code as a starting\n"
+"\t           point to integrate Taler into your services. To use\n"
+"\t           Taler, you do not need to pay license fees, and the\n"
+"\t           free software development model will ensure that\n"
+"\t           you can select from many competent integrators for\n"
+"\t           support."
+msgstr ""
 
-#: merchants.html.j2:56
+#: merchants.html.j2:71
 msgid "Low Fees"
 msgstr "Faible Coût "
 
-#: merchants.html.j2:58
-msgid ""
-"Taler is designed to minimize the work the exchange needs to\n"
-"\t     perform.  Combined with Taler's strong security which prevents "
-"fraud,\n"
-"\t     exchanges can operate with very low overhead and thus low "
-"transaction\n"
-"\t     fees.  Given Taler's free software exchange reference "
-"implementation,\n"
-"\t     competition among exchanges will ensure fair, low transaction fees"
-" for\n"
-"\t     merchants."
-msgstr ""
-"Taler est construit pour minimiser le temps d'éxécution\n"
-"\t     de la monnaie. Couplé avec le haut système de sécurité de Taler "
-"qui\n"
-"\t     permet d'éviter les fraudes, les monnaies génèrent des coûts de\n"
-"\t     gestion et de frais très bas. L'installation via un logiciel libre"
-" de\n"
-"\t     la monnaie Taler, la compétition entre monnaies permettra des "
-"coûts de\n"
-"\t     transactions honnêtes et faibles pour les commerçants."
-
-#: merchants.html.j2:66
+#: merchants.html.j2:73
+msgid ""
+"Taler is designed to minimize the work the exchange\n"
+"\t           needs to perform.  Combined with Taler's strong\n"
+"\t           security which prevents fraud, payment service\n"
+"\t           providers can operate with very low overhead and\n"
+"\t           thus low transaction fees."
+msgstr ""
+
+#: merchants.html.j2:81
 msgid "Flexible"
 msgstr "Flexible"
 
-#: merchants.html.j2:68
+#: merchants.html.j2:83
 msgid ""
-"Taler can be used for different currencies (such as Euros\n"
-"\t     or US Dollars) and different payment models limited only by what "
-"the\n"
-"\t     exchange supports in its interactions."
+"Taler can be used for different currencies (such as\n"
+"\t           Euros, US Dollars or BitCoins) and different\n"
+"\t           payment models limited only by what the payment\n"
+"\t           service provider supports in its interactions."
 msgstr ""
-"Taler est construit pour minimiser le temps d'éxécution\n"
-"\t     de la monnaie. Couplé avec le haut système de sécurité de Taler "
-"qui\n"
-"\t     permet d'éviter les fraudes, les monnaies génèrent des coûts de\n"
-"\t     gestion et de frais très bas. L'installation via un logiciel libre"
-" de\n"
-"\t     la monnaie Taler, la compétition entre monnaies permettra des "
-"coûts de\n"
-"\t     transactions honnêtes et faibles pour les commerçants."
 
-#: merchants.html.j2:73
+#: merchants.html.j2:91
 msgid "Ethical"
 msgstr "Ethique"
 
-#: merchants.html.j2:75
-msgid ""
-"Taler does not support tax evasion or money laundering, and is\n"
-"             also not a pyramid scheme or speculative investment.  "
-"Taler's\n"
-"             protocols are efficient and do not waste energy. Taler "
-"encourages\n"
-"             competition by providing an open standard and free software\n"
-"             reference implementations."
-msgstr ""
-"Taler ne permet pas l'évasion fiscale ou le blanchiment\n"
-"\t     d'argent, et n'est pas non plus un schéma d'investissement "
-"pyramidal\n"
-"\t     ou spéculatif. Les protocoles Taler son efficaces et ne gaspillent"
-" pas\n"
-"\t     d'énergie. Taler encourage la concurrence en fournissant un "
-"standard\n"
-"\t     ouvert et des références d'installations de logiciels libres."
+#: merchants.html.j2:93
+msgid ""
+"Taler prevents tax evasion and money laundering.\n"
+"                   Taler's protocols are efficient and do not waste\n"
+"                   energy. Taler encourages transparency by providing\n"
+"                   an open standard and free software reference\n"
+"                   implementations."
+msgstr ""
 
-#: merchants.html.j2:83
+#: merchants.html.j2:102
 msgid "Taler as seen by merchants"
 msgstr "Taler du poit de vu des marchants"
 
-#: merchants.html.j2:85
-#, fuzzy
+#: merchants.html.j2:104
 msgid ""
-"Merchants supporting the Taler system need to integrate\n"
-"          some relatively simple logic into their transaction processing\n"
-"          system.\n"
-"          Typical steps performed by the merchant system are:\n"
-"        "
+"Merchants supporting the Taler system need to\n"
+"                 integrate some relatively simple logic into their\n"
+"                 transaction processing system.  Typical steps\n"
+"                 performed by the merchant system are: "
 msgstr ""
 
-#: merchants.html.j2:94
-#, fuzzy
+#: merchants.html.j2:113
 msgid ""
 "The new logic detects when a customer's system\n"
-"              supports Taler and then needs to send a cryptographically "
-"signed\n"
-"              version of the proposed contract in a simple JSON format to"
-"\n"
-"              the customer.\n"
-"              The message also includes salted, hashed wire details for\n"
-"              the merchant, as well as restrictions as to which exchange "
-"operators\n"
-"              the merchant is willing to deal with."
+"                      supports Taler and then needs to send a\n"
+"                      cryptographically signed version of the proposed\n"
+"                      contract in a simple JSON format to the\n"
+"                      customer.  The message also includes salted,\n"
+"                      hashed wire details for the merchant, as well as\n"
+"                      restrictions as to which exchange operators the\n"
+"                      merchant is willing to deal with."
 msgstr ""
 
-#: merchants.html.j2:102
+#: merchants.html.j2:122
 msgid ""
-"The customer sends a signed response which states\n"
-"               that certain digital coins now belong to the merchant to "
-"both\n"
-"               signal acceptance of the deal as well as to pay the "
-"respective\n"
-"               amount (bottom)."
+"The customer sends a signed response which\n"
+"                      states that certain digital coins now belong to\n"
+"                      the merchant to both signal acceptance of the\n"
+"                      deal as well as to pay the respective amount\n"
+"                      (bottom)."
 msgstr ""
-"Le client envoid une réponse signée qui stipule\n"
-"               que certaines pièces numériques apartienent désormais au "
-"marchand.\n"
-"               Cette signature sert à la fois de payement et de "
-"validation\n"
-"               du contrat."
 
-#: merchants.html.j2:107
+#: merchants.html.j2:128
 msgid ""
 "The merchant then forwards the signed messages\n"
-"               received from the customer to the exchange, together with "
-"its\n"
-"               wire details and the salt (without hashing).  The exchange"
-" verifies\n"
-"               the details and sends a signed confirmation (or an error\n"
-"               message) to the merchant.  The merchant checks that the\n"
-"               exchange's signature is valid, sends a confirmation to the"
-"\n"
-"               customer and executes the contract-specific business logic."
-msgstr ""
-"Le marchand transfère ensuite le message signé\n"
-"               reçu du client au exchange, avec ses détails banquaires et"
-" le sel (sans hashage).\n"
-"               Le exchange vérifie les détails et envoie une confirmation"
-" (ou un message d'erreur).\n"
-"               au marchand. Le marchand verifie que la signature du "
-"exchange est valide, envoi\n"
-"               la confirmation au client et execute le contrat."
-
-#: merchants.html.j2:115
-msgid ""
-"The exchange performs wire transfers corresponding to\n"
-"               the claims deposited by the merchant. Note that the "
-"exchange may\n"
-"               charge fees for the deposit operation, hence merchants may"
-"\n"
-"               impose limits restricting the set of exchange operators "
-"they are\n"
-"               willing to deal with, for example by imposing a bound on\n"
-"               deposit fees."
-msgstr ""
-"Le exchange effectue le virement banquaire correspondant\n"
-"               au dépos effectué par le marchant. Nottez que le exchange "
-"peut charger des\n"
-"               frais pour l'opération de dépos, les marchands peuvent "
-"donc imposer\n"
-"               des restrictions sur les exchanges avec lesquels il "
-"acceptent de travailler,\n"
-"               par exemple en imposant des limites sur les frais qu'ils "
-"acceptent."
-
-#: merchants.html.j2:125
+"                       received from the customer to the exchange,\n"
+"                       together with its wire details and the salt\n"
+"                       (without hashing).  The exchange verifies the\n"
+"                       details and sends a signed confirmation (or an\n"
+"                       error message) to the merchant.  The merchant\n"
+"                       checks that the exchange's signature is valid,\n"
+"                       sends a confirmation to the customer and\n"
+"                       executes the contract-specific business\n"
+"                       logic."
+msgstr ""
+
+#: merchants.html.j2:139
+msgid ""
+"The exchange performs wire transfers\n"
+"                       corresponding to the claims deposited by the\n"
+"                       merchant. Note that the exchange may charge\n"
+"                       fees for the deposit operation, hence merchants\n"
+"                       may impose limits restricting the set of\n"
+"                       exchange operators they are willing to deal\n"
+"                       with, for example by imposing a bound on\n"
+"                       deposit fees."
+msgstr ""
+
+#: merchants.html.j2:151
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
 
+#: merchants.html.j2:154
+msgid "The GNU Taler merchant backend operator tutorial"
+msgstr ""
+
+#: merchants.html.j2:157
+msgid "The GNU Taler Web shop integration tutorial (PHP)"
+msgstr ""
+
 #: wallet.html.j2:5
 msgid "Wallet"
 msgstr ""
@@ -1553,3 +1098,57 @@ msgstr ""
 #~ msgid "About&nbsp;us"
 #~ msgstr "À&nbsp;propos"
 
+#~ msgid "Stability "
+#~ msgstr "Stabilité"
+
+#~ msgid "News"
+#~ msgstr ""
+
+#~ msgid "Taler Web payments paper published."
+#~ msgstr "Taler 0.0.0."
+
+#~ msgid "More news »"
+#~ msgstr "En savoir plus »"
+
+#~ msgid "Taler technology: About taxability, change and privacy"
+#~ msgstr "La technologie de Taler: Taxabilité, rendu de monnaie et vie privée"
+
+#~ msgid "1-2017: Taler Documentation pages updated"
+#~ msgstr ""
+
+#~ msgid "Operate a Taler exchange!"
+#~ msgstr "Investissez dans Taler !"
+
+#~ msgid "Electronic payments for a liberal society!"
+#~ msgstr "Paiements électroniques pour une société libre!"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonyme"
+
+#~ msgid "Electronic"
+#~ msgstr "Électronique"
+
+#~ msgid "Reserves"
+#~ msgstr "Réserve"
+
+#~ msgid "Advantages for citizens"
+#~ msgstr "Avantages pour les citoyens"
+
+#~ msgid "Independent One-Click Payment!"
+#~ msgstr ""
+
+#~ msgid "Advantages for merchants"
+#~ msgstr "Avantages pour les marchandes"
+
+#~ msgid "Advantages for governments"
+#~ msgstr "Avantage pour les gouvernements"
+
+#~ msgid "Invest in GNU Taler!"
+#~ msgstr ""
+
+#~ msgid "Business model"
+#~ msgstr "Business model"
+
+#~ msgid "Taler as seen by the exchange operator"
+#~ msgstr "Taler du point de vu de l'exploitant"
+
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index dfeacc9..4960a05 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-08 06:20+0100\n"
+"POT-Creation-Date: 2017-02-10 15:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language: it\n"
@@ -15,14 +15,14 @@ msgstr ""
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:2 citizens.html.j2:2 developers.html.j2:2
-#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2 news.html.j2:2
+#: governments.html.j2:2 investors.html.j2:2 merchants.html.j2:2
 #: wallet.html.j2:2
 msgid "en"
 msgstr "it"
 
 #: about.html.j2:5 citizens.html.j2:5 developers.html.j2:5
-#: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5
-#: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5
+#: governments.html.j2:5 index.html.j2:5 investors.html.j2:5
+#: merchants.html.j2:5 wallet.html.j2:5
 msgid "GNU Taler"
 msgstr ""
 
@@ -125,205 +125,133 @@ msgid "Citizens"
 msgstr "Cittadini"
 
 #: citizens.html.j2:14
-msgid "Advantages for citizens"
-msgstr "Vantaggi per i cittadini"
+msgid "Advantages for Citizens"
+msgstr ""
+
+#: citizens.html.j2:18
+msgid ""
+"Taler largely functions like digital cash.  You\n"
+"\t           withdraw money from your bank account into your\n"
+"\t           electronic wallet, and can henceforth spend digital\n"
+"\t           cash.  The electronic wallet can carry multiple\n"
+"\t           currencies."
+msgstr ""
 
-#: citizens.html.j2:21
+#: citizens.html.j2:30
 msgid "Security"
 msgstr "Sicurezza"
 
-#: citizens.html.j2:23
-msgid ""
-"Taler is the electronic equivalent of cash, except harder to fake.\n"
-"             If your digital wallet is lost -- say because\n"
-"             your computer is irreparably damaged or compromised -- only "
-"the amount of coin\n"
-"             stored in your wallet will be lost. Unlike a physical "
-"wallet, you can make\n"
-"             backups of your digital wallet which can provide security "
-"against data loss.\n"
-"             So your digital wallet works mostly just like\n"
-"             a physical wallet, except online and without the need to "
-"manually count coins."
-msgstr ""
-"Taler è l'equivalente elettronico dei contanti, tranne per il fatto\n"
-"             che è più difficile da falsificare. Se il tuo portafoglio "
-"digitale va perso\n"
-"             (ad esempio, perché il tuo computer è stato danneggiato "
-"irreparabilmente o\n"
-"             compromesso), solo l'ammontare di denaro contenuto in esso "
-"andrà perduto a sua\n"
-"             volta. A differenza di un portafoglio reale, è possibile "
-"fare un backup di\n"
-"             quello digitale, così da garantire sicurezza contro la "
-"perdita dei dati. Quindi\n"
-"             il tuo portafoglio digitale funziona per lo più come quello "
-"reale, eccetto il\n"
-"             fatto che sia online ed eviti di contare manualmente le "
-"monete."
-
 #: citizens.html.j2:32
+msgid ""
+"Taler uses modern cryptography, ensuring that there\n"
+"                   is no counterfeit.  Your digital wallet is safer\n"
+"                   than your physical wallet.  At most, you can lose\n"
+"                   its contents because your computer or mobile is\n"
+"                   irreparably damaged or compromised.  Unlike a\n"
+"                   physical wallet, you can make backups to secure\n"
+"                   against data loss."
+msgstr ""
+
+#: citizens.html.j2:42
 msgid "Privacy"
 msgstr "Privacy"
 
-#: citizens.html.j2:34
+#: citizens.html.j2:44
 msgid ""
-"Your transactions are private, neither the exchange nor merchant needs to"
-"\n"
-"             learn your identity. There is no need to give our credit "
-"card numbers or\n"
-"             other sensitive information, and the merchant will only be "
-"able to do\n"
-"             exactly the transaction you confirmed using your digital "
-"wallet."
-msgstr ""
-"Le tue transazioni sono private, né la ufficio cambi, né il venditore\n"
-"\t     hanno bisogno di conoscere la tua identità. Non c'è necessità di "
-"rivelare il\n"
-"\t     numero di carta di credito o altre informazioni riservate, e il "
-"venditore sarà\n"
-"\t     solo in grado di fare l'esatta transazione che tu hai confermato "
-"usando il tuo\n"
-"\t     portafoglio digitale."
+"Your transactions are private, neither the exchange\n"
+"                   nor merchant needs to learn your identity. There is\n"
+"                   no need to give out credit card numbers or other\n"
+"                   sensitive information. The merchant will only be\n"
+"                   able to do exactly the transaction you agreed to."
+msgstr ""
 
-#: citizens.html.j2:42
+#: citizens.html.j2:55
 msgid "Convenience"
 msgstr "Convenienza"
 
-#: citizens.html.j2:44
+#: citizens.html.j2:57
 msgid ""
-"You will be able to withdraw digital coins to replenish your wallet using"
-"\n"
-"             your credit card or SEPA transactions, similar to how you "
-"pay or withdraw\n"
-"             cash today."
-msgstr ""
-"Potrai prelevare le tue monete digitali per riempire il portafoglio\n"
-"\t     usando la carta di credito o transazioni SEPA, simili al modo in "
-"cui paghi o\n"
-"\t     prelevi contanti normalmente al giorno d'oggi."
-
-#: citizens.html.j2:49
-msgid "Stability "
-msgstr "Stabilità"
-
-#: citizens.html.j2:51
-msgid ""
-"Coins in your digital wallet will be of the same denomination as the\n"
-"             cash in your physical wallet. So you will not have to worry "
-"about\n"
-"             currency fluctuations or conversion rates. Like a physical "
-"wallet,\n"
-"             you can carry digital coins of different currencies in your "
-"digital\n"
-"             wallet at the same time."
-msgstr ""
-"Il denaro nel tuo portafoglio digitale sarà sotto la stessa\n"
-"\t     denominazione di quello nel portafoglio reale, così da non doverti"
-" preoccupare\n"
-"\t     per la svalutazione della valuta o per le tariffe di conversione. "
-"Come in un\n"
-"\t     portafoglio normale, puoi avere allo stesso tempo monete digitali "
-"di diverse\n"
-"\t     valute nel tuo portafoglio digitale."
-
-#: citizens.html.j2:59
+"You will be able to withdraw money to replenish the\n"
+"                   digital coins in your wallet using your credit card\n"
+"                   or wire transfers.  Afterwards you can pay with\n"
+"                   one-click using the Taler wallet, which optionally\n"
+"                   keeps your transaction history on your computer."
+msgstr ""
+
+#: citizens.html.j2:66
+msgid "Stability"
+msgstr ""
+
+#: citizens.html.j2:68
+msgid ""
+"Coins in your digital wallet will be of the same\n"
+"                   denomination as the cash in your physical wallet.\n"
+"                   Taler is not a crypto-currency, so you do not have\n"
+"                   to worry about cryto-currency related value\n"
+"                   fluctuations.  Banking with Taler is subject to the\n"
+"                   usual government protections for finanical\n"
+"                   services."
+msgstr ""
+
+#: citizens.html.j2:79
 msgid "Taler as seen by customers"
 msgstr "Come i clienti vedono Taler"
 
-#: citizens.html.j2:61
+#: citizens.html.j2:81
 msgid ""
 "Customers interact with the Taler system mostly using\n"
-"          a free wallet implementation, which may be an extension or "
-"plugin\n"
-"          to their browser or a custom application on their computer(s).\n"
-"          Typical steps performed by customers are:\n"
-"        "
-msgstr ""
-"I cliente interagiscono con Taler principalmente utilizzando\n"
-"\tun portafoglio elettronico gratuito, che può presentarsi sia come una\n"
-"\testensione per il loro browser, sia come una applicazione dedicata.\n"
-"\tLe tipiche operazioni fatte da un cliente sono:"
-
-#: citizens.html.j2:70
-msgid ""
-"The customer selects an exchange (i.e. by visiting the\n"
-"              respective website or selecting from a list of exchanges in"
-" the\n"
-"              application) and asks the wallet to create bank transfer\n"
-"              instructions to withdraw a certain amount of electronic "
-"cash.\n"
-"              The bank transfer instructions will contain an\n"
-"              access code that must be included in the subject of the\n"
-"              transaction, as well as the wire details for the exchange "
-"(i.e.\n"
-"              a SEPA account number)."
-msgstr ""
-"Il cliente seleziona una ufficio cambi (visitandone il\n"
-"\t     sito o selezionandola da una lista nel caso egli usi "
-"l'applicazione\n"
-"\t     dedicata) e chiede al suo portafoglio di creare le istruzioni per "
-"un\n"
-"\t     bonifico che avrà come effetto finale quello di ottenere gettoni "
-"elettronci.\n"
-"\t     Tali istruzioni conterranno un codice d'accesso che dovrà essere "
-"incluso\n"
-"\t     nella causale del bonifico, nonché le coordinate bancarie della "
-"ufficio cambi\n"
-"\t     (che sarà un conto compatibile con SEPA)."
+"                 a free wallet implementation, which may be an\n"
+"                 extension or plugin to their browser or a custom\n"
+"                 application on their computer(s).  Typical steps\n"
+"                 performed by customers are: "
+msgstr ""
 
-#: citizens.html.j2:79
+#: citizens.html.j2:92
+msgid ""
+"The customer selects an exchange (i.e. by\n"
+"                      visiting the respective website or selecting\n"
+"                      from a list of exchanges in the application) and\n"
+"                      asks the wallet to create bank transfer\n"
+"                      instructions to withdraw a certain amount of\n"
+"                      electronic cash.  The bank transfer instructions\n"
+"                      will contain an access code that must be\n"
+"                      included in the subject of the transaction, as\n"
+"                      well as the wire details for the exchange (i.e.\n"
+"                      a SEPA account number)."
+msgstr ""
+
+#: citizens.html.j2:103
 msgid ""
 "The customer then instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange "
-"using\n"
-"               these instructions provided by the wallet (top left)."
+"                       transfer funds from his account to the Taler\n"
+"                       exchange using these instructions provided by\n"
+"                       the wallet (top left)."
 msgstr ""
-"Il cliente si rivolge alla sua <b>banca</b> per\n"
-"\t     trasferire fondi dal suo conto a quello della ufficio cambi, "
-"utilizzando\n"
-"\t     le istruzioni create dal suo portafoglio (in alto a sinistra)."
 
-#: citizens.html.j2:83
+#: citizens.html.j2:108
 msgid ""
 "Once the funds have arrived, the wallet will\n"
-"               automatically withdraw the electronic coins.  The\n"
-"               customer can use the wallet to review his remaining "
-"balance\n"
-"               at any time. He can also make backups to secure his "
-"digital\n"
-"               coins against hardware failures."
-msgstr ""
-"Una volta che i fondi sono arrivati alla zecca,\n"
-"\t     il portafoglio ritirerà automaticamente il corrispettivo in "
-"gettoni\n"
-"\t     elettronici. Il cliente può sempre usare il portafogli per "
-"controllare\n"
-"\t     il suo bilancio. Può anche effettuare copie di sicurezza come\n"
-"\t     prevenzione verso malfunzionamenti o danni alla sua macchina."
-
-#: citizens.html.j2:89
+"                       automatically withdraw the electronic coins.\n"
+"                       The customer can use the wallet to review his\n"
+"                       remaining balance at any time. He can also make\n"
+"                       backups to secure his digital coins against\n"
+"                       hardware failures."
+msgstr ""
+
+#: citizens.html.j2:115
 msgid ""
 "When visiting a merchant that supports Taler,\n"
-"               an additional payment option for Taler is enabled in the "
-"checkout system.\n"
-"               If the customer selects payments via Taler, the wallet\n"
-"               displays the secured contract from the merchant and asks\n"
-"               for confirmation.  Taler does not require the customer\n"
-"               to provide any identity information to the merchant.\n"
-"               Transaction histories and digitally\n"
-"               signed contracts can be preserved in the wallet for future"
-"\n"
-"               review by the customer, or even use in court."
+"                       an additional payment option for Taler is\n"
+"                       enabled in the checkout system.  If the\n"
+"                       customer selects payments via Taler, the wallet\n"
+"                       displays the secured contract from the merchant\n"
+"                       and asks for confirmation.  Taler does not\n"
+"                       require the customer to provide any identity\n"
+"                       information to the merchant.  Transaction\n"
+"                       histories and digitally signed contracts can be\n"
+"                       preserved in the wallet for future review by\n"
+"                       the customer, or even use in court."
 msgstr ""
-"Se un certo venditore supporta Taler, il suo\n"
-"\t     sito mostrerà una nuova opzione di pagamento. Se il cliente\n"
-"\t     sceglie Taler, il portafoglio mostrerà, previo controllo di\n"
-"\t     sicurezza, il contratto del venditore e chiederà una conferma.\n"
-"\t     Taler non richiede che il cliente riveli alcun dato personale\n"
-"\t     al venditore. Gli storici delle transazioni e i contratti possono\n"
-"\t     essere mantenuti nel portafoglio per future revisioni da parte\n"
-"\t     del cliente o persino per essere mostrati durante una causa."
 
 #: developers.html.j2:5
 msgid "Developers"
@@ -340,409 +268,253 @@ msgstr "Free"
 #: developers.html.j2:22
 msgid ""
 "Taler is free software implementing an open\n"
-"            protocol. Anybody is welcome to inspect our code and\n"
-"            integrate our reference implementation into their\n"
-"            applications.  Different components of Taler are being\n"
-"            made available under different licenses. The Affero\n"
-"            GPLv3+ is used for the exchange, the LGPLv3+ is used for\n"
-"            reference code demonstrating integration with merchant\n"
-"            platforms, and licenses like Apache/Mozilla/GPLv3+ are\n"
-"            used for wallets and related customer-facing software.\n"
-"            We are open for constructive suggestions for maximizing\n"
-"            the adoption of this libre payment platform.\n"
-"          "
+"                   protocol. Anybody is welcome to inspect our code\n"
+"                   and integrate our reference implementation into\n"
+"                   their applications.  Different components of Taler\n"
+"                   are being made available under different\n"
+"                   licenses. The Affero GPLv3+ is used for the\n"
+"                   exchange, the LGPLv3+ is used for reference code\n"
+"                   demonstrating integration with merchant platforms,\n"
+"                   and licenses like Apache/Mozilla/GPLv3+ are used\n"
+"                   for wallets and related customer-facing software.\n"
+"                   We are open for constructive suggestions for\n"
+"                   maximizing the adoption of this libre payment\n"
+"                   platform.  "
 msgstr ""
-"Taler è un free software che utilizza un\n"
-"\t    protocollo aperto. Chiunque è benvenuto per esaminare il\n"
-"\t    nostro codice e integrare le nostre implementazioni di\n"
-"\t    riferimento nelle loro applicazioni. Diversi componenti di\n"
-"\t    Taler sono stati resi disponibili sotto diverse\n"
-"\t    licenze. Affero GPLv3+ è usata per la exchange, LGPLv3+\n"
-"\t    per il codice di riferimento che mostra l'integrazione con\n"
-"\t    la piattaforma del venditore, e licenze come\n"
-"\t    Apache/Mozilla/GPLv3+ sono usate per i portafogli e i\n"
-"\t    relativi software di interfaccia dei clienti. Siamo aperti\n"
-"\t    a suggerimenti costruttivi per massimizzare l'adozione di\n"
-"\t    questa piattaforma di pagamento free.\n"
-"          "
 
-#: developers.html.j2:36
+#: developers.html.j2:38
 msgid "RESTful"
 msgstr "RESTful"
 
-#: developers.html.j2:38
+#: developers.html.j2:40
 msgid ""
 "Taler is designed to work on the Internet.  To\n"
-"\t    ensure that Taler payments can work with restrictive\n"
-"\t    network setups, Taler uses a RESTful protocol over HTTP or\n"
-"\t    HTTPS. Taler's security does not depend upon the use of\n"
-"\t    HTTPS, but obviously merchants may choose to offer HTTPS\n"
-"\t    for consistency and because it generally is better for\n"
-"\t    privacy compared to HTTP.  Taler uses JSON to encode\n"
-"\t    structure data, making it easy to integrate Taler with\n"
-"\t    existing Web applications.  Taler's protocol is documented\n"
-"\t    in detail <a href='https://api.taler.net/'>here</a>.\n"
-"          "
-msgstr ""
-"Taler è progettato per funzionare su\n"
-"\t    Internet. Per assicurare che i pagamenti in Taler possano\n"
-"\t    funzionare con configurazioni di rete ristrette, Taler usa\n"
-"\t    un protocollo RESTful su HTTP o HTTPS. La sicurezza di\n"
-"\t    Taler non dipende dall'uso di HTTPS, ma ovviamente i\n"
-"\t    venditori possono scegliere di offrire HTTPS per maggior\n"
-"\t    compattenza e perché è generalmente migliore per la\n"
-"\t    privacy se paragonato a HTTP.  Taler usa JSON per\n"
-"\t    codificare i dati di struttura, rendendo facile integrare\n"
-"\t    Taler con le già esistenti applicazioni web. Il protocollo\n"
-"\t    usato da Taler è documentato nel\n"
-"\t    dettaglio <a href='https://api.taler.net/'>qui</a>.\n"
-"          "
-
-#: developers.html.j2:53
+"\t           ensure that Taler payments can work with\n"
+"\t           restrictive network setups, Taler uses a RESTful\n"
+"\t           protocol over HTTP or HTTPS. Taler's security does\n"
+"\t           not depend upon the use of HTTPS, but obviously\n"
+"\t           merchants may choose to offer HTTPS for consistency\n"
+"\t           and because it generally is better for privacy\n"
+"\t           compared to HTTP.  Taler uses JSON to encode\n"
+"\t           structure data, making it easy to integrate Taler\n"
+"\t           with existing Web applications.  Taler's protocol\n"
+"\t           is documented in\n"
+"\t           detail <a href='https://api.taler.net/'>here</a>.\n"
+"\t           "
+msgstr ""
+
+#: developers.html.j2:58
 msgid "Code"
 msgstr "Codice"
 
-#: developers.html.j2:55
+#: developers.html.j2:60
 msgid ""
 "Taler is currently primarily developed by a\n"
-"\t    research team at Inria and TU Munich. However,\n"
-"\t    contributions from anyone are welcome.  Our Git\n"
-"\t    repositories can be cloned using the Git and HTTP access\n"
-"\t    methods against <tt>git.taler.net</tt> with the name of\n"
-"\t    the respective repository. A list of public repositories\n"
-"\t    can be found in\n"
-"\t    our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
+"\t           research team at Inria and GNUnet e.V. However,\n"
+"\t           contributions from anyone are welcome.  Our Git\n"
+"\t           repositories can be cloned using the Git and HTTP\n"
+"\t           access methods against <tt>git.taler.net</tt> with\n"
+"\t           the name of the respective repository. A list of\n"
+"\t           public repositories can be found in\n"
+"\t           our <a href='https://git.taler.net/'>GitWeb</a>.\n"
+"\t           "
 msgstr ""
-"Attualmente Taler è principalmente sviluppato\n"
-"\t    da un team di ricercatori di Inria e TU Munich. Comunque,\n"
-"\t    sono ben accetti contributi da parte di chiunque.  Le\n"
-"\t    nostre repository di Git possono essere clonate applicando\n"
-"\t    il metodo d'accesso di Git e HTTP su questo\n"
-"\t    link <tt>git.taler.net</tt>, con il nome della\n"
-"\t    corrispettiva repository. Una lista delle repository\n"
-"\t    pubbiche può essere trovata al nostro\n"
-"\t    <a href='https://git.taler.net/'>GitWeb</a>.\n"
-"          "
 
-#: developers.html.j2:66
+#: developers.html.j2:72
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: developers.html.j2:68
+#: developers.html.j2:74
 msgid ""
 "In addition to this website,\n"
-"            the <a href='https://git.taler.net/'>documented\n"
-"            code</a> and the <a href='https://api.taler.net/'>API\n"
-"            documentation</a>, we are in the process of preparing a\n"
-"            comprehensive design document which will be published here\n"
-"            soon.\n"
-"          "
+"                   the <a href='https://git.taler.net/'>documented\n"
+"                   code</a> and\n"
+"                   the <a href='https://api.taler.net/'>API\n"
+"                   documentation</a>, we are in the process of\n"
+"                   preparing a comprehensive design document which\n"
+"                   will be published here soon.  "
 msgstr ""
-"Oltre a questo sito,\n"
-"\t    il <a href='https://git.taler.net/'>codice\n"
-"\t    documentato</a>, e\n"
-"\t    la <a href='https://api.taler.net/'>documentazione API</a>,\n"
-"\t    siamo preparando un documento integrale di progettazione\n"
-"\t    che sarà presto pubblicato qui.\n"
-"          "
 
-#: developers.html.j2:77
+#: developers.html.j2:83
 msgid "Discussion"
 msgstr "Discussione"
 
-#: developers.html.j2:79
+#: developers.html.j2:85
 msgid ""
 "We have a mailinglist for developer discussions.\n"
-"            You can subscribe to it or read the list archive at\n"
-"            <a "
+"                   You can subscribe to it or read the list archive at\n"
+"                   <a "
 
"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 msgstr ""
-"We have a mailinglist for developer discussions.\n"
-"            You can subscribe to it or read the list archive at\n"
-"            <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
 
-#: developers.html.j2:87
+#: developers.html.j2:93
 msgid "Regression Testing"
 msgstr "Test delle regressioni"
 
-#: developers.html.j2:89
+#: developers.html.j2:95
 msgid ""
-"We\n"
-"            have <a href='https://buildbot.net/'>Buildbot</a>\n"
-"            automation tests to detect regressions and check for\n"
-"            portability at\n"
+"We have\n"
+"                   <a href='https://buildbot.net/'>Buildbot</a>\n"
+"                   automation tests to detect regressions and check\n"
+"                   for portability at\n"
 "            <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>."
 "\n"
 "          "
 msgstr ""
-"E' disponibile\n"
-"\t    un <a href='https://buildbot.net/'>Buildbot</a>\n"
-"\t    dedicato a test automatici per individuare regressioni e\n"
-"\t    controllare la portabilità, alla\n"
-"\t    pagina <a "
-"href='https://buildbot.taler.net/'>buildbot.taler.net</a>.\n"
-"          "
 
-#: developers.html.j2:97
+#: developers.html.j2:103
 msgid "Code Coverage Analysis"
 msgstr "Analisi della copertura del codice"
 
-#: developers.html.j2:99
+#: developers.html.j2:105
 msgid ""
-"We\n"
-"            use <a "
+"We use\n"
+"                   <a "
 "href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-"            to analyze the code coverage of our tests, the results are\n"
-"            available\n"
-"            at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
+"                   to analyze the code coverage of our tests, the\n"
+"                   results are available\n"
+"                   at <a "
+"href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
+"                   "
 msgstr ""
-"I test effettuati sul software Taler subiscono\n"
-"\t    la misurazione della loro 'copertura'\n"
-"\t    da <a href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>;"
-"\n"
-"\t    inoltre, tali risultati sono disponibili alla\n"
-"\t    pagina <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-"          "
 
-#: developers.html.j2:107
+#: developers.html.j2:113
 msgid "Performance Analysis"
 msgstr "Analisi delle prestazioni"
 
-#: developers.html.j2:109
+#: developers.html.j2:115
 msgid ""
 "We\n"
-"            use <a href='https://gnunet.org/gauger'>Gauger</a> for\n"
-"            performance regression analysis of the exchange backend\n"
-"            at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
+"                   use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
+"                   for performance regression analysis of the exchange\n"
+"                   backend\n"
+"                   at <a "
+"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
+"                   "
 msgstr ""
-"Le prestazioni della ufficio cambi sono misurate attraverso\n"
-"\t    <a href='https://gnunet.org/gauger'>Gauger</a>, e i\n"
-"\t    risultati disponibili alla pagina\n"
-"\t    <a href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-"          "
 
-#: developers.html.j2:118
+#: developers.html.j2:125
 msgid "Taler system overview"
 msgstr "Schema generale del sistema Taler"
 
-#: developers.html.j2:120
+#: developers.html.j2:127
 msgid ""
-"The Taler system consists of protocols executed\n"
-"          among a number of actors with the help\n"
-"          of <a href='https://www.fsf.org/'>Free Software</a> as\n"
-"          illustrated in the illustration on the right.  Typical\n"
-"          transactions involve the following steps:\n"
-"        "
+"The Taler system consists of protocols executed among\n"
+"                 a number of actors with the help\n"
+"                 of <a href='https://www.fsf.org/'>Free Software</a>\n"
+"                 as illustrated in the illustration on the right.\n"
+"                 Typical transactions involve the following steps: "
 msgstr ""
-"Taler usa <a href='https://www.fsf.org/'>software\n"
-"\t  libero</a> per realizzare i protocolli finalizzati alla\n"
-"\t  comunicazione tra i vari partecipanti come illustrato nella\n"
-"\t  figura a destra.  La tipica transazione nel modello Taler si\n"
-"\t  compone dei seguenti passaggi:\n"
-"        "
 
-#: developers.html.j2:129
+#: developers.html.j2:136
 msgid ""
 "A customer instructs his <b>bank</b> to\n"
-"               transfer funds from his account to the Taler exchange\n"
-"               (top left).  In the subject of the transaction, he\n"
-"               includes an authentication token from his\n"
-"               electronic <b>wallet</b>. In Taler terminology, the\n"
-"               customer creates a reserve at the exchange.\n"
-"             "
-msgstr ""
-"Un cliente chiede alla sua <b>banca</b> di\n"
-"\t       trasferire fondi dal suo conto a quello della\n"
-"\t       ufficio cambi Taler (in alto a destra).  La causale di\n"
-"\t       questo trasferimento includerà l'informazione\n"
-"\t       necessaria, generata dal portafoglio elettronico\n"
-"\t       (<b>wallet</b>) compatibile col sistema Taler, ad\n"
-"\t       autenticare il cliente alla ufficio cambi (nota anche\n"
-"\t       come &quot;exchange&quot;).  Nella terminologia adeguata, si "
-"dirà\n"
-"\t       che il cliente ha creato una riserva.\n"
-"             "
-
-#: developers.html.j2:137
-msgid ""
-"Once the exchange has received the\n"
-"               transfer, it allows the customer's electronic wallet\n"
-"               to <b>withdraw</b> electronic coins.  The electronic\n"
-"               coins are digital representations of the original\n"
-"               currency from the transfer. It is important to note\n"
-"               that the exchange does not learn the &quot;serial "
-"numbers&quot;\n"
-"               of the coins created in this process, so it cannot tell\n"
-"               later which customer purchased what at which merchant.\n"
-"               The use of Taler does not change the currency or the\n"
-"               total value of the funds (except for fees which the\n"
-"               exchange may charge for the service).\n"
-"             "
-msgstr ""
-"In seguito alla ricezione del trasferimento\n"
-"\t       da parte della ufficio cambi, il cliente\n"
-"\t       potrà <b>ritirare</b> i suoi gettoni elettronici.  Tali\n"
-"\t       gettoni sono rappresentazioni digitali dell'ammonto che\n"
-"\t       il cliente ha trasferitto alla ufficio cambi. E'\n"
-"\t       fondamentale notare che in questo processo la\n"
-"\t       ufficio cambi non apprende nessun &quot;numero seriale&quot; dei"
-"\n"
-"\t       gettoni coinvolti, in modo tale da non poter a\n"
-"\t       posteriori associare un certo cliente ad un certo\n"
-"\t       acquisto. Taler non interferisce dunque né con la\n"
-"\t       valuta né con l'ammonto presente nella riserva. L'unica\n"
-"\t       modifca apportata da Taler alla riserva è la\n"
-"\t       sottrazione da questa della tariffa del servizio.\n"
-"             "
-
-#: developers.html.j2:150
-msgid ""
-"Once the customer has the digital coins in\n"
-"               his wallet, the wallet can be used to <b>spend</b> the\n"
-"               coins with merchant portals that support the Taler\n"
-"               payment system and accept the respective exchange as a\n"
-"               business partner (bottom arrow). This creates a digital\n"
-"               contract signed by the customer's coins and the\n"
-"               merchant.  If necessary, the customer can later use\n"
-"               this digitally signed contract in a court of law to\n"
-"               prove the exact terms of the contract and that he paid\n"
-"               the respective amount. The customer does not learn the\n"
-"               banking details of the merchant, and Taler does not\n"
-"               require the merchant to learn the identity of the\n"
-"               customer. Naturally, the customer can spend any\n"
-"               fraction of his digital coins (the system takes care of\n"
-"               customers getting change).\n"
-"             "
-msgstr ""
-"Con i gettoni elettronici nel portafogli,\n"
-"\t       il cliente può <b>spendere</b> presso tutti i venditori\n"
-"\t       che accettano Taler tra i loro sistemi di pagamento, e\n"
-"\t       che sono disponibili a finalizzare l'operazione con la\n"
-"\t       stessa ufficio cambi che ha dato i gettoni al cliente\n"
-"\t       (freccia in basso).  Tecnicamente, ciò comporta la\n"
-"\t       creazione di un certificato firmato d'ambo le parti:\n"
-"\t       dal venditore e dalla chiave corrispondente al gettone\n"
-"\t       speso (vale la pena notare che un gettone, altro non è,\n"
-"\t       che una coppia di chiavi pubblica e privata). Assumendo\n"
-"\t       che i tribunali accettino firme elettroniche, un\n"
-"\t       cliente può utilizzare tale certificato per mostrare i\n"
-"\t       suoi termini esatti e che egli ha pagato la somma\n"
-"\t       dovuta. Ancora, il cliente non viene mai a conoscenza\n"
-"\t       degli estremi bancari del negoziante e, allo stesso\n"
-"\t       modo, Taler non richiede che il negoziante debba\n"
-"\t       conoscere l'identità del cliente. Naturalmente, il\n"
-"\t       cliente può anche spendere una frazione di uno dei suoi\n"
-"\t       gettoni, grazie alla facoltà che Taler ha di restituire\n"
-"\t       il cambio.\n"
-"\t     "
-
-#: developers.html.j2:167
+"                       transfer funds from his account to the Taler\n"
+"                       exchange (top left).  In the subject of the\n"
+"                       transaction, he includes an authentication\n"
+"                       token from his electronic <b>wallet</b>. In\n"
+"                       Taler terminology, the customer creates a\n"
+"                       reserve at the exchange.  "
+msgstr ""
+
+#: developers.html.j2:144
+msgid ""
+"Once the exchange has received the wire\n"
+"                       transfer, it allows the customer's electronic\n"
+"                       wallet to <b>withdraw</b> electronic coins.\n"
+"                       The electronic coins are digital\n"
+"                       representations of the original currency from\n"
+"                       the transfer. It is important to note that the\n"
+"                       exchange does not learn the &quot;serial\n"
+"                       numbers&quot; of the coins created in this\n"
+"                       process, so it cannot tell later which customer\n"
+"                       purchased what at which merchant.  The use of\n"
+"                       Taler does not change the currency or the total\n"
+"                       value of the funds (except for fees which the\n"
+"                       exchange may charge for the service).  "
+msgstr ""
+
+#: developers.html.j2:159
+msgid ""
+"Once the customer has the digital coins in his\n"
+"                       wallet, the wallet can be used to <b>spend</b>\n"
+"                       the coins with merchant portals that support\n"
+"                       the Taler payment system and accept the\n"
+"                       respective exchange as a business partner\n"
+"                       (bottom arrow). This creates a digital contract\n"
+"                       signed by the customer's coins and the\n"
+"                       merchant.  If necessary, the customer can later\n"
+"                       use this digitally signed contract in a court\n"
+"                       of law to prove the exact terms of the contract\n"
+"                       and that he paid the respective amount. The\n"
+"                       customer does not learn the banking details of\n"
+"                       the merchant, and Taler does not require the\n"
+"                       merchant to learn the identity of the\n"
+"                       customer. Naturally, the customer can spend any\n"
+"                       fraction of his digital coins (the system takes\n"
+"                       care of customers getting change).  "
+msgstr ""
+
+#: developers.html.j2:177
 msgid ""
 "Merchants receiving digital\n"
-"               coins <b>deposit</b> the respective receipts that\n"
-"               resulted from the contract signing with the customer at\n"
-"               the exchange to redeem the coins.  The deposit step\n"
-"               does not reveal the details of the contract between the\n"
-"               customer and the merchant or the identity of the\n"
-"               customer to the exchange in any way. However, the\n"
-"               exchange does learn the identity of the merchant via\n"
-"               the provided bank routing information.  The merchant\n"
-"               can, for example when compelled by the state for\n"
-"               taxation, provide information linking the individual\n"
-"               deposit to the respective contract signed by the\n"
-"               customer. Thus, the exchange's database allows the\n"
-"               state to enforce that merchants pay applicable taxes\n"
-"               (and do not engage in illegal contracts).\n"
-"             "
-msgstr ""
-"Contemporaneamente alla firma dei contratti\n"
-"\t       viene creata una ricevuta che il negoziante\n"
-"\t       può <b>depositare</b> alla ufficio cambi al fine di\n"
-"\t       riavere indietro il corrispettivo in denaro del gettone\n"
-"\t       che ha ricevuto dal cliente. Il deposito non mette la\n"
-"\t       ufficio cambi nelle condizioni di apprendere i dettagli\n"
-"\t       del contratto tra il negoziante e il cliente, né\n"
-"\t       l'identità stessa del cliente. Ad ogni modo, la\n"
-"\t       ufficio cambi potrà (e dovrà) conoscere l'identità del\n"
-"\t       negoziante, dal momento che essa necessità dei suoi\n"
-"\t       estremi bancari necessari a finalizzare il\n"
-"\t       processo.\n"
-"             "
-
-#: developers.html.j2:184
+"                       coins <b>deposit</b> the respective receipts\n"
+"                       that resulted from the contract signing with\n"
+"                       the customer at the exchange to redeem the\n"
+"                       coins.  The deposit step does not reveal the\n"
+"                       details of the contract between the customer\n"
+"                       and the merchant or the identity of the\n"
+"                       customer to the exchange in any way. However,\n"
+"                       the exchange does learn the identity of the\n"
+"                       merchant via the provided bank routing\n"
+"                       information.  The merchant can, for example\n"
+"                       when compelled by the state for taxation,\n"
+"                       provide information linking the individual\n"
+"                       deposit to the respective contract signed by\n"
+"                       the customer. Thus, the exchange's database\n"
+"                       allows the state to enforce that merchants pay\n"
+"                       applicable taxes (and do not engage in illegal\n"
+"                       contracts).  "
+msgstr ""
+
+#: developers.html.j2:196
 msgid ""
 "Finally, the exchange transfers funds\n"
-"               corresponding to the digital coins redeemed by the\n"
-"               merchants to the merchant's <b>bank</b> account. The\n"
-"               exchange may combine multiple small transactions into\n"
-"               one larger bank transfer.  The merchant can query the\n"
-"               exchange about the relationship between the bank\n"
-"               transfers and the individual claims that were\n"
-"               deposited.\n"
-"             "
-msgstr ""
-"Infine, la ufficio cambi trascferirà fondi\n"
-"\t       della stessa cifra dei gettoni riscattati dal negoziate\n"
-"\t       verso il conto in <b>banca</b> di quest' ultimo. Nulla\n"
-"\t       impedisce alla zezza di combinare molteplici piccole\n"
-"\t       transazioni in un unico bonifico verso il conto del\n"
-"\t       negoziante. Il negoziante può in ogni momento\n"
-"\t       interrogare la ufficio cambi sullo stato dei bonifici\n"
-"\t       che egli ha diritto a ricevere.\n"
-"\t     "
-
-#: developers.html.j2:194
+"                       corresponding to the digital coins redeemed by\n"
+"                       the merchants to the merchant's <b>bank</b>\n"
+"                       account. The exchange may combine multiple\n"
+"                       small transactions into one larger bank\n"
+"                       transfer.  The merchant can query the exchange\n"
+"                       about the relationship between the bank\n"
+"                       transfers and the individual claims that were\n"
+"                       deposited.  "
+msgstr ""
+
+#: developers.html.j2:206
 msgid ""
 "Most importantly, the exchange keeps\n"
-"               cryptographic proofs that allow it to demonstrate that\n"
-"               it is operating correctly to third parties.  The system\n"
-"               requires an external <b>auditor</b>, such as a\n"
-"               government-appointed financial regulatory body, to\n"
-"               frequently verify the exchange's databases and check that\n"
-"               its bank balance matches the total value of the\n"
-"               remaining coins in circulation.\n"
-"             "
-msgstr ""
-"E' importante notare che la ufficio cambi\n"
-"\t       mantiene prove crittografiche che le permettono di\n"
-"\t       dimostrare la sua buona fede verso terze\n"
-"\t       parti. Nell'architettura di Taler è prevista la\n"
-"\t       presenza di un <b>ispettore</b> esterno, come ad\n"
-"\t       esempio un apparato statale del fisco, che controlla\n"
-"\t       costantemente i database della ufficio cambi per\n"
-"\t       verificare che il suo bilancio corrisponda sempre alla\n"
-"\t       quantità di gettoni ancora in circolazione.\n"
-"             "
-
-#: developers.html.j2:204
+"                       cryptographic proofs that allow it to\n"
+"                       demonstrate that it is operating correctly to\n"
+"                       third parties.  The system requires an\n"
+"                       external <b>auditor</b>, such as a\n"
+"                       government-appointed financial regulatory body,\n"
+"                       to frequently verify the exchange's databases\n"
+"                       and check that its bank balance matches the\n"
+"                       total value of the remaining coins in\n"
+"                       circulation.  "
+msgstr ""
+
+#: developers.html.j2:217
 msgid ""
 "Without the auditor, the exchange operators\n"
-"               could embezzle funds they are holding in\n"
-"               reserve. Customers and merchants cannot cheat each\n"
-"               other or the exchange. If any party's computers are\n"
-"               compromised, the financial damage is limited to the\n"
-"               respective party and proportional to the funds they\n"
-"               have in circulation during the period of the\n"
-"               compromise.\n"
-"             "
-msgstr ""
-"L'assenza di taler ispettore metterebbe i\n"
-"\t       gestori della ufficio cambi nelle condizioni di\n"
-"\t       appropriarsi del denaro presente nelle sue riserve.\n"
-"\t       Clienti e negozianti non hanno la possibilità di\n"
-"\t       frodarsi a vicenda, né di frodare la ufficio cambi. Se\n"
-"\t       il computer di qualcuna delle parti viene compromesso,\n"
-"\t       la perdita finananziaria non tocca le altre parti ed è\n"
-"\t       proporzionale ai fondi che tale computer ha in\n"
-"\t       circolazione durante il periodo della compromissione.\n"
-"\t     "
-
-#: financial-news.html.j2:5 financial-news.html.j2:14
-msgid "Financial News"
+"                       could embezzle funds they are holding in\n"
+"                       reserve. Customers and merchants cannot cheat\n"
+"                       each other or the exchange. If any party's\n"
+"                       computers are compromised, the financial damage\n"
+"                       is limited to the respective party and\n"
+"                       proportional to the funds they have in\n"
+"                       circulation during the period of the\n"
+"                       compromise.  "
 msgstr ""
 
 #: governments.html.j2:5
@@ -750,802 +522,567 @@ msgid "Governments"
 msgstr "Governi"
 
 #: governments.html.j2:14
-msgid "Advantages for governments"
-msgstr "Vantaggi per i governi"
+msgid "Advantages for Governments"
+msgstr ""
+
+#: governments.html.j2:18
+msgid ""
+"Taler provides accountability to ensure business\n"
+"                   accepting payments operate legally, while also\n"
+"                   respecting civil liberties of citizens spending\n"
+"                   digital cash.  Taler is a commons, a payment system\n"
+"                   based on open standards and free software.  Taler\n"
+"                   needs governments to set a financial framework and\n"
+"                   to act as trusted regulators.  Taler contributes to\n"
+"                   digital sovereignty in the critial financial\n"
+"                   infrastructure."
+msgstr ""
 
-#: governments.html.j2:21 index.html.j2:25
+#: governments.html.j2:34
 msgid "Taxable"
 msgstr "Tassabile"
 
-#: governments.html.j2:23
-msgid ""
-"Taler is an electronic payment system that was built with the goal of "
-"supporting taxation.\n"
-"             With Taler, the receiver of any form of payment is known, "
-"and the payment information comes\n"
-"             attached with some details about what the payment was made "
-"for (but not the identity of the customer).  Thus, governments can use "
-"this\n"
-"             data to tax buisnesses and individuals based on their "
-"income, making tax evasion and\n"
-"             black markets less viable."
-msgstr ""
-"Taler è un sistema di pagamento elettronico ideato con lo scopo di "
-"supportare la tassazione.\n"
-"\t     Con Taler, il ricevitore di qualsiasi forma di pagamento è "
-"conosciuto, e le informazioni del pagamento\n"
-"\t     arrivano con l'aggiunta di dettagli riguardo al perché sia stato "
-"effettuato. Quindi i governi possono usare\n"
-"\t     questi dati per tazzare aziende e individui in base al loro "
-"reddito, così da rendere evasione fiscale\n"
-"\t     e mercato nero meno usufruibili."
-
-#: governments.html.j2:30 investors.html.j2:28 merchants.html.j2:29
+#: governments.html.j2:36
+msgid ""
+"Taler was\n"
+"\t           built with the goal of fighting corruption and supporting "
+"taxation.  \n"
+"\t           With Taler, the receiver of any form of payment is\n"
+"\t           easily identified by the government, and the merchant\n"
+"                   can be compelled to provide the contract that was "
+"accepted\n"
+"                   by the customer.  Governments can use this data to\n"
+"\t           tax businesses and individuals based on their\n"
+"\t           income, making tax evasion and black markets less\n"
+"\t           viable."
+msgstr ""
+
+#: governments.html.j2:46
+msgid ""
+"Thus, despite offering anonymity for citizens\n"
+"                   spending digital cash to buy goods and services,\n"
+"                   Taler also ensures that the state can observe\n"
+"                   incoming funds. This can be used to ensure\n"
+"                   businesses engage only in legal activities, and do\n"
+"                   not evade income tax, sales tax or value-added tax.\n"
+"                   However, this observational capability does not\n"
+"                   extend to the immediate personal domain.  In\n"
+"                   particular, sharing access to funds within a family\n"
+"                   or synchronizing wallets across multiple devices is "
+"not\n"
+"                   subject to monitoring."
+msgstr ""
+
+#: governments.html.j2:59 merchants.html.j2:43
 msgid "Secure"
 msgstr "Sicuro"
 
-#: governments.html.j2:32
-msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, "
-"merchants and\n"
-"             the exchange can mathematically demonstrate their lawful "
-"behavior in court in case\n"
-"             of disputes. Financial damages are strictly limited, "
-"improving economic security\n"
-"             for individuals, merchants, the exchange and the state.  "
-"Most importantly, an\n"
-"             independent auditor can ensure that there is no &quot;bad "
-"exchange&quot;\n"
-"             within the Taler system who might threaten the economy due "
-"to fraud."
-msgstr ""
-"I pagamenti fatti con Taler sono crittograficamente sicuri. In questo "
-"modo, clienti, venditori\n"
-"\t     e il conio possono matematicamente dimostrare il loro "
-"comportamento legittimo in un processo, in\n"
-"\t     caso di controversie. I danni finanziari sono molto limitati "
-"attraverso l'incremento di sicurezza\n"
-"\t     economica per l'individuo, il venditore, il conio e lo stato. "
-"Ancora più importante è il fatto che un\n"
-"\t     qualsiasi revisore di conti indipendente possa assicurare che non "
-"ci sia un &quot;conio cattivo&quot; all'interno\n"
-"\t     del sistema di Taler che potrebbe minacciare l'economia attraverso"
-" frodi fiscali."
-
-#: governments.html.j2:42 index.html.j2:39
+#: governments.html.j2:61
+msgid ""
+"Taler's payments are cryptographically\n"
+"                   secured. Thus, customers, merchants and the\n"
+"                   exchange can mathematically demonstrate their\n"
+"                   lawful behavior in court in case of\n"
+"                   disputes. Financial damages are strictly limited,\n"
+"                   improving economic security for individuals,\n"
+"                   merchants, the exchange and the state."
+msgstr ""
+
+#: governments.html.j2:69
+msgid ""
+"By design, the Taler payment service provider is\n"
+"                   subject to financial regulation. Financial\n"
+"                   regulation and regular audits are critical to\n"
+"                   establish trust. In particular, the Taler design\n"
+"                   mandates the existence of an independent auditor\n"
+"                   who checks cryptographic proofs that accumulate at\n"
+"                   the payment service provider to ensure that the\n"
+"                   escrow account is managed honestly.  This ensures\n"
+"                   that the payment service provider does not threaten\n"
+"                   the economy due to fraud."
+msgstr ""
+
+#: governments.html.j2:80
 #, fuzzy
 msgid "Libre"
 msgstr "Libero"
 
-#: governments.html.j2:44
+#: governments.html.j2:82
 msgid ""
-"Taler is free software implementing an open protocol standard.  Thus, "
-"Taler will\n"
-"             enable competition and avoid the monopolization of payment "
-"systems that threatens\n"
-"             global political and financial stability today."
+"Taler is free software implementing an open\n"
+"                   protocol standard.  Thus, Taler will enable\n"
+"                   competition and avoid the monopolization of payment\n"
+"                   systems that threatens global political and\n"
+"                   financial stability today."
 msgstr ""
-"Taler è un free software che implementa standard di protocollo aperto. "
-"Quindi Taler\n"
-"\t     abiliterà la competizione ed eviterà la monopolizzazione dei "
-"sistemi di pagamento che oggigiorno\n"
-"\t     minacciano la politica globale e la stabilità finanziaria."
 
-#: governments.html.j2:49 investors.html.j2:18
+#: governments.html.j2:91
 msgid "Efficient"
 msgstr "Efficiente"
 
-#: governments.html.j2:51
+#: governments.html.j2:93
 msgid ""
-"Taler is designed to be efficient.  Unlike timeline-based payment systems"
-" like\n"
-"             BitCoin, Taler will not threaten the availability of "
-"national electric grids or\n"
-"             (significantly) contribute to environmental pollution."
+"Taler has an efficient design.  Unlike\n"
+"                   timeline-based payment systems, such as BitCoin,\n"
+"                   Taler will not threaten the availability of\n"
+"                   national electric grids or (significantly)\n"
+"                   contribute to environmental pollution."
 msgstr ""
-"Taler è progettato per essere efficiente. A differenza dei sistemi di "
-"pagamento come\n"
-"\t     BitCoin, Taler non minaccerà la disponibilità della rete elettrica"
-" nazionale o contribuirà ad incrementare\n"
-"\t     (in modo significativo) l'inquinamento."
 
-#: governments.html.j2:57
+#: governments.html.j2:102
 msgid "Taler as seen by governments"
 msgstr "Taler dal punto di vista dai governi"
 
-#: governments.html.j2:59
-msgid ""
-"Governments can observe traditional wire\n"
-"          transfers entering and leaving the Taler system, and\n"
-"          require merchants and exchange operators to provide certain\n"
-"          information during financial audits.  Exchange operators\n"
-"          are expected to be permanently checked by auditors,\n"
-"          while merchants may be required to reveal information\n"
-"          during regular tax audits.\n"
-"          Information available to the government includes:\n"
-"        "
-msgstr ""
-"Organi quali gli Stati potranno osservare i trasferimenti\n"
-"\tbancari in ingresso e in uscita dal sistema Taler, e richiedere ai "
-"venditori\n"
-"\te alla zecca le informazioni necessarie nelle ispezioni finanziarie.\n"
-"\tGli operatori della zecca dovranno aspettarsi ripetitivi controlli da\n"
-"\tparte degli ispettori, mentre ai negozianti sarà richiesto di rivelare\n"
-"\tle informazioni necessarie soltanto durante la riscossione delle tasse."
-"\n"
-"\tLe informazini disponibili ai governi includono:"
-
-#: governments.html.j2:71
-msgid ""
-"From the banking system:\n"
-"              The total amount of digital currency\n"
-"              obtained by a customer. The government could impose\n"
-"              limits on how many digital coins a customer may\n"
-"              withdraw within a given timeframe."
-msgstr ""
-"Dal sistema bancario:\n"
-"\t     l'ammonto totale dei gettoni digitali in possesso\n"
-"\t     di un certo cliente. Lo Stato potrebbe imporre un limite\n"
-"\t     alla quantità di moneta digitale che un cliente può ritirare\n"
-"\t     in un certo lasso di tempo."
-
-#: governments.html.j2:77
-msgid ""
-"From the banking system:\n"
-"               The total amount of income received\n"
-"               by any merchant via the Taler system."
-msgstr ""
-"Dal sistema bancario:\n"
-"\t     La somma totale delle entrate di un negoziante attraverso\n"
-"\t     Taler."
-
-#: governments.html.j2:81
-msgid ""
-"From auditing the exchange:\n"
-"               The amounts of digital coins legitimately withdrawn by\n"
-"               customers from the exchange, the value of non-redeemed "
-"digital coins\n"
-"               in customer's wallets, the value and corresponding wire "
-"details\n"
-"               of deposit operations performed by merchants with the "
-"exchange, and\n"
-"               the income of the exchange from transaction fees."
-msgstr ""
-"Dalle ispezioni alla ufficio cambi:\n"
-"\t     La somma di gettoni digitali ritirati dai clienti alla ufficio "
-"cambi,\n"
-"\t     il valore dei gettoni ancora custoditi nei portafogli virtuali\n"
-"\t     dei clienti (chiamati anche &quot;gettoni non riscattati&quot;), "
-"il valore\n"
-"\t     e i dettagli dei bonifici che i mercanti hanno ricevuti in seguito"
-"\n"
-"\t     alla operazione di &quot;deposito&quot; (ossia quando le monete "
-"virtuali vengono\n"
-"\t     riscattate dai mercanti) effettuata presso la ufficio cambi, e le "
-"entrate\n"
-"\t     della ufficio cambi dovute alle tariffe applicate ai suoi servizi"
-
-#: governments.html.j2:88
-msgid ""
-"From auditing merchants:\n"
-"               For each deposit operation, the exact details of the\n"
-"               underlying contract that was signed between\n"
-"               customer and merchant.  However, this information would\n"
-"               typically not include the identity of the customer.\n"
-"               Note that while the customer can decide to prove that it "
-"was his\n"
-"               transaction (i.e. in court when suing the merchant if the\n"
-"               merchant failed to deliver on the contract),\n"
-"               merchant, exchange and government cannot find out the "
-"customer's\n"
-"               identity from the information that Taler collects."
-msgstr ""
-"Dalle ispezioni ai negozianti:\n"
-"\t     Per ogni operazione di deposito, i dettagli del contratto,\n"
-"\t     firmato da cliente e negoziante, da cui questa è stata\n"
-"\t     originata. Tipicamente, questa informazione non include\n"
-"\t     l'identità del cliente. Si noti che l'identità del cliente\n"
-"\t     può essere resa nota solo se questi decide volontariamente di\n"
-"\t     rivelare i suoi estremi (ad esempio, nel caso ritenga di dover\n"
-"\t     procedere per vie legali per risolvere\n"
-"\t     un disputa con un negoziante), in quanto ufficio cambi, negozianti"
-"\n"
-"\t     e ispettore fiscale non possono risalire a tale informazione\n"
-"\t     sulla sola base dei dati raccoli da Taler."
+#: governments.html.j2:104
+msgid ""
+"Governments can observe traditional wire transfers\n"
+"                 entering and leaving the Taler system, and require\n"
+"                 merchants and exchange operators to provide certain\n"
+"                 information during financial audits.  Exchange\n"
+"                 operators are expected to be permanently checked by\n"
+"                 auditors, while merchants may be required to reveal\n"
+"                 information during regular tax audits.  Information\n"
+"                 available to the government includes: "
+msgstr ""
+
+#: governments.html.j2:117
+msgid ""
+"From the banking system: The total amount of\n"
+"  \t              digital currency obtained by a customer. The\n"
+"  \t              government could impose limits on how many\n"
+"  \t              digital coins a customer may withdraw within a\n"
+"  \t              given timeframe."
+msgstr ""
+
+#: governments.html.j2:123
+msgid ""
+"From the banking system: The total amount of\n"
+"                       income received by any merchant via the Taler\n"
+"                       system."
+msgstr ""
+
+#: governments.html.j2:127
+msgid ""
+"From auditing the exchange: The amounts of\n"
+"                       digital coins legitimately withdrawn by\n"
+"                       customers from the exchange, the value of\n"
+"                       non-redeemed digital coins in customer's\n"
+"                       wallets, the value and corresponding wire\n"
+"                       details of deposit operations performed by\n"
+"                       merchants with the exchange, and the income of\n"
+"                       the exchange from transaction fees."
+msgstr ""
+
+#: governments.html.j2:136
+msgid ""
+"From auditing merchants: For each deposit\n"
+"                      operation, the exact details of the underlying\n"
+"                      contract that was signed between customer and\n"
+"                      merchant.  However, this information would\n"
+"                      typically not include the identity of the\n"
+"                      customer.  Note that while the customer can\n"
+"                      decide to prove that it was his transaction\n"
+"                      (i.e. in court when suing the merchant if the\n"
+"                      merchant failed to deliver on the contract),\n"
+"                      merchant, exchange and government cannot find\n"
+"                      out the customer's identity from the information\n"
+"                      that Taler collects."
+msgstr ""
+
+#: index.html.j2:6
+msgid "Taxable Anonymous Libre Electronic Reserves"
+msgstr ""
 
 #: index.html.j2:17
-msgid "Electronic payments for a liberal society!"
-msgstr "Pagamenti elettronici per una società libera!"
+msgid "Independent One-Click Payments!"
+msgstr ""
 
-#: index.html.j2:18
+#: index.html.j2:19
 msgid ""
-"Taler is a new electronic payment system under development\n"
-"\t   at <a href=\"http://www.inria.fr/\";>Inria</a>.  Today, this website "
-"only\n"
-"\t    presents the advantages our system is expected to provide.  We "
-"expect to\n"
-"\t    make the payment system operational in 2017."
+"Taler is an electronic payment system under\n"
+"\t          development\n"
+"\t          at <a href=\"http://www.inria.fr/\";>Inria</a>.  This\n"
+"\t          community Web site provides extensive documentation\n"
+"\t          about the system, which we expect to make\n"
+"\t          operational in 2017."
+msgstr ""
+
+#: index.html.j2:29
+msgid "<b>T</b>axable"
 msgstr ""
 
-#: index.html.j2:26
+#: index.html.j2:31
 msgid ""
 "Unlike BitCoin or cash payments, Taler ensures that\n"
-"\t     governments can learn their citizen's total income and thus "
-"collect\n"
-"\t     sales, value-added or income taxes. Taler is thus a currency for "
-"the\n"
-"\t     mainstream economy, and not the black market."
-msgstr ""
-"A differenza di BitCoin o del pagamento in contanti, Taler\n"
-"\t     assicura che i govrni possano facilmente tracciare il reddito dei "
-"loro\n"
-"\t     cittadini e di conseguenza riscuotere vendite, IVA o tasse. Taler "
-"è quindi\n"
-"\t     una valuta per un'economia tradizionale, e non per il mercato nero."
-
-#: index.html.j2:32
-msgid "Anonymous"
-msgstr "Anonimo"
-
-#: index.html.j2:33
-msgid ""
-"When you pay with Taler, your identity does not have to\n"
-"\t     be revealed to the merchant. The bank, government and exchange "
-"will also\n"
-"\t     never learn how you spent your electronic money. However, you can\n"
-"\t     prove that you paid in court if necessary."
-msgstr ""
-"Quando paghi usando Taler, la tua identità non deve essere\n"
-"\t     rivelata al venditore. Anche la banca, il governo e la ufficio "
-"cambi non sapranno\n"
-"\t     come spendi i tuoi soldi elettronici. Comunque, se necessario, è "
-"possibile\n"
-"\t     dimostrante durante un processo di aver pagato."
-
-#: index.html.j2:40
-msgid ""
-"Taler is free software from <a href=\"http://www.gnu.org/\";>the GNU "
-"project</a> implementing an open protocol.\n"
-"\t     Anybody is welcome to inspect our code and integrate our reference"
-"\n"
-"\t     implementation into their applications."
+"\t           governments can learn their citizen's total income\n"
+"\t           and thus collect sales, value-added or income\n"
+"\t           taxes. Taler is a currency for the mainstream\n"
+"\t           economy, and not the black market."
 msgstr ""
 
-#: index.html.j2:47
-msgid "Electronic"
-msgstr "Elettronico"
+#: index.html.j2:39
+msgid "<b>A</b>nonymous"
+msgstr ""
 
-#: index.html.j2:48
+#: index.html.j2:41
 msgid ""
-"Taler is designed to work on the Internet. Using a\n"
-"\t    so-called RESTful protocol over HTTP or HTTPS, Taler is easy to\n"
-"\t    integrate with existing Web applications."
+"When you pay with Taler, your identity does not\n"
+"\t           have to be revealed to the merchant. Just like\n"
+"\t           payments in cash, nobody else can track how you\n"
+"\t           spent your electronic money. However, you obtain a\n"
+"\t           legally valid proof of payment."
 msgstr ""
-"Taler è progettato per funzionare su Internet. Usando un cosiddetto\n"
-"\t    protocollo RESTful su HTTP o HTTPS, Taler è facile da integrare con"
-" applicazioni\n"
-"\t    web già esistenti."
 
-#: index.html.j2:53
-msgid "Reserves"
-msgstr "Riserva"
+#: index.html.j2:49
+msgid "<b>L</b>ibre"
+msgstr ""
 
-#: index.html.j2:54
+#: index.html.j2:51
 msgid ""
-"Taler uses an electronic exchange holding financial\n"
-"             reserves in existing currencies. This means that Taler is "
-"not\n"
-"\t     a new currency with the inherent currency fluctuation risks, but\n"
-"\t     instead the cryptographic coins correspond to existing currencies,"
-" such as\n"
-"\t     US Dollars, Euros or even BitCoins."
+"Taler is free software\n"
+"\t           from <a href=\"http://www.gnu.org/\";>the GNU\n"
+"\t           project</a> implementing an open protocol.  Anybody\n"
+"\t           is welcome to inspect our code and integrate our\n"
+"\t           reference implementation into their applications."
 msgstr ""
-"\n"
-"\t     E' importante notare che Taler non è una nuova valuta, "
-"allontanandosi dunque da tutti i\n"
-"\t     rischi di fluttuazione che questo comporterebbe. La sua ufficio "
-"cambi funziona come una riserva,\n"
-"\t     ossia un tramite che fa corrispondere gettoni criptati a vere "
-"valute come Euro, Dollaro\n"
-"\t     Americano o anche Bitcoin."
 
-#: index.html.j2:61 news.html.j2:5 news.html.j2:14
-msgid "News"
+#: index.html.j2:62
+msgid "<b>E</b>lectronic"
 msgstr ""
 
-#: index.html.j2:62
-#, fuzzy
-msgid "Taler Web payments paper published."
-msgstr "Taler 0.0.0."
-
-#: index.html.j2:63
-msgid "More news »"
-msgstr "Scopri di più »"
-
-#: index.html.j2:67
-msgid "Taler technology: About taxability, change and privacy"
-msgstr "La tecnologia Taler: tassabilità, cambio e privacy"
-
-#: index.html.j2:68
-msgid ""
-"One of the key goals of Taler is to provide anonymity for\n"
-"           citizens buying goods and services, while ensuring that the "
-"state can\n"
-"           observe incoming transactions to ensure businesses engage only"
-" in\n"
-"           legal activities and do not evade taxes (such as income tax,\n"
-"           sales tax or value-added tax).  However, we also want to stay\n"
-"           out of the immediate personal domain, so sharing funds within "
-"a\n"
-"           family or copying coins between devices should not be subject "
-"to\n"
-"           monitoring by the state.\n"
-"         "
-msgstr ""
-"Uno dei principali obbiettivi di Taler è quello\n"
-"  \t   di fornire anonimato ai cittadini nel momento in cui questi "
-"effettuano acquisti\n"
-"\t   di beni e servizi. Allo stesso tempo, si vuole dare allo Stato uno "
-"strumento che sia\n"
-"\t   in grado di prevenire evasione fiscale (salvaguardando, ad esempio, "
-"IVA e imposta sul\n"
-"\t   reddito) e attività illegali. Ad ogni modo, Taler non vuole "
-"intervenire nelle relazioni\n"
-"\t   interpersonali, cosicché la condivisione di fondi tra membri di una "
-"famiglia o la\n"
-"\t   copia di gettoni tra più dispositivi non sarà soggetta a "
-"monitoraggio statale.\n"
-"\t "
-
-#: index.html.j2:77
-msgid ""
-"As a result, Taler does not intrude into the\n"
-"           personal economic domain, offers good privacy, taxability\n"
-"           for transactions and the ability to give change.\n"
-"         "
-msgstr ""
-"Ne deriva che Taler non entra nella gestione economica personale,\n"
-"\t offre privacy affidabile, tassabilità per le transazioni e la "
-"possibilità di dare\n"
-"\t il cambio"
+#: index.html.j2:64
+msgid ""
+"Taler is easy to integrate with existing Web\n"
+"\t           applications. Payments are cryptographically\n"
+"\t           secured and are confirmed within milliseconds with\n"
+"\t           extremely low transaction costs."
+msgstr ""
+
+#: index.html.j2:71
+msgid "<b>R</b>eserves"
+msgstr ""
+
+#: index.html.j2:73
+msgid ""
+"Taler does not introduce a new currency with\n"
+"\t           fluctuation risks, and instead uses a digital\n"
+"\t           wallet holding coins in reserve. Taler's\n"
+"\t           cryptographic coins correspond to existing\n"
+"\t           currencies, such as US Dollars, Euros or even\n"
+"\t           BitCoins."
+msgstr ""
+
+#: index.html.j2:82
+msgid "Latest Videos"
+msgstr ""
+
+#: index.html.j2:83
+msgid "Florian Dold talks about Taler at 50p!"
+msgstr ""
+
+#: index.html.j2:93
+msgid "Taler News"
+msgstr ""
+
+#: index.html.j2:97
+msgid "Financial News"
+msgstr ""
 
 #: investors.html.j2:5
 msgid "Investors"
 msgstr ""
 
 #: investors.html.j2:14
-#, fuzzy
-msgid "Operate a Taler exchange!"
-msgstr "Investi in Taler!"
-
-#: investors.html.j2:20
-msgid ""
-"Taler uses efficient cryptographic primitives (such as RSA 2048 and\n"
-"             EdDSA) and is thus expected to be able to handle large "
-"transaction\n"
-"             volumes, only limited by the input/output capabilities of "
-"the\n"
-"             database. Thus, running a Taler exchange should be "
-"profitable even\n"
-"             with very low (less than 1 cent) transaction fees (at "
-"appropriate\n"
-"             transaction volume)."
-msgstr ""
-"Taler utilizza efficienti algoritmi crittografici di base (come RSA 2048\n"
-"\t     e EdDSA) e quindi dovrebbe essere in grado di gestire transazioni "
-"di grande volume,\n"
-"\t     limitato solamente dalle capacità di input/output del database. "
-"Quindi, usare un conio\n"
-"\t     di Taler dovrebbe essere redditizio anche con un prezzo di "
-"transazione molto basso\n"
-"\t     (meno di 1 cent) in relazione al volume di transazione appropriato."
-
-#: investors.html.j2:30
-msgid ""
-"All transactions in Taler are secured using modern cryptography and\n"
-"             trust in all parties is minimized. Financial damage is "
-"bounded\n"
-"             (for customers, merchants and the exchange) even\n"
-"             in the case that systems are compromised and private keys "
-"are stolen.\n"
-"             Databases can be audited for consistency, resulting in "
-"either the\n"
-"             detection of compromised systems or the demonstration that\n"
-"             participants were honest."
-msgstr ""
-"Tutte le transazioni in Taler sono rese sicure usando la moderna\n"
-"\t     crittografia e la fiducia in tutte le varie parti coinvolte è "
-"tenuta al minimo.\n"
-"\t     Il danno finanziario è limitato (sia per il cliente, il mercante e"
-" la valuta)\n"
-"\t     and in caso il sistema venisse compromesso e le chiavi private "
-"rubate.\n"
-"\t     I database possono essere controllati per coerenza, facendo sì che"
-" vengano evidenziate\n"
-"\t     sia la scoperta di sistemi compromessi, sia la dimostrazione che i"
-" partecipanti sono stati\n"
-"\t     onesti."
+msgid "Invest in Taler!"
+msgstr ""
+
+#: investors.html.j2:16
+msgid ""
+"We have created a company, Taler Systems SA in \n"
+"                   Luxemburgh.<br>\n"
+"                   Please contact <tt>address@hidden</tt>\n"
+"                   if you want to invest in Taler."
+msgstr ""
+
+#: investors.html.j2:24
+msgid "The Team"
+msgstr ""
+
+#: investors.html.j2:26
+msgid ""
+"Our team combines world-class business leaders,\n"
+"                   cryptographers, software engineers, civil-rights\n"
+"                   activits and academics. We are unified by a vision\n"
+"                   of how payments should work and the goal of\n"
+"                   imposing this vision upon the world."
+msgstr ""
+
+#: investors.html.j2:32
+msgid ""
+"We are currently supported by Inria, the French\n"
+"                   national institute for research in informatics and\n"
+"                   automation, and the Renewable Freedom Foundation."
+msgstr ""
+
+#: investors.html.j2:37
+msgid "The Technology"
+msgstr ""
 
 #: investors.html.j2:39
-msgid "Business model"
-msgstr "Modello business"
-
-#: investors.html.j2:41
-msgid ""
-"The basic business model for Taler is the operation of an exchange.  An "
-"exchange converts money from traditional payment systems (Mastercard,\n"
-"             SEPA, Visa, BitCoin, ACH, SWIFT, etc.) to anonymous "
-"electronic\n"
-"             coins in the same currency. The customer can then redeem the"
-" electronic\n"
-"             coins at a merchant, who can exchange them for money "
-"represented using\n"
-"             traditional payment systems at the exchange.  The exchange "
-"can then charge\n"
-"             fees (to the customer, merchant or both) to facilitate the "
-"transactions."
-msgstr ""
-"Il modello business di base per Taler è l'operazione di un ufficio cambi."
-"\n"
-"\t     La ufficio cambi converte i soldi da un sistema di pagamento "
-"tradizionale (Mastercard,\n"
-"\t     SEPA, Visa, BitCoin, ACH, SWIFT, ecc.) a monete elettroniche "
-"anonime nella stessa\n"
-"\t     valuta. Il cliente può allora restituire le monete elettroniche ad"
-" un mercante,\n"
-"\t     che può scambiarle alla ufficio cambi ccon monete rappresentate "
-"dal sistema di\n"
-"\t     pagamento tradizionale. La ufficio cambi può quindi tassare (il "
-"cliente, il mercante\n"
-"\t     o entrambi) per facilitare le transazioni."
-
-#: investors.html.j2:50
-msgid "Taler as seen by the exchange operator"
-msgstr "Come opera la ufficio cambi di Taler"
-
-#: investors.html.j2:52
-msgid ""
-"The exchange operator primarily operates a Web service\n"
-"          portal and keeps databases with transaction details and\n"
-"          cryptographic proofs.  Its operational expenses are thus "
-"related to\n"
-"          its interactions with the banking system and the operation of\n"
-"          the computing infrastructure, while its income is based on\n"
-"          transaction fees it may charge for the various interactions.\n"
-"          Key interactions of the exchange include:\n"
-"        "
-msgstr ""
-"Chi gestisce la ufficio cambi dovrà offrire un portale\n"
-"\tWeb e mantenere vari database in cui custodire dettagli circa "
-"transazioni\n"
-"\te certificati criptografici. I suoi costi dipenderanno dunque da quanto"
-" e come\n"
-"\tessa si interfaccerà col sistema bancario, e dalla sua infrastruttura "
-"informatica.\n"
-"\tDall'altro lato, i suoi guadagni saranno basati sulle tariffe applicate"
-" alle\n"
-"\tvarie operazioni offerte. Tali operazioni offerte comprendono:\n"
-"\t"
-
-#: investors.html.j2:64
 msgid ""
-"Create a <b>reserve</b> based on an incoming\n"
-"              wire transfer from a customer."
+"All transactions in Taler are secured using modern\n"
+"                   cryptography and trust in all parties is\n"
+"                   minimized. Financial damage is bounded (for\n"
+"                   customers, merchants and the exchange) even in the\n"
+"                   case that systems are compromised and private keys\n"
+"                   are stolen.  Databases can be audited for\n"
+"                   consistency, resulting in either the detection of\n"
+"                   compromised systems or the demonstration that\n"
+"                   participants were honest. Actual transaction costs\n"
+"                   are fractions of a cent."
+msgstr ""
+
+#: investors.html.j2:51
+msgid "The Business"
+msgstr ""
+
+#: investors.html.j2:53
+msgid ""
+"The scalable business model for Taler is the operation\n"
+"                   of the payment service provider, which converts money "
+"from\n"
+"                   traditional payment systems (Mastercard, SEPA,\n"
+"                   Visa, BitCoin, ACH, SWIFT, etc.) to anonymous\n"
+"                   electronic coins in the same currency. The customer\n"
+"                   can then redeem the electronic coins at a merchant,\n"
+"                   who can exchange them for money represented using\n"
+"                   traditional payment systems at the exchange.  The\n"
+"                   exchange charges fees (to the customer,\n"
+"                   merchant or both) to facilitate the transactions."
 msgstr ""
-"Creazione di una <b>riserva</b> in seguito\n"
-"\t    alla ricezione di un bonifico bancario da parte di un cliente"
 
 #: investors.html.j2:67
+msgid "Taler as seen by the payment service operator"
+msgstr ""
+
+#: investors.html.j2:69
+msgid ""
+"The payment service operator runs a <em>Taler\n"
+"                 exchange</em>, which is a Web service portal that\n"
+"                 keeps databases with transaction details and\n"
+"                 cryptographic proofs.  Its operational expenses are\n"
+"                 thus related to its interactions with the banking\n"
+"                 system and the operation of the computing\n"
+"                 infrastructure, while its income is based on\n"
+"                 transaction fees it may charge for the various\n"
+"                 interactions.  Key interactions of the exchange\n"
+"                 include: "
+msgstr ""
+
+#: investors.html.j2:83
+msgid ""
+"Create a <b>reserve</b> based on an incoming\n"
+"                      wire transfer from a customer."
+msgstr ""
+
+#: investors.html.j2:86
 msgid ""
 "Allow customers to withdraw (and refresh)\n"
-"               digital coins from their reserve."
+"                      digital coins from their reserve."
 msgstr ""
-"Permettere ai clienti di ritirare e cambiare gettoni posseduti\n"
-"\t    con gettoni nuovi (attraverso una operazione chiamata "
-"<b>refresh</b>)\n"
-"\t    i gettoni digitali dalla loro riserva."
 
-#: investors.html.j2:70
+#: investors.html.j2:89
 msgid "Accept and validate deposits from merchants."
 msgstr ""
 "Accettare e validare depositi di gettoni elettronici\n"
 "\t    da parte dei venditori."
 
-#: investors.html.j2:72
+#: investors.html.j2:91
 msgid ""
 "Execute wire transfers to merchants in\n"
-"               response to validated deposits."
+"                      response to validated deposits."
 msgstr ""
-"Eseguire bonifici verso i conti dei venditori in seguito\n"
-"\t    a depositi (di gettoni elettronici) andati a buon fine"
 
-#: investors.html.j2:75
+#: investors.html.j2:94
 msgid ""
 "Preserve and provide cryptographic proofs of\n"
-"               correct operation for audits by financial regulators."
+"                      correct operation for audits by financial "
+"regulators."
 msgstr ""
-"Preservare e fornire prove crittografiche delle\n"
-"\t    varie operazioni al fine di permettere controlli da parte di organi"
-"\n"
-"\t    finanziari"
 
 #: merchants.html.j2:5
 msgid "Merchants"
 msgstr "Venditori"
 
 #: merchants.html.j2:14
-msgid "Advantages for merchants"
-msgstr "Vantaggi per i mercanti"
+msgid "Advantages for Merchants"
+msgstr ""
+
+#: merchants.html.j2:17
+msgid ""
+"Taler is a cost-effective electronic payment system\n"
+"\t           which provides you with cryptographic proof that\n"
+"\t           the payment worked correctly within milliseconds.\n"
+"\t           Your Web customers pay with previously unknown\n"
+"\t           levels of convenience without risk of fraud."
+msgstr ""
 
-#: merchants.html.j2:18
+#: merchants.html.j2:28
 msgid "Fast"
 msgstr "Veloce"
 
-#: merchants.html.j2:20
-msgid ""
-"Processing transactions with Taler is fast, allowing you\n"
-"\t     to confirm the transaction with your customer virtually "
-"immediately.\n"
-"\t     Your customers will appreciate that they do not have to type in "
-"credit\n"
-"\t     card information and play the &quot;verified by&quot; game.  By "
-"making payments\n"
-"\t     significantly more convenient for your customers, you may be able "
-"to\n"
-"\t     use Taler for small transactions that would not work with credit "
-"card\n"
-"\t     payments due to the mental overhead for customers."
-msgstr ""
-"L'elaborazione delle transazioni con Taler è veloce, e ti permette di "
-"confermare virtualmente\n"
-"\t     la transazione con il tuo cliente immediatamente. Il cliente "
-"apprezzerà di non dover inserire\n"
-"\t     informazioni sulla carta di credito e giocare il gioco del "
-"&quot;verificato da&quot;. Rendendo\n"
-"\t     i pagamenti significativamente più convenienti per i tuoi clienti,"
-" potrai usare Taler per\n"
-"\t     piccole transazioni che non funzionerebbero con pagamenti a carta "
-"di credito, a causa\n"
-"\t     del sovraccarico mentale per i clienti."
-
-#: merchants.html.j2:31
-msgid ""
-"You never learn sensitive customer information. You need\n"
-"\t     to ensure that your website provides the correct account "
-"information\n"
-"\t     for your business, and that you correctly validate the payment\n"
-"\t     confirmations from the Taler exchange.  As a result, you will have"
-"\n"
-"\t     cryptographic proof of payment for the specific contracts you "
-"entered\n"
-"\t     with your customers, and cryptographically signed confirmations "
-"from\n"
-"\t     the Taler exchange about the deposits. Taler does not require you "
-"to\n"
-"\t     undergo any particular security audits, processes or procedures, "
-"as\n"
-"\t     you never handle sensitive customer information.  Your systems "
-"will\n"
-"\t     have cryptographically signed contracts which you can use in court"
-" in\n"
-"\t     case of disputes."
-msgstr ""
-"Non verrai mai a conoscenza di informazioni sensibili sui tuoi clienti.\n"
-"\t     Dovrai assicurare che il tuo sito offra le corrette informazioni "
-"account per il tuo\n"
-"\t     business, e che le conferme di pagamento dalla ufficio cambi di "
-"Taler vengano correttamente validate.\n"
-"\t     Come risultato, avrai la prova crittografica del pagamento per lo "
-"specifico contratto che hai\n"
-"\t     stipulato con i suoi clienti, e conferma crittograticamente "
-"firmate dalla ufficio cambi di Taler\n"
-"\t     riguardo ai versamenti. Taler non ti richiede di sottoporti a "
-"particolari controlli o prodecure\n"
-"\t     di sicurezza, poiché non dovrai mai gestire informazioni sensibili"
-" sui clienti.\n"
-"\t     I tuoi sistemi avranno contratti crittograficamente firmati che "
-"potrai usare in tribunale\n"
-"\t     in caso di controversie."
-
-#: merchants.html.j2:44
+#: merchants.html.j2:30
+msgid ""
+"Processing transactions with Taler is fast,\n"
+"\t           allowing you to confirm the transaction with your\n"
+"\t           customer virtually immediately.  Your customers\n"
+"\t           will appreciate that they do not have to type in\n"
+"\t           credit card information and play the &quot;verified\n"
+"\t           by&quot; game.  By making payments significantly\n"
+"\t           more convenient for your customers, you may be able\n"
+"\t           to use Taler for small transactions that would not\n"
+"\t           work with credit card payments due to the mental\n"
+"\t           overhead for customers."
+msgstr ""
+
+#: merchants.html.j2:45
+msgid ""
+"You will have cryptographic proof of payment from\n"
+"\t           the Taler payment service provider. Taler does not\n"
+"\t           require you to undergo any particular security\n"
+"\t           audits (such as PCI DSS), processes or procedures,\n"
+"\t           as you never handle sensitive customer account\n"
+"\t           information.  Your systems will have customer\n"
+"\t           contracts wih qualified signatures for all\n"
+"\t           transactions which you can use in court in case of\n"
+"\t           disputes."
+msgstr ""
+
+#: merchants.html.j2:57
 msgid "Free Software"
 msgstr "Free Software"
 
-#: merchants.html.j2:46
+#: merchants.html.j2:59
 msgid ""
 "Taler is free software, and you can use the\n"
-"\t     liberally-licensed reference code as a starting point to integrate"
-"\n"
-"\t     Taler into your services. To use Taler, you do not need to pay "
-"license\n"
-"\t     fees, and the free software development model will ensure that you"
-" can\n"
-"\t     select from many competent developers to help you with your\n"
-"\t     integration."
-msgstr ""
-"Taler si basa su un free software, e potrai utilizzare il codice\n"
-"\t     di riferimento sotto licenza libera come punto di partenza per "
-"integrare\n"
-"\t     Taler nei tuoi sistemi. Per usare Taler, non servirà pagare i "
-"diritti di\n"
-"\t     licenza, e il modello di sviluppo del free software assicurerà che"
-" tu possa\n"
-"\t     selezionare molti sviluppatori compententi per aiutarti con "
-"l'implementazione."
-
-#: merchants.html.j2:56
+"\t           liberally-licensed reference code as a starting\n"
+"\t           point to integrate Taler into your services. To use\n"
+"\t           Taler, you do not need to pay license fees, and the\n"
+"\t           free software development model will ensure that\n"
+"\t           you can select from many competent integrators for\n"
+"\t           support."
+msgstr ""
+
+#: merchants.html.j2:71
 msgid "Low Fees"
 msgstr "Prezzi bassi"
 
-#: merchants.html.j2:58
-msgid ""
-"Taler is designed to minimize the work the exchange needs to\n"
-"\t     perform.  Combined with Taler's strong security which prevents "
-"fraud,\n"
-"\t     exchanges can operate with very low overhead and thus low "
-"transaction\n"
-"\t     fees.  Given Taler's free software exchange reference "
-"implementation,\n"
-"\t     competition among exchanges will ensure fair, low transaction fees"
-" for\n"
-"\t     merchants."
-msgstr ""
-"Taler è progettato per minimizzare il lavoro che la &quot;banca&quot; "
-"(exchange)\n"
-"\t     ha necessità di eseguire. Combinate con la forte sicurezza di "
-"Taler che previene\n"
-"\t     la frode, le &quot;banche&quot; (exchanges) possono operare con "
-"spese molto basse e quindi bassi\n"
-"\t     costi di transazione. Considerata l'implementazione free-software "
-"di riferimento della &quot;banca&quot; (exchange)\n"
-"\t     la competizione tra &quot;banche&quot; (exchanges) garantirà costi"
-" di transazione giusti e bassi per\n"
-"\t     i mercanti."
-
-#: merchants.html.j2:66
+#: merchants.html.j2:73
+msgid ""
+"Taler is designed to minimize the work the exchange\n"
+"\t           needs to perform.  Combined with Taler's strong\n"
+"\t           security which prevents fraud, payment service\n"
+"\t           providers can operate with very low overhead and\n"
+"\t           thus low transaction fees."
+msgstr ""
+
+#: merchants.html.j2:81
 msgid "Flexible"
 msgstr "Flessibile"
 
-#: merchants.html.j2:68
+#: merchants.html.j2:83
 msgid ""
-"Taler can be used for different currencies (such as Euros\n"
-"\t     or US Dollars) and different payment models limited only by what "
-"the\n"
-"\t     exchange supports in its interactions."
+"Taler can be used for different currencies (such as\n"
+"\t           Euros, US Dollars or BitCoins) and different\n"
+"\t           payment models limited only by what the payment\n"
+"\t           service provider supports in its interactions."
 msgstr ""
-"Taler può essere usato per diverse valute (come Euro o dollari americani)"
-"\n"
-"\t     e diversi modelli di pagamento limitati solamente da quello che la"
-" &quot;banca&quot; (exchange)\n"
-"\t     supporta nelle sue interazioni."
 
-#: merchants.html.j2:73
+#: merchants.html.j2:91
 msgid "Ethical"
 msgstr "Etico"
 
-#: merchants.html.j2:75
+#: merchants.html.j2:93
 msgid ""
-"Taler does not support tax evasion or money laundering, and is\n"
-"             also not a pyramid scheme or speculative investment.  "
-"Taler's\n"
-"             protocols are efficient and do not waste energy. Taler "
-"encourages\n"
-"             competition by providing an open standard and free software\n"
-"             reference implementations."
+"Taler prevents tax evasion and money laundering.\n"
+"                   Taler's protocols are efficient and do not waste\n"
+"                   energy. Taler encourages transparency by providing\n"
+"                   an open standard and free software reference\n"
+"                   implementations."
 msgstr ""
-"Taler non supporta l'evasione fiscale o il riciclaggio di denaro,\n"
-"\t     e non è nemmeno a schema piramidale o un investimento speculativo."
-" I protocolli\n"
-"\t     di Taler sono efficienti e non sprecano energia. Taler incoraggia "
-"la competizione\n"
-"\t     fornendo standard aperti e implementazioni di riferimento in free-"
-"software."
 
-#: merchants.html.j2:83
+#: merchants.html.j2:102
 msgid "Taler as seen by merchants"
 msgstr "Come i negozianti vedono Taler"
 
-#: merchants.html.j2:85
+#: merchants.html.j2:104
 msgid ""
-"Merchants supporting the Taler system need to integrate\n"
-"          some relatively simple logic into their transaction processing\n"
-"          system.\n"
-"          Typical steps performed by the merchant system are:\n"
-"        "
+"Merchants supporting the Taler system need to\n"
+"                 integrate some relatively simple logic into their\n"
+"                 transaction processing system.  Typical steps\n"
+"                 performed by the merchant system are: "
 msgstr ""
-"Al fine di supportare Taler, i negozianti\n"
-"\tdovranno integrare alcune semplici procedure nei loro sistemi di "
-"ricezione\n"
-"\tdei pagamenti"
 
-#: merchants.html.j2:94
+#: merchants.html.j2:113
 msgid ""
 "The new logic detects when a customer's system\n"
-"              supports Taler and then needs to send a cryptographically "
-"signed\n"
-"              version of the proposed contract in a simple JSON format to"
-"\n"
-"              the customer.\n"
-"              The message also includes salted, hashed wire details for\n"
-"              the merchant, as well as restrictions as to which exchange "
-"operators\n"
-"              the merchant is willing to deal with."
-msgstr ""
-"La nuova procedura rileva il caso in cui un cliente\n"
-"\t     supporta Taler, e procede ad inviarvi un contratto digitale "
-"firmato\n"
-"\t     in un semplice formato JSON.\n"
-"\t     Il messaggio include anche le coordinate bancarie del negoziante\n"
-"\t     fissate in un &quot;hashcode&quot; assieme ad un numero casuale, "
-"nonché la\n"
-"\t     lista delle zecche con cui il negoziante è disposto a trattare."
+"                      supports Taler and then needs to send a\n"
+"                      cryptographically signed version of the proposed\n"
+"                      contract in a simple JSON format to the\n"
+"                      customer.  The message also includes salted,\n"
+"                      hashed wire details for the merchant, as well as\n"
+"                      restrictions as to which exchange operators the\n"
+"                      merchant is willing to deal with."
+msgstr ""
 
-#: merchants.html.j2:102
+#: merchants.html.j2:122
 msgid ""
-"The customer sends a signed response which states\n"
-"               that certain digital coins now belong to the merchant to "
-"both\n"
-"               signal acceptance of the deal as well as to pay the "
-"respective\n"
-"               amount (bottom)."
+"The customer sends a signed response which\n"
+"                      states that certain digital coins now belong to\n"
+"                      the merchant to both signal acceptance of the\n"
+"                      deal as well as to pay the respective amount\n"
+"                      (bottom)."
 msgstr ""
-"Il cliente invia una risposta firmata che attesta\n"
-"\t     che un certo numero di gettoni ora appartiene al negoziante, così\n"
-"\t     da segnalare sia l'accettazione dello scambio che il suo impegno\n"
-"\t     a pagare il prezzo dovuto (in basso).\n"
-"\t     "
 
-#: merchants.html.j2:107
+#: merchants.html.j2:128
 msgid ""
 "The merchant then forwards the signed messages\n"
-"               received from the customer to the exchange, together with "
-"its\n"
-"               wire details and the salt (without hashing).  The exchange"
-" verifies\n"
-"               the details and sends a signed confirmation (or an error\n"
-"               message) to the merchant.  The merchant checks that the\n"
-"               exchange's signature is valid, sends a confirmation to the"
-"\n"
-"               customer and executes the contract-specific business logic."
-msgstr ""
-"Il negoziante inoltra tale messaggio firmato appena\n"
-"\t     ricevuto del cliente alla zecca, insieme alle sue coordinata "
-"bancarie\n"
-"\t     e al numero casuale usato in precedenza per produrre "
-"l'&quot;hash&quot; dei due.\n"
-"\t     La zecca verifica le coordinate e manda una conferma (o un "
-"messaggio\n"
-"\t     d'errore) firmata al negoziante. A questo punto, il negoziante "
-"controlla\n"
-"\t     che la firma della zecca sia valida, manda una conferma al "
-"cliente,\n"
-"\t     e procede ad assolvere quanto indicato nel contratto."
-
-#: merchants.html.j2:115
-msgid ""
-"The exchange performs wire transfers corresponding to\n"
-"               the claims deposited by the merchant. Note that the "
-"exchange may\n"
-"               charge fees for the deposit operation, hence merchants may"
-"\n"
-"               impose limits restricting the set of exchange operators "
-"they are\n"
-"               willing to deal with, for example by imposing a bound on\n"
-"               deposit fees."
-msgstr ""
-"Per ogni deposito (od opzionalmente per ogni\n"
-"\t     raggruppamento di depositi) ricevuto da un certo negoziante,\n"
-"\t     la zecca procederà con il versamento verso il conto in banca di\n"
-"\t     quest'ultimo. La zecca potrebbe anche prevedere delle tariffe\n"
-"\t     per l'operazione di deposito, da cui è plausibile che alcuni\n"
-"\t     mercanti impongano delle restrizioni su quali siano le zecche\n"
-"\t     con cui essi vogliano trattare."
-
-#: merchants.html.j2:125
+"                       received from the customer to the exchange,\n"
+"                       together with its wire details and the salt\n"
+"                       (without hashing).  The exchange verifies the\n"
+"                       details and sends a signed confirmation (or an\n"
+"                       error message) to the merchant.  The merchant\n"
+"                       checks that the exchange's signature is valid,\n"
+"                       sends a confirmation to the customer and\n"
+"                       executes the contract-specific business\n"
+"                       logic."
+msgstr ""
+
+#: merchants.html.j2:139
+msgid ""
+"The exchange performs wire transfers\n"
+"                       corresponding to the claims deposited by the\n"
+"                       merchant. Note that the exchange may charge\n"
+"                       fees for the deposit operation, hence merchants\n"
+"                       may impose limits restricting the set of\n"
+"                       exchange operators they are willing to deal\n"
+"                       with, for example by imposing a bound on\n"
+"                       deposit fees."
+msgstr ""
+
+#: merchants.html.j2:151
 #, fuzzy
 msgid "Manuals for merchants"
 msgstr "Documentation"
 
+#: merchants.html.j2:154
+msgid "The GNU Taler merchant backend operator tutorial"
+msgstr ""
+
+#: merchants.html.j2:157
+msgid "The GNU Taler Web shop integration tutorial (PHP)"
+msgstr ""
+
 #: wallet.html.j2:5
 msgid "Wallet"
 msgstr ""
@@ -1565,3 +1102,57 @@ msgstr ""
 #~ msgid "About&nbsp;us"
 #~ msgstr "Chi siamo"
 
+#~ msgid "Stability "
+#~ msgstr "Stabilità"
+
+#~ msgid "News"
+#~ msgstr ""
+
+#~ msgid "Taler Web payments paper published."
+#~ msgstr "Taler 0.0.0."
+
+#~ msgid "More news »"
+#~ msgstr "Scopri di più »"
+
+#~ msgid "Taler technology: About taxability, change and privacy"
+#~ msgstr "La tecnologia Taler: tassabilità, cambio e privacy"
+
+#~ msgid "1-2017: Taler Documentation pages updated"
+#~ msgstr ""
+
+#~ msgid "Operate a Taler exchange!"
+#~ msgstr "Investi in Taler!"
+
+#~ msgid "Electronic payments for a liberal society!"
+#~ msgstr "Pagamenti elettronici per una società libera!"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonimo"
+
+#~ msgid "Electronic"
+#~ msgstr "Elettronico"
+
+#~ msgid "Reserves"
+#~ msgstr "Riserva"
+
+#~ msgid "Advantages for citizens"
+#~ msgstr "Vantaggi per i cittadini"
+
+#~ msgid "Independent One-Click Payment!"
+#~ msgstr ""
+
+#~ msgid "Advantages for merchants"
+#~ msgstr "Vantaggi per i mercanti"
+
+#~ msgid "Advantages for governments"
+#~ msgstr "Vantaggi per i governi"
+
+#~ msgid "Invest in GNU Taler!"
+#~ msgstr ""
+
+#~ msgid "Business model"
+#~ msgstr "Modello business"
+
+#~ msgid "Taler as seen by the exchange operator"
+#~ msgstr "Come opera la ufficio cambi di Taler"
+
diff --git a/merchants.html.j2 b/merchants.html.j2
index 34771b6..a63cd60 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -11,113 +11,139 @@
     {% include "common/navigation.j2.inc" %}
       <!-- Jumbotron -->
       <div class="jumbotron">
-        <h1>{{ _("Advantages for merchants") }}</h1>
+        <h1>{{ _("Advantages for Merchants") }}</h1>
+        <div class="col-lg-12">
+
+         <p>{{ _("Taler is a cost-effective electronic payment system
+                  which provides you with cryptographic proof that
+                  the payment worked correctly within milliseconds.
+                  Your Web customers pay with previously unknown
+                  levels of convenience without risk of fraud.")
+                  }}</p>
+
+       </div>
       </div>
       <div class="row">
         <div class="col-lg-4">
           <h2>{{ _("Fast") }}</h2>
 
-         <p>{{ _("Processing transactions with Taler is fast, allowing you
-            to confirm the transaction with your customer virtually 
immediately.
-            Your customers will appreciate that they do not have to type in 
credit
-            card information and play the &quot;verified by&quot; game.  By 
making payments
-            significantly more convenient for your customers, you may be able 
to
-            use Taler for small transactions that would not work with credit 
card
-            payments due to the mental overhead for customers.") }}</p>
+         <p>{{ _("Processing transactions with Taler is fast,
+                  allowing you to confirm the transaction with your
+                  customer virtually immediately.  Your customers
+                  will appreciate that they do not have to type in
+                  credit card information and play the &quot;verified
+                  by&quot; game.  By making payments significantly
+                  more convenient for your customers, you may be able
+                  to use Taler for small transactions that would not
+                  work with credit card payments due to the mental
+                  overhead for customers.") }}</p>
+
         </div>
         <div class="col-lg-4">
           <h2>{{ _("Secure") }}</h2>
 
-         <p>{{ _("You never learn sensitive customer information. You need
-            to ensure that your website provides the correct account 
information
-            for your business, and that you correctly validate the payment
-            confirmations from the Taler exchange.  As a result, you will have
-            cryptographic proof of payment for the specific contracts you 
entered
-            with your customers, and cryptographically signed confirmations 
from
-            the Taler exchange about the deposits. Taler does not require you 
to
-            undergo any particular security audits, processes or procedures, as
-            you never handle sensitive customer information.  Your systems will
-            have cryptographically signed contracts which you can use in court 
in
-            case of disputes.") }}</p>
+         <p>{{ _("You will have cryptographic proof of payment from
+                  the Taler payment service provider. Taler does not
+                  require you to undergo any particular security
+                  audits (such as PCI DSS), processes or procedures,
+                  as you never handle sensitive customer account
+                  information.  Your systems will have customer
+                  contracts wih qualified signatures for all
+                  transactions which you can use in court in case of
+                  disputes.") }}</p>
+
         </div>
         <div class="col-lg-4">
           <h2>{{ _("Free Software") }}</h2>
 
          <p>{{ _("Taler is free software, and you can use the
-            liberally-licensed reference code as a starting point to integrate
-            Taler into your services. To use Taler, you do not need to pay 
license
-            fees, and the free software development model will ensure that you 
can
-            select from many competent developers to help you with your
-            integration.") }}</p>
+                  liberally-licensed reference code as a starting
+                  point to integrate Taler into your services. To use
+                  Taler, you do not need to pay license fees, and the
+                  free software development model will ensure that
+                  you can select from many competent integrators for
+                  support.") }}</p>
+
         </div>
       </div>
       <div class="row">
         <div class="col-lg-4">
           <h2>{{ _("Low Fees") }}</h2>
 
-         <p>{{ _("Taler is designed to minimize the work the exchange needs to
-            perform.  Combined with Taler's strong security which prevents 
fraud,
-            exchanges can operate with very low overhead and thus low 
transaction
-            fees.  Given Taler's free software exchange reference 
implementation,
-            competition among exchanges will ensure fair, low transaction fees 
for
-            merchants.") }}</p>
+         <p>{{ _("Taler is designed to minimize the work the exchange
+                  needs to perform.  Combined with Taler's strong
+                  security which prevents fraud, payment service
+                  providers can operate with very low overhead and
+                  thus low transaction fees.") }}</p>
+
         </div>
         <div class="col-lg-4">
           <h2>{{ _("Flexible") }}</h2>
 
-         <p>{{ _("Taler can be used for different currencies (such as Euros
-            or US Dollars) and different payment models limited only by what 
the
-            exchange supports in its interactions.") }}</p>
+         <p>{{ _("Taler can be used for different currencies (such as
+                  Euros, US Dollars or BitCoins) and different
+                  payment models limited only by what the payment
+                  service provider supports in its interactions.")
+                  }}</p>
+
         </div>
         <div class="col-lg-4">
           <h2>{{ _("Ethical") }}</h2>
 
-          <p>{{ _("Taler does not support tax evasion or money laundering, and 
is
-             also not a pyramid scheme or speculative investment.  Taler's
-             protocols are efficient and do not waste energy. Taler encourages
-             competition by providing an open standard and free software
-             reference implementations.") }}</p>
+          <p>{{ _("Taler prevents tax evasion and money laundering.
+                   Taler's protocols are efficient and do not waste
+                   energy. Taler encourages transparency by providing
+                   an open standard and free software reference
+                   implementations.") }}</p>
+
         </div>
       </div>
      <div class="col-lg-12">
         <h2 id="overview">{{ _("Taler as seen by merchants") }}</h2>
 
-        <p>{{ _("Merchants supporting the Taler system need to integrate
-          some relatively simple logic into their transaction processing
-          system.
-          Typical steps performed by the merchant system are:
-        ") }}</p>
+        <p>{{ _("Merchants supporting the Taler system need to
+                 integrate some relatively simple logic into their
+                 transaction processing system.  Typical steps
+                 performed by the merchant system are: ") }}</p>
 
         <p>
         <img src="{{ url('images/merchant.svg') }}" alt="merchant perspective" 
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
           <ol>
+         
             <li>{{ _("The new logic detects when a customer's system
-              supports Taler and then needs to send a cryptographically signed
-              version of the proposed contract in a simple JSON format to
-              the customer.
-              The message also includes salted, hashed wire details for
-              the merchant, as well as restrictions as to which exchange 
operators
-              the merchant is willing to deal with.") }}</li>
-
-            <li>{{ _("The customer sends a signed response which states
-               that certain digital coins now belong to the merchant to both
-               signal acceptance of the deal as well as to pay the respective
-               amount (bottom).") }}</li>
+                      supports Taler and then needs to send a
+                      cryptographically signed version of the proposed
+                      contract in a simple JSON format to the
+                      customer.  The message also includes salted,
+                      hashed wire details for the merchant, as well as
+                      restrictions as to which exchange operators the
+                      merchant is willing to deal with.") }}</li>
+
+            <li>{{ _("The customer sends a signed response which
+                      states that certain digital coins now belong to
+                      the merchant to both signal acceptance of the
+                      deal as well as to pay the respective amount
+                      (bottom).") }}</li>
 
              <li>{{ _("The merchant then forwards the signed messages
-               received from the customer to the exchange, together with its
-               wire details and the salt (without hashing).  The exchange 
verifies
-               the details and sends a signed confirmation (or an error
-               message) to the merchant.  The merchant checks that the
-               exchange's signature is valid, sends a confirmation to the
-               customer and executes the contract-specific business logic.") 
}}</li>
-
-             <li>{{ _("The exchange performs wire transfers corresponding to
-               the claims deposited by the merchant. Note that the exchange may
-               charge fees for the deposit operation, hence merchants may
-               impose limits restricting the set of exchange operators they are
-               willing to deal with, for example by imposing a bound on
-               deposit fees.") }}</li>
+                       received from the customer to the exchange,
+                       together with its wire details and the salt
+                       (without hashing).  The exchange verifies the
+                       details and sends a signed confirmation (or an
+                       error message) to the merchant.  The merchant
+                       checks that the exchange's signature is valid,
+                       sends a confirmation to the customer and
+                       executes the contract-specific business
+                       logic.") }}</li>
+
+             <li>{{ _("The exchange performs wire transfers
+                       corresponding to the claims deposited by the
+                       merchant. Note that the exchange may charge
+                       fees for the deposit operation, hence merchants
+                       may impose limits restricting the set of
+                       exchange operators they are willing to deal
+                       with, for example by imposing a bound on
+                       deposit fees.") }}</li>
           </ol>
         </p>
      </div>
@@ -125,10 +151,10 @@
         <h2 id="documentation">{{ _("Manuals for merchants") }}</h2>
         <p>
           </p><ul>
-            <li>The GNU Taler merchant backend operator tutorial
+            <li>{{ _("The GNU Taler merchant backend operator tutorial") }}
               (<a 
href="https://docs.taler.net/current/merchant-backend/tutorial.html";>html</a>,
                <a 
href="https://docs.taler.net/current/merchant-backend/tutorial.pdf";>pdf</a>)</li>
-            <li>The GNU Taler Web shop integration tutorial (PHP)
+            <li>{{ _("The GNU Taler Web shop integration tutorial (PHP)") }}
               (<a 
href="https://docs.taler.net/current/merchant-shop/php/tutorial.html";>html</a>,
                <a 
href="https://docs.taler.net/current/merchant-shop/php/tutorial.pdf";>pdf</a>)</li>
           </ul>
diff --git a/news.html.j2 b/news.html.j2
deleted file mode 100644
index 0063806..0000000
--- a/news.html.j2
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ _('en') }}">
-  <head>
-    <meta charset="UTF-8"/>
-    <title>{{ _("GNU Taler") }} - {{ _("News") }}</title>
-    <meta name="description" content=""/>
-    {% include "common/header.j2.inc" %}
-  </head>
-  <body>
-    <div class="container">
-      {% include "common/navigation.j2.inc" %}
-      <!-- Jumbotron -->
-      <div class="jumbotron">
-        <h1>{{ _("News") }}</h1>
-        <!-- p><a class="btn btn-lg btn-success" href="#" role="button">Get 
started today</a></p -->
-      </div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>10-2016: Taler Wallet for Firefox online</h2>
-          <p>We now have a first version of the Taler wallet for Firefox.
-             For now, a development build of Firefox is required.
-             Installation instructions are on the <a href="/wallet">Wallet 
page</a>.</p>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>9-2016: Taler Web Payments paper published</h2>
-          <p>We just finished the camera-ready version of our paper on how to 
use Taler
-             for Web payments.  This paper does not discuss the cryptography 
behind
-             Taler, but focuses on the practical aspects of how the wallet and 
the merchants
-             interact over the Web.  Hence, this paper should be a good read 
for
-             anyone who wants to integrate Taler support with their Web site.
-            We have posted the paper <a 
href="https://gnunet.org/taler2016space";>here</a>.</p>
-
-          <h2>8-2016: Taler Systems S.A. created</h2>
-          <p>We now have a business entity for Taler.  Potential investors may
-            contact the executive team at <a 
href="mailto:address@hidden";>address@hidden</a>.</p>
-
-          <h2>6-2016: GNU Taler 0.0.0 released</h2>
-          <p>We have reached our first big milestone, the 0.0.0 release!
-             The release includes implementations of a bank, exchange, 
merchant and wallet
-             and is available on the GNU FTP mirrors.
-             <br>
-             While the exchange implements the
-             complete protocol, the implementations of merchant and wallet are 
both
-             fundamentally incomplete and still lack key features, including 
important
-             error handling. GNU Taler still lacks an implementation of an 
auditor or
-             logic for integration with "real" banks.
-             Thus, this release should not yet be used for actual financial
-             transactions.
-             <br>
-             That said, you can already setup your own functional payment 
system
-             and run your own toy currency -- or just try out the demo using
-             the Chrome/Chromium browser at <a 
href="https://demo.taler.net/";>demo.taler.net</a>.
-             <br>
-             Please provide feedback to our <a 
href="https://gnunet.org/bugs/";>bug tracker</a>.
-             There, you can also find our <a 
href="https://gnunet.org/bugs/roadmap_page.php";>roadmap</a>
-             which contains a list of known open issues and our plans for the 
near future.
-          </p>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>12-2015: Taler Demo for Chrome/Chromium online</h2>
-          <p>We finally have a first simple demo for Taler online. The 
Firefox-variant
-             still needs some love, but you can start to try out the demo using
-             the Chrome/Chromium browser at <a 
href="https://demo.taler.net/";>demo.taler.net</a>.
-             Please provide feedback to our <a 
href="https://gnunet.org/bugs/";>bug tracker</a>.</p>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>11-2014: Christian Grothoff's explains the goals behind 
Taler</h2>
-          <p>
-           <video id="video" poster="/videos/inria2015interview.png" 
autobuffer="" height="360" width="640" controls="controls">
-           <source src="/videos/inria2015interview.webm#t=216" 
type="video/webm">
-           <source src="/videos/inria2015interview.ogv#t=216" type="video/ogv">
-           </video>
-          <a rel="license" 
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";><img 
alt="Creative Commons License" style="border-width:0" 
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/"; 
property="dct:title">Taler</span>" by <span 
xmlns:cc="http://creativecommons.org/ns#"; 
property="cc:attributionName">Christian Grothoff, produced by Inria Rennes 
Bretagne Atlantique</span> is licensed under a <a rel="license" 
href="https://creativecommons.org/licens [...]
-          </p>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>2-2015: Taler becomes an official GNU package</h2>
-          <p>Taler was accepted into the GNU project today.  GNU will offer 
advice,
-            advocacy and cooperation --- and host our official public
-            mailinglist <a href="mailto:address@hidden";>address@hidden</a>.</p>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>12-2014: Watch Christian Grothoff's FOSSA talk on Taler</h2>
-          <p>
-           <video id="video" poster="/images/fossa2014.png" autobuffer="" 
height="360" width="640" controls="controls">
-           <source src="/videos/grothoff2014fossa.webm" type="video/webm">
-           <source src="/videos/grothoff2014fossa.ogv" type="video/ogv">
-           </video>
-          <a rel="license" 
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";><img 
alt="Creative Commons License" style="border-width:0" 
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/"; 
property="dct:title">Taler</span>" by <span 
xmlns:cc="http://creativecommons.org/ns#"; 
property="cc:attributionName">Christian Grothoff, produced by FOSSA, Inria 
Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" 
href="https://creativecommons.org [...]
-          </p>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>11-2014: Launching <tt>taler.net</tt></h2>
-          <p>Welcome to our new site about the Taler electronic payment 
system.</p>
-        </div>
-      </div>
-
-      {% include "common/footer.j2.inc" %}
-    </div> <!-- /container -->
-  </body>
-</html>
diff --git a/news.html.j2.inc b/news.html.j2.inc
new file mode 100644
index 0000000..76d9960
--- /dev/null
+++ b/news.html.j2.inc
@@ -0,0 +1,10 @@
+{% include "news/2017-01.inc" %}
+{% include "news/2016-10.inc" %}
+{% include "news/2016-09.inc" %}
+{% include "news/2016-08.inc" %}
+{% include "news/2016-06.inc" %}
+{% include "news/2015-12.inc" %}
+{% include "news/2015-11.inc" %}
+{% include "news/2015-02.inc" %}
+{% include "news/2014-12.inc" %}
+{% include "news/2014-11.inc" %}
diff --git a/news/2014-11.inc b/news/2014-11.inc
new file mode 100644
index 0000000..edb994a
--- /dev/null
+++ b/news/2014-11.inc
@@ -0,0 +1,2 @@
+          <h3>11-2014: Launching <tt>taler.net</tt></h3>
+          <p>Welcome to our new site about the Taler electronic payment 
system.</p>
diff --git a/news/2014-12.inc b/news/2014-12.inc
new file mode 100644
index 0000000..311e54b
--- /dev/null
+++ b/news/2014-12.inc
@@ -0,0 +1,8 @@
+          <h3>12-2014: Watch Christian Grothoff's FOSSA talk on Taler</h3>
+          <p>
+           <video id="video" poster="/images/fossa2014.png" autobuffer="" 
height="180" width="320" controls="controls">
+           <source src="/videos/grothoff2014fossa.webm" type="video/webm">
+           <source src="/videos/grothoff2014fossa.ogv" type="video/ogv">
+           </video>
+          <a rel="license" 
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";><img 
alt="Creative Commons License" style="border-width:0" 
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/"; 
property="dct:title">Taler</span>" by <span 
xmlns:cc="http://creativecommons.org/ns#"; 
property="cc:attributionName">Christian Grothoff, produced by FOSSA, Inria 
Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" 
href="https://creativecommons.org [...]
+          </p>
diff --git a/news/2015-02.inc b/news/2015-02.inc
new file mode 100644
index 0000000..3b168c8
--- /dev/null
+++ b/news/2015-02.inc
@@ -0,0 +1,4 @@
+          <h3>2-2015: Taler becomes an official GNU package</h3>
+          <p>Taler was accepted into the GNU project today.  GNU will offer 
advice,
+            advocacy and cooperation --- and host our official public
+            mailinglist <a href="mailto:address@hidden";>address@hidden</a>.</p>
\ No newline at end of file
diff --git a/news/2015-11.inc b/news/2015-11.inc
new file mode 100644
index 0000000..b91983a
--- /dev/null
+++ b/news/2015-11.inc
@@ -0,0 +1,9 @@
+          <h3>11-2014: Christian Grothoff's explains the goals behind 
Taler</h3>
+          <p>
+           <video id="video" poster="/videos/inria2015interview.png" 
autobuffer="" height="180" width="320" controls="controls">
+           <source src="/videos/inria2015interview.webm#t=216" 
type="video/webm">
+           <source src="/videos/inria2015interview.ogv#t=216" type="video/ogv">
+           </video>
+          <a rel="license" 
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";><img 
alt="Creative Commons License" style="border-width:0" 
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/"; 
property="dct:title">Taler</span>" by <span 
xmlns:cc="http://creativecommons.org/ns#"; 
property="cc:attributionName">Christian Grothoff, produced by Inria Rennes 
Bretagne Atlantique</span> is licensed under a <a rel="license" 
href="https://creativecommons.org/licens [...]
+          </p>
+
diff --git a/news/2015-12.inc b/news/2015-12.inc
new file mode 100644
index 0000000..5d16035
--- /dev/null
+++ b/news/2015-12.inc
@@ -0,0 +1,5 @@
+          <h3>12-2015: Taler Demo for Chrome/Chromium online</h3>
+          <p>We finally have a first simple demo for Taler online. The 
Firefox-variant
+             still needs some love, but you can start to try out the demo using
+             the Chrome/Chromium browser at <a 
href="https://demo.taler.net/";>demo.taler.net</a>.
+             Please provide feedback to our <a 
href="https://gnunet.org/bugs/";>bug tracker</a>.</p>
\ No newline at end of file
diff --git a/news/2016-06.inc b/news/2016-06.inc
new file mode 100644
index 0000000..0155fc7
--- /dev/null
+++ b/news/2016-06.inc
@@ -0,0 +1,21 @@
+          <h3>6-2016: GNU Taler 0.0.0 released</h3>
+          <p>We have reached our first big milestone, the 0.0.0 release!
+             The release includes implementations of a bank, exchange, 
merchant and wallet
+             and is available on the GNU FTP mirrors.
+             <br>
+             While the exchange implements the
+             complete protocol, the implementations of merchant and wallet are 
both
+             fundamentally incomplete and still lack key features, including 
important
+             error handling. GNU Taler still lacks an implementation of an 
auditor or
+             logic for integration with "real" banks.
+             Thus, this release should not yet be used for actual financial
+             transactions.
+             <br>
+             That said, you can already setup your own functional payment 
system
+             and run your own toy currency -- or just try out the demo using
+             the Chrome/Chromium browser at <a 
href="https://demo.taler.net/";>demo.taler.net</a>.
+             <br>
+             Please provide feedback to our <a 
href="https://gnunet.org/bugs/";>bug tracker</a>.
+             There, you can also find our <a 
href="https://gnunet.org/bugs/roadmap_page.php";>roadmap</a>
+             which contains a list of known open issues and our plans for the 
near future.
+          </p>
diff --git a/news/2016-08.inc b/news/2016-08.inc
new file mode 100644
index 0000000..73e231f
--- /dev/null
+++ b/news/2016-08.inc
@@ -0,0 +1,3 @@
+          <h3>8-2016: Taler Systems S.A. created</h3>
+          <p>We now have a business entity for Taler.  Potential investors may
+            contact the executive team at <a 
href="mailto:address@hidden";>address@hidden</a>.</p>
diff --git a/news/2016-09.inc b/news/2016-09.inc
new file mode 100644
index 0000000..42dd857
--- /dev/null
+++ b/news/2016-09.inc
@@ -0,0 +1,7 @@
+          <h3>9-2016: Taler Web Payments paper published</h3>
+          <p>We just finished the camera-ready version of our paper on how to 
use Taler
+             for Web payments.  This paper does not discuss the cryptography 
behind
+             Taler, but focuses on the practical aspects of how the wallet and 
the merchants
+             interact over the Web.  Hence, this paper should be a good read 
for
+             anyone who wants to integrate Taler support with their Web site.
+            We have posted the paper <a 
href="https://gnunet.org/taler2016space";>here</a>.</p>
\ No newline at end of file
diff --git a/news/2016-10.inc b/news/2016-10.inc
new file mode 100644
index 0000000..2f35b2f
--- /dev/null
+++ b/news/2016-10.inc
@@ -0,0 +1,4 @@
+          <h3>10-2016: Taler Wallet for Firefox online</h3>
+          <p>We now have a first version of the Taler wallet for Firefox.
+             For now, a development build of Firefox is required.
+             Installation instructions are on the <a href="/wallet">Wallet 
page</a>.</p>
diff --git a/news/2017-01.inc b/news/2017-01.inc
new file mode 100644
index 0000000..c9185bc
--- /dev/null
+++ b/news/2017-01.inc
@@ -0,0 +1,3 @@
+          <h3>1-2017: Taler Documentation pages updated</h3>
+            <p><a href="https://docs.taler.net/";>docs.taler.net</a> is now
+               online, providing a new portal to the Taler system 
documentation.</p>

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



reply via email to

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