[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch master updated: revise government page,
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-www] branch master updated: revise government page, fix misc i18n issues, fix some style issues |
|
Date: |
Tue, 07 Mar 2017 00:45:11 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new 4738878 revise government page, fix misc i18n issues, fix some style
issues
4738878 is described below
commit 473887865beb80d10a688d5e36aa843f8346601d
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Mar 7 00:45:07 2017 +0100
revise government page, fix misc i18n issues, fix some style issues
---
citizens.html.j2 | 10 +-
governments.html.j2 | 52 ++++++--
index.html.j2 | 108 +++++++--------
locale/de/LC_MESSAGES/messages.po | 270 ++++++++++++++++++++++++--------------
locale/en/LC_MESSAGES/messages.po | 268 +++++++++++++++++++++++--------------
locale/es/LC_MESSAGES/messages.po | 270 ++++++++++++++++++++++++--------------
locale/fr/LC_MESSAGES/messages.po | 270 ++++++++++++++++++++++++--------------
locale/it/LC_MESSAGES/messages.po | 270 ++++++++++++++++++++++++--------------
merchants.html.j2 | 83 +++++-------
9 files changed, 974 insertions(+), 627 deletions(-)
diff --git a/citizens.html.j2 b/citizens.html.j2
index 5829556..cf8a8cf 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -18,11 +18,11 @@
</div>
</div>
-<div class="container">
+<div class="container adorn_h3_bracket">
<!-- Example row of columns -->
<div class="row">
<div class="col-lg-6">
- <h2>{{ _("Security") }}</h2>
+ <h3>{{ _("Security") }}</h3>
<p>{{ _("Taler uses modern cryptography, ensuring that there
is no counterfeit. Your digital wallet is safer
@@ -34,7 +34,7 @@
</div>
<div class="col-lg-6">
- <h2>{{ _("Privacy") }}</h2>
+ <h3>{{ _("Privacy") }}</h3>
<p>{{ _("Your transactions are private, neither the exchange
nor merchant needs to learn your identity. There is
@@ -47,7 +47,7 @@
</div>
<div class="row">
<div class="col-lg-6">
- <h2>{{ _("Convenience") }}</h2>
+ <h3>{{ _("Convenience") }}</h3>
<p>{{ _("You will be able to withdraw money to replenish the
digital coins in your wallet using your credit card
@@ -58,7 +58,7 @@
</div>
<div class="col-lg-6">
- <h2>{{ _("Stability") }}</h2>
+ <h3>{{ _("Stability") }}</h3>
<p>{{ _("Coins in your digital wallet will be of the same
denomination as the cash in your physical wallet.
diff --git a/governments.html.j2 b/governments.html.j2
index 2349440..2b627c3 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -16,15 +16,14 @@
</div>
</div>
-<div class="container">
-
<!-- Example row of columns -->
-<div class="row">
+<div class="container adorn_h3_bracket">
+ <div class="row">
<div class="col-lg-6">
- <h2>{{ _("Taxable") }}</h2>
+ <h3>{{ _("Taxable") }}</h3>
<p>{{ _("Taler was
- built with the goal of fighting corruption and supporting
taxation.
+ built with the goal of fighting corruption and supporting
taxation.
With Taler, the receiver of any form of payment is
easily identified by the government, and the merchant
can be compelled to provide the contract that was accepted
@@ -43,10 +42,10 @@
extend to the immediate personal domain. In
particular, sharing access to funds within a family
or synchronizing wallets across multiple devices is not
- subject to monitoring.") }}</p> </div>
-
+ subject to monitoring.") }}</p>
+ </div>
<div class="col-lg-6">
- <h2>{{ _("Secure") }}</h2>
+ <h3>{{ _("Secure") }}</h3>
<p>{{ _("Taler's payments are cryptographically
secured. Thus, customers, merchants and the
@@ -65,9 +64,12 @@
the payment service provider to ensure that the
escrow account is managed honestly. This ensures
that the payment service provider does not threaten
- the economy due to fraud.") }}</p> </div> </div>
- <div class="row"> <div class="col-lg-6"> <h2>{{
- _("Libre") }}</h2>
+ the economy due to fraud.") }}</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-6">
+ <h3>{{ _("Libre") }}</h3>
<p>{{ _("Taler is free software implementing an open
protocol standard. Thus, Taler will enable
@@ -78,7 +80,7 @@
</div>
<div class="col-lg-6">
- <h2>{{ _("Efficient") }}</h2>
+ <h3>{{ _("Efficient") }}</h3>
<p>{{ _("Taler has an efficient design. Unlike
timeline-based payment systems, such as Bitcoin,
@@ -87,7 +89,29 @@
contribute to environmental pollution.") }}</p>
</div>
+ </div>
+</div>
+
+
+
+<div class="contianer-fluid c_acronym">
+ <div class="container">
+ <h2 id="documentation">{{ _("Taler and regulation") }}</h2>
+ <dl>
+ <dt>{{ _("Anti-money laundering (AML)")}}</dt>
+ <dd>{{ _("With Taler, income is visible and can be tied to the contract
signed by both parties.") }}</li>
+ <dt>{{ _("Know-your-customer (KYC)")}}</dt>
+ <dd>{{ _("In Taler, payer and payee are known by their bank accounts
when withdrawing or depositing coins respectively") }}</dd>
+ <dt>{{ _("Privacy-by-design (GDPR)")}}</dt>
+ <dd>{{ _("Taler cryptographically protects citizen's privacy, and by
design implements data minimization and privacy by default.") }}</dd>
+ <dt>{{ _("Competitive banking (PSD2)")}}</dt>
+ <dd>{{ _("Taler provides an open standard with public APIs contributing
to a level playing field.") }}</dt>
+ </dl>
+ </div>
</div>
+
+
+<div class="container">
<div class="col-lg-12">
<h2 id="overview">{{ _("Taler as seen by governments") }}</h2>
@@ -99,11 +123,11 @@
auditors, while merchants may be required to reveal
information during regular tax audits. Information
available to the government includes: ") }}</p>
-
+
<p>
<img src="{{ url('images/government.svg') }}" alt="government perspective"
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
</p><ul>
-
+
<li>{{ _("From the banking system: The total amount of
digital currency obtained by a customer. The
government could impose limits on how many
diff --git a/index.html.j2 b/index.html.j2
index e4ec7cf..c9cc38f 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -27,40 +27,42 @@
<div class="row">
<div class="col-lg-4">
- <h3>{{ _("Taxable") }}</h3>
+ <h3>{{ _("Practical") }}</h3>
<p>
{% trans %}
- When using Taler, merchants can't hide their income from tax
- collection authorities. Unlike cash and most digital currencies,
- Taler helps preventing black markets.
+ Taler is easy to integrate with existing Web
+ applications. Payments are cryptographically
+ secured and are confirmed within milliseconds with
+ extremely low transaction costs.
{% endtrans %}
</p>
</div>
<div class="col-lg-4">
- <h3>{{ _("Privacy-friendly") }}</h3>
+ <h3>{{ _("Stable") }}</h3>
+
<p>
{% trans %}
- When you pay with Taler, your identity does not
- have to be revealed to the merchant. Just like
- payments in cash, nobody else can track how you
- spent your electronic money. However, you obtain a
- legally valid proof of payment.
+ Taler does not introduce a new currency with
+ fluctuation risks, and instead uses a digital
+ wallet holding coins in reserve. Taler's
+ cryptographic coins correspond to existing
+ currencies, such as US Dollars, Euros or even
+ Bitcoins.
{% endtrans %}
</p>
</div>
<div class="col-lg-4">
- <h3>{{ _("Libre") }}</h3>
+ <h3>{{ _("Security-focused") }}</h3>
<p>
{% trans %}
- Taler provides protocols and reference implementations that in
- principle enables anybody to run their own payment infrastructure,
- be it individuals, organizations or whole countries. Since the
- reference implementation is a <a href="http://www.gnu.org/";>GNU</a>
- package, it will always remain free software.
+ By design Taler does not suffer from many classes
+ of security problems such as phishing or conterfeit.
+ Despite its security features, Taler never rejects a legitimate
+ customer due to a fraud-detection false positive.
{% endtrans %}
</p>
@@ -68,45 +70,44 @@
</div>
<div class="row">
<div class="col-lg-4">
- <h3>{{ _("Practical") }}</h3>
-
+ <h3>{{ _("Taxable") }}</h3>
+
<p>
{% trans %}
- Taler is easy to integrate with existing Web
- applications. Payments are cryptographically
- secured and are confirmed within milliseconds with
- extremely low transaction costs.
+ When using Taler, merchants cannot hide their income from tax
+ collection authorities. Unlike cash and most digital currencies,
+ Taler helps prevent black markets. Taler is not suitable for
+ illegal activities.
{% endtrans %}
</p>
</div>
<div class="col-lg-4">
- <h3>{{ _("Stable") }}</h3>
-
+ <h3>{{ _("Privacy-friendly") }}</h3>
<p>
{% trans %}
- Taler does not introduce a new currency with
- fluctuation risks, and instead uses a digital
- wallet holding coins in reserve. Taler's
- cryptographic coins correspond to existing
- currencies, such as US Dollars, Euros or even
- Bitcoins.
+ When you pay with Taler, your identity does not
+ have to be revealed to the merchant. Just like
+ payments in cash, nobody else can track how you
+ spent your electronic money. However, you obtain a
+ legally valid proof of payment.
{% endtrans %}
</p>
-
+
</div>
<div class="col-lg-4">
- <h3>{{ _("Security-focused") }}</h3>
+ <h3>{{ _("Libre") }}</h3>
<p>
{% trans %}
- By design Taler does not suffer from many classes
- of security problems such as phishing or conterfeit.
- Despite its security features, Taler never rejects a legitimate
- customer due to a fraud-detection false positive.
+ Taler provides protocols and reference implementations that in
+ principle enables anybody to run their own payment infrastructure,
+ be it individuals, organizations or whole countries. Since the
+ reference implementation is a <a href="http://www.gnu.org/";>GNU</a>
+ package, it will always remain free software.
{% endtrans %}
</p>
-
+
</div>
</div>
</div>
@@ -115,22 +116,25 @@
<div class="container">
<div class="row">
<div class="col-lg-6">
- <h2>Paying with Taler</h2>
- <p>In order to pay with Taler, users install a wallet browser extension
- or app on their device. Before the first payment, the wallet's balance
must
- be charged by some other means of payment for the desired currency.</p>
- <p>Once the wallet is charged, payments on websites take only one click,
are never falsely rejected
- by fraud detection and do not post any risk of phishing or identity
theft.</p>
+ <h2>{{ _("Paying with Taler") }}</h2>
+ {% trans %}
+ <p>To pay with Taler, customers install an electronic wallet
+ on their device. Before the first payment, the wallet's balance must
+ be charged in the desired currency by some other means of payment.</p>
+ <p>Once the wallet is charged, payments on websites take only one click,
+ are never falsely rejected by fraud detection and do not post any risk
+ of phishing or identity theft.</p>
+ {% endtrans %}
</div>
<div class="col-lg-6">
- <h2>Receiving payments with Taler</h2>
- <p>To receive Taler payments, a merchant only needs a bank account (or
- any other kind of payment address) in the desired currency. We provide an
- SDK in various languages that makes the integration into a merchant's store
- painless. The merchant's backend for Taler transaction processing can run
- on the mechant's premises or be a hosted backend.</p>
- <p>When using a hosted backend, setting up a website that accepts taler
- payments is a matter of minutes.</p>
+ <h2>{{ _("Receiving payments with Taler") }}</h2>
+ {% trans %}
+ <p>To receive Taler payments, a merchant needs a bank account
+ in the desired currency. We provide
+ SDKs in various languages to makes the integration painless.
+ The merchant's backend for Taler transaction processing can run
+ on the mechant's premises or hosted.</p>
+ {% endtrans %}
</div>
</div>
</div>
@@ -144,7 +148,7 @@
<div class="col-lg-6">
<h2>{{ _("Financial News") }}</h2>
{% include "financial-news.html.j2.inc" %}
- </div>
+ </div>
</div>
</div> <!-- /container -->
{% endblock body_content %}
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 359e819..56a07a3 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-06 23:50+0100\n"
+"POT-Creation-Date: 2017-03-07 00:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: de\n"
@@ -590,16 +590,16 @@ msgid ""
" infrastructure."
msgstr ""
-#: governments.html.j2:24 index.html.j2:30
+#: governments.html.j2:23 index.html.j2:73
#, fuzzy
msgid "Taxable"
msgstr "Taxierbar"
-#: governments.html.j2:26
+#: governments.html.j2:25
msgid ""
"Taler was\n"
" built with the goal of fighting corruption and supporting "
-"taxation. \n"
+"taxation.\n"
" With Taler, the receiver of any form of payment is\n"
" easily identified by the government, and the merchant\n"
" can be compelled to provide the contract that was accepted\n"
@@ -609,7 +609,7 @@ msgid ""
" viable."
msgstr ""
-#: governments.html.j2:36
+#: governments.html.j2:35
msgid ""
"Thus, despite offering anonymity for citizens\n"
" spending digital cash to buy goods and services,\n"
@@ -624,11 +624,11 @@ msgid ""
" subject to monitoring."
msgstr ""
-#: governments.html.j2:49 merchants.html.j2:33
+#: governments.html.j2:48 merchants.html.j2:33
msgid "Secure"
msgstr "Sicher"
-#: governments.html.j2:51
+#: governments.html.j2:50
msgid ""
"Taler's payments are cryptographically\n"
" secured. Thus, customers, merchants and the\n"
@@ -639,7 +639,7 @@ msgid ""
" merchants, the exchange and the state."
msgstr ""
-#: governments.html.j2:59
+#: governments.html.j2:58
msgid ""
"By design, the Taler payment service provider is\n"
" subject to financial regulation. Financial\n"
@@ -653,11 +653,11 @@ msgid ""
" the economy due to fraud."
msgstr ""
-#: governments.html.j2:70 index.html.j2:55
+#: governments.html.j2:72 index.html.j2:99
msgid "Libre"
msgstr "Libre"
-#: governments.html.j2:72
+#: governments.html.j2:74
msgid ""
"Taler is free software implementing an open\n"
" protocol standard. Thus, Taler will enable\n"
@@ -666,11 +666,11 @@ msgid ""
" financial stability today."
msgstr ""
-#: governments.html.j2:81
+#: governments.html.j2:83
msgid "Efficient"
msgstr "Effizient"
-#: governments.html.j2:83
+#: governments.html.j2:85
msgid ""
"Taler has an efficient design. Unlike\n"
" timeline-based payment systems, such as Bitcoin,\n"
@@ -679,11 +679,55 @@ msgid ""
" contribute to environmental pollution."
msgstr ""
-#: governments.html.j2:92
+#: governments.html.j2:99
+msgid "Taler and regulation"
+msgstr ""
+
+#: governments.html.j2:101
+msgid "Anti-money laundering (AML)"
+msgstr ""
+
+#: governments.html.j2:102
+msgid ""
+"With Taler, income is visible and can be tied to the contract signed by "
+"both parties."
+msgstr ""
+
+#: governments.html.j2:103
+msgid "Know-your-customer (KYC)"
+msgstr ""
+
+#: governments.html.j2:104
+msgid ""
+"In Taler, payer and payee are known by their bank accounts when "
+"withdrawing or depositing coins respectively"
+msgstr ""
+
+#: governments.html.j2:105
+msgid "Privacy-by-design (GDPR)"
+msgstr ""
+
+#: governments.html.j2:106
+msgid ""
+"Taler cryptographically protects citizen's privacy, and by design "
+"implements data minimization and privacy by default."
+msgstr ""
+
+#: governments.html.j2:107
+msgid "Competitive banking (PSD2)"
+msgstr ""
+
+#: governments.html.j2:108
+msgid ""
+"Taler provides an open standard with public APIs contributing to a level "
+"playing field."
+msgstr ""
+
+#: governments.html.j2:116
msgid "Taler as seen by governments"
msgstr "Taler aus Regierungsperspektive"
-#: governments.html.j2:94
+#: governments.html.j2:118
msgid ""
"Governments can observe traditional wire transfers\n"
" entering and leaving the Taler system, and require\n"
@@ -695,7 +739,7 @@ msgid ""
" available to the government includes: "
msgstr ""
-#: governments.html.j2:107
+#: governments.html.j2:131
msgid ""
"From the banking system: The total amount of\n"
" digital currency obtained by a customer. The\n"
@@ -704,14 +748,14 @@ msgid ""
" given timeframe."
msgstr ""
-#: governments.html.j2:113
+#: governments.html.j2:137
msgid ""
"From the banking system: The total amount of\n"
" income received by any merchant via the Taler\n"
" system."
msgstr ""
-#: governments.html.j2:117
+#: governments.html.j2:141
msgid ""
"From auditing the exchange: The amounts of\n"
" digital coins legitimately withdrawn by\n"
@@ -723,7 +767,7 @@ msgid ""
" the exchange from transaction fees."
msgstr ""
-#: governments.html.j2:126
+#: governments.html.j2:150
msgid ""
"From auditing merchants: For each deposit\n"
" operation, the exact details of the underlying\n"
@@ -757,21 +801,66 @@ msgid ""
" "
msgstr ""
+#: index.html.j2:30
+msgid "Practical"
+msgstr ""
+
#: index.html.j2:33
msgid ""
"\n"
-" When using Taler, merchants can't hide their income from tax\n"
+" Taler is easy to integrate with existing Web\n"
+" applications. Payments are cryptographically\n"
+" secured and are confirmed within milliseconds with\n"
+" extremely low transaction costs.\n"
+" "
+msgstr ""
+
+#: index.html.j2:43
+msgid "Stable"
+msgstr ""
+
+#: index.html.j2:46
+msgid ""
+"\n"
+" Taler does not introduce a new currency with\n"
+" fluctuation risks, and instead uses a digital\n"
+" wallet holding coins in reserve. Taler's\n"
+" cryptographic coins correspond to existing\n"
+" currencies, such as US Dollars, Euros or even\n"
+" Bitcoins.\n"
+" "
+msgstr ""
+
+#: index.html.j2:58
+msgid "Security-focused"
+msgstr ""
+
+#: index.html.j2:61
+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 ""
+
+#: index.html.j2:76
+msgid ""
+"\n"
+" When using Taler, merchants cannot hide their income from tax\n"
" collection authorities. Unlike cash and most digital currencies,"
"\n"
-" Taler helps preventing black markets.\n"
+" Taler helps prevent black markets. Taler is not suitable for\n"
+" illegal activities.\n"
" "
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:86
msgid "Privacy-friendly"
msgstr ""
-#: index.html.j2:44
+#: index.html.j2:88
msgid ""
"\n"
" When you pay with Taler, your identity does not\n"
@@ -782,7 +871,7 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:58
+#: index.html.j2:102
msgid ""
"\n"
" Taler provides protocols and reference implementations that in\n"
@@ -795,55 +884,46 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:71
-msgid "Practical"
+#: index.html.j2:119
+msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:74
+#: index.html.j2:120
msgid ""
"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
-msgstr ""
-
-#: index.html.j2:84
-msgid "Stable"
-msgstr ""
-
-#: index.html.j2:87
-msgid ""
+" <p>To pay with Taler, customers install an electronic wallet\n"
+" on their device. Before the first payment, the wallet's balance must"
"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+" be charged in the desired currency by some other means of "
+"payment.</p>\n"
+" <p>Once the wallet is charged, payments on websites take only one "
+"click,\n"
+" are never falsely rejected by fraud detection and do not post any "
+"risk\n"
+" of phishing or identity theft.</p>\n"
+" "
msgstr ""
-#: index.html.j2:99
-msgid "Security-focused"
+#: index.html.j2:130
+msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:102
+#: index.html.j2:131
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"
-" "
+" <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 ""
-#: index.html.j2:141
+#: index.html.j2:145
msgid "Taler News"
msgstr ""
-#: index.html.j2:145
+#: index.html.j2:149
msgid "Financial News"
msgstr ""
@@ -1077,62 +1157,35 @@ msgid "The GNU Taler Web shop integration tutorial
(Python)"
msgstr ""
#: merchants.html.j2:116
-msgid "Taler as seen by merchants"
-msgstr "Taler aus Händlerperspektive"
-
-#: merchants.html.j2:118
-msgid ""
-"Merchants supporting the Taler system need to\n"
-" integrate some relatively simple logic into their\n"
-" transaction processing system. Typical steps\n"
-" performed by the merchant system are: "
+msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:127
-msgid ""
-"The new logic detects when a customer's system\n"
-" supports Taler and then needs to send a\n"
-" cryptographically signed version of the proposed\n"
-" contract in a simple JSON format to the\n"
-" customer. The message also includes salted,\n"
-" hashed wire details for the merchant, as well as\n"
-" restrictions as to which exchange operators the\n"
-" merchant is willing to deal with."
+#: merchants.html.j2:118
+msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:136
+#: merchants.html.j2:122
msgid ""
-"The customer sends a signed response which\n"
-" states that certain digital coins now belong to\n"
-" the merchant to both signal acceptance of the\n"
-" deal as well as to pay the respective amount\n"
-" (bottom)."
+"The backend <b>signs</b> and <b>stores</b>\n"
+" proposals made by the merchant to customers.\n"
+" For this, the merchant's frontend needs to give the\n"
+" customer's order in a JSON format to the backend."
msgstr ""
-#: merchants.html.j2:142
+#: merchants.html.j2:127
msgid ""
-"The merchant then forwards the signed messages\n"
-" received from the customer to the exchange,\n"
-" together with its wire details and the salt\n"
-" (without hashing). The exchange verifies the\n"
-" details and sends a signed confirmation (or an\n"
-" error message) to the merchant. The merchant\n"
-" checks that the exchange's signature is valid,\n"
-" sends a confirmation to the customer and\n"
-" executes the contract-specific business\n"
-" logic."
+"The backend <b>validates</b> and <b>executes</b>\n"
+" payments received from the wallet. The frontend\n"
+" must pass the payment request through to the backend\n"
+" and checks the HTTP status code that is returned."
msgstr ""
-#: merchants.html.j2:153
+#: merchants.html.j2:132
msgid ""
-"The exchange performs wire transfers\n"
-" corresponding to the claims deposited by the\n"
-" merchant. Note that the exchange may charge\n"
-" fees for the deposit operation, hence merchants\n"
-" may impose limits restricting the set of\n"
-" exchange operators they are willing to deal\n"
-" with, for example by imposing a bound on\n"
-" deposit fees."
+"The backend can <b>list</b> completed transactions\n"
+" and <b>map</b> aggregated wire transfers to individual\n"
+" business transactions including the exact terms of\n"
+" the contract."
msgstr ""
#: common/base.j2:5
@@ -1275,3 +1328,18 @@ msgstr ""
#~ msgid "Taler as seen by customers"
#~ msgstr "Taler aus Kundensicht"
+#~ msgid "Taler as seen by merchants"
+#~ msgstr "Taler aus Händlerperspektive"
+
+#~ msgid "Tax-friendly"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
+#~ msgstr ""
+
+#~ msgid "Taler complies with regulation"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2)"
+#~ msgstr ""
+
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 07bf7c6..35ad169 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-06 23:50+0100\n"
+"POT-Creation-Date: 2017-03-07 00:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: en\n"
@@ -582,15 +582,15 @@ msgid ""
" infrastructure."
msgstr ""
-#: governments.html.j2:24 index.html.j2:30
+#: governments.html.j2:23 index.html.j2:73
msgid "Taxable"
msgstr ""
-#: governments.html.j2:26
+#: governments.html.j2:25
msgid ""
"Taler was\n"
" built with the goal of fighting corruption and supporting "
-"taxation. \n"
+"taxation.\n"
" With Taler, the receiver of any form of payment is\n"
" easily identified by the government, and the merchant\n"
" can be compelled to provide the contract that was accepted\n"
@@ -600,7 +600,7 @@ msgid ""
" viable."
msgstr ""
-#: governments.html.j2:36
+#: governments.html.j2:35
msgid ""
"Thus, despite offering anonymity for citizens\n"
" spending digital cash to buy goods and services,\n"
@@ -615,11 +615,11 @@ msgid ""
" subject to monitoring."
msgstr ""
-#: governments.html.j2:49 merchants.html.j2:33
+#: governments.html.j2:48 merchants.html.j2:33
msgid "Secure"
msgstr ""
-#: governments.html.j2:51
+#: governments.html.j2:50
msgid ""
"Taler's payments are cryptographically\n"
" secured. Thus, customers, merchants and the\n"
@@ -630,7 +630,7 @@ msgid ""
" merchants, the exchange and the state."
msgstr ""
-#: governments.html.j2:59
+#: governments.html.j2:58
msgid ""
"By design, the Taler payment service provider is\n"
" subject to financial regulation. Financial\n"
@@ -644,11 +644,11 @@ msgid ""
" the economy due to fraud."
msgstr ""
-#: governments.html.j2:70 index.html.j2:55
+#: governments.html.j2:72 index.html.j2:99
msgid "Libre"
msgstr ""
-#: governments.html.j2:72
+#: governments.html.j2:74
msgid ""
"Taler is free software implementing an open\n"
" protocol standard. Thus, Taler will enable\n"
@@ -657,11 +657,11 @@ msgid ""
" financial stability today."
msgstr ""
-#: governments.html.j2:81
+#: governments.html.j2:83
msgid "Efficient"
msgstr ""
-#: governments.html.j2:83
+#: governments.html.j2:85
msgid ""
"Taler has an efficient design. Unlike\n"
" timeline-based payment systems, such as Bitcoin,\n"
@@ -670,11 +670,55 @@ msgid ""
" contribute to environmental pollution."
msgstr ""
-#: governments.html.j2:92
+#: governments.html.j2:99
+msgid "Taler and regulation"
+msgstr ""
+
+#: governments.html.j2:101
+msgid "Anti-money laundering (AML)"
+msgstr ""
+
+#: governments.html.j2:102
+msgid ""
+"With Taler, income is visible and can be tied to the contract signed by "
+"both parties."
+msgstr ""
+
+#: governments.html.j2:103
+msgid "Know-your-customer (KYC)"
+msgstr ""
+
+#: governments.html.j2:104
+msgid ""
+"In Taler, payer and payee are known by their bank accounts when "
+"withdrawing or depositing coins respectively"
+msgstr ""
+
+#: governments.html.j2:105
+msgid "Privacy-by-design (GDPR)"
+msgstr ""
+
+#: governments.html.j2:106
+msgid ""
+"Taler cryptographically protects citizen's privacy, and by design "
+"implements data minimization and privacy by default."
+msgstr ""
+
+#: governments.html.j2:107
+msgid "Competitive banking (PSD2)"
+msgstr ""
+
+#: governments.html.j2:108
+msgid ""
+"Taler provides an open standard with public APIs contributing to a level "
+"playing field."
+msgstr ""
+
+#: governments.html.j2:116
msgid "Taler as seen by governments"
msgstr ""
-#: governments.html.j2:94
+#: governments.html.j2:118
msgid ""
"Governments can observe traditional wire transfers\n"
" entering and leaving the Taler system, and require\n"
@@ -686,7 +730,7 @@ msgid ""
" available to the government includes: "
msgstr ""
-#: governments.html.j2:107
+#: governments.html.j2:131
msgid ""
"From the banking system: The total amount of\n"
" digital currency obtained by a customer. The\n"
@@ -695,14 +739,14 @@ msgid ""
" given timeframe."
msgstr ""
-#: governments.html.j2:113
+#: governments.html.j2:137
msgid ""
"From the banking system: The total amount of\n"
" income received by any merchant via the Taler\n"
" system."
msgstr ""
-#: governments.html.j2:117
+#: governments.html.j2:141
msgid ""
"From auditing the exchange: The amounts of\n"
" digital coins legitimately withdrawn by\n"
@@ -714,7 +758,7 @@ msgid ""
" the exchange from transaction fees."
msgstr ""
-#: governments.html.j2:126
+#: governments.html.j2:150
msgid ""
"From auditing merchants: For each deposit\n"
" operation, the exact details of the underlying\n"
@@ -748,21 +792,66 @@ msgid ""
" "
msgstr ""
+#: index.html.j2:30
+msgid "Practical"
+msgstr ""
+
#: index.html.j2:33
msgid ""
"\n"
-" When using Taler, merchants can't hide their income from tax\n"
+" Taler is easy to integrate with existing Web\n"
+" applications. Payments are cryptographically\n"
+" secured and are confirmed within milliseconds with\n"
+" extremely low transaction costs.\n"
+" "
+msgstr ""
+
+#: index.html.j2:43
+msgid "Stable"
+msgstr ""
+
+#: index.html.j2:46
+msgid ""
+"\n"
+" Taler does not introduce a new currency with\n"
+" fluctuation risks, and instead uses a digital\n"
+" wallet holding coins in reserve. Taler's\n"
+" cryptographic coins correspond to existing\n"
+" currencies, such as US Dollars, Euros or even\n"
+" Bitcoins.\n"
+" "
+msgstr ""
+
+#: index.html.j2:58
+msgid "Security-focused"
+msgstr ""
+
+#: index.html.j2:61
+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 ""
+
+#: index.html.j2:76
+msgid ""
+"\n"
+" When using Taler, merchants cannot hide their income from tax\n"
" collection authorities. Unlike cash and most digital currencies,"
"\n"
-" Taler helps preventing black markets.\n"
+" Taler helps prevent black markets. Taler is not suitable for\n"
+" illegal activities.\n"
" "
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:86
msgid "Privacy-friendly"
msgstr ""
-#: index.html.j2:44
+#: index.html.j2:88
msgid ""
"\n"
" When you pay with Taler, your identity does not\n"
@@ -773,7 +862,7 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:58
+#: index.html.j2:102
msgid ""
"\n"
" Taler provides protocols and reference implementations that in\n"
@@ -786,55 +875,46 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:71
-msgid "Practical"
+#: index.html.j2:119
+msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:74
+#: index.html.j2:120
msgid ""
"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
-msgstr ""
-
-#: index.html.j2:84
-msgid "Stable"
-msgstr ""
-
-#: index.html.j2:87
-msgid ""
+" <p>To pay with Taler, customers install an electronic wallet\n"
+" on their device. Before the first payment, the wallet's balance must"
"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+" be charged in the desired currency by some other means of "
+"payment.</p>\n"
+" <p>Once the wallet is charged, payments on websites take only one "
+"click,\n"
+" are never falsely rejected by fraud detection and do not post any "
+"risk\n"
+" of phishing or identity theft.</p>\n"
+" "
msgstr ""
-#: index.html.j2:99
-msgid "Security-focused"
+#: index.html.j2:130
+msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:102
+#: index.html.j2:131
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"
-" "
+" <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 ""
-#: index.html.j2:141
+#: index.html.j2:145
msgid "Taler News"
msgstr ""
-#: index.html.j2:145
+#: index.html.j2:149
msgid "Financial News"
msgstr ""
@@ -1068,62 +1148,35 @@ msgid "The GNU Taler Web shop integration tutorial
(Python)"
msgstr ""
#: merchants.html.j2:116
-msgid "Taler as seen by merchants"
+msgid "The GNU Taler Merchant Backend"
msgstr ""
#: merchants.html.j2:118
-msgid ""
-"Merchants supporting the Taler system need to\n"
-" integrate some relatively simple logic into their\n"
-" transaction processing system. Typical steps\n"
-" performed by the merchant system are: "
+msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:127
+#: merchants.html.j2:122
msgid ""
-"The new logic detects when a customer's system\n"
-" supports Taler and then needs to send a\n"
-" cryptographically signed version of the proposed\n"
-" contract in a simple JSON format to the\n"
-" customer. The message also includes salted,\n"
-" hashed wire details for the merchant, as well as\n"
-" restrictions as to which exchange operators the\n"
-" merchant is willing to deal with."
+"The backend <b>signs</b> and <b>stores</b>\n"
+" proposals made by the merchant to customers.\n"
+" For this, the merchant's frontend needs to give the\n"
+" customer's order in a JSON format to the backend."
msgstr ""
-#: merchants.html.j2:136
-msgid ""
-"The customer sends a signed response which\n"
-" states that certain digital coins now belong to\n"
-" the merchant to both signal acceptance of the\n"
-" deal as well as to pay the respective amount\n"
-" (bottom)."
-msgstr ""
-
-#: merchants.html.j2:142
+#: merchants.html.j2:127
msgid ""
-"The merchant then forwards the signed messages\n"
-" received from the customer to the exchange,\n"
-" together with its wire details and the salt\n"
-" (without hashing). The exchange verifies the\n"
-" details and sends a signed confirmation (or an\n"
-" error message) to the merchant. The merchant\n"
-" checks that the exchange's signature is valid,\n"
-" sends a confirmation to the customer and\n"
-" executes the contract-specific business\n"
-" logic."
+"The backend <b>validates</b> and <b>executes</b>\n"
+" payments received from the wallet. The frontend\n"
+" must pass the payment request through to the backend\n"
+" and checks the HTTP status code that is returned."
msgstr ""
-#: merchants.html.j2:153
+#: merchants.html.j2:132
msgid ""
-"The exchange performs wire transfers\n"
-" corresponding to the claims deposited by the\n"
-" merchant. Note that the exchange may charge\n"
-" fees for the deposit operation, hence merchants\n"
-" may impose limits restricting the set of\n"
-" exchange operators they are willing to deal\n"
-" with, for example by imposing a bound on\n"
-" deposit fees."
+"The backend can <b>list</b> completed transactions\n"
+" and <b>map</b> aggregated wire transfers to individual\n"
+" business transactions including the exact terms of\n"
+" the contract."
msgstr ""
#: common/base.j2:5
@@ -1269,3 +1322,18 @@ msgstr ""
#~ msgid "Taler as seen by customers"
#~ msgstr ""
+#~ msgid "Taler as seen by merchants"
+#~ msgstr ""
+
+#~ msgid "Tax-friendly"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
+#~ msgstr ""
+
+#~ msgid "Taler complies with regulation"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2)"
+#~ msgstr ""
+
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 6efec34..d65c903 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-06 23:50+0100\n"
+"POT-Creation-Date: 2017-03-07 00:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: es\n"
@@ -600,15 +600,15 @@ msgid ""
" infrastructure."
msgstr ""
-#: governments.html.j2:24 index.html.j2:30
+#: governments.html.j2:23 index.html.j2:73
msgid "Taxable"
msgstr "Imponible"
-#: governments.html.j2:26
+#: governments.html.j2:25
msgid ""
"Taler was\n"
" built with the goal of fighting corruption and supporting "
-"taxation. \n"
+"taxation.\n"
" With Taler, the receiver of any form of payment is\n"
" easily identified by the government, and the merchant\n"
" can be compelled to provide the contract that was accepted\n"
@@ -618,7 +618,7 @@ msgid ""
" viable."
msgstr ""
-#: governments.html.j2:36
+#: governments.html.j2:35
msgid ""
"Thus, despite offering anonymity for citizens\n"
" spending digital cash to buy goods and services,\n"
@@ -633,11 +633,11 @@ msgid ""
" subject to monitoring."
msgstr ""
-#: governments.html.j2:49 merchants.html.j2:33
+#: governments.html.j2:48 merchants.html.j2:33
msgid "Secure"
msgstr "Seguro"
-#: governments.html.j2:51
+#: governments.html.j2:50
msgid ""
"Taler's payments are cryptographically\n"
" secured. Thus, customers, merchants and the\n"
@@ -648,7 +648,7 @@ msgid ""
" merchants, the exchange and the state."
msgstr ""
-#: governments.html.j2:59
+#: governments.html.j2:58
msgid ""
"By design, the Taler payment service provider is\n"
" subject to financial regulation. Financial\n"
@@ -662,11 +662,11 @@ msgid ""
" the economy due to fraud."
msgstr ""
-#: governments.html.j2:70 index.html.j2:55
+#: governments.html.j2:72 index.html.j2:99
msgid "Libre"
msgstr "Libre"
-#: governments.html.j2:72
+#: governments.html.j2:74
msgid ""
"Taler is free software implementing an open\n"
" protocol standard. Thus, Taler will enable\n"
@@ -675,11 +675,11 @@ msgid ""
" financial stability today."
msgstr ""
-#: governments.html.j2:81
+#: governments.html.j2:83
msgid "Efficient"
msgstr "Eficiente"
-#: governments.html.j2:83
+#: governments.html.j2:85
msgid ""
"Taler has an efficient design. Unlike\n"
" timeline-based payment systems, such as Bitcoin,\n"
@@ -688,11 +688,55 @@ msgid ""
" contribute to environmental pollution."
msgstr ""
-#: governments.html.j2:92
+#: governments.html.j2:99
+msgid "Taler and regulation"
+msgstr ""
+
+#: governments.html.j2:101
+msgid "Anti-money laundering (AML)"
+msgstr ""
+
+#: governments.html.j2:102
+msgid ""
+"With Taler, income is visible and can be tied to the contract signed by "
+"both parties."
+msgstr ""
+
+#: governments.html.j2:103
+msgid "Know-your-customer (KYC)"
+msgstr ""
+
+#: governments.html.j2:104
+msgid ""
+"In Taler, payer and payee are known by their bank accounts when "
+"withdrawing or depositing coins respectively"
+msgstr ""
+
+#: governments.html.j2:105
+msgid "Privacy-by-design (GDPR)"
+msgstr ""
+
+#: governments.html.j2:106
+msgid ""
+"Taler cryptographically protects citizen's privacy, and by design "
+"implements data minimization and privacy by default."
+msgstr ""
+
+#: governments.html.j2:107
+msgid "Competitive banking (PSD2)"
+msgstr ""
+
+#: governments.html.j2:108
+msgid ""
+"Taler provides an open standard with public APIs contributing to a level "
+"playing field."
+msgstr ""
+
+#: governments.html.j2:116
msgid "Taler as seen by governments"
msgstr "Taler desde el punto de vista del gobierno"
-#: governments.html.j2:94
+#: governments.html.j2:118
msgid ""
"Governments can observe traditional wire transfers\n"
" entering and leaving the Taler system, and require\n"
@@ -704,7 +748,7 @@ msgid ""
" available to the government includes: "
msgstr ""
-#: governments.html.j2:107
+#: governments.html.j2:131
msgid ""
"From the banking system: The total amount of\n"
" digital currency obtained by a customer. The\n"
@@ -713,14 +757,14 @@ msgid ""
" given timeframe."
msgstr ""
-#: governments.html.j2:113
+#: governments.html.j2:137
msgid ""
"From the banking system: The total amount of\n"
" income received by any merchant via the Taler\n"
" system."
msgstr ""
-#: governments.html.j2:117
+#: governments.html.j2:141
msgid ""
"From auditing the exchange: The amounts of\n"
" digital coins legitimately withdrawn by\n"
@@ -732,7 +776,7 @@ msgid ""
" the exchange from transaction fees."
msgstr ""
-#: governments.html.j2:126
+#: governments.html.j2:150
msgid ""
"From auditing merchants: For each deposit\n"
" operation, the exact details of the underlying\n"
@@ -766,21 +810,66 @@ msgid ""
" "
msgstr ""
+#: index.html.j2:30
+msgid "Practical"
+msgstr ""
+
#: index.html.j2:33
msgid ""
"\n"
-" When using Taler, merchants can't hide their income from tax\n"
+" Taler is easy to integrate with existing Web\n"
+" applications. Payments are cryptographically\n"
+" secured and are confirmed within milliseconds with\n"
+" extremely low transaction costs.\n"
+" "
+msgstr ""
+
+#: index.html.j2:43
+msgid "Stable"
+msgstr ""
+
+#: index.html.j2:46
+msgid ""
+"\n"
+" Taler does not introduce a new currency with\n"
+" fluctuation risks, and instead uses a digital\n"
+" wallet holding coins in reserve. Taler's\n"
+" cryptographic coins correspond to existing\n"
+" currencies, such as US Dollars, Euros or even\n"
+" Bitcoins.\n"
+" "
+msgstr ""
+
+#: index.html.j2:58
+msgid "Security-focused"
+msgstr ""
+
+#: index.html.j2:61
+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 ""
+
+#: index.html.j2:76
+msgid ""
+"\n"
+" When using Taler, merchants cannot hide their income from tax\n"
" collection authorities. Unlike cash and most digital currencies,"
"\n"
-" Taler helps preventing black markets.\n"
+" Taler helps prevent black markets. Taler is not suitable for\n"
+" illegal activities.\n"
" "
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:86
msgid "Privacy-friendly"
msgstr ""
-#: index.html.j2:44
+#: index.html.j2:88
msgid ""
"\n"
" When you pay with Taler, your identity does not\n"
@@ -791,7 +880,7 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:58
+#: index.html.j2:102
msgid ""
"\n"
" Taler provides protocols and reference implementations that in\n"
@@ -804,55 +893,46 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:71
-msgid "Practical"
+#: index.html.j2:119
+msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:74
+#: index.html.j2:120
msgid ""
"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
-msgstr ""
-
-#: index.html.j2:84
-msgid "Stable"
-msgstr ""
-
-#: index.html.j2:87
-msgid ""
+" <p>To pay with Taler, customers install an electronic wallet\n"
+" on their device. Before the first payment, the wallet's balance must"
"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+" be charged in the desired currency by some other means of "
+"payment.</p>\n"
+" <p>Once the wallet is charged, payments on websites take only one "
+"click,\n"
+" are never falsely rejected by fraud detection and do not post any "
+"risk\n"
+" of phishing or identity theft.</p>\n"
+" "
msgstr ""
-#: index.html.j2:99
-msgid "Security-focused"
+#: index.html.j2:130
+msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:102
+#: index.html.j2:131
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"
-" "
+" <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 ""
-#: index.html.j2:141
+#: index.html.j2:145
msgid "Taler News"
msgstr ""
-#: index.html.j2:145
+#: index.html.j2:149
msgid "Financial News"
msgstr ""
@@ -1087,62 +1167,35 @@ msgid "The GNU Taler Web shop integration tutorial
(Python)"
msgstr ""
#: merchants.html.j2:116
-msgid "Taler as seen by merchants"
-msgstr "Taler desde el punto de vista del comerciante"
-
-#: merchants.html.j2:118
-msgid ""
-"Merchants supporting the Taler system need to\n"
-" integrate some relatively simple logic into their\n"
-" transaction processing system. Typical steps\n"
-" performed by the merchant system are: "
+msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:127
-msgid ""
-"The new logic detects when a customer's system\n"
-" supports Taler and then needs to send a\n"
-" cryptographically signed version of the proposed\n"
-" contract in a simple JSON format to the\n"
-" customer. The message also includes salted,\n"
-" hashed wire details for the merchant, as well as\n"
-" restrictions as to which exchange operators the\n"
-" merchant is willing to deal with."
+#: merchants.html.j2:118
+msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:136
+#: merchants.html.j2:122
msgid ""
-"The customer sends a signed response which\n"
-" states that certain digital coins now belong to\n"
-" the merchant to both signal acceptance of the\n"
-" deal as well as to pay the respective amount\n"
-" (bottom)."
+"The backend <b>signs</b> and <b>stores</b>\n"
+" proposals made by the merchant to customers.\n"
+" For this, the merchant's frontend needs to give the\n"
+" customer's order in a JSON format to the backend."
msgstr ""
-#: merchants.html.j2:142
+#: merchants.html.j2:127
msgid ""
-"The merchant then forwards the signed messages\n"
-" received from the customer to the exchange,\n"
-" together with its wire details and the salt\n"
-" (without hashing). The exchange verifies the\n"
-" details and sends a signed confirmation (or an\n"
-" error message) to the merchant. The merchant\n"
-" checks that the exchange's signature is valid,\n"
-" sends a confirmation to the customer and\n"
-" executes the contract-specific business\n"
-" logic."
+"The backend <b>validates</b> and <b>executes</b>\n"
+" payments received from the wallet. The frontend\n"
+" must pass the payment request through to the backend\n"
+" and checks the HTTP status code that is returned."
msgstr ""
-#: merchants.html.j2:153
+#: merchants.html.j2:132
msgid ""
-"The exchange performs wire transfers\n"
-" corresponding to the claims deposited by the\n"
-" merchant. Note that the exchange may charge\n"
-" fees for the deposit operation, hence merchants\n"
-" may impose limits restricting the set of\n"
-" exchange operators they are willing to deal\n"
-" with, for example by imposing a bound on\n"
-" deposit fees."
+"The backend can <b>list</b> completed transactions\n"
+" and <b>map</b> aggregated wire transfers to individual\n"
+" business transactions including the exact terms of\n"
+" the contract."
msgstr ""
#: common/base.j2:5
@@ -1288,3 +1341,18 @@ msgstr ""
#~ msgid "Taler as seen by customers"
#~ msgstr "Taler visto por sus clientes"
+#~ msgid "Taler as seen by merchants"
+#~ msgstr "Taler desde el punto de vista del comerciante"
+
+#~ msgid "Tax-friendly"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
+#~ msgstr ""
+
+#~ msgid "Taler complies with regulation"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2)"
+#~ msgstr ""
+
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 3d9e027..2ad2c2d 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-06 23:50+0100\n"
+"POT-Creation-Date: 2017-03-07 00:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: fr\n"
@@ -598,15 +598,15 @@ msgid ""
" infrastructure."
msgstr ""
-#: governments.html.j2:24 index.html.j2:30
+#: governments.html.j2:23 index.html.j2:73
msgid "Taxable"
msgstr "Taxable"
-#: governments.html.j2:26
+#: governments.html.j2:25
msgid ""
"Taler was\n"
" built with the goal of fighting corruption and supporting "
-"taxation. \n"
+"taxation.\n"
" With Taler, the receiver of any form of payment is\n"
" easily identified by the government, and the merchant\n"
" can be compelled to provide the contract that was accepted\n"
@@ -616,7 +616,7 @@ msgid ""
" viable."
msgstr ""
-#: governments.html.j2:36
+#: governments.html.j2:35
msgid ""
"Thus, despite offering anonymity for citizens\n"
" spending digital cash to buy goods and services,\n"
@@ -631,11 +631,11 @@ msgid ""
" subject to monitoring."
msgstr ""
-#: governments.html.j2:49 merchants.html.j2:33
+#: governments.html.j2:48 merchants.html.j2:33
msgid "Secure"
msgstr "Sûr"
-#: governments.html.j2:51
+#: governments.html.j2:50
msgid ""
"Taler's payments are cryptographically\n"
" secured. Thus, customers, merchants and the\n"
@@ -646,7 +646,7 @@ msgid ""
" merchants, the exchange and the state."
msgstr ""
-#: governments.html.j2:59
+#: governments.html.j2:58
msgid ""
"By design, the Taler payment service provider is\n"
" subject to financial regulation. Financial\n"
@@ -660,11 +660,11 @@ msgid ""
" the economy due to fraud."
msgstr ""
-#: governments.html.j2:70 index.html.j2:55
+#: governments.html.j2:72 index.html.j2:99
msgid "Libre"
msgstr "Libre"
-#: governments.html.j2:72
+#: governments.html.j2:74
msgid ""
"Taler is free software implementing an open\n"
" protocol standard. Thus, Taler will enable\n"
@@ -673,11 +673,11 @@ msgid ""
" financial stability today."
msgstr ""
-#: governments.html.j2:81
+#: governments.html.j2:83
msgid "Efficient"
msgstr "Efficace"
-#: governments.html.j2:83
+#: governments.html.j2:85
msgid ""
"Taler has an efficient design. Unlike\n"
" timeline-based payment systems, such as Bitcoin,\n"
@@ -686,11 +686,55 @@ msgid ""
" contribute to environmental pollution."
msgstr ""
-#: governments.html.j2:92
+#: governments.html.j2:99
+msgid "Taler and regulation"
+msgstr ""
+
+#: governments.html.j2:101
+msgid "Anti-money laundering (AML)"
+msgstr ""
+
+#: governments.html.j2:102
+msgid ""
+"With Taler, income is visible and can be tied to the contract signed by "
+"both parties."
+msgstr ""
+
+#: governments.html.j2:103
+msgid "Know-your-customer (KYC)"
+msgstr ""
+
+#: governments.html.j2:104
+msgid ""
+"In Taler, payer and payee are known by their bank accounts when "
+"withdrawing or depositing coins respectively"
+msgstr ""
+
+#: governments.html.j2:105
+msgid "Privacy-by-design (GDPR)"
+msgstr ""
+
+#: governments.html.j2:106
+msgid ""
+"Taler cryptographically protects citizen's privacy, and by design "
+"implements data minimization and privacy by default."
+msgstr ""
+
+#: governments.html.j2:107
+msgid "Competitive banking (PSD2)"
+msgstr ""
+
+#: governments.html.j2:108
+msgid ""
+"Taler provides an open standard with public APIs contributing to a level "
+"playing field."
+msgstr ""
+
+#: governments.html.j2:116
msgid "Taler as seen by governments"
msgstr "Taler, du point de vu des gouvernements"
-#: governments.html.j2:94
+#: governments.html.j2:118
msgid ""
"Governments can observe traditional wire transfers\n"
" entering and leaving the Taler system, and require\n"
@@ -702,7 +746,7 @@ msgid ""
" available to the government includes: "
msgstr ""
-#: governments.html.j2:107
+#: governments.html.j2:131
msgid ""
"From the banking system: The total amount of\n"
" digital currency obtained by a customer. The\n"
@@ -711,14 +755,14 @@ msgid ""
" given timeframe."
msgstr ""
-#: governments.html.j2:113
+#: governments.html.j2:137
msgid ""
"From the banking system: The total amount of\n"
" income received by any merchant via the Taler\n"
" system."
msgstr ""
-#: governments.html.j2:117
+#: governments.html.j2:141
msgid ""
"From auditing the exchange: The amounts of\n"
" digital coins legitimately withdrawn by\n"
@@ -730,7 +774,7 @@ msgid ""
" the exchange from transaction fees."
msgstr ""
-#: governments.html.j2:126
+#: governments.html.j2:150
msgid ""
"From auditing merchants: For each deposit\n"
" operation, the exact details of the underlying\n"
@@ -764,21 +808,66 @@ msgid ""
" "
msgstr ""
+#: index.html.j2:30
+msgid "Practical"
+msgstr ""
+
#: index.html.j2:33
msgid ""
"\n"
-" When using Taler, merchants can't hide their income from tax\n"
+" Taler is easy to integrate with existing Web\n"
+" applications. Payments are cryptographically\n"
+" secured and are confirmed within milliseconds with\n"
+" extremely low transaction costs.\n"
+" "
+msgstr ""
+
+#: index.html.j2:43
+msgid "Stable"
+msgstr ""
+
+#: index.html.j2:46
+msgid ""
+"\n"
+" Taler does not introduce a new currency with\n"
+" fluctuation risks, and instead uses a digital\n"
+" wallet holding coins in reserve. Taler's\n"
+" cryptographic coins correspond to existing\n"
+" currencies, such as US Dollars, Euros or even\n"
+" Bitcoins.\n"
+" "
+msgstr ""
+
+#: index.html.j2:58
+msgid "Security-focused"
+msgstr ""
+
+#: index.html.j2:61
+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 ""
+
+#: index.html.j2:76
+msgid ""
+"\n"
+" When using Taler, merchants cannot hide their income from tax\n"
" collection authorities. Unlike cash and most digital currencies,"
"\n"
-" Taler helps preventing black markets.\n"
+" Taler helps prevent black markets. Taler is not suitable for\n"
+" illegal activities.\n"
" "
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:86
msgid "Privacy-friendly"
msgstr ""
-#: index.html.j2:44
+#: index.html.j2:88
msgid ""
"\n"
" When you pay with Taler, your identity does not\n"
@@ -789,7 +878,7 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:58
+#: index.html.j2:102
msgid ""
"\n"
" Taler provides protocols and reference implementations that in\n"
@@ -802,55 +891,46 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:71
-msgid "Practical"
+#: index.html.j2:119
+msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:74
+#: index.html.j2:120
msgid ""
"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
-msgstr ""
-
-#: index.html.j2:84
-msgid "Stable"
-msgstr ""
-
-#: index.html.j2:87
-msgid ""
+" <p>To pay with Taler, customers install an electronic wallet\n"
+" on their device. Before the first payment, the wallet's balance must"
"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+" be charged in the desired currency by some other means of "
+"payment.</p>\n"
+" <p>Once the wallet is charged, payments on websites take only one "
+"click,\n"
+" are never falsely rejected by fraud detection and do not post any "
+"risk\n"
+" of phishing or identity theft.</p>\n"
+" "
msgstr ""
-#: index.html.j2:99
-msgid "Security-focused"
+#: index.html.j2:130
+msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:102
+#: index.html.j2:131
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"
-" "
+" <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 ""
-#: index.html.j2:141
+#: index.html.j2:145
msgid "Taler News"
msgstr ""
-#: index.html.j2:145
+#: index.html.j2:149
msgid "Financial News"
msgstr ""
@@ -1085,62 +1165,35 @@ msgid "The GNU Taler Web shop integration tutorial
(Python)"
msgstr ""
#: merchants.html.j2:116
-msgid "Taler as seen by merchants"
-msgstr "Taler du poit de vu des marchants"
-
-#: merchants.html.j2:118
-msgid ""
-"Merchants supporting the Taler system need to\n"
-" integrate some relatively simple logic into their\n"
-" transaction processing system. Typical steps\n"
-" performed by the merchant system are: "
+msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:127
-msgid ""
-"The new logic detects when a customer's system\n"
-" supports Taler and then needs to send a\n"
-" cryptographically signed version of the proposed\n"
-" contract in a simple JSON format to the\n"
-" customer. The message also includes salted,\n"
-" hashed wire details for the merchant, as well as\n"
-" restrictions as to which exchange operators the\n"
-" merchant is willing to deal with."
+#: merchants.html.j2:118
+msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:136
+#: merchants.html.j2:122
msgid ""
-"The customer sends a signed response which\n"
-" states that certain digital coins now belong to\n"
-" the merchant to both signal acceptance of the\n"
-" deal as well as to pay the respective amount\n"
-" (bottom)."
+"The backend <b>signs</b> and <b>stores</b>\n"
+" proposals made by the merchant to customers.\n"
+" For this, the merchant's frontend needs to give the\n"
+" customer's order in a JSON format to the backend."
msgstr ""
-#: merchants.html.j2:142
+#: merchants.html.j2:127
msgid ""
-"The merchant then forwards the signed messages\n"
-" received from the customer to the exchange,\n"
-" together with its wire details and the salt\n"
-" (without hashing). The exchange verifies the\n"
-" details and sends a signed confirmation (or an\n"
-" error message) to the merchant. The merchant\n"
-" checks that the exchange's signature is valid,\n"
-" sends a confirmation to the customer and\n"
-" executes the contract-specific business\n"
-" logic."
+"The backend <b>validates</b> and <b>executes</b>\n"
+" payments received from the wallet. The frontend\n"
+" must pass the payment request through to the backend\n"
+" and checks the HTTP status code that is returned."
msgstr ""
-#: merchants.html.j2:153
+#: merchants.html.j2:132
msgid ""
-"The exchange performs wire transfers\n"
-" corresponding to the claims deposited by the\n"
-" merchant. Note that the exchange may charge\n"
-" fees for the deposit operation, hence merchants\n"
-" may impose limits restricting the set of\n"
-" exchange operators they are willing to deal\n"
-" with, for example by imposing a bound on\n"
-" deposit fees."
+"The backend can <b>list</b> completed transactions\n"
+" and <b>map</b> aggregated wire transfers to individual\n"
+" business transactions including the exact terms of\n"
+" the contract."
msgstr ""
#: common/base.j2:5
@@ -1286,3 +1339,18 @@ msgstr ""
#~ msgid "Taler as seen by customers"
#~ msgstr "Taler du point de vu des clients"
+#~ msgid "Taler as seen by merchants"
+#~ msgstr "Taler du poit de vu des marchants"
+
+#~ msgid "Tax-friendly"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
+#~ msgstr ""
+
+#~ msgid "Taler complies with regulation"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2)"
+#~ msgstr ""
+
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 3c0d60c..3e952d6 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-06 23:50+0100\n"
+"POT-Creation-Date: 2017-03-07 00:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: it\n"
@@ -599,15 +599,15 @@ msgid ""
" infrastructure."
msgstr ""
-#: governments.html.j2:24 index.html.j2:30
+#: governments.html.j2:23 index.html.j2:73
msgid "Taxable"
msgstr "Tassabile"
-#: governments.html.j2:26
+#: governments.html.j2:25
msgid ""
"Taler was\n"
" built with the goal of fighting corruption and supporting "
-"taxation. \n"
+"taxation.\n"
" With Taler, the receiver of any form of payment is\n"
" easily identified by the government, and the merchant\n"
" can be compelled to provide the contract that was accepted\n"
@@ -617,7 +617,7 @@ msgid ""
" viable."
msgstr ""
-#: governments.html.j2:36
+#: governments.html.j2:35
msgid ""
"Thus, despite offering anonymity for citizens\n"
" spending digital cash to buy goods and services,\n"
@@ -632,11 +632,11 @@ msgid ""
" subject to monitoring."
msgstr ""
-#: governments.html.j2:49 merchants.html.j2:33
+#: governments.html.j2:48 merchants.html.j2:33
msgid "Secure"
msgstr "Sicuro"
-#: governments.html.j2:51
+#: governments.html.j2:50
msgid ""
"Taler's payments are cryptographically\n"
" secured. Thus, customers, merchants and the\n"
@@ -647,7 +647,7 @@ msgid ""
" merchants, the exchange and the state."
msgstr ""
-#: governments.html.j2:59
+#: governments.html.j2:58
msgid ""
"By design, the Taler payment service provider is\n"
" subject to financial regulation. Financial\n"
@@ -661,12 +661,12 @@ msgid ""
" the economy due to fraud."
msgstr ""
-#: governments.html.j2:70 index.html.j2:55
+#: governments.html.j2:72 index.html.j2:99
#, fuzzy
msgid "Libre"
msgstr "Libero"
-#: governments.html.j2:72
+#: governments.html.j2:74
msgid ""
"Taler is free software implementing an open\n"
" protocol standard. Thus, Taler will enable\n"
@@ -675,11 +675,11 @@ msgid ""
" financial stability today."
msgstr ""
-#: governments.html.j2:81
+#: governments.html.j2:83
msgid "Efficient"
msgstr "Efficiente"
-#: governments.html.j2:83
+#: governments.html.j2:85
msgid ""
"Taler has an efficient design. Unlike\n"
" timeline-based payment systems, such as Bitcoin,\n"
@@ -688,11 +688,55 @@ msgid ""
" contribute to environmental pollution."
msgstr ""
-#: governments.html.j2:92
+#: governments.html.j2:99
+msgid "Taler and regulation"
+msgstr ""
+
+#: governments.html.j2:101
+msgid "Anti-money laundering (AML)"
+msgstr ""
+
+#: governments.html.j2:102
+msgid ""
+"With Taler, income is visible and can be tied to the contract signed by "
+"both parties."
+msgstr ""
+
+#: governments.html.j2:103
+msgid "Know-your-customer (KYC)"
+msgstr ""
+
+#: governments.html.j2:104
+msgid ""
+"In Taler, payer and payee are known by their bank accounts when "
+"withdrawing or depositing coins respectively"
+msgstr ""
+
+#: governments.html.j2:105
+msgid "Privacy-by-design (GDPR)"
+msgstr ""
+
+#: governments.html.j2:106
+msgid ""
+"Taler cryptographically protects citizen's privacy, and by design "
+"implements data minimization and privacy by default."
+msgstr ""
+
+#: governments.html.j2:107
+msgid "Competitive banking (PSD2)"
+msgstr ""
+
+#: governments.html.j2:108
+msgid ""
+"Taler provides an open standard with public APIs contributing to a level "
+"playing field."
+msgstr ""
+
+#: governments.html.j2:116
msgid "Taler as seen by governments"
msgstr "Taler dal punto di vista dai governi"
-#: governments.html.j2:94
+#: governments.html.j2:118
msgid ""
"Governments can observe traditional wire transfers\n"
" entering and leaving the Taler system, and require\n"
@@ -704,7 +748,7 @@ msgid ""
" available to the government includes: "
msgstr ""
-#: governments.html.j2:107
+#: governments.html.j2:131
msgid ""
"From the banking system: The total amount of\n"
" digital currency obtained by a customer. The\n"
@@ -713,14 +757,14 @@ msgid ""
" given timeframe."
msgstr ""
-#: governments.html.j2:113
+#: governments.html.j2:137
msgid ""
"From the banking system: The total amount of\n"
" income received by any merchant via the Taler\n"
" system."
msgstr ""
-#: governments.html.j2:117
+#: governments.html.j2:141
msgid ""
"From auditing the exchange: The amounts of\n"
" digital coins legitimately withdrawn by\n"
@@ -732,7 +776,7 @@ msgid ""
" the exchange from transaction fees."
msgstr ""
-#: governments.html.j2:126
+#: governments.html.j2:150
msgid ""
"From auditing merchants: For each deposit\n"
" operation, the exact details of the underlying\n"
@@ -766,21 +810,66 @@ msgid ""
" "
msgstr ""
+#: index.html.j2:30
+msgid "Practical"
+msgstr ""
+
#: index.html.j2:33
msgid ""
"\n"
-" When using Taler, merchants can't hide their income from tax\n"
+" Taler is easy to integrate with existing Web\n"
+" applications. Payments are cryptographically\n"
+" secured and are confirmed within milliseconds with\n"
+" extremely low transaction costs.\n"
+" "
+msgstr ""
+
+#: index.html.j2:43
+msgid "Stable"
+msgstr ""
+
+#: index.html.j2:46
+msgid ""
+"\n"
+" Taler does not introduce a new currency with\n"
+" fluctuation risks, and instead uses a digital\n"
+" wallet holding coins in reserve. Taler's\n"
+" cryptographic coins correspond to existing\n"
+" currencies, such as US Dollars, Euros or even\n"
+" Bitcoins.\n"
+" "
+msgstr ""
+
+#: index.html.j2:58
+msgid "Security-focused"
+msgstr ""
+
+#: index.html.j2:61
+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 ""
+
+#: index.html.j2:76
+msgid ""
+"\n"
+" When using Taler, merchants cannot hide their income from tax\n"
" collection authorities. Unlike cash and most digital currencies,"
"\n"
-" Taler helps preventing black markets.\n"
+" Taler helps prevent black markets. Taler is not suitable for\n"
+" illegal activities.\n"
" "
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:86
msgid "Privacy-friendly"
msgstr ""
-#: index.html.j2:44
+#: index.html.j2:88
msgid ""
"\n"
" When you pay with Taler, your identity does not\n"
@@ -791,7 +880,7 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:58
+#: index.html.j2:102
msgid ""
"\n"
" Taler provides protocols and reference implementations that in\n"
@@ -804,55 +893,46 @@ msgid ""
" "
msgstr ""
-#: index.html.j2:71
-msgid "Practical"
+#: index.html.j2:119
+msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:74
+#: index.html.j2:120
msgid ""
"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
-msgstr ""
-
-#: index.html.j2:84
-msgid "Stable"
-msgstr ""
-
-#: index.html.j2:87
-msgid ""
+" <p>To pay with Taler, customers install an electronic wallet\n"
+" on their device. Before the first payment, the wallet's balance must"
"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+" be charged in the desired currency by some other means of "
+"payment.</p>\n"
+" <p>Once the wallet is charged, payments on websites take only one "
+"click,\n"
+" are never falsely rejected by fraud detection and do not post any "
+"risk\n"
+" of phishing or identity theft.</p>\n"
+" "
msgstr ""
-#: index.html.j2:99
-msgid "Security-focused"
+#: index.html.j2:130
+msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:102
+#: index.html.j2:131
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"
-" "
+" <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 ""
-#: index.html.j2:141
+#: index.html.j2:145
msgid "Taler News"
msgstr ""
-#: index.html.j2:145
+#: index.html.j2:149
msgid "Financial News"
msgstr ""
@@ -1089,62 +1169,35 @@ msgid "The GNU Taler Web shop integration tutorial
(Python)"
msgstr ""
#: merchants.html.j2:116
-msgid "Taler as seen by merchants"
-msgstr "Come i negozianti vedono Taler"
-
-#: merchants.html.j2:118
-msgid ""
-"Merchants supporting the Taler system need to\n"
-" integrate some relatively simple logic into their\n"
-" transaction processing system. Typical steps\n"
-" performed by the merchant system are: "
+msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:127
-msgid ""
-"The new logic detects when a customer's system\n"
-" supports Taler and then needs to send a\n"
-" cryptographically signed version of the proposed\n"
-" contract in a simple JSON format to the\n"
-" customer. The message also includes salted,\n"
-" hashed wire details for the merchant, as well as\n"
-" restrictions as to which exchange operators the\n"
-" merchant is willing to deal with."
+#: merchants.html.j2:118
+msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:136
+#: merchants.html.j2:122
msgid ""
-"The customer sends a signed response which\n"
-" states that certain digital coins now belong to\n"
-" the merchant to both signal acceptance of the\n"
-" deal as well as to pay the respective amount\n"
-" (bottom)."
+"The backend <b>signs</b> and <b>stores</b>\n"
+" proposals made by the merchant to customers.\n"
+" For this, the merchant's frontend needs to give the\n"
+" customer's order in a JSON format to the backend."
msgstr ""
-#: merchants.html.j2:142
+#: merchants.html.j2:127
msgid ""
-"The merchant then forwards the signed messages\n"
-" received from the customer to the exchange,\n"
-" together with its wire details and the salt\n"
-" (without hashing). The exchange verifies the\n"
-" details and sends a signed confirmation (or an\n"
-" error message) to the merchant. The merchant\n"
-" checks that the exchange's signature is valid,\n"
-" sends a confirmation to the customer and\n"
-" executes the contract-specific business\n"
-" logic."
+"The backend <b>validates</b> and <b>executes</b>\n"
+" payments received from the wallet. The frontend\n"
+" must pass the payment request through to the backend\n"
+" and checks the HTTP status code that is returned."
msgstr ""
-#: merchants.html.j2:153
+#: merchants.html.j2:132
msgid ""
-"The exchange performs wire transfers\n"
-" corresponding to the claims deposited by the\n"
-" merchant. Note that the exchange may charge\n"
-" fees for the deposit operation, hence merchants\n"
-" may impose limits restricting the set of\n"
-" exchange operators they are willing to deal\n"
-" with, for example by imposing a bound on\n"
-" deposit fees."
+"The backend can <b>list</b> completed transactions\n"
+" and <b>map</b> aggregated wire transfers to individual\n"
+" business transactions including the exact terms of\n"
+" the contract."
msgstr ""
#: common/base.j2:5
@@ -1290,3 +1343,18 @@ msgstr ""
#~ msgid "Taler as seen by customers"
#~ msgstr "Come i clienti vedono Taler"
+#~ msgid "Taler as seen by merchants"
+#~ msgstr "Come i negozianti vedono Taler"
+
+#~ msgid "Tax-friendly"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
+#~ msgstr ""
+
+#~ msgid "Taler complies with regulation"
+#~ msgstr ""
+
+#~ msgid "Open access (PSD2)"
+#~ msgstr ""
+
diff --git a/merchants.html.j2 b/merchants.html.j2
index 956a940..9e94f5a 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -12,10 +12,10 @@
</div>
</div>
-<div class="container">
+<div class="container adorn_h3_bracket">
<div class="row">
<div class="col-lg-4">
- <h2>{{ _("Fast") }}</h2>
+ <h3>{{ _("Fast") }}</h3>
<p>{{ _("Processing transactions with Taler is fast,
allowing you to confirm the transaction with your
@@ -30,7 +30,7 @@
</div>
<div class="col-lg-4">
- <h2>{{ _("Secure") }}</h2>
+ <h3>{{ _("Secure") }}</h3>
<p>{{ _("You will have cryptographic proof of payment from
the Taler payment service provider. Taler does not
@@ -44,7 +44,7 @@
</div>
<div class="col-lg-4">
- <h2>{{ _("Free Software") }}</h2>
+ <h3>{{ _("Free Software") }}</h3>
<p>{{ _("Taler is free software, and you can use the
liberally-licensed reference code as a starting
@@ -58,7 +58,7 @@
</div>
<div class="row">
<div class="col-lg-4">
- <h2>{{ _("Low Fees") }}</h2>
+ <h3>{{ _("Low Fees") }}</h3>
<p>{{ _("Taler is designed to minimize the work the exchange
needs to perform. Combined with Taler's strong
@@ -68,7 +68,7 @@
</div>
<div class="col-lg-4">
- <h2>{{ _("Flexible") }}</h2>
+ <h3>{{ _("Flexible") }}</h3>
<p>{{ _("Taler can be used for different currencies (such as
Euros, US Dollars or Bitcoins) and different
@@ -78,7 +78,7 @@
</div>
<div class="col-lg-4">
- <h2>{{ _("Ethical") }}</h2>
+ <h3>{{ _("Ethical") }}</h3>
<p>{{ _("Taler prevents tax evasion and money laundering.
Taler's protocols are efficient and do not waste
@@ -112,54 +112,33 @@
<div class="container">
- <div class="col-lg-12">
- <h2 id="overview">{{ _("Taler as seen by merchants") }}</h2>
-
- <p>{{ _("Merchants supporting the Taler system need to
- integrate some relatively simple logic into their
- transaction processing system. Typical steps
- performed by the merchant system are: ") }}</p>
+ <div class="col-lg-6">
+ <h2 id="overview">{{ _("The GNU Taler Merchant Backend") }}</h2>
+ <p>{{ _("Merchants process payments using the Taler backend:") }}</p>
<p>
- <img src="{{ url('images/merchant.svg') }}" alt="merchant perspective"
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
- <ol>
-
- <li>{{ _("The new logic detects when a customer's system
- supports Taler and then needs to send a
- cryptographically signed version of the proposed
- contract in a simple JSON format to the
- customer. The message also includes salted,
- hashed wire details for the merchant, as well as
- restrictions as to which exchange operators the
- merchant is willing to deal with.") }}</li>
-
- <li>{{ _("The customer sends a signed response which
- states that certain digital coins now belong to
- the merchant to both signal acceptance of the
- deal as well as to pay the respective amount
- (bottom).") }}</li>
-
- <li>{{ _("The merchant then forwards the signed messages
- received from the customer to the exchange,
- together with its wire details and the salt
- (without hashing). The exchange verifies the
- details and sends a signed confirmation (or an
- error message) to the merchant. The merchant
- checks that the exchange's signature is valid,
- sends a confirmation to the customer and
- executes the contract-specific business
- logic.") }}</li>
-
- <li>{{ _("The exchange performs wire transfers
- corresponding to the claims deposited by the
- merchant. Note that the exchange may charge
- fees for the deposit operation, hence merchants
- may impose limits restricting the set of
- exchange operators they are willing to deal
- with, for example by imposing a bound on
- deposit fees.") }}</li>
- </ol>
+ <ul>
+
+ <li>{{ _("The backend <b>signs</b> and <b>stores</b>
+ proposals made by the merchant to customers.
+ For this, the merchant's frontend needs to give the
+ customer's order in a JSON format to the backend.") }}</li>
+
+ <li>{{ _("The backend <b>validates</b> and <b>executes</b>
+ payments received from the wallet. The frontend
+ must pass the payment request through to the backend
+ and checks the HTTP status code that is returned.") }}</li>
+
+ <li>{{ _("The backend can <b>list</b> completed transactions
+ and <b>map</b> aggregated wire transfers to individual
+ business transactions including the exact terms of
+ the contract.") }} </li>
+
+ </ul>
</p>
</div>
+ <div class="col-lg-6">
+ <img src="{{ url('images/backend.svg') }}" alt="customer perspective"
style="float: right; margin: 5px 5px 5px 5px;" width="100%">
+ </div>
</div> <!-- /container -->
{% endblock body_content %}
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-www] branch master updated: revise government page, fix misc i18n issues, fix some style issues,
gnunet <=