simplify FAQ answers, i18n

6 files changed, 611 insertions, 170 deletions

diff --git a/faq.html.j2 b/faq.html.j2
index f548a143..d492b2bd 100644
--- a/faq.html.j2
+++ b/faq.html.j2
@@ -1,45 +1,61 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
 <div class="container">
-<h2>How is Taler related to Bitcoin or Blockchains?</h2>
-<p>
-Taler does not use any Blockchain technology or Bitcoin directly.  Taler is not
-based on proof-of-work or any other distributed consensus mechanism.  Instead
-Taler is based on blind signatures.</p>
 
-<p>It would be possible, however, to withdraw Bitcoins into a Taler wallet (with an appropriate exchange),
-which would give some benefits over plain Bitcoin, such as instant confirmation times.</p>
+<h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
+{% trans %}
+<p>Taler does not use any Blockchain technology or Bitcoin directly.
+Taler is not based on proof-of-work or any other distributed consensus
+mechanism.  Instead Taler is based on blind signatures.</p>
 
-<h2>Where is the balance in my wallet stored?</h2>
-<p>Your wallet stores tokens that are blindly signed by an exchange.
-Until your spend balance with a merchant, the exchange holds it in escrow.</p>
+<p>It would be possible, however, to withdraw Bitcoins into a Taler
+wallet (with an appropriate exchange), which would give some benefits
+over plain Bitcoin, such as instant confirmation times.</p>
 
-<h2>What if my wallet gets lost?</h2>
-<p>Since the digital tokens of value in your wallet are anonymized,
-the exchange can not assist you in restoring a lost or stolen wallet.  Just
-like with a physical wallet for cash, you are responsible for keeping it safe.</p>
 
-<p>The risk of losing a wallet can be mitigated by backups or keeping the balance reasonably low.</p>
+<h2>{{ _("Where is the balance in my wallet stored?") }}</h2>
+<p>Your wallet stores digital coins that were blindly signed by an
+exchange, and thus ultimately your computer holds your balance.  The
+exchange keeps funds matching all unspent coins in an escrow bank
+account.</p>
+{% endtrans %}
 
-<p>In case of a compromise of one of your devices, an attacker that spends coins on your behalf will
-make it possible for you to know that you've been compromised, which can be an advantage.</p>
 
-<h2>Can I send money to my friend with Taler?</h2>
-<p>You can <em>share</em> coins in your wallet with people you trust, like
-family or friends.  Whenever these shared coins are spent, the other copies
-become invalid.  Sharing coins this does not constitute a transaction, is not taxable
-and requires trust between the sharing parties.</p>
+<h2>{{ _("What if my wallet is lost?") }}</h2>
+{% trans %}
+<p>Since the digital coins of value in your wallet are anonymized, the
+exchange can not assist you in recovering a lost or stolen wallet.
+Just like with a physical wallet for cash, you are responsible for
+keeping it safe.</p>
 
-<p>If your friend provides goods or services for you in exchange for a payment,
-they can easily set up a Taler merchant and receive the payment on their bank account.</p>
+<p>The risk of losing a wallet can be mitigated by making backups or
+keeping the balance reasonably low.</p>
 
-<h2>How does Taler handle payments in different currencies?</h2>
-<p>Taler wallets can store digital coins corresponding to multiple different
-currencies such as the Euro, US Dollars or even Bitcoins.</p>
+<p>In case of a compromise of one of your devices, an attacker that
+spends coins on your behalf will allow you to detect that your device
+has been compromised.</p>
+{% endtrans %}
+
+
+<h2>{{ _("Can I send money to my friend with Taler?") }}</h2>
+{% trans %}
+<p>If your friend provides goods or services for you in exchange for a
+payment, they can easily set up a Taler merchant and receive the
+payment in their bank account.</p>
+
+<p>Future versions of the Taler wallet may allow exchanging coins
+among friends directly as well.</p>
+{% endtrans %}
+
+
+<h2>{{ _("How does Taler handle payments in different currencies?") }}</h2>
+{% trans %}
+<p>Taler wallets can store digital coins corresponding to multiple
+different currencies such as the Euro, US Dollars or Bitcoins.</p>
+
+<p>Taler currently does not offer conversion between currencies.</p>
+{% endtrans %}
 
-<p>Automatic currency conversion is currently not our focus, but could be made
-available in the future, either with exchanges that handle multiple
-currencies, or other means of multi-currency payment routing.</p>
 
 </div>
 {% endblock body_content %}
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index d400cf7c..8100ec8a 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,15 +3,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-07 17:34+0100\n"
+"POT-Creation-Date: 2017-03-08 10:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: de\n"
 "Language-Team: de <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
 msgid ""
