[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated: -editing fees
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] branch master updated: -editing fees |
|
Date: |
Sun, 25 Feb 2024 09:41:22 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository taler-ops-www.
The following commit(s) were added to refs/heads/master by this push:
new 6002764 -editing fees
6002764 is described below
commit 600276458f718adc4ff9d4ae8a543cb947c18929
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Feb 25 09:39:51 2024 +0100
-editing fees
---
locale/de/LC_MESSAGES/messages.po | 80 ++++++------
locale/en/LC_MESSAGES/messages.po | 80 ++++++------
locale/fr/LC_MESSAGES/messages.po | 80 ++++++------
locale/messages.pot | 80 ++++++------
template/fees.html.j2 | 262 +++-----------------------------------
template/users.html.j2 | 5 +-
6 files changed, 181 insertions(+), 406 deletions(-)
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 5537889..87be715 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-02-25 09:31+0100\n"
+"POT-Creation-Date: 2024-02-25 09:25+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/";
@@ -211,7 +211,7 @@ msgstr "Für Händler"
msgid "Describes how merchants can use Taler."
msgstr ""
-#: template/merchants.html.j2:16 template/users.html.j2:103
+#: template/merchants.html.j2:16 template/users.html.j2:100
#, fuzzy
#| msgid "<span>Prerequisites</span>"
msgid "Prerequisites"
@@ -405,174 +405,174 @@ msgstr "Für Kunden"
msgid "Describes how to use taler"
msgstr ""
-#: template/users.html.j2:107
+#: template/users.html.j2:104
msgid "What do I need to use Taler for payments?"
msgstr "Was braucht man zur Nutzung?"
-#: template/users.html.j2:113
+#: template/users.html.j2:110
#, 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:117
+#: template/users.html.j2:114
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments"
msgstr ""
-#: template/users.html.j2:121
+#: template/users.html.j2:118
#, fuzzy
#| msgid "Installation guide for users"
msgid "Installation of a"
msgstr "Installationsanleitung für Kunden"
-#: template/users.html.j2:126
+#: template/users.html.j2:123
#, fuzzy
#| msgid "Install Wallet"
msgid "Taler wallet"
msgstr "Installation"
-#: template/users.html.j2:138 template/users.html.j2:170
-#: template/users.html.j2:198 template/users.html.j2:246
-#: template/users.html.j2:291 template/users.html.j2:321
-#: template/users.html.j2:351 template/users.html.j2:382
-#: template/users.html.j2:429
+#: template/users.html.j2:135 template/users.html.j2:167
+#: template/users.html.j2:195 template/users.html.j2:243
+#: template/users.html.j2:288 template/users.html.j2:318
+#: template/users.html.j2:348 template/users.html.j2:379
+#: template/users.html.j2:426
msgid "Step"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:136
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:139
msgid ""
"Initially, you may 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:148
+#: template/users.html.j2:145
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, you "
"can also just click on the \"add\" button on the \"CHF balance\" screen."
msgstr ""
-#: template/users.html.j2:171
+#: template/users.html.j2:168
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:174
+#: template/users.html.j2:171
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:177
+#: template/users.html.j2:174
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:199
+#: template/users.html.j2:196
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:202
+#: template/users.html.j2:199
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:206
+#: template/users.html.j2:203
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:247
+#: template/users.html.j2:244
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:246
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:251
+#: template/users.html.j2:248
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:292
+#: template/users.html.j2:289
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:295
+#: template/users.html.j2:292
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:299
+#: template/users.html.j2:296
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:322
+#: template/users.html.j2:319
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:325
+#: template/users.html.j2:322
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:330
+#: template/users.html.j2:327
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:352
+#: template/users.html.j2:349
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:355
+#: template/users.html.j2:352
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:360
+#: template/users.html.j2:357
msgid ""
"The QR code scanner button can also be held to manually enter a \"taler://\"-"
"URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:383
+#: template/users.html.j2:380
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:386
+#: template/users.html.j2:383
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:387
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:430
+#: template/users.html.j2:427
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:433
+#: template/users.html.j2:430
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:437
+#: template/users.html.j2:434
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:463
+#: template/users.html.j2:460
msgid "Frequently Asked Questions"
msgstr "FAQs (Frequently Asked Questions)"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 1f14ab8..8aac461 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-02-25 09:31+0100\n"
+"POT-Creation-Date: 2024-02-25 09:25+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"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Describes how merchants can use Taler."
msgstr ""
-#: template/merchants.html.j2:16 template/users.html.j2:103
+#: template/merchants.html.j2:16 template/users.html.j2:100
msgid "Prerequisites"
msgstr ""
@@ -356,164 +356,164 @@ msgstr ""
msgid "Describes how to use taler"
msgstr ""
-#: template/users.html.j2:107
+#: template/users.html.j2:104
msgid "What do I need to use Taler for payments?"
msgstr ""
-#: template/users.html.j2:113
+#: template/users.html.j2:110
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\""
msgstr ""
-#: template/users.html.j2:117
+#: template/users.html.j2:114
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments"
msgstr ""
-#: template/users.html.j2:121
+#: template/users.html.j2:118
msgid "Installation of a"
msgstr ""
-#: template/users.html.j2:126
+#: template/users.html.j2:123
msgid "Taler wallet"
msgstr ""
-#: template/users.html.j2:138 template/users.html.j2:170
-#: template/users.html.j2:198 template/users.html.j2:246
-#: template/users.html.j2:291 template/users.html.j2:321
-#: template/users.html.j2:351 template/users.html.j2:382
-#: template/users.html.j2:429
+#: template/users.html.j2:135 template/users.html.j2:167
+#: template/users.html.j2:195 template/users.html.j2:243
+#: template/users.html.j2:288 template/users.html.j2:318
+#: template/users.html.j2:348 template/users.html.j2:379
+#: template/users.html.j2:426
msgid "Step"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:136
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:139
msgid ""
"Initially, you may 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:148
+#: template/users.html.j2:145
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, you "
"can also just click on the \"add\" button on the \"CHF balance\" screen."
msgstr ""
-#: template/users.html.j2:171
+#: template/users.html.j2:168
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:174
+#: template/users.html.j2:171
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:177
+#: template/users.html.j2:174
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:199
+#: template/users.html.j2:196
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:202
+#: template/users.html.j2:199
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:206
+#: template/users.html.j2:203
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:247
+#: template/users.html.j2:244
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:246
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:251
+#: template/users.html.j2:248
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:292
+#: template/users.html.j2:289
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:295
+#: template/users.html.j2:292
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:299
+#: template/users.html.j2:296
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:322
+#: template/users.html.j2:319
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:325
+#: template/users.html.j2:322
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:330
+#: template/users.html.j2:327
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:352
+#: template/users.html.j2:349
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:355
+#: template/users.html.j2:352
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:360
+#: template/users.html.j2:357
msgid ""
"The QR code scanner button can also be held to manually enter a \"taler://\"-"
"URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:383
+#: template/users.html.j2:380
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:386
+#: template/users.html.j2:383
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:387
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:430
+#: template/users.html.j2:427
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:433
+#: template/users.html.j2:430
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:437
+#: template/users.html.j2:434
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:463
+#: template/users.html.j2:460
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 4a1ec01..6a153ab 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-02-25 09:31+0100\n"
+"POT-Creation-Date: 2024-02-25 09:25+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/";
@@ -201,7 +201,7 @@ msgstr "Taler Operations AG - Pour marchands"
msgid "Describes how merchants can use Taler."
msgstr ""
-#: template/merchants.html.j2:16 template/users.html.j2:103
+#: template/merchants.html.j2:16 template/users.html.j2:100
msgid "Prerequisites"
msgstr ""
@@ -380,166 +380,166 @@ msgstr "Taler Operations AG - Pour les clients"
msgid "Describes how to use taler"
msgstr ""
-#: template/users.html.j2:107
+#: template/users.html.j2:104
msgid "What do I need to use Taler for payments?"
msgstr ""
-#: template/users.html.j2:113
+#: template/users.html.j2:110
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\""
msgstr ""
-#: template/users.html.j2:117
+#: template/users.html.j2:114
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments"
msgstr ""
-#: template/users.html.j2:121
+#: template/users.html.j2:118
#, fuzzy
msgid "Installation of a"
msgstr "Guide d'installation utilisateur"
-#: template/users.html.j2:126
+#: template/users.html.j2:123
msgid "Taler wallet"
msgstr ""
-#: template/users.html.j2:138 template/users.html.j2:170
-#: template/users.html.j2:198 template/users.html.j2:246
-#: template/users.html.j2:291 template/users.html.j2:321
-#: template/users.html.j2:351 template/users.html.j2:382
-#: template/users.html.j2:429
+#: template/users.html.j2:135 template/users.html.j2:167
+#: template/users.html.j2:195 template/users.html.j2:243
+#: template/users.html.j2:288 template/users.html.j2:318
+#: template/users.html.j2:348 template/users.html.j2:379
+#: template/users.html.j2:426
msgid "Step"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:136
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:139
msgid ""
"Initially, you may 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:148
+#: template/users.html.j2:145
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, you "
"can also just click on the \"add\" button on the \"CHF balance\" screen."
msgstr ""
-#: template/users.html.j2:171
+#: template/users.html.j2:168
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:174
+#: template/users.html.j2:171
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:177
+#: template/users.html.j2:174
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:199
+#: template/users.html.j2:196
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:202
+#: template/users.html.j2:199
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:206
+#: template/users.html.j2:203
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:247
+#: template/users.html.j2:244
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:246
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:251
+#: template/users.html.j2:248
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:292
+#: template/users.html.j2:289
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:295
+#: template/users.html.j2:292
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:299
+#: template/users.html.j2:296
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:322
+#: template/users.html.j2:319
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:325
+#: template/users.html.j2:322
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:330
+#: template/users.html.j2:327
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:352
+#: template/users.html.j2:349
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:355
+#: template/users.html.j2:352
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:360
+#: template/users.html.j2:357
msgid ""
"The QR code scanner button can also be held to manually enter a \"taler://\"-"
"URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:383
+#: template/users.html.j2:380
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:386
+#: template/users.html.j2:383
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:387
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:430
+#: template/users.html.j2:427
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:433
+#: template/users.html.j2:430
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:437
+#: template/users.html.j2:434
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:463
+#: template/users.html.j2:460
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/locale/messages.pot b/locale/messages.pot
index 6e970fe..0f1ad76 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 09:31+0100\n"
+"POT-Creation-Date: 2024-02-25 09:25+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"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Describes how merchants can use Taler."
msgstr ""
-#: template/merchants.html.j2:16 template/users.html.j2:103
+#: template/merchants.html.j2:16 template/users.html.j2:100
msgid "Prerequisites"
msgstr ""
@@ -356,166 +356,166 @@ msgstr ""
msgid "Describes how to use taler"
msgstr ""
-#: template/users.html.j2:107
+#: template/users.html.j2:104
msgid "What do I need to use Taler for payments?"
msgstr ""
-#: template/users.html.j2:113
+#: template/users.html.j2:110
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\""
msgstr ""
-#: template/users.html.j2:117
+#: template/users.html.j2:114
msgid "<b>Mobile phone number</b> beginning with \"+41\" to receive P2P
payments"
msgstr ""
-#: template/users.html.j2:121
+#: template/users.html.j2:118
msgid "Installation of a"
msgstr ""
-#: template/users.html.j2:126
+#: template/users.html.j2:123
msgid "Taler wallet"
msgstr ""
-#: template/users.html.j2:138 template/users.html.j2:170
-#: template/users.html.j2:198 template/users.html.j2:246
-#: template/users.html.j2:291 template/users.html.j2:321
-#: template/users.html.j2:351 template/users.html.j2:382
-#: template/users.html.j2:429
+#: template/users.html.j2:135 template/users.html.j2:167
+#: template/users.html.j2:195 template/users.html.j2:243
+#: template/users.html.j2:288 template/users.html.j2:318
+#: template/users.html.j2:348 template/users.html.j2:379
+#: template/users.html.j2:426
msgid "Step"
msgstr ""
-#: template/users.html.j2:139
+#: template/users.html.j2:136
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:142
+#: template/users.html.j2:139
msgid ""
"Initially, you may 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:148
+#: template/users.html.j2:145
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, "
"you can also just click on the \"add\" button on the \"CHF balance\" "
"screen."
msgstr ""
-#: template/users.html.j2:171
+#: template/users.html.j2:168
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:174
+#: template/users.html.j2:171
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:177
+#: template/users.html.j2:174
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:199
+#: template/users.html.j2:196
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:202
+#: template/users.html.j2:199
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:206
+#: template/users.html.j2:203
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:247
+#: template/users.html.j2:244
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:246
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:251
+#: template/users.html.j2:248
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:292
+#: template/users.html.j2:289
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:295
+#: template/users.html.j2:292
msgid ""
"The wallet will show you the subject, target account and amount to "
"transfer."
msgstr ""
-#: template/users.html.j2:299
+#: template/users.html.j2:296
msgid ""
"Copy the information into your online banking application and wire the "
"funds to the payment service provider."
msgstr ""
-#: template/users.html.j2:322
+#: template/users.html.j2:319
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:325
+#: template/users.html.j2:322
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:330
+#: template/users.html.j2:327
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:352
+#: template/users.html.j2:349
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:355
+#: template/users.html.j2:352
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:360
+#: template/users.html.j2:357
msgid ""
"The QR code scanner button can also be held to manually enter a "
"\"taler://\"-URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:383
+#: template/users.html.j2:380
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:386
+#: template/users.html.j2:383
msgid ""
"The wallet will show you details about what you are buying, including the"
" price and applicable fees."
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:387
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:430
+#: template/users.html.j2:427
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:433
+#: template/users.html.j2:430
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:437
+#: template/users.html.j2:434
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:463
+#: template/users.html.j2:460
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/template/fees.html.j2 b/template/fees.html.j2
index b4cd22e..7b9bc80 100644
--- a/template/fees.html.j2
+++ b/template/fees.html.j2
@@ -1,7 +1,7 @@
{% extends "common/base.j2" %}
{% block head_content %}
<title>{% trans %}Fees{% endtrans %}</title>
-<meta name="description" content="{% trans %}Information about the fees Taler
does, and does not collect.{% endtrans %}" />
+<meta name="description" content="{% trans %}Information about the fees Taler
does, and does not collect.{% endtrans %}" />
{# <meta name="author" content="" /> #}
{% endblock %}
@@ -14,107 +14,26 @@
<h2>{% trans %}Fees{% endtrans %}</h2>
<br />
<p>
- {% trans %}Diese Seite erklärt die einzelnen Gebührenarten im
- Taler-Bezahlsystem.{% endtrans %}
+ Ein Abhebevorgang von 5 CHF erzeugt elektronische Münzen
+ mit Nennwerten von 4, 16, 32, 64, 128, und 256 Rappen.
+ Bezahlt man nun beispielsweise einen Betrag von 3,23 CHF
+ mit den Nennwerten 4, 64, und 256 Rappen (also über einen
+ Zahlbetrag von insgesamt 324 Rappen) bekommt man eine
+ Münze mit dem Nennwert 1 Rappen als Wechselgeld. Für die
+ drei eingesetzten Münzen (4, 64, und 256 Rappen) fällt
+ nach der Tabelle oben folgende Zahlgebühr an: 2 x 0,25
+ Rappen und 1 x 0,50 Rappen, also insgesamt 1,00 Rappen
+ (dies entspricht 0,3 Prozent des Zahlbetrags).
+ </p>
+ <p>
+ Bezahlt man hingegen 0,33 CHF mit einer Münze von 32
+ Rappen und einer Münze von 1 Rappen, beträgt die Gebühr
+ 0,50 Rappen (dies entspricht 1,5 Prozent von 0,33 CHF).
+ </p>
+ <p>
+ Bezahlt man 0,01 CHF mit einer Münze von 1 Rappen
+ Nennwert, beträgt die Gebühr 0,25 Rappen (25 Prozent).
</p>
- <br />
- </div>
- <div class="innfaqSec">
- <div id="accordion">
- <div class="row">
- <div class="col-sm-12">
- <div class="card">
- <div class="card-header">
- <a class="card-link" data-toggle="collapse" href="#collapse"
- >{% trans %}Fees{% endtrans %} - Version 1, 2024</a
- >
- </div>
- <div
- id="collapse"
- class="collapse show"
- data-parent="#accordion"
- ></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="innfaqSec">
- <div id="accordion">
- <div class="row">
- <div class="col-sm-12">
- <div class="card">
- <div class="card-header">
- <a
- class="card-link"
- data-toggle="collapse"
- href="#collapse_STEFAN"
- >Nutzerfreundlich vereinfachte Gebührenordnung</a
- >
- </div>
- <div
- id="collapse_STEFAN"
- class="collapse show"
- data-parent="#accordion"
- >
- <div class="card-body">
- <p>
- Das Taler-Bezahlsystem bringt technisch bedingt
- verschiedene Gebührenarten mit sich. Es bietet den
Nutzern
- aber auch eine vereinfachte Gebührenordnung. Kein Nutzer
- wird gezwungen sein, die Gebührenarten kennenlernen zu
- müssen. Es genügt zu wissen, dass bei jedem einzelnen
- Aufbuchen und Bezahlen mit digitalem Bargeld eine leicht
- verständliche Summe aus den berechneten Gebührenarten
- angezeigt wird. Selbstverständlich kann man sich auch
alle
- berechneten Gebührenarten im Detail anzeigen lassen, wenn
- man dies möchte. Ein Tippen oder Klicken auf die
- Gebührensumme listet diese dann auf.
- </p>
- <p>
- Die Gebührensumme ist aufgerundet. In der Gebührensumme
- steckt daher stets eine kleine Überdeckung der
tatsächlich
- belasteten Gebühren. Diese Überdeckung wird im Wallet
über
- den Zeitraum eines Jahrs gesammelt und dort ordentlich
- verwahrt, um dann zum Bezahlen wieder zur Verfügung zu
- stehen.
- </p>
- <p>
- Die Gründe für die Aufrundung der Gebührensumme sind auf
- einer
- <a
-
href="https://docs.taler.net/design-documents/047-stefan.html";
- target="_blank"
- rel="noopener noreferrer"
- >
- Unterseite der Taler-Dokumentation</a
- >
- ausführlich in englischer Sprache beschrieben.
- </p>
- <p>
- Kurz zusammengefasst: Zahlbeträge müssen für die
Zahlenden
- vorhersehbar und nachvollziehbar sein - unabhängig von
den
- Nennwerten der eingesetzten elektronischen Münzen. Man
- erwartet, dass für gleich hohe Zahlbeträge stets gleich
- hohe Gebühren angezeigt werden, auch wenn die
eingesetzten
- elektronischen Münzen andere Nennwerte haben. Des
weiteren
- folgen die Gebühren keinem starren Verhältnis zum
Nennwert
- der eingesetzten Münzen, sondern einer logarithmischen
- Staffelung. Münzen von hohem Wert tragen daher eine
- prozentual geringere Gebühr als Münzen von niedrigem
Wert.
- Sonst würde eine Münze von hohem Wert mit einer zu hohen
- Gebühr belastet, eine Münze von geringem Wert zu niedrig
- belastet. Die nutzerfreundlich vereinfachte
- Gebührenordnung verringert zudem die Komplexität, die ein
- elektronisches Bezahlsystem nun mal mit sich bringt. Dies
- kommt sowohl den Händlern als auch ihren Kunden zugute.
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
</div>
<div class="innfaqSec">
<div id="accordion">
@@ -191,27 +110,6 @@
</tr>
</table>
<br />
- <p>
- Ein Abhebevorgang von 5 CHF erzeugt elektronische Münzen
- mit Nennwerten von 4, 16, 32, 64, 128, und 256 Rappen.
- Bezahlt man nun beispielsweise einen Betrag von 3,23 CHF
- mit den Nennwerten 4, 64, und 256 Rappen (also über einen
- Zahlbetrag von insgesamt 324 Rappen) bekommt man eine
- Münze mit dem Nennwert 1 Rappen als Wechselgeld. Für die
- drei eingesetzten Münzen (4, 64, und 256 Rappen) fällt
- nach der Tabelle oben folgende Zahlgebühr an: 2 x 0,25
- Rappen und 1 x 0,50 Rappen, also insgesamt 1,00 Rappen
- (dies entspricht 0,3 Prozent des Zahlbetrags).
- </p>
- <p>
- Bezahlt man hingegen 0,33 CHF mit einer Münze von 32
- Rappen und einer Münze von 1 Rappen, beträgt die Gebühr
- 0,50 Rappen (dies entspricht 1,5 Prozent von 0,33 CHF).
- </p>
- <p>
- Bezahlt man 0,01 CHF mit einer Münze von 1 Rappen
- Nennwert, beträgt die Gebühr 0,25 Rappen (25 Prozent).
- </p>
<p>
Die <b>Abhebegebühr</b> fällt einmalig an beim Abheben
von
Guthaben, das der Inhaber eines Wallets an den
@@ -234,54 +132,6 @@
</div>
</div>
</div>
- <div class="innfaqSec">
- <div id="accordion">
- <div class="row">
- <div class="col-sm-12">
- <div class="card">
- <div class="card-header">
- <a class="card-link" data-toggle="collapse" href="#collapse0"
- >Abhebegebühr - per Abhebung von digitalem Bargeld</a
- >
- </div>
- <div
- id="collapse0"
- class="collapse show"
- data-parent="#accordion"
- >
- <div class="card-body">
- <p>
- Die <b>Abhebegebühr (Withdrawal fee)</b> kann für jede
- Kundenüberweisung vom persönlichen Giro-Bankkonto auf das
- Bankkonto des Systembetreibers erhoben werden. Die
- Überweisung stellt das Guthaben bereit, aus dem das
Wallet
- den entsprechenden Wert in elektronischen Münzen beim
- Systembetreiber abheben kann. Mit diesen Münzen kann dann
- aus dem Wallet datenschutz-optimiert bezahlt werden.
- </p>
- <p>
- Es fallen auf der Seite des Systembetreibers verschiedene
- Kosten an, die ihre Abwälzung auf die Kunden
- rechtfertigen. Zum Beispiel entstehen Kosten für die
teils
- manuelle, teils automatisierte Prüfung von wirtschaftlich
- Berechtigten der überweisenden Bankkonten, um Gesetzen
- gegen Geldwäsche Folge leisten zu können. Ein weiteres
- Beispiel sind Kosten für die rechtlich und buchhalterisch
- korrekte Verwahrung der überwiesenen Geldbeträge auf
einem
- Verrechnungskonto beim Systembetreiber.
- </p>
- <p>
- Die Abhebegebühr wird erhoben pro Abhebung aufs Wallet
- nach der Überweisung vom eigenen Bankkonto auf das
- Bankkonto des Systembetreibers.
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
<div class="innfaqSec">
<div id="accordion">
<div class="row">
@@ -473,78 +323,6 @@
</div>
</div>
</div>
- <div class="innfaqSec">
- <div id="accordion">
- <div class="row">
- <div class="col-sm-12">
- <div class="card">
- <div class="card-header">
- <a class="card-link" data-toggle="collapse" href="#collapse5"
- >{% trans %}Costs for sending SMS to users{% endtrans %}</a
- >
- </div>
- <div
- id="collapse5"
- class="collapse show"
- data-parent="#accordion"
- >
- <div class="card-body">
- <p>
- Bevor ein Taler-Wallet digitales Geld abheben kann, muss
- ein Geldbetrag in CHF von einem regulären Schweizer
- Bankkonto an den Systembetreiber des Taler-Bezahlsystems
- überwiesen werden. Dafür ist ein
- Know-Your-Customer-Verfahren (KYC) erforderlich, das im
- Fall der Taler Operations AG mittels SMS an eine
- Telefonnummer mit Schweizer Vorwahl (++41) durchgeführt
- wird. Dieses Verfahren führt zu Kosten, die der
- Systembetreiber durch Gebühren decken muss.
- </p>
- <p>
- In der Markteinführungsphase übernimmt die Taler
- Operations AG diese Kosten des SMS-Versands.
- </p>
- <p>
- <b
- >Für Kunden, die
- <a
- href="https://www.netzbon.ch/e-netzbon/";
- target="_blank"
- rel="noopener noreferrer"
- >eNetzBon des Vereins Soziale Ökonomie</a
- >
- nutzen, fallen keine Kosten an, da weder ein
- KYC-Verfahren nötig ist noch SMS versendet werden.
- </b>
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- {#
- <!-- DEPRECATED REFRESH FEE <div class="innfaqSec">
- <div id="accordion">
- <div class="row">
- <div class="col-sm-12">
- <div class="card">
- <div
class="card-header">
- <a
class="card-link" data-toggle="collapse" href="#collapse_refresh_fee">Refresh
fee - Gebühr für Nichtnutzung des Guthabens im Wallet</a>
- </div>
- <div
id="collapse_refresh_fee" class="collapse show" data-parent="#accordion">
- <div
class="card-body">
- <p>{%
trans %}Refresh fees are possibly incurred for not spending digital cash from
the Taler wallet after
- a
certain time frame which can be configured by the Taler payment service
provider.{% endtrans %}</p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div> -->
- #}
</div>
</section>
</main>
diff --git a/template/users.html.j2 b/template/users.html.j2
index 372a14f..c9291a5 100644
--- a/template/users.html.j2
+++ b/template/users.html.j2
@@ -17,11 +17,8 @@
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 of choice
+ Select your platform!
</h2>
- <p class="text-xl font-normal mb-8">
- Please select which platform you're running.
- </p>
<div class="browser-selection">
<a
href="javascript:selectGroup('android')"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-ops-www] branch master updated: -editing fees,
gnunet <=