summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-01-29 18:13:17 +0100
committerChristian Grothoff <christian@grothoff.org>2018-01-29 18:13:17 +0100
commitb1f33b6377c77713196b4914577ee40912f7984a (patch)
tree0a256fea32a88f2a0b68aab632102a919db915d2
parente6b0e232fbbf69583c5f98edab06a449afbe37d2 (diff)
downloadwww-b1f33b6377c77713196b4914577ee40912f7984a.tar.gz
www-b1f33b6377c77713196b4914577ee40912f7984a.tar.bz2
www-b1f33b6377c77713196b4914577ee40912f7984a.zip
fix #5263
-rw-r--r--citizens.html.j22
-rw-r--r--glossary.html.j22
-rw-r--r--merchants.html.j22
m---------web-common0
4 files changed, 3 insertions, 3 deletions
diff --git a/citizens.html.j2 b/citizens.html.j2
index 2d5b677..4b6a175 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -63,7 +63,7 @@
<p>{{ _("Coins in your digital wallet will be of the same
denomination as the cash in your physical wallet.
Taler is not a crypto-currency, so you do not have
- to worry about cryto-currency related value
+ to worry about crypto-currency related value
fluctuations. Banking with Taler is subject to the
usual government protections for financial
services.") }}</p>
diff --git a/glossary.html.j2 b/glossary.html.j2
index 03cb493..997f19b 100644
--- a/glossary.html.j2
+++ b/glossary.html.j2
@@ -54,7 +54,7 @@
<dt>{{ _("exchange") }}</dt>
<dd>
{% trans %}
- Taler's payment service provider. Issues eletronic `coins` during `withdrawal` and redeems them when they are `deposited` by merchants.
+ Taler's payment service provider. Issues electronic `coins` during `withdrawal` and redeems them when they are `deposited` by merchants.
{% endtrans %}
</dd>
<dt>{{ _("extension") }}</dt>
diff --git a/merchants.html.j2 b/merchants.html.j2
index 970e562..687e516 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -92,7 +92,7 @@
{% trans %}
Taler can be used for different currencies (such as
Euros, US Dollars or Bitcoins) and any amount, limited
- only by applicable regulatation and what denominations
+ only by applicable regulation and what denominations
the payment service provider supports.
{% endtrans %}
</p>
diff --git a/web-common b/web-common
-Subproject caf5a98114402d057ba08b14279eb8e46481a02
+Subproject dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bf