@@ -183,7 +184,7 @@ msgid ""
 "               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"
+"               usual government protections for financial\n"
 "               services."
 msgstr ""
 
@@ -591,7 +592,7 @@ msgid ""
 "             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"
+"             digital sovereignty in the critical financial\n"
 "             infrastructure."
 msgstr ""
 
@@ -745,7 +746,7 @@ msgid ""
 "The total amount of digital currency withdrawn by a\n"
 "                customer. The government can impose limits on how much\n"
 "                digital cash a customer can withdraw within a\n"
-"                given timeframe."
+"                given time frame."
 msgstr ""
 
 #: governments.html.j2:128
@@ -786,7 +787,7 @@ msgid ""
 "      development\n"
 "      at <a href=\"http://www.inria.fr/\">Inria</a>.  We expect to make "
 "it operational in 2017.\n"
-"      Meanwhile you can learn about Taler on this website, try the <a "
+"      You can learn about Taler on this website, try the <a "
 "href=\"https://demo.taler.net\">demo</a>\n"
 "      and look at our <a href=\"https://docs.taler.net\">developer</a> "
 "and <a href=\"https://api.taler.net\">API</a> documentation.\n"
@@ -831,7 +832,7 @@ msgstr ""
 msgid ""
 "\n"
 "        By design Taler does not suffer from many classes\n"
-"        of security problems such as phishing or conterfeit.\n"
+"        of security problems such as phishing or counterfeit.\n"
 "        Despite its security features, Taler never rejects a legitimate\n"
 "        customer due to a fraud-detection false positive.\n"
 "        "
@@ -907,7 +908,7 @@ msgid ""
 "    in the desired currency.  We provide\n"
 "    SDKs in various languages to makes the integration painless.\n"
 "    The merchant's backend for Taler transaction processing can run\n"
-"    on the mechant's premises or hosted.</p>\n"
+"    on the merchant's premises or hosted.</p>\n"
 "    "
 msgstr ""
 
@@ -927,7 +928,7 @@ msgstr ""
 msgid ""
 "\n"
 "          We have created a company, Taler Systems SA in\n"
-"          Luxemburg.<br>\n"
+"          Luxembourg.<br>\n"
 "          Please contact <tt>invest@taler.net</tt>\n"
 "          if you want to invest in Taler.\n"
 "        "
@@ -943,7 +944,7 @@ msgid ""
 "             Our <a href=\"about.html\">team</a> combines world-class "
 "business leaders,\n"
 "             cryptographers, software engineers, civil-rights\n"
-"             activits and academics. We are unified by a vision\n"
+"             activists 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.\n"
 "        "
@@ -988,7 +989,7 @@ msgid ""
 "\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"
+"             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"
@@ -1082,7 +1083,7 @@ msgid ""
 "               audits (such as PCI DSS), processes or procedures,\n"
 "               as you never handle sensitive customer account\n"
 "               information.  Your systems will have customer\n"
-"               contracts wih qualified signatures for all\n"
+"               contracts with qualified signatures for all\n"
 "               transactions which you can use in court in case of\n"
 "               disputes."
 msgstr ""
@@ -1369,31 +1370,115 @@ msgstr ""
 #~ msgstr ""
 
 #~ 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 ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The total amount of digital currency withdrawn by a\n"
+#~ "                customer. The government can"
+#~ " impose limits on how much\n"
+#~ "                digital cash a customer can withdraw within a\n"
+#~ "                given timeframe."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "      Taler is an electronic payment system under\n"
+#~ "      development\n"
+#~ "      at <a href=\"http://www.inria.fr/\">Inria</a>."
+#~ "  We expect to make it operational"
+#~ " in 2017.\n"
+#~ "      Meanwhile you can learn about "
+#~ "Taler on this website, try the <a"
+#~ " href=\"https://demo.taler.net\">demo</a>\n"
+#~ "      and look at our <a "
+#~ "href=\"https://docs.taler.net\">developer</a> and <a "
+#~ "href=\"https://api.taler.net\">API</a> documentation.\n"
+#~ "      "
+#~ msgstr ""
+
+#~ msgid ""
 #~ "\n"
