[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch master updated: principles edits based on collected f
|
From: |
gnunet |
|
Subject: |
[taler-www] branch master updated: principles edits based on collected feedback |
|
Date: |
Mon, 01 Jun 2020 17:15:21 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new 6fd5c92 principles edits based on collected feedback
6fd5c92 is described below
commit 6fd5c929848e59a669b3a30eac8c09a18f5b4e8a
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Jun 1 17:15:18 2020 +0200
principles edits based on collected feedback
---
locale/de/LC_MESSAGES/messages.po | 375 ++++++++++++++++++++++----------------
locale/en/LC_MESSAGES/messages.po | 84 +++++----
locale/es/LC_MESSAGES/messages.po | 84 +++++----
locale/fr/LC_MESSAGES/messages.po | 256 ++++++++++++++------------
locale/it/LC_MESSAGES/messages.po | 84 +++++----
locale/messages.pot | 87 +++++----
locale/pt/LC_MESSAGES/messages.po | 84 +++++----
locale/ru/LC_MESSAGES/messages.po | 84 +++++----
template/principles.html.j2 | 134 +++++++++-----
9 files changed, 741 insertions(+), 531 deletions(-)
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 60c2e1c..2c7daf4 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1,12 +1,12 @@
msgid ""
msgstr ""
"Project-Id-Version: German (Taler Website)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-13 07:25+0000\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German <http://weblate.taler.net/projects/taler-website/";
-"main-site/de/>\n"
+"Language-Team: German <http://weblate.taler.net/projects/taler-website/main-";
+"site/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +14,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.0.3\n"
-#: common/base.j2:5,
-#: common/news.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr "Das Taler-Bezahlsystem"
-#: common/base.j2:6,
-#: common/news.j2:6
+#: common/base.j2:6 common/news.j2:6
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Taxable Anonymous Libre Electronic Reserves"
@@ -36,15 +34,14 @@ msgstr "FAQs"
msgid "Bibliography"
msgstr "Bibliografie von GNU Taler"
-#: common/footer.j2.inc:28,
-#: template/bibliography.html.j2:34
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
msgid "and"
msgstr "und"
#: common/footer.j2.inc:31
msgid ""
-"We are grateful for support and free hosting of this site by <a "
-"href='http://www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a href='http://";
+"www.bfh.ch/'>BFH</a>"
msgstr ""
"Wir danken der <a href='http://www.bfh.ch/'>Fachhochschule Bern</a> für ihre "
"Unterstützung und das kostenlose Hosting dieser Webseiten"
@@ -54,8 +51,8 @@ msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
msgstr ""
-"Diese Webseiten wurden ausschließlich mit <a href='https://www.gnu.org/'>"
-"freier Software</a> erstellt."
+"Diese Webseiten wurden ausschließlich mit <a href='https://www.gnu.";
+"org/'>freier Software</a> erstellt."
#: common/navigation.j2.inc:21
msgid "Features"
@@ -69,8 +66,7 @@ msgstr "Prinzipien"
msgid "Docs"
msgstr "Dokumente/Links"
-#: common/navigation.j2.inc:24,
-#: news/index.html.j2:9
+#: common/navigation.j2.inc:24 news/index.html.j2:9
msgid "News"
msgstr "Aktuelles"
@@ -104,8 +100,7 @@ msgstr ""
"lassen kann. Die Aufbuchung kann auf das eigene oder ein fremdes Wallet "
"erfolgen."
-#: template/cashier.html.j2:21,
-#: template/investors.html.j2:90
+#: template/cashier.html.j2:21 template/investors.html.j2:90
msgid "Download"
msgstr "Download"
@@ -148,11 +143,11 @@ msgstr "Chat/IRC"
#: template/contact.html.j2:42
msgid ""
-"You can find some team members in the IRC channel <tt>#taler</tt> on "
-"<tt>irc.freenode.net</tt>."
+"You can find some team members in the IRC channel <tt>#taler</tt> on <tt>irc."
+"freenode.net</tt>."
msgstr ""
-"Einige unserer Teammitglieder sind im IRC-Kanal <tt>#taler</tt> auf "
-"<tt>irc.freenode.net</tt> für einen Chat zu erreichen."
+"Einige unserer Teammitglieder sind im IRC-Kanal <tt>#taler</tt> auf <tt>irc."
+"freenode.net</tt> für einen Chat zu erreichen."
#: template/contact.html.j2:50
msgid "Reporting bugs"
@@ -185,8 +180,8 @@ msgstr "Allgemeine Anfragen"
#: template/contact.html.j2:67
msgid ""
-"You can reach a group of team members handling general inquiries at <tt>"
-"contact AT taler.net</tt>."
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
msgstr ""
"Allgemeine Anfragen können mit einer E-Mail an <tt>contact AT taler.net</tt> "
"gestellt werden, um mehrere Mitglieder unseres Entwicklerteams auf einmal zu "
@@ -198,8 +193,8 @@ msgstr "Geschäftsführung"
#: template/contact.html.j2:77
msgid ""
-"For non-technical commercial requests, please contact <tt>ceo AT "
-"taler.net</tt>."
+"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
+"tt>."
msgstr ""
"Für alle nicht-technischen Anfragen und Händleranfragen bitten wir unsere "
"Geschäftsführung mit einer E-Mail an <tt>ceo AT taler.net</tt> anzuschreiben."
@@ -211,15 +206,15 @@ msgstr "Vereinbarung zur Abtretung von Urheberrechten"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href=\""
-"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex\";>"
-"GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
"Wer zum Projekt GNU Taler beitragen möchte, ist dazu herzlich eingeladen. "
"Voraussetzung dafür ist neben einem Zugang über Git, dass die Urheberrechte "
-"des eigenen Beitrags an das Projekt gemäß <a href=\"/pdf/copyright.pdf\">"
-"Copyright Assignment</a> abgetreten werden, um sicherzustellen, dass die "
+"des eigenen Beitrags an das Projekt gemäß <a href=\"/pdf/copyright.pdf"
+"\">Copyright Assignment</a> abgetreten werden, um sicherzustellen, dass die "
"Lizenzvereinbarung und die Richtlinien der Mitarbeit gegenüber GNUnet e.V. "
"und Taler Systems SA erfüllt werden (siehe <a href=\"https://git.gnunet.org/";
"gnunet-ev.git/tree/gnunet_taler_agreement.tex\">GNUnet e.V. --- Taler "
@@ -262,8 +257,8 @@ msgstr "Dokumente und Materialien zu GNU Taler"
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
-"full documentation contents can be found <a href=\"https://docs.taler.net/\"";
-">here</a>."
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
msgstr ""
"Hier befinden sich Verweise auf einzelne Kapitel in der Dokumentation des "
"Taler-Bezahlsystems. Die vollständige Dokumentation aller Systembestandteile "
@@ -278,7 +273,11 @@ msgid "Merchant Backend Administration"
msgstr "Verwaltungs-Backend für Händler und Verkäufer"
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, fuzzy, python-format
+#| msgid "Tutorial and manual for operating a merchant. Also available as"
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr "Anleitung zum Aufsetzen der Verkäufer-Backends. Hier auch als"
#: template/docs.html.j2:50
@@ -286,9 +285,14 @@ msgid "Merchant API Tutorial"
msgstr "Beschreibung der API für Verkäufer"
#: template/docs.html.j2:52
+#, fuzzy, python-format
+#| msgid ""
+#| "Tutorial for processing Taler payments using the merchant backend API. "
+#| "Also available as"
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
msgstr ""
"Anleitung zur Zahlungsabwicklung mit Taler unter Verwendung der API für "
"Verkäufer. Hier auch als"
@@ -298,7 +302,11 @@ msgid "Exchange"
msgstr "Taler-Exchange"
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, fuzzy, python-format
+#| msgid "Operator's manual for the GNU Taler exchange. Also available as"
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr "Anleitung für Exchange-Betreiber. Hier auch als"
#: template/docs.html.j2:74
@@ -306,9 +314,14 @@ msgid "Bank Integration"
msgstr "Bankintegration"
#: template/docs.html.j2:76
+#, fuzzy, python-format
+#| msgid ""
+#| "Manual for tightly integrating Taler with banking applications. Also "
+#| "available as"
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
msgstr ""
"Anleitung zum Aufsetzen der Schnittstellen für Bank-Anwendungen. Hier auch "
"als"
@@ -332,7 +345,11 @@ msgid "Back office"
msgstr "Prüfung des Zahlungseingangs"
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, fuzzy, python-format
+#| msgid "Manual to run the back-office Web application. Also available as"
+msgid ""
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
"Anleitung zum Aufsetzen der Anwendung, die alle Zahlungseingänge an "
"Verkäufer prüft. Hier auch als"
@@ -342,8 +359,12 @@ msgid "Merchant POS Terminal"
msgstr "POS-Terminal für Verkäufer"
#: template/docs.html.j2:118
+#, fuzzy, python-format
+#| msgid ""
+#| "Manual for configuring and using the point of sale app. Also available as"
msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
msgstr ""
"Anleitung zur Konfiguration und Inbetriebnahme der POS-Anwendung. Hier auch "
"als"
@@ -398,8 +419,8 @@ msgstr "Internet Relay Chat"
#: template/docs.html.j2:198
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-"Einige unserer Teammitglieder sind im IRC-Kanal <tt>#taler</tt> auf "
-"<tt>irc.freenode.net</tt> für einen Chat zu erreichen."
+"Einige unserer Teammitglieder sind im IRC-Kanal <tt>#taler</tt> auf <tt>irc."
+"freenode.net</tt> für einen Chat zu erreichen."
#: template/docs.html.j2:204
msgid "Bug Tracker"
@@ -430,8 +451,8 @@ msgstr "LCOV-Ergebnisse"
#: template/docs.html.j2:238
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
-"Zeigt die Ergebnisse der Ausführunganalyse unseres Codes in der Entwicklung ("
-"LCOV code coverage report)."
+"Zeigt die Ergebnisse der Ausführunganalyse unseres Codes in der Entwicklung "
+"(LCOV code coverage report)."
#: template/docs.html.j2:244
msgid "Continuous integration"
@@ -628,8 +649,8 @@ msgstr ""
"ein eventuelles Nichtabheben von Coins aus der Reserve eines Exchange (falls "
"ein Wallet eine Abhebung nicht zu Ende führt). Verkäufer haben die Option, "
"Anteile der Gebühren an Stelle ihrer Kunden zu übernehmen. Die Kosten für "
-"eine Transaktion betragen gegenwärtig nach eigener Schätzung 0,001 Eurocent ("
-"für den Fall von hohen Transaktionsmengen, auf welche die Betriebskosten "
+"eine Transaktion betragen gegenwärtig nach eigener Schätzung 0,001 Eurocent "
+"(für den Fall von hohen Transaktionsmengen, auf welche die Betriebskosten "
"degressiv verteilt werden)."
#: template/faq.html.j2:117
@@ -746,8 +767,8 @@ msgid ""
"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
-"be premature given the state of the project (see also <a href=\""
-"https://gnunet.org/bugs/\";>our bugtracker</a> for a list of open issues)."
+"be premature given the state of the project (see also <a href=\"https://";
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
"Wir wissen von mehreren Projekten, die Taler experimentell einsetzen oder "
"betriebsfähige Systemprototypen entwickelt haben. Wir selbst führen aktuell "
@@ -762,6 +783,54 @@ msgstr ""
msgid "Does Taler support recurring payments?"
msgstr "Beherrscht Taler Daueraufträge (wiederkehrende Zahlungen)?"
+#: template/faq.html.j2:176
+#, fuzzy
+#| msgid ""
+#| "Today, our wallet implementation does not support recurring payments. "
+#| "Recurring payments, where some fixed amount is paid on a regular basis "
+#| "are in theory possible with Taler, but they come with a few caveats. "
+#| "Specifically, recurring payments can only work if the Taler wallet is "
+#| "running and online around the desired time. Furthermore, given their "
+#| "repetitive nature they are linkable, and could thus be used to "
+#| "deanonymize the user making the recurring payment, for example by forcing "
+#| "the user offline at the time of the payment and observing that it does "
+#| "then not happen on time. Finally, the Taler wallet does not work with "
+#| "credit and thus the user would have to make sure to carry a sufficient "
+#| "balance for the recurring payment to be made. Still, they can be useful, "
+#| "and a future version of the Taler wallet will likely support them. But "
+#| "this is not a feature that we are targeting for Taler 1.0. at this time"
+msgid ""
+"Today, our wallet implementation does not support recurring payments. "
+"Recurring payments, where some fixed amount is paid on a regular basis are "
+"in theory possible with Taler, but they come with a few caveats. "
+"Specifically, recurring payments can only work if the Taler wallet is "
+"running and online around the desired time. Furthermore, given their "
+"repetitive nature they are linkable, and could thus be used to deanonymize "
+"the user making the recurring payment, for example by forcing the user "
+"offline at the time of the payment and observing that it does then not "
+"happen on time. Finally, the Taler wallet does not work with credit and thus "
+"the user would have to make sure to carry a sufficient balance for the "
+"recurring payment to be made. Still, they can be useful, and a future "
+"version of the Taler wallet will likely support them. But this is not a "
+"feature that we are targeting for Taler 1.0. at this time."
+msgstr ""
+"Taler-Wallets bieten gegenwärtig noch nicht die Funktionalität für "
+"Daueraufträge. Wiederkehrende Zahlungen mit einem fixen Zahlbetrag und "
+"vorgegebenen Ausführungsterminen sind theoretisch mit Taler möglich, "
+"verlangen jedoch einige Vorsichtsmaßnahmen und bringen auch Nachteile mit "
+"sich. Daueraufträge erfordern zwingend den Online-Status des Wallet zum "
+"gewünschten Ausführungstermin. Durch häufige wiederkehrende Zahlungen kann "
+"es zudem zu einem Rückschluss auf den Zahlenden kommen, wodurch dessen "
+"Anonymität aufgehoben wird. In der Praxis könnte dies dadurch geschehen, "
+"dass das Wallet des Zahlenden zum Zeitpunkt des angesetzten "
+"Ausführungstermins absichtlich am Internetzugang gehindert wird und durch "
+"das Ausbleiben des Zahlungseingangs beim Empfänger auf den Zahlenden "
+"geschlossen werden kann. Schließlich besteht noch das Erfordernis einer "
+"ausreichenden Deckung mit Coins im Wallet, damit die wiederkehrende Zahlung "
+"garantiert ausgeführt wird. Zwar hätte die Dauerauftragsfunktion Vorteile "
+"für die Nutzer, doch wird erst eine zukünftige Version von Taler diese "
+"bereitstellen und nicht die Erstversion."
+
#: template/features.html.j2:7
msgid "GNU Taler: Features"
msgstr "Features"
@@ -776,8 +845,9 @@ msgstr ""
"GNU Taler <span class=\"tlr\">schützt Ihre Daten als Käufer</span>. Während "
"die Daten der Käufer nicht preisgegeben werden, gilt hingegen für die "
"Verkäufer von Waren und Dienstleistungen, dass ihre Umsätze aus dem "
-"Bezahlsystem grundsätzlich offengelegt sind. <span class=\"tlr\">"
-"Steuerhinterziehung und Geldwäsche werden so systematisch verhindert</span>."
+"Bezahlsystem grundsätzlich offengelegt sind. <span class=\"tlr"
+"\">Steuerhinterziehung und Geldwäsche werden so systematisch verhindert</"
+"span>."
#: template/features.html.j2:23
msgid ""
@@ -785,24 +855,45 @@ msgid ""
"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
"always backed by an existing currency."
msgstr ""
-"GNU Taler versteht sich als <span class=\"tlr\">Bezahlsystem</span> und <"
-"span class=\"tlr\">nicht als Mittel zur Wertaufbewahrung</span>. Alle "
+"GNU Taler versteht sich als <span class=\"tlr\">Bezahlsystem</span> und "
+"<span class=\"tlr\">nicht als Mittel zur Wertaufbewahrung</span>. Alle "
"Zahlungen erfolgen stets in Entsprechung zu den Geldwerten in den "
"Ursprungswährungen, die auf dem Treuhandkonto des Taler-Exchange aufgebucht "
"und abgebucht werden. Zinsen oder Kursschwankungen sind dabei "
"ausgeschlossen. Die Auszahlung geschieht immer in der gleichen Währung, in "
"der die Einzahlung auf das Treuhandkonto erfolgte."
+#: template/features.html.j2:32
+#, fuzzy
+#| msgid ""
+#| "Payment are made after <span class=\"tlr\">exchanging existing money</"
+#| "span> into <em>electronic money</em> with the help of an Exchange "
+#| "service, that is, a payment service provider for Taler."
+msgid ""
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
+"into <em>electronic money</em> with the help of an Exchange service, that "
+"is, a payment service provider for Taler."
+msgstr ""
+"Zahlungen erfolgen mit <span class=\"tlr\">Coins als elektronischen "
+"Repräsentanten </span> der ursprünglichen Geldwerte in Währungen wie dem "
+"Euro. Der Exchange als Dreh- und Angelpunkt <span class=\"tlr\">verwaltet "
+"zwei parallele Zahlungsströme: </span> Zum einen die Buchungen auf dem "
+"Treuhandkonto (von gewöhnlichen Kundenkonten an den Exchange zur Umwandlung "
+"in Coins der Taler-Wallets und bei deren Ausgabe nach einem "
+"Kaufvertragsschluss an die Bankkonten der Verkäufer), zum anderen die "
+"Zahlungsströme zwischen dem Exchange und den Wallets (bei allen Aufwertungen "
+"und Ausgaben von Coins)."
+
#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
-"accept payments <span class=\"tlr\">without making their customers "
-"register</span> on the merchant's Website."
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
msgstr ""
"Die Käufer benötigen zur Zahlung mit Taler nur ausreichende Geldwerte in "
-"ihren Taler-Wallets. Die Verkäufer, z.B. Webshops oder Supermärkte, können <"
-"span class=\"tlr\">ohne Registrierung des Kunden</span> Zahlungen sicher und "
-"verlässlich entgegennehmen."
+"ihren Taler-Wallets. Die Verkäufer, z.B. Webshops oder Supermärkte, können "
+"<span class=\"tlr\">ohne Registrierung des Kunden</span> Zahlungen sicher "
+"und verlässlich entgegennehmen."
#: template/features.html.j2:50
msgid ""
@@ -874,10 +965,10 @@ msgstr ""
"entsprechenden Geldwerte vom Treuhandkonto an das Girokonto des Verkäufers "
"weiter. Der Exchange sammelt Zahlungen von verschiedenen Kunden, bündelt "
"diese nach Verkäufern sortiert zu Sammelbuchungen und überweist diese "
-"aggregierten Buchungen schließlich zugunsten der betreffenden (Verkäufer-)"
-"Girokonten. Die Verkäufer können die Frequenz der Sammelbuchung bestimmen. "
-"Sammelbuchungen minimieren Transaktionskosten und erhöhen die Effizienz der "
-"Buchungsverarbeitung zwischen den Banken."
+"aggregierten Buchungen schließlich zugunsten der betreffenden "
+"(Verkäufer-)Girokonten. Die Verkäufer können die Frequenz der Sammelbuchung "
+"bestimmen. Sammelbuchungen minimieren Transaktionskosten und erhöhen die "
+"Effizienz der Buchungsverarbeitung zwischen den Banken."
#: template/features.html.j2:105
msgid ""
@@ -933,8 +1024,7 @@ msgstr ""
"der Geschäftsbank, die das Treuhandkonto verantwortet. Sie verfügt über eine "
"regulär genehmigte Banklizenz."
-#: template/features.html.j2:154,
-#: template/governments.html.j2:55,
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr "Sicherheit"
@@ -952,8 +1042,7 @@ msgstr ""
"übervorsichtigen Maßnahmen zur Betrugsvermeidung seine Käufe nicht "
"durchführen könnte."
-#: template/features.html.j2:169,
-#: template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr "Besteuerbarkeit"
@@ -985,8 +1074,7 @@ msgstr ""
"bezahlt wurde, müssen hingegen die Verkäufer im Fall einer behördlichen "
"Anfrage offenlegen."
-#: template/features.html.j2:195,
-#: template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr "Freie Software"
@@ -1308,8 +1396,7 @@ msgid "Codeless Payment Backend"
msgstr ""
# Suggested in Weblate: Link
-#: template/gsoc-codeless.html.j2:114,
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
msgid "Link"
msgstr ""
@@ -1389,8 +1476,8 @@ msgstr ""
#: template/index.html.j2:25
msgid ""
-"We provide a payment system that makes <span class='tlr'>privacy-"
-"friendly</span> online transactions <span class='tlr'>fast and easy</span>."
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
msgstr ""
"Das Bezahlsystem GNU Taler ermöglicht das <span class='tlr'>schnelle und "
"einfache </span>Geldüberweisen mit <span class='tlr'>Datenschutz und hoher "
@@ -1475,8 +1562,8 @@ msgstr ""
#: template/investors.html.j2:50
msgid ""
-"All transactions in Taler are secured using <a href=\"bibliography.html\">"
-"modern cryptography</a> and trust in all parties is minimized. Financial "
+"All transactions in Taler are secured using <a href=\"bibliography.html"
+"\">modern cryptography</a> and trust in all parties is minimized. Financial "
"damage is bounded (for customers, merchants and the exchange) even "
"in the case that systems are compromised and private keys are stolen. "
"Databases can be audited for consistency, resulting in either the detection "
@@ -1492,8 +1579,8 @@ msgstr ""
#: template/investors.html.j2:65
msgid ""
"The scalable business model for Taler is the operation of the payment "
-"service provider, which converts money from traditional payment systems ("
-"MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
+"service provider, which converts money from traditional payment systems "
+"(MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
"electronic coins in the same currency. The customer can then redeem the "
"electronic coins at a merchant, who can exchange them for money represented "
"using traditional payment systems at the exchange. The exchange charges fees "
@@ -1544,8 +1631,8 @@ msgstr ""
#: template/investors.html.j2:132
msgid ""
-"Protocol allows the exchange to charge fees for any expensive operation ("
-"withdraw, deposit, refresh, refund or aggregated wire transfers)."
+"Protocol allows the exchange to charge fees for any expensive operation "
+"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
msgstr ""
# Suggested in Weblate: Partnerschaften mit Banken etablieren Nutzervertrauen.
@@ -1742,11 +1829,11 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html\";>"
-"Free Software</a>. For merchants, our Free Software reference implementation "
-"prevents vendor lock-in. As the software of the payment provider itself is "
-"free, countries can deploy the payment system without compromising "
-"sovereignty."
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
msgstr ""
"GNU Taler muss <a href=\"https://www.gnu.org/philosophy/free-sw.html\";>freie "
"Software</a> sein. Mit Taler werden Verkäufer und Händler unabhängig von "
@@ -1830,10 +1917,16 @@ msgid "Money laundering"
msgstr "Gesetzgebung gegen Geldwäsche"
#: template/principles.html.j2:85
+#, fuzzy
+#| msgid ""
+#| "As a payment system must still be legal to operate and use, it must "
+#| "comply with these requirements. Furthermore, we consider levying of taxes "
+#| "as beneficial to society."
msgid ""
-"As a payment system must still be legal to operate and use, it must comply "
-"with these requirements. Furthermore, we consider levying of taxes as "
-"beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with "
+"regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
"GNU Taler muss die gültigen Gesetze gegen Geldwäsche und "
"Terrorismusfinanzierung einhalten. Taler macht es jedoch auch leichter, "
@@ -1844,8 +1937,8 @@ msgstr ""
"bereitstellen, andererseits bei einem Verdacht auf Geldwäsche oder unlautere "
"Geschäfte auch die Mikrotransaktionen der einzelnen Kaufverträge gegenüber "
"legitimierten Aufsichtsbehörden offenbaren. Taler verrechnet bei jedem "
-"Verkaufsvorgang die kaufvertraglich vereinbarten Verfügungsgeschäfte ("
-"Lieferung gegen Geldbetrag) zu einem eindeutigen Hash-Wert. Dieser Hash "
+"Verkaufsvorgang die kaufvertraglich vereinbarten Verfügungsgeschäfte "
+"(Lieferung gegen Geldbetrag) zu einem eindeutigen Hash-Wert. Dieser Hash "
"verewigt sich in den Überweisungsdaten des Verkäufers und kann als Nachweis "
"der Verfügungsgeschäfte beweiskräftig herangezogen werden. Was für den "
"ehrlichen Kaufmann ein Beweismittel seiner Geschäftsabschlüsse ist, stellt "
@@ -1854,15 +1947,15 @@ msgstr ""
"Verfügungsgeschäfte nicht nur leicht aufgedeckt, sondern auch vor Gericht "
"gegen sie verwendet werden können."
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr "4. Zahlungsbetrug systematisch unterbinden"
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr "Phishing-Angriff"
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on the "
"general design, as payment fraud can also happen through misleading user "
@@ -1879,17 +1972,17 @@ msgstr ""
"auf die Kunden durch Fingerprinting. Auch dies haben die Entwickler von "
"Taler immer im Blick."
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr "5. Nur das Minimum an notwendigen Daten erheben"
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation "
"(GDPR) compliant"
msgstr "Privacy by design, privacy by default - Taler erfüllt die DSGVO"
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from it, "
@@ -1908,15 +2001,15 @@ msgstr ""
"Verkäufer erfolgen direkt vom Treuhandkonto auf das Geschäftsbankenkonto des "
"Verkäufers. Mehr Daten braucht das Bezahlsystem nicht."
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr "6. Nutzen und Benutzerfreundlichkeit maximieren"
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr "Mit einem Klick bezahlen"
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1931,15 +2024,15 @@ msgstr ""
"Datenverarbeitungsprozesse einkapseln und in einer modularen, isolierten und "
"überschaubaren API kryptografisch absichern."
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr "7. Effizienz steigern und Kosten mindern"
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr "Energieeffizienz ist ein entscheidendes Argument"
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
@@ -1952,15 +2045,15 @@ msgstr ""
"gering, dass Micropayments überhaupt erst möglich werden. Diesen standen "
"bisher ihre hohen Betriebskosten pro Zahlung entgegen."
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr "8. Hohe Ausfallsicherheit und Fehlertoleranz gewährleisten"
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr "Rettungsring für den Notfall"
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests in "
@@ -1980,24 +2073,32 @@ msgstr ""
"legitimierten Sicherheitsexperten ermöglicht, Fehler und Ausfälle zeitnah zu "
"erkennen."
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr "9. Gesunden Wettbewerb antreiben"
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr "Ein Markt ohne Monopolsituation und Kartellmacht"
# I don't really understand the meaning of " to join the systems".
# For now I've translated this sentence as if its meaning was "to connect to
the existing payment systems"
-#: template/principles.html.j2:166
-msgid ""
-"It must be relatively easy for competitors to join the systems. While the "
-"barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into smaller "
-"components that can be operated, developed and improved upon independently, "
-"instead of having one completely monolithic system."
+#: template/principles.html.j2:167
+#, fuzzy
+#| msgid ""
+#| "It must be relatively easy for competitors to join the systems. While the "
+#| "barriers for this in traditional financial systems are rather high, the "
+#| "technical burden for new competitors to join must be minimized. Another "
+#| "design choice that supports this is to split the whole system into "
+#| "smaller components that can be operated, developed and improved upon "
+#| "independently, instead of having one completely monolithic system."
+msgid ""
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial systems "
+"are rather high, the technical burden for new competitors to join must be "
+"minimized. A design choice that supports this is to split the whole system "
+"into smaller components that can be operated, developed and improved upon "
+"independently, instead of having one completely monolithic system."
msgstr ""
"Für unser Geldwesen ist es besonders wichtig, dass keine Monopole oder "
"Kartelle über die Verfügbarkeit und Zugänglichkeit von Zahlungsdiensten "
@@ -2044,8 +2145,7 @@ msgstr ""
msgid "demonstration"
msgstr "Demo"
-#: template/wallet.html.j2:145,
-#: template/wallet.html.j2:155
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
msgid "or"
msgstr "oder"
@@ -2104,52 +2204,3 @@ msgstr "Andere Browser"
#: template/wallet.html.j2:263
msgid "Wallets for other browsers will be provided in the near future."
msgstr "Wallets für andere Browser werden zukünftig bereitgestellt."
-
-#: template/faq.html.j2:176
-msgid ""
-"Today, our wallet implementation does not support recurring payments. "
-"Recurring payments, where some fixed amount is paid on a regular basis are "
-"in theory possible with Taler, but they come with a few caveats. "
-"Specifically, recurring payments can only work if the Taler wallet is "
-"running and online around the desired time. Furthermore, given their "
-"repetitive nature they are linkable, and could thus be used to deanonymize "
-"the user making the recurring payment, for example by forcing the user "
-"offline at the time of the payment and observing that it does then not "
-"happen on time. Finally, the Taler wallet does not work with credit and thus "
-"the user would have to make sure to carry a sufficient balance for the "
-"recurring payment to be made. Still, they can be useful, and a future "
-"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
-msgstr ""
-"Taler-Wallets bieten gegenwärtig noch nicht die Funktionalität für "
-"Daueraufträge. Wiederkehrende Zahlungen mit einem fixen Zahlbetrag und "
-"vorgegebenen Ausführungsterminen sind theoretisch mit Taler möglich, "
-"verlangen jedoch einige Vorsichtsmaßnahmen und bringen auch Nachteile mit "
-"sich. Daueraufträge erfordern zwingend den Online-Status des Wallet zum "
-"gewünschten Ausführungstermin. Durch häufige wiederkehrende Zahlungen kann "
-"es zudem zu einem Rückschluss auf den Zahlenden kommen, wodurch dessen "
-"Anonymität aufgehoben wird. In der Praxis könnte dies dadurch geschehen, "
-"dass das Wallet des Zahlenden zum Zeitpunkt des angesetzten "
-"Ausführungstermins absichtlich am Internetzugang gehindert wird und durch "
-"das Ausbleiben des Zahlungseingangs beim Empfänger auf den Zahlenden "
-"geschlossen werden kann. Schließlich besteht noch das Erfordernis einer "
-"ausreichenden Deckung mit Coins im Wallet, damit die wiederkehrende Zahlung "
-"garantiert ausgeführt wird. Zwar hätte die Dauerauftragsfunktion Vorteile "
-"für die Nutzer, doch wird erst eine zukünftige Version von Taler diese "
-"bereitstellen und nicht die Erstversion."
-
-#: template/features.html.j2:32
-msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
-"into <em>electronic money</em> with the help of an Exchange service, that "
-"is, a payment service provider for Taler."
-msgstr ""
-"Zahlungen erfolgen mit <span class=\"tlr\">Coins als elektronischen "
-"Repräsentanten </span> der ursprünglichen Geldwerte in Währungen wie dem "
-"Euro. Der Exchange als Dreh- und Angelpunkt <span class=\"tlr\">verwaltet "
-"zwei parallele Zahlungsströme: </span> Zum einen die Buchungen auf dem "
-"Treuhandkonto (von gewöhnlichen Kundenkonten an den Exchange zur Umwandlung "
-"in Coins der Taler-Wallets und bei deren Ausgabe nach einem "
-"Kaufvertragsschluss an die Bankkonten der Verkäufer), zum anderen die "
-"Zahlungsströme zwischen dem Exchange und den Wallets (bei allen Aufwertungen "
-"und Ausgaben von Coins)."
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 82c5a90..78b8e67 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-04-15 23:32+0200\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@@ -223,7 +223,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, python-format
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:50
@@ -231,9 +234,11 @@ msgid "Merchant API Tutorial"
msgstr ""
#: template/docs.html.j2:52
+#, python-format
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:62
@@ -241,7 +246,10 @@ msgid "Exchange"
msgstr ""
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, python-format
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:74
@@ -249,9 +257,11 @@ msgid "Bank Integration"
msgstr ""
#: template/docs.html.j2:76
+#, python-format
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
msgstr ""
#: template/docs.html.j2:92
@@ -270,7 +280,10 @@ msgid "Back office"
msgstr ""
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, python-format
+msgid ""
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:116
@@ -278,8 +291,10 @@ msgid "Merchant POS Terminal"
msgstr ""
#: template/docs.html.j2:118
+#, python-format
msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:128
@@ -1448,37 +1463,38 @@ msgstr ""
#: template/principles.html.j2:85
msgid ""
-"As a payment system must still be legal to operate and use, it must comply "
-"with these requirements. Furthermore, we consider levying of taxes as "
-"beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with "
+"regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr ""
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr ""
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on the "
"general design, as payment fraud can also happen through misleading user "
"interface design or the lack of cryptographic evidence for certain processes."
msgstr ""
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr ""
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation "
"(GDPR) compliant"
msgstr ""
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from it, "
@@ -1486,15 +1502,15 @@ msgid ""
"competitors."
msgstr ""
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr ""
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr ""
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1502,29 +1518,29 @@ msgid ""
"operations into an isolated component with a simple API."
msgstr ""
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr ""
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr ""
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
msgstr ""
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr ""
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr ""
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests in "
@@ -1532,22 +1548,22 @@ msgid ""
"auditing procedures."
msgstr ""
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr ""
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr ""
-#: template/principles.html.j2:166
+#: template/principles.html.j2:167
msgid ""
-"It must be relatively easy for competitors to join the systems. While the "
-"barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into smaller "
-"components that can be operated, developed and improved upon independently, "
-"instead of having one completely monolithic system."
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial systems "
+"are rather high, the technical burden for new competitors to join must be "
+"minimized. A design choice that supports this is to split the whole system "
+"into smaller components that can be operated, developed and improved upon "
+"independently, instead of having one completely monolithic system."
msgstr ""
#: template/schemafuzz.html.j2:6
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 7a00964..14af83d 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-04-15 23:32+0200\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -224,7 +224,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, python-format
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:50
@@ -232,9 +235,11 @@ msgid "Merchant API Tutorial"
msgstr ""
#: template/docs.html.j2:52
+#, python-format
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:62
@@ -242,7 +247,10 @@ msgid "Exchange"
msgstr ""
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, python-format
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:74
@@ -250,9 +258,11 @@ msgid "Bank Integration"
msgstr ""
#: template/docs.html.j2:76
+#, python-format
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
msgstr ""
#: template/docs.html.j2:92
@@ -271,7 +281,10 @@ msgid "Back office"
msgstr ""
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, python-format
+msgid ""
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:116
@@ -279,8 +292,10 @@ msgid "Merchant POS Terminal"
msgstr ""
#: template/docs.html.j2:118
+#, python-format
msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:128
@@ -1449,37 +1464,38 @@ msgstr ""
#: template/principles.html.j2:85
msgid ""
-"As a payment system must still be legal to operate and use, it must comply "
-"with these requirements. Furthermore, we consider levying of taxes as "
-"beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with "
+"regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr ""
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr ""
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on the "
"general design, as payment fraud can also happen through misleading user "
"interface design or the lack of cryptographic evidence for certain processes."
msgstr ""
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr ""
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation "
"(GDPR) compliant"
msgstr ""
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from it, "
@@ -1487,15 +1503,15 @@ msgid ""
"competitors."
msgstr ""
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr ""
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr ""
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1503,29 +1519,29 @@ msgid ""
"operations into an isolated component with a simple API."
msgstr ""
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr ""
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr ""
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
msgstr ""
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr ""
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr ""
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests in "
@@ -1533,22 +1549,22 @@ msgid ""
"auditing procedures."
msgstr ""
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr ""
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr ""
-#: template/principles.html.j2:166
+#: template/principles.html.j2:167
msgid ""
-"It must be relatively easy for competitors to join the systems. While the "
-"barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into smaller "
-"components that can be operated, developed and improved upon independently, "
-"instead of having one completely monolithic system."
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial systems "
+"are rather high, the technical burden for new competitors to join must be "
+"minimized. A design choice that supports this is to split the whole system "
+"into smaller components that can be operated, developed and improved upon "
+"independently, instead of having one completely monolithic system."
msgstr ""
#: template/schemafuzz.html.j2:6
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 881938a..3ffcff0 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,12 +1,12 @@
msgid ""
msgstr ""
"Project-Id-Version: French (Taler Website)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-13 07:25+0000\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French <http://weblate.taler.net/projects/taler-website/";
-"main-site/fr/>\n"
+"Language-Team: French <http://weblate.taler.net/projects/taler-website/main-";
+"site/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +14,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: Weblate 4.0.3\n"
-#: common/base.j2:5,
-#: common/news.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr "GNU Taler"
-#: common/base.j2:6,
-#: common/news.j2:6
+#: common/base.j2:6 common/news.j2:6
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Taxable Anonymous Libre Electronic Reserves"
@@ -36,15 +34,14 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliographie"
-#: common/footer.j2.inc:28,
-#: template/bibliography.html.j2:34
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
msgid "and"
msgstr "et"
#: common/footer.j2.inc:31
msgid ""
-"We are grateful for support and free hosting of this site by <a "
-"href='http://www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a href='http://";
+"www.bfh.ch/'>BFH</a>"
msgstr ""
"Nous remercions <a href='http://www.bfh.ch/'>BFH</a> pour le support et pour "
"l'hébergement gratuit de ce site"
@@ -54,8 +51,8 @@ msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
msgstr ""
-"Cette page a été créée exclusivement avec des <a href='https://www.gnu.org/'>"
-"logiciels libres</a>."
+"Cette page a été créée exclusivement avec des <a href='https://www.gnu.";
+"org/'>logiciels libres</a>."
#: common/navigation.j2.inc:21
msgid "Features"
@@ -69,8 +66,7 @@ msgstr "Principes"
msgid "Docs"
msgstr "Docs"
-#: common/navigation.j2.inc:24,
-#: news/index.html.j2:9
+#: common/navigation.j2.inc:24 news/index.html.j2:9
msgid "News"
msgstr "Actualité"
@@ -100,8 +96,7 @@ msgid ""
"out electronic cash."
msgstr ""
-#: template/cashier.html.j2:21,
-#: template/investors.html.j2:90
+#: template/cashier.html.j2:21 template/investors.html.j2:90
msgid "Download"
msgstr "Télécharger"
@@ -145,8 +140,8 @@ msgstr "Discussion"
#: template/contact.html.j2:42
msgid ""
-"You can find some team members in the IRC channel <tt>#taler</tt> on "
-"<tt>irc.freenode.net</tt>."
+"You can find some team members in the IRC channel <tt>#taler</tt> on <tt>irc."
+"freenode.net</tt>."
msgstr ""
"Vous pouvez retrouver certains membres de l'équipe dans le salon IRC "
"<tt>#taler</tt> sur <tt>irc.freenode.net</tt>."
@@ -181,8 +176,8 @@ msgstr "Demandes générales"
#: template/contact.html.j2:67
msgid ""
-"You can reach a group of team members handling general inquiries at <tt>"
-"contact AT taler.net</tt>."
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
msgstr ""
"Vous pouvez joindre des membres de l'équipe qui s’occupent des questions "
"générales à l'adresse <tt>contact AT taler.net</tt>."
@@ -193,8 +188,8 @@ msgstr "Équipe dirigeante"
#: template/contact.html.j2:77
msgid ""
-"For non-technical commercial requests, please contact <tt>ceo AT "
-"taler.net</tt>."
+"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
+"tt>."
msgstr ""
"Pour toute requête commerciale et non technique, merci de contacter <tt>ceo "
"AT taler.net</tt>."
@@ -206,9 +201,9 @@ msgstr ""
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href=\""
-"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex\";>"
-"GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
@@ -236,8 +231,8 @@ msgstr "GNU Taler : Documentation et ressources"
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
-"full documentation contents can be found <a href=\"https://docs.taler.net/\"";
-">here</a>."
+"full documentation contents can be found <a href=\"https://docs.taler.net/";
+"\">here</a>."
msgstr ""
"Ceci est un aperçu de la documentation et autres ressources concernant GNU "
"Taler. La documentation complète se trouve <a href=\"https://docs.taler.net/";
@@ -252,7 +247,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, python-format
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:50
@@ -260,9 +258,11 @@ msgid "Merchant API Tutorial"
msgstr ""
#: template/docs.html.j2:52
+#, python-format
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:62
@@ -270,7 +270,10 @@ msgid "Exchange"
msgstr ""
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, python-format
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:74
@@ -278,9 +281,11 @@ msgid "Bank Integration"
msgstr ""
#: template/docs.html.j2:76
+#, python-format
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
msgstr ""
#: template/docs.html.j2:92
@@ -299,7 +304,10 @@ msgid "Back office"
msgstr ""
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, python-format
+msgid ""
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:116
@@ -307,8 +315,10 @@ msgid "Merchant POS Terminal"
msgstr ""
#: template/docs.html.j2:118
+#, python-format
msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:128
@@ -345,12 +355,16 @@ msgid "Community"
msgstr ""
#: template/docs.html.j2:188
+#, fuzzy
+#| msgid "The mailing list"
msgid "Mailing List"
-msgstr ""
+msgstr "La liste de diffusion"
#: template/docs.html.j2:190
+#, fuzzy
+#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
-msgstr ""
+msgstr "La liste de diffusion"
#: template/docs.html.j2:196
msgid "IRC"
@@ -389,8 +403,10 @@ msgid "Shows results of the code coverage analysis for our
test suite."
msgstr ""
#: template/docs.html.j2:244
+#, fuzzy
+#| msgid "Contact information"
msgid "Continuous integration"
-msgstr ""
+msgstr "Coordonnées"
#: template/docs.html.j2:246
msgid "Continuous integration and deployment is managed by our Buildbot."
@@ -513,7 +529,8 @@ msgstr ""
#: template/faq.html.j2:84
msgid "Taler currently does not offer conversion between currencies."
-msgstr "Actuellement Taler ne permet pas de convertir d'une devise à une
autre."
+msgstr ""
+"Actuellement Taler ne permet pas de convertir d'une devise à une autre."
#: template/faq.html.j2:89
msgid "How does Taler protect my privacy?"
@@ -526,11 +543,11 @@ msgid ""
"signature protects your privacy as it prevents the exchange from knowing "
"which coin it signed for which customer."
msgstr ""
-"Votre porte-monnaie stocke des pièces numériques qui sont <a href=\""
-"https://fr.wikipedia.org/wiki/Signature_aveugle\";>signées en aveugle</a> par "
-"un bureau de change. L'usage de la signature aveugle protège votre vie "
-"privée puisqu'elle empêche le bureau de change de savoir quelle pièce il a "
-"signée pour quel acheteur."
+"Votre porte-monnaie stocke des pièces numériques qui sont <a href=\"https://";
+"fr.wikipedia.org/wiki/Signature_aveugle\">signées en aveugle</a> par un "
+"bureau de change. L'usage de la signature aveugle protège votre vie privée "
+"puisqu'elle empêche le bureau de change de savoir quelle pièce il a signée "
+"pour quel acheteur."
#: template/faq.html.j2:101
msgid "How much does it cost?"
@@ -658,16 +675,16 @@ msgid ""
"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
-"be premature given the state of the project (see also <a href=\""
-"https://gnunet.org/bugs/\";>our bugtracker</a> for a list of open issues)."
+"be premature given the state of the project (see also <a href=\"https://";
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
"Nous sommes au courant de plusieurs entreprises ayant démarré des projets "
"expérimentaux ou ayant développé des prototypes fonctionnels. Nous sommes "
"également en discussion avec plusieurs banques traditionnelles ainsi que "
"plusieurs banques centrales à propos du projet. Cela dit, il n'y a "
"actuellement aucun produit sur le marché, et nous pensons que ce serait "
-"prématuré étant donné l'état d'avancement du projet (voir aussi <a href=\""
-"https://gnunet.org/bugs/\";>notre gestionnaire de suivi des bogues</a> pour "
+"prématuré étant donné l'état d'avancement du projet (voir aussi <a href="
+"\"https://gnunet.org/bugs/\";>notre gestionnaire de suivi des bogues</a> pour "
"une liste des tickets en cours)."
#: template/faq.html.j2:174
@@ -731,9 +748,9 @@ msgid ""
"always backed by an existing currency."
msgstr ""
"Le principal cas d'usage de GNU Taler sont <span class=\"tlr\">les "
-"paiements</span> ; ce n'est <span class=\"tlr\">pas un moyen pour "
-"stocker</span> de la valeur. Les paiements s'appuient toujours sur une "
-"monnaie existante."
+"paiements</span> ; ce n'est <span class=\"tlr\">pas un moyen pour stocker</"
+"span> de la valeur. Les paiements s'appuient toujours sur une monnaie "
+"existante."
#: template/features.html.j2:32
msgid ""
@@ -748,13 +765,12 @@ msgstr ""
#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
-"accept payments <span class=\"tlr\">without making their customers "
-"register</span> on the merchant's Website."
+"accept payments <span class=\"tlr\">without making their customers register</"
+"span> on the merchant's Website."
msgstr ""
"Au moment de payer, les acheteurs ont seulement besoin d'avoir un porte-"
-"monnaie alimenté. Un commerçant peut accepter les paiements <span class=\""
-"tlr\">sans obliger ses clients à enregistrer un compte</span> sur leur site "
-"Web."
+"monnaie alimenté. Un commerçant peut accepter les paiements <span class=\"tlr"
+"\">sans obliger ses clients à enregistrer un compte</span> sur leur site Web."
# J'ai traduit "chargeback fraud" par "fraude par rétro-facturation" mais
clairement je ne sais pas de quoi il s'agit. Il y a donc probablement une
meilleure traduction possible.
#: template/features.html.j2:50
@@ -764,10 +780,10 @@ msgid ""
"loss or theft, only the limited amount of money left in the wallet might be "
"gone."
msgstr ""
-"GNU Taler est <span class=\"tlr\">à l'abri de nombreux types de "
-"fraudes</span>, comme l'extorsion d'informations de carte de crédit ou la "
-"fraude par rétro-facturation. En cas de perte ou de vol, seul le montant "
-"présent dans le porte-monnaie peut être perdu."
+"GNU Taler est <span class=\"tlr\">à l'abri de nombreux types de fraudes</"
+"span>, comme l'extorsion d'informations de carte de crédit ou la fraude par "
+"rétro-facturation. En cas de perte ou de vol, seul le montant présent dans "
+"le porte-monnaie peut être perdu."
#: template/features.html.j2:69
msgid "Paying with Taler"
@@ -866,8 +882,7 @@ msgstr ""
"cryptographiques de Taler correspondent à des devises existantes, comme le "
"Dollar, l'Euro ou même les Bitcoins."
-#: template/features.html.j2:154,
-#: template/governments.html.j2:55,
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr "Sécurisé"
@@ -883,8 +898,7 @@ msgstr ""
"de sécurité, Taler ne rejette jamais un acheteur légitime à cause d'une "
"détection de fraude erronée."
-#: template/features.html.j2:169,
-#: template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr "Imposable"
@@ -914,8 +928,7 @@ msgstr ""
"comment vous dépensez votre monnaie électronique. Néanmoins vous obtenez une "
"preuve de paiement ayant une valeur légale."
-#: template/features.html.j2:195,
-#: template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr "Libre"
@@ -1205,8 +1218,7 @@ msgstr ""
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:114,
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
msgid "Link"
msgstr ""
@@ -1283,11 +1295,12 @@ msgstr ""
#: template/index.html.j2:25
msgid ""
-"We provide a payment system that makes <span class='tlr'>privacy-"
-"friendly</span> online transactions <span class='tlr'>fast and easy</span>."
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
msgstr ""
-"Nous proposons un système de paiement qui rend les transactions en ligne <"
-"span class='tlr'>privées</span>, <span class='tlr'>rapides et faciles</span>."
+"Nous proposons un système de paiement qui rend les transactions en ligne "
+"<span class='tlr'>privées</span>, <span class='tlr'>rapides et faciles</"
+"span>."
#: template/index.html.j2:29
msgid "Payments without registration"
@@ -1355,8 +1368,8 @@ msgstr ""
#: template/investors.html.j2:50
msgid ""
-"All transactions in Taler are secured using <a href=\"bibliography.html\">"
-"modern cryptography</a> and trust in all parties is minimized. Financial "
+"All transactions in Taler are secured using <a href=\"bibliography.html"
+"\">modern cryptography</a> and trust in all parties is minimized. Financial "
"damage is bounded (for customers, merchants and the exchange) even "
"in the case that systems are compromised and private keys are stolen. "
"Databases can be audited for consistency, resulting in either the detection "
@@ -1371,8 +1384,8 @@ msgstr ""
#: template/investors.html.j2:65
msgid ""
"The scalable business model for Taler is the operation of the payment "
-"service provider, which converts money from traditional payment systems ("
-"MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
+"service provider, which converts money from traditional payment systems "
+"(MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
"electronic coins in the same currency. The customer can then redeem the "
"electronic coins at a merchant, who can exchange them for money represented "
"using traditional payment systems at the exchange. The exchange charges fees "
@@ -1416,8 +1429,8 @@ msgstr ""
#: template/investors.html.j2:132
msgid ""
-"Protocol allows the exchange to charge fees for any expensive operation ("
-"withdraw, deposit, refresh, refund or aggregated wire transfers)."
+"Protocol allows the exchange to charge fees for any expensive operation "
+"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
msgstr ""
#: template/investors.html.j2:133
@@ -1606,14 +1619,14 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html\";>"
-"Free Software</a>. For merchants, our Free Software reference implementation "
-"prevents vendor lock-in. As the software of the payment provider itself is "
-"free, countries can deploy the payment system without compromising "
-"sovereignty."
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Free Software</a>. For merchants, our Free Software reference "
+"implementation prevents vendor lock-in. As the software of the payment "
+"provider itself is free, countries can deploy the payment system without "
+"compromising sovereignty."
msgstr ""
-"GNU Taler doit être un <a href=\"https://www.gnu.org/philosophy/free-sw.";
-"html\">Logiciel libre</a>. Pour les commerçants, notre implémentation de "
+"GNU Taler doit être un <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Logiciel libre</a>. Pour les commerçants, notre implémentation de "
"référence en logiciel libre évite l'emprisonnement commercial. Étant donné "
"que le logiciel du prestataire de paiement lui-même est un logiciel libre, "
"les états peuvent déployer le système de paiement sans compromettre leur "
@@ -1681,24 +1694,30 @@ msgid "Money laundering"
msgstr "Blanchiment d'argent"
#: template/principles.html.j2:85
+#, fuzzy
+#| msgid ""
+#| "As a payment system must still be legal to operate and use, it must "
+#| "comply with these requirements. Furthermore, we consider levying of taxes "
+#| "as beneficial to society."
msgid ""
-"As a payment system must still be legal to operate and use, it must comply "
-"with these requirements. Furthermore, we consider levying of taxes as "
-"beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with "
+"regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
"Un système de paiement doit d'être légal pour pouvoir fonctionner et être "
"utilisé, il doit donc respecter ces exigences. De plus, nous estimons que la "
"collecte d'impôts est bénéfique pour la société."
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr "4. Empêcher la fraude sur les paiements"
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr "Attaque par hameçonnage"
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on the "
"general design, as payment fraud can also happen through misleading user "
@@ -1709,11 +1728,11 @@ msgstr ""
"utilisateur trompeuse ou le manque de preuve cryptographique de certains "
"procédés."
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr "5. Ne divulguer que la quantité strictement nécessaire d'information"
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation "
"(GDPR) compliant"
@@ -1721,7 +1740,7 @@ msgstr ""
"Protection des données dès la conception, par défaut, conforme au Règlement "
"Général de Protection des Données (RGPD)"
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from it, "
@@ -1733,15 +1752,15 @@ msgstr ""
"profitent également, par exemple en empêchant les concurrents d'accéder à "
"leurs données financières."
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr "6. Être convivial"
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr "Acheter en un clic"
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1754,15 +1773,15 @@ msgstr ""
"procédures nécessitant des opérations cryptographiques dans un composant "
"isolé avec une API simple."
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr "7. Être efficace"
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr "Efficacité énergétique"
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
@@ -1771,15 +1790,15 @@ msgstr ""
"exigence. L'efficacité est nécessaire pour que GNU Taler soit utilisé pour "
"les micro-paiements."
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr "8. Une conception tolérante aux pannes"
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr "Bouées de sauvetage"
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests in "
@@ -1791,24 +1810,32 @@ msgstr ""
"données secrètes. Cela se traduit dans les choix architecturaux tels que "
"l'isolation de certains composants et des procédures d'audit."
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr "9. Stimuler la compétition"
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr "Un marché compétitif"
# I don't really understand the meaning of " to join the systems".
# For now I've translated this sentence as if its meaning was "to connect to
the existing payment systems"
-#: template/principles.html.j2:166
-msgid ""
-"It must be relatively easy for competitors to join the systems. While the "
-"barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into smaller "
-"components that can be operated, developed and improved upon independently, "
-"instead of having one completely monolithic system."
+#: template/principles.html.j2:167
+#, fuzzy
+#| msgid ""
+#| "It must be relatively easy for competitors to join the systems. While the "
+#| "barriers for this in traditional financial systems are rather high, the "
+#| "technical burden for new competitors to join must be minimized. Another "
+#| "design choice that supports this is to split the whole system into "
+#| "smaller components that can be operated, developed and improved upon "
+#| "independently, instead of having one completely monolithic system."
+msgid ""
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial systems "
+"are rather high, the technical burden for new competitors to join must be "
+"minimized. A design choice that supports this is to split the whole system "
+"into smaller components that can be operated, developed and improved upon "
+"independently, instead of having one completely monolithic system."
msgstr ""
"Il faut qu'il soit relativement facile pour des concurrents de se connecter "
"aux systèmes en place. Alors que les barrières pour ce genre de systèmes "
@@ -1842,8 +1869,7 @@ msgstr ""
msgid "demonstration"
msgstr ""
-#: template/wallet.html.j2:145,
-#: template/wallet.html.j2:155
+#: template/wallet.html.j2:145 template/wallet.html.j2:155
msgid "or"
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 1e8d843..0113afe 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-04-15 23:32+0200\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <LL@li.org>\n"
@@ -223,7 +223,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, python-format
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:50
@@ -231,9 +234,11 @@ msgid "Merchant API Tutorial"
msgstr ""
#: template/docs.html.j2:52
+#, python-format
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:62
@@ -241,7 +246,10 @@ msgid "Exchange"
msgstr ""
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, python-format
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:74
@@ -249,9 +257,11 @@ msgid "Bank Integration"
msgstr ""
#: template/docs.html.j2:76
+#, python-format
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
msgstr ""
#: template/docs.html.j2:92
@@ -270,7 +280,10 @@ msgid "Back office"
msgstr ""
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, python-format
+msgid ""
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:116
@@ -278,8 +291,10 @@ msgid "Merchant POS Terminal"
msgstr ""
#: template/docs.html.j2:118
+#, python-format
msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:128
@@ -1448,37 +1463,38 @@ msgstr ""
#: template/principles.html.j2:85
msgid ""
-"As a payment system must still be legal to operate and use, it must comply "
-"with these requirements. Furthermore, we consider levying of taxes as "
-"beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with "
+"regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr ""
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr ""
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on the "
"general design, as payment fraud can also happen through misleading user "
"interface design or the lack of cryptographic evidence for certain processes."
msgstr ""
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr ""
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation "
"(GDPR) compliant"
msgstr ""
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from it, "
@@ -1486,15 +1502,15 @@ msgid ""
"competitors."
msgstr ""
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr ""
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr ""
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1502,29 +1518,29 @@ msgid ""
"operations into an isolated component with a simple API."
msgstr ""
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr ""
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr ""
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
msgstr ""
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr ""
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr ""
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests in "
@@ -1532,22 +1548,22 @@ msgid ""
"auditing procedures."
msgstr ""
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr ""
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr ""
-#: template/principles.html.j2:166
+#: template/principles.html.j2:167
msgid ""
-"It must be relatively easy for competitors to join the systems. While the "
-"barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into smaller "
-"components that can be operated, developed and improved upon independently, "
-"instead of having one completely monolithic system."
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial systems "
+"are rather high, the technical burden for new competitors to join must be "
+"minimized. A design choice that supports this is to split the whole system "
+"into smaller components that can be operated, developed and improved upon "
+"independently, instead of having one completely monolithic system."
msgstr ""
#: template/schemafuzz.html.j2:6
diff --git a/locale/messages.pot b/locale/messages.pot
index f891397..90adebb 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: 2020-04-15 23:44+0200\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -228,7 +228,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, python-format
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:50
@@ -236,9 +239,11 @@ msgid "Merchant API Tutorial"
msgstr ""
#: template/docs.html.j2:52
+#, python-format
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. "
-"Also available as"
+"Also available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-"
+"tutorial.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:62
@@ -246,7 +251,10 @@ msgid "Exchange"
msgstr ""
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, python-format
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:74
@@ -254,9 +262,11 @@ msgid "Bank Integration"
msgstr ""
#: template/docs.html.j2:76
+#, python-format
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-"
+"manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:92
@@ -275,7 +285,10 @@ msgid "Back office"
msgstr ""
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, python-format
+msgid ""
+"Manual to run the back-office Web application. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:116
@@ -283,7 +296,11 @@ msgid "Merchant POS Terminal"
msgstr ""
#: template/docs.html.j2:118
-msgid "Manual for configuring and using the point of sale app. Also available
as"
+#, python-format
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
+" <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-"
+"terminal.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:128
@@ -1466,20 +1483,21 @@ msgstr ""
#: template/principles.html.j2:85
msgid ""
-"As a payment system must still be legal to operate and use, it must "
-"comply with these requirements. Furthermore, we consider levying of taxes"
-" as beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with"
+" regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr ""
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr ""
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on "
"the general design, as payment fraud can also happen through misleading "
@@ -1487,17 +1505,17 @@ msgid ""
"processes."
msgstr ""
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr ""
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation"
" (GDPR) compliant"
msgstr ""
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from "
@@ -1505,15 +1523,15 @@ msgid ""
"hidden from competitors."
msgstr ""
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr ""
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr ""
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1521,29 +1539,29 @@ msgid ""
" operations into an isolated component with a simple API."
msgstr ""
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr ""
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr ""
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
msgstr ""
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr ""
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr ""
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests "
@@ -1551,22 +1569,23 @@ msgid ""
" auditing procedures."
msgstr ""
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr ""
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr ""
-#: template/principles.html.j2:166
+#: template/principles.html.j2:167
msgid ""
-"It must be relatively easy for competitors to join the systems. While the"
-" barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into "
-"smaller components that can be operated, developed and improved upon "
-"independently, instead of having one completely monolithic system."
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial "
+"systems are rather high, the technical burden for new competitors to join"
+" must be minimized. A design choice that supports this is to split the "
+"whole system into smaller components that can be operated, developed and "
+"improved upon independently, instead of having one completely monolithic "
+"system."
msgstr ""
#: template/schemafuzz.html.j2:6
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index f43cd9e..551c7f5 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-04-15 23:32+0200\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -228,7 +228,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, python-format
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:50
@@ -236,9 +239,11 @@ msgid "Merchant API Tutorial"
msgstr ""
#: template/docs.html.j2:52
+#, python-format
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:62
@@ -246,7 +251,10 @@ msgid "Exchange"
msgstr ""
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, python-format
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:74
@@ -254,9 +262,11 @@ msgid "Bank Integration"
msgstr ""
#: template/docs.html.j2:76
+#, python-format
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
msgstr ""
#: template/docs.html.j2:92
@@ -275,7 +285,10 @@ msgid "Back office"
msgstr ""
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, python-format
+msgid ""
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:116
@@ -283,8 +296,10 @@ msgid "Merchant POS Terminal"
msgstr ""
#: template/docs.html.j2:118
+#, python-format
msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:128
@@ -1453,37 +1468,38 @@ msgstr ""
#: template/principles.html.j2:85
msgid ""
-"As a payment system must still be legal to operate and use, it must comply "
-"with these requirements. Furthermore, we consider levying of taxes as "
-"beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with "
+"regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr ""
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr ""
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on the "
"general design, as payment fraud can also happen through misleading user "
"interface design or the lack of cryptographic evidence for certain processes."
msgstr ""
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr ""
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation "
"(GDPR) compliant"
msgstr ""
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from it, "
@@ -1491,15 +1507,15 @@ msgid ""
"competitors."
msgstr ""
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr ""
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr ""
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1507,29 +1523,29 @@ msgid ""
"operations into an isolated component with a simple API."
msgstr ""
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr ""
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr ""
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
msgstr ""
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr ""
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr ""
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests in "
@@ -1537,22 +1553,22 @@ msgid ""
"auditing procedures."
msgstr ""
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr ""
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr ""
-#: template/principles.html.j2:166
+#: template/principles.html.j2:167
msgid ""
-"It must be relatively easy for competitors to join the systems. While the "
-"barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into smaller "
-"components that can be operated, developed and improved upon independently, "
-"instead of having one completely monolithic system."
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial systems "
+"are rather high, the technical burden for new competitors to join must be "
+"minimized. A design choice that supports this is to split the whole system "
+"into smaller components that can be operated, developed and improved upon "
+"independently, instead of having one completely monolithic system."
msgstr ""
#: template/schemafuzz.html.j2:6
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index f1188ac..3ad909f 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/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: 2020-04-15 23:32+0200\n"
+"POT-Creation-Date: 2020-05-29 20:58+0200\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <LL@li.org>\n"
@@ -229,7 +229,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant. Also available as"
+#, python-format
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:50
@@ -237,9 +240,11 @@ msgid "Merchant API Tutorial"
msgstr ""
#: template/docs.html.j2:52
+#, python-format
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:62
@@ -247,7 +252,10 @@ msgid "Exchange"
msgstr ""
#: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+#, python-format
+msgid ""
+"Operator's manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:74
@@ -255,9 +263,11 @@ msgid "Bank Integration"
msgstr ""
#: template/docs.html.j2:76
+#, python-format
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as"
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
msgstr ""
#: template/docs.html.j2:92
@@ -276,7 +286,10 @@ msgid "Back office"
msgstr ""
#: template/docs.html.j2:106
-msgid "Manual to run the back-office Web application. Also available as"
+#, python-format
+msgid ""
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:116
@@ -284,8 +297,10 @@ msgid "Merchant POS Terminal"
msgstr ""
#: template/docs.html.j2:118
+#, python-format
msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:128
@@ -1454,37 +1469,38 @@ msgstr ""
#: template/principles.html.j2:85
msgid ""
-"As a payment system must still be legal to operate and use, it must comply "
-"with these requirements. Furthermore, we consider levying of taxes as "
-"beneficial to society."
+"As a payment system must be legal to operate and use, it must comply with "
+"regulatory requirements such as anti money laundering. Furthermore, we "
+"consider levying of taxes as beneficial to society, and fair taxation "
+"requires income transparency."
msgstr ""
-#: template/principles.html.j2:95
+#: template/principles.html.j2:96
msgid "4. Prevent payment fraud"
msgstr ""
-#: template/principles.html.j2:97
+#: template/principles.html.j2:98
msgid "Phishing attack"
msgstr ""
-#: template/principles.html.j2:99
+#: template/principles.html.j2:100
msgid ""
"This imposes requirements on the security of the system, as well as on the "
"general design, as payment fraud can also happen through misleading user "
"interface design or the lack of cryptographic evidence for certain processes."
msgstr ""
-#: template/principles.html.j2:109
+#: template/principles.html.j2:110
msgid "5. Only disclose the minimal amount of information necessary"
msgstr ""
-#: template/principles.html.j2:110
+#: template/principles.html.j2:111
msgid ""
"Privacy by design, privacy by default, General Data Protection Regulation "
"(GDPR) compliant"
msgstr ""
-#: template/principles.html.j2:112
+#: template/principles.html.j2:113
msgid ""
"The reason behind this goal is similar to (2). The privacy of buyers is "
"given priority, but other parties such as merchants still benefit from it, "
@@ -1492,15 +1508,15 @@ msgid ""
"competitors."
msgstr ""
-#: template/principles.html.j2:122
+#: template/principles.html.j2:123
msgid "6. Be usable"
msgstr ""
-#: template/principles.html.j2:123
+#: template/principles.html.j2:124
msgid "Buy with one click"
msgstr ""
-#: template/principles.html.j2:125
+#: template/principles.html.j2:126
msgid ""
"Specifically it must be usable for non-expert customers. Usability also "
"applies to the integration with merchants, and informs choices about the "
@@ -1508,29 +1524,29 @@ msgid ""
"operations into an isolated component with a simple API."
msgstr ""
-#: template/principles.html.j2:136
+#: template/principles.html.j2:137
msgid "7. Be efficient"
msgstr ""
-#: template/principles.html.j2:137
+#: template/principles.html.j2:138
msgid "Energy efficiency"
msgstr ""
-#: template/principles.html.j2:139
+#: template/principles.html.j2:140
msgid ""
"Approaches such as proof-of-work are ruled out by this requirement. "
"Efficiency is necessary for GNU Taler to be used for micropayments."
msgstr ""
-#: template/principles.html.j2:149
+#: template/principles.html.j2:150
msgid "8. Fault-tolerant design"
msgstr ""
-#: template/principles.html.j2:150
+#: template/principles.html.j2:151
msgid "Life Safers"
msgstr ""
-#: template/principles.html.j2:152
+#: template/principles.html.j2:153
msgid ""
"Taler should tolerate failure of individual components and systems, "
"including malicious operators compromising core secrets. This manifests in "
@@ -1538,22 +1554,22 @@ msgid ""
"auditing procedures."
msgstr ""
-#: template/principles.html.j2:163
+#: template/principles.html.j2:164
msgid "9. Foster competition"
msgstr ""
-#: template/principles.html.j2:164
+#: template/principles.html.j2:165
msgid "A competitive market"
msgstr ""
-#: template/principles.html.j2:166
+#: template/principles.html.j2:167
msgid ""
-"It must be relatively easy for competitors to join the systems. While the "
-"barriers for this in traditional financial systems are rather high, the "
-"technical burden for new competitors to join must be minimized. Another "
-"design choice that supports this is to split the whole system into smaller "
-"components that can be operated, developed and improved upon independently, "
-"instead of having one completely monolithic system."
+"It must be relatively easy for competitors to deploy interoperable "
+"alternatives. While the barriers for this in traditional financial systems "
+"are rather high, the technical burden for new competitors to join must be "
+"minimized. A design choice that supports this is to split the whole system "
+"into smaller components that can be operated, developed and improved upon "
+"independently, instead of having one completely monolithic system."
msgstr ""
#: template/schemafuzz.html.j2:6
diff --git a/template/principles.html.j2 b/template/principles.html.j2
index 02dea04..1a741f4 100644
--- a/template/principles.html.j2
+++ b/template/principles.html.j2
@@ -28,25 +28,29 @@
</p>
<div class="row">
<div class="col-lg-12">
- <h2>{{ _("1. Free Software implementation") }}</h2>
+ <h2>{{ _("1. Free/Libre Software") }}</h2>
<a href="https://www.gnu.org/graphics/freedom.html";>
<img style="width:20vw;float:right" src="{{
url_static('images/stallman.medium.png') }}" alt="{{ _("... in the area of
computing, freedom means not using proprietary software") }}">
</a>
<p>
{% trans %}
- GNU Taler must be <a
href="https://www.gnu.org/philosophy/free-sw.html";>Free Software</a>.
- For merchants, our Free Software
- reference implementation prevents vendor lock-in. As
- the software of the payment provider itself is free, countries can
- deploy the payment system without compromising sovereignty.
+ GNU Taler must be <a
href="https://www.gnu.org/philosophy/free-sw.html";>Free/Libre Software</a>.
+ For merchants, Free/Libre Software prevents vendor lock-in meaning
+ merchants can easily choose another service provider to process
+ their payments.
+ For countries, Free/Libre
+ software means GNU Taler can not compromise sovereignty by imposing
+ restrictions or requirements. And for exchange operators,
transparency is crucial to satisfy
+ <a
href="https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle";>Kerckhoff's
principle</a>
+ and to establish public confidence.
{% endtrans %}
</p>
<p>
{% trans %}
- Customers benefit from Free Software
- as the wallet software can be made to run on a variety of
platforms, and
- the absence of user-hostile features such as tracking or telemetry
can easily be
- assured.
+ Customers benefit from Free/Libre Software
+ because anyone is free to modify the wallet software support
additional platforms.
+ The source code must be available and make it easy to verify that
+ user-hostile features such as tracking or telemetry are absent.
{% endtrans %}
</p>
</div>
@@ -58,35 +62,37 @@
<img style="width:20vw;float:left;padding:15px" src="{{
url_static('images/anonymous.jpg') }}" alt="{{_("You deserve some privacy")}}">
<p>
{% trans %}
- Privacy should be guaranteed via technical measures, as opposed to
mere
- policies. Especially with micropayments for online publications, a
disproportionate
- amount of rather private data about buyers would be revealed, if
the
- payment system does not have privacy protections.
+ Privacy is most meaningful when it is guaranteed via technical
measures, as opposed to mere
+ policies. Without a technical layer providing privacy-by-default,
financial transactions
+ reveal unnecessary levels of personal or private data. This would
be especially true
+ when making micropayments for online publications. Thus, GNU
Taler must protect
+ the privacy of buyers to avoid facilitating totalitarian control
over the population.
{% endtrans %}
- </p>
- <p>
+
{% trans %}
- In legislations with data protection regulations (such as the
recently introduced GDPR in Europe),
- merchants benefit from this as well, as
- no data breach of customers can happen if this information is, by
design,
- not collected in the first place. Obviously some private data,
such as the
- shipping address for a physical delivery, must still be collected
according to
- business needs.
+ Limited private data, such as the shipping address for a physical
+ delivery, may need to be collected according to business needs
+ and protected according to local laws. In this case, GNU Taler
must enable deletion
+ of such data as soon as it is no longer required.
{% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>{{ _("3. Enable the state to tax income and crack down on illegal
business activities") }}</h2>
+ <h2>{{ _("3. Auditability - enable the state to tax income and crack
down on illegal business activities") }}</h2>
<!-- From https://www.pxhere.com/ -->
<img style="width:20vw;float:right;padding:15px" src="{{
url_static('images/money-laundering.medium.jpg') }}" alt="{{_("Money
laundering")}}">
<p>
{% trans %}
- As a payment system must be legal to operate and use, it must
comply
- with regulatory requirements such as anti money laundering.
- Furthermore, we consider levying of taxes as
- beneficial to society, and fair taxation requires income
transparency.
+ As a payment system must comply with local laws in order to operate
+ legally, GNU Taler must be designed to comply with these
+ requirements. GNU Taler must provide an audit trail for
investigators
+ operating under the law.
+
+ Furthermore, we consider levying of taxes as
+ beneficial to society, and fair taxation requires income
transparency.
+ Thus, GNU Taler must enable authorities to track income.
{% endtrans %}
</p>
</div>
@@ -98,22 +104,30 @@
<img style="width:20vw;float:left;padding:15px" src="{{
url_static('images/fraud.medium.jpg') }}" alt="{{_("Phishing attack")}}">
<p>
{% trans %}
- This imposes requirements on the security of the system, as well
as on the
- general design, as payment fraud can also happen through
misleading user
- interface design or the lack of cryptographic evidence for certain
processes.
+ GNU Taler must mitigate the most common sources of payment fraud.
+ We must follow best practices in software design, 3rd party
+ design guidelines that prevent confusion and misleading user
interfaces,
+ and must have others inspect our publicly available code.
+
+ Furthermore, GNU Taler must provide extensive cryptographic
evidence for
+ all key processes to enable all parties to precisely attribute bad
behavior.
{% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>{{ _("5. Only disclose the minimal amount of information
necessary") }}</h2>
+ <h2>{{ _("5. Collect the minimum information necessary") }}</h2>
<img style="width:20vw;float:right;padding:15px" src="{{
url_static('images/gdpr.medium.jpg') }}" alt="{{_("Privacy by design, privacy
by default, General Data Protection Regulation (GDPR) compliant")}}">
<p>
{% trans %}
- The reason behind this goal is similar to (2). The privacy of
buyers is given
- priority, but other parties such as merchants still benefit from
it, for example,
- by keeping details about the merchant’s financials hidden from
competitors.
+ The privacy of buyers is given particular priority as part of
+ principle (2). However, other parties - such as merchants - also
+ must have data protection.
+
+ Generally, GNU Taler must collect the minimum information
necessary:
+ data that is not collected or is no longer stored can not be
+ compromised.
{% endtrans %}
</p>
</div>
@@ -124,10 +138,16 @@
<img style="width:20vw;float:left;padding:15px" src="{{
url_static('images/buy.medium.jpg') }}" alt="{{_("Buy with one click")}}">
<p>
{% trans %}
- Specifically it must be usable for non-expert customers. Usability
also
- applies to the integration with merchants, and informs choices
about the
- architecture, such as encapsulating procedures that require
cryptographic
- operations into an isolated component with a simple API.
+ GNU Taler must be usable for non-expert customers including
+ end-users of a GNU Taler wallet, merchants who wish to accept
payments
+ using GNU Taler, and 3rd party application developers for
e-commerce and
+ other platforms.
+
+ GNU Taler must follow best-practices usability guidelines and
+ incorporate feedback from experts and users. Free/Libre software
also
+ requires Free/Libre documentation to allow for informed choices.
+ GNU Taler must provide well-documented Advanced Programming
Interfaces (APIs)
+ to allow frictionless integrations between GNU Taler and other
projects.
{% endtrans %}
</p>
</div>
@@ -138,9 +158,12 @@
<img style="width:20vw;float:right;padding:15px" src="{{
url_static('images/efficient.png') }}" alt="{{_("Energy efficiency")}}">
<p>
{% trans %}
- Approaches such as proof-of-work are ruled out by this
- requirement. Efficiency is necessary for GNU Taler to be used for
- micropayments.
+ GNU Taler must be designed to be efficient.
+ Quite simply, efficiency means fewer things to break, and it means
more
+ transactions per second and lowers our environmental impact.
Efficiency
+ is also critical for GNU Taler to be used for micropayments.
+ Therefore certain expensive primitives, such as proof-of-work,
+ must not be used by GNU Taler.
{% endtrans %}
</p>
</div>
@@ -151,10 +174,17 @@
<img style="width:20vw;float:left;padding:15px" src="{{
url_static('images/life-safer.medium.jpg') }}" alt="{{_("Life Safers")}}">
<p>
{% trans %}
- Taler should tolerate failure of individual components and systems,
- including malicious operators compromising core secrets.
- This manifests in architectural choices such
- as the isolation of certain components, and auditing procedures.
+ Malicious operators, fat fingers, computer glitches, gremlins.
Things
+ go wrong.
+
+ GNU Taler must be designed to tolerate failure of individual
components and
+ systems. Where the system can continue running safely, it will
continue
+ running safely. Where it must halt an operation, other operations
+ must not be needlessly pulled offline. Where systems fail,
+ they must fail gracefully.
+
+ GNU Taler must have a plan to recover from malicious operators
+ compromising core secrets.
{% endtrans %}
</p>
</div>
@@ -165,11 +195,15 @@
<img style="width:20vw;float:right;padding:15px" src="{{
url_static('images/market.medium.jpg') }}" alt="{{_("A competitive market")}}">
<p>
{% trans %}
- It must be relatively easy for competitors to deploy interoperable
alternatives. While the
- barriers for this in traditional financial systems are rather
high, the technical
- burden for new competitors to join must be minimized. A design
- choice that supports this is to split the whole system into
smaller components
- that can be operated, developed and improved upon independently,
+ It must be relatively easy for competitors to deploy interoperable
alternatives. The
+ barriers for this in traditional financial systems are rather high
and outside
+ of our control. However, GNU Taler must minimize the technical
+ burden for new competitors to enter the market.
+ {% endtrans %}
+
+ {% trans %}
+ An example for a design choice that supports this is to split the
whole system into
+ smaller components that can be operated, developed and improved
upon independently,
instead of having one completely monolithic system.
{% endtrans %}
</p>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-www] branch master updated: principles edits based on collected feedback,
gnunet <=