simplify FAQ answers, i18n (merge)

5 files changed, 390 insertions, 570 deletions

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 8100ec8a..3cac8e52 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-08 10:09+0100\n"
+"POT-Creation-Date: 2017-03-08 10:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -579,6 +579,83 @@ msgid ""
 "                   compromise.  "
 msgstr ""
 
+#: faq.html.j2:5
+msgid "How is Taler related to Bitcoin or Blockchains?"
+msgstr ""
+
+#: faq.html.j2:6
+msgid ""
+"\n"
+"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+"Taler is not based on proof-of-work or any other distributed consensus\n"
+"mechanism.  Instead Taler is based on blind signatures.</p>\n"
+"\n"
+"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
+"wallet (with an appropriate exchange), which would give some benefits\n"
+"over plain Bitcoin, such as instant confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:16
+msgid "Where is the balance in my wallet stored?"
+msgstr ""
+
+#: faq.html.j2:17
+msgid ""
+"\n"
+"<p>Your wallet stores digital coins that were blindly signed by an\n"
+"exchange, and thus ultimately your computer holds your balance.  The\n"
+"exchange keeps funds matching all unspent coins in an escrow bank\n"
+"account.</p>\n"
+msgstr ""
+
+#: faq.html.j2:25
+msgid "What if my wallet is lost?"
+msgstr ""
+
+#: faq.html.j2:26
+msgid ""
+"\n"
+"<p>Since the digital coins of value in your wallet are anonymized, the\n"
+"exchange can not assist you in recovering a lost or stolen wallet.\n"
+"Just like with a physical wallet for cash, you are responsible for\n"
+"keeping it safe.</p>\n"
+"\n"
+"<p>The risk of losing a wallet can be mitigated by making backups or\n"
+"keeping the balance reasonably low.</p>\n"
+"\n"
+"<p>In case of a compromise of one of your devices, an attacker that\n"
+"spends coins on your behalf will allow you to detect that your device\n"
+"has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:41
+msgid "Can I send money to my friend with Taler?"
+msgstr ""
+
+#: faq.html.j2:42
+msgid ""
+"\n"
+"<p>If your friend provides goods or services for you in exchange for a\n"
+"payment, they can easily set up a Taler merchant and receive the\n"
+"payment in their bank account.</p>\n"
+"\n"
+"<p>Future versions of the Taler wallet may allow exchanging coins\n"
+"among friends directly as well.</p>\n"
+msgstr ""
+
+#: faq.html.j2:52
+msgid "How does Taler handle payments in different currencies?"
+msgstr ""
+
+#: faq.html.j2:53
+msgid ""
+"\n"
+"<p>Taler wallets can store digital coins corresponding to multiple\n"
+"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"\n"
+"<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1369,116 +1446,3 @@ msgstr ""
 #~ msgid "The mailinglist"
 #~ 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"
-#~ "        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"
-#~ "    <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 ""
-#~ "\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 aef5f99a..68869b49 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-03-08 10:09+0100\n"
+"POT-Creation-Date: 2017-03-08 10:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -571,6 +571,83 @@ msgid ""
 "                   compromise.  "
 msgstr ""
 
+#: faq.html.j2:5
+msgid "How is Taler related to Bitcoin or Blockchains?"
+msgstr ""
+
+#: faq.html.j2:6
+msgid ""
+"\n"
+"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+"Taler is not based on proof-of-work or any other distributed consensus\n"
+"mechanism.  Instead Taler is based on blind signatures.</p>\n"
+"\n"
+"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
+"wallet (with an appropriate exchange), which would give some benefits\n"
+"over plain Bitcoin, such as instant confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:16
+msgid "Where is the balance in my wallet stored?"
+msgstr ""
+
+#: faq.html.j2:17
+msgid ""
+"\n"
+"<p>Your wallet stores digital coins that were blindly signed by an\n"
+"exchange, and thus ultimately your computer holds your balance.  The\n"
+"exchange keeps funds matching all unspent coins in an escrow bank\n"
+"account.</p>\n"
+msgstr ""
+
+#: faq.html.j2:25
+msgid "What if my wallet is lost?"
+msgstr ""
+
+#: faq.html.j2:26
+msgid ""
+"\n"
+"<p>Since the digital coins of value in your wallet are anonymized, the\n"
+"exchange can not assist you in recovering a lost or stolen wallet.\n"
+"Just like with a physical wallet for cash, you are responsible for\n"
+"keeping it safe.</p>\n"
+"\n"
+"<p>The risk of losing a wallet can be mitigated by making backups or\n"
+"keeping the balance reasonably low.</p>\n"
+"\n"
+"<p>In case of a compromise of one of your devices, an attacker that\n"
+"spends coins on your behalf will allow you to detect that your device\n"
+"has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:41
+msgid "Can I send money to my friend with Taler?"
+msgstr ""
+
+#: faq.html.j2:42
+msgid ""
+"\n"
+"<p>If your friend provides goods or services for you in exchange for a\n"
+"payment, they can easily set up a Taler merchant and receive the\n"
+"payment in their bank account.</p>\n"
+"\n"
+"<p>Future versions of the Taler wallet may allow exchanging coins\n"
+"among friends directly as well.</p>\n"
+msgstr ""
+
+#: faq.html.j2:52
+msgid "How does Taler handle payments in different currencies?"
+msgstr ""
+
+#: faq.html.j2:53
+msgid ""
+"\n"
+"<p>Taler wallets can store digital coins corresponding to multiple\n"
+"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"\n"
+"<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1363,116 +1440,3 @@ msgstr ""
 #~ msgid "The mailinglist"
 #~ 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"