-#~ "            An archived, public mailinglist for GNU Taler is\n"
-#~ "            hosted at\n"
-#~ "            <a "
-#~ "href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/mailman/listinfo/taler</a>."
-#~ "  You can send messages to the "
-#~ "list\n"
-#~ "            at <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+#~ "        By design Taler does not suffer from many classes\n"
+#~ "        of security problems such as phishing or conterfeit.\n"
+#~ "        Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ "        customer due to a fraud-detection false positive.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "             We track open feature requests and bugs in our\n"
-#~ "             <a href=\"https://gnunet.org/bugs/\">Bug tracker</a>,\n"
-#~ "             which is shared with the GNUnet project.\n"
-#~ "             You can also report bugs or feature requests to the\n"
-#~ "             mailinglist.\n"
+#~ "    <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ "    in the desired currency.  We provide\n"
+#~ "    SDKs in various languages to makes the integration painless.\n"
+#~ "    The merchant's backend for Taler transaction processing can run\n"
+#~ "    on the mechant's premises or hosted.</p>\n"
+#~ "    "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "          We have created a company, Taler Systems SA in\n"
+#~ "          Luxemburg.<br>\n"
+#~ "          Please contact <tt>invest@taler.net</tt>\n"
+#~ "          if you want to invest in Taler.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
-#~ "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>."
+#~ "\n"
+#~ "             Our <a href=\"about.html\">team</a> "
+#~ "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.\n"
+#~ "        "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\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 facilitate the transactions.\n"
+#~ "       "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will have cryptographic proof of payment from\n"
+#~ "               the Taler payment service provider. Taler does not\n"
+#~ "               require you to undergo any particular security\n"
+#~ "               audits (such as PCI DSS), processes or procedures,\n"
+#~ "               as you never handle sensitive customer account\n"
+#~ "               information.  Your systems will have customer\n"
+#~ "               contracts wih qualified signatures for all\n"
+#~ "               transactions which you can use in court in case of\n"
+#~ "               disputes."
 #~ msgstr ""
 
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 1684ad77..aef5f99a 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,15 +3,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-07 17:34+0100\n"
+"POT-Creation-Date: 2017-03-08 10:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
 "Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
 msgid ""
@@ -175,7 +176,7 @@ msgid ""
 "               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"
+"               usual government protections for financial\n"
 "               services."
 msgstr ""
 
@@ -583,7 +584,7 @@ msgid ""
 "             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"
+"             digital sovereignty in the critical financial\n"
 "             infrastructure."
 msgstr ""
 
@@ -736,7 +737,7 @@ msgid ""
 "The total amount of digital currency withdrawn by a\n"
 "                customer. The government can impose limits on how much\n"
 "                digital cash a customer can withdraw within a\n"
-"                given timeframe."
+"                given time frame."
 msgstr ""
 
 #: governments.html.j2:128
@@ -777,7 +778,7 @@ msgid ""
 "      development\n"
 "      at <a href=\"http://www.inria.fr/\">Inria</a>.  We expect to make "
 "it operational in 2017.\n"
-"      Meanwhile you can learn about Taler on this website, try the <a "
+"      You can learn about Taler on this website, try the <a "
 "href=\"https://demo.taler.net\">demo</a>\n"
 "      and look at our <a href=\"https://docs.taler.net\">developer</a> "
 "and <a href=\"https://api.taler.net\">API</a> documentation.\n"
@@ -822,7 +823,7 @@ msgstr ""
 msgid ""
 "\n"
 "        By design Taler does not suffer from many classes\n"
-"        of security problems such as phishing or conterfeit.\n"
+"        of security problems such as phishing or counterfeit.\n"
 "        Despite its security features, Taler never rejects a legitimate\n"
 "        customer due to a fraud-detection false positive.\n"
 "        "
@@ -898,7 +899,7 @@ msgid ""
 "    in the desired currency.  We provide\n"
 "    SDKs in various languages to makes the integration painless.\n"
 "    The merchant's backend for Taler transaction processing can run\n"
-"    on the mechant's premises or hosted.</p>\n"
+"    on the merchant's premises or hosted.</p>\n"
 "    "
 msgstr ""
 
@@ -918,7 +919,7 @@ msgstr ""
 msgid ""
 "\n"
 "          We have created a company, Taler Systems SA in\n"
-"          Luxemburg.<br>\n"
+"          Luxembourg.<br>\n"
 "          Please contact <tt>invest@taler.net</tt>\n"
 "          if you want to invest in Taler.\n"
 "        "
@@ -934,7 +935,7 @@ msgid ""
 "             Our <a href=\"about.html\">team</a> combines world-class "
 "business leaders,\n"
 "             cryptographers, software engineers, civil-rights\n"
-"             activits and academics. We are unified by a vision\n"
+"             activists 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.\n"
 "        "
