[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated (7e71121 -> 991a994)
From: |
gnunet |
Subject: |
[taler-taler-ops-www] branch master updated (7e71121 -> 991a994) |
Date: |
Sat, 30 Mar 2024 23:52:04 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository taler-ops-www.
from 7e71121 bolder
new ae29911 intermediate
new 991a994 new screenshots
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
locale/de/LC_MESSAGES/messages.po | 125 +++++++++++--------
locale/en/LC_MESSAGES/messages.po | 98 ++++++++-------
locale/fr/LC_MESSAGES/messages.po | 103 +++++++++-------
locale/messages.pot | 100 ++++++++-------
.../images/screenshots/cta-withdraw-2-chrome-0.png | Bin 0 -> 34371 bytes
.../screenshots/cta-withdraw-2-chrome-latest.png | Bin 0 -> 34371 bytes
template/users.html.j2 | 135 ++++++++++++---------
7 files changed, 322 insertions(+), 239 deletions(-)
create mode 100644 static/images/screenshots/cta-withdraw-2-chrome-0.png
create mode 100644 static/images/screenshots/cta-withdraw-2-chrome-latest.png
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index be75379..e8b92e2 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-30 23:31+0100\n"
+"POT-Creation-Date: 2024-03-30 23:47+0100\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/"
@@ -516,180 +516,206 @@ msgstr ""
"Auf diesen Seiten erfahren Sie, wie sich das Bezahlsystem Taler installieren "
"und verwenden lässt."
+#: template/users.html.j2:26
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:43
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:60
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:77
+msgid "Select instructions for Chrome"
+msgstr ""
+
#: template/users.html.j2:100
msgid "Here is what you need to get started paying with Taler:"
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:106
#, 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\";"
msgstr "<b>SCHWEIZER BANKKONTO</b> bei einer Bank, deren IBAN mit CH** beginnt"
-#: template/users.html.j2:109
+#: template/users.html.j2:111
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
"and;"
msgstr ""
-#: template/users.html.j2:113
+#: template/users.html.j2:116
#, fuzzy
-#| msgid "Installation guide for users"
-msgid "Installation of a"
-msgstr "Installationsanleitung für Kunden"
+#| 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>"
+msgstr ""
+"basiert auf <a href=\"https://taler.net/\" class=\"demo_btn\" "
+"target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
-#: template/users.html.j2:118
-#, fuzzy
-#| msgid "Install Wallet"
-msgid "Taler wallet."
-msgstr "Installation"
-
-#: template/users.html.j2:129 template/users.html.j2:160
-#: template/users.html.j2:206 template/users.html.j2:253
-#: template/users.html.j2:297 template/users.html.j2:345
-#: template/users.html.j2:391 template/users.html.j2:440
-#: template/users.html.j2:484
+#: template/users.html.j2:133 template/users.html.j2:167
+#: template/users.html.j2:216 template/users.html.j2:265
+#: template/users.html.j2:314 template/users.html.j2:365
+#: template/users.html.j2:411 template/users.html.j2:459
+#: template/users.html.j2:503
msgid "Step"
msgstr ""
-#: template/users.html.j2:132
+#: template/users.html.j2:136
msgid "Select provider"
msgstr ""
-#: template/users.html.j2:136
+#: template/users.html.j2:140
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."
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:147
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."
msgstr ""
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:167
+#: template/users.html.j2:174
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:179
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:209
+#: template/users.html.j2:219
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:213
+#: template/users.html.j2:223
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:217
+#: template/users.html.j2:228
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:268
msgid "Review Operation"
msgstr ""
-#: template/users.html.j2:259
+#: template/users.html.j2:272
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:261
+#: template/users.html.j2:277
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:300
+#: template/users.html.j2:317
msgid "Wire Transfer"
msgstr ""
-#: template/users.html.j2:304
+#: template/users.html.j2:321
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:308
+#: template/users.html.j2:326
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:367
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:350
+#: template/users.html.j2:370
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:355
+#: template/users.html.j2:375
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:393
+#: template/users.html.j2:413
msgid "Shop"
msgstr ""
-#: template/users.html.j2:396
+#: template/users.html.j2:416
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:401
+#: template/users.html.j2:421
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:442
+#: template/users.html.j2:461
msgid "Pay"
msgstr ""
-#: template/users.html.j2:445
+#: template/users.html.j2:464
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:449
+#: template/users.html.j2:468
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:486
+#: template/users.html.j2:505
msgid "Manage"
msgstr ""
-#: template/users.html.j2:489
+#: template/users.html.j2:508
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:493
+#: template/users.html.j2:512
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:532
+#: template/users.html.j2:551
msgid "Frequently Asked Questions"
msgstr "FAQs (Frequently Asked Questions)"
+#, fuzzy
+#~| msgid "Installation guide for users"
+#~ msgid "Installation of a"
+#~ msgstr "Installationsanleitung für Kunden"
+
+#, fuzzy
+#~| msgid "Install Wallet"
+#~ msgid "Taler wallet."
+#~ msgstr "Installation"
+
#, fuzzy
#~| msgid "GNU Taler"
#~ msgid "GNU Taler Fees"
@@ -1131,13 +1157,6 @@ msgstr "FAQs (Frequently Asked Questions)"
#~ "programmiert mit <a href=\"https://fsf.org/\" class=\"demo_btn\" "
#~ "target=\"_blank\" rel=\"noopener noreferrer\">Freier Software</a>"
-#~ msgid ""
-#~ "using the technology of <a href=\"https://taler.net/\" class=\"demo_btn\" "
-#~ "target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
-#~ msgstr ""
-#~ "basiert auf <a href=\"https://taler.net/\" class=\"demo_btn\" "
-#~ "target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</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!"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index df8a341..53a2918 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-30 23:31+0100\n"
+"POT-Creation-Date: 2024-03-30 23:47+0100\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"
@@ -456,167 +456,181 @@ msgstr ""
msgid "This page explains how to use GNU Taler to make payments."
msgstr ""
+#: template/users.html.j2:26
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:43
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:60
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:77
+msgid "Select instructions for Chrome"
+msgstr ""
+
#: template/users.html.j2:100
msgid "Here is what you need to get started paying with Taler:"
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:106
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\";"
msgstr ""
-#: template/users.html.j2:109
+#: template/users.html.j2:111
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
"and;"
msgstr ""
-#: template/users.html.j2:113
-msgid "Installation of a"
-msgstr ""
-
-#: template/users.html.j2:118
-msgid "Taler wallet."
+#: template/users.html.j2:116
+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:129 template/users.html.j2:160
-#: template/users.html.j2:206 template/users.html.j2:253
-#: template/users.html.j2:297 template/users.html.j2:345
-#: template/users.html.j2:391 template/users.html.j2:440
-#: template/users.html.j2:484
+#: template/users.html.j2:133 template/users.html.j2:167
+#: template/users.html.j2:216 template/users.html.j2:265
+#: template/users.html.j2:314 template/users.html.j2:365
+#: template/users.html.j2:411 template/users.html.j2:459
+#: template/users.html.j2:503
msgid "Step"
msgstr ""
-#: template/users.html.j2:132
+#: template/users.html.j2:136
msgid "Select provider"
msgstr ""
-#: template/users.html.j2:136
+#: template/users.html.j2:140
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."
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:147
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."
msgstr ""
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:167
+#: template/users.html.j2:174
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:179
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:209
+#: template/users.html.j2:219
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:213
+#: template/users.html.j2:223
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:217
+#: template/users.html.j2:228
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:268
msgid "Review Operation"
msgstr ""
-#: template/users.html.j2:259
+#: template/users.html.j2:272
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:261
+#: template/users.html.j2:277
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:300
+#: template/users.html.j2:317
msgid "Wire Transfer"
msgstr ""
-#: template/users.html.j2:304
+#: template/users.html.j2:321
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:308
+#: template/users.html.j2:326
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:367
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:350
+#: template/users.html.j2:370
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:355
+#: template/users.html.j2:375
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:393
+#: template/users.html.j2:413
msgid "Shop"
msgstr ""
-#: template/users.html.j2:396
+#: template/users.html.j2:416
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:401
+#: template/users.html.j2:421
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:442
+#: template/users.html.j2:461
msgid "Pay"
msgstr ""
-#: template/users.html.j2:445
+#: template/users.html.j2:464
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:449
+#: template/users.html.j2:468
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:486
+#: template/users.html.j2:505
msgid "Manage"
msgstr ""
-#: template/users.html.j2:489
+#: template/users.html.j2:508
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:493
+#: template/users.html.j2:512
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:532
+#: template/users.html.j2:551
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index aeaa0f4..75b7fd3 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-30 23:31+0100\n"
+"POT-Creation-Date: 2024-03-30 23:47+0100\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/"
@@ -484,168 +484,185 @@ msgstr "Taler Operations AG - Pour les clients"
msgid "This page explains how to use GNU Taler to make payments."
msgstr ""
+#: template/users.html.j2:26
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:43
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:60
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:77
+msgid "Select instructions for Chrome"
+msgstr ""
+
#: template/users.html.j2:100
msgid "Here is what you need to get started paying with Taler:"
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:106
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\";"
msgstr ""
-#: template/users.html.j2:109
+#: template/users.html.j2:111
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments, "
"and;"
msgstr ""
-#: template/users.html.j2:113
-#, fuzzy
-msgid "Installation of a"
-msgstr "Guide d'installation utilisateur"
-
-#: template/users.html.j2:118
-msgid "Taler wallet."
+#: template/users.html.j2:116
+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:129 template/users.html.j2:160
-#: template/users.html.j2:206 template/users.html.j2:253
-#: template/users.html.j2:297 template/users.html.j2:345
-#: template/users.html.j2:391 template/users.html.j2:440
-#: template/users.html.j2:484
+#: template/users.html.j2:133 template/users.html.j2:167
+#: template/users.html.j2:216 template/users.html.j2:265
+#: template/users.html.j2:314 template/users.html.j2:365
+#: template/users.html.j2:411 template/users.html.j2:459
+#: template/users.html.j2:503
msgid "Step"
msgstr ""
-#: template/users.html.j2:132
+#: template/users.html.j2:136
msgid "Select provider"
msgstr ""
-#: template/users.html.j2:136
+#: template/users.html.j2:140
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."
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:147
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."
msgstr ""
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:167
+#: template/users.html.j2:174
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:179
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:209
+#: template/users.html.j2:219
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:213
+#: template/users.html.j2:223
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:217
+#: template/users.html.j2:228
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:268
msgid "Review Operation"
msgstr ""
-#: template/users.html.j2:259
+#: template/users.html.j2:272
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:261
+#: template/users.html.j2:277
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:300
+#: template/users.html.j2:317
msgid "Wire Transfer"
msgstr ""
-#: template/users.html.j2:304
+#: template/users.html.j2:321
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:308
+#: template/users.html.j2:326
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:367
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:350
+#: template/users.html.j2:370
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:355
+#: template/users.html.j2:375
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:393
+#: template/users.html.j2:413
msgid "Shop"
msgstr ""
-#: template/users.html.j2:396
+#: template/users.html.j2:416
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:401
+#: template/users.html.j2:421
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:442
+#: template/users.html.j2:461
msgid "Pay"
msgstr ""
-#: template/users.html.j2:445
+#: template/users.html.j2:464
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:449
+#: template/users.html.j2:468
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:486
+#: template/users.html.j2:505
msgid "Manage"
msgstr ""
-#: template/users.html.j2:489
+#: template/users.html.j2:508
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:493
+#: template/users.html.j2:512
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:532
+#: template/users.html.j2:551
msgid "Frequently Asked Questions"
msgstr ""
+
+#, fuzzy
+#~ msgid "Installation of a"
+#~ msgstr "Guide d'installation utilisateur"
diff --git a/locale/messages.pot b/locale/messages.pot
index 708573a..5ab1916 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-30 23:31+0100\n"
+"POT-Creation-Date: 2024-03-30 23:47+0100\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"
@@ -460,169 +460,183 @@ msgstr ""
msgid "This page explains how to use GNU Taler to make payments."
msgstr ""
+#: template/users.html.j2:26
+msgid "Select instructions for Android"
+msgstr ""
+
+#: template/users.html.j2:43
+msgid "Select instructions for iOS"
+msgstr ""
+
+#: template/users.html.j2:60
+msgid "Select instructions for Firefox"
+msgstr ""
+
+#: template/users.html.j2:77
+msgid "Select instructions for Chrome"
+msgstr ""
+
#: template/users.html.j2:100
msgid "Here is what you need to get started paying with Taler:"
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:106
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\";"
msgstr ""
-#: template/users.html.j2:109
+#: template/users.html.j2:111
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P "
"payments, and;"
msgstr ""
-#: template/users.html.j2:113
-msgid "Installation of a"
-msgstr ""
-
-#: template/users.html.j2:118
-msgid "Taler wallet."
+#: template/users.html.j2:116
+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:129 template/users.html.j2:160
-#: template/users.html.j2:206 template/users.html.j2:253
-#: template/users.html.j2:297 template/users.html.j2:345
-#: template/users.html.j2:391 template/users.html.j2:440
-#: template/users.html.j2:484
+#: template/users.html.j2:133 template/users.html.j2:167
+#: template/users.html.j2:216 template/users.html.j2:265
+#: template/users.html.j2:314 template/users.html.j2:365
+#: template/users.html.j2:411 template/users.html.j2:459
+#: template/users.html.j2:503
msgid "Step"
msgstr ""
-#: template/users.html.j2:132
+#: template/users.html.j2:136
msgid "Select provider"
msgstr ""
-#: template/users.html.j2:136
+#: template/users.html.j2:140
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."
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:147
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."
msgstr ""
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid "Enter amount"
msgstr ""
-#: template/users.html.j2:167
+#: template/users.html.j2:174
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:170
+#: template/users.html.j2:179
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:209
+#: template/users.html.j2:219
msgid "Accept terms"
msgstr ""
-#: template/users.html.j2:213
+#: template/users.html.j2:223
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:217
+#: template/users.html.j2:228
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:268
msgid "Review Operation"
msgstr ""
-#: template/users.html.j2:259
+#: template/users.html.j2:272
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:261
+#: template/users.html.j2:277
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:300
+#: template/users.html.j2:317
msgid "Wire Transfer"
msgstr ""
-#: template/users.html.j2:304
+#: template/users.html.j2:321
msgid ""
"The wallet will show you the subject, target account and amount to "
"transfer."
msgstr ""
-#: template/users.html.j2:308
+#: template/users.html.j2:326
msgid ""
"Copy the information into your online banking application and wire the "
"funds to the payment service provider."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:367
msgid "Wait!"
msgstr ""
-#: template/users.html.j2:350
+#: template/users.html.j2:370
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:355
+#: template/users.html.j2:375
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:393
+#: template/users.html.j2:413
msgid "Shop"
msgstr ""
-#: template/users.html.j2:396
+#: template/users.html.j2:416
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:401
+#: template/users.html.j2:421
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:442
+#: template/users.html.j2:461
msgid "Pay"
msgstr ""
-#: template/users.html.j2:445
+#: template/users.html.j2:464
msgid ""
"The wallet will show you details about what you are buying, including the"
" price and applicable fees."
msgstr ""
-#: template/users.html.j2:449
+#: template/users.html.j2:468
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:486
+#: template/users.html.j2:505
msgid "Manage"
msgstr ""
-#: template/users.html.j2:489
+#: template/users.html.j2:508
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:493
+#: template/users.html.j2:512
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:532
+#: template/users.html.j2:551
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/static/images/screenshots/cta-withdraw-2-chrome-0.png
b/static/images/screenshots/cta-withdraw-2-chrome-0.png
new file mode 100644
index 0000000..56412ac
Binary files /dev/null and
b/static/images/screenshots/cta-withdraw-2-chrome-0.png differ
diff --git a/static/images/screenshots/cta-withdraw-2-chrome-latest.png
b/static/images/screenshots/cta-withdraw-2-chrome-latest.png
new file mode 100644
index 0000000..56412ac
Binary files /dev/null and
b/static/images/screenshots/cta-withdraw-2-chrome-latest.png differ
diff --git a/template/users.html.j2 b/template/users.html.j2
index 0b02e8f..32f45b8 100644
--- a/template/users.html.j2
+++ b/template/users.html.j2
@@ -23,7 +23,7 @@
<div class="browser-selection card">
<a
href="javascript:selectGroup('android')"
- aria-label="Select instructions for Android"
+ aria-label="{% trans %}Select instructions for Android{% endtrans %}"
role="radio"
>
<svg
@@ -40,7 +40,7 @@
</a>
<a
href="javascript:selectGroup('ios')"
- aria-label="Select instructions for iOS"
+ aria-label="{% trans %}Select instructions for iOS{% endtrans %}"
role="radio"
>
<svg
@@ -57,7 +57,7 @@
</a>
<a
href="javascript:selectGroup('firefox')"
- aria-label="Select instructions for Firefox"
+ aria-label="{% trans %}Select instructions for Firefox{% endtrans %}"
role="radio"
>
<svg
@@ -74,7 +74,7 @@
</a>
<a
href="javascript:selectGroup('chrome')"
- aria-label="Select instructions for Chrome"
+ aria-label="{% trans %}Select instructions for Chrome{% endtrans %}"
role="radio"
>
<svg
@@ -97,26 +97,30 @@
<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 %}
+ {% 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 %}
+ {% 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 %}
+ {% trans %}
+ <b>Mobile phone number</b> beginning with "+41" to receive P2P
payments, and;
+ {% endtrans %}
</li>
<li>
- <b>{% trans %}Installation of a{% endtrans %}</b>
+ {% trans %}
+ <b>Installation</b> of a
<a
href="https://wallet.taler.net/"
target="_blank"
rel="noopener noreferrer"
- >{% trans %}Taler wallet.{% endtrans %}</a
- >
+ >Taler wallet.</a>
+ {% endtrans %}
</li>
</ul>
</div>
@@ -128,20 +132,23 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#1:</span>
- <span class="step-description"
- >{% trans %}Select provider{% endtrans %}</span
- >
+ <span class="step-description">
+ {% trans %}Select provider{% endtrans %}
+ </span>
</h2>
<p>
- {% trans %}As a first-time user, you need to add Taler Operations as
a
+ {% 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 %}
+ code on the right which will also initiate the withdrawal process.
+ {% endtrans %}
</p>
<p>
- {% trans %}If you already have a payment service provider for the
+ {% 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 %}
+ button on the "CHF balance" screen.
+ {% endtrans %}
</p>
</div>
<div class="img">
@@ -159,22 +166,25 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#2:</span>
- <span class="step-description"
- >{% trans %}Enter amount{% endtrans %}</span
- >
+ <span class="step-description">
+ {% 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-firefox-0.png')
}}"
+ src="{{
url_static('images/screenshots/cta-withdraw-firefox-latest.png') }}"
alt=""
width="350px"
/>
@@ -182,7 +192,7 @@
class="group-chrome"
src="{{
url_static('images/screenshots/cta-withdraw-chrome-latest.png') }}"
alt=""
- width="450px"
+ width="350px"
/>
<img
class="group-firefox"
@@ -205,17 +215,19 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#3:</span>
- <span class="step-description"
- >{% trans %}Accept terms{% endtrans %}</span
- >
+ <span class="step-description">
+ {% trans %}Accept terms{% endtrans %}
+ </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">
@@ -229,7 +241,7 @@
class="group-chrome"
src="{{
url_static('images/screenshots/cta-accept-tos-chrome-latest.png') }}"
alt=""
- width="450px"
+ width="350px"
/>
<img
class="group-firefox"
@@ -252,14 +264,19 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#4:</span>
- <span class="step-description"
- >{% trans %}Review Operation{% endtrans %}</span
- >
+ <span class="step-description">
+ {% 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">
@@ -271,7 +288,7 @@
/>
<img
class="group-chrome"
- src="{{
url_static('images/screenshots/cta-withdraw-chrome-latest.png') }}"
+ src="{{
url_static('images/screenshots/cta-withdraw-2-chrome-latest.png') }}"
alt=""
width="350px"
/>
@@ -296,17 +313,20 @@
<h2>
<span class="step-prefix">{% trans %}Step{% endtrans %}</span>
<span class="step-ctr">#5:</span>
- <span class="step-description"
- >{% trans %}Wire Transfer{% endtrans %}</span
- >
+ <span class="step-description">
+ {% 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 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">
@@ -321,7 +341,7 @@
class="group-chrome"
src="{{
url_static('images/screenshots/cta-wire-transfer-chrome-latest.png') }}"
alt=""
- width="450px"
+ width="350px"
/>
<img
class="group-firefox"
@@ -367,7 +387,7 @@
class="group-chrome"
src="{{
url_static('images/screenshots/cta-withdraw-done-chrome-latest.png') }}"
alt=""
- width="450px"
+ width="350px"
/>
<img
class="group-firefox"
@@ -404,10 +424,9 @@
</p>
</div>
<div class="img">
- <!-- FIXME: Dialog: "QR scan" -->
<img
class="group-android"
- src="{{
url_static('images/screenshots/cta-url-entry-1-android-latest.png') }}"
+ src="{{
url_static('images/screenshots/cta-url-entry-2-android-latest.png') }}"
alt=""
width="350px"
/>
@@ -415,7 +434,7 @@
class="group-chrome"
src="{{
url_static('images/screenshots/cta-url-entry-chrome-latest.png') }}"
alt=""
- width="450px"
+ width="350px"
/>
<img
class="group-firefox"
@@ -460,7 +479,7 @@
class="group-chrome"
src="{{
url_static('images/screenshots/cta-payment-chrome-latest.png') }}"
alt=""
- width="450px"
+ width="350px"
/>
<img
class="group-firefox"
@@ -505,7 +524,7 @@
class="group-chrome"
src="{{
url_static('images/screenshots/cta-payment-paid-chrome-latest.png') }}"
alt=""
- width="450px"
+ width="350px"
/>
<img
class="group-firefox"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ops-www] branch master updated (7e71121 -> 991a994),
gnunet <=