aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-07 00:45:07 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-07 00:45:07 +0100
commit473887865beb80d10a688d5e36aa843f8346601d (patch)
tree7a8ae7ea40be77b89e1d2fc3f9ea7acd2b1a768a
parentcce633874102d4e19960ab0273bd4369477bd08f (diff)
downloadwww-473887865beb80d10a688d5e36aa843f8346601d.tar.gz
www-473887865beb80d10a688d5e36aa843f8346601d.zip
revise government page, fix misc i18n issues, fix some style issues
Diffstat
-rw-r--r--citizens.html.j210
-rw-r--r--governments.html.j252
-rw-r--r--index.html.j2108
-rw-r--r--locale/de/LC_MESSAGES/messages.po270
-rw-r--r--locale/en/LC_MESSAGES/messages.po268
-rw-r--r--locale/es/LC_MESSAGES/messages.po270
-rw-r--r--locale/fr/LC_MESSAGES/messages.po270
-rw-r--r--locale/it/LC_MESSAGES/messages.po270
-rw-r--r--merchants.html.j283
9 files changed, 974 insertions, 627 deletions
diff --git a/citizens.html.j2 b/citizens.html.j2
index 58295564..cf8a8cfa 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -18,11 +18,11 @@
18 </div> 18 </div>
19</div> 19</div>
20 20
21<div class="container"> 21<div class="container adorn_h3_bracket">
22 <!-- Example row of columns --> 22 <!-- Example row of columns -->
23 <div class="row"> 23 <div class="row">
24 <div class="col-lg-6"> 24 <div class="col-lg-6">
25 <h2>{{ _("Security") }}</h2> 25 <h3>{{ _("Security") }}</h3>
26 26
27 <p>{{ _("Taler uses modern cryptography, ensuring that there 27 <p>{{ _("Taler uses modern cryptography, ensuring that there
28 is no counterfeit. Your digital wallet is safer 28 is no counterfeit. Your digital wallet is safer
@@ -34,7 +34,7 @@
34 34
35 </div> 35 </div>
36 <div class="col-lg-6"> 36 <div class="col-lg-6">
37 <h2>{{ _("Privacy") }}</h2> 37 <h3>{{ _("Privacy") }}</h3>
38 38
39 <p>{{ _("Your transactions are private, neither the exchange 39 <p>{{ _("Your transactions are private, neither the exchange
40 nor merchant needs to learn your identity. There is 40 nor merchant needs to learn your identity. There is
@@ -47,7 +47,7 @@
47 </div> 47 </div>
48 <div class="row"> 48 <div class="row">
49 <div class="col-lg-6"> 49 <div class="col-lg-6">
50 <h2>{{ _("Convenience") }}</h2> 50 <h3>{{ _("Convenience") }}</h3>
51 51
52 <p>{{ _("You will be able to withdraw money to replenish the 52 <p>{{ _("You will be able to withdraw money to replenish the
53 digital coins in your wallet using your credit card 53 digital coins in your wallet using your credit card
@@ -58,7 +58,7 @@
58 58
59 </div> 59 </div>
60 <div class="col-lg-6"> 60 <div class="col-lg-6">
61 <h2>{{ _("Stability") }}</h2> 61 <h3>{{ _("Stability") }}</h3>
62 62
63 <p>{{ _("Coins in your digital wallet will be of the same 63 <p>{{ _("Coins in your digital wallet will be of the same
64 denomination as the cash in your physical wallet. 64 denomination as the cash in your physical wallet.
diff --git a/governments.html.j2 b/governments.html.j2
index 23494400..2b627c3f 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -16,15 +16,14 @@
16 </div> 16 </div>
17</div> 17</div>
18 18
19<div class="container">
20
21<!-- Example row of columns --> 19<!-- Example row of columns -->
22<div class="row"> 20<div class="container adorn_h3_bracket">
21 <div class="row">
23 <div class="col-lg-6"> 22 <div class="col-lg-6">
24 <h2>{{ _("Taxable") }}</h2> 23 <h3>{{ _("Taxable") }}</h3>
25 24
26 <p>{{ _("Taler was 25 <p>{{ _("Taler was
27 built with the goal of fighting corruption and supporting taxation. 26 built with the goal of fighting corruption and supporting taxation.
28 With Taler, the receiver of any form of payment is 27 With Taler, the receiver of any form of payment is
29 easily identified by the government, and the merchant 28 easily identified by the government, and the merchant
30 can be compelled to provide the contract that was accepted 29 can be compelled to provide the contract that was accepted
@@ -43,10 +42,10 @@
43 extend to the immediate personal domain. In 42 extend to the immediate personal domain. In
44 particular, sharing access to funds within a family 43 particular, sharing access to funds within a family
45 or synchronizing wallets across multiple devices is not 44 or synchronizing wallets across multiple devices is not
46 subject to monitoring.") }}</p> </div> 45 subject to monitoring.") }}</p>
47 46 </div>
48 <div class="col-lg-6"> 47 <div class="col-lg-6">
49 <h2>{{ _("Secure") }}</h2> 48 <h3>{{ _("Secure") }}</h3>
50 49
51 <p>{{ _("Taler's payments are cryptographically 50 <p>{{ _("Taler's payments are cryptographically
52 secured. Thus, customers, merchants and the 51 secured. Thus, customers, merchants and the
@@ -65,9 +64,12 @@
65 the payment service provider to ensure that the 64 the payment service provider to ensure that the
66 escrow account is managed honestly. This ensures 65 escrow account is managed honestly. This ensures
67 that the payment service provider does not threaten 66 that the payment service provider does not threaten
68 the economy due to fraud.") }}</p> </div> </div> 67 the economy due to fraud.") }}</p>
69 <div class="row"> <div class="col-lg-6"> <h2>{{ 68 </div>
70 _("Libre") }}</h2> 69 </div>
70 <div class="row">
71 <div class="col-lg-6">
72 <h3>{{ _("Libre") }}</h3>
71 73
72 <p>{{ _("Taler is free software implementing an open 74 <p>{{ _("Taler is free software implementing an open
73 protocol standard. Thus, Taler will enable 75 protocol standard. Thus, Taler will enable
@@ -78,7 +80,7 @@
78 80
79 </div> 81 </div>
80 <div class="col-lg-6"> 82 <div class="col-lg-6">
81 <h2>{{ _("Efficient") }}</h2> 83 <h3>{{ _("Efficient") }}</h3>
82 84
83 <p>{{ _("Taler has an efficient design. Unlike 85 <p>{{ _("Taler has an efficient design. Unlike
84 timeline-based payment systems, such as Bitcoin, 86 timeline-based payment systems, such as Bitcoin,
@@ -87,7 +89,29 @@
87 contribute to environmental pollution.") }}</p> 89 contribute to environmental pollution.") }}</p>
88 90
89 </div> 91 </div>
92 </div>
93</div>
94
95
96
97<div class="contianer-fluid c_acronym">
98 <div class="container">
99 <h2 id="documentation">{{ _("Taler and regulation") }}</h2>
100 <dl>
101 <dt>{{ _("Anti-money laundering (AML)")}}</dt>
102 <dd>{{ _("With Taler, income is visible and can be tied to the contract signed by both parties.") }}</li>
103 <dt>{{ _("Know-your-customer (KYC)")}}</dt>
104 <dd>{{ _("In Taler, payer and payee are known by their bank accounts when withdrawing or depositing coins respectively") }}</dd>
105 <dt>{{ _("Privacy-by-design (GDPR)")}}</dt>
106 <dd>{{ _("Taler cryptographically protects citizen's privacy, and by design implements data minimization and privacy by default.") }}</dd>
107 <dt>{{ _("Competitive banking (PSD2)")}}</dt>
108 <dd>{{ _("Taler provides an open standard with public APIs contributing to a level playing field.") }}</dt>
109 </dl>
110 </div>
90</div> 111</div>
112
113
114<div class="container">
91<div class="col-lg-12"> 115<div class="col-lg-12">
92 <h2 id="overview">{{ _("Taler as seen by governments") }}</h2> 116 <h2 id="overview">{{ _("Taler as seen by governments") }}</h2>
93 117
@@ -99,11 +123,11 @@
99 auditors, while merchants may be required to reveal 123 auditors, while merchants may be required to reveal
100 information during regular tax audits. Information 124 information during regular tax audits. Information
101 available to the government includes: ") }}</p> 125 available to the government includes: ") }}</p>
102 126
103 <p> 127 <p>
104 <img src="{{ url('images/government.svg') }}" alt="government perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> 128 <img src="{{ url('images/government.svg') }}" alt="government perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%">
105 </p><ul> 129 </p><ul>
106 130
107 <li>{{ _("From the banking system: The total amount of 131 <li>{{ _("From the banking system: The total amount of
108 digital currency obtained by a customer. The 132 digital currency obtained by a customer. The
109 government could impose limits on how many 133 government could impose limits on how many
diff --git a/index.html.j2 b/index.html.j2
index e4ec7cfb..c9cc38fd 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -27,40 +27,42 @@
27 27
28 <div class="row"> 28 <div class="row">
29 <div class="col-lg-4"> 29 <div class="col-lg-4">
30 <h3>{{ _("Taxable") }}</h3> 30 <h3>{{ _("Practical") }}</h3>
31 31
32 <p> 32 <p>
33 {% trans %} 33 {% trans %}
34 When using Taler, merchants can't hide their income from tax 34 Taler is easy to integrate with existing Web
35 collection authorities. Unlike cash and most digital currencies, 35 applications. Payments are cryptographically
36 Taler helps preventing black markets. 36 secured and are confirmed within milliseconds with
37 extremely low transaction costs.
37 {% endtrans %} 38 {% endtrans %}
38 </p> 39 </p>
39 40
40 </div> 41 </div>
41 <div class="col-lg-4"> 42 <div class="col-lg-4">
42 <h3>{{ _("Privacy-friendly") }}</h3> 43 <h3>{{ _("Stable") }}</h3>
44
43 <p> 45 <p>
44 {% trans %} 46 {% trans %}
45 When you pay with Taler, your identity does not 47 Taler does not introduce a new currency with
46 have to be revealed to the merchant. Just like 48 fluctuation risks, and instead uses a digital
47 payments in cash, nobody else can track how you 49 wallet holding coins in reserve. Taler's
48 spent your electronic money. However, you obtain a 50 cryptographic coins correspond to existing
49 legally valid proof of payment. 51 currencies, such as US Dollars, Euros or even
52 Bitcoins.
50 {% endtrans %} 53 {% endtrans %}
51 </p> 54 </p>
52 55
53 </div> 56 </div>
54 <div class="col-lg-4"> 57 <div class="col-lg-4">
55 <h3>{{ _("Libre") }}</h3> 58 <h3>{{ _("Security-focused") }}</h3>
56 59
57 <p> 60 <p>
58 {% trans %} 61 {% trans %}
59 Taler provides protocols and reference implementations that in 62 By design Taler does not suffer from many classes
60 principle enables anybody to run their own payment infrastructure, 63 of security problems such as phishing or conterfeit.
61 be it individuals, organizations or whole countries. Since the 64 Despite its security features, Taler never rejects a legitimate
62 reference implementation is a <a href="http://www.gnu.org/">GNU</a> 65 customer due to a fraud-detection false positive.
63 package, it will always remain free software.
64 {% endtrans %} 66 {% endtrans %}
65 </p> 67 </p>
66 68
@@ -68,45 +70,44 @@
68 </div> 70 </div>
69 <div class="row"> 71 <div class="row">
70 <div class="col-lg-4"> 72 <div class="col-lg-4">
71 <h3>{{ _("Practical") }}</h3> 73 <h3>{{ _("Taxable") }}</h3>
72 74
73 <p> 75 <p>
74 {% trans %} 76 {% trans %}
75 Taler is easy to integrate with existing Web 77 When using Taler, merchants cannot hide their income from tax
76 applications. Payments are cryptographically 78 collection authorities. Unlike cash and most digital currencies,
77 secured and are confirmed within milliseconds with 79 Taler helps prevent black markets. Taler is not suitable for
78 extremely low transaction costs. 80 illegal activities.
79 {% endtrans %} 81 {% endtrans %}
80 </p> 82 </p>
81 83
82 </div> 84 </div>
83 <div class="col-lg-4"> 85 <div class="col-lg-4">
84 <h3>{{ _("Stable") }}</h3> 86 <h3>{{ _("Privacy-friendly") }}</h3>
85
86 <p> 87 <p>
87 {% trans %} 88 {% trans %}
88 Taler does not introduce a new currency with 89 When you pay with Taler, your identity does not
89 fluctuation risks, and instead uses a digital 90 have to be revealed to the merchant. Just like
90 wallet holding coins in reserve. Taler's 91 payments in cash, nobody else can track how you
91 cryptographic coins correspond to existing 92 spent your electronic money. However, you obtain a
92 currencies, such as US Dollars, Euros or even 93 legally valid proof of payment.
93 Bitcoins.
94 {% endtrans %} 94 {% endtrans %}
95 </p> 95 </p>
96 96
97 </div> 97 </div>
98 <div class="col-lg-4"> 98 <div class="col-lg-4">
99 <h3>{{ _("Security-focused") }}</h3> 99 <h3>{{ _("Libre") }}</h3>
100 100
101 <p> 101 <p>
102 {% trans %} 102 {% trans %}
103 By design Taler does not suffer from many classes 103 Taler provides protocols and reference implementations that in
104 of security problems such as phishing or conterfeit. 104 principle enables anybody to run their own payment infrastructure,
105 Despite its security features, Taler never rejects a legitimate 105 be it individuals, organizations or whole countries. Since the
106 customer due to a fraud-detection false positive. 106 reference implementation is a <a href="http://www.gnu.org/">GNU</a>
107 package, it will always remain free software.
107 {% endtrans %} 108 {% endtrans %}
108 </p> 109 </p>
109 110
110 </div> 111 </div>
111 </div> 112 </div>
112</div> 113</div>
@@ -115,22 +116,25 @@
115<div class="container"> 116<div class="container">
116 <div class="row"> 117 <div class="row">
117 <div class="col-lg-6"> 118 <div class="col-lg-6">
118 <h2>Paying with Taler</h2> 119 <h2>{{ _("Paying with Taler") }}</h2>
119 <p>In order to pay with Taler, users install a wallet browser extension 120 {% trans %}
120 or app on their device. Before the first payment, the wallet's balance must 121 <p>To pay with Taler, customers install an electronic wallet
121 be charged by some other means of payment for the desired currency.</p> 122 on their device. Before the first payment, the wallet's balance must
122 <p>Once the wallet is charged, payments on websites take only one click, are never falsely rejected 123 be charged in the desired currency by some other means of payment.</p>
123 by fraud detection and do not post any risk of phishing or identity theft.</p> 124 <p>Once the wallet is charged, payments on websites take only one click,
125 are never falsely rejected by fraud detection and do not post any risk
126 of phishing or identity theft.</p>
127 {% endtrans %}
124 </div> 128 </div>
125 <div class="col-lg-6"> 129 <div class="col-lg-6">
126 <h2>Receiving payments with Taler</h2> 130 <h2>{{ _("Receiving payments with Taler") }}</h2>
127 <p>To receive Taler payments, a merchant only needs a bank account (or 131 {% trans %}
128 any other kind of payment address) in the desired currency. We provide an 132 <p>To receive Taler payments, a merchant needs a bank account
129 SDK in various languages that makes the integration into a merchant's store 133 in the desired currency. We provide
130 painless. The merchant's backend for Taler transaction processing can run 134 SDKs in various languages to makes the integration painless.
131 on the mechant's premises or be a hosted backend.</p> 135 The merchant's backend for Taler transaction processing can run
132 <p>When using a hosted backend, setting up a website that accepts taler 136 on the mechant's premises or hosted.</p>
133 payments is a matter of minutes.</p> 137 {% endtrans %}
134 </div> 138 </div>
135 </div> 139 </div>
136</div> 140</div>
@@ -144,7 +148,7 @@
144 <div class="col-lg-6"> 148 <div class="col-lg-6">
145 <h2>{{ _("Financial News") }}</h2> 149 <h2>{{ _("Financial News") }}</h2>
146 {% include "financial-news.html.j2.inc" %} 150 {% include "financial-news.html.j2.inc" %}
147 </div> 151 </div>
148 </div> 152 </div>
149</div> <!-- /container --> 153</div> <!-- /container -->
150{% endblock body_content %} 154{% endblock body_content %}
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 359e8190..56a07a34 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
3msgstr "" 3msgstr ""
4"Project-Id-Version: PROJECT VERSION\n" 4"Project-Id-Version: PROJECT VERSION\n"
5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
6"POT-Creation-Date: 2017-03-06 23:50+0100\n" 6"POT-Creation-Date: 2017-03-07 00:44+0100\n"
7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
9"Language: de\n" 9"Language: de\n"
@@ -590,16 +590,16 @@ msgid ""
590" infrastructure." 590" infrastructure."
591msgstr "" 591msgstr ""
592 592
593#: governments.html.j2:24 index.html.j2:30 593#: governments.html.j2:23 index.html.j2:73
594#, fuzzy 594#, fuzzy
595msgid "Taxable" 595msgid "Taxable"
596msgstr "Taxierbar" 596msgstr "Taxierbar"
597 597
598#: governments.html.j2:26 598#: governments.html.j2:25
599msgid "" 599msgid ""
600"Taler was\n" 600"Taler was\n"
601" built with the goal of fighting corruption and supporting " 601" built with the goal of fighting corruption and supporting "
602"taxation. \n" 602"taxation.\n"
603" With Taler, the receiver of any form of payment is\n" 603" With Taler, the receiver of any form of payment is\n"
604" easily identified by the government, and the merchant\n" 604" easily identified by the government, and the merchant\n"
605" can be compelled to provide the contract that was accepted\n" 605" can be compelled to provide the contract that was accepted\n"
@@ -609,7 +609,7 @@ msgid ""
609" viable." 609" viable."
610msgstr "" 610msgstr ""
611 611
612#: governments.html.j2:36 612#: governments.html.j2:35
613msgid "" 613msgid ""
614"Thus, despite offering anonymity for citizens\n" 614"Thus, despite offering anonymity for citizens\n"
615" spending digital cash to buy goods and services,\n" 615" spending digital cash to buy goods and services,\n"
@@ -624,11 +624,11 @@ msgid ""
624" subject to monitoring." 624" subject to monitoring."
625msgstr "" 625msgstr ""
626 626
627#: governments.html.j2:49 merchants.html.j2:33 627#: governments.html.j2:48 merchants.html.j2:33
628msgid "Secure" 628msgid "Secure"
629msgstr "Sicher" 629msgstr "Sicher"
630 630
631#: governments.html.j2:51 631#: governments.html.j2:50
632msgid "" 632msgid ""
633"Taler's payments are cryptographically\n" 633"Taler's payments are cryptographically\n"
634" secured. Thus, customers, merchants and the\n" 634" secured. Thus, customers, merchants and the\n"
@@ -639,7 +639,7 @@ msgid ""
639" merchants, the exchange and the state." 639" merchants, the exchange and the state."
640msgstr "" 640msgstr ""
641 641
642#: governments.html.j2:59 642#: governments.html.j2:58
643msgid "" 643msgid ""
644"By design, the Taler payment service provider is\n" 644"By design, the Taler payment service provider is\n"
645" subject to financial regulation. Financial\n" 645" subject to financial regulation. Financial\n"
@@ -653,11 +653,11 @@ msgid ""
653" the economy due to fraud." 653" the economy due to fraud."
654msgstr "" 654msgstr ""
655 655
656#: governments.html.j2:70 index.html.j2:55 656#: governments.html.j2:72 index.html.j2:99
657msgid "Libre" 657msgid "Libre"
658msgstr "Libre" 658msgstr "Libre"
659 659
660#: governments.html.j2:72 660#: governments.html.j2:74
661msgid "" 661msgid ""
662"Taler is free software implementing an open\n" 662"Taler is free software implementing an open\n"
663" protocol standard. Thus, Taler will enable\n" 663" protocol standard. Thus, Taler will enable\n"
@@ -666,11 +666,11 @@ msgid ""
666" financial stability today." 666" financial stability today."
667msgstr "" 667msgstr ""
668 668
669#: governments.html.j2:81 669#: governments.html.j2:83
670msgid "Efficient" 670msgid "Efficient"
671msgstr "Effizient" 671msgstr "Effizient"
672 672
673#: governments.html.j2:83 673#: governments.html.j2:85
674msgid "" 674msgid ""
675"Taler has an efficient design. Unlike\n" 675"Taler has an efficient design. Unlike\n"
676" timeline-based payment systems, such as Bitcoin,\n" 676" timeline-based payment systems, such as Bitcoin,\n"
@@ -679,11 +679,55 @@ msgid ""
679" contribute to environmental pollution." 679" contribute to environmental pollution."
680msgstr "" 680msgstr ""
681 681
682#: governments.html.j2:92 682#: governments.html.j2:99
683msgid "Taler and regulation"
684msgstr ""
685
686#: governments.html.j2:101
687msgid "Anti-money laundering (AML)"
688msgstr ""
689
690#: governments.html.j2:102
691msgid ""
692"With Taler, income is visible and can be tied to the contract signed by "
693"both parties."
694msgstr ""
695
696#: governments.html.j2:103
697msgid "Know-your-customer (KYC)"
698msgstr ""
699
700#: governments.html.j2:104
701msgid ""
702"In Taler, payer and payee are known by their bank accounts when "
703"withdrawing or depositing coins respectively"
704msgstr ""
705
706#: governments.html.j2:105
707msgid "Privacy-by-design (GDPR)"
708msgstr ""
709
710#: governments.html.j2:106
711msgid ""
712"Taler cryptographically protects citizen's privacy, and by design "
713"implements data minimization and privacy by default."
714msgstr ""
715
716#: governments.html.j2:107
717msgid "Competitive banking (PSD2)"
718msgstr ""
719
720#: governments.html.j2:108
721msgid ""
722"Taler provides an open standard with public APIs contributing to a level "
723"playing field."
724msgstr ""
725
726#: governments.html.j2:116
683msgid "Taler as seen by governments" 727msgid "Taler as seen by governments"
684msgstr "Taler aus Regierungsperspektive" 728msgstr "Taler aus Regierungsperspektive"
685 729
686#: governments.html.j2:94 730#: governments.html.j2:118
687msgid "" 731msgid ""
688"Governments can observe traditional wire transfers\n" 732"Governments can observe traditional wire transfers\n"
689" entering and leaving the Taler system, and require\n" 733" entering and leaving the Taler system, and require\n"
@@ -695,7 +739,7 @@ msgid ""
695" available to the government includes: " 739" available to the government includes: "
696msgstr "" 740msgstr ""
697 741
698#: governments.html.j2:107 742#: governments.html.j2:131
699msgid "" 743msgid ""
700"From the banking system: The total amount of\n" 744"From the banking system: The total amount of\n"
701" digital currency obtained by a customer. The\n" 745" digital currency obtained by a customer. The\n"
@@ -704,14 +748,14 @@ msgid ""
704" given timeframe." 748" given timeframe."
705msgstr "" 749msgstr ""
706 750
707#: governments.html.j2:113 751#: governments.html.j2:137
708msgid "" 752msgid ""
709"From the banking system: The total amount of\n" 753"From the banking system: The total amount of\n"
710" income received by any merchant via the Taler\n" 754" income received by any merchant via the Taler\n"
711" system." 755" system."
712msgstr "" 756msgstr ""
713 757
714#: governments.html.j2:117 758#: governments.html.j2:141
715msgid "" 759msgid ""
716"From auditing the exchange: The amounts of\n" 760"From auditing the exchange: The amounts of\n"
717" digital coins legitimately withdrawn by\n" 761" digital coins legitimately withdrawn by\n"
@@ -723,7 +767,7 @@ msgid ""
723" the exchange from transaction fees." 767" the exchange from transaction fees."
724msgstr "" 768msgstr ""
725 769
726#: governments.html.j2:126 770#: governments.html.j2:150
727msgid "" 771msgid ""
728"From auditing merchants: For each deposit\n" 772"From auditing merchants: For each deposit\n"
729" operation, the exact details of the underlying\n" 773" operation, the exact details of the underlying\n"
@@ -757,21 +801,66 @@ msgid ""
757" " 801" "
758msgstr "" 802msgstr ""
759 803
804#: index.html.j2:30
805msgid "Practical"
806msgstr ""
807
760#: index.html.j2:33 808#: index.html.j2:33
761msgid "" 809msgid ""
762"\n" 810"\n"
763" When using Taler, merchants can't hide their income from tax\n" 811" Taler is easy to integrate with existing Web\n"
812" applications. Payments are cryptographically\n"
813" secured and are confirmed within milliseconds with\n"
814" extremely low transaction costs.\n"
815" "
816msgstr ""
817
818#: index.html.j2:43
819msgid "Stable"
820msgstr ""
821
822#: index.html.j2:46
823msgid ""
824"\n"
825" Taler does not introduce a new currency with\n"
826" fluctuation risks, and instead uses a digital\n"
827" wallet holding coins in reserve. Taler's\n"
828" cryptographic coins correspond to existing\n"
829" currencies, such as US Dollars, Euros or even\n"
830" Bitcoins.\n"
831" "
832msgstr ""
833
834#: index.html.j2:58
835msgid "Security-focused"
836msgstr ""
837
838#: index.html.j2:61
839msgid ""
840"\n"
841" By design Taler does not suffer from many classes\n"
842" of security problems such as phishing or conterfeit.\n"
843" Despite its security features, Taler never rejects a legitimate\n"
844" customer due to a fraud-detection false positive.\n"
845" "
846msgstr ""
847
848#: index.html.j2:76
849msgid ""
850"\n"
851" When using Taler, merchants cannot hide their income from tax\n"
764" collection authorities. Unlike cash and most digital currencies," 852" collection authorities. Unlike cash and most digital currencies,"
765"\n" 853"\n"
766" Taler helps preventing black markets.\n" 854" Taler helps prevent black markets. Taler is not suitable for\n"
855" illegal activities.\n"
767" " 856" "
768msgstr "" 857msgstr ""
769 858
770#: index.html.j2:42 859#: index.html.j2:86
771msgid "Privacy-friendly" 860msgid "Privacy-friendly"
772msgstr "" 861msgstr ""
773 862
774#: index.html.j2:44 863#: index.html.j2:88
775msgid "" 864msgid ""
776"\n" 865"\n"
777" When you pay with Taler, your identity does not\n" 866" When you pay with Taler, your identity does not\n"
@@ -782,7 +871,7 @@ msgid ""
782" " 871" "
783msgstr "" 872msgstr ""
784 873
785#: index.html.j2:58 874#: index.html.j2:102
786msgid "" 875msgid ""
787"\n" 876"\n"
788" Taler provides protocols and reference implementations that in\n" 877" Taler provides protocols and reference implementations that in\n"
@@ -795,55 +884,46 @@ msgid ""
795" " 884" "
796msgstr "" 885msgstr ""
797 886
798#: index.html.j2:71 887#: index.html.j2:119
799msgid "Practical" 888msgid "Paying with Taler"
800msgstr "" 889msgstr ""
801 890
802#: index.html.j2:74 891#: index.html.j2:120
803msgid "" 892msgid ""
804"\n" 893"\n"
805" Taler is easy to integrate with existing Web\n" 894" <p>To pay with Taler, customers install an electronic wallet\n"
806" applications. Payments are cryptographically\n" 895" on their device. Before the first payment, the wallet's balance must"
807" secured and are confirmed within milliseconds with\n"
808" extremely low transaction costs.\n"
809" "
810msgstr ""
811
812#: index.html.j2:84
813msgid "Stable"
814msgstr ""
815
816#: index.html.j2:87
817msgid ""
818"\n" 896"\n"
819" Taler does not introduce a new currency with\n" 897" be charged in the desired currency by some other means of "
820" fluctuation risks, and instead uses a digital\n" 898"payment.</p>\n"
821" wallet holding coins in reserve. Taler's\n" 899" <p>Once the wallet is charged, payments on websites take only one "
822" cryptographic coins correspond to existing\n" 900"click,\n"
823" currencies, such as US Dollars, Euros or even\n" 901" are never falsely rejected by fraud detection and do not post any "
824" Bitcoins.\n" 902"risk\n"
825" " 903" of phishing or identity theft.</p>\n"
904" "
826msgstr "" 905msgstr ""
827 906
828#: index.html.j2:99 907#: index.html.j2:130
829msgid "Security-focused" 908msgid "Receiving payments with Taler"
830msgstr "" 909msgstr ""
831 910
832#: index.html.j2:102 911#: index.html.j2:131
833msgid "" 912msgid ""
834"\n" 913"\n"
835" By design Taler does not suffer from many classes\n" 914" <p>To receive Taler payments, a merchant needs a bank account\n"
836" of security problems such as phishing or conterfeit.\n" 915" in the desired currency. We provide\n"
837" Despite its security features, Taler never rejects a legitimate\n" 916" SDKs in various languages to makes the integration painless.\n"
838" customer due to a fraud-detection false positive.\n" 917" The merchant's backend for Taler transaction processing can run\n"
839" " 918" on the mechant's premises or hosted.</p>\n"
919" "
840msgstr "" 920msgstr ""
841 921
842#: index.html.j2:141 922#: index.html.j2:145
843msgid "Taler News" 923msgid "Taler News"
844msgstr "" 924msgstr ""
845 925
846#: index.html.j2:145 926#: index.html.j2:149
847msgid "Financial News" 927msgid "Financial News"
848msgstr "" 928msgstr ""
849 929
@@ -1077,62 +1157,35 @@ msgid "The GNU Taler Web shop integration tutorial (Python)"
1077msgstr "" 1157msgstr ""
1078 1158
1079#: merchants.html.j2:116 1159#: merchants.html.j2:116
1080msgid "Taler as seen by merchants" 1160msgid "The GNU Taler Merchant Backend"
1081msgstr "Taler aus Händlerperspektive"
1082
1083#: merchants.html.j2:118
1084msgid ""
1085"Merchants supporting the Taler system need to\n"
1086" integrate some relatively simple logic into their\n"
1087" transaction processing system. Typical steps\n"
1088" performed by the merchant system are: "
1089msgstr "" 1161msgstr ""
1090 1162
1091#: merchants.html.j2:127 1163#: merchants.html.j2:118
1092msgid "" 1164msgid "Merchants process payments using the Taler backend:"
1093"The new logic detects when a customer's system\n"
1094" supports Taler and then needs to send a\n"
1095" cryptographically signed version of the proposed\n"
1096" contract in a simple JSON format to the\n"
1097" customer. The message also includes salted,\n"
1098" hashed wire details for the merchant, as well as\n"
1099" restrictions as to which exchange operators the\n"
1100" merchant is willing to deal with."
1101msgstr "" 1165msgstr ""
1102 1166
1103#: merchants.html.j2:136 1167#: merchants.html.j2:122
1104msgid "" 1168msgid ""
1105"The customer sends a signed response which\n" 1169"The backend <b>signs</b> and <b>stores</b>\n"
1106" states that certain digital coins now belong to\n" 1170" proposals made by the merchant to customers.\n"
1107" the merchant to both signal acceptance of the\n" 1171" For this, the merchant's frontend needs to give the\n"
1108" deal as well as to pay the respective amount\n" 1172" customer's order in a JSON format to the backend."
1109" (bottom)."
1110msgstr "" 1173msgstr ""
1111 1174
1112#: merchants.html.j2:142 1175#: merchants.html.j2:127
1113msgid "" 1176msgid ""
1114"The merchant then forwards the signed messages\n" 1177"The backend <b>validates</b> and <b>executes</b>\n"
1115" received from the customer to the exchange,\n" 1178" payments received from the wallet. The frontend\n"
1116" together with its wire details and the salt\n" 1179" must pass the payment request through to the backend\n"
1117" (without hashing). The exchange verifies the\n" 1180" and checks the HTTP status code that is returned."
1118" details and sends a signed confirmation (or an\n"
1119" error message) to the merchant. The merchant\n"
1120" checks that the exchange's signature is valid,\n"
1121" sends a confirmation to the customer and\n"
1122" executes the contract-specific business\n"
1123" logic."
1124msgstr "" 1181msgstr ""
1125 1182
1126#: merchants.html.j2:153 1183#: merchants.html.j2:132
1127msgid "" 1184msgid ""
1128"The exchange performs wire transfers\n" 1185"The backend can <b>list</b> completed transactions\n"
1129" corresponding to the claims deposited by the\n" 1186" and <b>map</b> aggregated wire transfers to individual\n"
1130" merchant. Note that the exchange may charge\n" 1187" business transactions including the exact terms of\n"
1131" fees for the deposit operation, hence merchants\n" 1188" the contract."
1132" may impose limits restricting the set of\n"
1133" exchange operators they are willing to deal\n"
1134" with, for example by imposing a bound on\n"
1135" deposit fees."
1136msgstr "" 1189msgstr ""
1137 1190
1138#: common/base.j2:5 1191#: common/base.j2:5
@@ -1275,3 +1328,18 @@ msgstr ""
1275#~ msgid "Taler as seen by customers" 1328#~ msgid "Taler as seen by customers"
1276#~ msgstr "Taler aus Kundensicht" 1329#~ msgstr "Taler aus Kundensicht"
1277 1330
1331#~ msgid "Taler as seen by merchants"
1332#~ msgstr "Taler aus Händlerperspektive"
1333
1334#~ msgid "Tax-friendly"
1335#~ msgstr ""
1336
1337#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
1338#~ msgstr ""
1339
1340#~ msgid "Taler complies with regulation"
1341#~ msgstr ""
1342
1343#~ msgid "Open access (PSD2)"
1344#~ msgstr ""
1345
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 07bf7c60..35ad1698 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
3msgstr "" 3msgstr ""
4"Project-Id-Version: PROJECT VERSION\n" 4"Project-Id-Version: PROJECT VERSION\n"
5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
6"POT-Creation-Date: 2017-03-06 23:50+0100\n" 6"POT-Creation-Date: 2017-03-07 00:44+0100\n"
7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
9"Language: en\n" 9"Language: en\n"
@@ -582,15 +582,15 @@ msgid ""
582" infrastructure." 582" infrastructure."
583msgstr "" 583msgstr ""
584 584
585#: governments.html.j2:24 index.html.j2:30 585#: governments.html.j2:23 index.html.j2:73
586msgid "Taxable" 586msgid "Taxable"
587msgstr "" 587msgstr ""
588 588
589#: governments.html.j2:26 589#: governments.html.j2:25
590msgid "" 590msgid ""
591"Taler was\n" 591"Taler was\n"
592" built with the goal of fighting corruption and supporting " 592" built with the goal of fighting corruption and supporting "
593"taxation. \n" 593"taxation.\n"
594" With Taler, the receiver of any form of payment is\n" 594" With Taler, the receiver of any form of payment is\n"
595" easily identified by the government, and the merchant\n" 595" easily identified by the government, and the merchant\n"
596" can be compelled to provide the contract that was accepted\n" 596" can be compelled to provide the contract that was accepted\n"
@@ -600,7 +600,7 @@ msgid ""
600" viable." 600" viable."
601msgstr "" 601msgstr ""
602 602
603#: governments.html.j2:36 603#: governments.html.j2:35
604msgid "" 604msgid ""
605"Thus, despite offering anonymity for citizens\n" 605"Thus, despite offering anonymity for citizens\n"
606" spending digital cash to buy goods and services,\n" 606" spending digital cash to buy goods and services,\n"
@@ -615,11 +615,11 @@ msgid ""
615" subject to monitoring." 615" subject to monitoring."
616msgstr "" 616msgstr ""
617 617
618#: governments.html.j2:49 merchants.html.j2:33 618#: governments.html.j2:48 merchants.html.j2:33
619msgid "Secure" 619msgid "Secure"
620msgstr "" 620msgstr ""
621 621
622#: governments.html.j2:51 622#: governments.html.j2:50
623msgid "" 623msgid ""
624"Taler's payments are cryptographically\n" 624"Taler's payments are cryptographically\n"
625" secured. Thus, customers, merchants and the\n" 625" secured. Thus, customers, merchants and the\n"
@@ -630,7 +630,7 @@ msgid ""
630" merchants, the exchange and the state." 630" merchants, the exchange and the state."
631msgstr "" 631msgstr ""
632 632
633#: governments.html.j2:59 633#: governments.html.j2:58
634msgid "" 634msgid ""
635"By design, the Taler payment service provider is\n" 635"By design, the Taler payment service provider is\n"
636" subject to financial regulation. Financial\n" 636" subject to financial regulation. Financial\n"
@@ -644,11 +644,11 @@ msgid ""
644" the economy due to fraud." 644" the economy due to fraud."
645msgstr "" 645msgstr ""
646 646
647#: governments.html.j2:70 index.html.j2:55 647#: governments.html.j2:72 index.html.j2:99
648msgid "Libre" 648msgid "Libre"
649msgstr "" 649msgstr ""
650 650
651#: governments.html.j2:72 651#: governments.html.j2:74
652msgid "" 652msgid ""
653"Taler is free software implementing an open\n" 653"Taler is free software implementing an open\n"
654" protocol standard. Thus, Taler will enable\n" 654" protocol standard. Thus, Taler will enable\n"
@@ -657,11 +657,11 @@ msgid ""
657" financial stability today." 657" financial stability today."
658msgstr "" 658msgstr ""
659 659
660#: governments.html.j2:81 660#: governments.html.j2:83
661msgid "Efficient" 661msgid "Efficient"
662msgstr "" 662msgstr ""
663 663
664#: governments.html.j2:83 664#: governments.html.j2:85
665msgid "" 665msgid ""
666"Taler has an efficient design. Unlike\n" 666"Taler has an efficient design. Unlike\n"
667" timeline-based payment systems, such as Bitcoin,\n" 667" timeline-based payment systems, such as Bitcoin,\n"
@@ -670,11 +670,55 @@ msgid ""
670" contribute to environmental pollution." 670" contribute to environmental pollution."
671msgstr "" 671msgstr ""
672 672
673#: governments.html.j2:92 673#: governments.html.j2:99
674msgid "Taler and regulation"
675msgstr ""
676
677#: governments.html.j2:101
678msgid "Anti-money laundering (AML)"
679msgstr ""
680
681#: governments.html.j2:102
682msgid ""
683"With Taler, income is visible and can be tied to the contract signed by "
684"both parties."
685msgstr ""
686
687#: governments.html.j2:103
688msgid "Know-your-customer (KYC)"
689msgstr ""
690
691#: governments.html.j2:104
692msgid ""
693"In Taler, payer and payee are known by their bank accounts when "
694"withdrawing or depositing coins respectively"
695msgstr ""
696
697#: governments.html.j2:105
698msgid "Privacy-by-design (GDPR)"
699msgstr ""
700
701#: governments.html.j2:106
702msgid ""
703"Taler cryptographically protects citizen's privacy, and by design "
704"implements data minimization and privacy by default."
705msgstr ""
706
707#: governments.html.j2:107
708msgid "Competitive banking (PSD2)"
709msgstr ""
710
711#: governments.html.j2:108
712msgid ""
713"Taler provides an open standard with public APIs contributing to a level "
714"playing field."
715msgstr ""
716
717#: governments.html.j2:116
674msgid "Taler as seen by governments" 718msgid "Taler as seen by governments"
675msgstr "" 719msgstr ""
676 720
677#: governments.html.j2:94 721#: governments.html.j2:118
678msgid "" 722msgid ""
679"Governments can observe traditional wire transfers\n" 723"Governments can observe traditional wire transfers\n"
680" entering and leaving the Taler system, and require\n" 724" entering and leaving the Taler system, and require\n"
@@ -686,7 +730,7 @@ msgid ""
686" available to the government includes: " 730" available to the government includes: "
687msgstr "" 731msgstr ""
688 732
689#: governments.html.j2:107 733#: governments.html.j2:131
690msgid "" 734msgid ""
691"From the banking system: The total amount of\n" 735"From the banking system: The total amount of\n"
692" digital currency obtained by a customer. The\n" 736" digital currency obtained by a customer. The\n"
@@ -695,14 +739,14 @@ msgid ""
695" given timeframe." 739" given timeframe."
696msgstr "" 740msgstr ""
697 741
698#: governments.html.j2:113 742#: governments.html.j2:137
699msgid "" 743msgid ""
700"From the banking system: The total amount of\n" 744"From the banking system: The total amount of\n"
701" income received by any merchant via the Taler\n" 745" income received by any merchant via the Taler\n"
702" system." 746" system."
703msgstr "" 747msgstr ""
704 748
705#: governments.html.j2:117 749#: governments.html.j2:141
706msgid "" 750msgid ""
707"From auditing the exchange: The amounts of\n" 751"From auditing the exchange: The amounts of\n"
708" digital coins legitimately withdrawn by\n" 752" digital coins legitimately withdrawn by\n"
@@ -714,7 +758,7 @@ msgid ""
714" the exchange from transaction fees." 758" the exchange from transaction fees."
715msgstr "" 759msgstr ""
716 760
717#: governments.html.j2:126 761#: governments.html.j2:150
718msgid "" 762msgid ""
719"From auditing merchants: For each deposit\n" 763"From auditing merchants: For each deposit\n"
720" operation, the exact details of the underlying\n" 764" operation, the exact details of the underlying\n"
@@ -748,21 +792,66 @@ msgid ""
748" " 792" "
749msgstr "" 793msgstr ""
750 794
795#: index.html.j2:30
796msgid "Practical"
797msgstr ""
798
751#: index.html.j2:33 799#: index.html.j2:33
752msgid "" 800msgid ""
753"\n" 801"\n"
754" When using Taler, merchants can't hide their income from tax\n" 802" Taler is easy to integrate with existing Web\n"
803" applications. Payments are cryptographically\n"
804" secured and are confirmed within milliseconds with\n"
805" extremely low transaction costs.\n"
806" "
807msgstr ""
808
809#: index.html.j2:43
810msgid "Stable"
811msgstr ""
812
813#: index.html.j2:46
814msgid ""
815"\n"
816" Taler does not introduce a new currency with\n"
817" fluctuation risks, and instead uses a digital\n"
818" wallet holding coins in reserve. Taler's\n"
819" cryptographic coins correspond to existing\n"
820" currencies, such as US Dollars, Euros or even\n"
821" Bitcoins.\n"
822" "
823msgstr ""
824
825#: index.html.j2:58
826msgid "Security-focused"
827msgstr ""
828
829#: index.html.j2:61
830msgid ""
831"\n"
832" By design Taler does not suffer from many classes\n"
833" of security problems such as phishing or conterfeit.\n"
834" Despite its security features, Taler never rejects a legitimate\n"
835" customer due to a fraud-detection false positive.\n"
836" "
837msgstr ""
838
839#: index.html.j2:76
840msgid ""
841"\n"
842" When using Taler, merchants cannot hide their income from tax\n"
755" collection authorities. Unlike cash and most digital currencies," 843" collection authorities. Unlike cash and most digital currencies,"
756"\n" 844"\n"
757" Taler helps preventing black markets.\n" 845" Taler helps prevent black markets. Taler is not suitable for\n"
846" illegal activities.\n"
758" " 847" "
759msgstr "" 848msgstr ""
760 849
761#: index.html.j2:42 850#: index.html.j2:86
762msgid "Privacy-friendly" 851msgid "Privacy-friendly"
763msgstr "" 852msgstr ""
764 853
765#: index.html.j2:44 854#: index.html.j2:88
766msgid "" 855msgid ""
767"\n" 856"\n"
768" When you pay with Taler, your identity does not\n" 857" When you pay with Taler, your identity does not\n"
@@ -773,7 +862,7 @@ msgid ""
773" " 862" "
774msgstr "" 863msgstr ""
775 864
776#: index.html.j2:58 865#: index.html.j2:102
777msgid "" 866msgid ""
778"\n" 867"\n"
779" Taler provides protocols and reference implementations that in\n" 868" Taler provides protocols and reference implementations that in\n"
@@ -786,55 +875,46 @@ msgid ""
786" " 875" "
787msgstr "" 876msgstr ""
788 877
789#: index.html.j2:71 878#: index.html.j2:119
790msgid "Practical" 879msgid "Paying with Taler"
791msgstr "" 880msgstr ""
792 881
793#: index.html.j2:74 882#: index.html.j2:120
794msgid "" 883msgid ""
795"\n" 884"\n"
796" Taler is easy to integrate with existing Web\n" 885" <p>To pay with Taler, customers install an electronic wallet\n"
797" applications. Payments are cryptographically\n" 886" on their device. Before the first payment, the wallet's balance must"
798" secured and are confirmed within milliseconds with\n"
799" extremely low transaction costs.\n"
800" "
801msgstr ""
802
803#: index.html.j2:84
804msgid "Stable"
805msgstr ""
806
807#: index.html.j2:87
808msgid ""
809"\n" 887"\n"
810" Taler does not introduce a new currency with\n" 888" be charged in the desired currency by some other means of "
811" fluctuation risks, and instead uses a digital\n" 889"payment.</p>\n"
812" wallet holding coins in reserve. Taler's\n" 890" <p>Once the wallet is charged, payments on websites take only one "
813" cryptographic coins correspond to existing\n" 891"click,\n"
814" currencies, such as US Dollars, Euros or even\n" 892" are never falsely rejected by fraud detection and do not post any "
815" Bitcoins.\n" 893"risk\n"
816" " 894" of phishing or identity theft.</p>\n"
895" "
817msgstr "" 896msgstr ""
818 897
819#: index.html.j2:99 898#: index.html.j2:130
820msgid "Security-focused" 899msgid "Receiving payments with Taler"
821msgstr "" 900msgstr ""
822 901
823#: index.html.j2:102 902#: index.html.j2:131
824msgid "" 903msgid ""
825"\n" 904"\n"
826" By design Taler does not suffer from many classes\n" 905" <p>To receive Taler payments, a merchant needs a bank account\n"
827" of security problems such as phishing or conterfeit.\n" 906" in the desired currency. We provide\n"
828" Despite its security features, Taler never rejects a legitimate\n" 907" SDKs in various languages to makes the integration painless.\n"
829" customer due to a fraud-detection false positive.\n" 908" The merchant's backend for Taler transaction processing can run\n"
830" " 909" on the mechant's premises or hosted.</p>\n"
910" "
831msgstr "" 911msgstr ""
832 912
833#: index.html.j2:141 913#: index.html.j2:145
834msgid "Taler News" 914msgid "Taler News"
835msgstr "" 915msgstr ""
836 916
837#: index.html.j2:145 917#: index.html.j2:149
838msgid "Financial News" 918msgid "Financial News"
839msgstr "" 919msgstr ""
840 920
@@ -1068,62 +1148,35 @@ msgid "The GNU Taler Web shop integration tutorial (Python)"
1068msgstr "" 1148msgstr ""
1069 1149
1070#: merchants.html.j2:116 1150#: merchants.html.j2:116
1071msgid "Taler as seen by merchants" 1151msgid "The GNU Taler Merchant Backend"
1072msgstr "" 1152msgstr ""
1073 1153
1074#: merchants.html.j2:118 1154#: merchants.html.j2:118
1075msgid "" 1155msgid "Merchants process payments using the Taler backend:"
1076"Merchants supporting the Taler system need to\n"
1077" integrate some relatively simple logic into their\n"
1078" transaction processing system. Typical steps\n"
1079" performed by the merchant system are: "
1080msgstr "" 1156msgstr ""
1081 1157
1082#: merchants.html.j2:127 1158#: merchants.html.j2:122
1083msgid "" 1159msgid ""
1084"The new logic detects when a customer's system\n" 1160"The backend <b>signs</b> and <b>stores</b>\n"
1085" supports Taler and then needs to send a\n" 1161" proposals made by the merchant to customers.\n"
1086" cryptographically signed version of the proposed\n" 1162" For this, the merchant's frontend needs to give the\n"
1087" contract in a simple JSON format to the\n" 1163" customer's order in a JSON format to the backend."
1088" customer. The message also includes salted,\n"
1089" hashed wire details for the merchant, as well as\n"
1090" restrictions as to which exchange operators the\n"
1091" merchant is willing to deal with."
1092msgstr "" 1164msgstr ""
1093 1165
1094#: merchants.html.j2:136 1166#: merchants.html.j2:127
1095msgid ""
1096"The customer sends a signed response which\n"
1097" states that certain digital coins now belong to\n"
1098" the merchant to both signal acceptance of the\n"
1099" deal as well as to pay the respective amount\n"
1100" (bottom)."
1101msgstr ""
1102
1103#: merchants.html.j2:142
1104msgid "" 1167msgid ""
1105"The merchant then forwards the signed messages\n" 1168"The backend <b>validates</b> and <b>executes</b>\n"
1106" received from the customer to the exchange,\n" 1169" payments received from the wallet. The frontend\n"
1107" together with its wire details and the salt\n" 1170" must pass the payment request through to the backend\n"
1108" (without hashing). The exchange verifies the\n" 1171" and checks the HTTP status code that is returned."
1109" details and sends a signed confirmation (or an\n"
1110" error message) to the merchant. The merchant\n"
1111" checks that the exchange's signature is valid,\n"
1112" sends a confirmation to the customer and\n"
1113" executes the contract-specific business\n"
1114" logic."
1115msgstr "" 1172msgstr ""
1116 1173
1117#: merchants.html.j2:153 1174#: merchants.html.j2:132
1118msgid "" 1175msgid ""
1119"The exchange performs wire transfers\n" 1176"The backend can <b>list</b> completed transactions\n"
1120" corresponding to the claims deposited by the\n" 1177" and <b>map</b> aggregated wire transfers to individual\n"
1121" merchant. Note that the exchange may charge\n" 1178" business transactions including the exact terms of\n"
1122" fees for the deposit operation, hence merchants\n" 1179" the contract."
1123" may impose limits restricting the set of\n"
1124" exchange operators they are willing to deal\n"
1125" with, for example by imposing a bound on\n"
1126" deposit fees."
1127msgstr "" 1180msgstr ""
1128 1181
1129#: common/base.j2:5 1182#: common/base.j2:5
@@ -1269,3 +1322,18 @@ msgstr ""
1269#~ msgid "Taler as seen by customers" 1322#~ msgid "Taler as seen by customers"
1270#~ msgstr "" 1323#~ msgstr ""
1271 1324
1325#~ msgid "Taler as seen by merchants"
1326#~ msgstr ""
1327
1328#~ msgid "Tax-friendly"
1329#~ msgstr ""
1330
1331#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
1332#~ msgstr ""
1333
1334#~ msgid "Taler complies with regulation"
1335#~ msgstr ""
1336
1337#~ msgid "Open access (PSD2)"
1338#~ msgstr ""
1339
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 6efec343..d65c9039 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
3msgstr "" 3msgstr ""
4"Project-Id-Version: PROJECT VERSION\n" 4"Project-Id-Version: PROJECT VERSION\n"
5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
6"POT-Creation-Date: 2017-03-06 23:50+0100\n" 6"POT-Creation-Date: 2017-03-07 00:44+0100\n"
7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
9"Language: es\n" 9"Language: es\n"
@@ -600,15 +600,15 @@ msgid ""
600" infrastructure." 600" infrastructure."
601msgstr "" 601msgstr ""
602 602
603#: governments.html.j2:24 index.html.j2:30 603#: governments.html.j2:23 index.html.j2:73
604msgid "Taxable" 604msgid "Taxable"
605msgstr "Imponible" 605msgstr "Imponible"
606 606
607#: governments.html.j2:26 607#: governments.html.j2:25
608msgid "" 608msgid ""
609"Taler was\n" 609"Taler was\n"
610" built with the goal of fighting corruption and supporting " 610" built with the goal of fighting corruption and supporting "
611"taxation. \n" 611"taxation.\n"
612" With Taler, the receiver of any form of payment is\n" 612" With Taler, the receiver of any form of payment is\n"
613" easily identified by the government, and the merchant\n" 613" easily identified by the government, and the merchant\n"
614" can be compelled to provide the contract that was accepted\n" 614" can be compelled to provide the contract that was accepted\n"
@@ -618,7 +618,7 @@ msgid ""
618" viable." 618" viable."
619msgstr "" 619msgstr ""
620 620
621#: governments.html.j2:36 621#: governments.html.j2:35
622msgid "" 622msgid ""
623"Thus, despite offering anonymity for citizens\n" 623"Thus, despite offering anonymity for citizens\n"
624" spending digital cash to buy goods and services,\n" 624" spending digital cash to buy goods and services,\n"
@@ -633,11 +633,11 @@ msgid ""
633" subject to monitoring." 633" subject to monitoring."
634msgstr "" 634msgstr ""
635 635
636#: governments.html.j2:49 merchants.html.j2:33 636#: governments.html.j2:48 merchants.html.j2:33
637msgid "Secure" 637msgid "Secure"
638msgstr "Seguro" 638msgstr "Seguro"
639 639
640#: governments.html.j2:51 640#: governments.html.j2:50
641msgid "" 641msgid ""
642"Taler's payments are cryptographically\n" 642"Taler's payments are cryptographically\n"
643" secured. Thus, customers, merchants and the\n" 643" secured. Thus, customers, merchants and the\n"
@@ -648,7 +648,7 @@ msgid ""
648" merchants, the exchange and the state." 648" merchants, the exchange and the state."
649msgstr "" 649msgstr ""
650 650
651#: governments.html.j2:59 651#: governments.html.j2:58
652msgid "" 652msgid ""
653"By design, the Taler payment service provider is\n" 653"By design, the Taler payment service provider is\n"
654" subject to financial regulation. Financial\n" 654" subject to financial regulation. Financial\n"
@@ -662,11 +662,11 @@ msgid ""
662" the economy due to fraud." 662" the economy due to fraud."
663msgstr "" 663msgstr ""
664 664
665#: governments.html.j2:70 index.html.j2:55 665#: governments.html.j2:72 index.html.j2:99
666msgid "Libre" 666msgid "Libre"
667msgstr "Libre" 667msgstr "Libre"
668 668
669#: governments.html.j2:72 669#: governments.html.j2:74
670msgid "" 670msgid ""
671"Taler is free software implementing an open\n" 671"Taler is free software implementing an open\n"
672" protocol standard. Thus, Taler will enable\n" 672" protocol standard. Thus, Taler will enable\n"
@@ -675,11 +675,11 @@ msgid ""
675" financial stability today." 675" financial stability today."
676msgstr "" 676msgstr ""
677 677
678#: governments.html.j2:81 678#: governments.html.j2:83
679msgid "Efficient" 679msgid "Efficient"
680msgstr "Eficiente" 680msgstr "Eficiente"
681 681
682#: governments.html.j2:83 682#: governments.html.j2:85
683msgid "" 683msgid ""
684"Taler has an efficient design. Unlike\n" 684"Taler has an efficient design. Unlike\n"
685" timeline-based payment systems, such as Bitcoin,\n" 685" timeline-based payment systems, such as Bitcoin,\n"
@@ -688,11 +688,55 @@ msgid ""
688" contribute to environmental pollution." 688" contribute to environmental pollution."
689msgstr "" 689msgstr ""
690 690
691#: governments.html.j2:92 691#: governments.html.j2:99
692msgid "Taler and regulation"
693msgstr ""
694
695#: governments.html.j2:101
696msgid "Anti-money laundering (AML)"
697msgstr ""
698
699#: governments.html.j2:102
700msgid ""
701"With Taler, income is visible and can be tied to the contract signed by "
702"both parties."
703msgstr ""
704
705#: governments.html.j2:103
706msgid "Know-your-customer (KYC)"
707msgstr ""
708
709#: governments.html.j2:104
710msgid ""
711"In Taler, payer and payee are known by their bank accounts when "
712"withdrawing or depositing coins respectively"
713msgstr ""
714
715#: governments.html.j2:105
716msgid "Privacy-by-design (GDPR)"
717msgstr ""
718
719#: governments.html.j2:106
720msgid ""
721"Taler cryptographically protects citizen's privacy, and by design "
722"implements data minimization and privacy by default."
723msgstr ""
724
725#: governments.html.j2:107
726msgid "Competitive banking (PSD2)"
727msgstr ""
728
729#: governments.html.j2:108
730msgid ""
731"Taler provides an open standard with public APIs contributing to a level "
732"playing field."
733msgstr ""
734
735#: governments.html.j2:116
692msgid "Taler as seen by governments" 736msgid "Taler as seen by governments"
693msgstr "Taler desde el punto de vista del gobierno" 737msgstr "Taler desde el punto de vista del gobierno"
694 738
695#: governments.html.j2:94 739#: governments.html.j2:118
696msgid "" 740msgid ""
697"Governments can observe traditional wire transfers\n" 741"Governments can observe traditional wire transfers\n"
698" entering and leaving the Taler system, and require\n" 742" entering and leaving the Taler system, and require\n"
@@ -704,7 +748,7 @@ msgid ""
704" available to the government includes: " 748" available to the government includes: "
705msgstr "" 749msgstr ""
706 750
707#: governments.html.j2:107 751#: governments.html.j2:131
708msgid "" 752msgid ""
709"From the banking system: The total amount of\n" 753"From the banking system: The total amount of\n"
710" digital currency obtained by a customer. The\n" 754" digital currency obtained by a customer. The\n"
@@ -713,14 +757,14 @@ msgid ""
713" given timeframe." 757" given timeframe."
714msgstr "" 758msgstr ""
715 759
716#: governments.html.j2:113 760#: governments.html.j2:137
717msgid "" 761msgid ""
718"From the banking system: The total amount of\n" 762"From the banking system: The total amount of\n"
719" income received by any merchant via the Taler\n" 763" income received by any merchant via the Taler\n"
720" system." 764" system."
721msgstr "" 765msgstr ""
722 766
723#: governments.html.j2:117 767#: governments.html.j2:141
724msgid "" 768msgid ""
725"From auditing the exchange: The amounts of\n" 769"From auditing the exchange: The amounts of\n"
726" digital coins legitimately withdrawn by\n" 770" digital coins legitimately withdrawn by\n"
@@ -732,7 +776,7 @@ msgid ""
732" the exchange from transaction fees." 776" the exchange from transaction fees."
733msgstr "" 777msgstr ""
734 778
735#: governments.html.j2:126 779#: governments.html.j2:150
736msgid "" 780msgid ""
737"From auditing merchants: For each deposit\n" 781"From auditing merchants: For each deposit\n"
738" operation, the exact details of the underlying\n" 782" operation, the exact details of the underlying\n"
@@ -766,21 +810,66 @@ msgid ""
766" " 810" "
767msgstr "" 811msgstr ""
768 812
813#: index.html.j2:30
814msgid "Practical"
815msgstr ""
816
769#: index.html.j2:33 817#: index.html.j2:33
770msgid "" 818msgid ""
771"\n" 819"\n"
772" When using Taler, merchants can't hide their income from tax\n" 820" Taler is easy to integrate with existing Web\n"
821" applications. Payments are cryptographically\n"
822" secured and are confirmed within milliseconds with\n"
823" extremely low transaction costs.\n"
824" "
825msgstr ""
826
827#: index.html.j2:43
828msgid "Stable"
829msgstr ""
830
831#: index.html.j2:46
832msgid ""
833"\n"
834" Taler does not introduce a new currency with\n"
835" fluctuation risks, and instead uses a digital\n"
836" wallet holding coins in reserve. Taler's\n"
837" cryptographic coins correspond to existing\n"
838" currencies, such as US Dollars, Euros or even\n"
839" Bitcoins.\n"
840" "
841msgstr ""
842
843#: index.html.j2:58
844msgid "Security-focused"
845msgstr ""
846
847#: index.html.j2:61
848msgid ""
849"\n"
850" By design Taler does not suffer from many classes\n"
851" of security problems such as phishing or conterfeit.\n"
852" Despite its security features, Taler never rejects a legitimate\n"
853" customer due to a fraud-detection false positive.\n"
854" "
855msgstr ""
856
857#: index.html.j2:76
858msgid ""
859"\n"
860" When using Taler, merchants cannot hide their income from tax\n"
773" collection authorities. Unlike cash and most digital currencies," 861" collection authorities. Unlike cash and most digital currencies,"
774"\n" 862"\n"
775" Taler helps preventing black markets.\n" 863" Taler helps prevent black markets. Taler is not suitable for\n"
864" illegal activities.\n"
776" " 865" "
777msgstr "" 866msgstr ""
778 867
779#: index.html.j2:42 868#: index.html.j2:86
780msgid "Privacy-friendly" 869msgid "Privacy-friendly"
781msgstr "" 870msgstr ""
782 871
783#: index.html.j2:44 872#: index.html.j2:88
784msgid "" 873msgid ""
785"\n" 874"\n"
786" When you pay with Taler, your identity does not\n" 875" When you pay with Taler, your identity does not\n"
@@ -791,7 +880,7 @@ msgid ""
791" " 880" "
792msgstr "" 881msgstr ""
793 882
794#: index.html.j2:58 883#: index.html.j2:102
795msgid "" 884msgid ""
796"\n" 885"\n"
797" Taler provides protocols and reference implementations that in\n" 886" Taler provides protocols and reference implementations that in\n"
@@ -804,55 +893,46 @@ msgid ""
804" " 893" "
805msgstr "" 894msgstr ""
806 895
807#: index.html.j2:71 896#: index.html.j2:119
808msgid "Practical" 897msgid "Paying with Taler"
809msgstr "" 898msgstr ""
810 899
811#: index.html.j2:74 900#: index.html.j2:120
812msgid "" 901msgid ""
813"\n" 902"\n"
814" Taler is easy to integrate with existing Web\n" 903" <p>To pay with Taler, customers install an electronic wallet\n"
815" applications. Payments are cryptographically\n" 904" on their device. Before the first payment, the wallet's balance must"
816" secured and are confirmed within milliseconds with\n"
817" extremely low transaction costs.\n"
818" "
819msgstr ""
820
821#: index.html.j2:84
822msgid "Stable"
823msgstr ""
824
825#: index.html.j2:87
826msgid ""
827"\n" 905"\n"
828" Taler does not introduce a new currency with\n" 906" be charged in the desired currency by some other means of "
829" fluctuation risks, and instead uses a digital\n" 907"payment.</p>\n"
830" wallet holding coins in reserve. Taler's\n" 908" <p>Once the wallet is charged, payments on websites take only one "
831" cryptographic coins correspond to existing\n" 909"click,\n"
832" currencies, such as US Dollars, Euros or even\n" 910" are never falsely rejected by fraud detection and do not post any "
833" Bitcoins.\n" 911"risk\n"
834" " 912" of phishing or identity theft.</p>\n"
913" "
835msgstr "" 914msgstr ""
836 915
837#: index.html.j2:99 916#: index.html.j2:130
838msgid "Security-focused" 917msgid "Receiving payments with Taler"
839msgstr "" 918msgstr ""
840 919
841#: index.html.j2:102 920#: index.html.j2:131
842msgid "" 921msgid ""
843"\n" 922"\n"
844" By design Taler does not suffer from many classes\n" 923" <p>To receive Taler payments, a merchant needs a bank account\n"
845" of security problems such as phishing or conterfeit.\n" 924" in the desired currency. We provide\n"
846" Despite its security features, Taler never rejects a legitimate\n" 925" SDKs in various languages to makes the integration painless.\n"
847" customer due to a fraud-detection false positive.\n" 926" The merchant's backend for Taler transaction processing can run\n"
848" " 927" on the mechant's premises or hosted.</p>\n"
928" "
849msgstr "" 929msgstr ""
850 930
851#: index.html.j2:141 931#: index.html.j2:145
852msgid "Taler News" 932msgid "Taler News"
853msgstr "" 933msgstr ""
854 934
855#: index.html.j2:145 935#: index.html.j2:149
856msgid "Financial News" 936msgid "Financial News"
857msgstr "" 937msgstr ""
858 938
@@ -1087,62 +1167,35 @@ msgid "The GNU Taler Web shop integration tutorial (Python)"
1087msgstr "" 1167msgstr ""
1088 1168
1089#: merchants.html.j2:116 1169#: merchants.html.j2:116
1090msgid "Taler as seen by merchants" 1170msgid "The GNU Taler Merchant Backend"
1091msgstr "Taler desde el punto de vista del comerciante"
1092
1093#: merchants.html.j2:118
1094msgid ""
1095"Merchants supporting the Taler system need to\n"
1096" integrate some relatively simple logic into their\n"
1097" transaction processing system. Typical steps\n"
1098" performed by the merchant system are: "
1099msgstr "" 1171msgstr ""
1100 1172
1101#: merchants.html.j2:127 1173#: merchants.html.j2:118
1102msgid "" 1174msgid "Merchants process payments using the Taler backend:"
1103"The new logic detects when a customer's system\n"
1104" supports Taler and then needs to send a\n"
1105" cryptographically signed version of the proposed\n"
1106" contract in a simple JSON format to the\n"
1107" customer. The message also includes salted,\n"
1108" hashed wire details for the merchant, as well as\n"
1109" restrictions as to which exchange operators the\n"
1110" merchant is willing to deal with."
1111msgstr "" 1175msgstr ""
1112 1176
1113#: merchants.html.j2:136 1177#: merchants.html.j2:122
1114msgid "" 1178msgid ""
1115"The customer sends a signed response which\n" 1179"The backend <b>signs</b> and <b>stores</b>\n"
1116" states that certain digital coins now belong to\n" 1180" proposals made by the merchant to customers.\n"
1117" the merchant to both signal acceptance of the\n" 1181" For this, the merchant's frontend needs to give the\n"
1118" deal as well as to pay the respective amount\n" 1182" customer's order in a JSON format to the backend."
1119" (bottom)."
1120msgstr "" 1183msgstr ""
1121 1184
1122#: merchants.html.j2:142 1185#: merchants.html.j2:127
1123msgid "" 1186msgid ""
1124"The merchant then forwards the signed messages\n" 1187"The backend <b>validates</b> and <b>executes</b>\n"
1125" received from the customer to the exchange,\n" 1188" payments received from the wallet. The frontend\n"
1126" together with its wire details and the salt\n" 1189" must pass the payment request through to the backend\n"
1127" (without hashing). The exchange verifies the\n" 1190" and checks the HTTP status code that is returned."
1128" details and sends a signed confirmation (or an\n"
1129" error message) to the merchant. The merchant\n"
1130" checks that the exchange's signature is valid,\n"
1131" sends a confirmation to the customer and\n"
1132" executes the contract-specific business\n"
1133" logic."
1134msgstr "" 1191msgstr ""
1135 1192
1136#: merchants.html.j2:153 1193#: merchants.html.j2:132
1137msgid "" 1194msgid ""
1138"The exchange performs wire transfers\n" 1195"The backend can <b>list</b> completed transactions\n"
1139" corresponding to the claims deposited by the\n" 1196" and <b>map</b> aggregated wire transfers to individual\n"
1140" merchant. Note that the exchange may charge\n" 1197" business transactions including the exact terms of\n"
1141" fees for the deposit operation, hence merchants\n" 1198" the contract."
1142" may impose limits restricting the set of\n"
1143" exchange operators they are willing to deal\n"
1144" with, for example by imposing a bound on\n"
1145" deposit fees."
1146msgstr "" 1199msgstr ""
1147 1200
1148#: common/base.j2:5 1201#: common/base.j2:5
@@ -1288,3 +1341,18 @@ msgstr ""
1288#~ msgid "Taler as seen by customers" 1341#~ msgid "Taler as seen by customers"
1289#~ msgstr "Taler visto por sus clientes" 1342#~ msgstr "Taler visto por sus clientes"
1290 1343
1344#~ msgid "Taler as seen by merchants"
1345#~ msgstr "Taler desde el punto de vista del comerciante"
1346
1347#~ msgid "Tax-friendly"
1348#~ msgstr ""
1349
1350#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
1351#~ msgstr ""
1352
1353#~ msgid "Taler complies with regulation"
1354#~ msgstr ""
1355
1356#~ msgid "Open access (PSD2)"
1357#~ msgstr ""
1358
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 3d9e0278..2ad2c2de 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
3msgstr "" 3msgstr ""
4"Project-Id-Version: PROJECT VERSION\n" 4"Project-Id-Version: PROJECT VERSION\n"
5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
6"POT-Creation-Date: 2017-03-06 23:50+0100\n" 6"POT-Creation-Date: 2017-03-07 00:44+0100\n"
7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
9"Language: fr\n" 9"Language: fr\n"
@@ -598,15 +598,15 @@ msgid ""
598" infrastructure." 598" infrastructure."
599msgstr "" 599msgstr ""
600 600
601#: governments.html.j2:24 index.html.j2:30 601#: governments.html.j2:23 index.html.j2:73
602msgid "Taxable" 602msgid "Taxable"
603msgstr "Taxable" 603msgstr "Taxable"
604 604
605#: governments.html.j2:26 605#: governments.html.j2:25
606msgid "" 606msgid ""
607"Taler was\n" 607"Taler was\n"
608" built with the goal of fighting corruption and supporting " 608" built with the goal of fighting corruption and supporting "
609"taxation. \n" 609"taxation.\n"
610" With Taler, the receiver of any form of payment is\n" 610" With Taler, the receiver of any form of payment is\n"
611" easily identified by the government, and the merchant\n" 611" easily identified by the government, and the merchant\n"
612" can be compelled to provide the contract that was accepted\n" 612" can be compelled to provide the contract that was accepted\n"
@@ -616,7 +616,7 @@ msgid ""
616" viable." 616" viable."
617msgstr "" 617msgstr ""
618 618
619#: governments.html.j2:36 619#: governments.html.j2:35
620msgid "" 620msgid ""
621"Thus, despite offering anonymity for citizens\n" 621"Thus, despite offering anonymity for citizens\n"
622" spending digital cash to buy goods and services,\n" 622" spending digital cash to buy goods and services,\n"
@@ -631,11 +631,11 @@ msgid ""
631" subject to monitoring." 631" subject to monitoring."
632msgstr "" 632msgstr ""
633 633
634#: governments.html.j2:49 merchants.html.j2:33 634#: governments.html.j2:48 merchants.html.j2:33
635msgid "Secure" 635msgid "Secure"
636msgstr "Sûr" 636msgstr "Sûr"
637 637
638#: governments.html.j2:51 638#: governments.html.j2:50
639msgid "" 639msgid ""
640"Taler's payments are cryptographically\n" 640"Taler's payments are cryptographically\n"
641" secured. Thus, customers, merchants and the\n" 641" secured. Thus, customers, merchants and the\n"
@@ -646,7 +646,7 @@ msgid ""
646" merchants, the exchange and the state." 646" merchants, the exchange and the state."
647msgstr "" 647msgstr ""
648 648
649#: governments.html.j2:59 649#: governments.html.j2:58
650msgid "" 650msgid ""
651"By design, the Taler payment service provider is\n" 651"By design, the Taler payment service provider is\n"
652" subject to financial regulation. Financial\n" 652" subject to financial regulation. Financial\n"
@@ -660,11 +660,11 @@ msgid ""
660" the economy due to fraud." 660" the economy due to fraud."
661msgstr "" 661msgstr ""
662 662
663#: governments.html.j2:70 index.html.j2:55 663#: governments.html.j2:72 index.html.j2:99
664msgid "Libre" 664msgid "Libre"
665msgstr "Libre" 665msgstr "Libre"
666 666
667#: governments.html.j2:72 667#: governments.html.j2:74
668msgid "" 668msgid ""
669"Taler is free software implementing an open\n" 669"Taler is free software implementing an open\n"
670" protocol standard. Thus, Taler will enable\n" 670" protocol standard. Thus, Taler will enable\n"
@@ -673,11 +673,11 @@ msgid ""
673" financial stability today." 673" financial stability today."
674msgstr "" 674msgstr ""
675 675
676#: governments.html.j2:81 676#: governments.html.j2:83
677msgid "Efficient" 677msgid "Efficient"
678msgstr "Efficace" 678msgstr "Efficace"
679 679
680#: governments.html.j2:83 680#: governments.html.j2:85
681msgid "" 681msgid ""
682"Taler has an efficient design. Unlike\n" 682"Taler has an efficient design. Unlike\n"
683" timeline-based payment systems, such as Bitcoin,\n" 683" timeline-based payment systems, such as Bitcoin,\n"
@@ -686,11 +686,55 @@ msgid ""
686" contribute to environmental pollution." 686" contribute to environmental pollution."
687msgstr "" 687msgstr ""
688 688
689#: governments.html.j2:92 689#: governments.html.j2:99
690msgid "Taler and regulation"
691msgstr ""
692
693#: governments.html.j2:101
694msgid "Anti-money laundering (AML)"
695msgstr ""
696
697#: governments.html.j2:102
698msgid ""
699"With Taler, income is visible and can be tied to the contract signed by "
700"both parties."
701msgstr ""
702
703#: governments.html.j2:103
704msgid "Know-your-customer (KYC)"
705msgstr ""
706
707#: governments.html.j2:104
708msgid ""
709"In Taler, payer and payee are known by their bank accounts when "
710"withdrawing or depositing coins respectively"
711msgstr ""
712
713#: governments.html.j2:105
714msgid "Privacy-by-design (GDPR)"
715msgstr ""
716
717#: governments.html.j2:106
718msgid ""
719"Taler cryptographically protects citizen's privacy, and by design "
720"implements data minimization and privacy by default."
721msgstr ""
722
723#: governments.html.j2:107
724msgid "Competitive banking (PSD2)"
725msgstr ""
726
727#: governments.html.j2:108
728msgid ""
729"Taler provides an open standard with public APIs contributing to a level "
730"playing field."
731msgstr ""
732
733#: governments.html.j2:116
690msgid "Taler as seen by governments" 734msgid "Taler as seen by governments"
691msgstr "Taler, du point de vu des gouvernements" 735msgstr "Taler, du point de vu des gouvernements"
692 736
693#: governments.html.j2:94 737#: governments.html.j2:118
694msgid "" 738msgid ""
695"Governments can observe traditional wire transfers\n" 739"Governments can observe traditional wire transfers\n"
696" entering and leaving the Taler system, and require\n" 740" entering and leaving the Taler system, and require\n"
@@ -702,7 +746,7 @@ msgid ""
702" available to the government includes: " 746" available to the government includes: "
703msgstr "" 747msgstr ""
704 748
705#: governments.html.j2:107 749#: governments.html.j2:131
706msgid "" 750msgid ""
707"From the banking system: The total amount of\n" 751"From the banking system: The total amount of\n"
708" digital currency obtained by a customer. The\n" 752" digital currency obtained by a customer. The\n"
@@ -711,14 +755,14 @@ msgid ""
711" given timeframe." 755" given timeframe."
712msgstr "" 756msgstr ""
713 757
714#: governments.html.j2:113 758#: governments.html.j2:137
715msgid "" 759msgid ""
716"From the banking system: The total amount of\n" 760"From the banking system: The total amount of\n"
717" income received by any merchant via the Taler\n" 761" income received by any merchant via the Taler\n"
718" system." 762" system."
719msgstr "" 763msgstr ""
720 764
721#: governments.html.j2:117 765#: governments.html.j2:141
722msgid "" 766msgid ""
723"From auditing the exchange: The amounts of\n" 767"From auditing the exchange: The amounts of\n"
724" digital coins legitimately withdrawn by\n" 768" digital coins legitimately withdrawn by\n"
@@ -730,7 +774,7 @@ msgid ""
730" the exchange from transaction fees." 774" the exchange from transaction fees."
731msgstr "" 775msgstr ""
732 776
733#: governments.html.j2:126 777#: governments.html.j2:150
734msgid "" 778msgid ""
735"From auditing merchants: For each deposit\n" 779"From auditing merchants: For each deposit\n"
736" operation, the exact details of the underlying\n" 780" operation, the exact details of the underlying\n"
@@ -764,21 +808,66 @@ msgid ""
764" " 808" "
765msgstr "" 809msgstr ""
766 810
811#: index.html.j2:30
812msgid "Practical"
813msgstr ""
814
767#: index.html.j2:33 815#: index.html.j2:33
768msgid "" 816msgid ""
769"\n" 817"\n"
770" When using Taler, merchants can't hide their income from tax\n" 818" Taler is easy to integrate with existing Web\n"
819" applications. Payments are cryptographically\n"
820" secured and are confirmed within milliseconds with\n"
821" extremely low transaction costs.\n"
822" "
823msgstr ""
824
825#: index.html.j2:43
826msgid "Stable"
827msgstr ""
828
829#: index.html.j2:46
830msgid ""
831"\n"
832" Taler does not introduce a new currency with\n"
833" fluctuation risks, and instead uses a digital\n"
834" wallet holding coins in reserve. Taler's\n"
835" cryptographic coins correspond to existing\n"
836" currencies, such as US Dollars, Euros or even\n"
837" Bitcoins.\n"
838" "
839msgstr ""
840
841#: index.html.j2:58
842msgid "Security-focused"
843msgstr ""
844
845#: index.html.j2:61
846msgid ""
847"\n"
848" By design Taler does not suffer from many classes\n"
849" of security problems such as phishing or conterfeit.\n"
850" Despite its security features, Taler never rejects a legitimate\n"
851" customer due to a fraud-detection false positive.\n"
852" "
853msgstr ""
854
855#: index.html.j2:76
856msgid ""
857"\n"
858" When using Taler, merchants cannot hide their income from tax\n"
771" collection authorities. Unlike cash and most digital currencies," 859" collection authorities. Unlike cash and most digital currencies,"
772"\n" 860"\n"
773" Taler helps preventing black markets.\n" 861" Taler helps prevent black markets. Taler is not suitable for\n"
862" illegal activities.\n"
774" " 863" "
775msgstr "" 864msgstr ""
776 865
777#: index.html.j2:42 866#: index.html.j2:86
778msgid "Privacy-friendly" 867msgid "Privacy-friendly"
779msgstr "" 868msgstr ""
780 869
781#: index.html.j2:44 870#: index.html.j2:88
782msgid "" 871msgid ""
783"\n" 872"\n"
784" When you pay with Taler, your identity does not\n" 873" When you pay with Taler, your identity does not\n"
@@ -789,7 +878,7 @@ msgid ""
789" " 878" "
790msgstr "" 879msgstr ""
791 880
792#: index.html.j2:58 881#: index.html.j2:102
793msgid "" 882msgid ""
794"\n" 883"\n"
795" Taler provides protocols and reference implementations that in\n" 884" Taler provides protocols and reference implementations that in\n"
@@ -802,55 +891,46 @@ msgid ""
802" " 891" "
803msgstr "" 892msgstr ""
804 893
805#: index.html.j2:71 894#: index.html.j2:119
806msgid "Practical" 895msgid "Paying with Taler"
807msgstr "" 896msgstr ""
808 897
809#: index.html.j2:74 898#: index.html.j2:120
810msgid "" 899msgid ""
811"\n" 900"\n"
812" Taler is easy to integrate with existing Web\n" 901" <p>To pay with Taler, customers install an electronic wallet\n"
813" applications. Payments are cryptographically\n" 902" on their device. Before the first payment, the wallet's balance must"
814" secured and are confirmed within milliseconds with\n"
815" extremely low transaction costs.\n"
816" "
817msgstr ""
818
819#: index.html.j2:84
820msgid "Stable"
821msgstr ""
822
823#: index.html.j2:87
824msgid ""
825"\n" 903"\n"
826" Taler does not introduce a new currency with\n" 904" be charged in the desired currency by some other means of "
827" fluctuation risks, and instead uses a digital\n" 905"payment.</p>\n"
828" wallet holding coins in reserve. Taler's\n" 906" <p>Once the wallet is charged, payments on websites take only one "
829" cryptographic coins correspond to existing\n" 907"click,\n"
830" currencies, such as US Dollars, Euros or even\n" 908" are never falsely rejected by fraud detection and do not post any "
831" Bitcoins.\n" 909"risk\n"
832" " 910" of phishing or identity theft.</p>\n"
911" "
833msgstr "" 912msgstr ""
834 913
835#: index.html.j2:99 914#: index.html.j2:130
836msgid "Security-focused" 915msgid "Receiving payments with Taler"
837msgstr "" 916msgstr ""
838 917
839#: index.html.j2:102 918#: index.html.j2:131
840msgid "" 919msgid ""
841"\n" 920"\n"
842" By design Taler does not suffer from many classes\n" 921" <p>To receive Taler payments, a merchant needs a bank account\n"
843" of security problems such as phishing or conterfeit.\n" 922" in the desired currency. We provide\n"
844" Despite its security features, Taler never rejects a legitimate\n" 923" SDKs in various languages to makes the integration painless.\n"
845" customer due to a fraud-detection false positive.\n" 924" The merchant's backend for Taler transaction processing can run\n"
846" " 925" on the mechant's premises or hosted.</p>\n"
926" "
847msgstr "" 927msgstr ""
848 928
849#: index.html.j2:141 929#: index.html.j2:145
850msgid "Taler News" 930msgid "Taler News"
851msgstr "" 931msgstr ""
852 932
853#: index.html.j2:145 933#: index.html.j2:149
854msgid "Financial News" 934msgid "Financial News"
855msgstr "" 935msgstr ""
856 936
@@ -1085,62 +1165,35 @@ msgid "The GNU Taler Web shop integration tutorial (Python)"
1085msgstr "" 1165msgstr ""
1086 1166
1087#: merchants.html.j2:116 1167#: merchants.html.j2:116
1088msgid "Taler as seen by merchants" 1168msgid "The GNU Taler Merchant Backend"
1089msgstr "Taler du poit de vu des marchants"
1090
1091#: merchants.html.j2:118
1092msgid ""
1093"Merchants supporting the Taler system need to\n"
1094" integrate some relatively simple logic into their\n"
1095" transaction processing system. Typical steps\n"
1096" performed by the merchant system are: "
1097msgstr "" 1169msgstr ""
1098 1170
1099#: merchants.html.j2:127 1171#: merchants.html.j2:118
1100msgid "" 1172msgid "Merchants process payments using the Taler backend:"
1101"The new logic detects when a customer's system\n"
1102" supports Taler and then needs to send a\n"
1103" cryptographically signed version of the proposed\n"
1104" contract in a simple JSON format to the\n"
1105" customer. The message also includes salted,\n"
1106" hashed wire details for the merchant, as well as\n"
1107" restrictions as to which exchange operators the\n"
1108" merchant is willing to deal with."
1109msgstr "" 1173msgstr ""
1110 1174
1111#: merchants.html.j2:136 1175#: merchants.html.j2:122
1112msgid "" 1176msgid ""
1113"The customer sends a signed response which\n" 1177"The backend <b>signs</b> and <b>stores</b>\n"
1114" states that certain digital coins now belong to\n" 1178" proposals made by the merchant to customers.\n"
1115" the merchant to both signal acceptance of the\n" 1179" For this, the merchant's frontend needs to give the\n"
1116" deal as well as to pay the respective amount\n" 1180" customer's order in a JSON format to the backend."
1117" (bottom)."
1118msgstr "" 1181msgstr ""
1119 1182
1120#: merchants.html.j2:142 1183#: merchants.html.j2:127
1121msgid "" 1184msgid ""
1122"The merchant then forwards the signed messages\n" 1185"The backend <b>validates</b> and <b>executes</b>\n"
1123" received from the customer to the exchange,\n" 1186" payments received from the wallet. The frontend\n"
1124" together with its wire details and the salt\n" 1187" must pass the payment request through to the backend\n"
1125" (without hashing). The exchange verifies the\n" 1188" and checks the HTTP status code that is returned."
1126" details and sends a signed confirmation (or an\n"
1127" error message) to the merchant. The merchant\n"
1128" checks that the exchange's signature is valid,\n"
1129" sends a confirmation to the customer and\n"
1130" executes the contract-specific business\n"
1131" logic."
1132msgstr "" 1189msgstr ""
1133 1190
1134#: merchants.html.j2:153 1191#: merchants.html.j2:132
1135msgid "" 1192msgid ""
1136"The exchange performs wire transfers\n" 1193"The backend can <b>list</b> completed transactions\n"
1137" corresponding to the claims deposited by the\n" 1194" and <b>map</b> aggregated wire transfers to individual\n"
1138" merchant. Note that the exchange may charge\n" 1195" business transactions including the exact terms of\n"
1139" fees for the deposit operation, hence merchants\n" 1196" the contract."
1140" may impose limits restricting the set of\n"
1141" exchange operators they are willing to deal\n"
1142" with, for example by imposing a bound on\n"
1143" deposit fees."
1144msgstr "" 1197msgstr ""
1145 1198
1146#: common/base.j2:5 1199#: common/base.j2:5
@@ -1286,3 +1339,18 @@ msgstr ""
1286#~ msgid "Taler as seen by customers" 1339#~ msgid "Taler as seen by customers"
1287#~ msgstr "Taler du point de vu des clients" 1340#~ msgstr "Taler du point de vu des clients"
1288 1341
1342#~ msgid "Taler as seen by merchants"
1343#~ msgstr "Taler du poit de vu des marchants"
1344
1345#~ msgid "Tax-friendly"
1346#~ msgstr ""
1347
1348#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
1349#~ msgstr ""
1350
1351#~ msgid "Taler complies with regulation"
1352#~ msgstr ""
1353
1354#~ msgid "Open access (PSD2)"
1355#~ msgstr ""
1356
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 3c0d60c0..3e952d61 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
3msgstr "" 3msgstr ""
4"Project-Id-Version: PROJECT VERSION\n" 4"Project-Id-Version: PROJECT VERSION\n"
5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 5"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
6"POT-Creation-Date: 2017-03-06 23:50+0100\n" 6"POT-Creation-Date: 2017-03-07 00:44+0100\n"
7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 7"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 8"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
9"Language: it\n" 9"Language: it\n"
@@ -599,15 +599,15 @@ msgid ""
599" infrastructure." 599" infrastructure."
600msgstr "" 600msgstr ""
601 601
602#: governments.html.j2:24 index.html.j2:30 602#: governments.html.j2:23 index.html.j2:73
603msgid "Taxable" 603msgid "Taxable"
604msgstr "Tassabile" 604msgstr "Tassabile"
605 605
606#: governments.html.j2:26 606#: governments.html.j2:25
607msgid "" 607msgid ""
608"Taler was\n" 608"Taler was\n"
609" built with the goal of fighting corruption and supporting " 609" built with the goal of fighting corruption and supporting "
610"taxation. \n" 610"taxation.\n"
611" With Taler, the receiver of any form of payment is\n" 611" With Taler, the receiver of any form of payment is\n"
612" easily identified by the government, and the merchant\n" 612" easily identified by the government, and the merchant\n"
613" can be compelled to provide the contract that was accepted\n" 613" can be compelled to provide the contract that was accepted\n"
@@ -617,7 +617,7 @@ msgid ""
617" viable." 617" viable."
618msgstr "" 618msgstr ""
619 619
620#: governments.html.j2:36 620#: governments.html.j2:35
621msgid "" 621msgid ""
622"Thus, despite offering anonymity for citizens\n" 622"Thus, despite offering anonymity for citizens\n"
623" spending digital cash to buy goods and services,\n" 623" spending digital cash to buy goods and services,\n"
@@ -632,11 +632,11 @@ msgid ""
632" subject to monitoring." 632" subject to monitoring."
633msgstr "" 633msgstr ""
634 634
635#: governments.html.j2:49 merchants.html.j2:33 635#: governments.html.j2:48 merchants.html.j2:33
636msgid "Secure" 636msgid "Secure"
637msgstr "Sicuro" 637msgstr "Sicuro"
638 638
639#: governments.html.j2:51 639#: governments.html.j2:50
640msgid "" 640msgid ""
641"Taler's payments are cryptographically\n" 641"Taler's payments are cryptographically\n"
642" secured. Thus, customers, merchants and the\n" 642" secured. Thus, customers, merchants and the\n"
@@ -647,7 +647,7 @@ msgid ""
647" merchants, the exchange and the state." 647" merchants, the exchange and the state."
648msgstr "" 648msgstr ""
649 649
650#: governments.html.j2:59 650#: governments.html.j2:58
651msgid "" 651msgid ""
652"By design, the Taler payment service provider is\n" 652"By design, the Taler payment service provider is\n"
653" subject to financial regulation. Financial\n" 653" subject to financial regulation. Financial\n"
@@ -661,12 +661,12 @@ msgid ""
661" the economy due to fraud." 661" the economy due to fraud."
662msgstr "" 662msgstr ""
663 663
664#: governments.html.j2:70 index.html.j2:55 664#: governments.html.j2:72 index.html.j2:99
665#, fuzzy 665#, fuzzy
666msgid "Libre" 666msgid "Libre"
667msgstr "Libero" 667msgstr "Libero"
668 668
669#: governments.html.j2:72 669#: governments.html.j2:74
670msgid "" 670msgid ""
671"Taler is free software implementing an open\n" 671"Taler is free software implementing an open\n"
672" protocol standard. Thus, Taler will enable\n" 672" protocol standard. Thus, Taler will enable\n"
@@ -675,11 +675,11 @@ msgid ""
675" financial stability today." 675" financial stability today."
676msgstr "" 676msgstr ""
677 677
678#: governments.html.j2:81 678#: governments.html.j2:83
679msgid "Efficient" 679msgid "Efficient"
680msgstr "Efficiente" 680msgstr "Efficiente"
681 681
682#: governments.html.j2:83 682#: governments.html.j2:85
683msgid "" 683msgid ""
684"Taler has an efficient design. Unlike\n" 684"Taler has an efficient design. Unlike\n"
685" timeline-based payment systems, such as Bitcoin,\n" 685" timeline-based payment systems, such as Bitcoin,\n"
@@ -688,11 +688,55 @@ msgid ""
688" contribute to environmental pollution." 688" contribute to environmental pollution."
689msgstr "" 689msgstr ""
690 690
691#: governments.html.j2:92 691#: governments.html.j2:99
692msgid "Taler and regulation"
693msgstr ""
694
695#: governments.html.j2:101
696msgid "Anti-money laundering (AML)"
697msgstr ""
698
699#: governments.html.j2:102
700msgid ""
701"With Taler, income is visible and can be tied to the contract signed by "
702"both parties."
703msgstr ""
704
705#: governments.html.j2:103
706msgid "Know-your-customer (KYC)"
707msgstr ""
708
709#: governments.html.j2:104
710msgid ""
711"In Taler, payer and payee are known by their bank accounts when "
712"withdrawing or depositing coins respectively"
713msgstr ""
714
715#: governments.html.j2:105
716msgid "Privacy-by-design (GDPR)"
717msgstr ""
718
719#: governments.html.j2:106
720msgid ""
721"Taler cryptographically protects citizen's privacy, and by design "
722"implements data minimization and privacy by default."
723msgstr ""
724
725#: governments.html.j2:107
726msgid "Competitive banking (PSD2)"
727msgstr ""
728
729#: governments.html.j2:108
730msgid ""
731"Taler provides an open standard with public APIs contributing to a level "
732"playing field."
733msgstr ""
734
735#: governments.html.j2:116
692msgid "Taler as seen by governments" 736msgid "Taler as seen by governments"
693msgstr "Taler dal punto di vista dai governi" 737msgstr "Taler dal punto di vista dai governi"
694 738
695#: governments.html.j2:94 739#: governments.html.j2:118
696msgid "" 740msgid ""
697"Governments can observe traditional wire transfers\n" 741"Governments can observe traditional wire transfers\n"
698" entering and leaving the Taler system, and require\n" 742" entering and leaving the Taler system, and require\n"
@@ -704,7 +748,7 @@ msgid ""
704" available to the government includes: " 748" available to the government includes: "
705msgstr "" 749msgstr ""
706 750
707#: governments.html.j2:107 751#: governments.html.j2:131
708msgid "" 752msgid ""
709"From the banking system: The total amount of\n" 753"From the banking system: The total amount of\n"
710" digital currency obtained by a customer. The\n" 754" digital currency obtained by a customer. The\n"
@@ -713,14 +757,14 @@ msgid ""
713" given timeframe." 757" given timeframe."
714msgstr "" 758msgstr ""
715 759
716#: governments.html.j2:113 760#: governments.html.j2:137
717msgid "" 761msgid ""
718"From the banking system: The total amount of\n" 762"From the banking system: The total amount of\n"
719" income received by any merchant via the Taler\n" 763" income received by any merchant via the Taler\n"
720" system." 764" system."
721msgstr "" 765msgstr ""
722 766
723#: governments.html.j2:117 767#: governments.html.j2:141
724msgid "" 768msgid ""
725"From auditing the exchange: The amounts of\n" 769"From auditing the exchange: The amounts of\n"
726" digital coins legitimately withdrawn by\n" 770" digital coins legitimately withdrawn by\n"
@@ -732,7 +776,7 @@ msgid ""
732" the exchange from transaction fees." 776" the exchange from transaction fees."
733msgstr "" 777msgstr ""
734 778
735#: governments.html.j2:126 779#: governments.html.j2:150
736msgid "" 780msgid ""
737"From auditing merchants: For each deposit\n" 781"From auditing merchants: For each deposit\n"
738" operation, the exact details of the underlying\n" 782" operation, the exact details of the underlying\n"
@@ -766,21 +810,66 @@ msgid ""
766" " 810" "
767msgstr "" 811msgstr ""
768 812
813#: index.html.j2:30
814msgid "Practical"
815msgstr ""
816
769#: index.html.j2:33 817#: index.html.j2:33
770msgid "" 818msgid ""
771"\n" 819"\n"
772" When using Taler, merchants can't hide their income from tax\n" 820" Taler is easy to integrate with existing Web\n"
821" applications. Payments are cryptographically\n"
822" secured and are confirmed within milliseconds with\n"
823" extremely low transaction costs.\n"
824" "
825msgstr ""
826
827#: index.html.j2:43
828msgid "Stable"
829msgstr ""
830
831#: index.html.j2:46
832msgid ""
833"\n"
834" Taler does not introduce a new currency with\n"
835" fluctuation risks, and instead uses a digital\n"
836" wallet holding coins in reserve. Taler's\n"
837" cryptographic coins correspond to existing\n"
838" currencies, such as US Dollars, Euros or even\n"
839" Bitcoins.\n"
840" "
841msgstr ""
842
843#: index.html.j2:58
844msgid "Security-focused"
845msgstr ""
846
847#: index.html.j2:61
848msgid ""
849"\n"
850" By design Taler does not suffer from many classes\n"
851" of security problems such as phishing or conterfeit.\n"
852" Despite its security features, Taler never rejects a legitimate\n"
853" customer due to a fraud-detection false positive.\n"
854" "
855msgstr ""
856
857#: index.html.j2:76
858msgid ""
859"\n"
860" When using Taler, merchants cannot hide their income from tax\n"
773" collection authorities. Unlike cash and most digital currencies," 861" collection authorities. Unlike cash and most digital currencies,"
774"\n" 862"\n"
775" Taler helps preventing black markets.\n" 863" Taler helps prevent black markets. Taler is not suitable for\n"
864" illegal activities.\n"
776" " 865" "
777msgstr "" 866msgstr ""
778 867
779#: index.html.j2:42 868#: index.html.j2:86
780msgid "Privacy-friendly" 869msgid "Privacy-friendly"
781msgstr "" 870msgstr ""
782 871
783#: index.html.j2:44 872#: index.html.j2:88
784msgid "" 873msgid ""
785"\n" 874"\n"
786" When you pay with Taler, your identity does not\n" 875" When you pay with Taler, your identity does not\n"
@@ -791,7 +880,7 @@ msgid ""
791" " 880" "
792msgstr "" 881msgstr ""
793 882
794#: index.html.j2:58 883#: index.html.j2:102
795msgid "" 884msgid ""
796"\n" 885"\n"
797" Taler provides protocols and reference implementations that in\n" 886" Taler provides protocols and reference implementations that in\n"
@@ -804,55 +893,46 @@ msgid ""
804" " 893" "
805msgstr "" 894msgstr ""
806 895
807#: index.html.j2:71 896#: index.html.j2:119
808msgid "Practical" 897msgid "Paying with Taler"
809msgstr "" 898msgstr ""
810 899
811#: index.html.j2:74 900#: index.html.j2:120
812msgid "" 901msgid ""
813"\n" 902"\n"
814" Taler is easy to integrate with existing Web\n" 903" <p>To pay with Taler, customers install an electronic wallet\n"
815" applications. Payments are cryptographically\n" 904" on their device. Before the first payment, the wallet's balance must"
816" secured and are confirmed within milliseconds with\n"
817" extremely low transaction costs.\n"
818" "
819msgstr ""
820
821#: index.html.j2:84
822msgid "Stable"
823msgstr ""
824
825#: index.html.j2:87
826msgid ""
827"\n" 905"\n"
828" Taler does not introduce a new currency with\n" 906" be charged in the desired currency by some other means of "
829" fluctuation risks, and instead uses a digital\n" 907"payment.</p>\n"
830" wallet holding coins in reserve. Taler's\n" 908" <p>Once the wallet is charged, payments on websites take only one "
831" cryptographic coins correspond to existing\n" 909"click,\n"
832" currencies, such as US Dollars, Euros or even\n" 910" are never falsely rejected by fraud detection and do not post any "
833" Bitcoins.\n" 911"risk\n"
834" " 912" of phishing or identity theft.</p>\n"
913" "
835msgstr "" 914msgstr ""
836 915
837#: index.html.j2:99 916#: index.html.j2:130
838msgid "Security-focused" 917msgid "Receiving payments with Taler"
839msgstr "" 918msgstr ""
840 919
841#: index.html.j2:102 920#: index.html.j2:131
842msgid "" 921msgid ""
843"\n" 922"\n"
844" By design Taler does not suffer from many classes\n" 923" <p>To receive Taler payments, a merchant needs a bank account\n"
845" of security problems such as phishing or conterfeit.\n" 924" in the desired currency. We provide\n"
846" Despite its security features, Taler never rejects a legitimate\n" 925" SDKs in various languages to makes the integration painless.\n"
847" customer due to a fraud-detection false positive.\n" 926" The merchant's backend for Taler transaction processing can run\n"
848" " 927" on the mechant's premises or hosted.</p>\n"
928" "
849msgstr "" 929msgstr ""
850 930
851#: index.html.j2:141 931#: index.html.j2:145
852msgid "Taler News" 932msgid "Taler News"
853msgstr "" 933msgstr ""
854 934
855#: index.html.j2:145 935#: index.html.j2:149
856msgid "Financial News" 936msgid "Financial News"
857msgstr "" 937msgstr ""
858 938
@@ -1089,62 +1169,35 @@ msgid "The GNU Taler Web shop integration tutorial (Python)"
1089msgstr "" 1169msgstr ""
1090 1170
1091#: merchants.html.j2:116 1171#: merchants.html.j2:116
1092msgid "Taler as seen by merchants" 1172msgid "The GNU Taler Merchant Backend"
1093msgstr "Come i negozianti vedono Taler"
1094
1095#: merchants.html.j2:118
1096msgid ""
1097"Merchants supporting the Taler system need to\n"
1098" integrate some relatively simple logic into their\n"
1099" transaction processing system. Typical steps\n"
1100" performed by the merchant system are: "
1101msgstr "" 1173msgstr ""
1102 1174
1103#: merchants.html.j2:127 1175#: merchants.html.j2:118
1104msgid "" 1176msgid "Merchants process payments using the Taler backend:"
1105"The new logic detects when a customer's system\n"
1106" supports Taler and then needs to send a\n"
1107" cryptographically signed version of the proposed\n"
1108" contract in a simple JSON format to the\n"
1109" customer. The message also includes salted,\n"
1110" hashed wire details for the merchant, as well as\n"
1111" restrictions as to which exchange operators the\n"
1112" merchant is willing to deal with."
1113msgstr "" 1177msgstr ""
1114 1178
1115#: merchants.html.j2:136 1179#: merchants.html.j2:122
1116msgid "" 1180msgid ""
1117"The customer sends a signed response which\n" 1181"The backend <b>signs</b> and <b>stores</b>\n"
1118" states that certain digital coins now belong to\n" 1182" proposals made by the merchant to customers.\n"
1119" the merchant to both signal acceptance of the\n" 1183" For this, the merchant's frontend needs to give the\n"
1120" deal as well as to pay the respective amount\n" 1184" customer's order in a JSON format to the backend."
1121" (bottom)."
1122msgstr "" 1185msgstr ""
1123 1186
1124#: merchants.html.j2:142 1187#: merchants.html.j2:127
1125msgid "" 1188msgid ""
1126"The merchant then forwards the signed messages\n" 1189"The backend <b>validates</b> and <b>executes</b>\n"
1127" received from the customer to the exchange,\n" 1190" payments received from the wallet. The frontend\n"
1128" together with its wire details and the salt\n" 1191" must pass the payment request through to the backend\n"
1129" (without hashing). The exchange verifies the\n" 1192" and checks the HTTP status code that is returned."
1130" details and sends a signed confirmation (or an\n"
1131" error message) to the merchant. The merchant\n"
1132" checks that the exchange's signature is valid,\n"
1133" sends a confirmation to the customer and\n"
1134" executes the contract-specific business\n"
1135" logic."
1136msgstr "" 1193msgstr ""
1137 1194
1138#: merchants.html.j2:153 1195#: merchants.html.j2:132
1139msgid "" 1196msgid ""
1140"The exchange performs wire transfers\n" 1197"The backend can <b>list</b> completed transactions\n"
1141" corresponding to the claims deposited by the\n" 1198" and <b>map</b> aggregated wire transfers to individual\n"
1142" merchant. Note that the exchange may charge\n" 1199" business transactions including the exact terms of\n"
1143" fees for the deposit operation, hence merchants\n" 1200" the contract."
1144" may impose limits restricting the set of\n"
1145" exchange operators they are willing to deal\n"
1146" with, for example by imposing a bound on\n"
1147" deposit fees."
1148msgstr "" 1201msgstr ""
1149 1202
1150#: common/base.j2:5 1203#: common/base.j2:5
@@ -1290,3 +1343,18 @@ msgstr ""
1290#~ msgid "Taler as seen by customers" 1343#~ msgid "Taler as seen by customers"
1291#~ msgstr "Come i clienti vedono Taler" 1344#~ msgstr "Come i clienti vedono Taler"
1292 1345
1346#~ msgid "Taler as seen by merchants"
1347#~ msgstr "Come i negozianti vedono Taler"
1348
1349#~ msgid "Tax-friendly"
1350#~ msgstr ""
1351
1352#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
1353#~ msgstr ""
1354
1355#~ msgid "Taler complies with regulation"
1356#~ msgstr ""
1357
1358#~ msgid "Open access (PSD2)"
1359#~ msgstr ""
1360
diff --git a/merchants.html.j2 b/merchants.html.j2
index 956a9407..9e94f5a9 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -12,10 +12,10 @@
12 </div> 12 </div>
13</div> 13</div>
14 14
15<div class="container"> 15<div class="container adorn_h3_bracket">
16 <div class="row"> 16 <div class="row">
17 <div class="col-lg-4"> 17 <div class="col-lg-4">
18 <h2>{{ _("Fast") }}</h2> 18 <h3>{{ _("Fast") }}</h3>
19 19
20 <p>{{ _("Processing transactions with Taler is fast, 20 <p>{{ _("Processing transactions with Taler is fast,
21 allowing you to confirm the transaction with your 21 allowing you to confirm the transaction with your
@@ -30,7 +30,7 @@
30 30
31 </div> 31 </div>
32 <div class="col-lg-4"> 32 <div class="col-lg-4">
33 <h2>{{ _("Secure") }}</h2> 33 <h3>{{ _("Secure") }}</h3>
34 34
35 <p>{{ _("You will have cryptographic proof of payment from 35 <p>{{ _("You will have cryptographic proof of payment from
36 the Taler payment service provider. Taler does not 36 the Taler payment service provider. Taler does not
@@ -44,7 +44,7 @@
44 44
45 </div> 45 </div>
46 <div class="col-lg-4"> 46 <div class="col-lg-4">
47 <h2>{{ _("Free Software") }}</h2> 47 <h3>{{ _("Free Software") }}</h3>
48 48
49 <p>{{ _("Taler is free software, and you can use the 49 <p>{{ _("Taler is free software, and you can use the
50 liberally-licensed reference code as a starting 50 liberally-licensed reference code as a starting
@@ -58,7 +58,7 @@
58 </div> 58 </div>
59 <div class="row"> 59 <div class="row">
60 <div class="col-lg-4"> 60 <div class="col-lg-4">
61 <h2>{{ _("Low Fees") }}</h2> 61 <h3>{{ _("Low Fees") }}</h3>
62 62
63 <p>{{ _("Taler is designed to minimize the work the exchange 63 <p>{{ _("Taler is designed to minimize the work the exchange
64 needs to perform. Combined with Taler's strong 64 needs to perform. Combined with Taler's strong
@@ -68,7 +68,7 @@
68 68
69 </div> 69 </div>
70 <div class="col-lg-4"> 70 <div class="col-lg-4">
71 <h2>{{ _("Flexible") }}</h2> 71 <h3>{{ _("Flexible") }}</h3>
72 72
73 <p>{{ _("Taler can be used for different currencies (such as 73 <p>{{ _("Taler can be used for different currencies (such as
74 Euros, US Dollars or Bitcoins) and different 74 Euros, US Dollars or Bitcoins) and different
@@ -78,7 +78,7 @@
78 78
79 </div> 79 </div>
80 <div class="col-lg-4"> 80 <div class="col-lg-4">
81 <h2>{{ _("Ethical") }}</h2> 81 <h3>{{ _("Ethical") }}</h3>
82 82
83 <p>{{ _("Taler prevents tax evasion and money laundering. 83 <p>{{ _("Taler prevents tax evasion and money laundering.
84 Taler's protocols are efficient and do not waste 84 Taler's protocols are efficient and do not waste
@@ -112,54 +112,33 @@
112 112
113<div class="container"> 113<div class="container">
114 114
115 <div class="col-lg-12"> 115 <div class="col-lg-6">
116 <h2 id="overview">{{ _("Taler as seen by merchants") }}</h2> 116 <h2 id="overview">{{ _("The GNU Taler Merchant Backend") }}</h2>
117
118 <p>{{ _("Merchants supporting the Taler system need to
119 integrate some relatively simple logic into their
120 transaction processing system. Typical steps
121 performed by the merchant system are: ") }}</p>
122 117
118 <p>{{ _("Merchants process payments using the Taler backend:") }}</p>
123 <p> 119 <p>
124 <img src="{{ url('images/merchant.svg') }}" alt="merchant perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> 120 <ul>
125 <ol> 121
126 122 <li>{{ _("The backend <b>signs</b> and <b>stores</b>
127 <li>{{ _("The new logic detects when a customer's system 123 proposals made by the merchant to customers.
128 supports Taler and then needs to send a 124 For this, the merchant's frontend needs to give the
129 cryptographically signed version of the proposed 125 customer's order in a JSON format to the backend.") }}</li>
130 contract in a simple JSON format to the 126
131 customer. The message also includes salted, 127 <li>{{ _("The backend <b>validates</b> and <b>executes</b>
132 hashed wire details for the merchant, as well as 128 payments received from the wallet. The frontend
133 restrictions as to which exchange operators the 129 must pass the payment request through to the backend
134 merchant is willing to deal with.") }}</li> 130 and checks the HTTP status code that is returned.") }}</li>
135 131
136 <li>{{ _("The customer sends a signed response which 132 <li>{{ _("The backend can <b>list</b> completed transactions
137 states that certain digital coins now belong to 133 and <b>map</b> aggregated wire transfers to individual
138 the merchant to both signal acceptance of the 134 business transactions including the exact terms of
139 deal as well as to pay the respective amount 135 the contract.") }} </li>
140 (bottom).") }}</li> 136
141 137 </ul>
142 <li>{{ _("The merchant then forwards the signed messages
143 received from the customer to the exchange,
144 together with its wire details and the salt
145 (without hashing). The exchange verifies the
146 details and sends a signed confirmation (or an
147 error message) to the merchant. The merchant
148 checks that the exchange's signature is valid,
149 sends a confirmation to the customer and
150 executes the contract-specific business
151 logic.") }}</li>
152
153 <li>{{ _("The exchange performs wire transfers
154 corresponding to the claims deposited by the
155 merchant. Note that the exchange may charge
156 fees for the deposit operation, hence merchants
157 may impose limits restricting the set of
158 exchange operators they are willing to deal
159 with, for example by imposing a bound on
160 deposit fees.") }}</li>
161 </ol>
162 </p> 138 </p>
163 </div> 139 </div>
140 <div class="col-lg-6">
141 <img src="{{ url('images/backend.svg') }}" alt="customer perspective" style="float: right; margin: 5px 5px 5px 5px;" width="100%">
142 </div>
164</div> <!-- /container --> 143</div> <!-- /container -->
165{% endblock body_content %} 144{% endblock body_content %}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 03:57:58 +0000