@@ -979,7 +980,7 @@ msgid ""
 "\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"
+"             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"
@@ -1073,7 +1074,7 @@ msgid ""
 "               audits (such as PCI DSS), processes or procedures,\n"
 "               as you never handle sensitive customer account\n"
 "               information.  Your systems will have customer\n"
-"               contracts wih qualified signatures for all\n"
+"               contracts with qualified signatures for all\n"
 "               transactions which you can use in court in case of\n"
 "               disputes."
 msgstr ""
@@ -1363,31 +1364,115 @@ msgstr ""
 #~ msgstr ""
 
 #~ 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 ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The total amount of digital currency withdrawn by a\n"
+#~ "                customer. The government can"
+#~ " impose limits on how much\n"
+#~ "                digital cash a customer can withdraw within a\n"
+#~ "                given timeframe."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "      Taler is an electronic payment system under\n"
+#~ "      development\n"
+#~ "      at <a href=\"http://www.inria.fr/\">Inria</a>."
+#~ "  We expect to make it operational"
+#~ " in 2017.\n"
+#~ "      Meanwhile you can learn about "
+#~ "Taler on this website, try the <a"
+#~ " href=\"https://demo.taler.net\">demo</a>\n"
+#~ "      and look at our <a "
+#~ "href=\"https://docs.taler.net\">developer</a> and <a "
+#~ "href=\"https://api.taler.net\">API</a> documentation.\n"
+#~ "      "
+#~ msgstr ""
+
+#~ msgid ""
 #~ "\n"
-#~ "            An archived, public mailinglist for GNU Taler is\n"
-#~ "            hosted at\n"
-#~ "            <a "
-#~ "href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/mailman/listinfo/taler</a>."
-#~ "  You can send messages to the "
-#~ "list\n"
-#~ "            at <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+#~ "        By design Taler does not suffer from many classes\n"
+#~ "        of security problems such as phishing or conterfeit.\n"
+#~ "        Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ "        customer due to a fraud-detection false positive.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "             We track open feature requests and bugs in our\n"
-#~ "             <a href=\"https://gnunet.org/bugs/\">Bug tracker</a>,\n"
-#~ "             which is shared with the GNUnet project.\n"
-#~ "             You can also report bugs or feature requests to the\n"
-#~ "             mailinglist.\n"
+#~ "    <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ "    in the desired currency.  We provide\n"
+#~ "    SDKs in various languages to makes the integration painless.\n"
+#~ "    The merchant's backend for Taler transaction processing can run\n"
+#~ "    on the mechant's premises or hosted.</p>\n"
+#~ "    "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "          We have created a company, Taler Systems SA in\n"
+#~ "          Luxemburg.<br>\n"
+#~ "          Please contact <tt>invest@taler.net</tt>\n"
+#~ "          if you want to invest in Taler.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
-#~ "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>."
+#~ "\n"
+#~ "             Our <a href=\"about.html\">team</a> "
+#~ "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.\n"
+#~ "        "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\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 facilitate the transactions.\n"
+#~ "       "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will have cryptographic proof of payment from\n"
+#~ "               the Taler payment service provider. Taler does not\n"
+#~ "               require you to undergo any particular security\n"
+#~ "               audits (such as PCI DSS), processes or procedures,\n"
+#~ "               as you never handle sensitive customer account\n"
+#~ "               information.  Your systems will have customer\n"
+#~ "               contracts wih qualified signatures for all\n"
+#~ "               transactions which you can use in court in case of\n"
+#~ "               disputes."
 #~ msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index e1d01545..cac50efa 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,15 +3,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-07 17:34+0100\n"
+"POT-Creation-Date: 2017-03-08 10:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: es\n"
 "Language-Team: es <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
 #, fuzzy
@@ -193,7 +194,7 @@ msgid ""
 "               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"
+"               usual government protections for financial\n"
 "               services."
 msgstr ""
 
@@ -601,7 +602,7 @@ msgid ""
 "             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"
+"             digital sovereignty in the critical financial\n"
 "             infrastructure."
 msgstr ""
 
@@ -754,7 +755,7 @@ msgid ""
 "The total amount of digital currency withdrawn by a\n"
 "                customer. The government can impose limits on how much\n"
 "                digital cash a customer can withdraw within a\n"
-"                given timeframe."
+"                given time frame."
 msgstr ""
 
 #: governments.html.j2:128
@@ -795,7 +796,7 @@ msgid ""
 "      development\n"
 "      at <a href=\"http://www.inria.fr/\">Inria</a>.  We expect to make "
 "it operational in 2017.\n"