-#~ "        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"
-#~ "    <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 ""
-#~ "\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 cac50efa..b2acde1d 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-08 10:09+0100\n"
+"POT-Creation-Date: 2017-03-08 10:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: es\n"
@@ -589,6 +589,83 @@ msgid ""
 "                   compromise.  "
 msgstr ""
 
+#: faq.html.j2:5
+msgid "How is Taler related to Bitcoin or Blockchains?"
+msgstr ""
+
+#: faq.html.j2:6
+msgid ""
+"\n"
+"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+"Taler is not based on proof-of-work or any other distributed consensus\n"
+"mechanism.  Instead Taler is based on blind signatures.</p>\n"
+"\n"
+"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
+"wallet (with an appropriate exchange), which would give some benefits\n"
+"over plain Bitcoin, such as instant confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:16
+msgid "Where is the balance in my wallet stored?"
+msgstr ""
+
+#: faq.html.j2:17
+msgid ""
+"\n"
+"<p>Your wallet stores digital coins that were blindly signed by an\n"
+"exchange, and thus ultimately your computer holds your balance.  The\n"
+"exchange keeps funds matching all unspent coins in an escrow bank\n"
+"account.</p>\n"
+msgstr ""
+
+#: faq.html.j2:25
+msgid "What if my wallet is lost?"
+msgstr ""
+
+#: faq.html.j2:26
+msgid ""
+"\n"
+"<p>Since the digital coins of value in your wallet are anonymized, the\n"
+"exchange can not assist you in recovering a lost or stolen wallet.\n"
+"Just like with a physical wallet for cash, you are responsible for\n"
+"keeping it safe.</p>\n"
+"\n"
+"<p>The risk of losing a wallet can be mitigated by making backups or\n"
+"keeping the balance reasonably low.</p>\n"
+"\n"
+"<p>In case of a compromise of one of your devices, an attacker that\n"
+"spends coins on your behalf will allow you to detect that your device\n"
+"has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:41
+msgid "Can I send money to my friend with Taler?"
+msgstr ""
+
+#: faq.html.j2:42
+msgid ""
+"\n"
+"<p>If your friend provides goods or services for you in exchange for a\n"
+"payment, they can easily set up a Taler merchant and receive the\n"
+"payment in their bank account.</p>\n"
+"\n"
+"<p>Future versions of the Taler wallet may allow exchanging coins\n"
+"among friends directly as well.</p>\n"
+msgstr ""
+
+#: faq.html.j2:52
+msgid "How does Taler handle payments in different currencies?"
+msgstr ""
+
+#: faq.html.j2:53
+msgid ""
+"\n"
+"<p>Taler wallets can store digital coins corresponding to multiple\n"
+"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"\n"
+"<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1382,116 +1459,3 @@ msgstr ""
 #~ msgid "The mailinglist"
 #~ 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"
-#~ "        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"
-#~ "    <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 ""
-#~ "\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 e6b043e8..76584d59 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-08 10:09+0100\n"
+"POT-Creation-Date: 2017-03-08 10:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -587,6 +587,83 @@ msgid ""
 "                   compromise.  "
 msgstr ""
 
