1 files changed, 656 insertions, 662 deletions

diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 6d6509b1..38600edf 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: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-02-08 10:21+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 <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -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
+#: 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)."
-msgstr ""
-
-#: citizens.html.j2:79
+"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 ""
 
-#: 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,244 +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"
-"             "
-msgstr ""
-
-#: 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"
-"             "
+"                       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
@@ -497,151 +504,170 @@ 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
+#: governments.html.j2:36
 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 ""
-
-#: governments.html.j2:28
+"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, while one of the key goals of Taler is to provide anonymity for\n"
-"             citizens spending digital cash to buy goods and services, we"
-" also ensure 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, this observational "
-"capability does not\n"
-"             extend to the immediate personal domain.  In particular, "
-"sharing access to funds \n"
-"             within a family or copying coins between multiple devices is"
-" not subject to\n"
-"             monitoring."
+"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 ""
 
-#: governments.html.j2:39 investors.html.j2:28 merchants.html.j2:29
-msgid "Secure"
+#: 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:41
+#: 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:51 index.html.j2:39
+#: governments.html.j2:80
 msgid "Libre"
 msgstr ""
 
-#: governments.html.j2:53
+#: 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:58 investors.html.j2:18
+#: governments.html.j2:91
 msgid "Efficient"
 msgstr ""
 
-#: governments.html.j2:60
+#: 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:66
+#: governments.html.j2:102
 msgid "Taler as seen by governments"
 msgstr ""
 
-#: governments.html.j2:68
+#: 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:80
+#: 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:86
+#: 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:90
+#: 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:97
+#: 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:6
@@ -649,94 +675,97 @@ msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
 
 #: index.html.j2:17
-msgid "Electronic payments for a liberal society!"
+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>.  This community Web "
-"site\n"
-"            provides extensive documentation about the system, which we "
-"expect to\n"
-"\t    make 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:26
+#: index.html.j2:29
+msgid "<b>T</b>axable"
+msgstr ""
+
+#: 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."
+"\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:32
-msgid "Anonymous"
+#: index.html.j2:39
+msgid "<b>A</b>nonymous"
 msgstr ""
 
-#: index.html.j2:33
+#: index.html.j2:41
 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 cash. However, you have\n"
-"\t     proof that you paid for use in court if necessary."
+"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:40
+#: index.html.j2:49
+msgid "<b>L</b>ibre"
+msgstr ""
+
+#: index.html.j2:51
 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. The payment system will\n"
-"             thus foster competition instead of putting some vendor in "
-"control."
+"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:48
-msgid "Electronic"
+#: index.html.j2:62
+msgid "<b>E</b>lectronic"
 msgstr ""
 
-#: index.html.j2:49
+#: index.html.j2:64
 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 requires\n"
-"            participants to be online when they make payments."
+"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:55
-msgid "Reserves"
+#: index.html.j2:71
+msgid "<b>R</b>eserves"
 msgstr ""
 
-#: index.html.j2:56
+#: index.html.j2:73
 msgid ""
-"Taler uses payment providers which hold financial\n"
-"             reserves in escrow accounts denominated in existing "
-"currencies. \n"
-"             This means that Taler does not introduce\n"
-"\t     a new currency with the inherent currency fluctuation risks.\n"
-"\t     Taler's cryptographic coins correspond to existing currencies, "
-"such as\n"
-"\t     US Dollars, Euros or even BitCoins."
+"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:64
+#: index.html.j2:82
 msgid "Latest Videos"
 msgstr ""
 
-#: index.html.j2:65
+#: index.html.j2:83
 msgid "Florian Dold talks about Taler at 50p!"
 msgstr ""
 
-#: index.html.j2:75
+#: index.html.j2:93
 msgid "Taler News"
 msgstr ""
 
-#: index.html.j2:79
+#: index.html.j2:97
 msgid "Financial News"
 msgstr ""
 
@@ -745,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>invest@taler.net</tt>\n"
+"                   if you want to invest in Taler."
+msgstr ""
+
+#: investors.html.j2:24
+msgid "The Team"
 msgstr ""
 
-#: investors.html.j2:30
+#: investors.html.j2:26
 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."
+"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:39
-msgid "Business model"
+#: 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:41
+#: investors.html.j2:37
+msgid "The Technology"
+msgstr ""
+
+#: investors.html.j2:39
 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."
+"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:50
-msgid "Taler as seen by the exchange operator"
+#: investors.html.j2:51
+msgid "The Business"
 msgstr ""
 
-#: investors.html.j2:52
+#: investors.html.j2:53
 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 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:64
+#: 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."
+"                      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
@@ -846,184 +894,171 @@ msgid "Merchants"
 msgstr ""
 
 #: merchants.html.j2:14
-msgid "Advantages for merchants"
+msgid "Advantages for Merchants"
 msgstr ""
 
-#: merchants.html.j2:18
-msgid "Fast"
+#: 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: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."
+#: merchants.html.j2:28
+msgid "Fast"
 msgstr ""
 
-#: merchants.html.j2:31
+#: merchants.html.j2:30
 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
+"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 ""
 
-#: 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."
-msgstr ""
-
-#: merchants.html.j2:115
+"                       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 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."
+"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:125
+#: merchants.html.j2:151
 msgid "Manuals for merchants"
 msgstr ""
 
-#: news.html.j2:1
-msgid "1-2017: Taler Documentation pages updated"
+#: 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
@@ -1048,95 +1083,54 @@ msgstr ""
 #~ msgid "Stability "
 #~ msgstr ""
 
-#~ 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."
+#~ msgid "News"
 #~ msgstr ""
 
-#~ 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."
+#~ msgid "Taler Web payments paper published."
 #~ msgstr ""
 
-#~ 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."
+#~ msgid "More news »"
 #~ msgstr ""
 
-#~ 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."
+#~ msgid "Taler technology: About taxability, change and privacy"
 #~ msgstr ""
 
-#~ 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."
+#~ msgid "1-2017: Taler Documentation pages updated"
 #~ msgstr ""
 
-#~ msgid "News"
+#~ msgid "Operate a Taler exchange!"
 #~ msgstr ""
 
-#~ msgid "Taler Web payments paper published."
+#~ msgid "Electronic payments for a liberal society!"
 #~ msgstr ""
 
-#~ msgid "More news »"
+#~ msgid "Anonymous"
 #~ msgstr ""
 
-#~ msgid "Taler technology: About taxability, change and privacy"
+#~ msgid "Electronic"
 #~ msgstr ""
 
-#~ 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"
-#~ "         "
+#~ msgid "Reserves"
 #~ msgstr ""
 
-#~ 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"
-#~ "         "
+#~ 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 ""