-"      Meanwhile you can learn about Taler on this website, try the <a "
+"      You can learn about Taler on this website, try the <a "
 "href=\"https://demo.taler.net\">demo</a>\n"
 "      and look at our <a href=\"https://docs.taler.net\">developer</a> "
 "and <a href=\"https://api.taler.net\">API</a> documentation.\n"
@@ -840,7 +841,7 @@ msgstr ""
 msgid ""
 "\n"
 "        By design Taler does not suffer from many classes\n"
-"        of security problems such as phishing or conterfeit.\n"
+"        of security problems such as phishing or counterfeit.\n"
 "        Despite its security features, Taler never rejects a legitimate\n"
 "        customer due to a fraud-detection false positive.\n"
 "        "
@@ -916,7 +917,7 @@ msgid ""
 "    in the desired currency.  We provide\n"
 "    SDKs in various languages to makes the integration painless.\n"
 "    The merchant's backend for Taler transaction processing can run\n"
-"    on the mechant's premises or hosted.</p>\n"
+"    on the merchant's premises or hosted.</p>\n"
 "    "
 msgstr ""
 
@@ -936,7 +937,7 @@ msgstr ""
 msgid ""
 "\n"
 "          We have created a company, Taler Systems SA in\n"
-"          Luxemburg.<br>\n"
+"          Luxembourg.<br>\n"
 "          Please contact <tt>invest@taler.net</tt>\n"
 "          if you want to invest in Taler.\n"
 "        "
@@ -952,7 +953,7 @@ msgid ""
 "             Our <a href=\"about.html\">team</a> combines world-class "
 "business leaders,\n"
 "             cryptographers, software engineers, civil-rights\n"
-"             activits and academics. We are unified by a vision\n"
+"             activists 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.\n"
 "        "
@@ -997,7 +998,7 @@ msgid ""
 "\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"
+"             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"
@@ -1091,7 +1092,7 @@ msgid ""
 "               audits (such as PCI DSS), processes or procedures,\n"
 "               as you never handle sensitive customer account\n"
 "               information.  Your systems will have customer\n"
-"               contracts wih qualified signatures for all\n"
+"               contracts with qualified signatures for all\n"
 "               transactions which you can use in court in case of\n"
 "               disputes."
 msgstr ""
@@ -1382,31 +1383,115 @@ msgstr ""
 #~ msgstr ""
 
 #~ 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 ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The total amount of digital currency withdrawn by a\n"
+#~ "                customer. The government can"
+#~ " impose limits on how much\n"
+#~ "                digital cash a customer can withdraw within a\n"
+#~ "                given timeframe."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "      Taler is an electronic payment system under\n"
+#~ "      development\n"
+#~ "      at <a href=\"http://www.inria.fr/\">Inria</a>."
+#~ "  We expect to make it operational"
+#~ " in 2017.\n"
+#~ "      Meanwhile you can learn about "
+#~ "Taler on this website, try the <a"
+#~ " href=\"https://demo.taler.net\">demo</a>\n"
+#~ "      and look at our <a "
+#~ "href=\"https://docs.taler.net\">developer</a> and <a "
+#~ "href=\"https://api.taler.net\">API</a> documentation.\n"
+#~ "      "
+#~ msgstr ""
+
+#~ msgid ""
 #~ "\n"
-#~ "            An archived, public mailinglist for GNU Taler is\n"
-#~ "            hosted at\n"
-#~ "            <a "
-#~ "href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/mailman/listinfo/taler</a>."
-#~ "  You can send messages to the "
-#~ "list\n"
-#~ "            at <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+#~ "        By design Taler does not suffer from many classes\n"
+#~ "        of security problems such as phishing or conterfeit.\n"
+#~ "        Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ "        customer due to a fraud-detection false positive.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "             We track open feature requests and bugs in our\n"
-#~ "             <a href=\"https://gnunet.org/bugs/\">Bug tracker</a>,\n"
-#~ "             which is shared with the GNUnet project.\n"
-#~ "             You can also report bugs or feature requests to the\n"
-#~ "             mailinglist.\n"
+#~ "    <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ "    in the desired currency.  We provide\n"
+#~ "    SDKs in various languages to makes the integration painless.\n"
+#~ "    The merchant's backend for Taler transaction processing can run\n"
+#~ "    on the mechant's premises or hosted.</p>\n"
+#~ "    "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "          We have created a company, Taler Systems SA in\n"
+#~ "          Luxemburg.<br>\n"
+#~ "          Please contact <tt>invest@taler.net</tt>\n"
+#~ "          if you want to invest in Taler.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
-#~ "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>."
+#~ "\n"
+#~ "             Our <a href=\"about.html\">team</a> "
+#~ "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.\n"
+#~ "        "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\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 facilitate the transactions.\n"
+#~ "       "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will have cryptographic proof of payment from\n"
+#~ "               the Taler payment service provider. Taler does not\n"
+#~ "               require you to undergo any particular security\n"
+#~ "               audits (such as PCI DSS), processes or procedures,\n"
+#~ "               as you never handle sensitive customer account\n"
+#~ "               information.  Your systems will have customer\n"
+#~ "               contracts wih qualified signatures for all\n"
+#~ "               transactions which you can use in court in case of\n"
+#~ "               disputes."
 #~ msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index ef771c57..e6b043e8 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,15 +3,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-07 17:34+0100\n"
