[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated: fix footer
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] branch master updated: fix footer |
|
Date: |
Sat, 24 Feb 2024 20:16:43 +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 910b768 fix footer
910b768 is described below
commit 910b768afc2ef7118f5f45027caecb5c8376a522
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Feb 24 20:16:39 2024 +0100
fix footer
---
common/footer.j2.inc | 21 ++-
locale/de/LC_MESSAGES/messages.po | 309 +++++++++++++++++++-------------------
locale/en/LC_MESSAGES/messages.po | 196 ++++++++----------------
locale/fr/LC_MESSAGES/messages.po | 209 +++++++++-----------------
locale/messages.pot | 196 ++++++++----------------
template/index.html.j2 | 141 ++---------------
6 files changed, 375 insertions(+), 697 deletions(-)
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index faa042e..104fc6b 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -5,8 +5,13 @@
<div class="col-md-3 col-sm-6">
<div class="footbox text-center">
<a href="{{
url_localized('index.html') }}" class="footlogo"><img src="{{
url_static('images/footlogo.png') }}" alt="Homepage"></a>
- <ul class="footsos">
- </ul>
+ </div>
+ <div class="footbox text-center">
+ <p
style="color:white;margin-top:5px">
+ Taler Operations AG, {% trans
%}Switzerland{% endtrans %}<br />
+ Höheweg 80<br />
+ CH-2502 Biel, Switzerland
+ </p>
</div>
</div>
<div class="col-md-3 col-sm-6">
@@ -35,11 +40,7 @@
<div class="footbox footadres">
<h4>{% trans %}Contacts{%
endtrans %}</h4>
<ul>
- <li>{% trans %}Taler
Operations AG, Switzerland{% endtrans %}</li>
- <li><a class="phone"
href="tel:0041442801200">Tel: +41 44 280 1200</a></li>
- <li>Höheweg 80</li>
- <li>CH-2502 Biel,
Switzerland</li>
- <li><a
href="https://taler-ops.ch"; target="_blank" rel="noopener
noreferrer">www.taler-ops.ch</a></li>
+ <li><a class="phone"
href="tel:0041442801200">{% trans %}Tel:{% endtrans %} +41 44 280 1200</a></li>
<li><a
href="mailto:compliance@taler-systems.com";>{% trans %}Compliance Officer{%
endtrans %}</a></li>
<li><a
href="mailto:aml@taler-systems.com";>{% trans %}AML Officer{% endtrans
%}</a></li>
</ul>
@@ -51,11 +52,9 @@
<div class="footbottm">
<div class="container">
<div class="footbottminn">
- <p>© {% trans %}Copyright{% endtrans %} 2024
| <a href="{{ url_localized('index.html') }}">Taler Operations AG</a> |
{% trans %}All Rights Reserved{% endtrans %}</p>
- <p>{% trans %}We do not assume any liability
for the correctness of contents. We do not collect any data and do not use
cookies.
+ <p>© {% trans %}Copyright{% endtrans %} 2024
| <a href="{{ url_localized('index.html') }}">Taler Operations AG</a> | <a
href="https://www.gnu.org/licenses/fdl-1.3.html.en"; target="_blank"
rel="noopener noreferrer">{% trans %}License{% endtrans %}: GNU Free
Documentation License</a></p>
+ <p>{% trans %}We do not assume any liability
for the correctness of contents. We do not collect any data and do not use
cookies.
<br>Our web server generates a log file with IP
addresses of visitors. However, these are evaluated exclusively for
troubleshooting or problem mitigation.{% endtrans %}</p>
- <p><a
href="https://www.gnu.org/licenses/fdl-1.3.html.en"; target="_blank"
rel="noopener noreferrer">{% trans %}License{% endtrans %}: GNU Free
Documentation License</a></p>
</div>
</div>
</div>
-
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index fa60983..5f32e0d 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-24 18:16+0100\n"
+"POT-Creation-Date: 2024-02-24 20:14+0100\n"
"PO-Revision-Date: 2024-02-20 17:03+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: German <https://weblate.taler.net/projects/taler-ops/website/";
@@ -24,68 +24,72 @@ msgstr ""
msgid "Taler Operations AG, Biel, Switzerland"
msgstr "Taler Operations AG, Biel, Schweiz"
-#: common/footer.j2.inc:14
+#: common/footer.j2.inc:11
+msgid "Switzerland"
+msgstr ""
+
+#: common/footer.j2.inc:19
msgid "Quick Links"
msgstr "Seitenübersicht"
-#: common/footer.j2.inc:16
+#: common/footer.j2.inc:21
msgid "Taler Operations AG Homepage"
msgstr "Taler Operations AG Startseite"
-#: common/footer.j2.inc:16 common/navigation.j2.inc:19
+#: common/footer.j2.inc:21 common/navigation.j2.inc:19
msgid "Home"
msgstr "Startseite"
-#: common/footer.j2.inc:19 common/navigation.j2.inc:22 template/fees.html.j2:3
+#: common/footer.j2.inc:24 common/navigation.j2.inc:22 template/fees.html.j2:3
#: template/fees.html.j2:9 template/fees.html.j2:19
msgid "Fees"
msgstr "Gebührenordnung"
-#: common/footer.j2.inc:20
+#: common/footer.j2.inc:25
msgid "Terms of Service"
msgstr "AGB"
-#: common/footer.j2.inc:26
+#: common/footer.j2.inc:31
msgid "Partners"
msgstr "Partner"
-#: common/footer.j2.inc:28
+#: common/footer.j2.inc:33
msgid "Taler Consortium"
msgstr "Taler-Konsortium NGI TALER"
-#: common/footer.j2.inc:29
+#: common/footer.j2.inc:34
msgid "Bern University of Applied Sciences"
msgstr "Berner Fachhochschule (BFH)"
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:35
msgid "NetzBon"
msgstr "NetzBon"
-#: common/footer.j2.inc:36
+#: common/footer.j2.inc:41
msgid "Contacts"
msgstr "Kontakt"
-#: common/footer.j2.inc:38
-msgid "Taler Operations AG, Switzerland"
-msgstr "Taler Operations AG, Schweiz"
-
#: common/footer.j2.inc:43
+msgid "Tel:"
+msgstr ""
+
+#: common/footer.j2.inc:44
msgid "Compliance Officer"
msgstr "Compliance-Beauftragte"
-#: common/footer.j2.inc:44
+#: common/footer.j2.inc:45
msgid "AML Officer"
msgstr "AML-Beauftragte"
-#: common/footer.j2.inc:54
+#: common/footer.j2.inc:55
msgid "Copyright"
msgstr "Copyright"
-#: common/footer.j2.inc:54
-msgid "All Rights Reserved"
-msgstr "Alle Rechte vorbehalten"
-
#: common/footer.j2.inc:55
+msgid "License"
+msgstr "Lizenz"
+
+#: common/footer.j2.inc:56
msgid ""
"We do not assume any liability for the correctness of contents. We do not "
"collect any data and do not use cookies. <br>Our web server generates a log "
@@ -98,19 +102,15 @@ msgstr ""
"Besuchern. Diese werden jedoch ausschließlich zur Fehlersuche und "
"Problembehebung ausgewertet."
-#: common/footer.j2.inc:57
-msgid "License"
-msgstr "Lizenz"
-
#: common/navigation.j2.inc:2
msgid "Skip to main content"
msgstr "Navigationsmenü überspringen"
-#: common/navigation.j2.inc:20 template/index.html.j2:40
+#: common/navigation.j2.inc:20 template/index.html.j2:50
msgid "For Merchants"
msgstr "Für Händler"
-#: common/navigation.j2.inc:21 template/index.html.j2:50
+#: common/navigation.j2.inc:21 template/index.html.j2:40
msgid "For Users"
msgstr "Für Kunden"
@@ -131,13 +131,11 @@ msgstr ""
msgid "Costs for sending SMS to users"
msgstr "Kosten für den Versand von SMS an Kunden"
-#: template/index.html.j2:3
-msgid "Taler Operations AG - Home"
-msgstr "Taler Operations AG - Hauptseite"
-
#: template/index.html.j2:11
-msgid "Welcome to the homepage of<span> TALER OPERATIONS"
-msgstr "Willkommen auf den Webseiten von<span> TALER OPERATIONS"
+#, fuzzy
+#| msgid "Welcome to <span>Taler's solution for CBDC"
+msgid "Welcome to <span>Taler Operations"
+msgstr "Willkommen <span>bei Zentralbankwährungen"
#: template/index.html.j2:13
msgid "These pages explain how to install and use Taler."
@@ -153,21 +151,6 @@ msgstr ""
#: template/index.html.j2:41
msgid ""
-"Taler offers efficient payments and backoffice procedures with security, "
-"privacy and data minimization by design. Payers and payees can rely on "
-"technology, and do not need to purely rely on trust anymore."
-msgstr ""
-"Taler bietet effiziente Bezahl- und Buchungsverfahren mit Sicherheit, "
-"Datenschutz und Datenminimierung auf der Grundlage von Designprinzipien. "
-"Händler und Kunden können sich auf Technologie verlassen und müssen nicht "
-"mehr auf blindes Vertrauen setzen."
-
-#: template/index.html.j2:44
-msgid "Integrate Shop"
-msgstr "Integration"
-
-#: template/index.html.j2:51
-msgid ""
"Taler provides the world with a payment solution that definitely makes sense "
"in a society where privacy, data safety, technical security, and reliability "
"become more and more crucial for everyone."
@@ -177,47 +160,38 @@ msgstr ""
"höchsten Datenschutz, technische Sicherheit und uneingeschränkte "
"Verlässlichkeit verlangen."
-#: template/index.html.j2:54
-msgid "Install Wallet"
-msgstr "Installation"
-
-#: template/index.html.j2:68 template/users.html.j2:11
-msgid "Quick Steps for<span> Users</span>"
-msgstr "Bezahlen mit <span> Taler</span>"
-
-#: template/index.html.j2:69 template/users.html.j2:12
-msgid "What do I need to use Taler for payments?"
-msgstr "Was braucht man zur Nutzung?"
-
-#: template/index.html.j2:71 template/users.html.j2:14
-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/index.html.j2:44
+#, fuzzy
+#| msgid "Try the Taler demo"
+msgid "Pay with Taler"
+msgstr "Taler-Demo ausprobieren"
-#: template/index.html.j2:72 template/users.html.j2:15
+#: template/index.html.j2:51
msgid ""
-"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's digital "
-"cash into the wallet"
+"Taler offers efficient payments and backoffice procedures with security, "
+"privacy and data minimization by design. Payers and payees can rely on "
+"technology, and do not need to purely rely on trust anymore."
msgstr ""
-"<b>TELEFONNUMMER</b> mit Schweizer Vorwahl (++41) zum Empfang einer SMS vor "
-"dem Abheben in die elektronische Geldbörse"
-
-#: template/index.html.j2:73 template/users.html.j2:16
-msgid "<b>TALER WALLET</b> installed for"
-msgstr "<b>TALER WALLET</b> im Smartphone"
+"Taler bietet effiziente Bezahl- und Buchungsverfahren mit Sicherheit, "
+"Datenschutz und Datenminimierung auf der Grundlage von Designprinzipien. "
+"Händler und Kunden können sich auf Technologie verlassen und müssen nicht "
+"mehr auf blindes Vertrauen setzen."
-#: template/index.html.j2:77
-msgid "or <b>BROWSERS</b>"
-msgstr "oder im <b>BROWSER</b>"
+#: template/index.html.j2:54
+#, fuzzy
+#| msgid "Integrate Shop"
+msgid "Integrate"
+msgstr "Integration"
-#: template/index.html.j2:79
-msgid "FULL USER GUIDE"
-msgstr "ALLE SCHRITTE EINFACH ERKLÄRT"
+#: template/merchants.html.j2:3
+msgid "Taler Operations AG - Merchants"
+msgstr "Taler Operations AG - Händler"
-#: template/index.html.j2:92
+#: template/merchants.html.j2:11
msgid "Quick Steps for<span> Merchants</span>"
msgstr "Anleitung für<span> Händler</span>"
-#: template/index.html.j2:94
+#: template/merchants.html.j2:13
msgid ""
"To receive Taler payments, a merchant needs a Swiss bank account in the "
"currency CHF."
@@ -225,7 +199,7 @@ msgstr ""
"Um Zahlungen zu erhalten, benötigen Verkäufer ein Schweizer Bankkonto in der "
"Währung CHF (NetzBon-Betriebe benötigen ein NetzBon-Konto)."
-#: template/index.html.j2:95
+#: template/merchants.html.j2:14
msgid ""
"The configuration file has to be filled in, e.g. entering the bank account "
"number of the merchant."
@@ -233,7 +207,7 @@ msgstr ""
"In einer Konfigurationsdatei muss u.a. die Bankverbindung des Händlers "
"eingegeben werden."
-#: template/index.html.j2:96
+#: template/merchants.html.j2:15
msgid ""
"In case a mechant has a web shop, a snippet of code has to be integrated "
"into the web shop software for Taler as a payment option."
@@ -241,81 +215,17 @@ msgstr ""
"Bei Webshops müssen nur ein paar Zeilen Code in deren Software eingefügt "
"werden, damit sie Taler als Zahlungsoption anbieten können."
-#: template/index.html.j2:97
+#: template/merchants.html.j2:16
msgid "A QR code can be generated for offline use at the point of sale."
msgstr ""
"Zur Offline-Nutzung am Verkaufsort kann ein QR-Code generiert werden, den "
"Kunden mit ihren Smartphones scannen, um den Verkäufern eine Bestätigung "
"ihrer Zahlung vorzuweisen."
-#: template/index.html.j2:98
+#: template/merchants.html.j2:17
msgid "INTEGRATE SHOP"
msgstr "Integration"
-#: template/index.html.j2:122
-msgid "Installation Guide for<br> USERS"
-msgstr "Gebrauchs-<br>anleitung für<br> KUNDEN"
-
-#: template/index.html.j2:123 template/index.html.j2:148
-msgid "User Guide"
-msgstr "ANZEIGEN"
-
-#: template/index.html.j2:129
-msgid "Integration Guide for<br> MERCHANTS"
-msgstr "Integrations-<br>anleitung für<br> HÄNDLER"
-
-#: template/index.html.j2:130 template/index.html.j2:155
-msgid "Merchant Guide"
-msgstr "ANZEIGEN"
-
-#: template/index.html.j2:136
-msgid "Overview of<br> payment <br> FEES"
-msgstr "Übersicht der<br> Gebühren-<br>arten"
-
-#: template/index.html.j2:137 template/index.html.j2:162
-msgid "Fee Overview"
-msgstr "ANZEIGEN"
-
-#: template/index.html.j2:147
-msgid "Installation guide for users"
-msgstr "Installationsanleitung für Kunden"
-
-#: template/index.html.j2:154
-msgid "Integration guide for merchants"
-msgstr "Integrationsanleitung für Händler"
-
-#: template/index.html.j2:161
-msgid "Overview of payment fees"
-msgstr "Gebührenordnung"
-
-#: template/index.html.j2:168
-msgid "This payment system for citizens and companies in Switzerland is"
-msgstr "Das Taler-Bezahlystem für Nutzer und Unternehmen in der Schweiz ist"
-
-#: template/index.html.j2:170
-msgid "principle-based on privacy by design and data minimization"
-msgstr "dem Grundsatz des Datenschutzes und der Datenminimierung verpflichtet"
-
-#: template/index.html.j2:171
-msgid "ideal for micro-payments"
-msgstr "ideal für Micro-Payments"
-
-#: template/index.html.j2:172
-msgid ""
-"running on <a href=\"https://fsf.org/\"; class=\"demo_btn\" target=\"_blank\" "
-"rel=\"noopener noreferrer\">Free Software</a>"
-msgstr ""
-"programmiert mit <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Freier Software</a>"
-
-#: template/index.html.j2:173
-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>"
-
#: template/terms.html.j2:3
msgid "Taler Operations AG - Terms of Service"
msgstr "Taler Operations AG - AGB"
@@ -369,6 +279,30 @@ msgstr "Wir beantworten gern Ihre Fragen unter"
msgid "Taler Operations AG - Users"
msgstr "Taler Operations AG - Kunden"
+#: template/users.html.j2:11
+msgid "Quick Steps for<span> Users</span>"
+msgstr "Bezahlen mit <span> Taler</span>"
+
+#: template/users.html.j2:12
+msgid "What do I need to use Taler for payments?"
+msgstr "Was braucht man zur Nutzung?"
+
+#: template/users.html.j2:14
+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:15
+msgid ""
+"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's digital "
+"cash into the wallet"
+msgstr ""
+"<b>TELEFONNUMMER</b> mit Schweizer Vorwahl (++41) zum Empfang einer SMS vor "
+"dem Abheben in die elektronische Geldbörse"
+
+#: template/users.html.j2:16
+msgid "<b>TALER WALLET</b> installed for"
+msgstr "<b>TALER WALLET</b> im Smartphone"
+
#: template/users.html.j2:20
msgid "or a <b>BROWSER WALLET</b>"
msgstr "oder im <b>BROWSER</b>"
@@ -686,8 +620,77 @@ msgstr "WEITER"
msgid "I want to use digital cash <br>on my phone!"
msgstr "Ich bezahle <br>mit meinem Smartphone!"
-#~ msgid "Taler Operations AG - Merchants"
-#~ msgstr "Taler Operations AG - Händler"
+#~ msgid "Taler Operations AG, Switzerland"
+#~ msgstr "Taler Operations AG, Schweiz"
+
+#~ msgid "All Rights Reserved"
+#~ msgstr "Alle Rechte vorbehalten"
+
+#~ msgid "Taler Operations AG - Home"
+#~ msgstr "Taler Operations AG - Hauptseite"
+
+#~ msgid "Welcome to the homepage of<span> TALER OPERATIONS"
+#~ msgstr "Willkommen auf den Webseiten von<span> TALER OPERATIONS"
+
+#~ msgid "Install Wallet"
+#~ msgstr "Installation"
+
+#~ msgid "or <b>BROWSERS</b>"
+#~ msgstr "oder im <b>BROWSER</b>"
+
+#~ msgid "FULL USER GUIDE"
+#~ msgstr "ALLE SCHRITTE EINFACH ERKLÄRT"
+
+#~ msgid "Installation Guide for<br> USERS"
+#~ msgstr "Gebrauchs-<br>anleitung für<br> KUNDEN"
+
+#~ msgid "User Guide"
+#~ msgstr "ANZEIGEN"
+
+#~ msgid "Integration Guide for<br> MERCHANTS"
+#~ msgstr "Integrations-<br>anleitung für<br> HÄNDLER"
+
+#~ msgid "Merchant Guide"
+#~ msgstr "ANZEIGEN"
+
+#~ msgid "Overview of<br> payment <br> FEES"
+#~ msgstr "Übersicht der<br> Gebühren-<br>arten"
+
+#~ msgid "Fee Overview"
+#~ msgstr "ANZEIGEN"
+
+#~ msgid "Installation guide for users"
+#~ msgstr "Installationsanleitung für Kunden"
+
+#~ msgid "Integration guide for merchants"
+#~ msgstr "Integrationsanleitung für Händler"
+
+#~ msgid "Overview of payment fees"
+#~ msgstr "Gebührenordnung"
+
+#~ msgid "This payment system for citizens and companies in Switzerland is"
+#~ msgstr "Das Taler-Bezahlystem für Nutzer und Unternehmen in der Schweiz ist"
+
+#~ msgid "principle-based on privacy by design and data minimization"
+#~ msgstr ""
+#~ "dem Grundsatz des Datenschutzes und der Datenminimierung verpflichtet"
+
+#~ msgid "ideal for micro-payments"
+#~ msgstr "ideal für Micro-Payments"
+
+#~ msgid ""
+#~ "running on <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
+#~ "target=\"_blank\" rel=\"noopener noreferrer\">Free Software</a>"
+#~ msgstr ""
+#~ "programmiert mit <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
+#~ "target=\"_blank\" rel=\"noopener noreferrer\">Freier Software</a>"
+
+#~ msgid ""
+#~ "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!"
@@ -775,9 +778,6 @@ msgstr "Ich bezahle <br>mit meinem Smartphone!"
#~ msgid "Architecture of <span> Taler</span>"
#~ msgstr "Transaktionen bei <span> Taler</span> in der Übersicht"
-#~ msgid "Try the Taler demo"
-#~ msgstr "Taler-Demo ausprobieren"
-
#~ msgid ""
#~ "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 "
@@ -963,9 +963,6 @@ msgstr "Ich bezahle <br>mit meinem Smartphone!"
#~ "Um mit Taler bezahlen zu können, müssen Sie eine Taler-Geldbörse (Wallet) "
#~ "auf einem Endgerät installiert haben."
-#~ msgid "Welcome to <span>Taler's solution for CBDC"
-#~ msgstr "Willkommen <span>bei Zentralbankwährungen"
-
#~ msgid "Taler as a Central Bank Digital Currency"
#~ msgstr "Taler für CBDCs"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index d7cb366..0454098 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-24 18:16+0100\n"
+"POT-Creation-Date: 2024-02-24 20:14+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,68 +22,72 @@ msgstr ""
msgid "Taler Operations AG, Biel, Switzerland"
msgstr ""
-#: common/footer.j2.inc:14
+#: common/footer.j2.inc:11
+msgid "Switzerland"
+msgstr ""
+
+#: common/footer.j2.inc:19
msgid "Quick Links"
msgstr ""
-#: common/footer.j2.inc:16
+#: common/footer.j2.inc:21
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:16 common/navigation.j2.inc:19
+#: common/footer.j2.inc:21 common/navigation.j2.inc:19
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:19 common/navigation.j2.inc:22 template/fees.html.j2:3
+#: common/footer.j2.inc:24 common/navigation.j2.inc:22 template/fees.html.j2:3
#: template/fees.html.j2:9 template/fees.html.j2:19
msgid "Fees"
msgstr ""
-#: common/footer.j2.inc:20
+#: common/footer.j2.inc:25
msgid "Terms of Service"
msgstr ""
-#: common/footer.j2.inc:26
+#: common/footer.j2.inc:31
msgid "Partners"
msgstr ""
-#: common/footer.j2.inc:28
+#: common/footer.j2.inc:33
msgid "Taler Consortium"
msgstr ""
-#: common/footer.j2.inc:29
+#: common/footer.j2.inc:34
msgid "Bern University of Applied Sciences"
msgstr ""
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:35
msgid "NetzBon"
msgstr ""
-#: common/footer.j2.inc:36
+#: common/footer.j2.inc:41
msgid "Contacts"
msgstr ""
-#: common/footer.j2.inc:38
-msgid "Taler Operations AG, Switzerland"
+#: common/footer.j2.inc:43
+msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:43
+#: common/footer.j2.inc:44
msgid "Compliance Officer"
msgstr ""
-#: common/footer.j2.inc:44
+#: common/footer.j2.inc:45
msgid "AML Officer"
msgstr ""
-#: common/footer.j2.inc:54
+#: common/footer.j2.inc:55
msgid "Copyright"
msgstr ""
-#: common/footer.j2.inc:54
-msgid "All Rights Reserved"
+#: common/footer.j2.inc:55
+msgid "License"
msgstr ""
-#: common/footer.j2.inc:55
+#: common/footer.j2.inc:56
msgid ""
"We do not assume any liability for the correctness of contents. We do not "
"collect any data and do not use cookies. <br>Our web server generates a log "
@@ -91,19 +95,15 @@ msgid ""
"for troubleshooting or problem mitigation."
msgstr ""
-#: common/footer.j2.inc:57
-msgid "License"
-msgstr ""
-
#: common/navigation.j2.inc:2
msgid "Skip to main content"
msgstr ""
-#: common/navigation.j2.inc:20 template/index.html.j2:40
+#: common/navigation.j2.inc:20 template/index.html.j2:50
msgid "For Merchants"
msgstr ""
-#: common/navigation.j2.inc:21 template/index.html.j2:50
+#: common/navigation.j2.inc:21 template/index.html.j2:40
msgid "For Users"
msgstr ""
@@ -121,12 +121,8 @@ msgstr ""
msgid "Costs for sending SMS to users"
msgstr ""
-#: template/index.html.j2:3
-msgid "Taler Operations AG - Home"
-msgstr ""
-
#: template/index.html.j2:11
-msgid "Welcome to the homepage of<span> TALER OPERATIONS"
+msgid "Welcome to <span>Taler Operations"
msgstr ""
#: template/index.html.j2:13
@@ -139,146 +135,60 @@ msgstr ""
#: template/index.html.j2:41
msgid ""
-"Taler offers efficient payments and backoffice procedures with security, "
-"privacy and data minimization by design. Payers and payees can rely on "
-"technology, and do not need to purely rely on trust anymore."
-msgstr ""
-
-#: template/index.html.j2:44
-msgid "Integrate Shop"
-msgstr ""
-
-#: template/index.html.j2:51
-msgid ""
"Taler provides the world with a payment solution that definitely makes sense "
"in a society where privacy, data safety, technical security, and reliability "
"become more and more crucial for everyone."
msgstr ""
-#: template/index.html.j2:54
-msgid "Install Wallet"
-msgstr ""
-
-#: template/index.html.j2:68 template/users.html.j2:11
-msgid "Quick Steps for<span> Users</span>"
-msgstr ""
-
-#: template/index.html.j2:69 template/users.html.j2:12
-msgid "What do I need to use Taler for payments?"
-msgstr ""
-
-#: template/index.html.j2:71 template/users.html.j2:14
-msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
+#: template/index.html.j2:44
+msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:72 template/users.html.j2:15
+#: template/index.html.j2:51
msgid ""
-"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's digital "
-"cash into the wallet"
-msgstr ""
-
-#: template/index.html.j2:73 template/users.html.j2:16
-msgid "<b>TALER WALLET</b> installed for"
+"Taler offers efficient payments and backoffice procedures with security, "
+"privacy and data minimization by design. Payers and payees can rely on "
+"technology, and do not need to purely rely on trust anymore."
msgstr ""
-#: template/index.html.j2:77
-msgid "or <b>BROWSERS</b>"
+#: template/index.html.j2:54
+msgid "Integrate"
msgstr ""
-#: template/index.html.j2:79
-msgid "FULL USER GUIDE"
+#: template/merchants.html.j2:3
+msgid "Taler Operations AG - Merchants"
msgstr ""
-#: template/index.html.j2:92
+#: template/merchants.html.j2:11
msgid "Quick Steps for<span> Merchants</span>"
msgstr ""
-#: template/index.html.j2:94
+#: template/merchants.html.j2:13
msgid ""
"To receive Taler payments, a merchant needs a Swiss bank account in the "
"currency CHF."
msgstr ""
-#: template/index.html.j2:95
+#: template/merchants.html.j2:14
msgid ""
"The configuration file has to be filled in, e.g. entering the bank account "
"number of the merchant."
msgstr ""
-#: template/index.html.j2:96
+#: template/merchants.html.j2:15
msgid ""
"In case a mechant has a web shop, a snippet of code has to be integrated "
"into the web shop software for Taler as a payment option."
msgstr ""
-#: template/index.html.j2:97
+#: template/merchants.html.j2:16
msgid "A QR code can be generated for offline use at the point of sale."
msgstr ""
-#: template/index.html.j2:98
+#: template/merchants.html.j2:17
msgid "INTEGRATE SHOP"
msgstr ""
-#: template/index.html.j2:122
-msgid "Installation Guide for<br> USERS"
-msgstr ""
-
-#: template/index.html.j2:123 template/index.html.j2:148
-msgid "User Guide"
-msgstr ""
-
-#: template/index.html.j2:129
-msgid "Integration Guide for<br> MERCHANTS"
-msgstr ""
-
-#: template/index.html.j2:130 template/index.html.j2:155
-msgid "Merchant Guide"
-msgstr ""
-
-#: template/index.html.j2:136
-msgid "Overview of<br> payment <br> FEES"
-msgstr ""
-
-#: template/index.html.j2:137 template/index.html.j2:162
-msgid "Fee Overview"
-msgstr ""
-
-#: template/index.html.j2:147
-msgid "Installation guide for users"
-msgstr ""
-
-#: template/index.html.j2:154
-msgid "Integration guide for merchants"
-msgstr ""
-
-#: template/index.html.j2:161
-msgid "Overview of payment fees"
-msgstr ""
-
-#: template/index.html.j2:168
-msgid "This payment system for citizens and companies in Switzerland is"
-msgstr ""
-
-#: template/index.html.j2:170
-msgid "principle-based on privacy by design and data minimization"
-msgstr ""
-
-#: template/index.html.j2:171
-msgid "ideal for micro-payments"
-msgstr ""
-
-#: template/index.html.j2:172
-msgid ""
-"running on <a href=\"https://fsf.org/\"; class=\"demo_btn\" target=\"_blank\" "
-"rel=\"noopener noreferrer\">Free Software</a>"
-msgstr ""
-
-#: template/index.html.j2:173
-msgid ""
-"using the technology of <a href=\"https://taler.net/\"; class=\"demo_btn\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
-msgstr ""
-
#: template/terms.html.j2:3
msgid "Taler Operations AG - Terms of Service"
msgstr ""
@@ -325,6 +235,28 @@ msgstr ""
msgid "Taler Operations AG - Users"
msgstr ""
+#: template/users.html.j2:11
+msgid "Quick Steps for<span> Users</span>"
+msgstr ""
+
+#: template/users.html.j2:12
+msgid "What do I need to use Taler for payments?"
+msgstr ""
+
+#: template/users.html.j2:14
+msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
+msgstr ""
+
+#: template/users.html.j2:15
+msgid ""
+"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's digital "
+"cash into the wallet"
+msgstr ""
+
+#: template/users.html.j2:16
+msgid "<b>TALER WALLET</b> installed for"
+msgstr ""
+
#: template/users.html.j2:20
msgid "or a <b>BROWSER WALLET</b>"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index e3f62ea..5ee6245 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-24 18:16+0100\n"
+"POT-Creation-Date: 2024-02-24 20:14+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,68 +24,72 @@ msgstr ""
msgid "Taler Operations AG, Biel, Switzerland"
msgstr "Taler Operations AG, Bienne, Suisse"
-#: common/footer.j2.inc:14
+#: common/footer.j2.inc:11
+msgid "Switzerland"
+msgstr ""
+
+#: common/footer.j2.inc:19
msgid "Quick Links"
msgstr "Liens directs"
-#: common/footer.j2.inc:16
+#: common/footer.j2.inc:21
msgid "Taler Operations AG Homepage"
msgstr "Page d'accueil Taler Operations AG"
-#: common/footer.j2.inc:16 common/navigation.j2.inc:19
+#: common/footer.j2.inc:21 common/navigation.j2.inc:19
msgid "Home"
msgstr "Accueil"
-#: common/footer.j2.inc:19 common/navigation.j2.inc:22 template/fees.html.j2:3
+#: common/footer.j2.inc:24 common/navigation.j2.inc:22 template/fees.html.j2:3
#: template/fees.html.j2:9 template/fees.html.j2:19
msgid "Fees"
msgstr "Frais"
-#: common/footer.j2.inc:20
+#: common/footer.j2.inc:25
msgid "Terms of Service"
msgstr "Conditions d'utilisation"
-#: common/footer.j2.inc:26
+#: common/footer.j2.inc:31
msgid "Partners"
msgstr "Partenaires"
-#: common/footer.j2.inc:28
+#: common/footer.j2.inc:33
msgid "Taler Consortium"
msgstr "Consortium Taler"
-#: common/footer.j2.inc:29
+#: common/footer.j2.inc:34
msgid "Bern University of Applied Sciences"
msgstr "Haute école spécialisée bernoise"
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:35
msgid "NetzBon"
msgstr "NetzBon"
-#: common/footer.j2.inc:36
+#: common/footer.j2.inc:41
msgid "Contacts"
msgstr "Contacts"
-#: common/footer.j2.inc:38
-msgid "Taler Operations AG, Switzerland"
-msgstr "Taler Operations AG, Suisse"
-
#: common/footer.j2.inc:43
+msgid "Tel:"
+msgstr ""
+
+#: common/footer.j2.inc:44
msgid "Compliance Officer"
msgstr "Responsable de la conformité"
-#: common/footer.j2.inc:44
+#: common/footer.j2.inc:45
msgid "AML Officer"
msgstr "Agent de lutte contre le blanchiment d'argent"
-#: common/footer.j2.inc:54
+#: common/footer.j2.inc:55
msgid "Copyright"
msgstr "Droits d'auteur"
-#: common/footer.j2.inc:54
-msgid "All Rights Reserved"
-msgstr "Tous droits réservés"
-
#: common/footer.j2.inc:55
+msgid "License"
+msgstr "Licence"
+
+#: common/footer.j2.inc:56
#, fuzzy
msgid ""
"We do not assume any liability for the correctness of contents. We do not "
@@ -99,19 +103,15 @@ msgstr ""
"Toutefois, celles-ci ne sont consultées exclusivement pour des besoins de "
"dépannages ou de résolution de problème."
-#: common/footer.j2.inc:57
-msgid "License"
-msgstr "Licence"
-
#: common/navigation.j2.inc:2
msgid "Skip to main content"
msgstr "Aller au menu principal"
-#: common/navigation.j2.inc:20 template/index.html.j2:40
+#: common/navigation.j2.inc:20 template/index.html.j2:50
msgid "For Merchants"
msgstr ""
-#: common/navigation.j2.inc:21 template/index.html.j2:50
+#: common/navigation.j2.inc:21 template/index.html.j2:40
msgid "For Users"
msgstr ""
@@ -129,12 +129,8 @@ msgstr ""
msgid "Costs for sending SMS to users"
msgstr ""
-#: template/index.html.j2:3
-msgid "Taler Operations AG - Home"
-msgstr ""
-
#: template/index.html.j2:11
-msgid "Welcome to the homepage of<span> TALER OPERATIONS"
+msgid "Welcome to <span>Taler Operations"
msgstr ""
#: template/index.html.j2:13
@@ -147,146 +143,60 @@ msgstr ""
#: template/index.html.j2:41
msgid ""
-"Taler offers efficient payments and backoffice procedures with security, "
-"privacy and data minimization by design. Payers and payees can rely on "
-"technology, and do not need to purely rely on trust anymore."
-msgstr ""
-
-#: template/index.html.j2:44
-msgid "Integrate Shop"
-msgstr ""
-
-#: template/index.html.j2:51
-msgid ""
"Taler provides the world with a payment solution that definitely makes sense "
"in a society where privacy, data safety, technical security, and reliability "
"become more and more crucial for everyone."
msgstr ""
-#: template/index.html.j2:54
-msgid "Install Wallet"
-msgstr ""
-
-#: template/index.html.j2:68 template/users.html.j2:11
-msgid "Quick Steps for<span> Users</span>"
-msgstr ""
-
-#: template/index.html.j2:69 template/users.html.j2:12
-msgid "What do I need to use Taler for payments?"
-msgstr ""
-
-#: template/index.html.j2:71 template/users.html.j2:14
-msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
+#: template/index.html.j2:44
+msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:72 template/users.html.j2:15
+#: template/index.html.j2:51
msgid ""
-"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's digital "
-"cash into the wallet"
-msgstr ""
-
-#: template/index.html.j2:73 template/users.html.j2:16
-msgid "<b>TALER WALLET</b> installed for"
+"Taler offers efficient payments and backoffice procedures with security, "
+"privacy and data minimization by design. Payers and payees can rely on "
+"technology, and do not need to purely rely on trust anymore."
msgstr ""
-#: template/index.html.j2:77
-msgid "or <b>BROWSERS</b>"
+#: template/index.html.j2:54
+msgid "Integrate"
msgstr ""
-#: template/index.html.j2:79
-msgid "FULL USER GUIDE"
-msgstr ""
+#: template/merchants.html.j2:3
+msgid "Taler Operations AG - Merchants"
+msgstr "Taler Operations AG - Pour marchands"
-#: template/index.html.j2:92
+#: template/merchants.html.j2:11
msgid "Quick Steps for<span> Merchants</span>"
msgstr ""
-#: template/index.html.j2:94
+#: template/merchants.html.j2:13
msgid ""
"To receive Taler payments, a merchant needs a Swiss bank account in the "
"currency CHF."
msgstr ""
-#: template/index.html.j2:95
+#: template/merchants.html.j2:14
msgid ""
"The configuration file has to be filled in, e.g. entering the bank account "
"number of the merchant."
msgstr ""
-#: template/index.html.j2:96
+#: template/merchants.html.j2:15
msgid ""
"In case a mechant has a web shop, a snippet of code has to be integrated "
"into the web shop software for Taler as a payment option."
msgstr ""
-#: template/index.html.j2:97
+#: template/merchants.html.j2:16
msgid "A QR code can be generated for offline use at the point of sale."
msgstr ""
-#: template/index.html.j2:98
+#: template/merchants.html.j2:17
msgid "INTEGRATE SHOP"
msgstr ""
-#: template/index.html.j2:122
-msgid "Installation Guide for<br> USERS"
-msgstr ""
-
-#: template/index.html.j2:123 template/index.html.j2:148
-msgid "User Guide"
-msgstr ""
-
-#: template/index.html.j2:129
-msgid "Integration Guide for<br> MERCHANTS"
-msgstr ""
-
-#: template/index.html.j2:130 template/index.html.j2:155
-msgid "Merchant Guide"
-msgstr ""
-
-#: template/index.html.j2:136
-msgid "Overview of<br> payment <br> FEES"
-msgstr ""
-
-#: template/index.html.j2:137 template/index.html.j2:162
-msgid "Fee Overview"
-msgstr ""
-
-#: template/index.html.j2:147
-msgid "Installation guide for users"
-msgstr ""
-
-#: template/index.html.j2:154
-msgid "Integration guide for merchants"
-msgstr ""
-
-#: template/index.html.j2:161
-msgid "Overview of payment fees"
-msgstr ""
-
-#: template/index.html.j2:168
-msgid "This payment system for citizens and companies in Switzerland is"
-msgstr ""
-
-#: template/index.html.j2:170
-msgid "principle-based on privacy by design and data minimization"
-msgstr ""
-
-#: template/index.html.j2:171
-msgid "ideal for micro-payments"
-msgstr ""
-
-#: template/index.html.j2:172
-msgid ""
-"running on <a href=\"https://fsf.org/\"; class=\"demo_btn\" target=\"_blank\" "
-"rel=\"noopener noreferrer\">Free Software</a>"
-msgstr ""
-
-#: template/index.html.j2:173
-msgid ""
-"using the technology of <a href=\"https://taler.net/\"; class=\"demo_btn\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
-msgstr ""
-
#: template/terms.html.j2:3
msgid "Taler Operations AG - Terms of Service"
msgstr "Taler Operations AG - Conditions d'utilisation"
@@ -333,6 +243,28 @@ msgstr ""
msgid "Taler Operations AG - Users"
msgstr "Taler Operations AG - Pour les clients"
+#: template/users.html.j2:11
+msgid "Quick Steps for<span> Users</span>"
+msgstr ""
+
+#: template/users.html.j2:12
+msgid "What do I need to use Taler for payments?"
+msgstr ""
+
+#: template/users.html.j2:14
+msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
+msgstr ""
+
+#: template/users.html.j2:15
+msgid ""
+"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's digital "
+"cash into the wallet"
+msgstr ""
+
+#: template/users.html.j2:16
+msgid "<b>TALER WALLET</b> installed for"
+msgstr ""
+
#: template/users.html.j2:20
msgid "or a <b>BROWSER WALLET</b>"
msgstr ""
@@ -565,8 +497,11 @@ msgstr ""
msgid "I want to use digital cash <br>on my phone!"
msgstr ""
-#~ msgid "Taler Operations AG - Merchants"
-#~ msgstr "Taler Operations AG - Pour marchands"
+#~ msgid "Taler Operations AG, Switzerland"
+#~ msgstr "Taler Operations AG, Suisse"
+
+#~ msgid "All Rights Reserved"
+#~ msgstr "Tous droits réservés"
#, fuzzy
#~ msgid "Legal Form"
diff --git a/locale/messages.pot b/locale/messages.pot
index 9d1adbc..3acdcba 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-24 18:16+0100\n"
+"POT-Creation-Date: 2024-02-24 20:14+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"
@@ -21,68 +21,72 @@ msgstr ""
msgid "Taler Operations AG, Biel, Switzerland"
msgstr ""
-#: common/footer.j2.inc:14
+#: common/footer.j2.inc:11
+msgid "Switzerland"
+msgstr ""
+
+#: common/footer.j2.inc:19
msgid "Quick Links"
msgstr ""
-#: common/footer.j2.inc:16
+#: common/footer.j2.inc:21
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:16 common/navigation.j2.inc:19
+#: common/footer.j2.inc:21 common/navigation.j2.inc:19
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:19 common/navigation.j2.inc:22 template/fees.html.j2:3
+#: common/footer.j2.inc:24 common/navigation.j2.inc:22 template/fees.html.j2:3
#: template/fees.html.j2:9 template/fees.html.j2:19
msgid "Fees"
msgstr ""
-#: common/footer.j2.inc:20
+#: common/footer.j2.inc:25
msgid "Terms of Service"
msgstr ""
-#: common/footer.j2.inc:26
+#: common/footer.j2.inc:31
msgid "Partners"
msgstr ""
-#: common/footer.j2.inc:28
+#: common/footer.j2.inc:33
msgid "Taler Consortium"
msgstr ""
-#: common/footer.j2.inc:29
+#: common/footer.j2.inc:34
msgid "Bern University of Applied Sciences"
msgstr ""
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:35
msgid "NetzBon"
msgstr ""
-#: common/footer.j2.inc:36
+#: common/footer.j2.inc:41
msgid "Contacts"
msgstr ""
-#: common/footer.j2.inc:38
-msgid "Taler Operations AG, Switzerland"
+#: common/footer.j2.inc:43
+msgid "Tel:"
msgstr ""
-#: common/footer.j2.inc:43
+#: common/footer.j2.inc:44
msgid "Compliance Officer"
msgstr ""
-#: common/footer.j2.inc:44
+#: common/footer.j2.inc:45
msgid "AML Officer"
msgstr ""
-#: common/footer.j2.inc:54
+#: common/footer.j2.inc:55
msgid "Copyright"
msgstr ""
-#: common/footer.j2.inc:54
-msgid "All Rights Reserved"
+#: common/footer.j2.inc:55
+msgid "License"
msgstr ""
-#: common/footer.j2.inc:55
+#: common/footer.j2.inc:56
msgid ""
"We do not assume any liability for the correctness of contents. We do not"
" collect any data and do not use cookies. <br>Our web server generates a "
@@ -90,19 +94,15 @@ msgid ""
"exclusively for troubleshooting or problem mitigation."
msgstr ""
-#: common/footer.j2.inc:57
-msgid "License"
-msgstr ""
-
#: common/navigation.j2.inc:2
msgid "Skip to main content"
msgstr ""
-#: common/navigation.j2.inc:20 template/index.html.j2:40
+#: common/navigation.j2.inc:20 template/index.html.j2:50
msgid "For Merchants"
msgstr ""
-#: common/navigation.j2.inc:21 template/index.html.j2:50
+#: common/navigation.j2.inc:21 template/index.html.j2:40
msgid "For Users"
msgstr ""
@@ -120,12 +120,8 @@ msgstr ""
msgid "Costs for sending SMS to users"
msgstr ""
-#: template/index.html.j2:3
-msgid "Taler Operations AG - Home"
-msgstr ""
-
#: template/index.html.j2:11
-msgid "Welcome to the homepage of<span> TALER OPERATIONS"
+msgid "Welcome to <span>Taler Operations"
msgstr ""
#: template/index.html.j2:13
@@ -138,146 +134,60 @@ msgstr ""
#: template/index.html.j2:41
msgid ""
-"Taler offers efficient payments and backoffice procedures with security, "
-"privacy and data minimization by design. Payers and payees can rely on "
-"technology, and do not need to purely rely on trust anymore."
-msgstr ""
-
-#: template/index.html.j2:44
-msgid "Integrate Shop"
-msgstr ""
-
-#: template/index.html.j2:51
-msgid ""
"Taler provides the world with a payment solution that definitely makes "
"sense in a society where privacy, data safety, technical security, and "
"reliability become more and more crucial for everyone."
msgstr ""
-#: template/index.html.j2:54
-msgid "Install Wallet"
-msgstr ""
-
-#: template/index.html.j2:68 template/users.html.j2:11
-msgid "Quick Steps for<span> Users</span>"
-msgstr ""
-
-#: template/index.html.j2:69 template/users.html.j2:12
-msgid "What do I need to use Taler for payments?"
-msgstr ""
-
-#: template/index.html.j2:71 template/users.html.j2:14
-msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
+#: template/index.html.j2:44
+msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:72 template/users.html.j2:15
+#: template/index.html.j2:51
msgid ""
-"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's "
-"digital cash into the wallet"
-msgstr ""
-
-#: template/index.html.j2:73 template/users.html.j2:16
-msgid "<b>TALER WALLET</b> installed for"
+"Taler offers efficient payments and backoffice procedures with security, "
+"privacy and data minimization by design. Payers and payees can rely on "
+"technology, and do not need to purely rely on trust anymore."
msgstr ""
-#: template/index.html.j2:77
-msgid "or <b>BROWSERS</b>"
+#: template/index.html.j2:54
+msgid "Integrate"
msgstr ""
-#: template/index.html.j2:79
-msgid "FULL USER GUIDE"
+#: template/merchants.html.j2:3
+msgid "Taler Operations AG - Merchants"
msgstr ""
-#: template/index.html.j2:92
+#: template/merchants.html.j2:11
msgid "Quick Steps for<span> Merchants</span>"
msgstr ""
-#: template/index.html.j2:94
+#: template/merchants.html.j2:13
msgid ""
"To receive Taler payments, a merchant needs a Swiss bank account in the "
"currency CHF."
msgstr ""
-#: template/index.html.j2:95
+#: template/merchants.html.j2:14
msgid ""
"The configuration file has to be filled in, e.g. entering the bank "
"account number of the merchant."
msgstr ""
-#: template/index.html.j2:96
+#: template/merchants.html.j2:15
msgid ""
"In case a mechant has a web shop, a snippet of code has to be integrated "
"into the web shop software for Taler as a payment option."
msgstr ""
-#: template/index.html.j2:97
+#: template/merchants.html.j2:16
msgid "A QR code can be generated for offline use at the point of sale."
msgstr ""
-#: template/index.html.j2:98
+#: template/merchants.html.j2:17
msgid "INTEGRATE SHOP"
msgstr ""
-#: template/index.html.j2:122
-msgid "Installation Guide for<br> USERS"
-msgstr ""
-
-#: template/index.html.j2:123 template/index.html.j2:148
-msgid "User Guide"
-msgstr ""
-
-#: template/index.html.j2:129
-msgid "Integration Guide for<br> MERCHANTS"
-msgstr ""
-
-#: template/index.html.j2:130 template/index.html.j2:155
-msgid "Merchant Guide"
-msgstr ""
-
-#: template/index.html.j2:136
-msgid "Overview of<br> payment <br> FEES"
-msgstr ""
-
-#: template/index.html.j2:137 template/index.html.j2:162
-msgid "Fee Overview"
-msgstr ""
-
-#: template/index.html.j2:147
-msgid "Installation guide for users"
-msgstr ""
-
-#: template/index.html.j2:154
-msgid "Integration guide for merchants"
-msgstr ""
-
-#: template/index.html.j2:161
-msgid "Overview of payment fees"
-msgstr ""
-
-#: template/index.html.j2:168
-msgid "This payment system for citizens and companies in Switzerland is"
-msgstr ""
-
-#: template/index.html.j2:170
-msgid "principle-based on privacy by design and data minimization"
-msgstr ""
-
-#: template/index.html.j2:171
-msgid "ideal for micro-payments"
-msgstr ""
-
-#: template/index.html.j2:172
-msgid ""
-"running on <a href=\"https://fsf.org/\"; class=\"demo_btn\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Free Software</a>"
-msgstr ""
-
-#: template/index.html.j2:173
-msgid ""
-"using the technology of <a href=\"https://taler.net/\"; class=\"demo_btn\""
-" target=\"_blank\" rel=\"noopener noreferrer\">GNU Taler</a>"
-msgstr ""
-
#: template/terms.html.j2:3
msgid "Taler Operations AG - Terms of Service"
msgstr ""
@@ -324,6 +234,28 @@ msgstr ""
msgid "Taler Operations AG - Users"
msgstr ""
+#: template/users.html.j2:11
+msgid "Quick Steps for<span> Users</span>"
+msgstr ""
+
+#: template/users.html.j2:12
+msgid "What do I need to use Taler for payments?"
+msgstr ""
+
+#: template/users.html.j2:14
+msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
+msgstr ""
+
+#: template/users.html.j2:15
+msgid ""
+"<b>PHONE NUMBER</b> beginning with ++41 for withdrawals of Taler's "
+"digital cash into the wallet"
+msgstr ""
+
+#: template/users.html.j2:16
+msgid "<b>TALER WALLET</b> installed for"
+msgstr ""
+
#: template/users.html.j2:20
msgid "or a <b>BROWSER WALLET</b>"
msgstr ""
diff --git a/template/index.html.j2 b/template/index.html.j2
index 3c60beb..82cfd96 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -1,6 +1,6 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<title>{% trans %}Taler Operations AG - Home{% endtrans %}</title>
+<title>Taler Operations AG</title>
<main id="maincontent">
<div class="banner_sec">
<div class="banner_box">
@@ -8,7 +8,7 @@
<div class="row">
<div class="col-sm-7">
<div class="ban_left">
- <h3>{% trans %}Welcome to the homepage of<span> TALER
OPERATIONS{% endtrans %}</span></h3>
+ <h3>{% trans %}Welcome to <span>Taler Operations{%
endtrans %}</span></h3>
<br>
<h4>{% trans %}These pages explain how to install
and use Taler.{% endtrans %}</h4>
<br><br>
@@ -34,145 +34,28 @@
<div class="digital_innr">
<div class="desk">
<div class="row">
- <div class="col-lg-6 col-sm-6">
- <div class="digital_box">
- <img src="{{
url_static('images/newpic1.png') }}" alt="" />
- <b>{% trans %}For
Merchants{% endtrans %}</b>
- <p>{% trans %}Taler
offers efficient payments and backoffice procedures with security,
- privacy and data
minimization by design. Payers and payees can rely on technology,
- and do not need to
purely rely on trust anymore.{% endtrans %}</p>
- <a href="{{
url_localized('merchants.html') }}" class="lrean_btn">{% trans %}Integrate
Shop{% endtrans %}</a>
- </div>
- </div>
<div class="col-lg-6 col-sm-6">
<div class="digital_box">
<img src="{{
url_static('images/newpic2.png') }}" alt="" />
<b>{% trans %}For
Users{% endtrans %}</b>
- <p>{% trans %}Taler
provides the world with a payment solution that definitely makes
- sense in a society
where privacy, data safety, technical security, and reliability
+ <p>{% trans %}Taler
provides the world with a payment solution that definitely makes
+ sense in a society
where privacy, data safety, technical security, and reliability
become more and more
crucial for everyone.{% endtrans %}</p>
- <a
href="https://taler.net/{{ url_localized('') }}wallet.html" target="_blank"
rel="noopener noreferrer" class="lrean_btn">{% trans %}Install Wallet{%
endtrans %}</a>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-</section>
-
-<section class="mid_sec">
- <div class="container">
- <div class="row">
- <div class="col-sm-6">
- <div class="mid_text">
- <h2>{% trans %}Quick Steps for<span>
Users</span>{% endtrans %}</h2>
- <p><b>{% trans %}What do I need to use
Taler for payments?{% endtrans %}</b></p>
- <ul>
- <li>{% trans %}<b>SWISS BANK
ACCOUNT</b> with an IBAN beginning with CH**{% endtrans %}</li>
- <li>{% trans %}<b>PHONE
NUMBER</b> beginning with ++41 for withdrawals of Taler's digital cash into the
wallet{% endtrans %}</li>
- <li>{% trans %}<b>TALER
WALLET</b> installed for{% endtrans %}<br>
- <a
href="https://play.google.com/store/apps/details?id=net.taler.wallet";
target="_blank" rel="noopener noreferrer">Android</a><br>
- <a
href="https://f-droid.org/en/packages/net.taler.wallet.fdroid/"; target="_blank"
rel="noopener noreferrer">F-Droid</a><br>
- <a
href="https://testflight.apple.com/"; target="_blank" rel="noopener
noreferrer">iOS</a>
- <p>{% trans %}or
<b>BROWSERS</b>{% endtrans %}
- <a href="https://taler.net/{{
url_localized('') }}wallet.html" target="_blank" rel="noopener noreferrer">
Firefox, Chrome, Chromium, Opera</a></li>
- <a href="{{
url_localized('users.html#quickstepsforusers') }}" class="blubtn">{% trans
%}FULL USER GUIDE{% endtrans %}</a></p>
- </ul>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="mid_img">
- <img src="{{
url_static('images/screenshot_history_1.png') }}" alt="" width=450px>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-sm-6">
- <div class="mid_text">
- <h2>{% trans %}Quick Steps for<span>
Merchants</span>{% endtrans %}</h2>
- <ul>
- <li>{% trans %}To receive Taler
payments, a merchant needs a Swiss bank account in the currency CHF.{% endtrans
%}</li>
- <li>{% trans %}The
configuration file has to be filled in, e.g. entering the bank account number
of the merchant.{% endtrans %}</li>
- <li>{% trans %}In case a
mechant has a web shop, a snippet of code has to be integrated into the web
shop software for Taler as a payment option.{% endtrans %}</li>
- <li>{% trans %}A QR code can be
generated for offline use at the point of sale.{% endtrans %}</li>
- <p><a href="{{
url_localized('merchants.html') }}" class="blubtn">{% trans %}INTEGRATE SHOP{%
endtrans %}</a></p>
- </ul>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="mid_img">
- <img src="{{
url_static('images/mobpic2.png') }}" alt="" width=400px>
- </div>
- </div>
- </div>
- </div>
-</section>
-
-<section class="digital_sec">
- <div class="container">
- {# <!-- <div class="top_heading">
- <h2>{% trans %}INSTALLATION AND INTEGRATION{% endtrans %}</h2>
- </div> --> #}
- <div class="digital_innr">
- <div class="desk d-md-block d-sm-none d-none">
- <div class="row">
- <div class="col-lg-4 col-md-4">
- <div class="digital_box">
- <img src="{{
url_static('images/topicon1.png') }}" alt="">
- <b>{% trans
%}Installation Guide for<br> USERS{% endtrans %}</b>
- <a href="{{
url_localized('users.html') }}" class="lrean_btn">{% trans %}User Guide{%
endtrans %}</a>
- </div>
- </div>
- <div class="col-lg-4 col-md-4">
- <div class="digital_box">
- <img src="{{
url_static('images/topicon2.png') }}" alt="">
- <b>{% trans
%}Integration Guide for<br> MERCHANTS{% endtrans %}</b>
- <a href="{{
url_localized('merchants.html') }}" class="lrean_btn">{% trans %}Merchant
Guide{% endtrans %}</a>
- </div>
- </div>
- <div class="col-lg-4 col-md-4">
- <div class="digital_box">
- <img src="{{
url_static('images/topicon3.png') }}" alt="">
- <b>{% trans %}Overview
of<br> payment <br> FEES{% endtrans %}</b>
- <a href="{{
url_localized('fees.html') }}" class="lrean_btn">{% trans %}Fee Overview{%
endtrans %}</a>
+ <a href="{{
url_localized('users.html') }}" class="lrean_btn">{% trans
%}Pay with Taler{% endtrans %}</a>
</div>
</div>
- </div>
- </div>
- <div class="desk d-md-none d-sm-block d-block">
- <div class="momelecte owl-carousel">
- <div class="item">
- <div class="digital_box">
- <img src="{{
url_static('images/topicon1.png') }}" alt="" />
- <b>{% trans
%}Installation guide for users{% endtrans %}</b>
- <a href="{{
url_localized('users.html') }}" class="lrean_btn">{% trans %}User Guide{%
endtrans %}</a>
- </div>
- </div>
- <div class="item">
- <div class="digital_box">
- <img src="{{
url_static('images/topicon2.png') }}" alt="" />
- <b>{% trans
%}Integration guide for merchants{% endtrans %}</b>
- <a href="{{
url_localized('merchants.html') }}" class="lrean_btn">{% trans %}Merchant
Guide{% endtrans %}</a>
- </div>
- </div>
- <div class="item">
+ <div class="col-lg-6 col-sm-6">
<div class="digital_box">
- <img src="{{
url_static('images/topicon3.png') }}" alt="" />
- <b>{% trans %}Overview
of payment fees{% endtrans %}</b>
- <a href="{{
url_localized('fees.html') }}" class="lrean_btn">{% trans %}Fee Overview{%
endtrans %}</a>
+ <img src="{{
url_static('images/newpic1.png') }}" alt="" />
+ <b>{% trans %}For
Merchants{% endtrans %}</b>
+ <p>{% trans %}Taler
offers efficient payments and backoffice procedures with security,
+ privacy and data
minimization by design. Payers and payees can rely on technology,
+ and do not need to
purely rely on trust anymore.{% endtrans %}</p>
+ <a href="{{
url_localized('merchants.html') }}" class="lrean_btn">{% trans %}Integrate{%
endtrans %}</a>
</div>
</div>
</div>
</div>
- <div class="provide_sec">
- <h3>{% trans %}This payment system for citizens
and companies in Switzerland is{% endtrans %}</h3>
- <ul>
- <li>{% trans %}principle-based on
privacy by design and data minimization{% endtrans %}</li>
- <li>{% trans %}ideal for
micro-payments{% endtrans %}</li>
- <li>{% trans %}running on <a
href="https://fsf.org/"; class="demo_btn" target="_blank" rel="noopener
noreferrer">Free Software</a>{% endtrans %}</li>
- <li>{% trans %}using the technology of
<a href="https://taler.net/"; class="demo_btn" target="_blank" rel="noopener
noreferrer">GNU Taler</a>{% endtrans %}</li>
- </ul>
- </div>
</div>
</div>
</section>
--
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: fix footer,
gnunet <=