[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch master updated: fix misc typos
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-www] branch master updated: fix misc typos |
Date: |
Wed, 08 Mar 2017 10:09:03 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new e0d2502 fix misc typos
e0d2502 is described below
commit e0d2502d80181606428978da8705efd2a4db24b7
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Mar 8 10:09:01 2017 +0100
fix misc typos
---
citizens.html.j2 | 4 ++--
developers.html.j2 | 2 +-
faq.html.j2 | 8 ++++----
governments.html.j2 | 6 +++---
index.html.j2 | 6 +++---
investors.html.j2 | 8 ++++----
merchants.html.j2 | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/citizens.html.j2 b/citizens.html.j2
index cf8a8cf..024bdc4 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -65,14 +65,14 @@
Taler is not a crypto-currency, so you do not have
to worry about cryto-currency related value
fluctuations. Banking with Taler is subject to the
- usual government protections for finanical
+ usual government protections for financial
services.") }}</p>
</div>
</div>
</div>
-<div class="contianer-fluid c_acronym">
+<div class="container-fluid c_acronym">
<div class="container">
<div class="row">
<div class="col-lg-6">
diff --git a/developers.html.j2 b/developers.html.j2
index 1d795eb..e3725df 100644
--- a/developers.html.j2
+++ b/developers.html.j2
@@ -53,7 +53,7 @@
</div>
</div>
-<div class="contianer-fluid c_acronym">
+<div class="container-fluid c_acronym">
<div class="container">
<div class="row">
<div class="col-lg-4">
diff --git a/faq.html.j2 b/faq.html.j2
index 28f37a1..f548a14 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
based on proof-of-work or any other distributed consensus mechanism. Instead
Taler is based on blind signatures.</p>
-<p>It would be possible, however, to withdraw Bitcoins into a Taler wallet
(with an approproate exchange),
-which would give some benefits ofer plain Bitcoin, such as instant
confirmation times.</p>
+<p>It would be possible, however, to withdraw Bitcoins into a Taler wallet
(with an appropriate exchange),
+which would give some benefits over plain Bitcoin, such as instant
confirmation times.</p>
<h2>Where is the balance in my wallet stored?</h2>
<p>Your wallet stores tokens that are blindly signed by an exchange.
@@ -34,10 +34,10 @@ and requires trust between the sharing parties.</p>
they can easily set up a Taler merchant and receive the payment on their bank
account.</p>
<h2>How does Taler handle payments in different currencies?</h2>
-<p>Taler wallets can store digital coins corresponding to multiple diffent
+<p>Taler wallets can store digital coins corresponding to multiple different
currencies such as the Euro, US Dollars or even Bitcoins.</p>
-<p>Automatic currency converstion is currently not our focus, but could be made
+<p>Automatic currency conversion is currently not our focus, but could be made
available in the future, either with exchanges that handle multiple
currencies, or other means of multi-currency payment routing.</p>
diff --git a/governments.html.j2 b/governments.html.j2
index a0a7eb0..ec46cf2 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -11,7 +11,7 @@
based on open standards and free software. Taler
needs governments to set a financial framework and
to act as trusted regulators. Taler contributes to
- digital sovereignty in the critial financial
+ digital sovereignty in the critical financial
infrastructure.") }}</p>
</div>
</div>
@@ -94,7 +94,7 @@
-<div class="contianer-fluid c_acronym">
+<div class="container-fluid c_acronym">
<div class="container">
<h2 id="documentation">{{ _("Taler and regulation") }}</h2>
<dl>
@@ -123,7 +123,7 @@
<li>{{ _("The total amount of digital currency withdrawn by a
customer. The government can impose limits on how much
digital cash a customer can withdraw within a
- given timeframe.") }}</li>
+ given time frame.") }}</li>
<li>{{ _("The income received by any merchant via the Taler
system.") }}</li>
diff --git a/index.html.j2 b/index.html.j2
index f1e769b..aa171dc 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -56,7 +56,7 @@
<p>
{% trans %}
By design Taler does not suffer from many classes
- of security problems such as phishing or conterfeit.
+ of security problems such as phishing or counterfeit.
Despite its security features, Taler never rejects a legitimate
customer due to a fraud-detection false positive.
{% endtrans %}
@@ -108,7 +108,7 @@
</div>
</div>
-<div class="contianer-fluid c_acronym">
+<div class="container-fluid c_acronym">
<div class="container">
<div class="row">
<div class="col-lg-6">
@@ -129,7 +129,7 @@
in the desired currency. We provide
SDKs in various languages to makes the integration painless.
The merchant's backend for Taler transaction processing can run
- on the mechant's premises or hosted.</p>
+ on the merchant's premises or hosted.</p>
{% endtrans %}
</div>
</div>
diff --git a/investors.html.j2 b/investors.html.j2
index f9c38c7..31e0e97 100644
--- a/investors.html.j2
+++ b/investors.html.j2
@@ -8,7 +8,7 @@
<p>
{% trans %}
We have created a company, Taler Systems SA in
- Luxemburg.<br>
+ Luxembourg.<br>
Please contact <tt>address@hidden</tt>
if you want to invest in Taler.
{% endtrans %}
@@ -27,7 +27,7 @@
{% trans %}
Our <a href="about.html">team</a> combines world-class business
leaders,
cryptographers, software engineers, civil-rights
- activits and academics. We are unified by a vision
+ activists and academics. We are unified by a vision
of how payments should work and the goal of
imposing this vision upon the world.
{% endtrans %}
@@ -66,7 +66,7 @@
{% trans %}
The scalable business model for Taler is the operation
of the payment service provider, which converts money from
- traditional payment systems (Mastercard, SEPA,
+ traditional payment systems (MasterCard, SEPA,
Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous
electronic coins in the same currency. The customer
can then redeem the electronic coins at a merchant,
@@ -80,7 +80,7 @@
</div>
-<div class="contianer-fluid c_acronym">
+<div class="container-fluid c_acronym">
<div class="container">
<h2>{{ _("The Business Case") }}</h2>
<div class="row">
diff --git a/merchants.html.j2 b/merchants.html.j2
index 9e94f5a..f5c9b42 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -38,7 +38,7 @@
audits (such as PCI DSS), processes or procedures,
as you never handle sensitive customer account
information. Your systems will have customer
- contracts wih qualified signatures for all
+ contracts with qualified signatures for all
transactions which you can use in court in case of
disputes.") }}</p>
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-www] branch master updated: fix misc typos,
gnunet <=