+"POT-Creation-Date: 2017-03-08 10:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: fr\n"
 "Language-Team: fr <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
 #, fuzzy
@@ -191,7 +192,7 @@ msgid ""
 "               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"
+"               usual government protections for financial\n"
 "               services."
 msgstr ""
 
@@ -599,7 +600,7 @@ msgid ""
 "             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"
+"             digital sovereignty in the critical financial\n"
 "             infrastructure."
 msgstr ""
 
@@ -752,7 +753,7 @@ msgid ""
 "The total amount of digital currency withdrawn by a\n"
 "                customer. The government can impose limits on how much\n"
 "                digital cash a customer can withdraw within a\n"
-"                given timeframe."
+"                given time frame."
 msgstr ""
 
 #: governments.html.j2:128
@@ -793,7 +794,7 @@ msgid ""
 "      development\n"
 "      at <a href=\"http://www.inria.fr/\">Inria</a>.  We expect to make "
 "it operational in 2017.\n"
-"      Meanwhile you can learn about Taler on this website, try the <a "
+"      You can learn about Taler on this website, try the <a "
 "href=\"https://demo.taler.net\">demo</a>\n"
 "      and look at our <a href=\"https://docs.taler.net\">developer</a> "
 "and <a href=\"https://api.taler.net\">API</a> documentation.\n"
@@ -838,7 +839,7 @@ msgstr ""
 msgid ""
 "\n"
 "        By design Taler does not suffer from many classes\n"
-"        of security problems such as phishing or conterfeit.\n"
+"        of security problems such as phishing or counterfeit.\n"
 "        Despite its security features, Taler never rejects a legitimate\n"
 "        customer due to a fraud-detection false positive.\n"
 "        "
@@ -914,7 +915,7 @@ msgid ""
 "    in the desired currency.  We provide\n"
 "    SDKs in various languages to makes the integration painless.\n"
 "    The merchant's backend for Taler transaction processing can run\n"
-"    on the mechant's premises or hosted.</p>\n"
+"    on the merchant's premises or hosted.</p>\n"
 "    "
 msgstr ""
 
@@ -934,7 +935,7 @@ msgstr ""
 msgid ""
 "\n"
 "          We have created a company, Taler Systems SA in\n"
-"          Luxemburg.<br>\n"
+"          Luxembourg.<br>\n"
 "          Please contact <tt>invest@taler.net</tt>\n"
 "          if you want to invest in Taler.\n"
 "        "
@@ -950,7 +951,7 @@ msgid ""
 "             Our <a href=\"about.html\">team</a> combines world-class "
 "business leaders,\n"
 "             cryptographers, software engineers, civil-rights\n"
-"             activits and academics. We are unified by a vision\n"
+"             activists 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.\n"
 "        "
@@ -995,7 +996,7 @@ msgid ""
 "\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"
+"             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"
@@ -1089,7 +1090,7 @@ msgid ""
 "               audits (such as PCI DSS), processes or procedures,\n"
 "               as you never handle sensitive customer account\n"
 "               information.  Your systems will have customer\n"
-"               contracts wih qualified signatures for all\n"
+"               contracts with qualified signatures for all\n"
 "               transactions which you can use in court in case of\n"
 "               disputes."
 msgstr ""
@@ -1380,31 +1381,115 @@ msgstr ""
 #~ msgstr ""
 
 #~ 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 ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The total amount of digital currency withdrawn by a\n"
