[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch master updated (348648c -> a766b53)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-www] branch master updated (348648c -> a766b53) |
|
Date: |
Thu, 29 Aug 2019 15:32:23 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository www.
from 348648c fix translation markup
add 38ae181 docs
new a766b53 path
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
common/navigation.j2.inc | 2 +-
docs.html.j2 | 113 ++++-----
locale/de/LC_MESSAGES/messages.po | 506 +++++++++++++++++++++++++++----------
locale/en/LC_MESSAGES/messages.po | 400 ++++++++++++++++++++++-------
locale/es/LC_MESSAGES/messages.po | 505 +++++++++++++++++++++++++++----------
locale/fr/LC_MESSAGES/messages.po | 404 +++++++++++++++++++++++-------
locale/it/LC_MESSAGES/messages.po | 510 +++++++++++++++++++++++++++----------
locale/pt/LC_MESSAGES/messages.po | 513 ++++++++++++++++++++++++++++----------
locale/ru/LC_MESSAGES/messages.po | 400 ++++++++++++++++++++++-------
web-common | 2 +-
10 files changed, 2478 insertions(+), 877 deletions(-)
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 79716df..4d870dc 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -14,7 +14,7 @@
<li class="{{ 'active' if filename == 'index.html' else '' }}"><a
class="navbar-brand taler_home" href="https://taler.net/{{ lang
}}/index.html">Taler</a></li>
<li class="nav-item {{ 'active' if filename == 'features.html' else ''
}}"><a class="nav-link" href="https://taler.net/{{ lang }}/features.html">{{
_("Features") }} </a></li>
<li class="nav-item {{ 'active' if filename == 'principles.html' else ''
}}"><a class="nav-link" href="https://taler.net/{{ lang }}/principles.html">{{
_("Principles") }} </a></li>
- <li class="nav-item"><a class="nav-link"
href="https://docs.taler.net/";>{{ _("Docs") }} </a></li>
+ <li class="nav-item {{ 'active' if filename == 'docs.html' else ''
}}"><a class="nav-link" href="https://taler.net/{{ lang }}/docs.html">{{
_("Docs") }} </a></li>
<li class="nav-item {{ 'active' if filename == 'team.html' else ''
}}"><a class="nav-link" href="team.html">{{ _("Team") }}</a></li>
</ul>
<ul class="navbar-nav navbar-right">
diff --git a/docs.html.j2 b/docs.html.j2
index 8996693..1ab7514 100644
--- a/docs.html.j2
+++ b/docs.html.j2
@@ -2,6 +2,21 @@
{% block body_content %}
<div class="container">
+ <div class="row">
+ <div class="col">
+ <h1>GNU Taler: Documentation and Resources</h1>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col">
+ 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>.
+ </div>
+ </div>
+
+ <div class="row mt-5">
+ </div>
<div class="row justify-content-center text-center">
@@ -14,73 +29,63 @@
</div>
<div class="row">
- <div class="col">
- <a href="https://{{ docshost }}/merchant/backend/html/manual.html">
+ <div class="col-3">
+ <a href="https://{{ docshost }}/taler-merchant-manual.html">
<img src="../icons/icon-backend.svg" height=60>
<h3>Merchant Backend Administration</h3>
</a>
{{ _("Tutorial and manual for operating a merchant") }}.
- {{ _("Also available as") }} <a href="https://{{ docshost
}}/merchant/backend/pdf/manual.pdf">PDF</a>.
+ {{ _("Also available as") }} <a href="https://{{ docshost
}}/taler-merchant-manual.pdf">PDF</a>.
</div>
- <div class="col">
- <a href="https://{{ docshost
}}/merchant/backend/html/merchant-api-curl.html">
+ <div class="col-3">
+ <a href="https://{{ docshost }}/taler-merchant-api-tutorial.html">
<img src="../icons/icon-market.svg" height=60>
- <h3>{{ _("Merchant API Tutorial (Command Line)") }}</h3>
+ <h3>{{ _("Merchant API Tutorial") }}</h3>
</a>
{% trans %}
- Tutorial for processing Taler payments using the merchant backend's API,
with command line (and cURL) examples.
+ Tutorial for processing Taler payments using the merchant backend API.
Also available as
- {% endtrans %} <a href="https://{{ docshost
}}/merchant/backend/pdf/merchant-api-curl.pdf">PDF</a>.
+ {% endtrans %} <a href="https://{{ docshost
}}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
</div>
- <div class="col">
- <a href="https://{{ docshost
}}/merchant/backend/html/merchant-api-python.html">
- <img src="../icons/icon-market.svg" height=60>
- <h3>Merchant API Tutorial (Python)</h3>
- </a>
- {% trans %}
- Tutorial for processing Taler payments using the merchant backend's API,
with Python 3 examples.
- Also available as
- {% endtrans %} <a href="https://{{ docshost
}}/merchant/backend/pdf/merchant-api-python.pdf">PDF</a>.
- </div>
- </div>
-
- <div class="row mt-5">
- </div>
-
- <div class="row">
- <div class="col">
- <a href="https://{{ docshost }}/exchange/html/taler-exchange.html">
+ <div class="col-3">
+ <a href="https://{{ docshost }}/taler-exchange-manual.html">
<img src="../icons/icon-exchange.svg" height=60>
<h3>Exchange</h3>
</a>
{% trans %}
Operator's manual for the GNU Taler exchange.
Also available as
- {% endtrans %} <a href="https://{{ docshost
}}/exchange/pdf/taler-exchange.pdf">PDF</a>.
+ {% endtrans %} <a href="https://{{ docshost
}}/pdf/taler-exchange-manual.pdf">PDF</a>.
</div>
- <div class="col">
- <a href="https://{{ docshost }}/bank/html/taler-bank.html">
+ <div class="col-3">
+ <a href="https://{{ docshost }}/taler-bank-manual.html">
<img src="../icons/icon-bank.svg" height=60>
<h3>{{ _("Bank Integration") }}</h3>
</a>
{% trans %}
Manual for tightly integrating Taler with banking applications.
Also available as
- {% endtrans %} <a href="https://{{ docshost
}}/bank/pdf/taler-bank.pdf">PDF</a>.
+ {% endtrans %} <a href="https://{{ docshost
}}/pdf/taler-bank-manual.pdf">PDF</a>.
</div>
+ </div>
- <div class="col">
- <a href="https://{{ docshost }}/backoffice/html/manual.html">
+ <div class="row mt-5">
+ </div>
+
+ <div class="row">
+
+ <div class="col-3">
+ <a href="https://{{ docshost }}/taler-backoffice-manual.html">
<img src="../icons/icon-backoffice.svg" height=60>
<h3>{{ _("Back office") }}</h3>
</a>
{% trans %}
Manual to run the back-office Web application.
Also available as
- {% endtrans %} <a href="https://{{ docshost
}}/backoffice/pdf/manual.pdf">PDF</a>.
+ {% endtrans %} <a href="https://{{ docshost
}}/pdf/taler-backoffice-manual.pdf">PDF</a>.
</div>
</div>
@@ -97,16 +102,16 @@
</div>
<div class="row">
- <div class="col">
- <a href="https://{{ docshost }}/api/index.html">
+ <div class="col-3">
+ <a href="https://{{ docshost }}/core/index.html">
<img src="../icons/icon-api.svg" height=60>
<h3>HTTP API</h3>
</a>
{{ _("Reference for the HTTP-based API for Taler components.") }}
</div>
- <div class="col">
- <a href="https://{{ docshost }}/onboarding/html/onboarding.html">
+ <div class="col-3">
+ <a href="https://{{ docshost }}/onboarding.html">
<img src="../icons/icon-developers.svg" height=60>
<h3>Onboarding</h3>
</a>
@@ -114,7 +119,7 @@
Description of our taler.net setup and how to contribute.
Also available as
{% endtrans %}
- <a href="https://{{ docshost }}/onboarding/pdf/onboarding.pdf">PDF</a>.
+ <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>.
</div>
</div>
@@ -131,7 +136,7 @@
</div>
<div class="row">
- <div class="col">
+ <div class="col-3">
<a href="https://lists.gnu.org/mailman/listinfo/taler";>
<img src="../icons/icon-share.svg" height=60>
<h3>Mailing List</h3>
@@ -139,7 +144,7 @@
{{ _("The official GNU Taler mailing list.") }}
</div>
- <div class="col">
+ <div class="col-3">
<a href="https://webchat.freenode.net/?channels=taler";>
<img src="../icons/icon-share.svg" height=60>
<h3>IRC</h3>
@@ -147,7 +152,7 @@
{{ _("Our IRC channel is #taler on freenode.") }}
</div>
- <div class="col">
+ <div class="col-3">
<a href="https://gnunet.org/bugs/";>
<img src="../icons/icon-share.svg" height=60>
<h3>Bug Tracker</h3>
@@ -171,31 +176,7 @@
<div class="row">
- <div class="col">
- <a href="https://{{ docshost }}/code/exchange/index.html">
- <img src="../icons/icon-code.svg" height=60>
- <h3>{{ _("Code (Exchange)") }}</h3>
- </a>
- {{ _("Documented source code (with Doxygen) for the exchange.") }}
- </div>
-
- <div class="col">
- <a href="https://{{ docshost }}/code/merchant/index.html">
- <img src="../icons/icon-code.svg" height=60>
- <h3>{{ _("Code (Merchant backend)") }}</h3>
- </a>
- {{ _("Documented source code (with Doxygen) for the merchant.") }}
- </div>
-
- <div class="col">
- <a>
- <img src="../icons/icon-code.svg" height=60>
- <h3>Code (Wallet)</h3>
- </a>
- {{ _("TBD: Documented source code (with TypeDoc) for the wallet.") }}
- </div>
-
- <div class="col">
+ <div class="col-3">
<a href="https://git.taler.net";>
<img src="../icons/icon-code.svg" height=60>
<h3>{{ _("Git repositories") }}</h3>
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 800f434..547b22a 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/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: 2019-08-11 11:49+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <address@hidden>\n"
"Language-Team: de <address@hidden, address@hidden>\n"
@@ -599,102 +599,74 @@ msgstr ""
"digitalen Münzen auf dem jeweiligen Computer zum Zeitpunkt der "
"Schadensentstehung."
-#: docs.html.j2:22
+#: docs.html.j2:37
msgid "Tutorial and manual for operating a merchant"
msgstr ""
-#: docs.html.j2:23
+#: docs.html.j2:38
msgid "Also available as"
msgstr ""
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
msgstr ""
-#: docs.html.j2:31
+#: docs.html.j2:46
msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
msgstr ""
-#: docs.html.j2:58
+#: docs.html.j2:57
msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: docs.html.j2:67
+#: docs.html.j2:66
msgid "Bank Integration"
msgstr ""
-#: docs.html.j2:69
+#: docs.html.j2:68
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
-#: docs.html.j2:78
+#: docs.html.j2:83
msgid "Back office"
msgstr ""
-#: docs.html.j2:80
+#: docs.html.j2:85
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: docs.html.j2:105
+#: docs.html.j2:110
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: docs.html.j2:113
+#: docs.html.j2:118
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: docs.html.j2:139
+#: docs.html.j2:144
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "Die Mailing-Liste"
-#: docs.html.j2:147
+#: docs.html.j2:152
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: docs.html.j2:155
+#: docs.html.j2:160
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "Das Taler-Backend für Händler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
msgid "Git repositories"
msgstr ""
-#: docs.html.j2:203
+#: docs.html.j2:184
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -1001,11 +973,48 @@ msgid ""
"feature that we are targeting for Taler 1.0. at this time</p>"
msgstr ""
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
+"Customers can stay anonymous, but merchants can not hide their income "
+"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
+"evasion and money laundering</span>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+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 ""
+
+#: features.html.j2:37
+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."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
msgid "Paying with Taler"
msgstr "Bezahlen mit Taler"
-#: features.html.j2:42
+#: features.html.j2:62
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet\n"
@@ -1015,13 +1024,9 @@ msgstr "Bezahlen mit Taler"
#| "are never falsely rejected by fraud detection and do not pose any risk\n"
#| "of phishing or identity theft.</p>\n"
msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
msgstr ""
"Um mit dem Taler-Bezahlsystem einkaufen zu können, muss man eine "
"elektronische Geldbörse auf einem Endgerät installieren. Vor der ersten "
@@ -1033,11 +1038,39 @@ msgstr ""
"(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
"Daten übermittelt."
-#: features.html.j2:54
+#: features.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "<p>To pay with Taler, customers install an electronic wallet\n"
+#| "on their device. Before the first payment, the wallet's balance must\n"
+#| "be charged in the desired currency by some other means of payment.</p>\n"
+#| "<p>Once the wallet is charged, payments on websites take only one click,\n"
+#| "are never falsely rejected by fraud detection and do not pose any risk\n"
+#| "of phishing or identity theft.</p>\n"
+msgid ""
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
+msgstr ""
+"Um mit dem Taler-Bezahlsystem einkaufen zu können, muss man eine "
+"elektronische Geldbörse auf einem Endgerät installieren. Vor der ersten "
+"Bezahlung ist es nötig, einen Wert in der gewünschten Währung an die "
+"Geldbörse zu überweisen. Dies erfolgt durch herkömmliche Banküberweisung "
+"oder durch Kreditkarten. Der aufgeladene Wert der Geldbörse kann dann mit "
+"nur einem Klick zum Bezahlen auf Webseiten verwendet werden. Die Verkäufer "
+"müssen diese Bezahlung als berechtigt annehmen. Ein Datendiebstahl "
+"(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
+"Daten übermittelt."
+
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
msgid "Receiving payments with Taler"
msgstr "Verkaufen mit Taler"
-#: features.html.j2:55
+#: features.html.j2:85
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account\n"
@@ -1046,14 +1079,10 @@ msgstr "Verkaufen mit Taler"
#| "The merchant's backend for Taler transaction processing can run\n"
#| "on the merchant's premises or be hosted by a third party.</p>\n"
msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
"make the integration painless. The merchant's backend for Taler transaction "
"processing can run on the merchant's premises or be hosted by a third party."
-"</p> <p>Merchant integration is simple, and customers can pay for products "
-"without even having to register an account.</p> <p><a href=\"https://docs.";
-"taler.net\">See how merchant integration works in our developer "
-"documentation!</a></p>"
msgstr ""
"Um Zahlungen erhalten zu können, brauchen Verkäufer ein Girokonto in der "
"gewünschten Währung bei einer Geschäftsbank. Das Taler-Bezahlsystem "
@@ -1062,11 +1091,21 @@ msgstr ""
"Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
"Verkäufers oder gehostet laufen, um die Taler-Buchungen durchzuführen."
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
msgid "Practical"
msgstr "Praktisch"
-#: features.html.j2:77
+#: features.html.j2:116
#, fuzzy
#| msgid ""
#| "Taler is easy to integrate with existing Web\n"
@@ -1082,11 +1121,11 @@ msgstr ""
"Zahlungen sind kryptographisch verschlüsselt, innerhalb von Millisekunden "
"bestätigt und extrem kostengünstig."
-#: features.html.j2:87
+#: features.html.j2:126
msgid "Stable"
msgstr "Stabil"
-#: features.html.j2:90
+#: features.html.j2:129
#, fuzzy
#| msgid ""
#| "Taler does not introduce a new currency. Taler\n"
@@ -1106,11 +1145,11 @@ msgstr ""
"also sagen, dass die kryptografischen Taler-Münzen herkömmlichen Währungen "
"wie US-Dollar, Euro oder sogar Bitcoin entsprechen."
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
msgid "Secure"
msgstr "Sicher"
-#: features.html.j2:104
+#: features.html.j2:143
#, fuzzy
#| msgid ""
#| "By design Taler does not suffer from many classes\n"
@@ -1126,11 +1165,11 @@ msgstr ""
"Phishing und wird gleichzeitig jedoch niemals Käufern betrügerische "
"Absichten unterstellen können."
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
msgid "Taxable"
msgstr "Besteuerbar"
-#: features.html.j2:119
+#: features.html.j2:158
#, fuzzy
#| msgid ""
#| "When using Taler, merchant's revenue is transparent for tax\n"
@@ -1148,11 +1187,11 @@ msgstr ""
"Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für illegale "
"Geschäfte."
-#: features.html.j2:129
+#: features.html.j2:168
msgid "Private"
msgstr "Anonym"
-#: features.html.j2:131
+#: features.html.j2:170
#, fuzzy
#| msgid ""
#| "When you pay with Taler, your identity does not\n"
@@ -1171,11 +1210,11 @@ msgstr ""
"garantiert einen Nachweis über ihre Zahlung und den erfolgten "
"Eigentumsübergang."
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
msgid "Libre"
msgstr "Frei"
-#: features.html.j2:145
+#: features.html.j2:184
#, fuzzy
#| msgid ""
#| "Taler provides protocols and reference implementations that in\n"
@@ -1917,18 +1956,26 @@ msgstr ""
#: gsoc-codeless.html.j2:33
msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
+msgstr ""
+
+#: gsoc-codeless.html.j2:50
msgid ""
"The buyers will access the seller's frontend where the code for the 'Buy "
"Now' button is present. When this button is triggered, they are redirected "
@@ -1938,7 +1985,7 @@ msgid ""
"frontend."
msgstr ""
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
msgid ""
"The other use case of the codeless payment backend is to handle the event "
"when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1946,31 +1993,31 @@ msgid ""
"successful payment, the users are redirected to the fulfilment page."
msgstr ""
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
msgid "Dynamic Merchant Instance"
msgstr ""
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
msgid "Use Case Diagram"
msgstr ""
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
msgid "Link to the contributions made"
msgstr ""
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
msgid "Codeless Payment Backend"
msgstr ""
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
msgid "Future Work"
msgstr ""
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
msgid ""
"The backend of codeless payment is very robust and can be easily extended as "
"per the requirements. It is adaptive to add new features to this framework. "
@@ -1979,7 +2026,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
msgid ""
"To send email notification to the merchant when the stocks run below a "
"certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1987,7 +2034,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
msgid ""
"To add API access to the merchant backend via the codeless payment service. "
"Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1999,7 +2046,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
msgid ""
"Mapping every seller account to a separate merchant backend instance. This "
"is not required for a simple version of codeless payments, but as soon as "
@@ -2007,7 +2054,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -2017,7 +2064,7 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
msgid "Screenshots"
msgstr ""
@@ -2494,6 +2541,192 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr "Taler in den Medien"
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "Taler in den Medien"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+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."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "Wie schützt Taler meine privaten Daten?"
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Gesetz gegen Geldwäsche"
+
+#: principles.html.j2:99
+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."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+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 ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "General Data Protection Regulation (GDPR)"
+
+#: principles.html.j2:134
+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, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Effizient"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Effizient"
+
+#: principles.html.j2:168
+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 ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+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."
+msgstr ""
+
#: schemafuzz.html.j2:6
msgid "SchemaFuzz"
msgstr ""
@@ -2634,38 +2867,10 @@ msgstr ""
msgid "Docs"
msgstr ""
-#~ msgid "PhD Student, Inria.."
-#~ msgstr "Doktorand, Inria."
-
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Software-Ingenieur. Arbeitet an libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
-
#, fuzzy
-#~| msgid "Developers"
-#~ msgid "Developer Resources"
-#~ msgstr "Entwickler"
-
-#, fuzzy
-#~| msgid "About us"
-#~ msgid "About"
-#~ msgstr "Über uns"
-
-#, fuzzy
-#~| msgid "Investors"
-#~ msgid "For Investors"
-#~ msgstr "Investoren"
-
-#~ msgid "Citizens"
-#~ msgstr "Bürger"
-
-#~ msgid "Merchants"
-#~ msgstr "Händler"
-
-#~ msgid "Governments"
-#~ msgstr "Regierungen"
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "Das Taler-Backend für Händler"
#, fuzzy
#~| msgid ""
@@ -2682,7 +2887,8 @@ msgstr ""
#~ "the wallet's balance by some other means of payment.</p> <p>Once the "
#~ "wallet is charged, payments on websites take only one click, are never "
#~ "falsely rejected by fraud detection and do not pose any risk of phishing "
-#~ "or identity theft.</p>"
+#~ "or identity theft.</p> <p><a href=\"https://demo.taler.net\";>Try it "
+#~ "yourself with the interactive demo!</a></p>"
#~ msgstr ""
#~ "Um mit dem Taler-Bezahlsystem einkaufen zu können, muss man eine "
#~ "elektronische Geldbörse auf einem Endgerät installieren. Vor der ersten "
@@ -2706,7 +2912,10 @@ msgstr ""
#~ "desired currency. We provide supporting software in various programming "
#~ "languages to make the integration painless. The merchant's backend for "
#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p>"
+#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
+#~ "customers can pay for products without even having to register an account."
+#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
+#~ "works in our developer documentation!</a></p>"
#~ msgstr ""
#~ "Um Zahlungen erhalten zu können, brauchen Verkäufer ein Girokonto in der "
#~ "gewünschten Währung bei einer Geschäftsbank. Das Taler-Bezahlsystem "
@@ -2715,6 +2924,39 @@ msgstr ""
#~ "Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
#~ "Verkäufers oder gehostet laufen, um die Taler-Buchungen durchzuführen."
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Doktorand, Inria."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Software-Ingenieur. Arbeitet an libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
+
+#, fuzzy
+#~| msgid "Developers"
+#~ msgid "Developer Resources"
+#~ msgstr "Entwickler"
+
+#, fuzzy
+#~| msgid "About us"
+#~ msgid "About"
+#~ msgstr "Über uns"
+
+#, fuzzy
+#~| msgid "Investors"
+#~ msgid "For Investors"
+#~ msgstr "Investoren"
+
+#~ msgid "Citizens"
+#~ msgstr "Bürger"
+
+#~ msgid "Merchants"
+#~ msgstr "Händler"
+
+#~ msgid "Governments"
+#~ msgstr "Regierungen"
+
#, fuzzy
#~| msgid ""
#~| "Taler uses modern cryptography, ensuring that there\n"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index acdee47..37c55bb 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: 2019-08-11 11:49+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <address@hidden>\n"
@@ -318,98 +318,72 @@ msgid ""
"circulation during the period of the compromise."
msgstr ""
-#: docs.html.j2:22
+#: docs.html.j2:37
msgid "Tutorial and manual for operating a merchant"
msgstr ""
-#: docs.html.j2:23
+#: docs.html.j2:38
msgid "Also available as"
msgstr ""
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
msgstr ""
-#: docs.html.j2:31
+#: docs.html.j2:46
msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
msgstr ""
-#: docs.html.j2:58
+#: docs.html.j2:57
msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: docs.html.j2:67
+#: docs.html.j2:66
msgid "Bank Integration"
msgstr ""
-#: docs.html.j2:69
+#: docs.html.j2:68
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
-#: docs.html.j2:78
+#: docs.html.j2:83
msgid "Back office"
msgstr ""
-#: docs.html.j2:80
+#: docs.html.j2:85
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: docs.html.j2:105
+#: docs.html.j2:110
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: docs.html.j2:113
+#: docs.html.j2:118
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: docs.html.j2:139
+#: docs.html.j2:144
msgid "The official GNU Taler mailing list."
msgstr ""
-#: docs.html.j2:147
+#: docs.html.j2:152
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: docs.html.j2:155
+#: docs.html.j2:160
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-msgid "Code (Merchant backend)"
-msgstr ""
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
msgid "Git repositories"
msgstr ""
-#: docs.html.j2:203
+#: docs.html.j2:184
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -623,53 +597,103 @@ msgid ""
"feature that we are targeting for Taler 1.0. at this time</p>"
msgstr ""
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
+"Customers can stay anonymous, but merchants can not hide their income "
+"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
+"evasion and money laundering</span>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+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 ""
+
+#: features.html.j2:37
+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."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
msgid "Paying with Taler"
msgstr ""
-#: features.html.j2:42
+#: features.html.j2:62
+msgid ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+
+#: features.html.j2:70
msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
msgstr ""
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
msgid "Receiving payments with Taler"
msgstr ""
-#: features.html.j2:55
+#: features.html.j2:85
msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
"make the integration painless. The merchant's backend for Taler transaction "
"processing can run on the merchant's premises or be hosted by a third party."
-"</p> <p>Merchant integration is simple, and customers can pay for products "
-"without even having to register an account.</p> <p><a href=\"https://docs.";
-"taler.net\">See how merchant integration works in our developer "
-"documentation!</a></p>"
msgstr ""
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
msgid "Practical"
msgstr ""
-#: features.html.j2:77
+#: features.html.j2:116
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
"extremely low transaction costs."
msgstr ""
-#: features.html.j2:87
+#: features.html.j2:126
msgid "Stable"
msgstr ""
-#: features.html.j2:90
+#: features.html.j2:129
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -677,44 +701,44 @@ msgid ""
"currencies, such as US Dollars, Euros or even Bitcoins."
msgstr ""
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
msgid "Secure"
msgstr ""
-#: features.html.j2:104
+#: features.html.j2:143
msgid ""
"By design Taler does not suffer from many classes of security problems such "
"as phishing or counterfeit. Thanks to its security features, Taler never "
"rejects a legitimate customer due to a fraud-detection false positive."
msgstr ""
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
msgid "Taxable"
msgstr ""
-#: features.html.j2:119
+#: features.html.j2:158
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
"black markets. Taler is not suitable for illegal activities."
msgstr ""
-#: features.html.j2:129
+#: features.html.j2:168
msgid "Private"
msgstr ""
-#: features.html.j2:131
+#: features.html.j2:170
msgid ""
"When you pay with Taler, your identity does not have to be revealed. Just "
"like payments in cash, nobody else can track how you spent your electronic "
"money. However, you obtain a legally valid proof of payment."
msgstr ""
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
msgid "Libre"
msgstr ""
-#: features.html.j2:145
+#: features.html.j2:184
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1270,18 +1294,26 @@ msgstr ""
#: gsoc-codeless.html.j2:33
msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
msgstr ""
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
+msgstr ""
+
+#: gsoc-codeless.html.j2:50
msgid ""
"The buyers will access the seller's frontend where the code for the 'Buy "
"Now' button is present. When this button is triggered, they are redirected "
@@ -1291,7 +1323,7 @@ msgid ""
"frontend."
msgstr ""
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
msgid ""
"The other use case of the codeless payment backend is to handle the event "
"when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1299,31 +1331,31 @@ msgid ""
"successful payment, the users are redirected to the fulfilment page."
msgstr ""
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
msgid "Dynamic Merchant Instance"
msgstr ""
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
msgid "Use Case Diagram"
msgstr ""
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
msgid "Link to the contributions made"
msgstr ""
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
msgid "Codeless Payment Backend"
msgstr ""
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
msgid "Future Work"
msgstr ""
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
msgid ""
"The backend of codeless payment is very robust and can be easily extended as "
"per the requirements. It is adaptive to add new features to this framework. "
@@ -1332,7 +1364,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
msgid ""
"To send email notification to the merchant when the stocks run below a "
"certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1340,7 +1372,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
msgid ""
"To add API access to the merchant backend via the codeless payment service. "
"Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1352,7 +1384,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
msgid ""
"Mapping every seller account to a separate merchant backend instance. This "
"is not required for a simple version of codeless payments, but as soon as "
@@ -1360,7 +1392,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1370,7 +1402,7 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
msgid "Screenshots"
msgstr ""
@@ -1629,6 +1661,180 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr ""
+#: principles.html.j2:22
+msgid "GNU Taler: Design Principles"
+msgstr ""
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+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."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+msgid "You deserve some privacy"
+msgstr ""
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+msgid "Money laundering"
+msgstr ""
+
+#: principles.html.j2:99
+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."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+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 ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr ""
+
+#: principles.html.j2:134
+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, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:162
+msgid "7. Be efficient"
+msgstr ""
+
+#: principles.html.j2:166
+msgid "Energy efficiency"
+msgstr ""
+
+#: principles.html.j2:168
+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 ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+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."
+msgstr ""
+
#: schemafuzz.html.j2:6
msgid "SchemaFuzz"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 94b8344..6cb665b 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: 2019-08-11 11:49+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <address@hidden>\n"
@@ -453,104 +453,74 @@ msgstr ""
"proporcional a los fondos que tuviesen en circulación durante el período en "
"que la computadora estuviese comprometida."
-#: docs.html.j2:22
+#: docs.html.j2:37
msgid "Tutorial and manual for operating a merchant"
msgstr ""
-#: docs.html.j2:23
+#: docs.html.j2:38
msgid "Also available as"
msgstr ""
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
msgstr ""
-#: docs.html.j2:31
+#: docs.html.j2:46
msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
msgstr ""
-#: docs.html.j2:58
+#: docs.html.j2:57
msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: docs.html.j2:67
+#: docs.html.j2:66
msgid "Bank Integration"
msgstr ""
-#: docs.html.j2:69
+#: docs.html.j2:68
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
-#: docs.html.j2:78
+#: docs.html.j2:83
msgid "Back office"
msgstr ""
-#: docs.html.j2:80
+#: docs.html.j2:85
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: docs.html.j2:105
+#: docs.html.j2:110
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: docs.html.j2:113
+#: docs.html.j2:118
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: docs.html.j2:139
+#: docs.html.j2:144
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "Lista de correo"
-#: docs.html.j2:147
+#: docs.html.j2:152
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: docs.html.j2:155
+#: docs.html.j2:160
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: docs.html.j2:177
-#, fuzzy
-#| msgid "exchange"
-msgid "Code (Exchange)"
-msgstr "Plataforma de intercambio"
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "Backend del comerciante de GNU Taler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
msgid "Git repositories"
msgstr ""
-#: docs.html.j2:203
+#: docs.html.j2:184
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -802,11 +772,48 @@ msgid ""
"feature that we are targeting for Taler 1.0. at this time</p>"
msgstr ""
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
+"Customers can stay anonymous, but merchants can not hide their income "
+"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
+"evasion and money laundering</span>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+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 ""
+
+#: features.html.j2:37
+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."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
msgid "Paying with Taler"
msgstr "Pagando con Taler"
-#: features.html.j2:42
+#: features.html.j2:62
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -816,13 +823,9 @@ msgstr "Pagando con Taler"
#| "falsely rejected by fraud detection and do not pose any risk of phishing "
#| "or identity theft.</p>"
msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
msgstr ""
"<p>Para pagar con Taler, los clientes instalan una billetera electrónica en "
"su dispositivo. Antes del primer pago, el saldo de la billetera debe ser "
@@ -831,11 +834,36 @@ msgstr ""
"clic, nunca son rechazados equivocadamente por detección de fraude, y no "
"representan ningún riesgo de phishing o robo de identidad.</p>"
-#: features.html.j2:54
+#: features.html.j2:70
+#, fuzzy
+#| msgid ""
+#| "<p>To pay with Taler, customers install an electronic wallet on their "
+#| "device. Before the first payment, the wallet's balance must be charged in "
+#| "the desired currency by some other means of payment.</p> <p>Once the "
+#| "wallet is charged, payments on websites take only one click, are never "
+#| "falsely rejected by fraud detection and do not pose any risk of phishing "
+#| "or identity theft.</p>"
+msgid ""
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
+msgstr ""
+"<p>Para pagar con Taler, los clientes instalan una billetera electrónica en "
+"su dispositivo. Antes del primer pago, el saldo de la billetera debe ser "
+"abonado en la moneda deseada por algún otro medio de pago.</p> <p>Una vez "
+"que se haya cargado la billetera, los pagos en sitios web solo toman un "
+"clic, nunca son rechazados equivocadamente por detección de fraude, y no "
+"representan ningún riesgo de phishing o robo de identidad.</p>"
+
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
msgid "Receiving payments with Taler"
msgstr "Recibiendo pagos con Taler"
-#: features.html.j2:55
+#: features.html.j2:85
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -844,14 +872,10 @@ msgstr "Recibiendo pagos con Taler"
#| "Taler transaction processing can run on the merchant's premises or be "
#| "hosted by a third party.</p>"
msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
"make the integration painless. The merchant's backend for Taler transaction "
"processing can run on the merchant's premises or be hosted by a third party."
-"</p> <p>Merchant integration is simple, and customers can pay for products "
-"without even having to register an account.</p> <p><a href=\"https://docs.";
-"taler.net\">See how merchant integration works in our developer "
-"documentation!</a></p>"
msgstr ""
"<p>Para recibir pagos con Taler, un comerciante necesita una cuenta bancaria "
"en la moneda deseada. Nosotros proporcionamos el software de apoyo en varios "
@@ -860,11 +884,21 @@ msgstr ""
"puede ejecutarse en el hardware del comerciante, o puede estar alojado por "
"un tercero. </ P>"
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
msgid "Practical"
msgstr "Práctico"
-#: features.html.j2:77
+#: features.html.j2:116
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
@@ -874,11 +908,11 @@ msgstr ""
"asegurados criptográficamente y se confirman en milisegundos con costos de "
"transacción extremadamente bajos."
-#: features.html.j2:87
+#: features.html.j2:126
msgid "Stable"
msgstr "Estable"
-#: features.html.j2:90
+#: features.html.j2:129
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -891,11 +925,11 @@ msgstr ""
"corresponden a monedas existentes, tales como dólares estadounidenses, euros "
"o incluso bitcoins."
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
msgid "Secure"
msgstr "Seguro"
-#: features.html.j2:104
+#: features.html.j2:143
msgid ""
"By design Taler does not suffer from many classes of security problems such "
"as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -906,11 +940,11 @@ msgstr ""
"rechaza a un cliente legítimo debido a un falso positivo en la detección de "
"fraude."
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
msgid "Taxable"
msgstr "Imponible"
-#: features.html.j2:119
+#: features.html.j2:158
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -921,11 +955,11 @@ msgstr ""
"mayoría de las monedas electrónicas, Taler ayuda a prevenir los mercados "
"negros. Taler no es adecuado para actividades ilegales."
-#: features.html.j2:129
+#: features.html.j2:168
msgid "Private"
msgstr "Privado"
-#: features.html.j2:131
+#: features.html.j2:170
msgid ""
"When you pay with Taler, your identity does not have to be revealed. Just "
"like payments in cash, nobody else can track how you spent your electronic "
@@ -935,11 +969,11 @@ msgstr ""
"pagos en efectivo, nadie puede rastrear cómo gasta su dinero electrónico. "
"Sin embargo, obtiene una prueba de pago legalmente válida."
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
msgid "Libre"
msgstr "Libre"
-#: features.html.j2:145
+#: features.html.j2:184
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1632,18 +1666,26 @@ msgstr ""
#: gsoc-codeless.html.j2:33
msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
msgstr ""
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:50
msgid ""
"The buyers will access the seller's frontend where the code for the 'Buy "
"Now' button is present. When this button is triggered, they are redirected "
@@ -1653,7 +1695,7 @@ msgid ""
"frontend."
msgstr ""
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
msgid ""
"The other use case of the codeless payment backend is to handle the event "
"when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1661,31 +1703,31 @@ msgid ""
"successful payment, the users are redirected to the fulfilment page."
msgstr ""
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
msgid "Dynamic Merchant Instance"
msgstr ""
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
msgid "Use Case Diagram"
msgstr ""
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
msgid "Link to the contributions made"
msgstr ""
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
msgid "Codeless Payment Backend"
msgstr ""
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
msgid "Future Work"
msgstr ""
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
msgid ""
"The backend of codeless payment is very robust and can be easily extended as "
"per the requirements. It is adaptive to add new features to this framework. "
@@ -1694,7 +1736,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
msgid ""
"To send email notification to the merchant when the stocks run below a "
"certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1702,7 +1744,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
msgid ""
"To add API access to the merchant backend via the codeless payment service. "
"Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1714,7 +1756,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
msgid ""
"Mapping every seller account to a separate merchant backend instance. This "
"is not required for a simple version of codeless payments, but as soon as "
@@ -1722,7 +1764,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1732,7 +1774,7 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
msgid "Screenshots"
msgstr ""
@@ -2088,6 +2130,192 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr "GNU Taler en la Prensa"
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "GNU Taler en la Prensa"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+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."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "¿De qué manera Taler protege mi privacidad?"
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Anti Lavado de dinero o 'Anti money laundering' (AML)"
+
+#: principles.html.j2:99
+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."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+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 ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "Regulación General de Protección de Datos (GDPR)"
+
+#: principles.html.j2:134
+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, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Eficiente"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Eficiente"
+
+#: principles.html.j2:168
+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 ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+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."
+msgstr ""
+
#: schemafuzz.html.j2:6
msgid "SchemaFuzz"
msgstr ""
@@ -2227,32 +2455,15 @@ msgstr ""
msgid "Docs"
msgstr ""
-#~ msgid "PhD Student, Inria.."
-#~ msgstr "Estudiante de doctorado, INRIA."
-
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Ingeniero de Software. Trabaja en libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
-
-#~ msgid "Developer Resources"
-#~ msgstr "Recursos de desarrollo"
-
-#~ msgid "About"
-#~ msgstr "Acerca de GNU Taler"
-
-#~ msgid "For Investors"
-#~ msgstr "Inversionistas"
-
-#~ msgid "Citizens"
-#~ msgstr "Ciudadanos"
-
-#~ msgid "Merchants"
-#~ msgstr "Comerciantes"
+#, fuzzy
+#~| msgid "exchange"
+#~ msgid "Code (Exchange)"
+#~ msgstr "Plataforma de intercambio"
-#~ msgid "Governments"
-#~ msgstr "Gobiernos"
+#, fuzzy
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "Backend del comerciante de GNU Taler"
#, fuzzy
#~| msgid ""
@@ -2268,7 +2479,8 @@ msgstr ""
#~ "the wallet's balance by some other means of payment.</p> <p>Once the "
#~ "wallet is charged, payments on websites take only one click, are never "
#~ "falsely rejected by fraud detection and do not pose any risk of phishing "
-#~ "or identity theft.</p>"
+#~ "or identity theft.</p> <p><a href=\"https://demo.taler.net\";>Try it "
+#~ "yourself with the interactive demo!</a></p>"
#~ msgstr ""
#~ "<p>Para pagar con Taler, los clientes instalan una billetera electrónica "
#~ "en su dispositivo. Antes del primer pago, el saldo de la billetera debe "
@@ -2277,12 +2489,22 @@ msgstr ""
#~ "un clic, nunca son rechazados equivocadamente por detección de fraude, y "
#~ "no representan ningún riesgo de phishing o robo de identidad.</p>"
+#, fuzzy
+#~| msgid ""
+#~| "<p>To receive Taler payments, a merchant needs a bank account in the "
+#~| "desired currency. We provide supporting software in various programming "
+#~| "languages to make the integration painless. The merchant's backend for "
+#~| "Taler transaction processing can run on the merchant's premises or be "
+#~| "hosted by a third party.</p>"
#~ msgid ""
#~ "<p>To receive Taler payments, a merchant needs a bank account in the "
#~ "desired currency. We provide supporting software in various programming "
#~ "languages to make the integration painless. The merchant's backend for "
#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p>"
+#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
+#~ "customers can pay for products without even having to register an account."
+#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
+#~ "works in our developer documentation!</a></p>"
#~ msgstr ""
#~ "<p>Para recibir pagos con Taler, un comerciante necesita una cuenta "
#~ "bancaria en la moneda deseada. Nosotros proporcionamos el software de "
@@ -2291,6 +2513,33 @@ msgstr ""
#~ "por parte de Taler puede ejecutarse en el hardware del comerciante, o "
#~ "puede estar alojado por un tercero. </ P>"
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Estudiante de doctorado, INRIA."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Ingeniero de Software. Trabaja en libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
+
+#~ msgid "Developer Resources"
+#~ msgstr "Recursos de desarrollo"
+
+#~ msgid "About"
+#~ msgstr "Acerca de GNU Taler"
+
+#~ msgid "For Investors"
+#~ msgstr "Inversionistas"
+
+#~ msgid "Citizens"
+#~ msgstr "Ciudadanos"
+
+#~ msgid "Merchants"
+#~ msgstr "Comerciantes"
+
+#~ msgid "Governments"
+#~ msgstr "Gobiernos"
+
#~ msgid ""
#~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
#~ "Your digital wallet is safer than your physical wallet. At most, you can "
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index a634660..7a71f16 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/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: 2019-08-11 11:49+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <address@hidden>\n"
@@ -322,98 +322,72 @@ msgid ""
"circulation during the period of the compromise."
msgstr ""
-#: docs.html.j2:22
+#: docs.html.j2:37
msgid "Tutorial and manual for operating a merchant"
msgstr ""
-#: docs.html.j2:23
+#: docs.html.j2:38
msgid "Also available as"
msgstr ""
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
msgstr ""
-#: docs.html.j2:31
+#: docs.html.j2:46
msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
msgstr ""
-#: docs.html.j2:58
+#: docs.html.j2:57
msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: docs.html.j2:67
+#: docs.html.j2:66
msgid "Bank Integration"
msgstr ""
-#: docs.html.j2:69
+#: docs.html.j2:68
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
-#: docs.html.j2:78
+#: docs.html.j2:83
msgid "Back office"
msgstr ""
-#: docs.html.j2:80
+#: docs.html.j2:85
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: docs.html.j2:105
+#: docs.html.j2:110
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: docs.html.j2:113
+#: docs.html.j2:118
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: docs.html.j2:139
+#: docs.html.j2:144
msgid "The official GNU Taler mailing list."
msgstr ""
-#: docs.html.j2:147
+#: docs.html.j2:152
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: docs.html.j2:155
+#: docs.html.j2:160
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-msgid "Code (Merchant backend)"
-msgstr ""
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
msgid "Git repositories"
msgstr ""
-#: docs.html.j2:203
+#: docs.html.j2:184
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -627,57 +601,107 @@ msgid ""
"feature that we are targeting for Taler 1.0. at this time</p>"
msgstr ""
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
+"Customers can stay anonymous, but merchants can not hide their income "
+"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
+"evasion and money laundering</span>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+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 ""
+
+#: features.html.j2:37
+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."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
msgid "Paying with Taler"
msgstr ""
-#: features.html.j2:42
+#: features.html.j2:62
+msgid ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+
+#: features.html.j2:70
msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
msgstr ""
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
msgid "Receiving payments with Taler"
msgstr ""
-#: features.html.j2:55
+#: features.html.j2:85
msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
"make the integration painless. The merchant's backend for Taler transaction "
"processing can run on the merchant's premises or be hosted by a third party."
-"</p> <p>Merchant integration is simple, and customers can pay for products "
-"without even having to register an account.</p> <p><a href=\"https://docs.";
-"taler.net\">See how merchant integration works in our developer "
-"documentation!</a></p>"
msgstr ""
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
#, fuzzy
#| msgid "Ethical"
msgid "Practical"
msgstr "Ethique"
-#: features.html.j2:77
+#: features.html.j2:116
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
"extremely low transaction costs."
msgstr ""
-#: features.html.j2:87
+#: features.html.j2:126
#, fuzzy
#| msgid "Taxable"
msgid "Stable"
msgstr "Taxable"
-#: features.html.j2:90
+#: features.html.j2:129
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -685,44 +709,44 @@ msgid ""
"currencies, such as US Dollars, Euros or even Bitcoins."
msgstr ""
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
msgid "Secure"
msgstr "Sûr"
-#: features.html.j2:104
+#: features.html.j2:143
msgid ""
"By design Taler does not suffer from many classes of security problems such "
"as phishing or counterfeit. Thanks to its security features, Taler never "
"rejects a legitimate customer due to a fraud-detection false positive."
msgstr ""
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
msgid "Taxable"
msgstr "Taxable"
-#: features.html.j2:119
+#: features.html.j2:158
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
"black markets. Taler is not suitable for illegal activities."
msgstr ""
-#: features.html.j2:129
+#: features.html.j2:168
msgid "Private"
msgstr ""
-#: features.html.j2:131
+#: features.html.j2:170
msgid ""
"When you pay with Taler, your identity does not have to be revealed. Just "
"like payments in cash, nobody else can track how you spent your electronic "
"money. However, you obtain a legally valid proof of payment."
msgstr ""
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
msgid "Libre"
msgstr "Libre"
-#: features.html.j2:145
+#: features.html.j2:184
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1284,18 +1308,26 @@ msgstr ""
#: gsoc-codeless.html.j2:33
msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
msgstr ""
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:50
msgid ""
"The buyers will access the seller's frontend where the code for the 'Buy "
"Now' button is present. When this button is triggered, they are redirected "
@@ -1305,7 +1337,7 @@ msgid ""
"frontend."
msgstr ""
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
msgid ""
"The other use case of the codeless payment backend is to handle the event "
"when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1313,31 +1345,31 @@ msgid ""
"successful payment, the users are redirected to the fulfilment page."
msgstr ""
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
msgid "Dynamic Merchant Instance"
msgstr ""
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
msgid "Use Case Diagram"
msgstr ""
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
msgid "Link to the contributions made"
msgstr ""
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
msgid "Codeless Payment Backend"
msgstr ""
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
msgid "Future Work"
msgstr ""
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
msgid ""
"The backend of codeless payment is very robust and can be easily extended as "
"per the requirements. It is adaptive to add new features to this framework. "
@@ -1346,7 +1378,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
msgid ""
"To send email notification to the merchant when the stocks run below a "
"certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1354,7 +1386,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
msgid ""
"To add API access to the merchant backend via the codeless payment service. "
"Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1366,7 +1398,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
msgid ""
"Mapping every seller account to a separate merchant backend instance. This "
"is not required for a simple version of codeless payments, but as soon as "
@@ -1374,7 +1406,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1384,7 +1416,7 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
msgid "Screenshots"
msgstr ""
@@ -1645,6 +1677,184 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr ""
+#: principles.html.j2:22
+msgid "GNU Taler: Design Principles"
+msgstr ""
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+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."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+msgid "You deserve some privacy"
+msgstr ""
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+msgid "Money laundering"
+msgstr ""
+
+#: principles.html.j2:99
+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."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+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 ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr ""
+
+#: principles.html.j2:134
+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, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Efficace"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Efficace"
+
+#: principles.html.j2:168
+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 ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+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."
+msgstr ""
+
#: schemafuzz.html.j2:6
msgid "SchemaFuzz"
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 3d4a349..c5c064f 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: 2019-08-11 11:49+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <address@hidden>\n"
@@ -444,104 +444,74 @@ msgstr ""
"sono compromessi, il danno finanziario è limitato alla rispettiva parte ed è "
"proporzionale ai fondi in circolazione durante quel periodo."
-#: docs.html.j2:22
+#: docs.html.j2:37
msgid "Tutorial and manual for operating a merchant"
msgstr ""
-#: docs.html.j2:23
+#: docs.html.j2:38
msgid "Also available as"
msgstr ""
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
msgstr ""
-#: docs.html.j2:31
+#: docs.html.j2:46
msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
msgstr ""
-#: docs.html.j2:58
+#: docs.html.j2:57
msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: docs.html.j2:67
+#: docs.html.j2:66
msgid "Bank Integration"
msgstr ""
-#: docs.html.j2:69
+#: docs.html.j2:68
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
-#: docs.html.j2:78
+#: docs.html.j2:83
msgid "Back office"
msgstr ""
-#: docs.html.j2:80
+#: docs.html.j2:85
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: docs.html.j2:105
+#: docs.html.j2:110
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: docs.html.j2:113
+#: docs.html.j2:118
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: docs.html.j2:139
+#: docs.html.j2:144
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "La mailing list"
-#: docs.html.j2:147
+#: docs.html.j2:152
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: docs.html.j2:155
+#: docs.html.j2:160
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: docs.html.j2:177
-#, fuzzy
-#| msgid "exchange"
-msgid "Code (Exchange)"
-msgstr "cambio"
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "Il backend del commerciante GNU Taler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
msgid "Git repositories"
msgstr ""
-#: docs.html.j2:203
+#: docs.html.j2:184
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -792,11 +762,70 @@ msgid ""
"feature that we are targeting for Taler 1.0. at this time</p>"
msgstr ""
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
+"Customers can stay anonymous, but merchants can not hide their income "
+"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
+"evasion and money laundering</span>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+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 ""
+
+#: features.html.j2:37
+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."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
msgid "Paying with Taler"
msgstr "Pagare con Taler"
-#: features.html.j2:42
+#: features.html.j2:62
+#, fuzzy
+#| msgid ""
+#| "<p>To pay with Taler, customers install an electronic wallet on their "
+#| "device. Before the first payment, the wallet's balance must be charged in "
+#| "the desired currency by some other means of payment.</p> <p>Once the "
+#| "wallet is charged, payments on websites take only one click, are never "
+#| "falsely rejected by fraud detection and do not pose any risk of phishing "
+#| "or identity theft.</p>"
+msgid ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+"<p>Per pagare con Taler, i clienti installano un portafoglio elettronico sul "
+"proprio dispositivo. Prima del primo pagamento, il saldo del portafoglio "
+"deve essere caricato da altri mezzi di pagamento nella valuta desiderata.</"
+"p> <p>Una volta che il portafoglio viene caricato, i pagamenti sui siti web "
+"richiedono un solo click, non vengono mai falsamente respinti per "
+"intercettazione di frodi e non presentano alcun rischio di phishing o furto "
+"di identità.</p> "
+
+#: features.html.j2:70
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -806,13 +835,9 @@ msgstr "Pagare con Taler"
#| "falsely rejected by fraud detection and do not pose any risk of phishing "
#| "or identity theft.</p>"
msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
msgstr ""
"<p>Per pagare con Taler, i clienti installano un portafoglio elettronico sul "
"proprio dispositivo. Prima del primo pagamento, il saldo del portafoglio "
@@ -822,11 +847,15 @@ msgstr ""
"intercettazione di frodi e non presentano alcun rischio di phishing o furto "
"di identità.</p> "
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
msgid "Receiving payments with Taler"
msgstr "Ricevere pagamenti con Taler"
-#: features.html.j2:55
+#: features.html.j2:85
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -835,14 +864,10 @@ msgstr "Ricevere pagamenti con Taler"
#| "Taler transaction processing can run on the merchant's premises or be "
#| "hosted by a third party.</p>"
msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
"make the integration painless. The merchant's backend for Taler transaction "
"processing can run on the merchant's premises or be hosted by a third party."
-"</p> <p>Merchant integration is simple, and customers can pay for products "
-"without even having to register an account.</p> <p><a href=\"https://docs.";
-"taler.net\">See how merchant integration works in our developer "
-"documentation!</a></p>"
msgstr ""
"<p>Per ricevere i pagamenti di Taler, un commerciante ha bisogno di un conto "
"bancario nella valuta desiderata. Forniamo software di supporto in vari "
@@ -850,11 +875,21 @@ msgstr ""
"backend del commerciante per l'elaborazione della transazione di Taler può "
"essere eseguito nella sede del commerciante o essere ospitato da terzi.</p> "
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
msgid "Practical"
msgstr "Pratico"
-#: features.html.j2:77
+#: features.html.j2:116
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
@@ -864,11 +899,11 @@ msgstr ""
"sono protetti da crittografia e vengono confermati entro pochi millisecondi "
"con costi di transazione estremamente bassi. "
-#: features.html.j2:87
+#: features.html.j2:126
msgid "Stable"
msgstr "Stabile"
-#: features.html.j2:90
+#: features.html.j2:129
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -881,11 +916,11 @@ msgstr ""
"corrispondono a valute attuali, come i dollari USA, gli Euro o perfino i "
"Bitcoins. "
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
msgid "Secure"
msgstr "Sicuro"
-#: features.html.j2:104
+#: features.html.j2:143
msgid ""
"By design Taler does not suffer from many classes of security problems such "
"as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -896,11 +931,11 @@ msgstr ""
"sue misure di sicurezza, Taler non respinge mai un cliente legittimo a causa "
"di un falso positivo in intercettazione di frode. "
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
msgid "Taxable"
msgstr "Tassabile"
-#: features.html.j2:119
+#: features.html.j2:158
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -911,11 +946,11 @@ msgstr ""
"parte delle valute digitali, Taler aiuta a prevenire il mercato nero. Taler "
"non è adatto ad attività illegali. "
-#: features.html.j2:129
+#: features.html.j2:168
msgid "Private"
msgstr "Privato"
-#: features.html.j2:131
+#: features.html.j2:170
msgid ""
"When you pay with Taler, your identity does not have to be revealed. Just "
"like payments in cash, nobody else can track how you spent your electronic "
@@ -926,12 +961,12 @@ msgstr ""
"moneta elettronica. Tuttavia, si ottiene una conferma di pagamento "
"legalmentevalida. "
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
#, fuzzy
msgid "Libre"
msgstr "Libero"
-#: features.html.j2:145
+#: features.html.j2:184
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1625,18 +1660,26 @@ msgstr ""
#: gsoc-codeless.html.j2:33
msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
msgstr ""
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:50
msgid ""
"The buyers will access the seller's frontend where the code for the 'Buy "
"Now' button is present. When this button is triggered, they are redirected "
@@ -1646,7 +1689,7 @@ msgid ""
"frontend."
msgstr ""
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
msgid ""
"The other use case of the codeless payment backend is to handle the event "
"when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1654,31 +1697,31 @@ msgid ""
"successful payment, the users are redirected to the fulfilment page."
msgstr ""
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
msgid "Dynamic Merchant Instance"
msgstr ""
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
msgid "Use Case Diagram"
msgstr ""
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
msgid "Link to the contributions made"
msgstr ""
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
msgid "Codeless Payment Backend"
msgstr ""
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
msgid "Future Work"
msgstr ""
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
msgid ""
"The backend of codeless payment is very robust and can be easily extended as "
"per the requirements. It is adaptive to add new features to this framework. "
@@ -1687,7 +1730,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
msgid ""
"To send email notification to the merchant when the stocks run below a "
"certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1695,7 +1738,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
msgid ""
"To add API access to the merchant backend via the codeless payment service. "
"Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1707,7 +1750,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
msgid ""
"Mapping every seller account to a separate merchant backend instance. This "
"is not required for a simple version of codeless payments, but as soon as "
@@ -1715,7 +1758,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1725,7 +1768,7 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
msgid "Screenshots"
msgstr ""
@@ -2081,6 +2124,192 @@ msgstr "Questa pagina documenta la storia di GNU Taler.
"
msgid "GNU Taler in the Press"
msgstr "GNU Taler nella Stampa"
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "GNU Taler nella Stampa"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+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."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "Come protegge Taler la mia privacy?"
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Antiriciclaggio (AML) "
+
+#: principles.html.j2:99
+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."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+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 ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "Regolamento generale sulla protezione dei dati (GDPR) "
+
+#: principles.html.j2:134
+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, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Efficiente"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Efficiente"
+
+#: principles.html.j2:168
+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 ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+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."
+msgstr ""
+
#: schemafuzz.html.j2:6
msgid "SchemaFuzz"
msgstr ""
@@ -2233,36 +2462,15 @@ msgstr ""
msgid "Docs"
msgstr ""
-#~ msgid "PhD Student, Inria.."
-#~ msgstr ""
-#~ "Dottorando a Inria Rennes.. Programmatore e architetto del protocollo "
-#~ "Taler."
-
#, fuzzy
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Programmatore. Attualmente coinvolto in libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
-
-#~ msgid "Developer Resources"
-#~ msgstr "Risorse per i programmatori"
-
-#~ msgid "About"
-#~ msgstr "Chi siamo"
-
-#~ msgid "For Investors"
-#~ msgstr "Per gli investitori"
-
-#~ msgid "Citizens"
-#~ msgstr "Cittadini"
+#~| msgid "exchange"
+#~ msgid "Code (Exchange)"
+#~ msgstr "cambio"
#, fuzzy
-#~ msgid "Merchants"
-#~ msgstr "Commercianti"
-
-#~ msgid "Governments"
-#~ msgstr "Pubbliche Amministrazioni"
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "Il backend del commerciante GNU Taler"
#, fuzzy
#~| msgid ""
@@ -2278,7 +2486,8 @@ msgstr ""
#~ "the wallet's balance by some other means of payment.</p> <p>Once the "
#~ "wallet is charged, payments on websites take only one click, are never "
#~ "falsely rejected by fraud detection and do not pose any risk of phishing "
-#~ "or identity theft.</p>"
+#~ "or identity theft.</p> <p><a href=\"https://demo.taler.net\";>Try it "
+#~ "yourself with the interactive demo!</a></p>"
#~ msgstr ""
#~ "<p>Per pagare con Taler, i clienti installano un portafoglio elettronico "
#~ "sul proprio dispositivo. Prima del primo pagamento, il saldo del "
@@ -2288,12 +2497,22 @@ msgstr ""
#~ "falsamente respinti per intercettazione di frodi e non presentano alcun "
#~ "rischio di phishing o furto di identità.</p> "
+#, fuzzy
+#~| msgid ""
+#~| "<p>To receive Taler payments, a merchant needs a bank account in the "
+#~| "desired currency. We provide supporting software in various programming "
+#~| "languages to make the integration painless. The merchant's backend for "
+#~| "Taler transaction processing can run on the merchant's premises or be "
+#~| "hosted by a third party.</p>"
#~ msgid ""
#~ "<p>To receive Taler payments, a merchant needs a bank account in the "
#~ "desired currency. We provide supporting software in various programming "
#~ "languages to make the integration painless. The merchant's backend for "
#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p>"
+#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
+#~ "customers can pay for products without even having to register an account."
+#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
+#~ "works in our developer documentation!</a></p>"
#~ msgstr ""
#~ "<p>Per ricevere i pagamenti di Taler, un commerciante ha bisogno di un "
#~ "conto bancario nella valuta desiderata. Forniamo software di supporto in "
@@ -2302,6 +2521,37 @@ msgstr ""
#~ "transazione di Taler può essere eseguito nella sede del commerciante o "
#~ "essere ospitato da terzi.</p> "
+#~ msgid "PhD Student, Inria.."
+#~ msgstr ""
+#~ "Dottorando a Inria Rennes.. Programmatore e architetto del protocollo "
+#~ "Taler."
+
+#, fuzzy
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Programmatore. Attualmente coinvolto in libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
+
+#~ msgid "Developer Resources"
+#~ msgstr "Risorse per i programmatori"
+
+#~ msgid "About"
+#~ msgstr "Chi siamo"
+
+#~ msgid "For Investors"
+#~ msgstr "Per gli investitori"
+
+#~ msgid "Citizens"
+#~ msgstr "Cittadini"
+
+#, fuzzy
+#~ msgid "Merchants"
+#~ msgstr "Commercianti"
+
+#~ msgid "Governments"
+#~ msgstr "Pubbliche Amministrazioni"
+
#~ msgid ""
#~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
#~ "Your digital wallet is safer than your physical wallet. At most, you can "
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index 094b178..59df9a6 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: 2019-08-11 11:49+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -442,104 +442,74 @@ msgstr ""
"comprometidos, o dano financeiro é limitado à respectiva parte e "
"proporcional aos fundos em circulação durante o período do comprometimento."
-#: docs.html.j2:22
+#: docs.html.j2:37
msgid "Tutorial and manual for operating a merchant"
msgstr ""
-#: docs.html.j2:23
+#: docs.html.j2:38
msgid "Also available as"
msgstr ""
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
msgstr ""
-#: docs.html.j2:31
+#: docs.html.j2:46
msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
msgstr ""
-#: docs.html.j2:58
+#: docs.html.j2:57
msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: docs.html.j2:67
+#: docs.html.j2:66
msgid "Bank Integration"
msgstr ""
-#: docs.html.j2:69
+#: docs.html.j2:68
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
-#: docs.html.j2:78
+#: docs.html.j2:83
msgid "Back office"
msgstr ""
-#: docs.html.j2:80
+#: docs.html.j2:85
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: docs.html.j2:105
+#: docs.html.j2:110
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: docs.html.j2:113
+#: docs.html.j2:118
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: docs.html.j2:139
+#: docs.html.j2:144
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "A lista de discussão"
-#: docs.html.j2:147
+#: docs.html.j2:152
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: docs.html.j2:155
+#: docs.html.j2:160
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: docs.html.j2:177
-#, fuzzy
-#| msgid "exchange"
-msgid "Code (Exchange)"
-msgstr "câmbio <i>(exchange)</i>"
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-#, fuzzy
-#| msgid "The GNU Taler Merchant Backend"
-msgid "Code (Merchant backend)"
-msgstr "O backend de comerciante do GNU Taler"
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
msgid "Git repositories"
msgstr ""
-#: docs.html.j2:203
+#: docs.html.j2:184
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -788,11 +758,69 @@ msgid ""
"feature that we are targeting for Taler 1.0. at this time</p>"
msgstr ""
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
+"Customers can stay anonymous, but merchants can not hide their income "
+"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
+"evasion and money laundering</span>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+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 ""
+
+#: features.html.j2:37
+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."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
msgid "Paying with Taler"
msgstr "Pagando com o Taler"
-#: features.html.j2:42
+#: features.html.j2:62
+#, fuzzy
+#| msgid ""
+#| "<p>To pay with Taler, customers install an electronic wallet on their "
+#| "device. Before the first payment, the desired currency must be added to "
+#| "the wallet's balance by some other means of payment.</p> <p>Once the "
+#| "wallet is charged, payments on websites take only one click, are never "
+#| "falsely rejected by fraud detection and do not pose any risk of phishing "
+#| "or identity theft.</p>"
+msgid ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+"<p>Para pagar com o Taler, os clientes instalam uma carteira eletrônica em "
+"seu dispositivo. Antes do primeiro pagamento, a moeda desejada deve ser "
+"adicionada ao saldo da carteira por outros meios de pagamento.</p> <p>Uma "
+"vez que a carteira é cobrada, os pagamentos em sites levam apenas um clique, "
+"nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
+"risco de phishing ou roubo de identidade.</p>"
+
+#: features.html.j2:70
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -802,13 +830,9 @@ msgstr "Pagando com o Taler"
#| "falsely rejected by fraud detection and do not pose any risk of phishing "
#| "or identity theft.</p>"
msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
msgstr ""
"<p>Para pagar com o Taler, os clientes instalam uma carteira eletrônica em "
"seu dispositivo. Antes do primeiro pagamento, a moeda desejada deve ser "
@@ -817,11 +841,15 @@ msgstr ""
"nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
"risco de phishing ou roubo de identidade.</p>"
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
msgid "Receiving payments with Taler"
msgstr "Recebendo pagamentos com o Taler"
-#: features.html.j2:55
+#: features.html.j2:85
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -830,14 +858,10 @@ msgstr "Recebendo pagamentos com o Taler"
#| "Taler transaction processing can run on the merchant's premises or be "
#| "hosted by a third party.</p>"
msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
"make the integration painless. The merchant's backend for Taler transaction "
"processing can run on the merchant's premises or be hosted by a third party."
-"</p> <p>Merchant integration is simple, and customers can pay for products "
-"without even having to register an account.</p> <p><a href=\"https://docs.";
-"taler.net\">See how merchant integration works in our developer "
-"documentation!</a></p>"
msgstr ""
"<p>Para receber pagamentos do Taler, um comerciante precisa de uma conta "
"bancária na moeda desejada. Nós fornecemos software de suporte em várias "
@@ -845,11 +869,21 @@ msgstr ""
"comerciante para o processamento de transações da Taler pode ser executado "
"nas instalações do comerciante ou ser hospedado por um terceiro.</p>"
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
msgid "Practical"
msgstr "Prático"
-#: features.html.j2:77
+#: features.html.j2:116
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
@@ -859,11 +893,11 @@ msgstr ""
"são protegidos criptograficamente e são confirmados em milissegundos com "
"custos de transação extremamente baixos."
-#: features.html.j2:87
+#: features.html.j2:126
msgid "Stable"
msgstr "Estável"
-#: features.html.j2:90
+#: features.html.j2:129
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -876,11 +910,11 @@ msgstr ""
"correspondem às moedas existentes, como Dólares dos EUA, Euros ou até "
"Bitcoins."
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
msgid "Secure"
msgstr "Seguro"
-#: features.html.j2:104
+#: features.html.j2:143
msgid ""
"By design Taler does not suffer from many classes of security problems such "
"as phishing or counterfeit. Thanks to its security features, Taler never "
@@ -891,11 +925,11 @@ msgstr ""
"o Taler nunca rejeita um cliente legítimo devido a um falso positivo de "
"detecção de fraude."
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
msgid "Taxable"
msgstr "Tributável"
-#: features.html.j2:119
+#: features.html.j2:158
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -906,11 +940,11 @@ msgstr ""
"digitais, o Taler ajuda a evitar os mercados negros. O Taler não é adequado "
"para atividades ilegais."
-#: features.html.j2:129
+#: features.html.j2:168
msgid "Private"
msgstr "Privado"
-#: features.html.j2:131
+#: features.html.j2:170
msgid ""
"When you pay with Taler, your identity does not have to be revealed. Just "
"like payments in cash, nobody else can track how you spent your electronic "
@@ -921,11 +955,11 @@ msgstr ""
"gastou seu dinheiro eletrônico. No entanto, você obtém uma prova de "
"pagamento legalmente válida."
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
msgid "Libre"
msgstr "Livre"
-#: features.html.j2:145
+#: features.html.j2:184
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1609,18 +1643,26 @@ msgstr ""
#: gsoc-codeless.html.j2:33
msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
+msgstr ""
+
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
msgstr ""
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:50
msgid ""
"The buyers will access the seller's frontend where the code for the 'Buy "
"Now' button is present. When this button is triggered, they are redirected "
@@ -1630,7 +1672,7 @@ msgid ""
"frontend."
msgstr ""
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
msgid ""
"The other use case of the codeless payment backend is to handle the event "
"when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1638,31 +1680,31 @@ msgid ""
"successful payment, the users are redirected to the fulfilment page."
msgstr ""
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
msgid "Dynamic Merchant Instance"
msgstr ""
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
msgid "Use Case Diagram"
msgstr ""
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
msgid "Link to the contributions made"
msgstr ""
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
msgid "Codeless Payment Backend"
msgstr ""
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
msgid "Future Work"
msgstr ""
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
msgid ""
"The backend of codeless payment is very robust and can be easily extended as "
"per the requirements. It is adaptive to add new features to this framework. "
@@ -1671,7 +1713,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
msgid ""
"To send email notification to the merchant when the stocks run below a "
"certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1679,7 +1721,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
msgid ""
"To add API access to the merchant backend via the codeless payment service. "
"Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1691,7 +1733,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
msgid ""
"Mapping every seller account to a separate merchant backend instance. This "
"is not required for a simple version of codeless payments, but as soon as "
@@ -1699,7 +1741,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1709,7 +1751,7 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
msgid "Screenshots"
msgstr ""
@@ -2051,6 +2093,192 @@ msgstr "Essa página documenta o histórico do GNU Taler."
msgid "GNU Taler in the Press"
msgstr "GNU Taler na imprensa"
+#: principles.html.j2:22
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Design Principles"
+msgstr "GNU Taler na imprensa"
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+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."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+#, fuzzy
+#| msgid "How does Taler protect my privacy?"
+msgid "You deserve some privacy"
+msgstr "Como o Taler protege minha privacidade?"
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+#, fuzzy
+#| msgid "Anti money laundering (AML)"
+msgid "Money laundering"
+msgstr "Antilavagem de dinheiro (AML)"
+
+#: principles.html.j2:99
+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."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+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 ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+#, fuzzy
+#| msgid "General Data Protection Regulation (GDPR)"
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr "Regulação de Proteção de Dados Pessoais (GDPR)"
+
+#: principles.html.j2:134
+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, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:162
+#, fuzzy
+#| msgid "Efficient"
+msgid "7. Be efficient"
+msgstr "Eficiente"
+
+#: principles.html.j2:166
+#, fuzzy
+#| msgid "Efficient"
+msgid "Energy efficiency"
+msgstr "Eficiente"
+
+#: principles.html.j2:168
+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 ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+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."
+msgstr ""
+
#: schemafuzz.html.j2:6
msgid "SchemaFuzz"
msgstr ""
@@ -2191,40 +2419,32 @@ msgstr ""
msgid "Docs"
msgstr ""
-#~ msgid "PhD Student, Inria.."
-#~ msgstr "Estudante de PhD, Inria."
-
-#~ msgid "Software engineer. Works on libebics."
-#~ msgstr "Engenheiro de software. Funciona em libebics."
-
-#~ msgid "Software engineer. Works on Android wallet."
-#~ msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
-
-#~ msgid "Developer Resources"
-#~ msgstr "Recursos para desenvolvedores"
-
-#~ msgid "About"
-#~ msgstr "Sobre"
-
-#~ msgid "For Investors"
-#~ msgstr "Para investidores"
-
-#~ msgid "Citizens"
-#~ msgstr "Cidadãos"
-
-#~ msgid "Merchants"
-#~ msgstr "Comerciantes"
+#, fuzzy
+#~| msgid "exchange"
+#~ msgid "Code (Exchange)"
+#~ msgstr "câmbio <i>(exchange)</i>"
-#~ msgid "Governments"
-#~ msgstr "Governos"
+#, fuzzy
+#~| msgid "The GNU Taler Merchant Backend"
+#~ msgid "Code (Merchant backend)"
+#~ msgstr "O backend de comerciante do GNU Taler"
+#, fuzzy
+#~| msgid ""
+#~| "<p>To pay with Taler, customers install an electronic wallet on their "
+#~| "device. Before the first payment, the desired currency must be added to "
+#~| "the wallet's balance by some other means of payment.</p> <p>Once the "
+#~| "wallet is charged, payments on websites take only one click, are never "
+#~| "falsely rejected by fraud detection and do not pose any risk of phishing "
+#~| "or identity theft.</p>"
#~ msgid ""
#~ "<p>To pay with Taler, customers install an electronic wallet on their "
#~ "device. Before the first payment, the desired currency must be added to "
#~ "the wallet's balance by some other means of payment.</p> <p>Once the "
#~ "wallet is charged, payments on websites take only one click, are never "
#~ "falsely rejected by fraud detection and do not pose any risk of phishing "
-#~ "or identity theft.</p>"
+#~ "or identity theft.</p> <p><a href=\"https://demo.taler.net\";>Try it "
+#~ "yourself with the interactive demo!</a></p>"
#~ msgstr ""
#~ "<p>Para pagar com o Taler, os clientes instalam uma carteira eletrônica "
#~ "em seu dispositivo. Antes do primeiro pagamento, a moeda desejada deve "
@@ -2233,12 +2453,22 @@ msgstr ""
#~ "um clique, nunca são falsamente rejeitados pela detecção de fraude e não "
#~ "apresentam risco de phishing ou roubo de identidade.</p>"
+#, fuzzy
+#~| msgid ""
+#~| "<p>To receive Taler payments, a merchant needs a bank account in the "
+#~| "desired currency. We provide supporting software in various programming "
+#~| "languages to make the integration painless. The merchant's backend for "
+#~| "Taler transaction processing can run on the merchant's premises or be "
+#~| "hosted by a third party.</p>"
#~ msgid ""
#~ "<p>To receive Taler payments, a merchant needs a bank account in the "
#~ "desired currency. We provide supporting software in various programming "
#~ "languages to make the integration painless. The merchant's backend for "
#~ "Taler transaction processing can run on the merchant's premises or be "
-#~ "hosted by a third party.</p>"
+#~ "hosted by a third party.</p> <p>Merchant integration is simple, and "
+#~ "customers can pay for products without even having to register an account."
+#~ "</p> <p><a href=\"https://docs.taler.net\";>See how merchant integration "
+#~ "works in our developer documentation!</a></p>"
#~ msgstr ""
#~ "<p>Para receber pagamentos do Taler, um comerciante precisa de uma conta "
#~ "bancária na moeda desejada. Nós fornecemos software de suporte em várias "
@@ -2247,6 +2477,33 @@ msgstr ""
#~ "executado nas instalações do comerciante ou ser hospedado por um terceiro."
#~ "</p>"
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Estudante de PhD, Inria."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Engenheiro de software. Funciona em libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
+
+#~ msgid "Developer Resources"
+#~ msgstr "Recursos para desenvolvedores"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "For Investors"
+#~ msgstr "Para investidores"
+
+#~ msgid "Citizens"
+#~ msgstr "Cidadãos"
+
+#~ msgid "Merchants"
+#~ msgstr "Comerciantes"
+
+#~ msgid "Governments"
+#~ msgstr "Governos"
+
#~ msgid ""
#~ "Taler uses modern cryptography, ensuring that there is no counterfeit. "
#~ "Your digital wallet is safer than your physical wallet. At most, you can "
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index 1fad3bf..aca8ea9 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: 2019-08-11 11:49+0200\n"
+"POT-Creation-Date: 2019-08-29 15:18+0200\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <address@hidden>\n"
@@ -324,98 +324,72 @@ msgid ""
"circulation during the period of the compromise."
msgstr ""
-#: docs.html.j2:22
+#: docs.html.j2:37
msgid "Tutorial and manual for operating a merchant"
msgstr ""
-#: docs.html.j2:23
+#: docs.html.j2:38
msgid "Also available as"
msgstr ""
-#: docs.html.j2:29
-msgid "Merchant API Tutorial (Command Line)"
+#: docs.html.j2:44
+msgid "Merchant API Tutorial"
msgstr ""
-#: docs.html.j2:31
+#: docs.html.j2:46
msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with command line (and cURL) examples. Also available as"
-msgstr ""
-
-#: docs.html.j2:42
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend's API, "
-"with Python 3 examples. Also available as"
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as"
msgstr ""
-#: docs.html.j2:58
+#: docs.html.j2:57
msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: docs.html.j2:67
+#: docs.html.j2:66
msgid "Bank Integration"
msgstr ""
-#: docs.html.j2:69
+#: docs.html.j2:68
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
-#: docs.html.j2:78
+#: docs.html.j2:83
msgid "Back office"
msgstr ""
-#: docs.html.j2:80
+#: docs.html.j2:85
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: docs.html.j2:105
+#: docs.html.j2:110
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: docs.html.j2:113
+#: docs.html.j2:118
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: docs.html.j2:139
+#: docs.html.j2:144
msgid "The official GNU Taler mailing list."
msgstr ""
-#: docs.html.j2:147
+#: docs.html.j2:152
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: docs.html.j2:155
+#: docs.html.j2:160
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: docs.html.j2:177
-msgid "Code (Exchange)"
-msgstr ""
-
-#: docs.html.j2:179
-msgid "Documented source code (with Doxygen) for the exchange."
-msgstr ""
-
-#: docs.html.j2:185
-msgid "Code (Merchant backend)"
-msgstr ""
-
-#: docs.html.j2:187
-msgid "Documented source code (with Doxygen) for the merchant."
-msgstr ""
-
-#: docs.html.j2:195
-msgid "TBD: Documented source code (with TypeDoc) for the wallet."
-msgstr ""
-
-#: docs.html.j2:201
+#: docs.html.j2:182
msgid "Git repositories"
msgstr ""
-#: docs.html.j2:203
+#: docs.html.j2:184
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -629,53 +603,103 @@ msgid ""
"feature that we are targeting for Taler 1.0. at this time</p>"
msgstr ""
-#: features.html.j2:41
+#: features.html.j2:15
+msgid ""
+"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
+"Customers can stay anonymous, but merchants can not hide their income "
+"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
+"evasion and money laundering</span>."
+msgstr ""
+
+#: features.html.j2:23
+msgid ""
+"The primary use case of GNU Taler is <span class=\"tlr\">payments</span>; it "
+"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
+"always backed by an existing currency."
+msgstr ""
+
+#: features.html.j2:30
+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 ""
+
+#: features.html.j2:37
+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."
+msgstr ""
+
+#: features.html.j2:44
+msgid ""
+"GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
+"such as phishing of credit card information or chargeback fraud. In case of "
+"loss or theft, only the limited amount of money left in the wallet might be "
+"gone."
+msgstr ""
+
+#: features.html.j2:60
msgid "Paying with Taler"
msgstr ""
-#: features.html.j2:42
+#: features.html.j2:62
+msgid ""
+"To pay with Taler, customers install an electronic wallet on their device. "
+"Before the first payment, the desired currency must be added to the wallet's "
+"balance by some other means of payment."
+msgstr ""
+
+#: features.html.j2:70
msgid ""
-"<p>To pay with Taler, customers install an electronic wallet on their "
-"device. Before the first payment, the desired currency must be added to the "
-"wallet's balance by some other means of payment.</p> <p>Once the wallet is "
-"charged, payments on websites take only one click, are never falsely "
-"rejected by fraud detection and do not pose any risk of phishing or identity "
-"theft.</p> <p><a href=\"https://demo.taler.net\";>Try it yourself with the "
-"interactive demo!</a></p>"
+"Once the wallet is charged, payments on websites take only one click, are "
+"never falsely rejected by fraud detection and do not pose any risk of "
+"phishing or identity theft."
msgstr ""
-#: features.html.j2:54
+#: features.html.j2:77
+msgid "Try it yourself with the interactive demo!"
+msgstr ""
+
+#: features.html.j2:83
msgid "Receiving payments with Taler"
msgstr ""
-#: features.html.j2:55
+#: features.html.j2:85
msgid ""
-"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
"make the integration painless. The merchant's backend for Taler transaction "
"processing can run on the merchant's premises or be hosted by a third party."
-"</p> <p>Merchant integration is simple, and customers can pay for products "
-"without even having to register an account.</p> <p><a href=\"https://docs.";
-"taler.net\">See how merchant integration works in our developer "
-"documentation!</a></p>"
msgstr ""
-#: features.html.j2:74
+#: features.html.j2:94
+msgid ""
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
+msgstr ""
+
+#: features.html.j2:99
+msgid "See how merchant integration works in our developer documentation!"
+msgstr ""
+
+#: features.html.j2:113
msgid "Practical"
msgstr ""
-#: features.html.j2:77
+#: features.html.j2:116
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
"extremely low transaction costs."
msgstr ""
-#: features.html.j2:87
+#: features.html.j2:126
msgid "Stable"
msgstr ""
-#: features.html.j2:90
+#: features.html.j2:129
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -683,44 +707,44 @@ msgid ""
"currencies, such as US Dollars, Euros or even Bitcoins."
msgstr ""
-#: features.html.j2:101 governments.html.j2:58 merchants.html.j2:41
+#: features.html.j2:140 governments.html.j2:58 merchants.html.j2:41
msgid "Secure"
msgstr ""
-#: features.html.j2:104
+#: features.html.j2:143
msgid ""
"By design Taler does not suffer from many classes of security problems such "
"as phishing or counterfeit. Thanks to its security features, Taler never "
"rejects a legitimate customer due to a fraud-detection false positive."
msgstr ""
-#: features.html.j2:116 governments.html.j2:25
+#: features.html.j2:155 governments.html.j2:25
msgid "Taxable"
msgstr ""
-#: features.html.j2:119
+#: features.html.j2:158
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
"black markets. Taler is not suitable for illegal activities."
msgstr ""
-#: features.html.j2:129
+#: features.html.j2:168
msgid "Private"
msgstr ""
-#: features.html.j2:131
+#: features.html.j2:170
msgid ""
"When you pay with Taler, your identity does not have to be revealed. Just "
"like payments in cash, nobody else can track how you spent your electronic "
"money. However, you obtain a legally valid proof of payment."
msgstr ""
-#: features.html.j2:142 governments.html.j2:88
+#: features.html.j2:181 governments.html.j2:88
msgid "Libre"
msgstr ""
-#: features.html.j2:145
+#: features.html.j2:184
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
@@ -1276,18 +1300,26 @@ msgstr ""
#: gsoc-codeless.html.j2:33
msgid ""
-"Merchant has the flexibility to add two types of inventory as follows: <ul> "
-"<li>The merchant can upload digital inventory (like a PDF or HTML page) via "
-"the codeless payments frontend and the user can then purchase it and view "
-"the version hosted by the codeless payment frontend.</li> <li>The merchant "
-"can add any physical inventory available in his stocks. While adding these "
-"inventory, the seller is prompted to add minimum quantity of product that is "
-"required to be maintained in the stock. Whenever the stocks run below this "
-"limit the seller would be notified (currently this feature has not been "
-"added but soon email notification would be added).</li> </ul>"
+"A merchant has the flexibility to add two types of inventory as follows:"
+msgstr ""
+
+#: gsoc-codeless.html.j2:38
+msgid ""
+"The merchant can upload digital inventory (like a PDF or HTML page) via the "
+"codeless payments frontend and the user can then purchase it and view the "
+"version hosted by the codeless payment frontend."
msgstr ""
-#: gsoc-codeless.html.j2:42
+#: gsoc-codeless.html.j2:43
+msgid ""
+"The merchant can add any physical inventory available in his stocks. While "
+"adding these inventory, the seller is prompted to add minimum quantity of "
+"product that is required to be maintained in the stock. Whenever the stocks "
+"run below this limit the seller would be notified (currently this feature "
+"has not been added but soon email notification would be added)."
+msgstr ""
+
+#: gsoc-codeless.html.j2:50
msgid ""
"The buyers will access the seller's frontend where the code for the 'Buy "
"Now' button is present. When this button is triggered, they are redirected "
@@ -1297,7 +1329,7 @@ msgid ""
"frontend."
msgstr ""
-#: gsoc-codeless.html.j2:47
+#: gsoc-codeless.html.j2:55
msgid ""
"The other use case of the codeless payment backend is to handle the event "
"when the 'Buy Now' button is triggered on the seller's frontend. To perform "
@@ -1305,31 +1337,31 @@ msgid ""
"successful payment, the users are redirected to the fulfilment page."
msgstr ""
-#: gsoc-codeless.html.j2:53
+#: gsoc-codeless.html.j2:61
msgid "Dynamic Merchant Instance"
msgstr ""
-#: gsoc-codeless.html.j2:57
+#: gsoc-codeless.html.j2:65
msgid "Use Case Diagram"
msgstr ""
-#: gsoc-codeless.html.j2:63
+#: gsoc-codeless.html.j2:71
msgid "Link to the contributions made"
msgstr ""
-#: gsoc-codeless.html.j2:66
+#: gsoc-codeless.html.j2:74
msgid "Codeless Payment Backend"
msgstr ""
-#: gsoc-codeless.html.j2:68
+#: gsoc-codeless.html.j2:76
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: gsoc-codeless.html.j2:77
+#: gsoc-codeless.html.j2:85
msgid "Future Work"
msgstr ""
-#: gsoc-codeless.html.j2:79
+#: gsoc-codeless.html.j2:87
msgid ""
"The backend of codeless payment is very robust and can be easily extended as "
"per the requirements. It is adaptive to add new features to this framework. "
@@ -1338,7 +1370,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: gsoc-codeless.html.j2:84
+#: gsoc-codeless.html.j2:92
msgid ""
"To send email notification to the merchant when the stocks run below a "
"certain limit. The minimum quantity required to be maintained in the stocks "
@@ -1346,7 +1378,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: gsoc-codeless.html.j2:90
+#: gsoc-codeless.html.j2:98
msgid ""
"To add API access to the merchant backend via the codeless payment service. "
"Basically, it would be used as a hosting platform for multiple merchants. "
@@ -1358,7 +1390,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: gsoc-codeless.html.j2:96
+#: gsoc-codeless.html.j2:104
msgid ""
"Mapping every seller account to a separate merchant backend instance. This "
"is not required for a simple version of codeless payments, but as soon as "
@@ -1366,7 +1398,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: gsoc-codeless.html.j2:102
+#: gsoc-codeless.html.j2:110
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1376,7 +1408,7 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: gsoc-codeless.html.j2:114
+#: gsoc-codeless.html.j2:122
msgid "Screenshots"
msgstr ""
@@ -1635,6 +1667,180 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr ""
+#: principles.html.j2:22
+msgid "GNU Taler: Design Principles"
+msgstr ""
+
+#: principles.html.j2:29
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
+msgstr ""
+
+#: principles.html.j2:36
+msgid "1. Free Software implementation"
+msgstr ""
+
+#: principles.html.j2:40
+msgid ""
+"... in the are of computing, freedom means not using proprietary software"
+msgstr ""
+
+#: principles.html.j2:42
+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."
+msgstr ""
+
+#: principles.html.j2:51
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:63
+msgid "2. Protect the privacy of buyers"
+msgstr ""
+
+#: principles.html.j2:68
+msgid "You deserve some privacy"
+msgstr ""
+
+#: principles.html.j2:70
+msgid ""
+"Privacy should be guaranteed via technical measures, as opposed to mere "
+"policies. Especially with micropayments for online content, a disproportion- "
+"ate amount of rather private data about buyers would be revealed, if the "
+"payment system does not have privacy protections."
+msgstr ""
+
+#: principles.html.j2:78
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:92
+msgid ""
+"3. Enable the state to tax income and crack down on illegal business "
+"activities"
+msgstr ""
+
+#: principles.html.j2:97
+msgid "Money laundering"
+msgstr ""
+
+#: principles.html.j2:99
+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."
+msgstr ""
+
+#: principles.html.j2:110
+msgid "4. Prevent payment fraud"
+msgstr ""
+
+#: principles.html.j2:115
+msgid "Phishing attack"
+msgstr ""
+
+#: principles.html.j2:117
+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 ""
+
+#: principles.html.j2:128
+msgid "5. Only disclose the minimal amount of information necessary"
+msgstr ""
+
+#: principles.html.j2:132
+msgid ""
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
+msgstr ""
+
+#: principles.html.j2:134
+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, "
+"for example, by keeping details about the merchant’s financials hidden from "
+"competitors."
+msgstr ""
+
+#: principles.html.j2:144
+msgid "6. Be usable"
+msgstr ""
+
+#: principles.html.j2:148
+msgid "Buy with one click"
+msgstr ""
+
+#: principles.html.j2:150
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:162
+msgid "7. Be efficient"
+msgstr ""
+
+#: principles.html.j2:166
+msgid "Energy efficiency"
+msgstr ""
+
+#: principles.html.j2:168
+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 ""
+
+#: principles.html.j2:177
+msgid "8. Fault-tolerant design"
+msgstr ""
+
+#: principles.html.j2:181
+msgid "Life Safers"
+msgstr ""
+
+#: principles.html.j2:183
+msgid ""
+"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."
+msgstr ""
+
+#: principles.html.j2:195
+msgid "9. Foster competition"
+msgstr ""
+
+#: principles.html.j2:199
+msgid "A competitive market"
+msgstr ""
+
+#: principles.html.j2:201
+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."
+msgstr ""
+
#: schemafuzz.html.j2:6
msgid "SchemaFuzz"
msgstr ""
diff --git a/web-common b/web-common
index dc9d5ab..caf5a98 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bfb
+Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [taler-www] branch master updated (348648c -> a766b53),
gnunet <=