[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated: fmt
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] branch master updated: fmt |
|
Date: |
Sun, 25 Feb 2024 11:01:02 +0100 |
This is an automated email from the git hooks/post-receive script.
nora 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 1188c35 fmt
1188c35 is described below
commit 1188c35569d1162e6c060b0d5d82207e6a4a6e63
Author: Nullptrderef <nullptrderef@national.shitposting.agency>
AuthorDate: Sun Feb 25 11:00:54 2024 +0100
fmt
---
common/base.j2 | 2 +-
common/footer.j2.inc | 90 +++++++++++++++++++++++---------
common/header.j2.inc | 7 ++-
common/navigation/items.j2.inc | 8 +--
locale/de/LC_MESSAGES/messages.po | 70 ++++++++++++++-----------
locale/en/LC_MESSAGES/messages.po | 62 ++++++++++++----------
locale/fr/LC_MESSAGES/messages.po | 66 ++++++++++++++----------
locale/messages.pot | 64 +++++++++++++----------
template/fees.html.j2 | 105 ++++++++++++++++++--------------------
9 files changed, 276 insertions(+), 198 deletions(-)
diff --git a/common/base.j2 b/common/base.j2
index ac099e9..ac0b8c7 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
<html lang="{{ lang }}">
<head>
<meta charset="UTF-8" />
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index fbf7172..5508df3 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,12 +1,20 @@
-<footer class="dark bg-black text-white w-screen relative py-8 footer flex
flex-col items-center justify-center">
- <div class="footer-top-outer flex px-8 py-8 sm:px-10 items-center
justify-center w-full">
+<footer
+ class="dark bg-black text-white w-screen relative py-8 footer flex flex-col
items-center justify-center"
+>
+ <div
+ class="footer-top-outer flex px-8 py-8 sm:px-10 items-center
justify-center w-full"
+ >
<div
- class="footer-top flex p-4 items-start max-w-max justify-center flex-1
gap-12 lg:max-w-screen-2xl flex-col lg:flex-row lg:items-start
lg:justify-between">
+ class="footer-top flex p-4 items-start max-w-max justify-center flex-1
gap-12 lg:max-w-screen-2xl flex-col lg:flex-row lg:items-start
lg:justify-between"
+ >
<div class="footer-col flex-1">
<div class="text-center flex flex-col items-center">
- <a href="{{ url_localized('index.html') }}" class="footlogo"><img
- src="{{ url_static('images/unsorted/footlogo.png') }}"
alt="Homepage"
- style="width: 206px; height: 85px; max-width: max-content" /></a>
+ <a href="{{ url_localized('index.html') }}" class="footlogo"
+ ><img
+ src="{{ url_static('images/unsorted/footlogo.png') }}"
+ alt="Homepage"
+ style="width: 206px; height: 85px; max-width: max-content"
+ /></a>
<p class="mt-3">
Taler Operations AG, {% trans %}Switzerland{% endtrans %}<br />
Höheweg 80<br />
@@ -19,8 +27,11 @@
<h4 class="section-title">{% trans %}Quick Links{% endtrans %}</h4>
<ul>
<li>
- <a class="link no-clr" href="{{ url_localized('index.html') }}"
- alt="{% trans %}Taler Operations AG Homepage{% endtrans %}">
+ <a
+ class="link no-clr"
+ href="{{ url_localized('index.html') }}"
+ alt="{% trans %}Taler Operations AG Homepage{% endtrans %}"
+ >
{% trans %}Home{% endtrans %}
</a>
</li>
@@ -46,17 +57,32 @@
<h4 class="section-title">{% trans %}Partners{% endtrans %}</h4>
<ul>
<li>
- <a href="https://taler.net/en/ngi-taler.html"; target="_blank"
rel="noopener noreferrer"
- class="link no-clr">{% trans %}Taler Consortium{% endtrans
%}</a>
+ <a
+ href="https://taler.net/en/ngi-taler.html";
+ target="_blank"
+ rel="noopener noreferrer"
+ class="link no-clr"
+ >{% trans %}Taler Consortium{% endtrans %}</a
+ >
</li>
<li>
- <a href="https://bfh.ch/"; target="_blank" rel="noopener
noreferrer" class="link no-clr">{% trans
- %}Bern University of Applied Sciences{%
- endtrans %}</a>
+ <a
+ href="https://bfh.ch/";
+ target="_blank"
+ rel="noopener noreferrer"
+ class="link no-clr"
+ >{% trans %}Bern University of Applied Sciences{%
+ endtrans %}</a
+ >
</li>
<li>
- <a href="https://netzbon.ch"; target="_blank" rel="noopener
noreferrer" class="link no-clr">{% trans
- %}NetzBon{% endtrans %}</a>
+ <a
+ href="https://netzbon.ch";
+ target="_blank"
+ rel="noopener noreferrer"
+ class="link no-clr"
+ >{% trans %}NetzBon{% endtrans %}</a
+ >
</li>
</ul>
</div>
@@ -66,29 +92,43 @@
<h4 class="section-title">{% trans %}Contacts{% endtrans %}</h4>
<ul>
<li>
- <a class="link no-clr phone" href="tel:0041442801200">{% trans
%}Tel:{% endtrans %} +41 44 280 1200</a>
+ <a class="link no-clr phone" href="tel:0041442801200"
+ >{% trans %}Tel:{% endtrans %} +41 44 280 1200</a
+ >
</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-systems.com";
+ >{% 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:aml@taler-systems.com";
+ >{% trans %}AML Officer{% endtrans %}</a
+ >
</li>
</ul>
</div>
</div>
</div>
</div>
- <div class="footer-bottom flex items-center justify-center flex-col
text-center px-6 max-w-5xl">
+ <div
+ class="footer-bottom flex items-center justify-center flex-col text-center
px-6 max-w-5xl"
+ >
<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">
+ <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>.
+ Documentation License</a
+ >.
</p>
<p class="py-2">
{% trans %}We do not assume any liability for the correctness of
contents.
@@ -100,4 +140,4 @@
mitigating problems.{% endtrans %}
</p>
</div>
-</footer>
\ No newline at end of file
+</footer>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 8757c1c..0ff1ef4 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -35,11 +35,14 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<meta name="viewport" content="width=device-width, initial-scale=1,
shrink-to-fit=no" />
+<meta
+ name="viewport"
+ content="width=device-width, initial-scale=1, shrink-to-fit=no"
+/>
<script src="{{ url_static('js/jquerymin.js') }}"></script>
<script src="{{ url_static('js/show-on-js.ts') }}" defer></script>
<link href="{{ url_static('scss/global.scss') }}" rel="stylesheet" />
-<link href="{{ url_static('postcss/tailwind.css') }}" rel="stylesheet" />
\ No newline at end of file
+<link href="{{ url_static('postcss/tailwind.css') }}" rel="stylesheet" />
diff --git a/common/navigation/items.j2.inc b/common/navigation/items.j2.inc
index 60de158..412a315 100644
--- a/common/navigation/items.j2.inc
+++ b/common/navigation/items.j2.inc
@@ -6,13 +6,13 @@
>
<a
class="no-underline hover:underline text-slate-500 hover:text-slate-400
transition-all"
- href="{{ url_localized('merchants.html') }}"
- >{% trans %}For Merchants{% endtrans %}</a
+ href="{{ url_localized('users.html') }}"
+ >{% trans %}Users{% endtrans %}</a
>
<a
class="no-underline hover:underline text-slate-500 hover:text-slate-400
transition-all"
- href="{{ url_localized('users.html') }}"
- >{% trans %}For Users{% endtrans %}</a
+ href="{{ url_localized('merchants.html') }}"
+ >{% trans %}Merchants{% endtrans %}</a
>
<a
class="no-underline hover:underline text-slate-500 hover:text-slate-400
transition-all"
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index ae0bbf7..fc442d6 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 10:51+0100\n"
+"POT-Creation-Date: 2024-02-25 10:59+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/";
@@ -24,74 +24,74 @@ msgstr ""
msgid "Taler Operations AG, Biel, Switzerland"
msgstr "Taler Operations AG, Biel, Schweiz"
-#: common/footer.j2.inc:11 common/footer.old.j2.inc:15
+#: common/footer.j2.inc:19 common/footer.old.j2.inc:15
msgid "Switzerland"
msgstr "Schweiz"
-#: common/footer.j2.inc:19 common/footer.old.j2.inc:23
+#: common/footer.j2.inc:27 common/footer.old.j2.inc:23
msgid "Quick Links"
msgstr "Seitenübersicht"
-#: common/footer.j2.inc:23 common/footer.old.j2.inc:28
+#: common/footer.j2.inc:33 common/footer.old.j2.inc:28
msgid "Taler Operations AG Homepage"
msgstr "Taler Operations AG Startseite"
-#: common/footer.j2.inc:24 common/footer.old.j2.inc:29
+#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
#: common/navigation/items.j2.inc:5
msgid "Home"
msgstr "Startseite"
-#: common/footer.j2.inc:33 common/footer.old.j2.inc:38
+#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
#: common/navigation/items.j2.inc:20 template/fees.html.j2:2
msgid "Fees"
msgstr "Gebührenordnung"
-#: common/footer.j2.inc:38 common/footer.old.j2.inc:43
+#: common/footer.j2.inc:49 common/footer.old.j2.inc:43
#: common/navigation/items.j2.inc:25
msgid "Terms of Service"
msgstr "AGB"
-#: common/footer.j2.inc:46 common/footer.old.j2.inc:51
+#: common/footer.j2.inc:57 common/footer.old.j2.inc:51
msgid "Partners"
msgstr "Partner"
-#: common/footer.j2.inc:50 common/footer.old.j2.inc:58
+#: common/footer.j2.inc:65 common/footer.old.j2.inc:58
msgid "Taler Consortium"
msgstr "Taler-Konsortium NGI TALER"
-#: common/footer.j2.inc:53 common/footer.old.j2.inc:66
+#: common/footer.j2.inc:74 common/footer.old.j2.inc:66
msgid "Bern University of Applied Sciences"
msgstr "Berner Fachhochschule (BFH)"
-#: common/footer.j2.inc:58 common/footer.old.j2.inc:75
+#: common/footer.j2.inc:84 common/footer.old.j2.inc:75
msgid "NetzBon"
msgstr "NetzBon"
-#: common/footer.j2.inc:66 common/footer.old.j2.inc:83
+#: common/footer.j2.inc:92 common/footer.old.j2.inc:83
msgid "Contacts"
msgstr "Kontakt"
-#: common/footer.j2.inc:69 common/footer.old.j2.inc:87
+#: common/footer.j2.inc:96 common/footer.old.j2.inc:87
msgid "Tel:"
msgstr "Tel:"
-#: common/footer.j2.inc:72 common/footer.old.j2.inc:92
+#: common/footer.j2.inc:101 common/footer.old.j2.inc:92
msgid "Compliance Officer"
msgstr "Compliance-Beauftragte"
-#: common/footer.j2.inc:76 common/footer.old.j2.inc:97
+#: common/footer.j2.inc:106 common/footer.old.j2.inc:97
msgid "AML Officer"
msgstr "AML-Beauftragte"
-#: common/footer.j2.inc:85 common/footer.old.j2.inc:110
+#: common/footer.j2.inc:118 common/footer.old.j2.inc:110
msgid "Copyright"
msgstr "Copyright"
-#: common/footer.j2.inc:86
+#: common/footer.j2.inc:121
msgid "Licensed under the"
msgstr ""
-#: common/footer.j2.inc:94
+#: common/footer.j2.inc:134
#, fuzzy
#| msgid ""
#| "We do not assume any liability for the correctness of contents. We do not "
@@ -137,14 +137,18 @@ msgstr ""
msgid "Skip to main content"
msgstr "Navigationsmenü überspringen"
-#: common/navigation/items.j2.inc:10 template/index.html.j2:66
-msgid "For Merchants"
-msgstr "Für Händler"
-
-#: common/navigation/items.j2.inc:15 template/index.html.j2:55
-msgid "For Users"
+#: common/navigation/items.j2.inc:10
+#, fuzzy
+#| msgid "For Users"
+msgid "Users"
msgstr "Für Kunden"
+#: common/navigation/items.j2.inc:15
+#, fuzzy
+#| msgid "For Merchants"
+msgid "Merchants"
+msgstr "Für Händler"
+
#: template/fees.html.j2:5
msgid "Information about the fees Taler does, and does not collect."
msgstr ""
@@ -172,11 +176,11 @@ msgstr "Tokenization"
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:65
+#: template/fees.html.j2:70
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:69
+#: template/fees.html.j2:73
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is applied to wire transfers that "
"return funds to customers when either the Taler wallet did not withdraw the "
@@ -186,14 +190,14 @@ msgid ""
"original account."
msgstr ""
-#: template/fees.html.j2:78
+#: template/fees.html.j2:81
msgid ""
"Payers should be careful when entering the wire transfer subject, and ensure "
"that their wallet is online within a month of initiating the withdrawal to "
"avoid paying bounce fees."
msgstr ""
-#: template/fees.html.j2:91
+#: template/fees.html.j2:92
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged on an outgoing wire "
"transfer when Taler is used to deposit funds into a bank account. Merchants "
@@ -205,7 +209,7 @@ msgid ""
"from the total amount wired."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:109
msgid ""
"Taler eCHF is issued with a <b>1 year</b> validity period. One month "
"before the expiration date, you wallet should automatically exchange any "
@@ -242,6 +246,10 @@ msgstr ""
msgid "Getting Started with Taler"
msgstr "Zur Demo-Seite"
+#: template/index.html.j2:55
+msgid "For Users"
+msgstr "Für Kunden"
+
#: template/index.html.j2:56
msgid "Your data and money under your control."
msgstr ""
@@ -250,6 +258,10 @@ msgstr ""
msgid "Pay with Taler"
msgstr "Mit Taler bezahlen"
+#: template/index.html.j2:66
+msgid "For Merchants"
+msgstr "Für Händler"
+
#: template/index.html.j2:68
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index f7831e8..06766f0 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 10:51+0100\n"
+"POT-Creation-Date: 2024-02-25 10:59+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"
@@ -22,74 +22,74 @@ msgstr ""
msgid "Taler Operations AG, Biel, Switzerland"
msgstr ""
-#: common/footer.j2.inc:11 common/footer.old.j2.inc:15
+#: common/footer.j2.inc:19 common/footer.old.j2.inc:15
msgid "Switzerland"
msgstr ""
-#: common/footer.j2.inc:19 common/footer.old.j2.inc:23
+#: common/footer.j2.inc:27 common/footer.old.j2.inc:23
msgid "Quick Links"
msgstr ""
-#: common/footer.j2.inc:23 common/footer.old.j2.inc:28
+#: common/footer.j2.inc:33 common/footer.old.j2.inc:28
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:24 common/footer.old.j2.inc:29
+#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
#: common/navigation/items.j2.inc:5
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:33 common/footer.old.j2.inc:38
+#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
#: common/navigation/items.j2.inc:20 template/fees.html.j2:2
msgid "Fees"
msgstr ""
-#: common/footer.j2.inc:38 common/footer.old.j2.inc:43
+#: common/footer.j2.inc:49 common/footer.old.j2.inc:43
#: common/navigation/items.j2.inc:25
msgid "Terms of Service"
msgstr ""
-#: common/footer.j2.inc:46 common/footer.old.j2.inc:51
+#: common/footer.j2.inc:57 common/footer.old.j2.inc:51
msgid "Partners"
msgstr ""
-#: common/footer.j2.inc:50 common/footer.old.j2.inc:58
+#: common/footer.j2.inc:65 common/footer.old.j2.inc:58
msgid "Taler Consortium"
msgstr ""
-#: common/footer.j2.inc:53 common/footer.old.j2.inc:66
+#: common/footer.j2.inc:74 common/footer.old.j2.inc:66
msgid "Bern University of Applied Sciences"
msgstr ""
-#: common/footer.j2.inc:58 common/footer.old.j2.inc:75
+#: common/footer.j2.inc:84 common/footer.old.j2.inc:75
msgid "NetzBon"
msgstr ""
-#: common/footer.j2.inc:66 common/footer.old.j2.inc:83
+#: common/footer.j2.inc:92 common/footer.old.j2.inc:83
msgid "Contacts"
msgstr ""
-#: common/footer.j2.inc:69 common/footer.old.j2.inc:87
+#: common/footer.j2.inc:96 common/footer.old.j2.inc:87
msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:72 common/footer.old.j2.inc:92
+#: common/footer.j2.inc:101 common/footer.old.j2.inc:92
msgid "Compliance Officer"
msgstr ""
-#: common/footer.j2.inc:76 common/footer.old.j2.inc:97
+#: common/footer.j2.inc:106 common/footer.old.j2.inc:97
msgid "AML Officer"
msgstr ""
-#: common/footer.j2.inc:85 common/footer.old.j2.inc:110
+#: common/footer.j2.inc:118 common/footer.old.j2.inc:110
msgid "Copyright"
msgstr ""
-#: common/footer.j2.inc:86
+#: common/footer.j2.inc:121
msgid "Licensed under the"
msgstr ""
-#: common/footer.j2.inc:94
+#: common/footer.j2.inc:134
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 "
@@ -113,12 +113,12 @@ msgstr ""
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:10 template/index.html.j2:66
-msgid "For Merchants"
+#: common/navigation/items.j2.inc:10
+msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:15 template/index.html.j2:55
-msgid "For Users"
+#: common/navigation/items.j2.inc:15
+msgid "Merchants"
msgstr ""
#: template/fees.html.j2:5
@@ -146,11 +146,11 @@ msgstr ""
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:65
+#: template/fees.html.j2:70
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:69
+#: template/fees.html.j2:73
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is applied to wire transfers that "
"return funds to customers when either the Taler wallet did not withdraw the "
@@ -160,14 +160,14 @@ msgid ""
"original account."
msgstr ""
-#: template/fees.html.j2:78
+#: template/fees.html.j2:81
msgid ""
"Payers should be careful when entering the wire transfer subject, and ensure "
"that their wallet is online within a month of initiating the withdrawal to "
"avoid paying bounce fees."
msgstr ""
-#: template/fees.html.j2:91
+#: template/fees.html.j2:92
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged on an outgoing wire "
"transfer when Taler is used to deposit funds into a bank account. Merchants "
@@ -179,7 +179,7 @@ msgid ""
"from the total amount wired."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:109
msgid ""
"Taler eCHF is issued with a <b>1 year</b> validity period. One month "
"before the expiration date, you wallet should automatically exchange any "
@@ -212,6 +212,10 @@ msgstr ""
msgid "Getting Started with Taler"
msgstr ""
+#: template/index.html.j2:55
+msgid "For Users"
+msgstr ""
+
#: template/index.html.j2:56
msgid "Your data and money under your control."
msgstr ""
@@ -220,6 +224,10 @@ msgstr ""
msgid "Pay with Taler"
msgstr ""
+#: template/index.html.j2:66
+msgid "For Merchants"
+msgstr ""
+
#: template/index.html.j2:68
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 20fb5a7..65145f4 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 10:51+0100\n"
+"POT-Creation-Date: 2024-02-25 10:59+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/";
@@ -24,76 +24,76 @@ msgstr ""
msgid "Taler Operations AG, Biel, Switzerland"
msgstr "Taler Operations AG, Bienne, Suisse"
-#: common/footer.j2.inc:11 common/footer.old.j2.inc:15
+#: common/footer.j2.inc:19 common/footer.old.j2.inc:15
msgid "Switzerland"
msgstr ""
-#: common/footer.j2.inc:19 common/footer.old.j2.inc:23
+#: common/footer.j2.inc:27 common/footer.old.j2.inc:23
msgid "Quick Links"
msgstr "Liens directs"
-#: common/footer.j2.inc:23 common/footer.old.j2.inc:28
+#: common/footer.j2.inc:33 common/footer.old.j2.inc:28
msgid "Taler Operations AG Homepage"
msgstr "Page d'accueil Taler Operations AG"
-#: common/footer.j2.inc:24 common/footer.old.j2.inc:29
+#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
#: common/navigation/items.j2.inc:5
msgid "Home"
msgstr "Accueil"
-#: common/footer.j2.inc:33 common/footer.old.j2.inc:38
+#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
#: common/navigation/items.j2.inc:20 template/fees.html.j2:2
msgid "Fees"
msgstr "Frais"
-#: common/footer.j2.inc:38 common/footer.old.j2.inc:43
+#: common/footer.j2.inc:49 common/footer.old.j2.inc:43
#: common/navigation/items.j2.inc:25
msgid "Terms of Service"
msgstr "Conditions d'utilisation"
-#: common/footer.j2.inc:46 common/footer.old.j2.inc:51
+#: common/footer.j2.inc:57 common/footer.old.j2.inc:51
msgid "Partners"
msgstr "Partenaires"
-#: common/footer.j2.inc:50 common/footer.old.j2.inc:58
+#: common/footer.j2.inc:65 common/footer.old.j2.inc:58
msgid "Taler Consortium"
msgstr "Consortium Taler"
-#: common/footer.j2.inc:53 common/footer.old.j2.inc:66
+#: common/footer.j2.inc:74 common/footer.old.j2.inc:66
#, fuzzy
#| msgid "Bern University of Applied Sciences"
msgid "Bern University of Applied Sciences"
msgstr "Haute école spécialisée bernoise"
-#: common/footer.j2.inc:58 common/footer.old.j2.inc:75
+#: common/footer.j2.inc:84 common/footer.old.j2.inc:75
msgid "NetzBon"
msgstr "NetzBon"
-#: common/footer.j2.inc:66 common/footer.old.j2.inc:83
+#: common/footer.j2.inc:92 common/footer.old.j2.inc:83
msgid "Contacts"
msgstr "Contacts"
-#: common/footer.j2.inc:69 common/footer.old.j2.inc:87
+#: common/footer.j2.inc:96 common/footer.old.j2.inc:87
msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:72 common/footer.old.j2.inc:92
+#: common/footer.j2.inc:101 common/footer.old.j2.inc:92
msgid "Compliance Officer"
msgstr "Responsable de la conformité"
-#: common/footer.j2.inc:76 common/footer.old.j2.inc:97
+#: common/footer.j2.inc:106 common/footer.old.j2.inc:97
msgid "AML Officer"
msgstr "Agent de lutte contre le blanchiment d'argent"
-#: common/footer.j2.inc:85 common/footer.old.j2.inc:110
+#: common/footer.j2.inc:118 common/footer.old.j2.inc:110
msgid "Copyright"
msgstr "Droits d'auteur"
-#: common/footer.j2.inc:86
+#: common/footer.j2.inc:121
msgid "Licensed under the"
msgstr ""
-#: common/footer.j2.inc:94
+#: common/footer.j2.inc:134
#, fuzzy
msgid ""
"We do not assume any liability for the correctness of contents. We do not "
@@ -129,13 +129,15 @@ msgstr ""
msgid "Skip to main content"
msgstr "Aller au menu principal"
-#: common/navigation/items.j2.inc:10 template/index.html.j2:66
-msgid "For Merchants"
+#: common/navigation/items.j2.inc:10
+msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:15 template/index.html.j2:55
-msgid "For Users"
-msgstr ""
+#: common/navigation/items.j2.inc:15
+#, fuzzy
+#| msgid "Taler Operations AG - Merchants"
+msgid "Merchants"
+msgstr "Taler Operations AG - Pour marchands"
#: template/fees.html.j2:5
msgid "Information about the fees Taler does, and does not collect."
@@ -162,11 +164,11 @@ msgstr ""
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:65
+#: template/fees.html.j2:70
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:69
+#: template/fees.html.j2:73
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is applied to wire transfers that "
"return funds to customers when either the Taler wallet did not withdraw the "
@@ -176,14 +178,14 @@ msgid ""
"original account."
msgstr ""
-#: template/fees.html.j2:78
+#: template/fees.html.j2:81
msgid ""
"Payers should be careful when entering the wire transfer subject, and ensure "
"that their wallet is online within a month of initiating the withdrawal to "
"avoid paying bounce fees."
msgstr ""
-#: template/fees.html.j2:91
+#: template/fees.html.j2:92
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged on an outgoing wire "
"transfer when Taler is used to deposit funds into a bank account. Merchants "
@@ -195,7 +197,7 @@ msgid ""
"from the total amount wired."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:109
msgid ""
"Taler eCHF is issued with a <b>1 year</b> validity period. One month "
"before the expiration date, you wallet should automatically exchange any "
@@ -230,6 +232,10 @@ msgstr ""
msgid "Getting Started with Taler"
msgstr ""
+#: template/index.html.j2:55
+msgid "For Users"
+msgstr ""
+
#: template/index.html.j2:56
msgid "Your data and money under your control."
msgstr ""
@@ -238,6 +244,10 @@ msgstr ""
msgid "Pay with Taler"
msgstr ""
+#: template/index.html.j2:66
+msgid "For Merchants"
+msgstr ""
+
#: template/index.html.j2:68
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
diff --git a/locale/messages.pot b/locale/messages.pot
index 61cdf1e..480917d 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,87 +8,87 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 10:55+0100\n"
+"POT-Creation-Date: 2024-02-25 10:59+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.10.3\n"
+"Generated-By: Babel 2.12.1\n"
#: common/base.j2:24 common/base.j2:28
msgid "Taler Operations AG, Biel, Switzerland"
msgstr ""
-#: common/footer.j2.inc:11 common/footer.old.j2.inc:15
+#: common/footer.j2.inc:19 common/footer.old.j2.inc:15
msgid "Switzerland"
msgstr ""
-#: common/footer.j2.inc:19 common/footer.old.j2.inc:23
+#: common/footer.j2.inc:27 common/footer.old.j2.inc:23
msgid "Quick Links"
msgstr ""
-#: common/footer.j2.inc:23 common/footer.old.j2.inc:28
+#: common/footer.j2.inc:33 common/footer.old.j2.inc:28
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:24 common/footer.old.j2.inc:29
+#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
#: common/navigation/items.j2.inc:5
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:33 common/footer.old.j2.inc:38
+#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
#: common/navigation/items.j2.inc:20 template/fees.html.j2:2
msgid "Fees"
msgstr ""
-#: common/footer.j2.inc:38 common/footer.old.j2.inc:43
+#: common/footer.j2.inc:49 common/footer.old.j2.inc:43
#: common/navigation/items.j2.inc:25
msgid "Terms of Service"
msgstr ""
-#: common/footer.j2.inc:46 common/footer.old.j2.inc:51
+#: common/footer.j2.inc:57 common/footer.old.j2.inc:51
msgid "Partners"
msgstr ""
-#: common/footer.j2.inc:50 common/footer.old.j2.inc:58
+#: common/footer.j2.inc:65 common/footer.old.j2.inc:58
msgid "Taler Consortium"
msgstr ""
-#: common/footer.j2.inc:53 common/footer.old.j2.inc:66
+#: common/footer.j2.inc:74 common/footer.old.j2.inc:66
msgid "Bern University of Applied Sciences"
msgstr ""
-#: common/footer.j2.inc:58 common/footer.old.j2.inc:75
+#: common/footer.j2.inc:84 common/footer.old.j2.inc:75
msgid "NetzBon"
msgstr ""
-#: common/footer.j2.inc:66 common/footer.old.j2.inc:83
+#: common/footer.j2.inc:92 common/footer.old.j2.inc:83
msgid "Contacts"
msgstr ""
-#: common/footer.j2.inc:69 common/footer.old.j2.inc:87
+#: common/footer.j2.inc:96 common/footer.old.j2.inc:87
msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:72 common/footer.old.j2.inc:92
+#: common/footer.j2.inc:101 common/footer.old.j2.inc:92
msgid "Compliance Officer"
msgstr ""
-#: common/footer.j2.inc:76 common/footer.old.j2.inc:97
+#: common/footer.j2.inc:106 common/footer.old.j2.inc:97
msgid "AML Officer"
msgstr ""
-#: common/footer.j2.inc:85 common/footer.old.j2.inc:110
+#: common/footer.j2.inc:118 common/footer.old.j2.inc:110
msgid "Copyright"
msgstr ""
-#: common/footer.j2.inc:86
+#: common/footer.j2.inc:121
msgid "Licensed under the"
msgstr ""
-#: common/footer.j2.inc:94
+#: common/footer.j2.inc:134
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 "
@@ -113,12 +113,12 @@ msgstr ""
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:10 template/index.html.j2:66
-msgid "For Merchants"
+#: common/navigation/items.j2.inc:10
+msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:15 template/index.html.j2:55
-msgid "For Users"
+#: common/navigation/items.j2.inc:15
+msgid "Merchants"
msgstr ""
#: template/fees.html.j2:5
@@ -146,11 +146,11 @@ msgstr ""
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:65
+#: template/fees.html.j2:70
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:69
+#: template/fees.html.j2:73
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is applied to wire transfers "
"that return funds to customers when either the Taler wallet did not "
@@ -160,14 +160,14 @@ msgid ""
"transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:78
+#: template/fees.html.j2:81
msgid ""
"Payers should be careful when entering the wire transfer subject, and "
"ensure that their wallet is online within a month of initiating the "
"withdrawal to avoid paying bounce fees."
msgstr ""
-#: template/fees.html.j2:91
+#: template/fees.html.j2:92
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged on an outgoing wire "
"transfer when Taler is used to deposit funds into a bank account. "
@@ -179,7 +179,7 @@ msgid ""
"simply subtracted from the total amount wired."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:109
msgid ""
"Taler eCHF is issued with a <b>1 year</b> validity period. One month"
" before the expiration date, you wallet should automatically exchange any"
@@ -212,6 +212,10 @@ msgstr ""
msgid "Getting Started with Taler"
msgstr ""
+#: template/index.html.j2:55
+msgid "For Users"
+msgstr ""
+
#: template/index.html.j2:56
msgid "Your data and money under your control."
msgstr ""
@@ -220,6 +224,10 @@ msgstr ""
msgid "Pay with Taler"
msgstr ""
+#: template/index.html.j2:66
+msgid "For Merchants"
+msgstr ""
+
#: template/index.html.j2:68
msgid "Easy to use, low fees, no compliance worries."
msgstr ""
diff --git a/template/fees.html.j2 b/template/fees.html.j2
index 21cafea..59312f0 100644
--- a/template/fees.html.j2
+++ b/template/fees.html.j2
@@ -11,25 +11,25 @@ right now. #} {% block body_content %}
<section class="hero">
<h2>{% trans %}Deposit fees{% endtrans %}</h2>
<p>
- {% trans %}
- Withdrawing 5 CHF creates electronic coins with denominations
- of 0.04 CHF, 0.16 CHF, 0.32 CHF, 0.64 CHF,
- 1.28 CHF, and 2.56 CHF.
- Paying 3.23 CHF might then use the 0.04 CHF, 0.64 CHF
- and 2.56 CHF coins, resulting in a total of 3.24 CHF with
- 0.01 CHF returned as change.
- {% endtrans %}
+ {% trans %} Withdrawing 5 CHF creates electronic coins with
+ denominations of 0.04 CHF, 0.16 CHF, 0.32 CHF,
+ 0.64 CHF, 1.28 CHF, and 2.56 CHF. Paying 3.23 CHF
+ might then use the 0.04 CHF, 0.64 CHF and 2.56 CHF coins,
+ resulting in a total of 3.24 CHF with 0.01 CHF returned as
+ change. {% endtrans %}
</p>
<p>
- This matters, as the <b>deposit fees</b> charged by Taler payment
providers
- depend on the electronic coins used in the transaction. Merchants can
- offer to pay deposit fees up to a specified limit; customers have to pay
- deposit fees that exceed what the merchant is willing to cover. Taler
- wallets inform customers about applicable deposit fees for every
transaction.
- The following table shows the deposit fee structure used by Taler
Operations:
+ This matters, as the <b>deposit fees</b> charged by Taler payment
+ providers depend on the electronic coins used in the transaction.
+ Merchants can offer to pay deposit fees up to a specified limit;
customers
+ have to pay deposit fees that exceed what the merchant is willing to
+ cover. Taler wallets inform customers about applicable deposit fees for
+ every transaction. The following table shows the deposit fee structure
+ used by Taler Operations:
</p>
<table
- class="border-spacing-2 border-separate border border-slate-500
rounded-3xl bg-slate-50 border-opacity-50">
+ class="border-spacing-2 border-separate border border-slate-500
rounded-3xl bg-slate-50 border-opacity-50"
+ >
<tr>
<th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
{% trans %}Coin denomination{% endtrans %}
@@ -42,44 +42,45 @@ right now. #} {% block body_content %}
<td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
0.0025 CHF - 0.64 CHF
</td>
- <td class="p-2 bg-slate-200 bg-opacity-60
rounded-2xl">0.0025 CHF</td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0025 CHF
+ </td>
</tr>
<tr>
<td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
1.28 CHF - 10.24 CHF
</td>
- <td class="p-2 bg-slate-200 bg-opacity-60
rounded-2xl">0.0050 CHF</td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0050 CHF
+ </td>
</tr>
<tr>
<td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 20.48 CHF - 655.36 CHF
+ 20.48 CHF - 655.36 CHF
+ </td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0010 CHF
</td>
- <td class="p-2 bg-slate-200 bg-opacity-60
rounded-2xl">0.0010 CHF</td>
</tr>
</table>
<br />
</section>
<section class="toggleable">
- <div class="title">
- {% trans %}Bounce fee{% endtrans %}
- </div>
+ <div class="title">{% trans %}Bounce fee{% endtrans %}</div>
<div class="toggle-content">
<p>
- {% trans %}
- A <b>bounce fee</b> of <b>0.1 CHF</b> is applied to wire
transfers that return
- funds to customers when either the Taler wallet did not withdraw the
amount after
- <b>4 weeks</b>, or immediately if a wire transfer subject was used
that is missing
- the required code to associate a wallet with the wire transfer. The
fee is deducted
- from the amount transferred back to the original account.
- {% endtrans %}
+ {% trans %} A <b>bounce fee</b> of <b>0.1 CHF</b> is applied to
+ wire transfers that return funds to customers when either the Taler
+ wallet did not withdraw the amount after <b>4 weeks</b>, or immediately
+ if a wire transfer subject was used that is missing the required code
to
+ associate a wallet with the wire transfer. The fee is deducted from the
+ amount transferred back to the original account. {% endtrans %}
</p>
<p>
- {% trans %}
- Payers should be careful when entering the wire transfer subject, and
ensure that
- their wallet is online within a month of initiating the withdrawal to
avoid paying
- bounce fees.
- {% endtrans %}
+ {% trans %} Payers should be careful when entering the wire transfer
+ subject, and ensure that their wallet is online within a month of
+ initiating the withdrawal to avoid paying bounce fees. {% endtrans %}
</p>
</div>
</section>
@@ -88,17 +89,15 @@ right now. #} {% block body_content %}
<div class="title">Wire transfer fee</div>
<div class="toggle-content">
<p>
- {% trans %}
- A <b>wire fee</b> of <b>0.1 CHF</b> is charged on an outgoing
- wire transfer when Taler is used to deposit funds into a bank
- account. Merchants are encouraged to allow Taler to delay and
- then aggregate many small payments into a single collective wire
transfer
- to minimize wire transfer fees. For example, by configuring a
- <b>wire deadline</b> of one week, all payments within a week
- could be aggregated into a single wire transfer, and thus only
- be paying the wire transfer fee once. The fee is simply subtracted
- from the total amount wired.
- {% endtrans %}
+ {% trans %} A <b>wire fee</b> of <b>0.1 CHF</b> is charged on an
+ outgoing wire transfer when Taler is used to deposit funds into a bank
+ account. Merchants are encouraged to allow Taler to delay and then
+ aggregate many small payments into a single collective wire transfer to
+ minimize wire transfer fees. For example, by configuring a
+ <b>wire deadline</b> of one week, all payments within a week could be
+ aggregated into a single wire transfer, and thus only be paying the
wire
+ transfer fee once. The fee is simply subtracted from the total amount
+ wired. {% endtrans %}
</p>
</div>
</div>
@@ -107,15 +106,13 @@ right now. #} {% block body_content %}
<div class="title">Possible loss of e-money due to expiration</div>
<div class="toggle-content">
<p>
- {% trans %}
- Taler eCHF is issued with a <b>1 year</b> validity period.
- One month before the expiration date, you wallet should
- automatically exchange any eCHF that are about to expire for
- new eCHF with an extended validity period.
- However, if your wallet is offline for an extended
- period of time, it may be unable to do so. Ensure your wallet
- is regularly online to avoid loosing money due to expiration!
- {% endtrans %}
+ {% trans %} Taler eCHF is issued with a <b>1 year</b> validity
+ period. One month before the expiration date, you wallet should
+ automatically exchange any eCHF that are about to expire for new eCHF
+ with an extended validity period. However, if your wallet is offline
for
+ an extended period of time, it may be unable to do so. Ensure your
+ wallet is regularly online to avoid loosing money due to expiration! {%
+ endtrans %}
</p>
</div>
</div>
--
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: fmt,
gnunet <=