+#~ "                customer. The government can"
+#~ " impose limits on how much\n"
+#~ "                digital cash a customer can withdraw within a\n"
+#~ "                given timeframe."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "      Taler is an electronic payment system under\n"
+#~ "      development\n"
+#~ "      at <a href=\"http://www.inria.fr/\">Inria</a>."
+#~ "  We expect to make it operational"
+#~ " in 2017.\n"
+#~ "      Meanwhile you can learn about "
+#~ "Taler on this website, try the <a"
+#~ " href=\"https://demo.taler.net\">demo</a>\n"
+#~ "      and look at our <a "
+#~ "href=\"https://docs.taler.net\">developer</a> and <a "
+#~ "href=\"https://api.taler.net\">API</a> documentation.\n"
+#~ "      "
+#~ msgstr ""
+
+#~ msgid ""
 #~ "\n"
-#~ "            An archived, public mailinglist for GNU Taler is\n"
-#~ "            hosted at\n"
-#~ "            <a "
-#~ "href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/mailman/listinfo/taler</a>."
-#~ "  You can send messages to the "
-#~ "list\n"
-#~ "            at <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+#~ "        By design Taler does not suffer from many classes\n"
+#~ "        of security problems such as phishing or conterfeit.\n"
+#~ "        Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ "        customer due to a fraud-detection false positive.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "             We track open feature requests and bugs in our\n"
-#~ "             <a href=\"https://gnunet.org/bugs/\">Bug tracker</a>,\n"
-#~ "             which is shared with the GNUnet project.\n"
-#~ "             You can also report bugs or feature requests to the\n"
-#~ "             mailinglist.\n"
+#~ "    <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ "    in the desired currency.  We provide\n"
+#~ "    SDKs in various languages to makes the integration painless.\n"
+#~ "    The merchant's backend for Taler transaction processing can run\n"
+#~ "    on the mechant's premises or hosted.</p>\n"
+#~ "    "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "          We have created a company, Taler Systems SA in\n"
+#~ "          Luxemburg.<br>\n"
+#~ "          Please contact <tt>invest@taler.net</tt>\n"
+#~ "          if you want to invest in Taler.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
-#~ "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>."
+#~ "\n"
+#~ "             Our <a href=\"about.html\">team</a> "
+#~ "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.\n"
+#~ "        "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\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 facilitate the transactions.\n"
+#~ "       "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will have cryptographic proof of payment from\n"
+#~ "               the Taler payment service provider. Taler does not\n"
+#~ "               require you to undergo any particular security\n"
+#~ "               audits (such as PCI DSS), processes or procedures,\n"
+#~ "               as you never handle sensitive customer account\n"
+#~ "               information.  Your systems will have customer\n"
+#~ "               contracts wih qualified signatures for all\n"
+#~ "               transactions which you can use in court in case of\n"
+#~ "               disputes."
 #~ msgstr ""
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 4948d2bb..33d60ac6 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,15 +3,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-07 17:34+0100\n"
+"POT-Creation-Date: 2017-03-08 10:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: it\n"
 "Language-Team: it <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
 #, fuzzy
@@ -192,7 +193,7 @@ msgid ""
 "               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"
+"               usual government protections for financial\n"
 "               services."
 msgstr ""
 
@@ -600,7 +601,7 @@ msgid ""
 "             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"
+"             digital sovereignty in the critical financial\n"
 "             infrastructure."
 msgstr ""
 
@@ -754,7 +755,7 @@ msgid ""
 "The total amount of digital currency withdrawn by a\n"
 "                customer. The government can impose limits on how much\n"
 "                digital cash a customer can withdraw within a\n"
-"                given timeframe."
+"                given time frame."
 msgstr ""
 
 #: governments.html.j2:128
@@ -795,7 +796,7 @@ msgid ""
 "      development\n"
 "      at <a href=\"http://www.inria.fr/\">Inria</a>.  We expect to make "
 "it operational in 2017.\n"
-"      Meanwhile you can learn about Taler on this website, try the <a "
+"      You can learn about Taler on this website, try the <a "
 "href=\"https://demo.taler.net\">demo</a>\n"
 "      and look at our <a href=\"https://docs.taler.net\">developer</a> "
 "and <a href=\"https://api.taler.net\">API</a> documentation.\n"
@@ -840,7 +841,7 @@ msgstr ""
 msgid ""
 "\n"
 "        By design Taler does not suffer from many classes\n"
-"        of security problems such as phishing or conterfeit.\n"
+"        of security problems such as phishing or counterfeit.\n"
 "        Despite its security features, Taler never rejects a legitimate\n"
 "        customer due to a fraud-detection false positive.\n"
 "        "
