[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] 02/02: misc improvements to TOPS site
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] 02/02: misc improvements to TOPS site |
|
Date: |
Tue, 02 Apr 2024 23:45:57 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository taler-ops-www.
commit 6917424fc724e59db0a2dff1e33b5efeea757350
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Apr 2 23:45:52 2024 +0200
misc improvements to TOPS site
---
common/footer.j2.inc | 106 +++++---
common/navigation/items.j2.inc | 25 +-
locale/de/LC_MESSAGES/messages.po | 499 +++++++++++++++++++++++++-------------
locale/en/LC_MESSAGES/messages.po | 416 +++++++++++++++++++------------
locale/fr/LC_MESSAGES/messages.po | 458 ++++++++++++++++++++++------------
locale/messages.pot | 420 ++++++++++++++++++++------------
template/index.html.j2 | 49 ++--
template/merchants.html.j2 | 191 ++++++++++-----
template/users.html.j2 | 297 ++++++++++++++---------
9 files changed, 1598 insertions(+), 863 deletions(-)
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 5508df3..f1627dc 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -32,7 +32,9 @@
href="{{ url_localized('index.html') }}"
alt="{% trans %}Taler Operations AG Homepage{% endtrans %}"
>
- {% trans %}Home{% endtrans %}
+ {% trans %}
+ Home
+ {% endtrans %}
</a>
</li>
{#
@@ -40,13 +42,27 @@
<li><a class="link
no-clr" href="{{ url_localized('users.html') }}">{% trans %}User Installation
Guide{% endtrans %}</a></li> -->
#}
<li>
- <a class="link no-clr" href="{{ url_localized('fees.html') }}">
- {% trans %}Fees{% endtrans %}
+ <a class="link no-clr"
+ rel="noopener noreferrer"
+ href="https://docs.taler.net/";
+ alt="{% trans %}GNU Taler system documentation{% endtrans %}"
+ target="_blank"
+ >
+ {% trans %}
+ Documentation 🔗
+ {% endtrans %}
</a>
</li>
<li>
- <a class="link no-clr"
href="https://exchange.taler-ops.ch/terms";>
- {% trans %}Terms of Service{% endtrans %}
+ <a class="link no-clr"
+ rel="noopener noreferrer"
+ href="https://exchange.taler-ops.ch/terms";
+ alt="{% trans %}Taler Operations Terms of Service{% endtrans
%}"
+ target="_blank"
+ >
+ {% trans %}
+ Terms of Service 🔗
+ {% endtrans %}
</a>
</li>
</ul>
@@ -61,35 +77,46 @@
href="https://taler.net/en/ngi-taler.html";
target="_blank"
rel="noopener noreferrer"
+ alt="{% trans %}NGI Taler EU consoritum{% endtrans %}"
class="link no-clr"
- >{% trans %}Taler Consortium{% endtrans %}</a
- >
+ >
+ {% trans %}
+ Taler consortium 🔗
+ {% endtrans %}
+ </a>
</li>
<li>
<a
href="https://bfh.ch/";
target="_blank"
+ alt="{% trans %}Bern University of Applied Sciences{% endtrans
%}"
rel="noopener noreferrer"
class="link no-clr"
- >{% trans %}Bern University of Applied Sciences{%
- endtrans %}</a
- >
+ >
+ {% trans %}
+ Bern University of Applied Sciences 🔗
+ {%endtrans %}
+ </a>
</li>
<li>
<a
href="https://netzbon.ch";
target="_blank"
+ alt="{% trans %}Netzbon: Regional currency Basel{% endtrans %}"
rel="noopener noreferrer"
class="link no-clr"
- >{% trans %}NetzBon{% endtrans %}</a
- >
+ >
+ {% trans %}
+ NetzBon 🔗
+ {% endtrans %}
+ </a>
</li>
</ul>
</div>
</div>
<div class="footer-col flex-1">
<div class="footbox footadres">
- <h4 class="section-title">{% trans %}Contacts{% endtrans %}</h4>
+ <h4 class="section-title">{% trans %}Contact{% endtrans %}</h4>
<ul>
<li>
<a class="link no-clr phone" href="tel:0041442801200"
@@ -97,14 +124,16 @@
>
</li>
<li>
- <a class="link no-clr" href="mailto:compliance@taler-systems.com";
- >{% trans %}Compliance Officer{% endtrans %}</a
- >
+ <a class="link no-clr" href="mailto:compliance@taler-ops.ch";
+ >
+ {% trans %}Compliance officer 📧{% endtrans %}
+ </a>
</li>
<li>
- <a class="link no-clr" href="mailto:aml@taler-systems.com";
- >{% trans %}AML Officer{% endtrans %}</a
- >
+ <a class="link no-clr" href="mailto:contact@taler-ops.ch";
+ >
+ {% trans %}General inquiries 📧{% endtrans %}
+ </a>
</li>
</ul>
</div>
@@ -116,28 +145,35 @@
>
<p>
© {% trans %}Copyright{% endtrans %} 2024
- <a class="link" href="{{ url_localized('index.html') }}"
- >Taler Operations AG</a
- >. {% trans %}Licensed under the{% endtrans %}
- <a
- href="https://www.gnu.org/licenses/fdl-1.3.html.en";
- target="_blank"
- rel="noopener noreferrer"
- class="link"
- >
- {# TODO: ask around for who chose the FDL - shouldn't we be using the
- GPL, or atleast license the code under the GPL? #} GNU Free
- Documentation License</a
- >.
+ <a class="link"
+ href="{{ url_localized('index.html') }}"
+ >
+ Taler Operations AG
+ </a>.
+ {% trans %}
+ Licensed under the
+ <a
+ href="https://www.gnu.org/licenses/fdl-1.3.html.en";
+ target="_blank"
+ rel="noopener noreferrer"
+ class="link"
+ >
+ GNU Free Documentation License 🔗
+ </a>.
+ {% endtrans %}
</p>
<p class="py-2">
- {% trans %}We do not assume any liability for the correctness of
contents.
+ {% trans %}
+ We do not assume any liability for the correctness of contents.
We do not collect any data and do not use cookies.
+ {% endtrans %}
</p>
<p>
+ {% trans %}
Our web server generates a log file with IP addresses of visitors.
- However, these are stored & processed exclusively for troubleshooting and
- mitigating problems.{% endtrans %}
+ However, these are stored & processed exclusively for
troubleshooting and
+ mitigating problems.
+ {% endtrans %}
</p>
</div>
</footer>
diff --git a/common/navigation/items.j2.inc b/common/navigation/items.j2.inc
index ee2b2b3..5298700 100644
--- a/common/navigation/items.j2.inc
+++ b/common/navigation/items.j2.inc
@@ -4,28 +4,27 @@
<a
class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('index.html') }}"
- >{% trans %}Home{% endtrans %}</a
- >
+ >
+ {% trans %}Home{% endtrans %}
+ </a>
<a
class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('users.html') }}"
- >{% trans %}Users{% endtrans %}</a
- >
+ >
+ {% trans %}Users{% endtrans %}
+ </a>
<a
class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('merchants.html') }}"
- >{% trans %}Merchants{% endtrans %}</a
- >
+ >
+ {% trans %}Merchants{% endtrans %}
+ </a>
<a
class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('fees.html') }}"
- >{% trans %}Fees{% endtrans %}</a
- >
- <a
- class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
- href="https://exchange.taler-ops.ch/terms";
- >{% trans %}Terms of Service{% endtrans %}</a
- >
+ >
+ {% trans %}Fees{% endtrans %}
+ </a>
<div class="contents md:hidden">
{% include 'common/navigation/lang-select.j2.inc' %}
</div>
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index c83f659..9e960b0 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-03-31 17:05+0200\n"
+"POT-Creation-Date: 2024-04-02 23:45+0200\n"
"PO-Revision-Date: 2024-02-24 20:06+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: German <https://weblate.taler.net/projects/taler-ops/website/";
@@ -36,59 +36,114 @@ msgstr "Seitenübersicht"
msgid "Taler Operations AG Homepage"
msgstr "Taler Operations AG Startseite"
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:8
msgid "Home"
msgstr "Startseite"
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
-msgid "Fees"
-msgstr "Gebührenordnung"
+#: common/footer.j2.inc:48
+#, fuzzy
+#| msgid "Taler Systems SA - Tokenization"
+msgid "GNU Taler system documentation"
+msgstr "Taler Systems SA - Tokenization"
+
+#: common/footer.j2.inc:51
+#, fuzzy
+#| msgid "Document"
+msgid "Documentation 🔗"
+msgstr "Veröffentlichungen"
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
-msgid "Terms of Service"
+#: common/footer.j2.inc:60
+#, fuzzy
+#| msgid "Taler Operations AG - Terms of Service"
+msgid "Taler Operations Terms of Service"
+msgstr "Taler Operations AG - AGB"
+
+#: common/footer.j2.inc:63
+#, fuzzy
+#| msgid "Terms of Service"
+msgid "Terms of Service 🔗"
msgstr "AGB"
-#: common/footer.j2.inc:57
+#: common/footer.j2.inc:73
msgid "Partners"
msgstr "Partner"
-#: common/footer.j2.inc:65
-msgid "Taler Consortium"
+#: common/footer.j2.inc:80
+#, fuzzy
+#| msgid "Taler Consortium"
+msgid "NGI Taler EU consoritum"
+msgstr "Taler-Konsortium NGI TALER"
+
+#: common/footer.j2.inc:83
+#, fuzzy
+#| msgid "Taler Consortium"
+msgid "Taler consortium 🔗"
msgstr "Taler-Konsortium NGI TALER"
-#: common/footer.j2.inc:74
-msgid "Bern University of Applied Sciences"
+#: common/footer.j2.inc:92
+#, fuzzy
+#| msgid "Bern University of Applied Sciences"
+msgid "Bern University of Applied Sciences"
+msgstr "Berner Fachhochschule (BFH)"
+
+#: common/footer.j2.inc:96
+#, fuzzy
+#| msgid "Bern University of Applied Sciences"
+msgid "Bern University of Applied Sciences 🔗"
msgstr "Berner Fachhochschule (BFH)"
-#: common/footer.j2.inc:84
-msgid "NetzBon"
+#: common/footer.j2.inc:105
+msgid "Netzbon: Regional currency Basel"
+msgstr ""
+
+#: common/footer.j2.inc:109
+#, fuzzy
+#| msgid "NetzBon"
+msgid "NetzBon 🔗"
msgstr "NetzBon"
-#: common/footer.j2.inc:92
-msgid "Contacts"
+#: common/footer.j2.inc:119 template/terms.html.j2:631
+msgid "Contact"
msgstr "Kontakt"
-#: common/footer.j2.inc:96
+#: common/footer.j2.inc:123
msgid "Tel:"
msgstr "Tel:"
-#: common/footer.j2.inc:101
-msgid "Compliance Officer"
+#: common/footer.j2.inc:129
+#, fuzzy
+#| msgid "Compliance Officer"
+msgid "Compliance officer 📧"
msgstr "Compliance-Beauftragte"
-#: common/footer.j2.inc:106
-msgid "AML Officer"
-msgstr "AML-Beauftragte"
+#: common/footer.j2.inc:135
+msgid "General inquiries 📧"
+msgstr ""
-#: common/footer.j2.inc:118
+#: common/footer.j2.inc:147
msgid "Copyright"
msgstr "Copyright"
-#: common/footer.j2.inc:121
-msgid "Licensed under the"
+#: common/footer.j2.inc:153
+#, fuzzy
+#| msgid ""
+#| "running on <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
+#| "target=\"_blank\" rel=\"noopener noreferrer\">Free Software</a>"
+msgid ""
+"Licensed under the <a href=\"https://www.gnu.org/licenses/fdl-1.3.html.en\"; "
+"target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\" > GNU Free "
+"Documentation License 🔗 </a>."
msgstr ""
+"programmiert mit <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
+"target=\"_blank\" rel=\"noopener noreferrer\">Freier Software</a>"
-#: common/footer.j2.inc:134
+#: common/footer.j2.inc:166
+msgid ""
+"We do not assume any liability for the correctness of contents. We do not "
+"collect any data and do not use cookies."
+msgstr ""
+
+#: common/footer.j2.inc:172
#, fuzzy
#| msgid ""
#| "We do not assume any liability for the correctness of contents. We do not "
@@ -96,10 +151,9 @@ msgstr ""
#| "log file with IP addresses of visitors. However, these are evaluated "
#| "exclusively for troubleshooting or problem mitigation."
msgid ""
-"We do not assume any liability for the correctness of contents. We do not "
-"collect any data and do not use cookies. </p> <p> Our web server generates a "
-"log file with IP addresses of visitors. However, these are stored & "
-"processed exclusively for troubleshooting and mitigating problems."
+"Our web server generates a log file with IP addresses of visitors. However, "
+"these are stored & processed exclusively for troubleshooting and "
+"mitigating problems."
msgstr ""
"Nutzungsbedingungen / Datenschutz: Wir übernehmen keine Haftung für die "
"Richtigkeit der Inhalte. Wir erheben keine Daten und verwenden keine "
@@ -111,18 +165,22 @@ msgstr ""
msgid "Skip to main content"
msgstr "Navigationsmenü überspringen"
-#: common/navigation/items.j2.inc:12
+#: common/navigation/items.j2.inc:14
#, fuzzy
#| msgid "For Users"
msgid "Users"
msgstr "Für Kunden"
-#: common/navigation/items.j2.inc:17
+#: common/navigation/items.j2.inc:20
#, fuzzy
#| msgid "For Merchants"
msgid "Merchants"
msgstr "Für Händler"
+#: common/navigation/items.j2.inc:26
+msgid "Fees"
+msgstr "Gebührenordnung"
+
#: template/fees.html.j2:2
#, fuzzy
#| msgid "Taler Operations AG - Users"
@@ -195,11 +253,11 @@ msgid ""
"amounts."
msgstr ""
-#: template/fees.html.j2:113
+#: template/fees.html.j2:115
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:117
+#: template/fees.html.j2:119
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations to "
"wire transfers that return funds to customers when either the Taler wallet "
@@ -209,18 +267,18 @@ msgid ""
"transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:126
+#: template/fees.html.j2:130
msgid ""
"To avoid paying bounce fees payers should be careful when entering the wire "
"transfer subject, and ensure that their wallet is online within a month of "
"initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:135
+#: template/fees.html.j2:141
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:139
+#: template/fees.html.j2:145
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> validity "
"period. One month before the expiration date, you wallet should "
@@ -230,7 +288,7 @@ msgid ""
"regularly online to avoid losing money due to expiration!"
msgstr ""
-#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:27
+#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:28
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
msgstr "Taler Operations betreibt das Taler-Bezahlsystem in der Schweiz."
@@ -240,44 +298,54 @@ msgstr "Taler Operations betreibt das Taler-Bezahlsystem
in der Schweiz."
msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr "Willkommen bei <span>Taler Operations</span>!"
-#: template/index.html.j2:31
+#: template/index.html.j2:34
msgid ""
"Taler Operations is not supervised by the Swiss Financial Market Supervisory "
-"Authority (FINMA). Escrowed customer assets are held in a segregated bank "
-"account."
+"Authority (FINMA). Escrowed customer assets are not subject to deposit "
+"insurance but held in a segregated bank account."
msgstr ""
-#: template/index.html.j2:41
+#: template/index.html.j2:46
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:52
+#: template/index.html.j2:57
#, fuzzy
#| msgid "Get Started Now"
-msgid "Getting Started with Taler"
+msgid "Getting started with Taler"
msgstr "Zur Demo-Seite"
-#: template/index.html.j2:60
+#: template/index.html.j2:65
+msgid "happy user"
+msgstr ""
+
+#: template/index.html.j2:66
msgid "For Users"
msgstr "Für Kunden"
-#: template/index.html.j2:61
+#: template/index.html.j2:68
msgid "Your data and money under your control."
msgstr ""
-#: template/index.html.j2:66
+#: template/index.html.j2:77
msgid "Pay with Taler"
msgstr "Mit Taler bezahlen"
-#: template/index.html.j2:71
+#: template/index.html.j2:84
+#, fuzzy
+#| msgid "For Merchants"
+msgid "happy merchant"
+msgstr "Für Händler"
+
+#: template/index.html.j2:85
msgid "For Merchants"
msgstr "Für Händler"
-#: template/index.html.j2:73
+#: template/index.html.j2:87
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
-#: template/index.html.j2:79
+#: template/index.html.j2:96
msgid "Integrate"
msgstr "Integration"
@@ -292,129 +360,152 @@ msgid ""
"payments."
msgstr ""
-#: template/merchants.html.j2:25 template/users.html.j2:97
+#: template/merchants.html.j2:25 template/users.html.j2:18
#, fuzzy
#| msgid "<span>Prerequisites</span>"
msgid "Prerequisites"
msgstr "<span>Voraussetzungen</span>"
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:30
msgid ""
-"Open Swiss bank account, ideally with support for <a target=\"_blank\" "
-"href=\"https://www.ebics.org/\";>EBICS</a>."
+"Here is what you need to get started to integrate Taler as a payment option "
+"into your payment process:"
msgstr ""
-#: template/merchants.html.j2:34
+#: template/merchants.html.j2:38
msgid ""
-"<a target=\"_blank\" href=\"https://docs.taler.net/taler-merchant-manual.";
-"html\" > Taler merchant backend</a > configured with your Swiss IBAN number."
+"Swiss bank account, ideally with support for <a target=\"_blank\" "
+"href=\"https://www.ebics.org/\";>EBICS 🔗</a>."
msgstr ""
#: template/merchants.html.j2:44
-msgid "Offer Taler as a payment option in your payment process."
+msgid ""
+"<a target=\"_blank\" href=\"https://docs.taler.net/taler-merchant-manual.";
+"html\" > Taler merchant backend 🔗 </a> configured with your Swiss IBAN "
+"number."
msgstr ""
-#: template/merchants.html.j2:53
+#: template/merchants.html.j2:64
+msgid "â³ Install GNU Taler merchant backend â³"
+msgstr ""
+
+#: template/merchants.html.j2:73
msgid "For in-person sales"
msgstr ""
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:78
msgid ""
"The merchant backend can generate static QR codes customers can scan to pay "
"you."
msgstr ""
-#: template/merchants.html.j2:59
+#: template/merchants.html.j2:84
msgid "You can hard-code a price or have the customer enter the price."
msgstr ""
-#: template/merchants.html.j2:67
-msgid "Watch tutorial"
+#: template/merchants.html.j2:95
+msgid "Watch tutorial 🎞"
msgstr ""
-#: template/merchants.html.j2:84
+#: template/merchants.html.j2:115
msgid "For WooCommerce"
msgstr ""
-#: template/merchants.html.j2:86
+#: template/merchants.html.j2:120
msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
msgstr ""
-#: template/merchants.html.j2:90 template/merchants.html.j2:120
-#: template/merchants.html.j2:151
+#: template/merchants.html.j2:126 template/merchants.html.j2:167
+#: template/merchants.html.j2:209
msgid "You mostly need to configure access to your Taler merchant backend."
msgstr ""
-#: template/merchants.html.j2:98
-msgid "WooCommerce plugin"
+#: template/merchants.html.j2:137
+msgid "â³ WooCommerce plugin â³"
msgstr ""
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:146
+msgid "Screenshot of Woocommerce settings dialog"
+msgstr ""
+
+#: template/merchants.html.j2:156
msgid "For Pretix"
msgstr ""
-#: template/merchants.html.j2:116
+#: template/merchants.html.j2:161
msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
msgstr ""
-#: template/merchants.html.j2:128
-msgid "Pretix plugin"
+#: template/merchants.html.j2:178
+msgid "â³ Pretix plugin â³"
msgstr ""
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:188
+msgid "Pretix logo"
+msgstr ""
+
+#: template/merchants.html.j2:198
msgid "For Joomla!"
msgstr ""
-#: template/merchants.html.j2:147
+#: template/merchants.html.j2:203
msgid ""
"A payment plugin is availalbe to add GNU Taler support to Joomla! with "
"Payage."
msgstr ""
-#: template/merchants.html.j2:159
-msgid "Joomla! plugin"
+#: template/merchants.html.j2:220
+msgid "â³ Joomla! plugin â³"
msgstr ""
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:229
+msgid "Woocommerce Taler settings"
+msgstr ""
+
+#: template/merchants.html.j2:238
msgid "For points of sale"
msgstr ""
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:240
msgid ""
"A point-of-sale App for Android can be used to quickly set up orders and "
"handle payments."
msgstr ""
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:246
msgid ""
"The App was designed for restaurants, but might be useful for other types of "
"in-person sales."
msgstr ""
-#: template/merchants.html.j2:189
-msgid "App manual"
+#: template/merchants.html.j2:257
+msgid "App manual 🔗"
+msgstr ""
+
+#: template/merchants.html.j2:266
+msgid "GNU Taler point-of-sale app user interface screenshot"
msgstr ""
-#: template/merchants.html.j2:205
+#: template/merchants.html.j2:276
#, fuzzy
#| msgid "For Users"
msgid "For developers"
msgstr "Für Kunden"
-#: template/merchants.html.j2:207
+#: template/merchants.html.j2:281
msgid ""
"The merchant backend offers a simple REST API to integrate GNU Taler into "
"existing E-commerce systems."
msgstr ""
-#: template/merchants.html.j2:211
+#: template/merchants.html.j2:287
msgid ""
"Documentation is available at <a target=\"_blank\" href=\"https://docs.taler.";
-"net/\">docs.taler.net</a>."
+"net/\">docs.taler.net 🔗</a>."
msgstr ""
-#: template/merchants.html.j2:220
-msgid "Watch tutorials"
+#: template/merchants.html.j2:297
+msgid "Watch tutorials 🎞"
msgstr ""
#: template/terms.html.j2:2
@@ -440,10 +531,6 @@ msgstr ""
"<b>Kunden und Händler</b>, die das Taler-Bezahlsystem für <b>eNetzBon</b> "
"nutzen."
-#: template/terms.html.j2:631
-msgid "Contact"
-msgstr "Kontakt"
-
#: template/terms.html.j2:634
msgid ""
"You can get into touch with Taler Operations AG via mail or email and on the "
@@ -490,196 +577,275 @@ msgstr ""
"Auf diesen Seiten erfahren Sie, wie sich das Bezahlsystem Taler installieren "
"und verwenden lässt."
-#: template/users.html.j2:25
-msgid "Select instructions for Android"
-msgstr ""
-
-#: template/users.html.j2:42
-msgid "Select instructions for iOS"
-msgstr ""
-
-#: template/users.html.j2:59
-msgid "Select instructions for Firefox"
+#: template/users.html.j2:20
+msgid "Here is what you need to get started paying with GNU Taler:"
msgstr ""
-#: template/users.html.j2:76
-msgid "Select instructions for Chrome"
-msgstr ""
-
-#: template/users.html.j2:99
-msgid "Here is what you need to get started paying with Taler:"
-msgstr ""
-
-#: template/users.html.j2:104
+#: template/users.html.j2:26
#, fuzzy
#| msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
-msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\";"
+msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\","
msgstr "<b>SCHWEIZER BANKKONTO</b> bei einer Bank, deren IBAN mit CH** beginnt"
-#: template/users.html.j2:109
+#: template/users.html.j2:31
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
-"and;"
+"and"
msgstr ""
-#: template/users.html.j2:114
+#: template/users.html.j2:36
#, fuzzy
#| msgid ""
#| "using the technology of <a href=\"https://taler.net/\"; class=\"demo_btn\" "
#| "target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
msgid ""
"<b>Installation</b> of a <a href=\"https://wallet.taler.net/\"; "
-"target=\"_blank\" rel=\"noopener noreferrer\" >Taler wallet.</a >"
+"target=\"_blank\" rel=\"noopener noreferrer\" > Taler wallet 🔗 </a>."
+msgstr ""
+"basiert auf <a href=\"https://taler.net/\"; class=\"demo_btn\" "
+"target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
+
+#: template/users.html.j2:46
+#, fuzzy
+#| msgid ""
+#| "using the technology of <a href=\"https://taler.net/\"; class=\"demo_btn\" "
+#| "target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
+msgid ""
+"<a href=\"https://tutorials.taler.net/wallet\"; target=\"_blank\" "
+"rel=\"noopener noreferrer\" > Tutorials available 🎞 </a>."
msgstr ""
"basiert auf <a href=\"https://taler.net/\"; class=\"demo_btn\" "
"target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
-#: template/users.html.j2:132 template/users.html.j2:163
-#: template/users.html.j2:209 template/users.html.j2:256
-#: template/users.html.j2:300 template/users.html.j2:347
-#: template/users.html.j2:393 template/users.html.j2:441
-#: template/users.html.j2:485
+#: template/users.html.j2:65
+msgid "â³ Download GNU Taler wallet â³"
+msgstr ""
+
+#: template/users.html.j2:79
+msgid "Select platform to view instructions for:"
+msgstr ""
+
+#: template/users.html.j2:86
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:103
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:120
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:137
+msgid "Select instructions for Chrome"
+msgstr ""
+
+#: template/users.html.j2:159 template/users.html.j2:196
+#: template/users.html.j2:247 template/users.html.j2:297
+#: template/users.html.j2:349 template/users.html.j2:402
+#: template/users.html.j2:448 template/users.html.j2:504
+#: template/users.html.j2:556
msgid "Step"
msgstr ""
-#: template/users.html.j2:135
-msgid "Select provider"
+#: template/users.html.j2:162
+msgid "Add provider"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:166
msgid ""
"As a first-time user, you need to add Taler Operations as a payment service "
-"provider. The easiest way to do so is to scan the QR code on the right which "
-"will also initiate the withdrawal process."
+"provider. The easiest way to do so is to <b>scan the QR code</b> on the "
+"right or click it to open the link. This will also initiate the withdrawal "
+"process."
msgstr ""
-#: template/users.html.j2:145
+#: template/users.html.j2:174
msgid ""
-"If you already have a payment service provider for the \"CHF\" currency, you "
-"can withdraw digital cash by clicking the \"add\" button on the \"CHF "
-"balance\" screen."
+"If you already have a payment service provider, you can withdraw digital "
+"cash by clicking the \"add\" button on the \"balance\" screen of the "
+"respective currency."
msgstr ""
-#: template/users.html.j2:166
+#: template/users.html.j2:199
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:205
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:173
+#: template/users.html.j2:210
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:212
+#: template/users.html.j2:219 template/users.html.j2:225
+#: template/users.html.j2:231 template/users.html.j2:237
+#: template/users.html.j2:321 template/users.html.j2:327
+#: template/users.html.j2:333 template/users.html.j2:339
+msgid "Wallet requesting amount to withdraw"
+msgstr ""
+
+#: template/users.html.j2:250
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:216
-msgid "Please read the Terms of Service and accept them."
+#: template/users.html.j2:254
+#, fuzzy
+#| msgid "Please read the Terms of Service and accept them."
+msgid "Please read the terms of service and accept them."
msgstr ""
"Bitte lesen Sie die Allgemeinen Geschäftsbedingungen (AGB) und bestätigen "
"diese (einmalig bei der ersten Abhebung bei einem Systembetreiber und im "
"Fall von AGB-Änderungen)."
-#: template/users.html.j2:220
+#: template/users.html.j2:259
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:259
-msgid "Review Operation"
+#: template/users.html.j2:269 template/users.html.j2:275
+#: template/users.html.j2:281 template/users.html.j2:287
+#, fuzzy
+#| msgid "eNetzBon Terms of Service"
+msgid "Wallet showing terms of service"
+msgstr "Allgemeine Geschäftsbedingungen (AGB) für eNetzBon"
+
+#: template/users.html.j2:300
+msgid "Review operation"
msgstr ""
-#: template/users.html.j2:262
+#: template/users.html.j2:306
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:264
+#: template/users.html.j2:311
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:303
-msgid "Wire Transfer"
+#: template/users.html.j2:352
+msgid "Wire transfer"
msgstr ""
-#: template/users.html.j2:307
+#: template/users.html.j2:358
msgid ""
-"The wallet will show you the subject, target account and amount to transfer."
+"The wallet will show you the wire transfer subject, target account and "
+"amount to transfer."
msgstr ""
-#: template/users.html.j2:311
+#: template/users.html.j2:364
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:349
+#: template/users.html.j2:374 template/users.html.j2:380
+#: template/users.html.j2:386 template/users.html.j2:392
+msgid "Wallet showing wire transfer instructions"
+msgstr ""
+
+#: template/users.html.j2:404
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:352
+#: template/users.html.j2:407
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:357
+#: template/users.html.j2:412
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep "
"the wallet open."
msgstr ""
-#: template/users.html.j2:395
+#: template/users.html.j2:420 template/users.html.j2:426
+#: template/users.html.j2:432 template/users.html.j2:438
+msgid "Wallet showing withdrawal status"
+msgstr ""
+
+#: template/users.html.j2:451
msgid "Shop"
msgstr ""
-#: template/users.html.j2:398
+#: template/users.html.j2:457
msgid ""
"When shopping, the wallet may be launched automatically or you may need to "
"click a link, scan a QR code or even select the wallet extension manually "
"depending on the context."
msgstr ""
-#: template/users.html.j2:403
+#: template/users.html.j2:464
msgid ""
"The QR code scanner button can also be held to manually enter a "
"\"<code>taler://</code>-URI\", for example if you received one via text "
"message."
msgstr ""
-#: template/users.html.j2:443
+#: template/users.html.j2:475 template/users.html.j2:481
+#: template/users.html.j2:487 template/users.html.j2:494
+msgid "Wallet requesting taler://-URI"
+msgstr ""
+
+#: template/users.html.j2:507
msgid "Pay"
msgstr ""
-#: template/users.html.j2:446
+#: template/users.html.j2:513
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:450
+#: template/users.html.j2:519
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:487
+#: template/users.html.j2:528 template/users.html.j2:534
+#: template/users.html.j2:540 template/users.html.j2:546
+msgid "Wallet requesting payment confirmation"
+msgstr ""
+
+#: template/users.html.j2:559
msgid "Manage"
msgstr ""
-#: template/users.html.j2:490
+#: template/users.html.j2:565
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:494
+#: template/users.html.j2:570
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:533
-msgid "Frequently Asked Questions"
+#: template/users.html.j2:580 template/users.html.j2:586
+#: template/users.html.j2:592 template/users.html.j2:598
+msgid "Wallet showing receipt"
+msgstr ""
+
+#: template/users.html.j2:612
+#, fuzzy
+#| msgid "Frequently Asked Questions"
+msgid "Frequently Asked Questions 🔗"
msgstr "FAQs (Frequently Asked Questions)"
+#~ msgid "Contacts"
+#~ msgstr "Kontakt"
+
+#, fuzzy
+#~| msgid "Contacts"
+#~ msgid "Contact Us 📧"
+#~ msgstr "Kontakt"
+
+#~ msgid "Terms of Service"
+#~ msgstr "AGB"
+
+#~ msgid "AML Officer"
+#~ msgstr "AML-Beauftragte"
+
#~ msgid "License"
#~ msgstr "Lizenz"
@@ -1145,13 +1311,6 @@ msgstr "FAQs (Frequently Asked Questions)"
#~ msgid "ideal for micro-payments"
#~ msgstr "ideal für Micro-Payments"
-#~ msgid ""
-#~ "running on <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
-#~ "target=\"_blank\" rel=\"noopener noreferrer\">Free Software</a>"
-#~ msgstr ""
-#~ "programmiert mit <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
-#~ "target=\"_blank\" rel=\"noopener noreferrer\">Freier Software</a>"
-
#~ msgid "I want to earn <br>digital cash <br>through my <br>web shop!"
#~ msgstr "Ich will bezahlt werden <br>in meinem <br>Webshop!"
@@ -2052,9 +2211,6 @@ msgstr "FAQs (Frequently Asked Questions)"
#~ msgid "RSS Feed"
#~ msgstr "RSS-Feed"
-#~ msgid "Document"
-#~ msgstr "Veröffentlichungen"
-
#~ msgid "June"
#~ msgstr "Juni"
@@ -2109,9 +2265,6 @@ msgstr "FAQs (Frequently Asked Questions)"
#~ "Zukünftige Versionen des Taler-Wallet sehen vor, unter Freunden auch "
#~ "direkt Token auszutauschen (peer-to-peer)."
-#~ msgid "Taler Systems SA - Tokenization"
-#~ msgstr "Taler Systems SA - Tokenization"
-
#~ msgid "WELCOME TO <span>TOKENIZATION"
#~ msgstr "Willkommen <span>bei Lösungen für Tokenization"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 52918bf..8a0f7cc 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-03-31 17:05+0200\n"
+"POT-Creation-Date: 2024-04-02 23:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,78 +34,110 @@ msgstr ""
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:8
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
-msgid "Fees"
+#: common/footer.j2.inc:48
+msgid "GNU Taler system documentation"
msgstr ""
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
-msgid "Terms of Service"
+#: common/footer.j2.inc:51
+msgid "Documentation 🔗"
msgstr ""
-#: common/footer.j2.inc:57
-msgid "Partners"
+#: common/footer.j2.inc:60
+msgid "Taler Operations Terms of Service"
+msgstr ""
+
+#: common/footer.j2.inc:63
+msgid "Terms of Service 🔗"
msgstr ""
-#: common/footer.j2.inc:65
-msgid "Taler Consortium"
+#: common/footer.j2.inc:73
+msgid "Partners"
msgstr ""
-#: common/footer.j2.inc:74
-msgid "Bern University of Applied Sciences"
+#: common/footer.j2.inc:80
+msgid "NGI Taler EU consoritum"
msgstr ""
-#: common/footer.j2.inc:84
-msgid "NetzBon"
+#: common/footer.j2.inc:83
+msgid "Taler consortium 🔗"
msgstr ""
#: common/footer.j2.inc:92
-msgid "Contacts"
+msgid "Bern University of Applied Sciences"
msgstr ""
#: common/footer.j2.inc:96
+msgid "Bern University of Applied Sciences 🔗"
+msgstr ""
+
+#: common/footer.j2.inc:105
+msgid "Netzbon: Regional currency Basel"
+msgstr ""
+
+#: common/footer.j2.inc:109
+msgid "NetzBon 🔗"
+msgstr ""
+
+#: common/footer.j2.inc:119 template/terms.html.j2:631
+msgid "Contact"
+msgstr ""
+
+#: common/footer.j2.inc:123
msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:101
-msgid "Compliance Officer"
+#: common/footer.j2.inc:129
+msgid "Compliance officer 📧"
msgstr ""
-#: common/footer.j2.inc:106
-msgid "AML Officer"
+#: common/footer.j2.inc:135
+msgid "General inquiries 📧"
msgstr ""
-#: common/footer.j2.inc:118
+#: common/footer.j2.inc:147
msgid "Copyright"
msgstr ""
-#: common/footer.j2.inc:121
-msgid "Licensed under the"
+#: common/footer.j2.inc:153
+msgid ""
+"Licensed under the <a href=\"https://www.gnu.org/licenses/fdl-1.3.html.en\"; "
+"target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\" > GNU Free "
+"Documentation License 🔗 </a>."
msgstr ""
-#: common/footer.j2.inc:134
+#: common/footer.j2.inc:166
msgid ""
"We do not assume any liability for the correctness of contents. We do not "
-"collect any data and do not use cookies. </p> <p> Our web server generates a "
-"log file with IP addresses of visitors. However, these are stored & "
-"processed exclusively for troubleshooting and mitigating problems."
+"collect any data and do not use cookies."
+msgstr ""
+
+#: common/footer.j2.inc:172
+msgid ""
+"Our web server generates a log file with IP addresses of visitors. However, "
+"these are stored & processed exclusively for troubleshooting and "
+"mitigating problems."
msgstr ""
#: common/navigation/index.j2.inc:7
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:12
+#: common/navigation/items.j2.inc:14
msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:17
+#: common/navigation/items.j2.inc:20
msgid "Merchants"
msgstr ""
+#: common/navigation/items.j2.inc:26
+msgid "Fees"
+msgstr ""
+
#: template/fees.html.j2:2
msgid "GNU Taler Operations Fees"
msgstr ""
@@ -174,11 +206,11 @@ msgid ""
"amounts."
msgstr ""
-#: template/fees.html.j2:113
+#: template/fees.html.j2:115
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:117
+#: template/fees.html.j2:119
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations to "
"wire transfers that return funds to customers when either the Taler wallet "
@@ -188,18 +220,18 @@ msgid ""
"transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:126
+#: template/fees.html.j2:130
msgid ""
"To avoid paying bounce fees payers should be careful when entering the wire "
"transfer subject, and ensure that their wallet is online within a month of "
"initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:135
+#: template/fees.html.j2:141
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:139
+#: template/fees.html.j2:145
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> validity "
"period. One month before the expiration date, you wallet should "
@@ -209,7 +241,7 @@ msgid ""
"regularly online to avoid losing money due to expiration!"
msgstr ""
-#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:27
+#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:28
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
msgstr ""
@@ -217,42 +249,50 @@ msgstr ""
msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr ""
-#: template/index.html.j2:31
+#: template/index.html.j2:34
msgid ""
"Taler Operations is not supervised by the Swiss Financial Market Supervisory "
-"Authority (FINMA). Escrowed customer assets are held in a segregated bank "
-"account."
+"Authority (FINMA). Escrowed customer assets are not subject to deposit "
+"insurance but held in a segregated bank account."
msgstr ""
-#: template/index.html.j2:41
+#: template/index.html.j2:46
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:52
-msgid "Getting Started with Taler"
+#: template/index.html.j2:57
+msgid "Getting started with Taler"
+msgstr ""
+
+#: template/index.html.j2:65
+msgid "happy user"
msgstr ""
-#: template/index.html.j2:60
+#: template/index.html.j2:66
msgid "For Users"
msgstr ""
-#: template/index.html.j2:61
+#: template/index.html.j2:68
msgid "Your data and money under your control."
msgstr ""
-#: template/index.html.j2:66
+#: template/index.html.j2:77
msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:71
+#: template/index.html.j2:84
+msgid "happy merchant"
+msgstr ""
+
+#: template/index.html.j2:85
msgid "For Merchants"
msgstr ""
-#: template/index.html.j2:73
+#: template/index.html.j2:87
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
-#: template/index.html.j2:79
+#: template/index.html.j2:96
msgid "Integrate"
msgstr ""
@@ -266,125 +306,148 @@ msgid ""
"payments."
msgstr ""
-#: template/merchants.html.j2:25 template/users.html.j2:97
+#: template/merchants.html.j2:25 template/users.html.j2:18
msgid "Prerequisites"
msgstr ""
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:30
msgid ""
-"Open Swiss bank account, ideally with support for <a target=\"_blank\" "
-"href=\"https://www.ebics.org/\";>EBICS</a>."
+"Here is what you need to get started to integrate Taler as a payment option "
+"into your payment process:"
msgstr ""
-#: template/merchants.html.j2:34
+#: template/merchants.html.j2:38
msgid ""
-"<a target=\"_blank\" href=\"https://docs.taler.net/taler-merchant-manual.";
-"html\" > Taler merchant backend</a > configured with your Swiss IBAN number."
+"Swiss bank account, ideally with support for <a target=\"_blank\" "
+"href=\"https://www.ebics.org/\";>EBICS 🔗</a>."
msgstr ""
#: template/merchants.html.j2:44
-msgid "Offer Taler as a payment option in your payment process."
+msgid ""
+"<a target=\"_blank\" href=\"https://docs.taler.net/taler-merchant-manual.";
+"html\" > Taler merchant backend 🔗 </a> configured with your Swiss IBAN "
+"number."
+msgstr ""
+
+#: template/merchants.html.j2:64
+msgid "â³ Install GNU Taler merchant backend â³"
msgstr ""
-#: template/merchants.html.j2:53
+#: template/merchants.html.j2:73
msgid "For in-person sales"
msgstr ""
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:78
msgid ""
"The merchant backend can generate static QR codes customers can scan to pay "
"you."
msgstr ""
-#: template/merchants.html.j2:59
+#: template/merchants.html.j2:84
msgid "You can hard-code a price or have the customer enter the price."
msgstr ""
-#: template/merchants.html.j2:67
-msgid "Watch tutorial"
+#: template/merchants.html.j2:95
+msgid "Watch tutorial 🎞"
msgstr ""
-#: template/merchants.html.j2:84
+#: template/merchants.html.j2:115
msgid "For WooCommerce"
msgstr ""
-#: template/merchants.html.j2:86
+#: template/merchants.html.j2:120
msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
msgstr ""
-#: template/merchants.html.j2:90 template/merchants.html.j2:120
-#: template/merchants.html.j2:151
+#: template/merchants.html.j2:126 template/merchants.html.j2:167
+#: template/merchants.html.j2:209
msgid "You mostly need to configure access to your Taler merchant backend."
msgstr ""
-#: template/merchants.html.j2:98
-msgid "WooCommerce plugin"
+#: template/merchants.html.j2:137
+msgid "â³ WooCommerce plugin â³"
msgstr ""
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:146
+msgid "Screenshot of Woocommerce settings dialog"
+msgstr ""
+
+#: template/merchants.html.j2:156
msgid "For Pretix"
msgstr ""
-#: template/merchants.html.j2:116
+#: template/merchants.html.j2:161
msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
msgstr ""
-#: template/merchants.html.j2:128
-msgid "Pretix plugin"
+#: template/merchants.html.j2:178
+msgid "â³ Pretix plugin â³"
+msgstr ""
+
+#: template/merchants.html.j2:188
+msgid "Pretix logo"
msgstr ""
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:198
msgid "For Joomla!"
msgstr ""
-#: template/merchants.html.j2:147
+#: template/merchants.html.j2:203
msgid ""
"A payment plugin is availalbe to add GNU Taler support to Joomla! with "
"Payage."
msgstr ""
-#: template/merchants.html.j2:159
-msgid "Joomla! plugin"
+#: template/merchants.html.j2:220
+msgid "â³ Joomla! plugin â³"
+msgstr ""
+
+#: template/merchants.html.j2:229
+msgid "Woocommerce Taler settings"
msgstr ""
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:238
msgid "For points of sale"
msgstr ""
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:240
msgid ""
"A point-of-sale App for Android can be used to quickly set up orders and "
"handle payments."
msgstr ""
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:246
msgid ""
"The App was designed for restaurants, but might be useful for other types of "
"in-person sales."
msgstr ""
-#: template/merchants.html.j2:189
-msgid "App manual"
+#: template/merchants.html.j2:257
+msgid "App manual 🔗"
msgstr ""
-#: template/merchants.html.j2:205
+#: template/merchants.html.j2:266
+msgid "GNU Taler point-of-sale app user interface screenshot"
+msgstr ""
+
+#: template/merchants.html.j2:276
msgid "For developers"
msgstr ""
-#: template/merchants.html.j2:207
+#: template/merchants.html.j2:281
msgid ""
"The merchant backend offers a simple REST API to integrate GNU Taler into "
"existing E-commerce systems."
msgstr ""
-#: template/merchants.html.j2:211
+#: template/merchants.html.j2:287
msgid ""
"Documentation is available at <a target=\"_blank\" href=\"https://docs.taler.";
-"net/\">docs.taler.net</a>."
+"net/\">docs.taler.net 🔗</a>."
msgstr ""
-#: template/merchants.html.j2:220
-msgid "Watch tutorials"
+#: template/merchants.html.j2:297
+msgid "Watch tutorials 🎞"
msgstr ""
#: template/terms.html.j2:2
@@ -405,10 +468,6 @@ msgid ""
"making use of the Taler payment system for <b>eNetzBon</b>."
msgstr ""
-#: template/terms.html.j2:631
-msgid "Contact"
-msgstr ""
-
#: template/terms.html.j2:634
msgid ""
"You can get into touch with Taler Operations AG via mail or email and on the "
@@ -441,181 +500,234 @@ msgstr ""
msgid "This page explains how to use GNU Taler to make payments."
msgstr ""
-#: template/users.html.j2:25
-msgid "Select instructions for Android"
+#: template/users.html.j2:20
+msgid "Here is what you need to get started paying with GNU Taler:"
msgstr ""
-#: template/users.html.j2:42
-msgid "Select instructions for iOS"
+#: template/users.html.j2:26
+msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\","
msgstr ""
-#: template/users.html.j2:59
-msgid "Select instructions for Firefox"
+#: template/users.html.j2:31
+msgid ""
+"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
+"and"
msgstr ""
-#: template/users.html.j2:76
-msgid "Select instructions for Chrome"
+#: template/users.html.j2:36
+msgid ""
+"<b>Installation</b> of a <a href=\"https://wallet.taler.net/\"; "
+"target=\"_blank\" rel=\"noopener noreferrer\" > Taler wallet 🔗 </a>."
msgstr ""
-#: template/users.html.j2:99
-msgid "Here is what you need to get started paying with Taler:"
+#: template/users.html.j2:46
+msgid ""
+"<a href=\"https://tutorials.taler.net/wallet\"; target=\"_blank\" "
+"rel=\"noopener noreferrer\" > Tutorials available 🎞 </a>."
msgstr ""
-#: template/users.html.j2:104
-msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\";"
+#: template/users.html.j2:65
+msgid "â³ Download GNU Taler wallet â³"
msgstr ""
-#: template/users.html.j2:109
-msgid ""
-"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
-"and;"
+#: template/users.html.j2:79
+msgid "Select platform to view instructions for:"
msgstr ""
-#: template/users.html.j2:114
-msgid ""
-"<b>Installation</b> of a <a href=\"https://wallet.taler.net/\"; "
-"target=\"_blank\" rel=\"noopener noreferrer\" >Taler wallet.</a >"
+#: template/users.html.j2:86
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:103
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:120
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:137
+msgid "Select instructions for Chrome"
msgstr ""
-#: template/users.html.j2:132 template/users.html.j2:163
-#: template/users.html.j2:209 template/users.html.j2:256
-#: template/users.html.j2:300 template/users.html.j2:347
-#: template/users.html.j2:393 template/users.html.j2:441
-#: template/users.html.j2:485
+#: template/users.html.j2:159 template/users.html.j2:196
+#: template/users.html.j2:247 template/users.html.j2:297
+#: template/users.html.j2:349 template/users.html.j2:402
+#: template/users.html.j2:448 template/users.html.j2:504
+#: template/users.html.j2:556
msgid "Step"
msgstr ""
-#: template/users.html.j2:135
-msgid "Select provider"
+#: template/users.html.j2:162
+msgid "Add provider"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:166
msgid ""
"As a first-time user, you need to add Taler Operations as a payment service "
-"provider. The easiest way to do so is to scan the QR code on the right which "
-"will also initiate the withdrawal process."
+"provider. The easiest way to do so is to <b>scan the QR code</b> on the "
+"right or click it to open the link. This will also initiate the withdrawal "
+"process."
msgstr ""
-#: template/users.html.j2:145
+#: template/users.html.j2:174
msgid ""
-"If you already have a payment service provider for the \"CHF\" currency, you "
-"can withdraw digital cash by clicking the \"add\" button on the \"CHF "
-"balance\" screen."
+"If you already have a payment service provider, you can withdraw digital "
+"cash by clicking the \"add\" button on the \"balance\" screen of the "
+"respective currency."
msgstr ""
-#: template/users.html.j2:166
+#: template/users.html.j2:199
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:205
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:173
+#: template/users.html.j2:210
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:212
+#: template/users.html.j2:219 template/users.html.j2:225
+#: template/users.html.j2:231 template/users.html.j2:237
+#: template/users.html.j2:321 template/users.html.j2:327
+#: template/users.html.j2:333 template/users.html.j2:339
+msgid "Wallet requesting amount to withdraw"
+msgstr ""
+
+#: template/users.html.j2:250
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:216
-msgid "Please read the Terms of Service and accept them."
+#: template/users.html.j2:254
+msgid "Please read the terms of service and accept them."
msgstr ""
-#: template/users.html.j2:220
+#: template/users.html.j2:259
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:259
-msgid "Review Operation"
+#: template/users.html.j2:269 template/users.html.j2:275
+#: template/users.html.j2:281 template/users.html.j2:287
+msgid "Wallet showing terms of service"
+msgstr ""
+
+#: template/users.html.j2:300
+msgid "Review operation"
msgstr ""
-#: template/users.html.j2:262
+#: template/users.html.j2:306
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:264
+#: template/users.html.j2:311
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:303
-msgid "Wire Transfer"
+#: template/users.html.j2:352
+msgid "Wire transfer"
msgstr ""
-#: template/users.html.j2:307
+#: template/users.html.j2:358
msgid ""
-"The wallet will show you the subject, target account and amount to transfer."
+"The wallet will show you the wire transfer subject, target account and "
+"amount to transfer."
msgstr ""
-#: template/users.html.j2:311
+#: template/users.html.j2:364
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:349
+#: template/users.html.j2:374 template/users.html.j2:380
+#: template/users.html.j2:386 template/users.html.j2:392
+msgid "Wallet showing wire transfer instructions"
+msgstr ""
+
+#: template/users.html.j2:404
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:352
+#: template/users.html.j2:407
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:357
+#: template/users.html.j2:412
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep "
"the wallet open."
msgstr ""
-#: template/users.html.j2:395
+#: template/users.html.j2:420 template/users.html.j2:426
+#: template/users.html.j2:432 template/users.html.j2:438
+msgid "Wallet showing withdrawal status"
+msgstr ""
+
+#: template/users.html.j2:451
msgid "Shop"
msgstr ""
-#: template/users.html.j2:398
+#: template/users.html.j2:457
msgid ""
"When shopping, the wallet may be launched automatically or you may need to "
"click a link, scan a QR code or even select the wallet extension manually "
"depending on the context."
msgstr ""
-#: template/users.html.j2:403
+#: template/users.html.j2:464
msgid ""
"The QR code scanner button can also be held to manually enter a "
"\"<code>taler://</code>-URI\", for example if you received one via text "
"message."
msgstr ""
-#: template/users.html.j2:443
+#: template/users.html.j2:475 template/users.html.j2:481
+#: template/users.html.j2:487 template/users.html.j2:494
+msgid "Wallet requesting taler://-URI"
+msgstr ""
+
+#: template/users.html.j2:507
msgid "Pay"
msgstr ""
-#: template/users.html.j2:446
+#: template/users.html.j2:513
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:450
+#: template/users.html.j2:519
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:487
+#: template/users.html.j2:528 template/users.html.j2:534
+#: template/users.html.j2:540 template/users.html.j2:546
+msgid "Wallet requesting payment confirmation"
+msgstr ""
+
+#: template/users.html.j2:559
msgid "Manage"
msgstr ""
-#: template/users.html.j2:490
+#: template/users.html.j2:565
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:494
+#: template/users.html.j2:570
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:533
-msgid "Frequently Asked Questions"
+#: template/users.html.j2:580 template/users.html.j2:586
+#: template/users.html.j2:592 template/users.html.j2:598
+msgid "Wallet showing receipt"
+msgstr ""
+
+#: template/users.html.j2:612
+msgid "Frequently Asked Questions 🔗"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 579218d..aa314a3 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-03-31 17:05+0200\n"
+"POT-Creation-Date: 2024-04-02 23:45+0200\n"
"PO-Revision-Date: 2024-02-12 18:13+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: French <https://weblate.taler.net/projects/taler-ops/website/";
@@ -36,67 +36,111 @@ msgstr "Liens directs"
msgid "Taler Operations AG Homepage"
msgstr "Page d'accueil Taler Operations AG"
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:8
msgid "Home"
msgstr "Accueil"
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
-msgid "Fees"
-msgstr "Frais"
+#: common/footer.j2.inc:48
+msgid "GNU Taler system documentation"
+msgstr ""
+
+#: common/footer.j2.inc:51
+#, fuzzy
+#| msgid "NetzBon"
+msgid "Documentation 🔗"
+msgstr "NetzBon"
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
-msgid "Terms of Service"
+#: common/footer.j2.inc:60
+#, fuzzy
+#| msgid "Taler Operations AG - Terms of Service"
+msgid "Taler Operations Terms of Service"
+msgstr "Taler Operations AG - Conditions d'utilisation"
+
+#: common/footer.j2.inc:63
+#, fuzzy
+#| msgid "Terms of Service"
+msgid "Terms of Service 🔗"
msgstr "Conditions d'utilisation"
-#: common/footer.j2.inc:57
+#: common/footer.j2.inc:73
msgid "Partners"
msgstr "Partenaires"
-#: common/footer.j2.inc:65
-msgid "Taler Consortium"
+#: common/footer.j2.inc:80
+#, fuzzy
+#| msgid "Taler Consortium"
+msgid "NGI Taler EU consoritum"
+msgstr "Consortium Taler"
+
+#: common/footer.j2.inc:83
+#, fuzzy
+#| msgid "Taler Consortium"
+msgid "Taler consortium 🔗"
msgstr "Consortium Taler"
-#: common/footer.j2.inc:74
+#: common/footer.j2.inc:92
+#, fuzzy
+#| msgid "Bern University of Applied Sciences"
+msgid "Bern University of Applied Sciences"
+msgstr "Haute école spécialisée bernoise"
+
+#: common/footer.j2.inc:96
#, fuzzy
#| msgid "Bern University of Applied Sciences"
-msgid "Bern University of Applied Sciences"
+msgid "Bern University of Applied Sciences 🔗"
msgstr "Haute école spécialisée bernoise"
-#: common/footer.j2.inc:84
-msgid "NetzBon"
+#: common/footer.j2.inc:105
+msgid "Netzbon: Regional currency Basel"
+msgstr ""
+
+#: common/footer.j2.inc:109
+#, fuzzy
+#| msgid "NetzBon"
+msgid "NetzBon 🔗"
msgstr "NetzBon"
-#: common/footer.j2.inc:92
-msgid "Contacts"
+#: common/footer.j2.inc:119 template/terms.html.j2:631
+msgid "Contact"
msgstr "Contacts"
-#: common/footer.j2.inc:96
+#: common/footer.j2.inc:123
msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:101
-msgid "Compliance Officer"
+#: common/footer.j2.inc:129
+#, fuzzy
+#| msgid "Compliance Officer"
+msgid "Compliance officer 📧"
msgstr "Responsable de la conformité"
-#: common/footer.j2.inc:106
-msgid "AML Officer"
-msgstr "Agent de lutte contre le blanchiment d'argent"
+#: common/footer.j2.inc:135
+msgid "General inquiries 📧"
+msgstr ""
-#: common/footer.j2.inc:118
+#: common/footer.j2.inc:147
msgid "Copyright"
msgstr "Droits d'auteur"
-#: common/footer.j2.inc:121
-msgid "Licensed under the"
+#: common/footer.j2.inc:153
+msgid ""
+"Licensed under the <a href=\"https://www.gnu.org/licenses/fdl-1.3.html.en\"; "
+"target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\" > GNU Free "
+"Documentation License 🔗 </a>."
msgstr ""
-#: common/footer.j2.inc:134
-#, fuzzy
+#: common/footer.j2.inc:166
msgid ""
"We do not assume any liability for the correctness of contents. We do not "
-"collect any data and do not use cookies. </p> <p> Our web server generates a "
-"log file with IP addresses of visitors. However, these are stored & "
-"processed exclusively for troubleshooting and mitigating problems."
+"collect any data and do not use cookies."
+msgstr ""
+
+#: common/footer.j2.inc:172
+#, fuzzy
+msgid ""
+"Our web server generates a log file with IP addresses of visitors. However, "
+"these are stored & processed exclusively for troubleshooting and "
+"mitigating problems."
msgstr ""
"Nous ne prenons aucune responsabilité sur l'exactitude des contenus. Nous ne "
"conservons aucune données et n'utilisons pas de cookies. <br>Notre serveur "
@@ -108,16 +152,20 @@ msgstr ""
msgid "Skip to main content"
msgstr "Aller au menu principal"
-#: common/navigation/items.j2.inc:12
+#: common/navigation/items.j2.inc:14
msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:17
+#: common/navigation/items.j2.inc:20
#, fuzzy
#| msgid "Taler Operations AG - Merchants"
msgid "Merchants"
msgstr "Taler Operations AG - Pour marchands"
+#: common/navigation/items.j2.inc:26
+msgid "Fees"
+msgstr "Frais"
+
#: template/fees.html.j2:2
#, fuzzy
#| msgid "Taler Operations AG - Users"
@@ -188,11 +236,11 @@ msgid ""
"amounts."
msgstr ""
-#: template/fees.html.j2:113
+#: template/fees.html.j2:115
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:117
+#: template/fees.html.j2:119
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations to "
"wire transfers that return funds to customers when either the Taler wallet "
@@ -202,18 +250,18 @@ msgid ""
"transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:126
+#: template/fees.html.j2:130
msgid ""
"To avoid paying bounce fees payers should be careful when entering the wire "
"transfer subject, and ensure that their wallet is online within a month of "
"initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:135
+#: template/fees.html.j2:141
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:139
+#: template/fees.html.j2:145
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> validity "
"period. One month before the expiration date, you wallet should "
@@ -223,7 +271,7 @@ msgid ""
"regularly online to avoid losing money due to expiration!"
msgstr ""
-#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:27
+#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:28
#, fuzzy
#| msgid "Taler Operations AG, Biel, Switzerland"
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
@@ -233,42 +281,52 @@ msgstr "Taler Operations AG, Bienne, Suisse"
msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr ""
-#: template/index.html.j2:31
+#: template/index.html.j2:34
msgid ""
"Taler Operations is not supervised by the Swiss Financial Market Supervisory "
-"Authority (FINMA). Escrowed customer assets are held in a segregated bank "
-"account."
+"Authority (FINMA). Escrowed customer assets are not subject to deposit "
+"insurance but held in a segregated bank account."
msgstr ""
-#: template/index.html.j2:41
+#: template/index.html.j2:46
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:52
-msgid "Getting Started with Taler"
+#: template/index.html.j2:57
+msgid "Getting started with Taler"
msgstr ""
-#: template/index.html.j2:60
+#: template/index.html.j2:65
+msgid "happy user"
+msgstr ""
+
+#: template/index.html.j2:66
msgid "For Users"
msgstr ""
-#: template/index.html.j2:61
+#: template/index.html.j2:68
msgid "Your data and money under your control."
msgstr ""
-#: template/index.html.j2:66
+#: template/index.html.j2:77
msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:71
+#: template/index.html.j2:84
+#, fuzzy
+#| msgid "Taler Operations AG - Merchants"
+msgid "happy merchant"
+msgstr "Taler Operations AG - Pour marchands"
+
+#: template/index.html.j2:85
msgid "For Merchants"
msgstr ""
-#: template/index.html.j2:73
+#: template/index.html.j2:87
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
-#: template/index.html.j2:79
+#: template/index.html.j2:96
msgid "Integrate"
msgstr ""
@@ -284,125 +342,148 @@ msgid ""
"payments."
msgstr ""
-#: template/merchants.html.j2:25 template/users.html.j2:97
+#: template/merchants.html.j2:25 template/users.html.j2:18
msgid "Prerequisites"
msgstr ""
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:30
msgid ""
-"Open Swiss bank account, ideally with support for <a target=\"_blank\" "
-"href=\"https://www.ebics.org/\";>EBICS</a>."
+"Here is what you need to get started to integrate Taler as a payment option "
+"into your payment process:"
msgstr ""
-#: template/merchants.html.j2:34
+#: template/merchants.html.j2:38
msgid ""
-"<a target=\"_blank\" href=\"https://docs.taler.net/taler-merchant-manual.";
-"html\" > Taler merchant backend</a > configured with your Swiss IBAN number."
+"Swiss bank account, ideally with support for <a target=\"_blank\" "
+"href=\"https://www.ebics.org/\";>EBICS 🔗</a>."
msgstr ""
#: template/merchants.html.j2:44
-msgid "Offer Taler as a payment option in your payment process."
+msgid ""
+"<a target=\"_blank\" href=\"https://docs.taler.net/taler-merchant-manual.";
+"html\" > Taler merchant backend 🔗 </a> configured with your Swiss IBAN "
+"number."
msgstr ""
-#: template/merchants.html.j2:53
+#: template/merchants.html.j2:64
+msgid "â³ Install GNU Taler merchant backend â³"
+msgstr ""
+
+#: template/merchants.html.j2:73
msgid "For in-person sales"
msgstr ""
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:78
msgid ""
"The merchant backend can generate static QR codes customers can scan to pay "
"you."
msgstr ""
-#: template/merchants.html.j2:59
+#: template/merchants.html.j2:84
msgid "You can hard-code a price or have the customer enter the price."
msgstr ""
-#: template/merchants.html.j2:67
-msgid "Watch tutorial"
+#: template/merchants.html.j2:95
+msgid "Watch tutorial 🎞"
msgstr ""
-#: template/merchants.html.j2:84
+#: template/merchants.html.j2:115
msgid "For WooCommerce"
msgstr ""
-#: template/merchants.html.j2:86
+#: template/merchants.html.j2:120
msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
msgstr ""
-#: template/merchants.html.j2:90 template/merchants.html.j2:120
-#: template/merchants.html.j2:151
+#: template/merchants.html.j2:126 template/merchants.html.j2:167
+#: template/merchants.html.j2:209
msgid "You mostly need to configure access to your Taler merchant backend."
msgstr ""
-#: template/merchants.html.j2:98
-msgid "WooCommerce plugin"
+#: template/merchants.html.j2:137
+msgid "â³ WooCommerce plugin â³"
+msgstr ""
+
+#: template/merchants.html.j2:146
+msgid "Screenshot of Woocommerce settings dialog"
msgstr ""
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:156
msgid "For Pretix"
msgstr ""
-#: template/merchants.html.j2:116
+#: template/merchants.html.j2:161
msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
msgstr ""
-#: template/merchants.html.j2:128
-msgid "Pretix plugin"
+#: template/merchants.html.j2:178
+msgid "â³ Pretix plugin â³"
msgstr ""
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:188
+msgid "Pretix logo"
+msgstr ""
+
+#: template/merchants.html.j2:198
msgid "For Joomla!"
msgstr ""
-#: template/merchants.html.j2:147
+#: template/merchants.html.j2:203
msgid ""
"A payment plugin is availalbe to add GNU Taler support to Joomla! with "
"Payage."
msgstr ""
-#: template/merchants.html.j2:159
-msgid "Joomla! plugin"
+#: template/merchants.html.j2:220
+msgid "â³ Joomla! plugin â³"
msgstr ""
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:229
+msgid "Woocommerce Taler settings"
+msgstr ""
+
+#: template/merchants.html.j2:238
msgid "For points of sale"
msgstr ""
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:240
msgid ""
"A point-of-sale App for Android can be used to quickly set up orders and "
"handle payments."
msgstr ""
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:246
msgid ""
"The App was designed for restaurants, but might be useful for other types of "
"in-person sales."
msgstr ""
-#: template/merchants.html.j2:189
-msgid "App manual"
+#: template/merchants.html.j2:257
+msgid "App manual 🔗"
+msgstr ""
+
+#: template/merchants.html.j2:266
+msgid "GNU Taler point-of-sale app user interface screenshot"
msgstr ""
-#: template/merchants.html.j2:205
+#: template/merchants.html.j2:276
msgid "For developers"
msgstr ""
-#: template/merchants.html.j2:207
+#: template/merchants.html.j2:281
msgid ""
"The merchant backend offers a simple REST API to integrate GNU Taler into "
"existing E-commerce systems."
msgstr ""
-#: template/merchants.html.j2:211
+#: template/merchants.html.j2:287
msgid ""
"Documentation is available at <a target=\"_blank\" href=\"https://docs.taler.";
-"net/\">docs.taler.net</a>."
+"net/\">docs.taler.net 🔗</a>."
msgstr ""
-#: template/merchants.html.j2:220
-msgid "Watch tutorials"
+#: template/merchants.html.j2:297
+msgid "Watch tutorials 🎞"
msgstr ""
#: template/terms.html.j2:2
@@ -425,10 +506,6 @@ msgid ""
"making use of the Taler payment system for <b>eNetzBon</b>."
msgstr ""
-#: template/terms.html.j2:631
-msgid "Contact"
-msgstr "Contacts"
-
#: template/terms.html.j2:634
msgid ""
"You can get into touch with Taler Operations AG via mail or email and on the "
@@ -463,185 +540,254 @@ msgstr "Taler Operations AG - Pour les clients"
msgid "This page explains how to use GNU Taler to make payments."
msgstr ""
-#: template/users.html.j2:25
-msgid "Select instructions for Android"
+#: template/users.html.j2:20
+msgid "Here is what you need to get started paying with GNU Taler:"
msgstr ""
-#: template/users.html.j2:42
-msgid "Select instructions for iOS"
+#: template/users.html.j2:26
+msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\","
msgstr ""
-#: template/users.html.j2:59
-msgid "Select instructions for Firefox"
+#: template/users.html.j2:31
+msgid ""
+"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
+"and"
msgstr ""
-#: template/users.html.j2:76
-msgid "Select instructions for Chrome"
+#: template/users.html.j2:36
+msgid ""
+"<b>Installation</b> of a <a href=\"https://wallet.taler.net/\"; "
+"target=\"_blank\" rel=\"noopener noreferrer\" > Taler wallet 🔗 </a>."
msgstr ""
-#: template/users.html.j2:99
-msgid "Here is what you need to get started paying with Taler:"
+#: template/users.html.j2:46
+msgid ""
+"<a href=\"https://tutorials.taler.net/wallet\"; target=\"_blank\" "
+"rel=\"noopener noreferrer\" > Tutorials available 🎞 </a>."
msgstr ""
-#: template/users.html.j2:104
-msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\";"
+#: template/users.html.j2:65
+msgid "â³ Download GNU Taler wallet â³"
msgstr ""
-#: template/users.html.j2:109
-msgid ""
-"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
-"and;"
+#: template/users.html.j2:79
+msgid "Select platform to view instructions for:"
msgstr ""
-#: template/users.html.j2:114
-msgid ""
-"<b>Installation</b> of a <a href=\"https://wallet.taler.net/\"; "
-"target=\"_blank\" rel=\"noopener noreferrer\" >Taler wallet.</a >"
+#: template/users.html.j2:86
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:103
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:120
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:137
+msgid "Select instructions for Chrome"
msgstr ""
-#: template/users.html.j2:132 template/users.html.j2:163
-#: template/users.html.j2:209 template/users.html.j2:256
-#: template/users.html.j2:300 template/users.html.j2:347
-#: template/users.html.j2:393 template/users.html.j2:441
-#: template/users.html.j2:485
+#: template/users.html.j2:159 template/users.html.j2:196
+#: template/users.html.j2:247 template/users.html.j2:297
+#: template/users.html.j2:349 template/users.html.j2:402
+#: template/users.html.j2:448 template/users.html.j2:504
+#: template/users.html.j2:556
msgid "Step"
msgstr ""
-#: template/users.html.j2:135
-msgid "Select provider"
+#: template/users.html.j2:162
+msgid "Add provider"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:166
msgid ""
"As a first-time user, you need to add Taler Operations as a payment service "
-"provider. The easiest way to do so is to scan the QR code on the right which "
-"will also initiate the withdrawal process."
+"provider. The easiest way to do so is to <b>scan the QR code</b> on the "
+"right or click it to open the link. This will also initiate the withdrawal "
+"process."
msgstr ""
-#: template/users.html.j2:145
+#: template/users.html.j2:174
msgid ""
-"If you already have a payment service provider for the \"CHF\" currency, you "
-"can withdraw digital cash by clicking the \"add\" button on the \"CHF "
-"balance\" screen."
+"If you already have a payment service provider, you can withdraw digital "
+"cash by clicking the \"add\" button on the \"balance\" screen of the "
+"respective currency."
msgstr ""
-#: template/users.html.j2:166
+#: template/users.html.j2:199
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:205
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:173
+#: template/users.html.j2:210
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:212
+#: template/users.html.j2:219 template/users.html.j2:225
+#: template/users.html.j2:231 template/users.html.j2:237
+#: template/users.html.j2:321 template/users.html.j2:327
+#: template/users.html.j2:333 template/users.html.j2:339
+msgid "Wallet requesting amount to withdraw"
+msgstr ""
+
+#: template/users.html.j2:250
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:216
-msgid "Please read the Terms of Service and accept them."
+#: template/users.html.j2:254
+msgid "Please read the terms of service and accept them."
msgstr ""
-#: template/users.html.j2:220
+#: template/users.html.j2:259
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:259
-msgid "Review Operation"
+#: template/users.html.j2:269 template/users.html.j2:275
+#: template/users.html.j2:281 template/users.html.j2:287
+#, fuzzy
+#| msgid "eNetzBon Terms of Service"
+msgid "Wallet showing terms of service"
+msgstr "Conditions d'utilisation pour eNetzBon"
+
+#: template/users.html.j2:300
+msgid "Review operation"
msgstr ""
-#: template/users.html.j2:262
+#: template/users.html.j2:306
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:264
+#: template/users.html.j2:311
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:303
-msgid "Wire Transfer"
+#: template/users.html.j2:352
+msgid "Wire transfer"
msgstr ""
-#: template/users.html.j2:307
+#: template/users.html.j2:358
msgid ""
-"The wallet will show you the subject, target account and amount to transfer."
+"The wallet will show you the wire transfer subject, target account and "
+"amount to transfer."
msgstr ""
-#: template/users.html.j2:311
+#: template/users.html.j2:364
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:349
+#: template/users.html.j2:374 template/users.html.j2:380
+#: template/users.html.j2:386 template/users.html.j2:392
+msgid "Wallet showing wire transfer instructions"
+msgstr ""
+
+#: template/users.html.j2:404
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:352
+#: template/users.html.j2:407
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:357
+#: template/users.html.j2:412
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep "
"the wallet open."
msgstr ""
-#: template/users.html.j2:395
+#: template/users.html.j2:420 template/users.html.j2:426
+#: template/users.html.j2:432 template/users.html.j2:438
+msgid "Wallet showing withdrawal status"
+msgstr ""
+
+#: template/users.html.j2:451
msgid "Shop"
msgstr ""
-#: template/users.html.j2:398
+#: template/users.html.j2:457
msgid ""
"When shopping, the wallet may be launched automatically or you may need to "
"click a link, scan a QR code or even select the wallet extension manually "
"depending on the context."
msgstr ""
-#: template/users.html.j2:403
+#: template/users.html.j2:464
msgid ""
"The QR code scanner button can also be held to manually enter a "
"\"<code>taler://</code>-URI\", for example if you received one via text "
"message."
msgstr ""
-#: template/users.html.j2:443
+#: template/users.html.j2:475 template/users.html.j2:481
+#: template/users.html.j2:487 template/users.html.j2:494
+msgid "Wallet requesting taler://-URI"
+msgstr ""
+
+#: template/users.html.j2:507
msgid "Pay"
msgstr ""
-#: template/users.html.j2:446
+#: template/users.html.j2:513
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:450
+#: template/users.html.j2:519
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:487
+#: template/users.html.j2:528 template/users.html.j2:534
+#: template/users.html.j2:540 template/users.html.j2:546
+msgid "Wallet requesting payment confirmation"
+msgstr ""
+
+#: template/users.html.j2:559
msgid "Manage"
msgstr ""
-#: template/users.html.j2:490
+#: template/users.html.j2:565
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:494
+#: template/users.html.j2:570
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:533
-msgid "Frequently Asked Questions"
+#: template/users.html.j2:580 template/users.html.j2:586
+#: template/users.html.j2:592 template/users.html.j2:598
+msgid "Wallet showing receipt"
msgstr ""
+#: template/users.html.j2:612
+msgid "Frequently Asked Questions 🔗"
+msgstr ""
+
+#~ msgid "Contacts"
+#~ msgstr "Contacts"
+
+#, fuzzy
+#~| msgid "Contacts"
+#~ msgid "Contact Us 📧"
+#~ msgstr "Contacts"
+
+#~ msgid "Terms of Service"
+#~ msgstr "Conditions d'utilisation"
+
+#~ msgid "AML Officer"
+#~ msgstr "Agent de lutte contre le blanchiment d'argent"
+
#~ msgid "License"
#~ msgstr "Licence"
diff --git a/locale/messages.pot b/locale/messages.pot
index d80f7c4..3175fab 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-03-31 17:05+0200\n"
+"POT-Creation-Date: 2024-04-02 23:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.14.0\n"
+"Generated-By: Babel 2.10.3\n"
#: common/base.j2:24 common/base.j2:28
msgid "Taler Operations AG, Biel, Switzerland"
@@ -33,79 +33,111 @@ msgstr ""
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:8
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
-msgid "Fees"
+#: common/footer.j2.inc:48
+msgid "GNU Taler system documentation"
msgstr ""
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
-msgid "Terms of Service"
+#: common/footer.j2.inc:51
+msgid "Documentation 🔗"
msgstr ""
-#: common/footer.j2.inc:57
-msgid "Partners"
+#: common/footer.j2.inc:60
+msgid "Taler Operations Terms of Service"
+msgstr ""
+
+#: common/footer.j2.inc:63
+msgid "Terms of Service 🔗"
msgstr ""
-#: common/footer.j2.inc:65
-msgid "Taler Consortium"
+#: common/footer.j2.inc:73
+msgid "Partners"
msgstr ""
-#: common/footer.j2.inc:74
-msgid "Bern University of Applied Sciences"
+#: common/footer.j2.inc:80
+msgid "NGI Taler EU consoritum"
msgstr ""
-#: common/footer.j2.inc:84
-msgid "NetzBon"
+#: common/footer.j2.inc:83
+msgid "Taler consortium 🔗"
msgstr ""
#: common/footer.j2.inc:92
-msgid "Contacts"
+msgid "Bern University of Applied Sciences"
msgstr ""
#: common/footer.j2.inc:96
+msgid "Bern University of Applied Sciences 🔗"
+msgstr ""
+
+#: common/footer.j2.inc:105
+msgid "Netzbon: Regional currency Basel"
+msgstr ""
+
+#: common/footer.j2.inc:109
+msgid "NetzBon 🔗"
+msgstr ""
+
+#: common/footer.j2.inc:119 template/terms.html.j2:631
+msgid "Contact"
+msgstr ""
+
+#: common/footer.j2.inc:123
msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:101
-msgid "Compliance Officer"
+#: common/footer.j2.inc:129
+msgid "Compliance officer 📧"
msgstr ""
-#: common/footer.j2.inc:106
-msgid "AML Officer"
+#: common/footer.j2.inc:135
+msgid "General inquiries 📧"
msgstr ""
-#: common/footer.j2.inc:118
+#: common/footer.j2.inc:147
msgid "Copyright"
msgstr ""
-#: common/footer.j2.inc:121
-msgid "Licensed under the"
+#: common/footer.j2.inc:153
+msgid ""
+"Licensed under the <a "
+"href=\"https://www.gnu.org/licenses/fdl-1.3.html.en\"; target=\"_blank\" "
+"rel=\"noopener noreferrer\" class=\"link\" > GNU Free Documentation "
+"License 🔗 </a>."
msgstr ""
-#: common/footer.j2.inc:134
+#: common/footer.j2.inc:166
msgid ""
"We do not assume any liability for the correctness of contents. We do not"
-" collect any data and do not use cookies. </p> <p> Our web server "
-"generates a log file with IP addresses of visitors. However, these are "
-"stored & processed exclusively for troubleshooting and mitigating "
-"problems."
+" collect any data and do not use cookies."
+msgstr ""
+
+#: common/footer.j2.inc:172
+msgid ""
+"Our web server generates a log file with IP addresses of visitors. "
+"However, these are stored & processed exclusively for troubleshooting"
+" and mitigating problems."
msgstr ""
#: common/navigation/index.j2.inc:7
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:12
+#: common/navigation/items.j2.inc:14
msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:17
+#: common/navigation/items.j2.inc:20
msgid "Merchants"
msgstr ""
+#: common/navigation/items.j2.inc:26
+msgid "Fees"
+msgstr ""
+
#: template/fees.html.j2:2
msgid "GNU Taler Operations Fees"
msgstr ""
@@ -175,11 +207,11 @@ msgid ""
"transaction amounts."
msgstr ""
-#: template/fees.html.j2:113
+#: template/fees.html.j2:115
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:117
+#: template/fees.html.j2:119
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations"
" to wire transfers that return funds to customers when either the Taler "
@@ -189,18 +221,18 @@ msgid ""
"amount transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:126
+#: template/fees.html.j2:130
msgid ""
"To avoid paying bounce fees payers should be careful when entering the "
"wire transfer subject, and ensure that their wallet is online within a "
"month of initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:135
+#: template/fees.html.j2:141
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:139
+#: template/fees.html.j2:145
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> "
"validity period. One month before the expiration date, you wallet should "
@@ -210,7 +242,7 @@ msgid ""
" is regularly online to avoid losing money due to expiration!"
msgstr ""
-#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:27
+#: template/index.html.j2:5 template/index.html.j2:9 template/index.html.j2:28
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
msgstr ""
@@ -218,42 +250,50 @@ msgstr ""
msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr ""
-#: template/index.html.j2:31
+#: template/index.html.j2:34
msgid ""
"Taler Operations is not supervised by the Swiss Financial Market "
-"Supervisory Authority (FINMA). Escrowed customer assets are held in a "
-"segregated bank account."
+"Supervisory Authority (FINMA). Escrowed customer assets are not subject "
+"to deposit insurance but held in a segregated bank account."
msgstr ""
-#: template/index.html.j2:41
+#: template/index.html.j2:46
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:52
-msgid "Getting Started with Taler"
+#: template/index.html.j2:57
+msgid "Getting started with Taler"
+msgstr ""
+
+#: template/index.html.j2:65
+msgid "happy user"
msgstr ""
-#: template/index.html.j2:60
+#: template/index.html.j2:66
msgid "For Users"
msgstr ""
-#: template/index.html.j2:61
+#: template/index.html.j2:68
msgid "Your data and money under your control."
msgstr ""
-#: template/index.html.j2:66
+#: template/index.html.j2:77
msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:71
+#: template/index.html.j2:84
+msgid "happy merchant"
+msgstr ""
+
+#: template/index.html.j2:85
msgid "For Merchants"
msgstr ""
-#: template/index.html.j2:73
+#: template/index.html.j2:87
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
-#: template/index.html.j2:79
+#: template/index.html.j2:96
msgid "Integrate"
msgstr ""
@@ -267,126 +307,148 @@ msgid ""
"payments."
msgstr ""
-#: template/merchants.html.j2:25 template/users.html.j2:97
+#: template/merchants.html.j2:25 template/users.html.j2:18
msgid "Prerequisites"
msgstr ""
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:30
+msgid ""
+"Here is what you need to get started to integrate Taler as a payment "
+"option into your payment process:"
+msgstr ""
+
+#: template/merchants.html.j2:38
msgid ""
-"Open Swiss bank account, ideally with support for <a target=\"_blank\" "
-"href=\"https://www.ebics.org/\";>EBICS</a>."
+"Swiss bank account, ideally with support for <a target=\"_blank\" "
+"href=\"https://www.ebics.org/\";>EBICS 🔗</a>."
msgstr ""
-#: template/merchants.html.j2:34
+#: template/merchants.html.j2:44
msgid ""
"<a target=\"_blank\" href=\"https://docs.taler.net/taler-merchant-";
-"manual.html\" > Taler merchant backend</a > configured with your Swiss "
+"manual.html\" > Taler merchant backend 🔗 </a> configured with your Swiss "
"IBAN number."
msgstr ""
-#: template/merchants.html.j2:44
-msgid "Offer Taler as a payment option in your payment process."
+#: template/merchants.html.j2:64
+msgid "â³ Install GNU Taler merchant backend â³"
msgstr ""
-#: template/merchants.html.j2:53
+#: template/merchants.html.j2:73
msgid "For in-person sales"
msgstr ""
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:78
msgid ""
"The merchant backend can generate static QR codes customers can scan to "
"pay you."
msgstr ""
-#: template/merchants.html.j2:59
+#: template/merchants.html.j2:84
msgid "You can hard-code a price or have the customer enter the price."
msgstr ""
-#: template/merchants.html.j2:67
-msgid "Watch tutorial"
+#: template/merchants.html.j2:95
+msgid "Watch tutorial 🎞"
msgstr ""
-#: template/merchants.html.j2:84
+#: template/merchants.html.j2:115
msgid "For WooCommerce"
msgstr ""
-#: template/merchants.html.j2:86
+#: template/merchants.html.j2:120
msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
msgstr ""
-#: template/merchants.html.j2:90 template/merchants.html.j2:120
-#: template/merchants.html.j2:151
+#: template/merchants.html.j2:126 template/merchants.html.j2:167
+#: template/merchants.html.j2:209
msgid "You mostly need to configure access to your Taler merchant backend."
msgstr ""
-#: template/merchants.html.j2:98
-msgid "WooCommerce plugin"
+#: template/merchants.html.j2:137
+msgid "â³ WooCommerce plugin â³"
msgstr ""
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:146
+msgid "Screenshot of Woocommerce settings dialog"
+msgstr ""
+
+#: template/merchants.html.j2:156
msgid "For Pretix"
msgstr ""
-#: template/merchants.html.j2:116
+#: template/merchants.html.j2:161
msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
msgstr ""
-#: template/merchants.html.j2:128
-msgid "Pretix plugin"
+#: template/merchants.html.j2:178
+msgid "â³ Pretix plugin â³"
+msgstr ""
+
+#: template/merchants.html.j2:188
+msgid "Pretix logo"
msgstr ""
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:198
msgid "For Joomla!"
msgstr ""
-#: template/merchants.html.j2:147
+#: template/merchants.html.j2:203
msgid ""
"A payment plugin is availalbe to add GNU Taler support to Joomla! with "
"Payage."
msgstr ""
-#: template/merchants.html.j2:159
-msgid "Joomla! plugin"
+#: template/merchants.html.j2:220
+msgid "â³ Joomla! plugin â³"
+msgstr ""
+
+#: template/merchants.html.j2:229
+msgid "Woocommerce Taler settings"
msgstr ""
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:238
msgid "For points of sale"
msgstr ""
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:240
msgid ""
"A point-of-sale App for Android can be used to quickly set up orders and "
"handle payments."
msgstr ""
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:246
msgid ""
"The App was designed for restaurants, but might be useful for other types"
" of in-person sales."
msgstr ""
-#: template/merchants.html.j2:189
-msgid "App manual"
+#: template/merchants.html.j2:257
+msgid "App manual 🔗"
msgstr ""
-#: template/merchants.html.j2:205
+#: template/merchants.html.j2:266
+msgid "GNU Taler point-of-sale app user interface screenshot"
+msgstr ""
+
+#: template/merchants.html.j2:276
msgid "For developers"
msgstr ""
-#: template/merchants.html.j2:207
+#: template/merchants.html.j2:281
msgid ""
"The merchant backend offers a simple REST API to integrate GNU Taler into"
" existing E-commerce systems."
msgstr ""
-#: template/merchants.html.j2:211
+#: template/merchants.html.j2:287
msgid ""
"Documentation is available at <a target=\"_blank\" "
-"href=\"https://docs.taler.net/\";>docs.taler.net</a>."
+"href=\"https://docs.taler.net/\";>docs.taler.net 🔗</a>."
msgstr ""
-#: template/merchants.html.j2:220
-msgid "Watch tutorials"
+#: template/merchants.html.j2:297
+msgid "Watch tutorials 🎞"
msgstr ""
#: template/terms.html.j2:2
@@ -407,10 +469,6 @@ msgid ""
"merchant</b> making use of the Taler payment system for <b>eNetzBon</b>."
msgstr ""
-#: template/terms.html.j2:631
-msgid "Contact"
-msgstr ""
-
#: template/terms.html.j2:634
msgid ""
"You can get into touch with Taler Operations AG via mail or email and on "
@@ -443,183 +501,235 @@ msgstr ""
msgid "This page explains how to use GNU Taler to make payments."
msgstr ""
-#: template/users.html.j2:25
-msgid "Select instructions for Android"
+#: template/users.html.j2:20
+msgid "Here is what you need to get started paying with GNU Taler:"
msgstr ""
-#: template/users.html.j2:42
-msgid "Select instructions for iOS"
+#: template/users.html.j2:26
+msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\","
msgstr ""
-#: template/users.html.j2:59
-msgid "Select instructions for Firefox"
+#: template/users.html.j2:31
+msgid ""
+"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P "
+"payments, and"
msgstr ""
-#: template/users.html.j2:76
-msgid "Select instructions for Chrome"
+#: template/users.html.j2:36
+msgid ""
+"<b>Installation</b> of a <a href=\"https://wallet.taler.net/\"; "
+"target=\"_blank\" rel=\"noopener noreferrer\" > Taler wallet 🔗 </a>."
msgstr ""
-#: template/users.html.j2:99
-msgid "Here is what you need to get started paying with Taler:"
+#: template/users.html.j2:46
+msgid ""
+"<a href=\"https://tutorials.taler.net/wallet\"; target=\"_blank\" "
+"rel=\"noopener noreferrer\" > Tutorials available 🎞 </a>."
msgstr ""
-#: template/users.html.j2:104
-msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\";"
+#: template/users.html.j2:65
+msgid "â³ Download GNU Taler wallet â³"
msgstr ""
-#: template/users.html.j2:109
-msgid ""
-"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P "
-"payments, and;"
+#: template/users.html.j2:79
+msgid "Select platform to view instructions for:"
msgstr ""
-#: template/users.html.j2:114
-msgid ""
-"<b>Installation</b> of a <a href=\"https://wallet.taler.net/\"; "
-"target=\"_blank\" rel=\"noopener noreferrer\" >Taler wallet.</a >"
+#: template/users.html.j2:86
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:103
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:120
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:137
+msgid "Select instructions for Chrome"
msgstr ""
-#: template/users.html.j2:132 template/users.html.j2:163
-#: template/users.html.j2:209 template/users.html.j2:256
-#: template/users.html.j2:300 template/users.html.j2:347
-#: template/users.html.j2:393 template/users.html.j2:441
-#: template/users.html.j2:485
+#: template/users.html.j2:159 template/users.html.j2:196
+#: template/users.html.j2:247 template/users.html.j2:297
+#: template/users.html.j2:349 template/users.html.j2:402
+#: template/users.html.j2:448 template/users.html.j2:504
+#: template/users.html.j2:556
msgid "Step"
msgstr ""
-#: template/users.html.j2:135
-msgid "Select provider"
+#: template/users.html.j2:162
+msgid "Add provider"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:166
msgid ""
"As a first-time user, you need to add Taler Operations as a payment "
-"service provider. The easiest way to do so is to scan the QR code on the "
-"right which will also initiate the withdrawal process."
+"service provider. The easiest way to do so is to <b>scan the QR code</b> "
+"on the right or click it to open the link. This will also initiate the "
+"withdrawal process."
msgstr ""
-#: template/users.html.j2:145
+#: template/users.html.j2:174
msgid ""
-"If you already have a payment service provider for the \"CHF\" currency, "
-"you can withdraw digital cash by clicking the \"add\" button on the \"CHF"
-" balance\" screen."
+"If you already have a payment service provider, you can withdraw digital "
+"cash by clicking the \"add\" button on the \"balance\" screen of the "
+"respective currency."
msgstr ""
-#: template/users.html.j2:166
+#: template/users.html.j2:199
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:205
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:173
+#: template/users.html.j2:210
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:212
+#: template/users.html.j2:219 template/users.html.j2:225
+#: template/users.html.j2:231 template/users.html.j2:237
+#: template/users.html.j2:321 template/users.html.j2:327
+#: template/users.html.j2:333 template/users.html.j2:339
+msgid "Wallet requesting amount to withdraw"
+msgstr ""
+
+#: template/users.html.j2:250
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:216
-msgid "Please read the Terms of Service and accept them."
+#: template/users.html.j2:254
+msgid "Please read the terms of service and accept them."
msgstr ""
-#: template/users.html.j2:220
+#: template/users.html.j2:259
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:259
-msgid "Review Operation"
+#: template/users.html.j2:269 template/users.html.j2:275
+#: template/users.html.j2:281 template/users.html.j2:287
+msgid "Wallet showing terms of service"
+msgstr ""
+
+#: template/users.html.j2:300
+msgid "Review operation"
msgstr ""
-#: template/users.html.j2:262
+#: template/users.html.j2:306
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:264
+#: template/users.html.j2:311
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:303
-msgid "Wire Transfer"
+#: template/users.html.j2:352
+msgid "Wire transfer"
msgstr ""
-#: template/users.html.j2:307
+#: template/users.html.j2:358
msgid ""
-"The wallet will show you the subject, target account and amount to "
-"transfer."
+"The wallet will show you the wire transfer subject, target account and "
+"amount to transfer."
msgstr ""
-#: template/users.html.j2:311
+#: template/users.html.j2:364
msgid ""
"Copy the information into your online banking application and wire the "
"funds to the payment service provider."
msgstr ""
-#: template/users.html.j2:349
+#: template/users.html.j2:374 template/users.html.j2:380
+#: template/users.html.j2:386 template/users.html.j2:392
+msgid "Wallet showing wire transfer instructions"
+msgstr ""
+
+#: template/users.html.j2:404
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:352
+#: template/users.html.j2:407
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:357
+#: template/users.html.j2:412
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep"
" the wallet open."
msgstr ""
-#: template/users.html.j2:395
+#: template/users.html.j2:420 template/users.html.j2:426
+#: template/users.html.j2:432 template/users.html.j2:438
+msgid "Wallet showing withdrawal status"
+msgstr ""
+
+#: template/users.html.j2:451
msgid "Shop"
msgstr ""
-#: template/users.html.j2:398
+#: template/users.html.j2:457
msgid ""
"When shopping, the wallet may be launched automatically or you may need "
"to click a link, scan a QR code or even select the wallet extension "
"manually depending on the context."
msgstr ""
-#: template/users.html.j2:403
+#: template/users.html.j2:464
msgid ""
"The QR code scanner button can also be held to manually enter a "
"\"<code>taler://</code>-URI\", for example if you received one via text "
"message."
msgstr ""
-#: template/users.html.j2:443
+#: template/users.html.j2:475 template/users.html.j2:481
+#: template/users.html.j2:487 template/users.html.j2:494
+msgid "Wallet requesting taler://-URI"
+msgstr ""
+
+#: template/users.html.j2:507
msgid "Pay"
msgstr ""
-#: template/users.html.j2:446
+#: template/users.html.j2:513
msgid ""
"The wallet will show you details about what you are buying, including the"
" price and applicable fees."
msgstr ""
-#: template/users.html.j2:450
+#: template/users.html.j2:519
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:487
+#: template/users.html.j2:528 template/users.html.j2:534
+#: template/users.html.j2:540 template/users.html.j2:546
+msgid "Wallet requesting payment confirmation"
+msgstr ""
+
+#: template/users.html.j2:559
msgid "Manage"
msgstr ""
-#: template/users.html.j2:490
+#: template/users.html.j2:565
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:494
+#: template/users.html.j2:570
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:533
-msgid "Frequently Asked Questions"
+#: template/users.html.j2:580 template/users.html.j2:586
+#: template/users.html.j2:592 template/users.html.j2:598
+msgid "Wallet showing receipt"
+msgstr ""
+
+#: template/users.html.j2:612
+msgid "Frequently Asked Questions 🔗"
msgstr ""
diff --git a/template/index.html.j2 b/template/index.html.j2
index cb4295d..39cd796 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -20,17 +20,22 @@
>
<div class="left-section md:flex-1">
<h1 class="welcome-to-taler-text text-3xl">
- {% trans %}Welcome to
- <span class="text-accent-pure">Taler Operations</span>!{% endtrans %}
+ {% trans %}
+ Welcome to <span class="text-accent-pure">Taler Operations</span>!
+ {% endtrans %}
</h1>
<p class="text-xl mt-3 mb-2">
- {% trans %}Taler Operations runs the GNU Taler payment system in
- Switzerland.{% endtrans %}
+ {% trans %}
+ Taler Operations runs the GNU Taler payment system in
+ Switzerland.
+ {% endtrans %}
</p>
<p class="text-xl notice-text">
- {% trans %}Taler Operations is not supervised by the Swiss Financial
+ {% trans %}
+ Taler Operations is not supervised by the Swiss Financial
Market Supervisory Authority (FINMA). Escrowed customer assets are
- held in a segregated bank account.{% endtrans %}
+ not subject to deposit insurance but held in a segregated bank
account.
+ {% endtrans %}
</p>
</div>
<div
@@ -49,35 +54,49 @@
<section class="target-audience-selection">
<div class="flex items-center justify-center pt-16 pb-8">
<h2 class="text-3xl text-white font-semibold">
- {% trans %}Getting Started with Taler{% endtrans %}
+ {% trans %}Getting started with Taler{% endtrans %}
</h2>
</div>
<div
class="flex flex-col lg:flex-row items-center justify-center flex-wrap
gap-16"
>
<div class="target-audience-card">
- <img src="{{ url_static('images/unsorted/newpic2.png') }}" alt="" />
+ <img src="{{ url_static('images/unsorted/newpic2.png') }}"
+ alt="{% trans %}happy user{% endtrans %}" />
<h3>{% trans %}For Users{% endtrans %}</h3>
- <p>{% trans %}Your data and money under your control.{% endtrans %}</p>
+ <p>
+ {% trans %}
+ Your data and money under your control.
+ {% endtrans %}
+ </p>
<a
href="{{ url_localized('users.html') }}"
class="button accent"
role="button"
- >{% trans %}Pay with Taler{% endtrans %}</a
- >
+ >
+ {% trans %}
+ Pay with Taler
+ {% endtrans %}
+ </a>
</div>
<div class="target-audience-card">
- <img src="{{ url_static('images/unsorted/newpic1.png') }}" alt="" />
+ <img src="{{ url_static('images/unsorted/newpic1.png') }}"
+ alt="{% trans %}happy merchant{% endtrans %}" />
<h3>{% trans %}For Merchants{% endtrans %}</h3>
<p>
- {% trans %}Easy to use, low fees, no compliance worries.{% endtrans
%}
+ {% trans %}
+ Easy to use, low fees, no compliance worries.
+ {% endtrans %}
</p>
<a
href="{{ url_localized('merchants.html') }}"
class="button accent"
role="button"
- >{% trans %}Integrate{% endtrans %}</a
- >
+ >
+ {% trans %}
+ Integrate
+ {% endtrans %}
+ </a>
</div>
</div>
</section>
diff --git a/template/merchants.html.j2 b/template/merchants.html.j2
index 274d4c0..c917304 100644
--- a/template/merchants.html.j2
+++ b/template/merchants.html.j2
@@ -22,13 +22,23 @@
class="inner flex flex-col justify-center w-max p-12 bg-gray-100
rounded-3xl text-left max-w-full"
>
<h2 class="text-xl font-medium mb-2">
- {% trans %}Prerequisites{% endtrans %}
+ {% trans %}
+ Prerequisites
+ {% endtrans %}
</h2>
+ <p>
+ {% trans %}
+ Here is what you need to get started to
+ integrate Taler as a payment option into
+ your payment process:
+ {% endtrans %}
+ </p>
<ul class="text-lg font-normal list-disc list-inside">
<li>
- {% trans %} Open Swiss bank account, ideally with support for
- <a target="_blank" href="https://www.ebics.org/";>EBICS</a>. {%
- endtrans %}
+ {% trans %}
+ Swiss bank account, ideally with support for
+ <a target="_blank" href="https://www.ebics.org/";>EBICS 🔗</a>.
+ {% endtrans %}
</li>
<li>
{% trans %}
@@ -36,36 +46,56 @@
target="_blank"
href="https://docs.taler.net/taler-merchant-manual.html";
>
- Taler merchant backend</a
- >
- configured with your Swiss IBAN number. {% endtrans %}
- </li>
- <li>
- {% trans %} Offer Taler as a payment option in your payment process.
+ Taler merchant backend 🔗
+ </a>
+ configured with your Swiss IBAN number.
{% endtrans %}
</li>
</ul>
</div>
</div>
+ <div class="flex items-center justify-center flex-col">
+ <a
+ class="button accent"
+ href="https://docs.taler.net/taler-merchant-manual.html#installation";
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ {% trans %}
+ â³ Install GNU Taler merchant backend â³
+ {% endtrans %}
+ </a>
+ </div>
<section id="select-provider">
<div class="step graphic-left">
<div class="text">
- <h2>{% trans %}For in-person sales{% endtrans %}</h2>
+ <h2>
+ {% trans %}
+ For in-person sales
+ {% endtrans %}
+ </h2>
<p>
- {% trans %} The merchant backend can generate static QR codes
- customers can scan to pay you. {% endtrans %}
+ {% trans %}
+ The merchant backend can generate static QR codes
+ customers can scan to pay you.
+ {% endtrans %}
</p>
<p>
- {% trans %} You can hard-code a price or have the customer enter the
- price. {% endtrans %}
+ {% trans %}
+ You can hard-code a price or have the customer enter the
+ price.
+ {% endtrans %}
</p>
<p>
<a
target="_blank"
- href="https://tutorials.taler.net/qr";
+ href="https://tutorials.taler.net/merchant/templates";
class="button accent mt-3"
- >{% trans %}Watch tutorial{% endtrans %}</a
- >
+ >
+ {% trans %}
+ Watch tutorial 🎞
+ {% endtrans %}
+ </a>
</p>
</div>
<div class="img">
@@ -81,28 +111,39 @@
<section id="select-provider">
<div class="step graphic-right">
<div class="text">
- <h2>{% trans %}For WooCommerce{% endtrans %}</h2>
+ <h2>
+ {% trans %}
+ For WooCommerce
+ {% endtrans %}
+ </h2>
<p>
- {% trans %} A payment plugin is availalbe to add GNU Taler support to
- WooCommerce. {% endtrans %}
+ {% trans %}
+ A payment plugin is availalbe to add GNU Taler support to
+ WooCommerce.
+ {% endtrans %}
</p>
<p>
- {% trans %} You mostly need to configure access to your Taler
merchant
- backend. {% endtrans %}
+ {% trans %}
+ You mostly need to configure access to your Taler merchant
+ backend.
+ {% endtrans %}
</p>
<p>
<a
target="_blank"
href="https://wordpress.org/plugins/gnu-taler-payment-for-woocommerce/";
class="button accent mt-3"
- >{% trans %}WooCommerce plugin{% endtrans %}</a
- >
+ >
+ {% trans %}
+ â³ WooCommerce plugin â³
+ {% endtrans %}
+ </a>
</p>
</div>
<div class="img">
<img
src="{{ url_static('images/unsorted/woocommerce-settings.png') }}"
- alt="Screenshot of Woocommerce settings dialog"
+ alt="{% trans %}Screenshot of Woocommerce settings dialog{% endtrans
%}"
width="350px"
/>
</div>
@@ -111,29 +152,40 @@
<section id="select-provider">
<div class="step graphic-left">
<div class="text">
- <h2>{% trans %}For Pretix{% endtrans %}</h2>
+ <h2>
+ {% trans %}
+ For Pretix
+ {% endtrans %}
+ </h2>
<p>
- {% trans %} A payment plugin is availalbe to add GNU Taler support to
- Pretix. {% endtrans %}
+ {% trans %}
+ A payment plugin is availalbe to add GNU Taler support to
+ Pretix.
+ {% endtrans %}
</p>
<p>
- {% trans %} You mostly need to configure access to your Taler
merchant
- backend. {% endtrans %}
+ {% trans %}
+ You mostly need to configure access to your Taler merchant
+ backend.
+ {% endtrans %}
</p>
<p>
<a
target="_blank"
href="https://github.com/pretix/pretix-taler";
class="button accent mt-3"
- >{% trans %}Pretix plugin{% endtrans %}</a
- >
+ >
+ {% trans %}
+ â³ Pretix plugin â³
+ {% endtrans %}
+ </a>
</p>
</div>
<div class="img">
<!-- FIXME: replace with screenshot of pretix settings? -->
<img
src="{{ url_static('images/unsorted/pretix.png') }}"
- alt="Pretix logo"
+ alt="{% trans %}Pretix logo{% endtrans %}"
width="350px"
/>
</div>
@@ -142,28 +194,39 @@
<section id="select-provider">
<div class="step graphic-right">
<div class="text">
- <h2>{% trans %}For Joomla!{% endtrans %}</h2>
+ <h2>
+ {% trans %}
+ For Joomla!
+ {% endtrans %}
+ </h2>
<p>
- {% trans %} A payment plugin is availalbe to add GNU Taler support to
- Joomla! with Payage. {% endtrans %}
+ {% trans %}
+ A payment plugin is availalbe to add GNU Taler support to
+ Joomla! with Payage.
+ {% endtrans %}
</p>
<p>
- {% trans %} You mostly need to configure access to your Taler
merchant
- backend. {% endtrans %}
+ {% trans %}
+ You mostly need to configure access to your Taler merchant
+ backend.
+ {% endtrans %}
</p>
<p>
<a
target="_blank"
href="https://git.taler.net/joomla-payage-taler-plugin.git/tree/README.md";
class="button accent mt-3"
- >{% trans %}Joomla! plugin{% endtrans %}</a
- >
+ >
+ {% trans %}
+ â³ Joomla! plugin â³
+ {% endtrans %}
+ </a>
</p>
</div>
<div class="img">
<img
src="{{ url_static('images/unsorted/woocommerce-settings.png') }}"
- alt=""
+ alt="{% trans %}Woocommerce Taler settings{% endtrans %}"
width="350px"
/>
</div>
@@ -174,26 +237,33 @@
<div class="text">
<h2>{% trans %}For points of sale{% endtrans %}</h2>
<p>
- {% trans %} A point-of-sale App for Android can be used to quickly
set
- up orders and handle payments. {% endtrans %}
+ {% trans %}
+ A point-of-sale App for Android can be used to quickly set
+ up orders and handle payments.
+ {% endtrans %}
</p>
<p>
- {% trans %} The App was designed for restaurants, but might be useful
- for other types of in-person sales. {% endtrans %}
+ {% trans %}
+ The App was designed for restaurants, but might be useful
+ for other types of in-person sales.
+ {% endtrans %}
</p>
<p>
<a
target="_blank"
href="https://docs.taler.net/taler-merchant-pos-terminal.html";
class="button accent mt-3"
- >{% trans %}App manual{% endtrans %}</a
- >
+ >
+ {% trans %}
+ App manual 🔗
+ {% endtrans %}
+ </a>
</p>
</div>
<div class="img">
<img
src="{{ url_static('images/unsorted/pos-app.jpg') }}"
- alt="Point-of-sale app user interface screenshot"
+ alt="{% trans %}GNU Taler point-of-sale app user interface
screenshot{% endtrans %}"
width="350px"
/>
</div>
@@ -202,23 +272,32 @@
<section id="select-provider">
<div class="step graphic-right">
<div class="text">
- <h2>{% trans %}For developers{% endtrans %}</h2>
+ <h2>
+ {% trans %}
+ For developers
+ {% endtrans %}
+ </h2>
<p>
- {% trans %} The merchant backend offers a simple REST API to
integrate
- GNU Taler into existing E-commerce systems. {% endtrans %}
+ {% trans %}
+ The merchant backend offers a simple REST API to integrate
+ GNU Taler into existing E-commerce systems.
+ {% endtrans %}
</p>
<p>
{% trans %} Documentation is available at
- <a target="_blank" href="https://docs.taler.net/";>docs.taler.net</a>.
+ <a target="_blank" href="https://docs.taler.net/";>docs.taler.net
🔗</a>.
{% endtrans %}
</p>
<p>
<a
target="_blank"
- href="https://tutorials.taler.net/";
+ href="https://tutorials.taler.net/merchant";
class="button accent mt-3"
- >{% trans %}Watch tutorials{% endtrans %}</a
- >
+ >
+ {% trans %}
+ Watch tutorials 🎞
+ {% endtrans %}
+ </a>
</p>
</div>
<div class="img">
diff --git a/template/users.html.j2 b/template/users.html.j2
index de7828b..c90c63f 100644
--- a/template/users.html.j2
+++ b/template/users.html.j2
@@ -12,13 +12,74 @@
<link href="{{ url_static('scss/pages/users.scss') }}" rel="stylesheet" />
{% endblock %} {% block body_content %}
<main id="maincontent" class="users-page flex flex-col items-center gap-16">
+ <section id="prerequisites" data-is-first-section>
+ <div class="step solo">
+ <div class="text card bg-gray-100">
+ <h2>{% trans %}Prerequisites{% endtrans %}</h2>
+ <p>
+ {% trans %}
+ Here is what you need to get started paying with GNU Taler:
+ {% endtrans %}
+ </p>
+ <ul class="list-disc list-inside">
+ <li>
+ {% trans %}
+ <b>Swiss bank account</b> with an IBAN beginning with "CH", {%
+ endtrans %}
+ </li>
+ <li>
+ {% trans %}
+ <b>Mobile phone number</b> beginning with "+41" to receive P2P
+ payments, and {% endtrans %}
+ </li>
+ <li>
+ {% trans %}
+ <b>Installation</b> of a
+ <a
+ href="https://wallet.taler.net/";
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ Taler wallet 🔗
+ </a>.
+ {% endtrans %}
+ {% trans %}
+ <a
+ href="https://tutorials.taler.net/wallet";
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ Tutorials available 🎞
+ </a>.
+ {% endtrans %}
+ </li>
+ </ul>
+ </div>
+ <div class="flex items-center justify-center flex-col">
+ <a
+ class="button accent"
+ href="https://wallet.taler.net/";
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ {% trans %}
+ â³ Download GNU Taler wallet â³
+ {% endtrans %}
+ </a>
+ </div>
+ </div>
+ </section>
<div
class="section show-on-js flex flex-col items-center justify-center w-max
text-center min-h-max h-[60vh] max-h-[42rem]"
>
<div
class="inner flex flex-col items-center justify-center w-max text-center
p-12 bg-gray-100 rounded-3xl"
>
- <h2 class="text-2xl font-semibold mb-3">Select your platform</h2>
+ <h2 class="text-2xl font-semibold mb-3">
+ {% trans %}
+ Select platform to view instructions for:
+ {% endtrans %}
+ </h2>
<div class="browser-selection card">
<a
href="javascript:selectGroup('android')"
@@ -91,40 +152,6 @@
</div>
</div>
</div>
- <section id="prerequisites" data-is-first-section>
- <div class="step solo">
- <div class="text card bg-gray-100">
- <h2>{% trans %}Prerequisites{% endtrans %}</h2>
- <p>
- {% trans %} Here is what you need to get started paying with Taler:
{%
- endtrans %}
- </p>
- <ul class="list-disc list-inside">
- <li>
- {% trans %}
- <b>Swiss bank account</b> with an IBAN beginning with "CH"; {%
- endtrans %}
- </li>
- <li>
- {% trans %}
- <b>Mobile phone number</b> beginning with "+41" to receive P2P
- payments, and; {% endtrans %}
- </li>
- <li>
- {% trans %}
- <b>Installation</b> of a
- <a
- href="https://wallet.taler.net/";
- target="_blank"
- rel="noopener noreferrer"
- >Taler wallet.</a
- >
- {% endtrans %}
- </li>
- </ul>
- </div>
- </div>
- </section>
<section id="select-provider">
<div class="step graphic-left">
<div class="text">
@@ -132,27 +159,33 @@
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#1:</span>
<span class="step-description">
- {% trans %}Select provider{% endtrans %}
+ {% trans %}Add provider{% endtrans %}
</span>
</h2>
<p>
- {% trans %} As a first-time user, you need to add Taler Operations as
- a payment service provider. The easiest way to do so is to scan the
QR
- code on the right which will also initiate the withdrawal process. {%
- endtrans %}
+ {% trans %}
+ As a first-time user, you need to add Taler Operations as
+ a payment service provider. The easiest way to do so is to
+ <b>scan the QR code</b> on the right or click it to open
+ the link. This will also initiate the withdrawal process.
+ {% endtrans %}
</p>
<p>
- {% trans %} If you already have a payment service provider for the
- "CHF" currency, you can withdraw digital cash by clicking the "add"
- button on the "CHF balance" screen. {% endtrans %}
+ {% trans %}
+ If you already have a payment service provider, you can
+ withdraw digital cash by clicking the "add"
+ button on the "balance" screen of the respective currency.
+ {% endtrans %}
</p>
</div>
<div class="img">
+ <a href="taler://withdraw-exchange/exchange.taler-ops.ch/">
<img
src="{{ url_static('images/unsorted/withdraw-qr.svg') }}"
alt="QR code for 'taler://withdraw-exchange/exchange.taler-ops.ch/'"
width="350px"
/>
+ </a>
</div>
</div>
</section>
@@ -163,40 +196,45 @@
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#2:</span>
<span class="step-description">
- {% trans %}Enter amount{% endtrans %}
+ {% trans %}
+ Enter amount
+ {% endtrans %}
</span>
</h2>
<p>
- {% trans %} Enter the desired amount to be withdrawn. {% endtrans %}
+ {% trans %}
+ Enter the desired amount to be withdrawn.
+ {% endtrans %}
</p>
<p>
- {% trans %} Afterwards, select "Withdraw" from my bank account. {%
- endtrans %}
+ {% trans %}
+ Afterwards, select "Withdraw" from my bank account.
+ {% endtrans %}
</p>
</div>
<div class="img">
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-withdraw-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-withdraw-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-withdraw-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
<img
class="group-ios"
src="{{ url_static('images/screenshots/cta-withdraw-ios-latest.png')
}}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
</div>
@@ -213,37 +251,40 @@
</span>
</h2>
<p>
- {% trans %} Please read the Terms of Service and accept them. {%
- endtrans %}
+ {% trans %}
+ Please read the terms of service and accept them.
+ {% endtrans %}
</p>
<p>
- {% trans %} You will only need to do so the first time, or when the
- terms have been updated. {% endtrans %}
+ {% trans %}
+ You will only need to do so the first time, or when the
+ terms have been updated.
+ {% endtrans %}
</p>
</div>
<div class="img">
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-accept-tos-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing terms of service{% endtrans %}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-accept-tos-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing terms of service{% endtrans %}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-accept-tos-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing terms of service{% endtrans %}"
width="350px"
/>
<img
class="group-ios"
src="{{
url_static('images/screenshots/cta-accept-tos-ios-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing terms of service{% endtrans %}"
width="350px"
/>
</div>
@@ -256,38 +297,46 @@
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#4:</span>
<span class="step-description">
- {% trans %}Review Operation{% endtrans %}
+ {% trans %}
+ Review operation
+ {% endtrans %}
</span>
</h2>
- <p>{% trans %} Review and confirm the operation. {% endtrans %}</p>
<p>
- {% trans %} Depending on the payment service provider, you may be
- shown fees. {% endtrans %}
+ {% trans %}
+ Review and confirm the operation.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Depending on the payment service provider, you may be
+ shown fees.
+ {% endtrans %}
</p>
</div>
<div class="img">
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-withdraw-2-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-withdraw-2-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-withdraw-2-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
<img
class="group-ios"
src="{{
url_static('images/screenshots/cta-withdraw-2-ios-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting amount to withdraw{% endtrans %}"
width="350px"
/>
</div>
@@ -300,41 +349,47 @@
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#5:</span>
<span class="step-description">
- {% trans %}Wire Transfer{% endtrans %}
+ {% trans %}
+ Wire transfer
+ {% endtrans %}
</span>
</h2>
<p>
- {% trans %} The wallet will show you the subject, target account and
- amount to transfer. {% endtrans %}
+ {% trans %}
+ The wallet will show you the wire transfer subject, target account
and
+ amount to transfer.
+ {% endtrans %}
</p>
<p>
- {% trans %} Copy the information into your online banking application
- and wire the funds to the payment service provider. {% endtrans %}
+ {% trans %}
+ Copy the information into your online banking application
+ and wire the funds to the payment service provider.
+ {% endtrans %}
</p>
</div>
<div class="img">
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-wire-transfer-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing wire transfer instructions{% endtrans
%}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-wire-transfer-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing wire transfer instructions{% endtrans
%}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-wire-transfer-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing wire transfer instructions{% endtrans
%}"
width="350px"
/>
<img
class="group-ios"
src="{{
url_static('images/screenshots/cta-wire-transfer-ios-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing wire transfer instructions{% endtrans
%}"
width="350px"
/>
</div>
@@ -362,25 +417,25 @@
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-withdraw-done-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing withdrawal status{% endtrans %}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-withdraw-done-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing withdrawal status{% endtrans %}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-withdraw-done-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing withdrawal status{% endtrans %}"
width="350px"
/>
<img
class="group-ios"
src="{{
url_static('images/screenshots/cta-withdraw-done-ios-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing withdrawal status{% endtrans %}"
width="350px"
/>
</div>
@@ -392,43 +447,51 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#7:</span>
- <span class="step-description">{% trans %}Shop{% endtrans %}</span>
+ <span class="step-description">
+ {% trans %}
+ Shop
+ {% endtrans %}
+ </span>
</h2>
<p>
- {% trans %} When shopping, the wallet may be launched automatically
or
+ {% trans %}
+ When shopping, the wallet may be launched automatically or
you may need to click a link, scan a QR code or even select the
wallet
- extension manually depending on the context. {% endtrans %}
+ extension manually depending on the context.
+ {% endtrans %}
</p>
<p>
- {% trans %} The QR code scanner button can also be held to manually
+ {% trans %}
+ The QR code scanner button can also be held to manually
enter a "<code>taler://</code>-URI", for example if you received one
- via text message. {% endtrans %}
+ via text message.
+ {% endtrans %}
</p>
</div>
<div class="img">
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-url-entry-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting taler://-URI{% endtrans %}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-url-entry-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting taler://-URI{% endtrans %}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-url-entry-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting taler://-URI{% endtrans %}"
width="350px"
/>
<!-- FIXME: Dialog: "QR code scan on iOS" -->
<img
class="group-ios"
src="{{
url_static('images/unsorted/Screenshot_Withdrawal_Confirmation_1.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting taler://-URI{% endtrans %}"
width="350px"
/>
</div>
@@ -440,39 +503,47 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#8:</span>
- <span class="step-description">{% trans %}Pay{% endtrans %}</span>
+ <span class="step-description">
+ {% trans %}
+ Pay
+ {% endtrans %}
+ </span>
</h2>
<p>
- {% trans %} The wallet will show you details about what you are
- buying, including the price and applicable fees. {% endtrans %}
+ {% trans %}
+ The wallet will show you details about what you are
+ buying, including the price and applicable fees.
+ {% endtrans %}
</p>
<p>
- {% trans %} Simply press "Pay" to make the payment. {% endtrans %}
+ {% trans %}
+ Simply press "Pay" to make the payment.
+ {% endtrans %}
</p>
</div>
<div class="img">
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-payment-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting payment confirmation{% endtrans %}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-payment-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting payment confirmation{% endtrans %}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-payment-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet requesting payment confirmation{% endtrans %}"
width="350px"
/>
<img
class="group-ios"
src="{{ url_static('images/screenshots/cta-payment-ios-latest.png')
}}"
- alt=""
+ alt="{% trans %}Wallet requesting payment confirmation{% endtrans %}"
width="350px"
/>
</div>
@@ -484,40 +555,47 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#9:</span>
- <span class="step-description">{% trans %}Manage{% endtrans %}</span>
+ <span class="step-description">
+ {% trans %}
+ Manage
+ {% endtrans %}
+ </span>
</h2>
<p>
- {% trans %} The wallet keeps track of your transaction history. {%
- endtrans %}
+ {% trans %}
+ The wallet keeps track of your transaction history.
+ {% endtrans %}
</p>
<p>
- {% trans %} You can delete transactions, erasing any trace that you
- were the buyer. {% endtrans %}
+ {% trans %}
+ You can delete transactions, erasing any trace that you
+ were the buyer.
+ {% endtrans %}
</p>
</div>
<div class="img">
<img
class="group-android"
src="{{
url_static('images/screenshots/cta-payment-paid-android-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing receipt{% endtrans %}"
width="350px"
/>
<img
class="group-chrome"
src="{{
url_static('images/screenshots/cta-payment-paid-chrome-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing receipt{% endtrans %}"
width="350px"
/>
<img
class="group-firefox"
src="{{
url_static('images/screenshots/cta-payment-paid-firefox-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing receipt{% endtrans %}"
width="350px"
/>
<img
class="group-ios"
src="{{
url_static('images/screenshots/cta-payment-paid-ios-latest.png') }}"
- alt=""
+ alt="{% trans %}Wallet showing receipt{% endtrans %}"
width="350px"
/>
</div>
@@ -530,8 +608,11 @@
href="https://taler.net/{{ url_localized('faq.html') }}"
target="_blank"
rel="noopener noreferrer"
- >{% trans %}Frequently Asked Questions{% endtrans %}</a
- >
+ >
+ {% trans %}
+ Frequently Asked Questions 🔗
+ {% endtrans %}
+ </a>
</div>
</section>
</main>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.