diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-08 10:09:01 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-08 10:09:01 +0100 |
commit | e0d2502d80181606428978da8705efd2a4db24b7 (patch) | |
tree | 79fcadab3ea56bf21f20be395ecf439954cb1986 | |
parent | 392c16334da891a1d933b3c0da6073cc3f92ef72 (diff) | |
download | www-e0d2502d80181606428978da8705efd2a4db24b7.tar.gz www-e0d2502d80181606428978da8705efd2a4db24b7.zip |
fix misc typos
-rw-r--r-- | citizens.html.j2 | 4 | ||||
-rw-r--r-- | developers.html.j2 | 2 | ||||
-rw-r--r-- | faq.html.j2 | 8 | ||||
-rw-r--r-- | governments.html.j2 | 6 | ||||
-rw-r--r-- | index.html.j2 | 6 | ||||
-rw-r--r-- | investors.html.j2 | 8 | ||||
-rw-r--r-- | merchants.html.j2 | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/citizens.html.j2 b/citizens.html.j2 index cf8a8cfa..024bdc41 100644 --- a/citizens.html.j2 +++ b/citizens.html.j2 | |||
@@ -65,14 +65,14 @@ | |||
65 | Taler is not a crypto-currency, so you do not have | 65 | Taler is not a crypto-currency, so you do not have |
66 | to worry about cryto-currency related value | 66 | to worry about cryto-currency related value |
67 | fluctuations. Banking with Taler is subject to the | 67 | fluctuations. Banking with Taler is subject to the |
68 | usual government protections for finanical | 68 | usual government protections for financial |
69 | services.") }}</p> | 69 | services.") }}</p> |
70 | 70 | ||
71 | </div> | 71 | </div> |
72 | </div> | 72 | </div> |
73 | </div> | 73 | </div> |
74 | 74 | ||
75 | <div class="contianer-fluid c_acronym"> | 75 | <div class="container-fluid c_acronym"> |
76 | <div class="container"> | 76 | <div class="container"> |
77 | <div class="row"> | 77 | <div class="row"> |
78 | <div class="col-lg-6"> | 78 | <div class="col-lg-6"> |
diff --git a/developers.html.j2 b/developers.html.j2 index 1d795ebd..e3725df4 100644 --- a/developers.html.j2 +++ b/developers.html.j2 | |||
@@ -53,7 +53,7 @@ | |||
53 | </div> | 53 | </div> |
54 | </div> | 54 | </div> |
55 | 55 | ||
56 | <div class="contianer-fluid c_acronym"> | 56 | <div class="container-fluid c_acronym"> |
57 | <div class="container"> | 57 | <div class="container"> |
58 | <div class="row"> | 58 | <div class="row"> |
59 | <div class="col-lg-4"> | 59 | <div class="col-lg-4"> |
diff --git a/faq.html.j2 b/faq.html.j2 index 28f37a15..f548a143 100644 --- a/faq.html.j2 +++ b/faq.html.j2 | |||
@@ -7,8 +7,8 @@ Taler does not use any Blockchain technology or Bitcoin directly. Taler is not | |||
7 | based on proof-of-work or any other distributed consensus mechanism. Instead | 7 | based on proof-of-work or any other distributed consensus mechanism. Instead |
8 | Taler is based on blind signatures.</p> | 8 | Taler is based on blind signatures.</p> |
9 | 9 | ||
10 | <p>It would be possible, however, to withdraw Bitcoins into a Taler wallet (with an approproate exchange), | 10 | <p>It would be possible, however, to withdraw Bitcoins into a Taler wallet (with an appropriate exchange), |
11 | which would give some benefits ofer plain Bitcoin, such as instant confirmation times.</p> | 11 | which would give some benefits over plain Bitcoin, such as instant confirmation times.</p> |
12 | 12 | ||
13 | <h2>Where is the balance in my wallet stored?</h2> | 13 | <h2>Where is the balance in my wallet stored?</h2> |
14 | <p>Your wallet stores tokens that are blindly signed by an exchange. | 14 | <p>Your wallet stores tokens that are blindly signed by an exchange. |
@@ -34,10 +34,10 @@ and requires trust between the sharing parties.</p> | |||
34 | they can easily set up a Taler merchant and receive the payment on their bank account.</p> | 34 | they can easily set up a Taler merchant and receive the payment on their bank account.</p> |
35 | 35 | ||
36 | <h2>How does Taler handle payments in different currencies?</h2> | 36 | <h2>How does Taler handle payments in different currencies?</h2> |
37 | <p>Taler wallets can store digital coins corresponding to multiple diffent | 37 | <p>Taler wallets can store digital coins corresponding to multiple different |
38 | currencies such as the Euro, US Dollars or even Bitcoins.</p> | 38 | currencies such as the Euro, US Dollars or even Bitcoins.</p> |
39 | 39 | ||
40 | <p>Automatic currency converstion is currently not our focus, but could be made | 40 | <p>Automatic currency conversion is currently not our focus, but could be made |
41 | available in the future, either with exchanges that handle multiple | 41 | available in the future, either with exchanges that handle multiple |
42 | currencies, or other means of multi-currency payment routing.</p> | 42 | currencies, or other means of multi-currency payment routing.</p> |
43 | 43 | ||
diff --git a/governments.html.j2 b/governments.html.j2 index a0a7eb06..ec46cf2f 100644 --- a/governments.html.j2 +++ b/governments.html.j2 | |||
@@ -11,7 +11,7 @@ | |||
11 | based on open standards and free software. Taler | 11 | based on open standards and free software. Taler |
12 | needs governments to set a financial framework and | 12 | needs governments to set a financial framework and |
13 | to act as trusted regulators. Taler contributes to | 13 | to act as trusted regulators. Taler contributes to |
14 | digital sovereignty in the critial financial | 14 | digital sovereignty in the critical financial |
15 | infrastructure.") }}</p> | 15 | infrastructure.") }}</p> |
16 | </div> | 16 | </div> |
17 | </div> | 17 | </div> |
@@ -94,7 +94,7 @@ | |||
94 | 94 | ||
95 | 95 | ||
96 | 96 | ||
97 | <div class="contianer-fluid c_acronym"> | 97 | <div class="container-fluid c_acronym"> |
98 | <div class="container"> | 98 | <div class="container"> |
99 | <h2 id="documentation">{{ _("Taler and regulation") }}</h2> | 99 | <h2 id="documentation">{{ _("Taler and regulation") }}</h2> |
100 | <dl> | 100 | <dl> |
@@ -123,7 +123,7 @@ | |||
123 | <li>{{ _("The total amount of digital currency withdrawn by a | 123 | <li>{{ _("The total amount of digital currency withdrawn by a |
124 | customer. The government can impose limits on how much | 124 | customer. The government can impose limits on how much |
125 | digital cash a customer can withdraw within a | 125 | digital cash a customer can withdraw within a |
126 | given timeframe.") }}</li> | 126 | given time frame.") }}</li> |
127 | 127 | ||
128 | <li>{{ _("The income received by any merchant via the Taler | 128 | <li>{{ _("The income received by any merchant via the Taler |
129 | system.") }}</li> | 129 | system.") }}</li> |
diff --git a/index.html.j2 b/index.html.j2 index f1e769bb..aa171dce 100644 --- a/index.html.j2 +++ b/index.html.j2 | |||
@@ -56,7 +56,7 @@ | |||
56 | <p> | 56 | <p> |
57 | {% trans %} | 57 | {% trans %} |
58 | By design Taler does not suffer from many classes | 58 | By design Taler does not suffer from many classes |
59 | of security problems such as phishing or conterfeit. | 59 | of security problems such as phishing or counterfeit. |
60 | Despite its security features, Taler never rejects a legitimate | 60 | Despite its security features, Taler never rejects a legitimate |
61 | customer due to a fraud-detection false positive. | 61 | customer due to a fraud-detection false positive. |
62 | {% endtrans %} | 62 | {% endtrans %} |
@@ -108,7 +108,7 @@ | |||
108 | </div> | 108 | </div> |
109 | </div> | 109 | </div> |
110 | 110 | ||
111 | <div class="contianer-fluid c_acronym"> | 111 | <div class="container-fluid c_acronym"> |
112 | <div class="container"> | 112 | <div class="container"> |
113 | <div class="row"> | 113 | <div class="row"> |
114 | <div class="col-lg-6"> | 114 | <div class="col-lg-6"> |
@@ -129,7 +129,7 @@ | |||
129 | in the desired currency. We provide | 129 | in the desired currency. We provide |
130 | SDKs in various languages to makes the integration painless. | 130 | SDKs in various languages to makes the integration painless. |
131 | The merchant's backend for Taler transaction processing can run | 131 | The merchant's backend for Taler transaction processing can run |
132 | on the mechant's premises or hosted.</p> | 132 | on the merchant's premises or hosted.</p> |
133 | {% endtrans %} | 133 | {% endtrans %} |
134 | </div> | 134 | </div> |
135 | </div> | 135 | </div> |
diff --git a/investors.html.j2 b/investors.html.j2 index f9c38c7f..31e0e979 100644 --- a/investors.html.j2 +++ b/investors.html.j2 | |||
@@ -8,7 +8,7 @@ | |||
8 | <p> | 8 | <p> |
9 | {% trans %} | 9 | {% trans %} |
10 | We have created a company, Taler Systems SA in | 10 | We have created a company, Taler Systems SA in |
11 | Luxemburg.<br> | 11 | Luxembourg.<br> |
12 | Please contact <tt>invest@taler.net</tt> | 12 | Please contact <tt>invest@taler.net</tt> |
13 | if you want to invest in Taler. | 13 | if you want to invest in Taler. |
14 | {% endtrans %} | 14 | {% endtrans %} |
@@ -27,7 +27,7 @@ | |||
27 | {% trans %} | 27 | {% trans %} |
28 | Our <a href="about.html">team</a> combines world-class business leaders, | 28 | Our <a href="about.html">team</a> combines world-class business leaders, |
29 | cryptographers, software engineers, civil-rights | 29 | cryptographers, software engineers, civil-rights |
30 | activits and academics. We are unified by a vision | 30 | activists and academics. We are unified by a vision |
31 | of how payments should work and the goal of | 31 | of how payments should work and the goal of |
32 | imposing this vision upon the world. | 32 | imposing this vision upon the world. |
33 | {% endtrans %} | 33 | {% endtrans %} |
@@ -66,7 +66,7 @@ | |||
66 | {% trans %} | 66 | {% trans %} |
67 | The scalable business model for Taler is the operation | 67 | The scalable business model for Taler is the operation |
68 | of the payment service provider, which converts money from | 68 | of the payment service provider, which converts money from |
69 | traditional payment systems (Mastercard, SEPA, | 69 | traditional payment systems (MasterCard, SEPA, |
70 | Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous | 70 | Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous |
71 | electronic coins in the same currency. The customer | 71 | electronic coins in the same currency. The customer |
72 | can then redeem the electronic coins at a merchant, | 72 | can then redeem the electronic coins at a merchant, |
@@ -80,7 +80,7 @@ | |||
80 | </div> | 80 | </div> |
81 | 81 | ||
82 | 82 | ||
83 | <div class="contianer-fluid c_acronym"> | 83 | <div class="container-fluid c_acronym"> |
84 | <div class="container"> | 84 | <div class="container"> |
85 | <h2>{{ _("The Business Case") }}</h2> | 85 | <h2>{{ _("The Business Case") }}</h2> |
86 | <div class="row"> | 86 | <div class="row"> |
diff --git a/merchants.html.j2 b/merchants.html.j2 index 9e94f5a9..f5c9b422 100644 --- a/merchants.html.j2 +++ b/merchants.html.j2 | |||
@@ -38,7 +38,7 @@ | |||
38 | audits (such as PCI DSS), processes or procedures, | 38 | audits (such as PCI DSS), processes or procedures, |
39 | as you never handle sensitive customer account | 39 | as you never handle sensitive customer account |
40 | information. Your systems will have customer | 40 | information. Your systems will have customer |
41 | contracts wih qualified signatures for all | 41 | contracts with qualified signatures for all |
42 | transactions which you can use in court in case of | 42 | transactions which you can use in court in case of |
43 | disputes.") }}</p> | 43 | disputes.") }}</p> |
44 | 44 | ||