@@ -916,7 +917,7 @@ msgid ""
 "    in the desired currency.  We provide\n"
 "    SDKs in various languages to makes the integration painless.\n"
 "    The merchant's backend for Taler transaction processing can run\n"
-"    on the mechant's premises or hosted.</p>\n"
+"    on the merchant's premises or hosted.</p>\n"
 "    "
 msgstr ""
 
@@ -936,7 +937,7 @@ msgstr ""
 msgid ""
 "\n"
 "          We have created a company, Taler Systems SA in\n"
-"          Luxemburg.<br>\n"
+"          Luxembourg.<br>\n"
 "          Please contact <tt>invest@taler.net</tt>\n"
 "          if you want to invest in Taler.\n"
 "        "
@@ -952,7 +953,7 @@ msgid ""
 "             Our <a href=\"about.html\">team</a> combines world-class "
 "business leaders,\n"
 "             cryptographers, software engineers, civil-rights\n"
-"             activits and academics. We are unified by a vision\n"
+"             activists 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.\n"
 "        "
@@ -997,7 +998,7 @@ msgid ""
 "\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"
+"             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"
@@ -1091,7 +1092,7 @@ msgid ""
 "               audits (such as PCI DSS), processes or procedures,\n"
 "               as you never handle sensitive customer account\n"
 "               information.  Your systems will have customer\n"
-"               contracts wih qualified signatures for all\n"
+"               contracts with qualified signatures for all\n"
 "               transactions which you can use in court in case of\n"
 "               disputes."
 msgstr ""
@@ -1382,31 +1383,115 @@ msgstr ""
 #~ msgstr ""
 
 #~ 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 ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The total amount of digital currency withdrawn by a\n"
+#~ "                customer. The government can"
+#~ " impose limits on how much\n"
+#~ "                digital cash a customer can withdraw within a\n"
+#~ "                given timeframe."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "      Taler is an electronic payment system under\n"
+#~ "      development\n"
+#~ "      at <a href=\"http://www.inria.fr/\">Inria</a>."
+#~ "  We expect to make it operational"
+#~ " in 2017.\n"
+#~ "      Meanwhile you can learn about "
+#~ "Taler on this website, try the <a"
+#~ " href=\"https://demo.taler.net\">demo</a>\n"
+#~ "      and look at our <a "
+#~ "href=\"https://docs.taler.net\">developer</a> and <a "
+#~ "href=\"https://api.taler.net\">API</a> documentation.\n"
+#~ "      "
+#~ msgstr ""
+
+#~ msgid ""
 #~ "\n"
-#~ "            An archived, public mailinglist for GNU Taler is\n"
-#~ "            hosted at\n"
-#~ "            <a "
-#~ "href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/mailman/listinfo/taler</a>."
-#~ "  You can send messages to the "
-#~ "list\n"
-#~ "            at <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+#~ "        By design Taler does not suffer from many classes\n"
+#~ "        of security problems such as phishing or conterfeit.\n"
+#~ "        Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ "        customer due to a fraud-detection false positive.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "             We track open feature requests and bugs in our\n"
-#~ "             <a href=\"https://gnunet.org/bugs/\">Bug tracker</a>,\n"
-#~ "             which is shared with the GNUnet project.\n"
-#~ "             You can also report bugs or feature requests to the\n"
-#~ "             mailinglist.\n"
+#~ "    <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ "    in the desired currency.  We provide\n"
+#~ "    SDKs in various languages to makes the integration painless.\n"
+#~ "    The merchant's backend for Taler transaction processing can run\n"
+#~ "    on the mechant's premises or hosted.</p>\n"
+#~ "    "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "          We have created a company, Taler Systems SA in\n"
+#~ "          Luxemburg.<br>\n"
+#~ "          Please contact <tt>invest@taler.net</tt>\n"
+#~ "          if you want to invest in Taler.\n"
 #~ "        "
 #~ msgstr ""
 
 #~ msgid ""
-#~ "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>."
+#~ "\n"
+#~ "             Our <a href=\"about.html\">team</a> "
+#~ "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.\n"
+#~ "        "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\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 facilitate the transactions.\n"
+#~ "       "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will have cryptographic proof of payment from\n"
+#~ "               the Taler payment service provider. Taler does not\n"
+#~ "               require you to undergo any particular security\n"
+#~ "               audits (such as PCI DSS), processes or procedures,\n"
+#~ "               as you never handle sensitive customer account\n"
+#~ "               information.  Your systems will have customer\n"
+#~ "               contracts wih qualified signatures for all\n"
+#~ "               transactions which you can use in court in case of\n"
+#~ "               disputes."
 #~ msgstr ""