+#: faq.html.j2:5
+msgid "How is Taler related to Bitcoin or Blockchains?"
+msgstr ""
+
+#: faq.html.j2:6
+msgid ""
+"\n"
+"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+"Taler is not based on proof-of-work or any other distributed consensus\n"
+"mechanism.  Instead Taler is based on blind signatures.</p>\n"
+"\n"
+"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
+"wallet (with an appropriate exchange), which would give some benefits\n"
+"over plain Bitcoin, such as instant confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:16
+msgid "Where is the balance in my wallet stored?"
+msgstr ""
+
+#: faq.html.j2:17
+msgid ""
+"\n"
+"<p>Your wallet stores digital coins that were blindly signed by an\n"
+"exchange, and thus ultimately your computer holds your balance.  The\n"
+"exchange keeps funds matching all unspent coins in an escrow bank\n"
+"account.</p>\n"
+msgstr ""
+
+#: faq.html.j2:25
+msgid "What if my wallet is lost?"
+msgstr ""
+
+#: faq.html.j2:26
+msgid ""
+"\n"
+"<p>Since the digital coins of value in your wallet are anonymized, the\n"
+"exchange can not assist you in recovering a lost or stolen wallet.\n"
+"Just like with a physical wallet for cash, you are responsible for\n"
+"keeping it safe.</p>\n"
+"\n"
+"<p>The risk of losing a wallet can be mitigated by making backups or\n"
+"keeping the balance reasonably low.</p>\n"
+"\n"
+"<p>In case of a compromise of one of your devices, an attacker that\n"
+"spends coins on your behalf will allow you to detect that your device\n"
+"has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:41
+msgid "Can I send money to my friend with Taler?"
+msgstr ""
+
+#: faq.html.j2:42
+msgid ""
+"\n"
+"<p>If your friend provides goods or services for you in exchange for a\n"
+"payment, they can easily set up a Taler merchant and receive the\n"
+"payment in their bank account.</p>\n"
+"\n"
+"<p>Future versions of the Taler wallet may allow exchanging coins\n"
+"among friends directly as well.</p>\n"
+msgstr ""
+
+#: faq.html.j2:52
+msgid "How does Taler handle payments in different currencies?"
+msgstr ""
+
+#: faq.html.j2:53
+msgid ""
+"\n"
+"<p>Taler wallets can store digital coins corresponding to multiple\n"
+"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"\n"
+"<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1380,116 +1457,3 @@ msgstr ""
 #~ msgid "The mailinglist"
 #~ 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"
-#~ "        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"
-#~ "    <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 ""
-#~ "\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 33d60ac6..dac021c0 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-08 10:09+0100\n"
+"POT-Creation-Date: 2017-03-08 10:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: it\n"
@@ -588,6 +588,83 @@ msgid ""
 "                   compromise.  "
 msgstr ""
 
+#: faq.html.j2:5
+msgid "How is Taler related to Bitcoin or Blockchains?"
+msgstr ""
+
+#: faq.html.j2:6
+msgid ""
+"\n"
+"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+"Taler is not based on proof-of-work or any other distributed consensus\n"
+"mechanism.  Instead Taler is based on blind signatures.</p>\n"
+"\n"
+"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
+"wallet (with an appropriate exchange), which would give some benefits\n"
+"over plain Bitcoin, such as instant confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:16
+msgid "Where is the balance in my wallet stored?"
+msgstr ""
+
+#: faq.html.j2:17
+msgid ""
+"\n"
+"<p>Your wallet stores digital coins that were blindly signed by an\n"
+"exchange, and thus ultimately your computer holds your balance.  The\n"
+"exchange keeps funds matching all unspent coins in an escrow bank\n"
+"account.</p>\n"
+msgstr ""
+
+#: faq.html.j2:25
+msgid "What if my wallet is lost?"
+msgstr ""
+
+#: faq.html.j2:26
+msgid ""
+"\n"
+"<p>Since the digital coins of value in your wallet are anonymized, the\n"
+"exchange can not assist you in recovering a lost or stolen wallet.\n"
+"Just like with a physical wallet for cash, you are responsible for\n"
+"keeping it safe.</p>\n"
+"\n"
+"<p>The risk of losing a wallet can be mitigated by making backups or\n"
+"keeping the balance reasonably low.</p>\n"
+"\n"
+"<p>In case of a compromise of one of your devices, an attacker that\n"
+"spends coins on your behalf will allow you to detect that your device\n"
+"has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:41
+msgid "Can I send money to my friend with Taler?"
+msgstr ""
+
+#: faq.html.j2:42
+msgid ""
+"\n"
+"<p>If your friend provides goods or services for you in exchange for a\n"
+"payment, they can easily set up a Taler merchant and receive the\n"
+"payment in their bank account.</p>\n"
+"\n"
+"<p>Future versions of the Taler wallet may allow exchanging coins\n"
+"among friends directly as well.</p>\n"
+msgstr ""
+
+#: faq.html.j2:52
+msgid "How does Taler handle payments in different currencies?"
+msgstr ""
+
+#: faq.html.j2:53
+msgid ""
+"\n"
+"<p>Taler wallets can store digital coins corresponding to multiple\n"
+"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"\n"
+"<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
 #: governments.html.j2:6
 msgid "Advantages for Governments"
 msgstr ""
@@ -1382,116 +1459,3 @@ msgstr ""
 #~ msgid "The mailinglist"
 #~ 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"
-#~ "        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"
-#~ "    <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 ""
-#~ "\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 ""
-