summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locale/de/LC_MESSAGES/messages.po531
-rw-r--r--locale/en/LC_MESSAGES/messages.po485
-rw-r--r--locale/es/LC_MESSAGES/messages.po524
-rw-r--r--locale/fr/LC_MESSAGES/messages.po485
-rw-r--r--locale/it/LC_MESSAGES/messages.po524
-rw-r--r--locale/pt/LC_MESSAGES/messages.po524
-rw-r--r--locale/ru/LC_MESSAGES/messages.po485
-rw-r--r--template/contact.html.j2121
-rw-r--r--template/copyright.html.j24
-rw-r--r--template/developers.html.j236
-rw-r--r--template/docs.html.j254
-rw-r--r--template/faq.html.j2386
-rw-r--r--template/features.html.j23
-rw-r--r--template/gsoc-codeless.html.j228
-rw-r--r--template/index.html.j217
-rw-r--r--template/investors.html.j21
-rw-r--r--template/news.html.j22
-rw-r--r--template/press.html.j28
-rw-r--r--template/principles.html.j22
-rw-r--r--template/team.html.j26
20 files changed, 2636 insertions, 1590 deletions
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 2372bad..f3ce8ed 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-09-03 09:57+0000\n"
+"POT-Creation-Date: 2019-09-03 12:13+0000\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: de <LL@li.org, de@taler.net>\n"
@@ -98,29 +98,22 @@ msgid "The mailing list"
msgstr "Die Mailing-Liste"
#: template/contact.html.j2:15
-#, fuzzy
-#| msgid ""
-#| "An archived, public mailing list for GNU Taler is\n"
-#| "hosted at\n"
-#| "<a href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists."
-#| "gnu.org/mailman/listinfo/taler</a>. You can send messages to the list\n"
-#| "at <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
msgstr ""
-"Eine öffentliche Mailing-Liste wird archiviert bereitgestellt auf <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. Nachrichten an die Liste sendet man an <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
-#: template/contact.html.j2:26
+#: template/contact.html.j2:29
msgid "Contacting individuals"
msgstr "Mitglieder kontaktieren"
-#: template/contact.html.j2:28
+#: template/contact.html.j2:31
#, fuzzy
#| msgid ""
#| "Team members are generally reachable at\n"
@@ -133,21 +126,29 @@ msgstr ""
"Die Mitglieder des Taler-Teams sind erreichbar mit einer E-Mail an "
"<tt>LASTNAME@taler.net</tt>, die GnuPG-verschlüsselt empfangen wird. "
-#: template/contact.html.j2:37
+#: template/contact.html.j2:40
msgid "General inquiries"
msgstr ""
-#: template/contact.html.j2:39
+#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:50
msgid "Reporting bugs"
msgstr "Funktionserweiterungen, Fehler und Bugs melden"
-#: template/contact.html.j2:49
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
#, fuzzy
#| msgid ""
#| "We track open feature requests and bugs in our\n"
@@ -156,20 +157,19 @@ msgstr "Funktionserweiterungen, Fehler und Bugs melden"
#| "You can also report bugs or feature requests to the\n"
#| "mailing list.\n"
msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
msgstr ""
"Wir verfolgen Bugs und Anfragen zu erweiterten Funktionalitäten zusammen mit "
"dem GNU-Project auf <a href=\"https://gnunet.org/bugs/\">Bug tracker</a>.\n"
" Bugs oder Funktionsanfragen können auch an die Mailing-Liste gesendet "
"werden."
-#: template/contact.html.j2:60
+#: template/contact.html.j2:65
msgid "Executive team"
msgstr "Leitungsteam"
-#: template/contact.html.j2:62
+#: template/contact.html.j2:67
#, fuzzy
#| msgid ""
#| "For non-technical commercial requests, please contact\n"
@@ -192,10 +192,14 @@ msgid ""
msgstr ""
#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
msgid "of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:22
+#: template/copyright.html.j2:24
msgid ""
"The agreements ensure that the code will continue to be made available under "
"free software licenses, but gives developers the freedom to move code "
@@ -204,7 +208,7 @@ msgid ""
"stores that are hostile to free software)."
msgstr ""
-#: template/copyright.html.j2:32
+#: template/copyright.html.j2:34
msgid ""
"Minor contributions (basically, anyone without Git access) do not require "
"copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -289,7 +293,7 @@ msgstr ""
"Dokumentation des Taler-Protokolls befindet sich auf <a href=\"https://docs."
"taler.net/\">docs.taler.net</a>."
-#: template/developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
msgid "Code"
msgstr "Code"
@@ -322,45 +326,45 @@ msgstr ""
"<tt>git.taler.net</tt> geklont werden. Eine Liste der Repositories befindet "
"sich auf unserem <a href=\"https://git.taler.net/\">GitWeb</a>."
-#: template/developers.html.j2:82
+#: template/developers.html.j2:80
msgid "Documentation"
msgstr "Dokumentation"
-#: template/developers.html.j2:85
+#: template/developers.html.j2:83
msgid "In addition to this website, the"
msgstr ""
-#: template/developers.html.j2:89
+#: template/developers.html.j2:86
msgid "documented code"
msgstr ""
-#: template/developers.html.j2:93
+#: template/developers.html.j2:87
#, fuzzy
#| msgid "and"
msgid "and the"
msgstr "und"
-#: template/developers.html.j2:97
+#: template/developers.html.j2:90
#, fuzzy
#| msgid "Documentation"
msgid "API documentation"
msgstr "Dokumentation"
-#: template/developers.html.j2:101
+#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
msgstr ""
-#: template/developers.html.j2:105
+#: template/developers.html.j2:94
#, fuzzy
#| msgid "GNU Taler Bibliography"
-msgid "bibliography</a>."
+msgid "bibliography"
msgstr "Bibliografie von GNU Taler"
-#: template/developers.html.j2:111
+#: template/developers.html.j2:98
msgid "Discussion"
msgstr "Diskussion"
-#: template/developers.html.j2:114
+#: template/developers.html.j2:101
#, fuzzy
#| msgid ""
#| "We have a mailing list for developer discussions.\n"
@@ -376,31 +380,37 @@ msgstr ""
"lists.gnu.org/mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/"
"taler</a>."
-#: template/developers.html.j2:124
+#: template/developers.html.j2:111
msgid "Regression Testing"
msgstr "Regressiontests mit Buildbot"
-#: template/developers.html.j2:127
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
#, fuzzy
#| msgid ""
#| "We have <a href=\"https://buildbot.net/\">Buildbot</a>\n"
#| "automation tests to detect regressions and check for\n"
#| "portability at <a\n"
#| "href=\"https://buildbot.taler.net/\">buildbot.taler.net</a>.\n"
-msgid ""
-"We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests to "
-"detect regressions and check for portability at"
+msgid "automation tests to detect regressions and check for portability at"
msgstr ""
"Unter <a href=\"https://buildbot.taler.net/\">buildbot.taler.net</a> "
"befinden sich Ergebnisse der Testumgebung <a href=\"https://buildbot.net/"
"\">Buildbot</a>, um Fehler nach Modifikationen aufzeigen zu können und die "
"Portabilität des Codes zu gewährleisten."
-#: template/developers.html.j2:136
+#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
msgstr "Testabdeckung"
-#: template/developers.html.j2:139
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
#, fuzzy
#| msgid ""
#| "We use\n"
@@ -408,27 +418,25 @@ msgstr "Testabdeckung"
#| "to analyze the code coverage of our tests, the\n"
#| "results are available\n"
#| "at <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>.\n"
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at"
+msgid "to analyze the code coverage of our tests, the results are available at"
msgstr ""
"Wir verwenden <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</"
"a>, um die Testabdeckung unserer Funktionstests zu analysieren, die "
"Ergebnisse sind auf <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
-#: template/developers.html.j2:154
+#: template/developers.html.j2:146
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:157 template/investors.html.j2:92
+#: template/developers.html.j2:149 template/investors.html.j2:93
msgid "Download"
msgstr ""
-#: template/developers.html.j2:173
+#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr "Das Taler-System im Überblick"
-#: template/developers.html.j2:176
+#: template/developers.html.j2:168
#, fuzzy
#| msgid ""
#| "The Taler system consists of protocols executed among\n"
@@ -442,13 +450,13 @@ msgstr ""
"Das Taler-Bezahlsystem verwendet Protokolle für den Geldfluss zwischen den "
"Beteiligten. Die grundlegenden Transaktionen sind in der Grafik dargestellt:"
-#: template/developers.html.j2:183
+#: template/developers.html.j2:175
#, fuzzy
#| msgid "Taler system overview"
msgid "system overview"
msgstr "Das Taler-System im Überblick"
-#: template/developers.html.j2:186
+#: template/developers.html.j2:178
#, fuzzy
#| msgid ""
#| "A customer instructs his <b>bank</b> to\n"
@@ -470,7 +478,7 @@ msgstr ""
"Überweisung nennen sie eine Transaktionsnummer ihrer Taler-Geldbörse. Damit "
"bilden sie eine Münzen-Reserve bei der Taler-Wechselstube."
-#: template/developers.html.j2:198
+#: template/developers.html.j2:190
#, fuzzy
#| msgid ""
#| "Once the exchange has received the wire\n"
@@ -506,7 +514,7 @@ msgstr ""
"nicht mehr nachvollzogen werden kann, welcher Käufer von welchem Verkäufer "
"welche Güter erwarb. Auch die Güter selbst bleiben unbekannt."
-#: template/developers.html.j2:216
+#: template/developers.html.j2:208
#, fuzzy
#| msgid ""
#| "Once the customer has the digital coins in his\n"
@@ -552,7 +560,7 @@ msgstr ""
"beliebige Teilbetrag von Münzen aus der Taler-Geldbörse verwendet werden, "
"das System sorgt für das korrekte Wechselgeld."
-#: template/developers.html.j2:238
+#: template/developers.html.j2:230
#, fuzzy
#| msgid ""
#| "Merchants receiving digital\n"
@@ -595,7 +603,7 @@ msgstr ""
"auf diese Weise den Staat, ausnahmslos alle Verkäufer zu ihren "
"Steuerzahlungen zu verpflichten und von illegalen Geschäften abzuhalten."
-#: template/developers.html.j2:261
+#: template/developers.html.j2:253
#, fuzzy
#| msgid ""
#| "Finally, the exchange transfers funds\n"
@@ -622,7 +630,7 @@ msgstr ""
"Möglichkeit, ihre angemeldeten Forderungen und deren Überweisung an die "
"Geschäftsbank bei der Taler-Wechselstube abzufragen."
-#: template/developers.html.j2:275
+#: template/developers.html.j2:267
#, fuzzy
#| msgid ""
#| "Most importantly, the exchange keeps\n"
@@ -652,7 +660,7 @@ msgstr ""
"können. Dabei vergleichen sie die Übereinstimmung der im Umlauf befindlichen "
"Summe von digitalen Münzen mit den Überweisungen an Geschäftsbanken."
-#: template/developers.html.j2:290
+#: template/developers.html.j2:282
#, fuzzy
#| msgid ""
#| "Without the auditor, the exchange operators\n"
@@ -679,6 +687,12 @@ msgstr ""
"digitalen Münzen auf dem jeweiligen Computer zum Zeitpunkt der "
"Schadensentstehung."
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "Taler in den Medien"
+
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
@@ -686,86 +700,112 @@ msgid ""
"\">here</a>."
msgstr ""
-#: template/docs.html.j2:39
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Also available as"
+msgid "Tutorial and manual for operating a merchant. Also available as"
msgstr ""
-#: template/docs.html.j2:46
+#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:48
-#, python-format
+#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:60
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:70
+#: template/docs.html.j2:64
+msgid "Operator's manual for the GNU Taler exchange. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:74
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:72
-#, python-format
+#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:88
+#: template/docs.html.j2:92
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:90
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:94
+msgid "Manual to run the back-office Web application. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:120
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:124
-#, python-format
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
msgid ""
-"Description of our taler.net setup and how to contribute. Also available as "
-"<a href=\"https://%(docshost)s/pdf/onboarding.pdf\">PDF</a>."
+"Description of our taler.net setup and how to contribute. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:143
+msgid "Community"
msgstr ""
-#: template/docs.html.j2:150
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "Die Mailing-Liste"
+
+#: template/docs.html.j2:156
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "Die Mailing-Liste"
-#: template/docs.html.j2:158
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:166
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:194
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:196
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -942,7 +982,7 @@ msgstr "Taler bietet jedoch derzeitig keinen Umtausch zwischen Währungen."
msgid "How does Taler protect my privacy?"
msgstr "Wie schützt Taler meine privaten Daten?"
-#: template/faq.html.j2:90
+#: template/faq.html.j2:91
#, fuzzy
#| msgid ""
#| "<p>Your wallet stores digital coins that are <a\n"
@@ -952,10 +992,10 @@ msgstr "Wie schützt Taler meine privaten Daten?"
#| "for which customer.</p>\n"
#| "\n"
msgid ""
-"<p> Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer. </p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
msgstr ""
"Deine Geldbörse speichert digitale \"Münzen\", die von der Wechselstube "
"blind signiert sind (siehe <a href=\"https://de.wikipedia.org/wiki/"
@@ -963,13 +1003,13 @@ msgstr ""
"privaten Daten, weil die Taler-Wechselstube dadurch keine Kenntnis davon "
"erlangt, welche der Münzen von welchen Käufern sie signiert."
-#: template/faq.html.j2:100
+#: template/faq.html.j2:101
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:103
msgid ""
-"<p> The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
"refunding coins. Operators can also charge fees for closing reserves and for "
"(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -977,87 +1017,86 @@ msgid ""
"0.001 cent/transaction (at high transaction rates, amortized over billions "
"of transactions, excluding migration costs). Note that this is an early "
"estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher. </p>"
+"regulator and could thus easily be 10x higher."
msgstr ""
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:118
+#: template/faq.html.j2:119
msgid ""
-"<p> Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future. </p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
msgstr ""
-#: template/faq.html.j2:131
+#: template/faq.html.j2:130
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
#: template/faq.html.j2:132
msgid ""
-"<p> We believe the European Electronic Money Directive provides part of the "
+"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
-"have to follow. </p>"
+"have to follow."
msgstr ""
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:142
+#: template/faq.html.j2:141
msgid ""
-"<p> The exchange would be operated by a bank or in cooperation with a bank, "
-"and that bank would hold the funds in escrow. Note that this bank could be a "
+"The exchange would be operated by a bank or in cooperation with a bank, and "
+"that bank would hold the funds in escrow. Note that this bank could be a "
"regular bank or a central bank for a centrally banked electronic currency. "
"Regardless, the bank would fall under the respective banking regulations "
"establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money. </p>"
+"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:153
+#: template/faq.html.j2:152
msgid ""
-"<p> Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
"the auditors, but auditors may also provide a method for manual submission "
"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public. </p>"
+"respective regulatory authorities, or even the general public."
msgstr ""
-#: template/faq.html.j2:163
+#: template/faq.html.j2:161
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:164
+#: template/faq.html.j2:163
msgid ""
-"<p> We are aware of several businesses running exploratory projects or "
-"having developed working prototypes. We are also in discussions with several "
+"We are aware of several businesses running exploratory projects or having "
+"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
"be premature given the state of the project (see also <a href=\"https://"
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues). </p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:176
+#: template/faq.html.j2:174
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:177
+#: template/faq.html.j2:176
msgid ""
-"<p> Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
"in theory possible with Taler, but they come with a few caveats. "
"Specifically, recurring payments can only work if the Taler wallet is "
@@ -1069,10 +1108,16 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time </p>"
+"feature that we are targeting for Taler 1.0. at this time"
msgstr ""
-#: template/features.html.j2:14
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "Taler in den Medien"
+
+#: template/features.html.j2:13
msgid ""
"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
"Customers can stay anonymous, but merchants can not hide their income "
@@ -1080,28 +1125,28 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
-#: template/features.html.j2:24
+#: template/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 ""
-#: template/features.html.j2:33
+#: template/features.html.j2:32
msgid ""
"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-#: template/features.html.j2:42
+#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-#: template/features.html.j2:51
+#: template/features.html.j2:50
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 "
@@ -1109,11 +1154,11 @@ msgid ""
"gone."
msgstr ""
-#: template/features.html.j2:70
+#: template/features.html.j2:69
msgid "Paying with Taler"
msgstr "Bezahlen mit Taler"
-#: template/features.html.j2:72
+#: template/features.html.j2:71
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet\n"
@@ -1137,7 +1182,7 @@ msgstr ""
"(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
"Daten übermittelt."
-#: template/features.html.j2:80
+#: template/features.html.j2:79
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet\n"
@@ -1161,15 +1206,15 @@ msgstr ""
"(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
"Daten übermittelt."
-#: template/features.html.j2:88
+#: template/features.html.j2:87
msgid "Try it yourself with the interactive demo!"
msgstr ""
-#: template/features.html.j2:95
+#: template/features.html.j2:94
msgid "Receiving payments with Taler"
msgstr "Verkaufen mit Taler"
-#: template/features.html.j2:97
+#: template/features.html.j2:96
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account\n"
@@ -1190,21 +1235,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."
-#: template/features.html.j2:106
+#: template/features.html.j2:105
msgid ""
"Merchant integration is simple, and customers can pay for products without "
"even having to register an account."
msgstr ""
-#: template/features.html.j2:113
+#: template/features.html.j2:112
msgid "See how merchant integration works in our developer documentation!"
msgstr ""
-#: template/features.html.j2:128
+#: template/features.html.j2:127
msgid "Practical"
msgstr "Praktisch"
-#: template/features.html.j2:131
+#: template/features.html.j2:130
#, fuzzy
#| msgid ""
#| "Taler is easy to integrate with existing Web\n"
@@ -1220,11 +1265,11 @@ msgstr ""
"Zahlungen sind kryptographisch verschlüsselt, innerhalb von Millisekunden "
"bestätigt und extrem kostengünstig."
-#: template/features.html.j2:141
+#: template/features.html.j2:140
msgid "Stable"
msgstr "Stabil"
-#: template/features.html.j2:144
+#: template/features.html.j2:143
#, fuzzy
#| msgid ""
#| "Taler does not introduce a new currency. Taler\n"
@@ -1244,12 +1289,12 @@ msgstr ""
"also sagen, dass die kryptografischen Taler-Münzen herkömmlichen Währungen "
"wie US-Dollar, Euro oder sogar Bitcoin entsprechen."
-#: template/features.html.j2:155 template/governments.html.j2:55
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr "Sicher"
-#: template/features.html.j2:158
+#: template/features.html.j2:157
#, fuzzy
#| msgid ""
#| "By design Taler does not suffer from many classes\n"
@@ -1265,11 +1310,11 @@ msgstr ""
"Phishing und wird gleichzeitig jedoch niemals Käufern betrügerische "
"Absichten unterstellen können."
-#: template/features.html.j2:170 template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr "Besteuerbar"
-#: template/features.html.j2:173
+#: template/features.html.j2:172
#, fuzzy
#| msgid ""
#| "When using Taler, merchant's revenue is transparent for tax\n"
@@ -1287,11 +1332,11 @@ msgstr ""
"Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für illegale "
"Geschäfte."
-#: template/features.html.j2:183
+#: template/features.html.j2:182
msgid "Private"
msgstr "Anonym"
-#: template/features.html.j2:185
+#: template/features.html.j2:184
#, fuzzy
#| msgid ""
#| "When you pay with Taler, your identity does not\n"
@@ -1310,11 +1355,11 @@ msgstr ""
"garantiert einen Nachweis über ihre Zahlung und den erfolgten "
"Eigentumsübergang."
-#: template/features.html.j2:196 template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr "Frei"
-#: template/features.html.j2:199
+#: template/features.html.j2:198
#, fuzzy
#| msgid ""
#| "Taler provides protocols and reference implementations that in\n"
@@ -1332,7 +1377,7 @@ msgstr ""
"Staaten geeignet sind. Die Referenzanwendung als <a href=\"http://www.gnu."
"org/\">GNU-Package</a> wird immer freie Software sein und bleiben."
-#: template/features.html.j2:206
+#: template/features.html.j2:205
msgid "package, it will always remain free software."
msgstr ""
@@ -2099,27 +2144,38 @@ msgstr ""
msgid "Dynamic Merchant Instance"
msgstr ""
-#: template/gsoc-codeless.html.j2:97
-msgid "Use Case Diagram"
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"merchant-instance\">here</a>."
msgstr ""
#: template/gsoc-codeless.html.j2:103
+msgid "Use Case Diagram"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:109
msgid "Link to the contributions made"
msgstr ""
-#: template/gsoc-codeless.html.j2:106
+#: template/gsoc-codeless.html.j2:113
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:108
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:127
msgid "Future Work"
msgstr ""
-#: template/gsoc-codeless.html.j2:120
+#: template/gsoc-codeless.html.j2:130
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. "
@@ -2128,7 +2184,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: template/gsoc-codeless.html.j2:130
+#: template/gsoc-codeless.html.j2:140
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 "
@@ -2136,7 +2192,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: template/gsoc-codeless.html.j2:140
+#: template/gsoc-codeless.html.j2:150
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. "
@@ -2148,7 +2204,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: template/gsoc-codeless.html.j2:154
+#: template/gsoc-codeless.html.j2:164
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 "
@@ -2156,7 +2212,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: template/gsoc-codeless.html.j2:164
+#: template/gsoc-codeless.html.j2:174
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -2166,10 +2222,56 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: template/gsoc-codeless.html.j2:181
+#: template/gsoc-codeless.html.j2:191
msgid "Screenshots"
msgstr ""
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
#: template/investors.html.j2:6
msgid "Invest in Taler!"
msgstr "In Taler investieren!"
@@ -2223,11 +2325,11 @@ msgid ""
"and the"
msgstr ""
-#: template/investors.html.j2:49
+#: template/investors.html.j2:50
msgid "The Technology"
msgstr "Die Technologie"
-#: template/investors.html.j2:52
+#: template/investors.html.j2:53
#, fuzzy
#| msgid ""
#| "All transactions in Taler are secured using <a href=\"bibliography.html"
@@ -2260,11 +2362,11 @@ msgstr ""
"Beteiligten dar. Die Buchungskosten betragen übrigens nur Bruchteile eines "
"Cent pro Buchung."
-#: template/investors.html.j2:65
+#: template/investors.html.j2:66
msgid "The Business"
msgstr "Das Geschäftsmodell des Taler-Bezahlsystems"
-#: template/investors.html.j2:67
+#: template/investors.html.j2:68
#, fuzzy
#| msgid ""
#| "The scalable business model for Taler is the operation\n"
@@ -2294,22 +2396,22 @@ msgstr ""
"gutgeschrieben bekommt. Die Wechselstube erhebt für die Überweisungen "
"geringe Gebühren."
-#: template/investors.html.j2:86
+#: template/investors.html.j2:87
msgid "The Business Case"
msgstr "Der Businessplan"
-#: template/investors.html.j2:96
+#: template/investors.html.j2:97
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:119
+#: template/investors.html.j2:120
msgid "Running a Taler payment service operator"
msgstr "Ein Taler-Bezahlsystem als Serviceanbieter betreiben"
-#: template/investors.html.j2:122
+#: template/investors.html.j2:123
#, fuzzy
#| msgid ""
#| "The payment service operator runs the <em>Taler exchange</em>.\n"
@@ -2328,7 +2430,7 @@ msgstr ""
"Banküberweisungen von und zu Geschäftsbanken und für den Betrieb der IT-"
"Infrastruktur."
-#: template/investors.html.j2:132
+#: template/investors.html.j2:133
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2336,7 +2438,7 @@ msgstr ""
"Die Kosten für die kryptographischen Berechnungen, die Bandbreite und "
"Datenspeicherung betragen weniger als 0,01 Eurocent pro Transaktion."
-#: template/investors.html.j2:133
+#: template/investors.html.j2:134
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2345,7 +2447,7 @@ msgstr ""
"können mehrere kleine Überweisungen auf das Girokonto der Verkäufer in einer "
"Transaktion zusammengefasst und übertragen werden."
-#: template/investors.html.j2:134
+#: template/investors.html.j2:135
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2355,11 +2457,11 @@ msgstr ""
"Geldbörse, Deponieren von Münzen, Refresh-Funktion, Erstattungen und "
"aggregierte Überweisungen an Geschäftsbanken."
-#: template/investors.html.j2:135
+#: template/investors.html.j2:136
msgid "Partnership with banks establishes consumer trust."
msgstr "Partnerschaften mit Banken erhöhen das Kundenvertrauen."
-#: template/investors.html.j2:136
+#: template/investors.html.j2:137
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"Partnerschaften mit der Free-Software-Bewegung ermöglichen eine rasche "
@@ -2617,6 +2719,10 @@ msgstr ""
msgid "customer perspective"
msgstr ""
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
#: template/news.html.j2:16
msgid "More news"
msgstr ""
@@ -2635,6 +2741,22 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr "Taler in den Medien"
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
#: template/principles.html.j2:21
#, fuzzy
#| msgid "GNU Taler in the Press"
@@ -2652,7 +2774,7 @@ msgstr ""
#: template/principles.html.j2:33
msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
msgstr ""
#: template/principles.html.j2:36
@@ -2825,6 +2947,12 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: template/team.html.j2:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "Das Taler-Bezahlsystem"
+
#: template/team.html.j2:8
msgid ""
"GNU Taler is proudly brought to you by the humans on this page. To contact "
@@ -2839,9 +2967,13 @@ msgstr ""
"GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
#: template/team.html.j2:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
msgid ""
"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
msgstr ""
"Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
"verschiedenen Branchen..."
@@ -2851,7 +2983,7 @@ msgid "Lawyer and banker."
msgstr ""
#: template/team.html.j2:38
-msgid "GNU mainatiner, lead developer."
+msgid "GNU maintainer, lead developer."
msgstr ""
#: template/team.html.j2:43
@@ -2985,3 +3117,26 @@ msgstr ""
#: template/wallet.html.j2:241
msgid "Wallets for other browsers will be provided in the near future."
msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| "An archived, public mailing list for GNU Taler is\n"
+#~| "hosted at\n"
+#~| "<a href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists."
+#~| "gnu.org/mailman/listinfo/taler</a>. You can send messages to the list\n"
+#~| "at <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+#~ msgid ""
+#~ "An archived, public mailing list for GNU Taler is hosted at <a href="
+#~ "\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+#~ "mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+#~ "\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+#~ msgstr ""
+#~ "Eine öffentliche Mailing-Liste wird archiviert bereitgestellt auf <a href="
+#~ "\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+#~ "mailman/listinfo/taler</a>. Nachrichten an die Liste sendet man an <a "
+#~ "href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+
+#, fuzzy
+#~| msgid "GNU Taler Bibliography"
+#~ msgid "bibliography</a>."
+#~ msgstr "Bibliografie von GNU Taler"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index c574ad8..90a70d8 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-09-03 09:57+0000\n"
+"POT-Creation-Date: 2019-09-03 12:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@@ -94,49 +94,60 @@ msgid "The mailing list"
msgstr ""
#: template/contact.html.j2:15
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
msgstr ""
-#: template/contact.html.j2:26
+#: template/contact.html.j2:29
msgid "Contacting individuals"
msgstr ""
-#: template/contact.html.j2:28
+#: template/contact.html.j2:31
msgid ""
"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
"us support receiving GnuPG encrypted e-mails."
msgstr ""
-#: template/contact.html.j2:37
+#: template/contact.html.j2:40
msgid "General inquiries"
msgstr ""
-#: template/contact.html.j2:39
+#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:50
msgid "Reporting bugs"
msgstr ""
-#: template/contact.html.j2:49
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
msgstr ""
-#: template/contact.html.j2:60
+#: template/contact.html.j2:65
msgid "Executive team"
msgstr ""
-#: template/contact.html.j2:62
+#: template/contact.html.j2:67
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -153,10 +164,14 @@ msgid ""
msgstr ""
#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
msgid "of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:22
+#: template/copyright.html.j2:24
msgid ""
"The agreements ensure that the code will continue to be made available under "
"free software licenses, but gives developers the freedom to move code "
@@ -165,7 +180,7 @@ msgid ""
"stores that are hostile to free software)."
msgstr ""
-#: template/copyright.html.j2:32
+#: template/copyright.html.j2:34
msgid ""
"Minor contributions (basically, anyone without Git access) do not require "
"copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -208,7 +223,7 @@ msgid ""
"applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
msgid "Code"
msgstr ""
@@ -224,88 +239,92 @@ msgid ""
"found in our"
msgstr ""
-#: template/developers.html.j2:82
+#: template/developers.html.j2:80
msgid "Documentation"
msgstr ""
-#: template/developers.html.j2:85
+#: template/developers.html.j2:83
msgid "In addition to this website, the"
msgstr ""
-#: template/developers.html.j2:89
+#: template/developers.html.j2:86
msgid "documented code"
msgstr ""
-#: template/developers.html.j2:93
+#: template/developers.html.j2:87
msgid "and the"
msgstr ""
-#: template/developers.html.j2:97
+#: template/developers.html.j2:90
msgid "API documentation"
msgstr ""
-#: template/developers.html.j2:101
+#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
msgstr ""
-#: template/developers.html.j2:105
-msgid "bibliography</a>."
+#: template/developers.html.j2:94
+msgid "bibliography"
msgstr ""
-#: template/developers.html.j2:111
+#: template/developers.html.j2:98
msgid "Discussion"
msgstr ""
-#: template/developers.html.j2:114
+#: template/developers.html.j2:101
msgid ""
"We have a mailing list for developer discussions. You can subscribe to or "
"read the list archive at"
msgstr ""
-#: template/developers.html.j2:124
+#: template/developers.html.j2:111
msgid "Regression Testing"
msgstr ""
-#: template/developers.html.j2:127
-msgid ""
-"We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests to "
-"detect regressions and check for portability at"
+#: template/developers.html.j2:114
+msgid "We have"
msgstr ""
-#: template/developers.html.j2:136
+#: template/developers.html.j2:118
+msgid "automation tests to detect regressions and check for portability at"
+msgstr ""
+
+#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
msgstr ""
-#: template/developers.html.j2:139
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at"
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
+msgid "to analyze the code coverage of our tests, the results are available at"
msgstr ""
-#: template/developers.html.j2:154
+#: template/developers.html.j2:146
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:157 template/investors.html.j2:92
+#: template/developers.html.j2:149 template/investors.html.j2:93
msgid "Download"
msgstr ""
-#: template/developers.html.j2:173
+#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
-#: template/developers.html.j2:176
+#: template/developers.html.j2:168
msgid ""
"The Taler system consists of protocols executed among a number of actors as "
"illustrated in the illustration on the right. Typical transactions involve "
"the following steps:"
msgstr ""
-#: template/developers.html.j2:183
+#: template/developers.html.j2:175
msgid "system overview"
msgstr ""
-#: template/developers.html.j2:186
+#: template/developers.html.j2:178
msgid ""
"A customer instructs his <b>bank</b> to transfer funds from his account to "
"the Taler exchange (top left). In the subject of the transaction, he "
@@ -313,7 +332,7 @@ msgid ""
"terminology, the customer creates a reserve at the exchange."
msgstr ""
-#: template/developers.html.j2:198
+#: template/developers.html.j2:190
msgid ""
"Once the exchange has received the wire transfer, it allows the customer's "
"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -325,7 +344,7 @@ msgid ""
"the exchange may charge for the service)."
msgstr ""
-#: template/developers.html.j2:216
+#: template/developers.html.j2:208
msgid ""
"Once the customer has the digital coins in his wallet, the wallet can be "
"used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -340,7 +359,7 @@ msgid ""
"change)."
msgstr ""
-#: template/developers.html.j2:238
+#: template/developers.html.j2:230
msgid ""
"Merchants receiving digital coins <b>deposit</b> the respective claims that "
"resulted from the contract signing with the customer at the exchange to "
@@ -354,7 +373,7 @@ msgid ""
"that merchants pay applicable taxes (and do not engage in illegal contracts)."
msgstr ""
-#: template/developers.html.j2:261
+#: template/developers.html.j2:253
msgid ""
"Finally, the exchange transfers funds corresponding to the digital coins "
"redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -363,7 +382,7 @@ msgid ""
"the bank transfers and the individual claims that were deposited."
msgstr ""
-#: template/developers.html.j2:275
+#: template/developers.html.j2:267
msgid ""
"Most importantly, the exchange keeps cryptographic proofs that allow it to "
"demonstrate that it is operating correctly to third parties. The system "
@@ -373,7 +392,7 @@ msgid ""
"in circulation."
msgstr ""
-#: template/developers.html.j2:290
+#: template/developers.html.j2:282
msgid ""
"Without the auditor, the exchange operators could embezzle funds they are "
"holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -382,6 +401,10 @@ msgid ""
"circulation during the period of the compromise."
msgstr ""
+#: template/docs.html.j2:7
+msgid "GNU Taler: Documentation and Resources"
+msgstr ""
+
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
@@ -389,84 +412,108 @@ msgid ""
"\">here</a>."
msgstr ""
-#: template/docs.html.j2:39
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Also available as"
+msgid "Tutorial and manual for operating a merchant. Also available as"
msgstr ""
-#: template/docs.html.j2:46
+#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:48
-#, python-format
+#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:60
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:70
+#: template/docs.html.j2:64
+msgid "Operator's manual for the GNU Taler exchange. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:74
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:72
-#, python-format
+#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:88
+#: template/docs.html.j2:92
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:90
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:94
+msgid "Manual to run the back-office Web application. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:107
+msgid "Internals"
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:124
-#, python-format
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
msgid ""
-"Description of our taler.net setup and how to contribute. Also available as "
-"<a href=\"https://%(docshost)s/pdf/onboarding.pdf\">PDF</a>."
+"Description of our taler.net setup and how to contribute. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:143
+msgid "Community"
msgstr ""
-#: template/docs.html.j2:150
+#: template/docs.html.j2:154
+msgid "Mailing List"
+msgstr ""
+
+#: template/docs.html.j2:156
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:158
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:166
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:194
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:196
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -563,21 +610,21 @@ msgstr ""
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:90
+#: template/faq.html.j2:91
msgid ""
-"<p> Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer. </p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
msgstr ""
-#: template/faq.html.j2:100
+#: template/faq.html.j2:101
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:103
msgid ""
-"<p> The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
"refunding coins. Operators can also charge fees for closing reserves and for "
"(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -585,87 +632,86 @@ msgid ""
"0.001 cent/transaction (at high transaction rates, amortized over billions "
"of transactions, excluding migration costs). Note that this is an early "
"estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher. </p>"
+"regulator and could thus easily be 10x higher."
msgstr ""
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:118
+#: template/faq.html.j2:119
msgid ""
-"<p> Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future. </p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
msgstr ""
-#: template/faq.html.j2:131
+#: template/faq.html.j2:130
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
#: template/faq.html.j2:132
msgid ""
-"<p> We believe the European Electronic Money Directive provides part of the "
+"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
-"have to follow. </p>"
+"have to follow."
msgstr ""
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:142
+#: template/faq.html.j2:141
msgid ""
-"<p> The exchange would be operated by a bank or in cooperation with a bank, "
-"and that bank would hold the funds in escrow. Note that this bank could be a "
+"The exchange would be operated by a bank or in cooperation with a bank, and "
+"that bank would hold the funds in escrow. Note that this bank could be a "
"regular bank or a central bank for a centrally banked electronic currency. "
"Regardless, the bank would fall under the respective banking regulations "
"establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money. </p>"
+"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:153
+#: template/faq.html.j2:152
msgid ""
-"<p> Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
"the auditors, but auditors may also provide a method for manual submission "
"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public. </p>"
+"respective regulatory authorities, or even the general public."
msgstr ""
-#: template/faq.html.j2:163
+#: template/faq.html.j2:161
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:164
+#: template/faq.html.j2:163
msgid ""
-"<p> We are aware of several businesses running exploratory projects or "
-"having developed working prototypes. We are also in discussions with several "
+"We are aware of several businesses running exploratory projects or having "
+"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
"be premature given the state of the project (see also <a href=\"https://"
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues). </p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:176
+#: template/faq.html.j2:174
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:177
+#: template/faq.html.j2:176
msgid ""
-"<p> Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
"in theory possible with Taler, but they come with a few caveats. "
"Specifically, recurring payments can only work if the Taler wallet is "
@@ -677,10 +723,14 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time </p>"
+"feature that we are targeting for Taler 1.0. at this time"
+msgstr ""
+
+#: template/features.html.j2:7
+msgid "GNU Taler: Features"
msgstr ""
-#: template/features.html.j2:14
+#: template/features.html.j2:13
msgid ""
"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
"Customers can stay anonymous, but merchants can not hide their income "
@@ -688,28 +738,28 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
-#: template/features.html.j2:24
+#: template/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 ""
-#: template/features.html.j2:33
+#: template/features.html.j2:32
msgid ""
"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-#: template/features.html.j2:42
+#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-#: template/features.html.j2:51
+#: template/features.html.j2:50
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 "
@@ -717,33 +767,33 @@ msgid ""
"gone."
msgstr ""
-#: template/features.html.j2:70
+#: template/features.html.j2:69
msgid "Paying with Taler"
msgstr ""
-#: template/features.html.j2:72
+#: template/features.html.j2:71
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 ""
-#: template/features.html.j2:80
+#: template/features.html.j2:79
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 ""
-#: template/features.html.j2:88
+#: template/features.html.j2:87
msgid "Try it yourself with the interactive demo!"
msgstr ""
-#: template/features.html.j2:95
+#: template/features.html.j2:94
msgid "Receiving payments with Taler"
msgstr ""
-#: template/features.html.j2:97
+#: template/features.html.j2:96
msgid ""
"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
@@ -751,32 +801,32 @@ msgid ""
"processing can run on the merchant's premises or be hosted by a third party."
msgstr ""
-#: template/features.html.j2:106
+#: template/features.html.j2:105
msgid ""
"Merchant integration is simple, and customers can pay for products without "
"even having to register an account."
msgstr ""
-#: template/features.html.j2:113
+#: template/features.html.j2:112
msgid "See how merchant integration works in our developer documentation!"
msgstr ""
-#: template/features.html.j2:128
+#: template/features.html.j2:127
msgid "Practical"
msgstr ""
-#: template/features.html.j2:131
+#: template/features.html.j2:130
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 ""
-#: template/features.html.j2:141
+#: template/features.html.j2:140
msgid "Stable"
msgstr ""
-#: template/features.html.j2:144
+#: template/features.html.j2:143
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -784,52 +834,52 @@ msgid ""
"currencies, such as US Dollars, Euros or even Bitcoins."
msgstr ""
-#: template/features.html.j2:155 template/governments.html.j2:55
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr ""
-#: template/features.html.j2:158
+#: template/features.html.j2:157
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 ""
-#: template/features.html.j2:170 template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr ""
-#: template/features.html.j2:173
+#: template/features.html.j2:172
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 ""
-#: template/features.html.j2:183
+#: template/features.html.j2:182
msgid "Private"
msgstr ""
-#: template/features.html.j2:185
+#: template/features.html.j2:184
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 ""
-#: template/features.html.j2:196 template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr ""
-#: template/features.html.j2:199
+#: template/features.html.j2:198
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
"organizations or whole countries. Since the reference implementation is a"
msgstr ""
-#: template/features.html.j2:206
+#: template/features.html.j2:205
msgid "package, it will always remain free software."
msgstr ""
@@ -1421,27 +1471,38 @@ msgstr ""
msgid "Dynamic Merchant Instance"
msgstr ""
-#: template/gsoc-codeless.html.j2:97
-msgid "Use Case Diagram"
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"merchant-instance\">here</a>."
msgstr ""
#: template/gsoc-codeless.html.j2:103
+msgid "Use Case Diagram"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:109
msgid "Link to the contributions made"
msgstr ""
-#: template/gsoc-codeless.html.j2:106
+#: template/gsoc-codeless.html.j2:113
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:108
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:127
msgid "Future Work"
msgstr ""
-#: template/gsoc-codeless.html.j2:120
+#: template/gsoc-codeless.html.j2:130
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. "
@@ -1450,7 +1511,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: template/gsoc-codeless.html.j2:130
+#: template/gsoc-codeless.html.j2:140
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 "
@@ -1458,7 +1519,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: template/gsoc-codeless.html.j2:140
+#: template/gsoc-codeless.html.j2:150
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. "
@@ -1470,7 +1531,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: template/gsoc-codeless.html.j2:154
+#: template/gsoc-codeless.html.j2:164
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 "
@@ -1478,7 +1539,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: template/gsoc-codeless.html.j2:164
+#: template/gsoc-codeless.html.j2:174
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1488,10 +1549,56 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: template/gsoc-codeless.html.j2:181
+#: template/gsoc-codeless.html.j2:191
msgid "Screenshots"
msgstr ""
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
#: template/investors.html.j2:6
msgid "Invest in Taler!"
msgstr ""
@@ -1524,11 +1631,11 @@ msgid ""
"and the"
msgstr ""
-#: template/investors.html.j2:49
+#: template/investors.html.j2:50
msgid "The Technology"
msgstr ""
-#: template/investors.html.j2:52
+#: template/investors.html.j2:53
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1539,11 +1646,11 @@ msgid ""
"transaction costs are fractions of a cent."
msgstr ""
-#: template/investors.html.j2:65
+#: template/investors.html.j2:66
msgid "The Business"
msgstr ""
-#: template/investors.html.j2:67
+#: template/investors.html.j2:68
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -1554,22 +1661,22 @@ msgid ""
"to facilitate the transactions."
msgstr ""
-#: template/investors.html.j2:86
+#: template/investors.html.j2:87
msgid "The Business Case"
msgstr ""
-#: template/investors.html.j2:96
+#: template/investors.html.j2:97
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:119
+#: template/investors.html.j2:120
msgid "Running a Taler payment service operator"
msgstr ""
-#: template/investors.html.j2:122
+#: template/investors.html.j2:123
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1577,29 +1684,29 @@ msgid ""
"of the computing infrastructure."
msgstr ""
-#: template/investors.html.j2:132
+#: template/investors.html.j2:133
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
msgstr ""
-#: template/investors.html.j2:133
+#: template/investors.html.j2:134
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
msgstr ""
-#: template/investors.html.j2:134
+#: template/investors.html.j2:135
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
msgstr ""
-#: template/investors.html.j2:135
+#: template/investors.html.j2:136
msgid "Partnership with banks establishes consumer trust."
msgstr ""
-#: template/investors.html.j2:136
+#: template/investors.html.j2:137
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
@@ -1733,6 +1840,10 @@ msgstr ""
msgid "customer perspective"
msgstr ""
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
#: template/news.html.j2:16
msgid "More news"
msgstr ""
@@ -1749,6 +1860,22 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr ""
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
#: template/principles.html.j2:21
msgid "GNU Taler: Design Principles"
msgstr ""
@@ -1764,7 +1891,7 @@ msgstr ""
#: template/principles.html.j2:33
msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
msgstr ""
#: template/principles.html.j2:36
@@ -1927,6 +2054,10 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: template/team.html.j2:6
+msgid "GNU Taler: Team"
+msgstr ""
+
#: template/team.html.j2:8
msgid ""
"GNU Taler is proudly brought to you by the humans on this page. To contact "
@@ -1942,7 +2073,7 @@ msgstr ""
#: template/team.html.j2:26
msgid ""
"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
msgstr ""
#: template/team.html.j2:31
@@ -1950,7 +2081,7 @@ msgid "Lawyer and banker."
msgstr ""
#: template/team.html.j2:38
-msgid "GNU mainatiner, lead developer."
+msgid "GNU maintainer, lead developer."
msgstr ""
#: template/team.html.j2:43
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 3c33685..886a74c 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-09-03 09:57+0000\n"
+"POT-Creation-Date: 2019-09-03 12:13+0000\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -99,22 +99,22 @@ msgid "The mailing list"
msgstr "Lista de correo"
#: template/contact.html.j2:15
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
msgstr ""
-"Una lista de correo pública archivada para GNU Taler está alojada en <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. Puede enviar mensajes a la lista <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
-#: template/contact.html.j2:26
+#: template/contact.html.j2:29
msgid "Contacting individuals"
msgstr "Contacto con los miembros del equipo"
-#: template/contact.html.j2:28
+#: template/contact.html.j2:31
msgid ""
"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
"us support receiving GnuPG encrypted e-mails."
@@ -123,36 +123,48 @@ msgstr ""
"siguiente formato: <tt>APELLIDO@taler.net</tt>. Todos aceptamos correos "
"electrónicos cifrados con GnuPG."
-#: template/contact.html.j2:37
+#: template/contact.html.j2:40
msgid "General inquiries"
msgstr ""
-#: template/contact.html.j2:39
+#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:50
msgid "Reporting bugs"
msgstr "Reportar errores"
-#: template/contact.html.j2:49
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "We track open feature requests and bugs in our <a href=\"https://gnunet."
+#| "org/bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You "
+#| "can also report bugs or feature requests to the mailing list."
msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
msgstr ""
"Registramos públicamente las solicitudes de funcionalidades y los bugs en "
"nuestro <a href=\"https://gnunet.org/bugs/\">sistema de seguimiento de bugs</"
"a>, que se comparte con el proyecto GNUnet. También puede reportar bugs o "
"solicitudes a través de la lista de correo."
-#: template/contact.html.j2:60
+#: template/contact.html.j2:65
msgid "Executive team"
msgstr "Comité Ejecutivo"
-#: template/contact.html.j2:62
+#: template/contact.html.j2:67
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -171,10 +183,14 @@ msgid ""
msgstr ""
#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
msgid "of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:22
+#: template/copyright.html.j2:24
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -196,7 +212,7 @@ msgstr ""
"para que podamos distribuir a través de las App-stores que son hostiles al "
"software libre).</p>"
-#: template/copyright.html.j2:32
+#: template/copyright.html.j2:34
#, fuzzy
#| msgid ""
#| "<p>Minor contributions (basically, anyone without Git access) do not "
@@ -278,7 +294,7 @@ msgstr ""
"aplicaciones web existentes. El protocolo de Taler está documentado en "
"detalle en <a href=\"https://docs.taler.net/\">docs.taler.net</a>."
-#: template/developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
msgid "Code"
msgstr "Código"
@@ -310,45 +326,45 @@ msgstr ""
"net</tt> con el nombre del repositorio respectivo. Puede encontrar una lista "
"de repositorios en nuestro <a href=\"https://git.taler.net/\">GitWeb</a>."
-#: template/developers.html.j2:82
+#: template/developers.html.j2:80
msgid "Documentation"
msgstr "Documentación"
-#: template/developers.html.j2:85
+#: template/developers.html.j2:83
msgid "In addition to this website, the"
msgstr ""
-#: template/developers.html.j2:89
+#: template/developers.html.j2:86
msgid "documented code"
msgstr ""
-#: template/developers.html.j2:93
+#: template/developers.html.j2:87
#, fuzzy
#| msgid "and"
msgid "and the"
msgstr "y"
-#: template/developers.html.j2:97
+#: template/developers.html.j2:90
#, fuzzy
#| msgid "Documentation"
msgid "API documentation"
msgstr "Documentación"
-#: template/developers.html.j2:101
+#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
msgstr ""
-#: template/developers.html.j2:105
+#: template/developers.html.j2:94
#, fuzzy
#| msgid "Bibliography"
-msgid "bibliography</a>."
+msgid "bibliography"
msgstr "Bibliografía"
-#: template/developers.html.j2:111
+#: template/developers.html.j2:98
msgid "Discussion"
msgstr "Debates"
-#: template/developers.html.j2:114
+#: template/developers.html.j2:101
#, fuzzy
#| msgid ""
#| "We have a mailing list for developer discussions. You can subscribe to or "
@@ -363,55 +379,59 @@ msgstr ""
"gnu.org/mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/"
"taler</a>."
-#: template/developers.html.j2:124
+#: template/developers.html.j2:111
msgid "Regression Testing"
msgstr "Pruebas de regresión"
-#: template/developers.html.j2:127
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
#, fuzzy
#| msgid ""
#| "We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests "
#| "to detect regressions and check for portability at <a href=\"https://"
#| "buildbot.taler.net/\">buildbot.taler.net</a>."
-msgid ""
-"We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests to "
-"detect regressions and check for portability at"
+msgid "automation tests to detect regressions and check for portability at"
msgstr ""
"Tenemos pruebas de automatización con <a href=\"https://buildbot.net/"
"\">Buildbot</a> para detectar regresiones y comprobar su portabilidad en <a "
"href=\"https://buildbot.taler.net/\">buildbot.taler.net</a>."
-#: template/developers.html.j2:136
+#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
msgstr "Análisis de cobertura de código"
-#: template/developers.html.j2:139
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
#, fuzzy
#| msgid ""
#| "We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> "
#| "to analyze the code coverage of our tests, the results are available at "
#| "<a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at"
+msgid "to analyze the code coverage of our tests, the results are available at"
msgstr ""
"Usamos <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> "
"para el análisis de cobertura de código de nuestros tests, los resultados "
"están disponibles en <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
-#: template/developers.html.j2:154
+#: template/developers.html.j2:146
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:157 template/investors.html.j2:92
+#: template/developers.html.j2:149 template/investors.html.j2:93
msgid "Download"
msgstr ""
-#: template/developers.html.j2:173
+#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr "Diagrama general del sistema Taler"
-#: template/developers.html.j2:176
+#: template/developers.html.j2:168
msgid ""
"The Taler system consists of protocols executed among a number of actors as "
"illustrated in the illustration on the right. Typical transactions involve "
@@ -421,11 +441,11 @@ msgstr ""
"tal como se ilustra en la imagen en la derecha. Las transacciones típicas "
"involucran los siguientes pasos:"
-#: template/developers.html.j2:183
+#: template/developers.html.j2:175
msgid "system overview"
msgstr "Diagrama general del sistema"
-#: template/developers.html.j2:186
+#: template/developers.html.j2:178
msgid ""
"A customer instructs his <b>bank</b> to transfer funds from his account to "
"the Taler exchange (top left). In the subject of the transaction, he "
@@ -438,7 +458,7 @@ msgstr ""
"<b>billetera</b> electrónica. En la termonología de Taler, el cliente crea "
"una reserva en la plataforma de intercambio."
-#: template/developers.html.j2:198
+#: template/developers.html.j2:190
msgid ""
"Once the exchange has received the wire transfer, it allows the customer's "
"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -459,7 +479,7 @@ msgstr ""
"Taler no modifica el valor total de la moneda o de los fondos (excepto por "
"los cargos que la plataforma de intercambio pueda cobrar por el servicio)."
-#: template/developers.html.j2:216
+#: template/developers.html.j2:208
msgid ""
"Once the customer has the digital coins in his wallet, the wallet can be "
"used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -486,7 +506,7 @@ msgstr ""
"gastar cualquier fracción de sus monedas electrónicas (el sistema se encarga "
"de que los clientes obtengan su cambio)."
-#: template/developers.html.j2:238
+#: template/developers.html.j2:230
msgid ""
"Merchants receiving digital coins <b>deposit</b> the respective claims that "
"resulted from the contract signing with the customer at the exchange to "
@@ -513,7 +533,7 @@ msgstr ""
"comerciantes el pago de los impuestos aplicables (y que éstos no se incurran "
"en contratos ilegales)."
-#: template/developers.html.j2:261
+#: template/developers.html.j2:253
msgid ""
"Finally, the exchange transfers funds corresponding to the digital coins "
"redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -530,7 +550,7 @@ msgstr ""
"bancarias y las monedas (y derechos a cobrar) individuales que fueron "
"depositadas."
-#: template/developers.html.j2:275
+#: template/developers.html.j2:267
msgid ""
"Most importantly, the exchange keeps cryptographic proofs that allow it to "
"demonstrate that it is operating correctly to third parties. The system "
@@ -547,7 +567,7 @@ msgstr ""
"que su saldo bancario coincida con el valor total de las monedas que "
"permanecen en circulación."
-#: template/developers.html.j2:290
+#: template/developers.html.j2:282
msgid ""
"Without the auditor, the exchange operators could embezzle funds they are "
"holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -563,6 +583,12 @@ msgstr ""
"proporcional a los fondos que tuviesen en circulación durante el período en "
"que la computadora estuviese comprometida."
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "GNU Taler en la Prensa"
+
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
@@ -570,86 +596,114 @@ msgid ""
"\">here</a>."
msgstr ""
-#: template/docs.html.j2:39
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Also available as"
+msgid "Tutorial and manual for operating a merchant. Also available as"
msgstr ""
-#: template/docs.html.j2:46
+#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:48
-#, python-format
+#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:60
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+#, fuzzy
+#| msgid "exchange"
+msgid "Exchange"
+msgstr "Plataforma de intercambio"
+
+#: template/docs.html.j2:64
+msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: template/docs.html.j2:70
+#: template/docs.html.j2:74
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:72
-#, python-format
+#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:88
+#: template/docs.html.j2:92
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:90
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:94
+msgid "Manual to run the back-office Web application. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:107
+msgid "Internals"
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:124
-#, python-format
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
msgid ""
-"Description of our taler.net setup and how to contribute. Also available as "
-"<a href=\"https://%(docshost)s/pdf/onboarding.pdf\">PDF</a>."
+"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:150
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "Lista de correo"
+
+#: template/docs.html.j2:156
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "Lista de correo"
-#: template/docs.html.j2:158
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:166
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:194
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:196
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -820,7 +874,7 @@ msgstr "<p>Actualmente Taler no ofrece conversiones entre monedas.</p>"
msgid "How does Taler protect my privacy?"
msgstr "¿De qué manera Taler protege mi privacidad?"
-#: template/faq.html.j2:90
+#: template/faq.html.j2:91
#, fuzzy
#| msgid ""
#| "<p>Your wallet stores digital coins that are <a href=\"https://en."
@@ -828,10 +882,10 @@ msgstr "¿De qué manera Taler protege mi privacidad?"
#| "The use of a blind signature protects your privacy as it prevents the "
#| "exchange from knowing which coin it signed for which customer.</p>"
msgid ""
-"<p> Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer. </p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
msgstr ""
"<p>Su billetera almacena monedas electrónicas que son <a href=\"https://es."
"wikipedia.org/wiki/Firma_digital_ciega\">firmadas ciegamente</a> por una "
@@ -839,13 +893,13 @@ msgstr ""
"ya que impide que se conozcan las monedas utilizadas o los clientes "
"involucrados.</p>"
-#: template/faq.html.j2:100
+#: template/faq.html.j2:101
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:103
msgid ""
-"<p> The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
"refunding coins. Operators can also charge fees for closing reserves and for "
"(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -853,87 +907,86 @@ msgid ""
"0.001 cent/transaction (at high transaction rates, amortized over billions "
"of transactions, excluding migration costs). Note that this is an early "
"estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher. </p>"
+"regulator and could thus easily be 10x higher."
msgstr ""
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:118
+#: template/faq.html.j2:119
msgid ""
-"<p> Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future. </p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
msgstr ""
-#: template/faq.html.j2:131
+#: template/faq.html.j2:130
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
#: template/faq.html.j2:132
msgid ""
-"<p> We believe the European Electronic Money Directive provides part of the "
+"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
-"have to follow. </p>"
+"have to follow."
msgstr ""
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:142
+#: template/faq.html.j2:141
msgid ""
-"<p> The exchange would be operated by a bank or in cooperation with a bank, "
-"and that bank would hold the funds in escrow. Note that this bank could be a "
+"The exchange would be operated by a bank or in cooperation with a bank, and "
+"that bank would hold the funds in escrow. Note that this bank could be a "
"regular bank or a central bank for a centrally banked electronic currency. "
"Regardless, the bank would fall under the respective banking regulations "
"establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money. </p>"
+"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:153
+#: template/faq.html.j2:152
msgid ""
-"<p> Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
"the auditors, but auditors may also provide a method for manual submission "
"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public. </p>"
+"respective regulatory authorities, or even the general public."
msgstr ""
-#: template/faq.html.j2:163
+#: template/faq.html.j2:161
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:164
+#: template/faq.html.j2:163
msgid ""
-"<p> We are aware of several businesses running exploratory projects or "
-"having developed working prototypes. We are also in discussions with several "
+"We are aware of several businesses running exploratory projects or having "
+"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
"be premature given the state of the project (see also <a href=\"https://"
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues). </p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:176
+#: template/faq.html.j2:174
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:177
+#: template/faq.html.j2:176
msgid ""
-"<p> Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
"in theory possible with Taler, but they come with a few caveats. "
"Specifically, recurring payments can only work if the Taler wallet is "
@@ -945,10 +998,16 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time </p>"
+"feature that we are targeting for Taler 1.0. at this time"
msgstr ""
-#: template/features.html.j2:14
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "GNU Taler en la Prensa"
+
+#: template/features.html.j2:13
msgid ""
"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
"Customers can stay anonymous, but merchants can not hide their income "
@@ -956,28 +1015,28 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
-#: template/features.html.j2:24
+#: template/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 ""
-#: template/features.html.j2:33
+#: template/features.html.j2:32
msgid ""
"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-#: template/features.html.j2:42
+#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-#: template/features.html.j2:51
+#: template/features.html.j2:50
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 "
@@ -985,11 +1044,11 @@ msgid ""
"gone."
msgstr ""
-#: template/features.html.j2:70
+#: template/features.html.j2:69
msgid "Paying with Taler"
msgstr "Pagando con Taler"
-#: template/features.html.j2:72
+#: template/features.html.j2:71
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -1010,7 +1069,7 @@ msgstr ""
"clic, nunca son rechazados equivocadamente por detección de fraude, y no "
"representan ningún riesgo de phishing o robo de identidad.</p>"
-#: template/features.html.j2:80
+#: template/features.html.j2:79
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -1031,15 +1090,15 @@ msgstr ""
"clic, nunca son rechazados equivocadamente por detección de fraude, y no "
"representan ningún riesgo de phishing o robo de identidad.</p>"
-#: template/features.html.j2:88
+#: template/features.html.j2:87
msgid "Try it yourself with the interactive demo!"
msgstr ""
-#: template/features.html.j2:95
+#: template/features.html.j2:94
msgid "Receiving payments with Taler"
msgstr "Recibiendo pagos con Taler"
-#: template/features.html.j2:97
+#: template/features.html.j2:96
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -1060,21 +1119,21 @@ msgstr ""
"puede ejecutarse en el hardware del comerciante, o puede estar alojado por "
"un tercero. </ P>"
-#: template/features.html.j2:106
+#: template/features.html.j2:105
msgid ""
"Merchant integration is simple, and customers can pay for products without "
"even having to register an account."
msgstr ""
-#: template/features.html.j2:113
+#: template/features.html.j2:112
msgid "See how merchant integration works in our developer documentation!"
msgstr ""
-#: template/features.html.j2:128
+#: template/features.html.j2:127
msgid "Practical"
msgstr "Práctico"
-#: template/features.html.j2:131
+#: template/features.html.j2:130
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
@@ -1084,11 +1143,11 @@ msgstr ""
"asegurados criptográficamente y se confirman en milisegundos con costos de "
"transacción extremadamente bajos."
-#: template/features.html.j2:141
+#: template/features.html.j2:140
msgid "Stable"
msgstr "Estable"
-#: template/features.html.j2:144
+#: template/features.html.j2:143
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -1101,12 +1160,12 @@ msgstr ""
"corresponden a monedas existentes, tales como dólares estadounidenses, euros "
"o incluso bitcoins."
-#: template/features.html.j2:155 template/governments.html.j2:55
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr "Seguro"
-#: template/features.html.j2:158
+#: template/features.html.j2:157
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 "
@@ -1117,11 +1176,11 @@ msgstr ""
"rechaza a un cliente legítimo debido a un falso positivo en la detección de "
"fraude."
-#: template/features.html.j2:170 template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr "Imponible"
-#: template/features.html.j2:173
+#: template/features.html.j2:172
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -1132,11 +1191,11 @@ msgstr ""
"mayoría de las monedas electrónicas, Taler ayuda a prevenir los mercados "
"negros. Taler no es adecuado para actividades ilegales."
-#: template/features.html.j2:183
+#: template/features.html.j2:182
msgid "Private"
msgstr "Privado"
-#: template/features.html.j2:185
+#: template/features.html.j2:184
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 "
@@ -1146,11 +1205,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."
-#: template/features.html.j2:196 template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr "Libre"
-#: template/features.html.j2:199
+#: template/features.html.j2:198
#, fuzzy
#| msgid ""
#| "Taler provides protocols and reference implementations that in principle "
@@ -1169,7 +1228,7 @@ msgstr ""
"referencia es un paquete <a href=\"http://www.gnu.org/\">GNU</a>, siempre "
"permanecerá como software libre."
-#: template/features.html.j2:206
+#: template/features.html.j2:205
msgid "package, it will always remain free software."
msgstr ""
@@ -1893,27 +1952,38 @@ msgstr ""
msgid "Dynamic Merchant Instance"
msgstr ""
-#: template/gsoc-codeless.html.j2:97
-msgid "Use Case Diagram"
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"merchant-instance\">here</a>."
msgstr ""
#: template/gsoc-codeless.html.j2:103
+msgid "Use Case Diagram"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:109
msgid "Link to the contributions made"
msgstr ""
-#: template/gsoc-codeless.html.j2:106
+#: template/gsoc-codeless.html.j2:113
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:108
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:127
msgid "Future Work"
msgstr ""
-#: template/gsoc-codeless.html.j2:120
+#: template/gsoc-codeless.html.j2:130
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. "
@@ -1922,7 +1992,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: template/gsoc-codeless.html.j2:130
+#: template/gsoc-codeless.html.j2:140
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 "
@@ -1930,7 +2000,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: template/gsoc-codeless.html.j2:140
+#: template/gsoc-codeless.html.j2:150
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. "
@@ -1942,7 +2012,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: template/gsoc-codeless.html.j2:154
+#: template/gsoc-codeless.html.j2:164
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 "
@@ -1950,7 +2020,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: template/gsoc-codeless.html.j2:164
+#: template/gsoc-codeless.html.j2:174
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1960,10 +2030,56 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: template/gsoc-codeless.html.j2:181
+#: template/gsoc-codeless.html.j2:191
msgid "Screenshots"
msgstr ""
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
#: template/investors.html.j2:6
msgid "Invest in Taler!"
msgstr "¡Invierta en Taler!"
@@ -2003,11 +2119,11 @@ msgid ""
"and the"
msgstr ""
-#: template/investors.html.j2:49
+#: template/investors.html.j2:50
msgid "The Technology"
msgstr "La Tecnología"
-#: template/investors.html.j2:52
+#: template/investors.html.j2:53
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -2027,11 +2143,11 @@ msgstr ""
"puesta en evidencia de la honestidad de los participantes. Los costos reales "
"de las transacciones son fracciones de un centavo."
-#: template/investors.html.j2:65
+#: template/investors.html.j2:66
msgid "The Business"
msgstr "El Negocio"
-#: template/investors.html.j2:67
+#: template/investors.html.j2:68
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -2050,22 +2166,22 @@ msgstr ""
"pago tradicionales en la plataforma de intercambio. La plataforma de "
"intercambio cobra una comisión para facilitar las transacciones."
-#: template/investors.html.j2:86
+#: template/investors.html.j2:87
msgid "The Business Case"
msgstr "El Caso de los Negocios"
-#: template/investors.html.j2:96
+#: template/investors.html.j2:97
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:119
+#: template/investors.html.j2:120
msgid "Running a Taler payment service operator"
msgstr "Operar una plataforma de servicio de pago de Taler"
-#: template/investors.html.j2:122
+#: template/investors.html.j2:123
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -2078,7 +2194,7 @@ msgstr ""
"transferencias electrónicas y del funcionamiento de la infraestructura "
"informática."
-#: template/investors.html.j2:132
+#: template/investors.html.j2:133
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2086,7 +2202,7 @@ msgstr ""
"Las operaciones criptográficas, el ancho de banda y los costes de "
"almacenamiento son inferiores a 0.01 centavos por transacción."
-#: template/investors.html.j2:133
+#: template/investors.html.j2:134
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2095,7 +2211,7 @@ msgstr ""
"electrónicas más grandes de los comerciantes para reducir al mínimo los "
"costes de la transferencia bancaria."
-#: template/investors.html.j2:134
+#: template/investors.html.j2:135
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2104,11 +2220,11 @@ msgstr ""
"cualquier operación que tenga un coste (retirar, depositar, actualizar, "
"reembolsar o realizar transferencias electrónicas agrupadas)."
-#: template/investors.html.j2:135
+#: template/investors.html.j2:136
msgid "Partnership with banks establishes consumer trust."
msgstr "La asociación con bancos consolida la confianza del consumidor."
-#: template/investors.html.j2:136
+#: template/investors.html.j2:137
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"La asociación con la comunidad de software libre permite un despliegue "
@@ -2297,6 +2413,10 @@ msgstr ""
msgid "customer perspective"
msgstr "Perspectiva del consumidor"
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
#: template/news.html.j2:16
msgid "More news"
msgstr ""
@@ -2315,6 +2435,22 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr "GNU Taler en la Prensa"
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
#: template/principles.html.j2:21
#, fuzzy
#| msgid "GNU Taler in the Press"
@@ -2332,7 +2468,7 @@ msgstr ""
#: template/principles.html.j2:33
msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
msgstr ""
#: template/principles.html.j2:36
@@ -2505,6 +2641,12 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: template/team.html.j2:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "GNU Taler"
+
#: template/team.html.j2:8
msgid ""
"GNU Taler is proudly brought to you by the humans on this page. To contact "
@@ -2520,9 +2662,13 @@ msgstr ""
"Investigador en privacidad informática. Arquitecto de Software."
#: template/team.html.j2:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
msgid ""
"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
msgstr ""
"Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
"de TI en diferentes industrias."
@@ -2532,7 +2678,7 @@ msgid "Lawyer and banker."
msgstr ""
#: template/team.html.j2:38
-msgid "GNU mainatiner, lead developer."
+msgid "GNU maintainer, lead developer."
msgstr ""
#: template/team.html.j2:43
@@ -2667,6 +2813,22 @@ msgstr ""
msgid "Wallets for other browsers will be provided in the near future."
msgstr ""
+#~ msgid ""
+#~ "An archived, public mailing list for GNU Taler is hosted at <a href="
+#~ "\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+#~ "mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+#~ "\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+#~ msgstr ""
+#~ "Una lista de correo pública archivada para GNU Taler está alojada en <a "
+#~ "href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu."
+#~ "org/mailman/listinfo/taler</a>. Puede enviar mensajes a la lista <a href="
+#~ "\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+
+#, fuzzy
+#~| msgid "Bibliography"
+#~ msgid "bibliography</a>."
+#~ msgstr "Bibliografía"
+
#, fuzzy
#~| msgid ""
#~| "<p>Contributors to GNU Taler with Git access must sign the <a href=\"/"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index a936dba..61aacc1 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-09-03 09:57+0000\n"
+"POT-Creation-Date: 2019-09-03 12:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <LL@li.org>\n"
@@ -96,49 +96,60 @@ msgid "The mailing list"
msgstr ""
#: template/contact.html.j2:15
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
msgstr ""
-#: template/contact.html.j2:26
+#: template/contact.html.j2:29
msgid "Contacting individuals"
msgstr ""
-#: template/contact.html.j2:28
+#: template/contact.html.j2:31
msgid ""
"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
"us support receiving GnuPG encrypted e-mails."
msgstr ""
-#: template/contact.html.j2:37
+#: template/contact.html.j2:40
msgid "General inquiries"
msgstr ""
-#: template/contact.html.j2:39
+#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:50
msgid "Reporting bugs"
msgstr ""
-#: template/contact.html.j2:49
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
msgstr ""
-#: template/contact.html.j2:60
+#: template/contact.html.j2:65
msgid "Executive team"
msgstr ""
-#: template/contact.html.j2:62
+#: template/contact.html.j2:67
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -155,10 +166,14 @@ msgid ""
msgstr ""
#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
msgid "of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:22
+#: template/copyright.html.j2:24
msgid ""
"The agreements ensure that the code will continue to be made available under "
"free software licenses, but gives developers the freedom to move code "
@@ -167,7 +182,7 @@ msgid ""
"stores that are hostile to free software)."
msgstr ""
-#: template/copyright.html.j2:32
+#: template/copyright.html.j2:34
msgid ""
"Minor contributions (basically, anyone without Git access) do not require "
"copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -210,7 +225,7 @@ msgid ""
"applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
msgid "Code"
msgstr "Code"
@@ -226,92 +241,96 @@ msgid ""
"found in our"
msgstr ""
-#: template/developers.html.j2:82
+#: template/developers.html.j2:80
msgid "Documentation"
msgstr "Documentation"
-#: template/developers.html.j2:85
+#: template/developers.html.j2:83
msgid "In addition to this website, the"
msgstr ""
-#: template/developers.html.j2:89
+#: template/developers.html.j2:86
msgid "documented code"
msgstr ""
-#: template/developers.html.j2:93
+#: template/developers.html.j2:87
msgid "and the"
msgstr ""
-#: template/developers.html.j2:97
+#: template/developers.html.j2:90
#, fuzzy
#| msgid "Documentation"
msgid "API documentation"
msgstr "Documentation"
-#: template/developers.html.j2:101
+#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
msgstr ""
-#: template/developers.html.j2:105
-msgid "bibliography</a>."
+#: template/developers.html.j2:94
+msgid "bibliography"
msgstr ""
-#: template/developers.html.j2:111
+#: template/developers.html.j2:98
msgid "Discussion"
msgstr "Discussion"
-#: template/developers.html.j2:114
+#: template/developers.html.j2:101
msgid ""
"We have a mailing list for developer discussions. You can subscribe to or "
"read the list archive at"
msgstr ""
-#: template/developers.html.j2:124
+#: template/developers.html.j2:111
msgid "Regression Testing"
msgstr "Tests de régression"
-#: template/developers.html.j2:127
-msgid ""
-"We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests to "
-"detect regressions and check for portability at"
+#: template/developers.html.j2:114
+msgid "We have"
msgstr ""
-#: template/developers.html.j2:136
+#: template/developers.html.j2:118
+msgid "automation tests to detect regressions and check for portability at"
+msgstr ""
+
+#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
msgstr "Mesure de couverture du code"
-#: template/developers.html.j2:139
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at"
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
+msgid "to analyze the code coverage of our tests, the results are available at"
msgstr ""
-#: template/developers.html.j2:154
+#: template/developers.html.j2:146
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:157 template/investors.html.j2:92
+#: template/developers.html.j2:149 template/investors.html.j2:93
msgid "Download"
msgstr ""
-#: template/developers.html.j2:173
+#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr "Vue d'ensemble de Taler"
-#: template/developers.html.j2:176
+#: template/developers.html.j2:168
msgid ""
"The Taler system consists of protocols executed among a number of actors as "
"illustrated in the illustration on the right. Typical transactions involve "
"the following steps:"
msgstr ""
-#: template/developers.html.j2:183
+#: template/developers.html.j2:175
#, fuzzy
#| msgid "Taler system overview"
msgid "system overview"
msgstr "Vue d'ensemble de Taler"
-#: template/developers.html.j2:186
+#: template/developers.html.j2:178
msgid ""
"A customer instructs his <b>bank</b> to transfer funds from his account to "
"the Taler exchange (top left). In the subject of the transaction, he "
@@ -319,7 +338,7 @@ msgid ""
"terminology, the customer creates a reserve at the exchange."
msgstr ""
-#: template/developers.html.j2:198
+#: template/developers.html.j2:190
msgid ""
"Once the exchange has received the wire transfer, it allows the customer's "
"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -331,7 +350,7 @@ msgid ""
"the exchange may charge for the service)."
msgstr ""
-#: template/developers.html.j2:216
+#: template/developers.html.j2:208
msgid ""
"Once the customer has the digital coins in his wallet, the wallet can be "
"used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -346,7 +365,7 @@ msgid ""
"change)."
msgstr ""
-#: template/developers.html.j2:238
+#: template/developers.html.j2:230
msgid ""
"Merchants receiving digital coins <b>deposit</b> the respective claims that "
"resulted from the contract signing with the customer at the exchange to "
@@ -360,7 +379,7 @@ msgid ""
"that merchants pay applicable taxes (and do not engage in illegal contracts)."
msgstr ""
-#: template/developers.html.j2:261
+#: template/developers.html.j2:253
msgid ""
"Finally, the exchange transfers funds corresponding to the digital coins "
"redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -369,7 +388,7 @@ msgid ""
"the bank transfers and the individual claims that were deposited."
msgstr ""
-#: template/developers.html.j2:275
+#: template/developers.html.j2:267
msgid ""
"Most importantly, the exchange keeps cryptographic proofs that allow it to "
"demonstrate that it is operating correctly to third parties. The system "
@@ -379,7 +398,7 @@ msgid ""
"in circulation."
msgstr ""
-#: template/developers.html.j2:290
+#: template/developers.html.j2:282
msgid ""
"Without the auditor, the exchange operators could embezzle funds they are "
"holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -388,6 +407,10 @@ msgid ""
"circulation during the period of the compromise."
msgstr ""
+#: template/docs.html.j2:7
+msgid "GNU Taler: Documentation and Resources"
+msgstr ""
+
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
@@ -395,84 +418,108 @@ msgid ""
"\">here</a>."
msgstr ""
-#: template/docs.html.j2:39
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Also available as"
+msgid "Tutorial and manual for operating a merchant. Also available as"
msgstr ""
-#: template/docs.html.j2:46
+#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:48
-#, python-format
+#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:60
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:70
+#: template/docs.html.j2:64
+msgid "Operator's manual for the GNU Taler exchange. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:74
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:72
-#, python-format
+#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:88
+#: template/docs.html.j2:92
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:90
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:94
+msgid "Manual to run the back-office Web application. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:107
+msgid "Internals"
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:124
-#, python-format
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
msgid ""
-"Description of our taler.net setup and how to contribute. Also available as "
-"<a href=\"https://%(docshost)s/pdf/onboarding.pdf\">PDF</a>."
+"Description of our taler.net setup and how to contribute. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:143
+msgid "Community"
msgstr ""
-#: template/docs.html.j2:150
+#: template/docs.html.j2:154
+msgid "Mailing List"
+msgstr ""
+
+#: template/docs.html.j2:156
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:158
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:166
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:194
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:196
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -569,21 +616,21 @@ msgstr ""
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:90
+#: template/faq.html.j2:91
msgid ""
-"<p> Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer. </p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
msgstr ""
-#: template/faq.html.j2:100
+#: template/faq.html.j2:101
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:103
msgid ""
-"<p> The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
"refunding coins. Operators can also charge fees for closing reserves and for "
"(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -591,87 +638,86 @@ msgid ""
"0.001 cent/transaction (at high transaction rates, amortized over billions "
"of transactions, excluding migration costs). Note that this is an early "
"estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher. </p>"
+"regulator and could thus easily be 10x higher."
msgstr ""
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:118
+#: template/faq.html.j2:119
msgid ""
-"<p> Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future. </p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
msgstr ""
-#: template/faq.html.j2:131
+#: template/faq.html.j2:130
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
#: template/faq.html.j2:132
msgid ""
-"<p> We believe the European Electronic Money Directive provides part of the "
+"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
-"have to follow. </p>"
+"have to follow."
msgstr ""
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:142
+#: template/faq.html.j2:141
msgid ""
-"<p> The exchange would be operated by a bank or in cooperation with a bank, "
-"and that bank would hold the funds in escrow. Note that this bank could be a "
+"The exchange would be operated by a bank or in cooperation with a bank, and "
+"that bank would hold the funds in escrow. Note that this bank could be a "
"regular bank or a central bank for a centrally banked electronic currency. "
"Regardless, the bank would fall under the respective banking regulations "
"establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money. </p>"
+"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:153
+#: template/faq.html.j2:152
msgid ""
-"<p> Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
"the auditors, but auditors may also provide a method for manual submission "
"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public. </p>"
+"respective regulatory authorities, or even the general public."
msgstr ""
-#: template/faq.html.j2:163
+#: template/faq.html.j2:161
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:164
+#: template/faq.html.j2:163
msgid ""
-"<p> We are aware of several businesses running exploratory projects or "
-"having developed working prototypes. We are also in discussions with several "
+"We are aware of several businesses running exploratory projects or having "
+"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
"be premature given the state of the project (see also <a href=\"https://"
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues). </p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:176
+#: template/faq.html.j2:174
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:177
+#: template/faq.html.j2:176
msgid ""
-"<p> Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
"in theory possible with Taler, but they come with a few caveats. "
"Specifically, recurring payments can only work if the Taler wallet is "
@@ -683,10 +729,14 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time </p>"
+"feature that we are targeting for Taler 1.0. at this time"
+msgstr ""
+
+#: template/features.html.j2:7
+msgid "GNU Taler: Features"
msgstr ""
-#: template/features.html.j2:14
+#: template/features.html.j2:13
msgid ""
"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
"Customers can stay anonymous, but merchants can not hide their income "
@@ -694,28 +744,28 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
-#: template/features.html.j2:24
+#: template/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 ""
-#: template/features.html.j2:33
+#: template/features.html.j2:32
msgid ""
"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-#: template/features.html.j2:42
+#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-#: template/features.html.j2:51
+#: template/features.html.j2:50
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 "
@@ -723,33 +773,33 @@ msgid ""
"gone."
msgstr ""
-#: template/features.html.j2:70
+#: template/features.html.j2:69
msgid "Paying with Taler"
msgstr ""
-#: template/features.html.j2:72
+#: template/features.html.j2:71
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 ""
-#: template/features.html.j2:80
+#: template/features.html.j2:79
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 ""
-#: template/features.html.j2:88
+#: template/features.html.j2:87
msgid "Try it yourself with the interactive demo!"
msgstr ""
-#: template/features.html.j2:95
+#: template/features.html.j2:94
msgid "Receiving payments with Taler"
msgstr ""
-#: template/features.html.j2:97
+#: template/features.html.j2:96
msgid ""
"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
@@ -757,36 +807,36 @@ msgid ""
"processing can run on the merchant's premises or be hosted by a third party."
msgstr ""
-#: template/features.html.j2:106
+#: template/features.html.j2:105
msgid ""
"Merchant integration is simple, and customers can pay for products without "
"even having to register an account."
msgstr ""
-#: template/features.html.j2:113
+#: template/features.html.j2:112
msgid "See how merchant integration works in our developer documentation!"
msgstr ""
-#: template/features.html.j2:128
+#: template/features.html.j2:127
#, fuzzy
#| msgid "Ethical"
msgid "Practical"
msgstr "Ethique"
-#: template/features.html.j2:131
+#: template/features.html.j2:130
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 ""
-#: template/features.html.j2:141
+#: template/features.html.j2:140
#, fuzzy
#| msgid "Taxable"
msgid "Stable"
msgstr "Taxable"
-#: template/features.html.j2:144
+#: template/features.html.j2:143
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -794,52 +844,52 @@ msgid ""
"currencies, such as US Dollars, Euros or even Bitcoins."
msgstr ""
-#: template/features.html.j2:155 template/governments.html.j2:55
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr "Sûr"
-#: template/features.html.j2:158
+#: template/features.html.j2:157
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 ""
-#: template/features.html.j2:170 template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr "Taxable"
-#: template/features.html.j2:173
+#: template/features.html.j2:172
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 ""
-#: template/features.html.j2:183
+#: template/features.html.j2:182
msgid "Private"
msgstr ""
-#: template/features.html.j2:185
+#: template/features.html.j2:184
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 ""
-#: template/features.html.j2:196 template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr "Libre"
-#: template/features.html.j2:199
+#: template/features.html.j2:198
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
"organizations or whole countries. Since the reference implementation is a"
msgstr ""
-#: template/features.html.j2:206
+#: template/features.html.j2:205
msgid "package, it will always remain free software."
msgstr ""
@@ -1437,27 +1487,38 @@ msgstr ""
msgid "Dynamic Merchant Instance"
msgstr ""
-#: template/gsoc-codeless.html.j2:97
-msgid "Use Case Diagram"
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"merchant-instance\">here</a>."
msgstr ""
#: template/gsoc-codeless.html.j2:103
+msgid "Use Case Diagram"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:109
msgid "Link to the contributions made"
msgstr ""
-#: template/gsoc-codeless.html.j2:106
+#: template/gsoc-codeless.html.j2:113
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:108
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:127
msgid "Future Work"
msgstr ""
-#: template/gsoc-codeless.html.j2:120
+#: template/gsoc-codeless.html.j2:130
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. "
@@ -1466,7 +1527,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: template/gsoc-codeless.html.j2:130
+#: template/gsoc-codeless.html.j2:140
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 "
@@ -1474,7 +1535,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: template/gsoc-codeless.html.j2:140
+#: template/gsoc-codeless.html.j2:150
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. "
@@ -1486,7 +1547,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: template/gsoc-codeless.html.j2:154
+#: template/gsoc-codeless.html.j2:164
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 "
@@ -1494,7 +1555,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: template/gsoc-codeless.html.j2:164
+#: template/gsoc-codeless.html.j2:174
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1504,10 +1565,56 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: template/gsoc-codeless.html.j2:181
+#: template/gsoc-codeless.html.j2:191
msgid "Screenshots"
msgstr ""
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
#: template/investors.html.j2:6
msgid "Invest in Taler!"
msgstr ""
@@ -1540,11 +1647,11 @@ msgid ""
"and the"
msgstr ""
-#: template/investors.html.j2:49
+#: template/investors.html.j2:50
msgid "The Technology"
msgstr ""
-#: template/investors.html.j2:52
+#: template/investors.html.j2:53
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1555,11 +1662,11 @@ msgid ""
"transaction costs are fractions of a cent."
msgstr ""
-#: template/investors.html.j2:65
+#: template/investors.html.j2:66
msgid "The Business"
msgstr ""
-#: template/investors.html.j2:67
+#: template/investors.html.j2:68
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -1570,22 +1677,22 @@ msgid ""
"to facilitate the transactions."
msgstr ""
-#: template/investors.html.j2:86
+#: template/investors.html.j2:87
msgid "The Business Case"
msgstr ""
-#: template/investors.html.j2:96
+#: template/investors.html.j2:97
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:119
+#: template/investors.html.j2:120
msgid "Running a Taler payment service operator"
msgstr ""
-#: template/investors.html.j2:122
+#: template/investors.html.j2:123
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1593,29 +1700,29 @@ msgid ""
"of the computing infrastructure."
msgstr ""
-#: template/investors.html.j2:132
+#: template/investors.html.j2:133
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
msgstr ""
-#: template/investors.html.j2:133
+#: template/investors.html.j2:134
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
msgstr ""
-#: template/investors.html.j2:134
+#: template/investors.html.j2:135
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
msgstr ""
-#: template/investors.html.j2:135
+#: template/investors.html.j2:136
msgid "Partnership with banks establishes consumer trust."
msgstr ""
-#: template/investors.html.j2:136
+#: template/investors.html.j2:137
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
@@ -1751,6 +1858,10 @@ msgstr ""
msgid "customer perspective"
msgstr ""
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
#: template/news.html.j2:16
msgid "More news"
msgstr ""
@@ -1767,6 +1878,22 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr ""
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
#: template/principles.html.j2:21
msgid "GNU Taler: Design Principles"
msgstr ""
@@ -1782,7 +1909,7 @@ msgstr ""
#: template/principles.html.j2:33
msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
msgstr ""
#: template/principles.html.j2:36
@@ -1949,6 +2076,10 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: template/team.html.j2:6
+msgid "GNU Taler: Team"
+msgstr ""
+
#: template/team.html.j2:8
msgid ""
"GNU Taler is proudly brought to you by the humans on this page. To contact "
@@ -1967,7 +2098,7 @@ msgstr ""
#: template/team.html.j2:26
msgid ""
"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
msgstr ""
#: template/team.html.j2:31
@@ -1975,7 +2106,7 @@ msgid "Lawyer and banker."
msgstr ""
#: template/team.html.j2:38
-msgid "GNU mainatiner, lead developer."
+msgid "GNU maintainer, lead developer."
msgstr ""
#: template/team.html.j2:43
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 59d059d..615240f 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-09-03 09:57+0000\n"
+"POT-Creation-Date: 2019-09-03 12:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <LL@li.org>\n"
@@ -100,22 +100,22 @@ msgid "The mailing list"
msgstr "La mailing list"
#: template/contact.html.j2:15
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
msgstr ""
-"L'archivio della mailing list di GNU Taler è disponibile all'indirizzo <a "
-"href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. I messaggi per la lista vanno inviati a <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
-#: template/contact.html.j2:26
+#: template/contact.html.j2:29
msgid "Contacting individuals"
msgstr "Contattare membri del gruppo"
-#: template/contact.html.j2:28
+#: template/contact.html.j2:31
msgid ""
"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
"us support receiving GnuPG encrypted e-mails."
@@ -123,36 +123,48 @@ msgstr ""
"Ogni membro è generalmente raggiungibile all'indirizzo <tt>LASTNAME@taler."
"net</tt> Sono particolarmente gradite e-mail criptate via GnuPG."
-#: template/contact.html.j2:37
+#: template/contact.html.j2:40
msgid "General inquiries"
msgstr ""
-#: template/contact.html.j2:39
+#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:50
msgid "Reporting bugs"
msgstr "Riporta un bug"
-#: template/contact.html.j2:49
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "We track open feature requests and bugs in our <a href=\"https://gnunet."
+#| "org/bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You "
+#| "can also report bugs or feature requests to the mailing list."
msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
msgstr ""
"Tracciamo bugs e proposte per nuove funzionalità nel nostro <a href="
"\"https://gnunet.org/bugs/\">Bug tracker</a>, che serve anche il progetto "
"GNUnet. Bugs e nuove funzionalità possono essere riportate anche nella "
"mailing-list."
-#: template/contact.html.j2:60
+#: template/contact.html.j2:65
msgid "Executive team"
msgstr "Dirigenza"
-#: template/contact.html.j2:62
+#: template/contact.html.j2:67
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -171,10 +183,14 @@ msgid ""
msgstr ""
#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
msgid "of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:22
+#: template/copyright.html.j2:24
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -195,7 +211,7 @@ msgstr ""
"alla società la capacità di doppia licenza (ad esempio, in modo da poter "
"distribuire attraverso App-store ostili al software libero).</p>"
-#: template/copyright.html.j2:32
+#: template/copyright.html.j2:34
#, fuzzy
#| msgid ""
#| "<p>Minor contributions (basically, anyone without Git access) do not "
@@ -278,7 +294,7 @@ msgstr ""
"Taler è documentato in dettaglio sul sito <a href=\"https://docs.taler.net/"
"\">docs.taler.net</a>."
-#: template/developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
msgid "Code"
msgstr "Codice"
@@ -310,45 +326,45 @@ msgstr ""
"repository. E' possibile trovare un elenco di repository sul nostro <a href="
"\"https://git.taler.net/\">GitWeb</a>."
-#: template/developers.html.j2:82
+#: template/developers.html.j2:80
msgid "Documentation"
msgstr "Documentazione"
-#: template/developers.html.j2:85
+#: template/developers.html.j2:83
msgid "In addition to this website, the"
msgstr ""
-#: template/developers.html.j2:89
+#: template/developers.html.j2:86
msgid "documented code"
msgstr ""
-#: template/developers.html.j2:93
+#: template/developers.html.j2:87
#, fuzzy
#| msgid "and"
msgid "and the"
msgstr "e"
-#: template/developers.html.j2:97
+#: template/developers.html.j2:90
#, fuzzy
#| msgid "Documentation"
msgid "API documentation"
msgstr "Documentazione"
-#: template/developers.html.j2:101
+#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
msgstr ""
-#: template/developers.html.j2:105
+#: template/developers.html.j2:94
#, fuzzy
#| msgid "GNU Taler Bibliography"
-msgid "bibliography</a>."
+msgid "bibliography"
msgstr "Bibliografia"
-#: template/developers.html.j2:111
+#: template/developers.html.j2:98
msgid "Discussion"
msgstr "Discussione"
-#: template/developers.html.j2:114
+#: template/developers.html.j2:101
#, fuzzy
#| msgid ""
#| "We have a mailing list for developer discussions. You can subscribe to or "
@@ -363,56 +379,60 @@ msgstr ""
"org/mailman /listinfo/taler\">http://lists.gnu.org/mailman/listinfo/taler</"
"a>."
-#: template/developers.html.j2:124
+#: template/developers.html.j2:111
msgid "Regression Testing"
msgstr "Test delle regressioni"
-#: template/developers.html.j2:127
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
#, fuzzy
#| msgid ""
#| "We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests "
#| "to detect regressions and check for portability at <a href=\"https://"
#| "buildbot.taler.net/\">buildbot.taler.net</a>."
-msgid ""
-"We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests to "
-"detect regressions and check for portability at"
+msgid "automation tests to detect regressions and check for portability at"
msgstr ""
"Disponiamo di test di automazione <a href=\"https://buildbot.net/"
"\">Buildbot</a> per rilevare regressioni e verificare la portabilità al "
"seguente link <a href=\"https://buildbot.taler.net/\">buildbot.taler.net</a>."
-#: template/developers.html.j2:136
+#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
msgstr "Analisi della copertura del codice"
-#: template/developers.html.j2:139
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
#, fuzzy
#| msgid ""
#| "We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> "
#| "to analyze the code coverage of our tests, the results are available at "
#| "<a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at"
+msgid "to analyze the code coverage of our tests, the results are available at"
msgstr ""
"Utilizziamo <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</"
"a> per analizzare la copertura del codice dei nostri test, i risultati sono "
"disponibili al seguente link <a href=\"https://lcov.taler.net/\">lcov.taler."
"net</a>."
-#: template/developers.html.j2:154
+#: template/developers.html.j2:146
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:157 template/investors.html.j2:92
+#: template/developers.html.j2:149 template/investors.html.j2:93
msgid "Download"
msgstr "Scarica"
-#: template/developers.html.j2:173
+#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr "Panoramica del sistema Taler"
-#: template/developers.html.j2:176
+#: template/developers.html.j2:168
msgid ""
"The Taler system consists of protocols executed among a number of actors as "
"illustrated in the illustration on the right. Typical transactions involve "
@@ -422,13 +442,13 @@ msgstr ""
"mostrato nell'illustrazione a destra. Le transazioni tipiche comportano le "
"seguenti operazioni:"
-#: template/developers.html.j2:183
+#: template/developers.html.j2:175
#, fuzzy
#| msgid "Taler system overview"
msgid "system overview"
msgstr "Panoramica del sistema"
-#: template/developers.html.j2:186
+#: template/developers.html.j2:178
msgid ""
"A customer instructs his <b>bank</b> to transfer funds from his account to "
"the Taler exchange (top left). In the subject of the transaction, he "
@@ -440,7 +460,7 @@ msgstr ""
"include un token di autenticazione dal suo <b>portafoglio</b> elettronico. "
"Nella terminologia di Taler, il cliente crea una riserva al cambio."
-#: template/developers.html.j2:198
+#: template/developers.html.j2:190
msgid ""
"Once the exchange has received the wire transfer, it allows the customer's "
"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -461,7 +481,7 @@ msgstr ""
"valore totale dei fondi (ad eccezione delle commissioni che il cambio può "
"addebitare per il servizio)."
-#: template/developers.html.j2:216
+#: template/developers.html.j2:208
msgid ""
"Once the customer has the digital coins in his wallet, the wallet can be "
"used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -488,7 +508,7 @@ msgstr ""
"piccola parte delle sue monete digitali (il sistema pensa ai clienti che "
"ricevono del resto)."
-#: template/developers.html.j2:238
+#: template/developers.html.j2:230
msgid ""
"Merchants receiving digital coins <b>deposit</b> the respective claims that "
"resulted from the contract signing with the customer at the exchange to "
@@ -513,7 +533,7 @@ msgstr ""
"database del cambio consente allo Stato di far rispettare ai commercianti di "
"pagare le imposte vigenti (e di non impegnarsi in contratti illegali)."
-#: template/developers.html.j2:261
+#: template/developers.html.j2:253
msgid ""
"Finally, the exchange transfers funds corresponding to the digital coins "
"redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -528,7 +548,7 @@ msgstr ""
"relazione tra i trasferimenti bancari e le singole richieste di risarcimento "
"che erano state depositate."
-#: template/developers.html.j2:275
+#: template/developers.html.j2:267
msgid ""
"Most importantly, the exchange keeps cryptographic proofs that allow it to "
"demonstrate that it is operating correctly to third parties. The system "
@@ -544,7 +564,7 @@ msgstr ""
"frequentemente i database del cambio e controllare che il suo saldo bancario "
"corrisponda al valore totale delle monete restanti in circolazione."
-#: template/developers.html.j2:290
+#: template/developers.html.j2:282
msgid ""
"Without the auditor, the exchange operators could embezzle funds they are "
"holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -558,6 +578,12 @@ msgstr ""
"sono compromessi, il danno finanziario è limitato alla rispettiva parte ed è "
"proporzionale ai fondi in circolazione durante quel periodo."
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "GNU Taler nella Stampa"
+
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
@@ -565,86 +591,114 @@ msgid ""
"\">here</a>."
msgstr ""
-#: template/docs.html.j2:39
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Also available as"
+msgid "Tutorial and manual for operating a merchant. Also available as"
msgstr ""
-#: template/docs.html.j2:46
+#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:48
-#, python-format
+#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:60
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+#, fuzzy
+#| msgid "exchange"
+msgid "Exchange"
+msgstr "cambio"
+
+#: template/docs.html.j2:64
+msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: template/docs.html.j2:70
+#: template/docs.html.j2:74
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:72
-#, python-format
+#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:88
+#: template/docs.html.j2:92
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:90
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:94
+msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:107
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:124
-#, python-format
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
msgid ""
-"Description of our taler.net setup and how to contribute. Also available as "
-"<a href=\"https://%(docshost)s/pdf/onboarding.pdf\">PDF</a>."
+"Description of our taler.net setup and how to contribute. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:143
+msgid "Community"
msgstr ""
-#: template/docs.html.j2:150
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "La mailing list"
+
+#: template/docs.html.j2:156
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "La mailing list"
-#: template/docs.html.j2:158
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:166
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:194
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:196
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -815,7 +869,7 @@ msgstr "<p>Al momento Taler non offre la conversione tra le valute.</p> "
msgid "How does Taler protect my privacy?"
msgstr "Come protegge Taler la mia privacy?"
-#: template/faq.html.j2:90
+#: template/faq.html.j2:91
#, fuzzy
#| msgid ""
#| "<p>Your wallet stores digital coins that are <a href=\"https://en."
@@ -823,23 +877,23 @@ msgstr "Come protegge Taler la mia privacy?"
#| "The use of a blind signature protects your privacy as it prevents the "
#| "exchange from knowing which coin it signed for which customer.</p>"
msgid ""
-"<p> Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer. </p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
msgstr ""
"<p>Il tuo portafoglio contiene monete digitali che sono <a href=\"https://en."
"wikipedia.org/wiki/Blind_signature\">firmate ciecamente</a> da un cambio. "
"L'uso della blind signature protegge la tua privacy in quanto impedisce al "
"cambio di sapere quale moneta ha firmato e per quale cliente.</p> "
-#: template/faq.html.j2:100
+#: template/faq.html.j2:101
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:103
msgid ""
-"<p> The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
"refunding coins. Operators can also charge fees for closing reserves and for "
"(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -847,87 +901,86 @@ msgid ""
"0.001 cent/transaction (at high transaction rates, amortized over billions "
"of transactions, excluding migration costs). Note that this is an early "
"estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher. </p>"
+"regulator and could thus easily be 10x higher."
msgstr ""
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:118
+#: template/faq.html.j2:119
msgid ""
-"<p> Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future. </p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
msgstr ""
-#: template/faq.html.j2:131
+#: template/faq.html.j2:130
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
#: template/faq.html.j2:132
msgid ""
-"<p> We believe the European Electronic Money Directive provides part of the "
+"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
-"have to follow. </p>"
+"have to follow."
msgstr ""
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:142
+#: template/faq.html.j2:141
msgid ""
-"<p> The exchange would be operated by a bank or in cooperation with a bank, "
-"and that bank would hold the funds in escrow. Note that this bank could be a "
+"The exchange would be operated by a bank or in cooperation with a bank, and "
+"that bank would hold the funds in escrow. Note that this bank could be a "
"regular bank or a central bank for a centrally banked electronic currency. "
"Regardless, the bank would fall under the respective banking regulations "
"establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money. </p>"
+"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:153
+#: template/faq.html.j2:152
msgid ""
-"<p> Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
"the auditors, but auditors may also provide a method for manual submission "
"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public. </p>"
+"respective regulatory authorities, or even the general public."
msgstr ""
-#: template/faq.html.j2:163
+#: template/faq.html.j2:161
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:164
+#: template/faq.html.j2:163
msgid ""
-"<p> We are aware of several businesses running exploratory projects or "
-"having developed working prototypes. We are also in discussions with several "
+"We are aware of several businesses running exploratory projects or having "
+"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
"be premature given the state of the project (see also <a href=\"https://"
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues). </p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:176
+#: template/faq.html.j2:174
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:177
+#: template/faq.html.j2:176
msgid ""
-"<p> Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
"in theory possible with Taler, but they come with a few caveats. "
"Specifically, recurring payments can only work if the Taler wallet is "
@@ -939,10 +992,16 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time </p>"
+"feature that we are targeting for Taler 1.0. at this time"
msgstr ""
-#: template/features.html.j2:14
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "GNU Taler nella Stampa"
+
+#: template/features.html.j2:13
msgid ""
"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
"Customers can stay anonymous, but merchants can not hide their income "
@@ -950,28 +1009,28 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
-#: template/features.html.j2:24
+#: template/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 ""
-#: template/features.html.j2:33
+#: template/features.html.j2:32
msgid ""
"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-#: template/features.html.j2:42
+#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-#: template/features.html.j2:51
+#: template/features.html.j2:50
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 "
@@ -979,11 +1038,11 @@ msgid ""
"gone."
msgstr ""
-#: template/features.html.j2:70
+#: template/features.html.j2:69
msgid "Paying with Taler"
msgstr "Pagare con Taler"
-#: template/features.html.j2:72
+#: template/features.html.j2:71
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -1005,7 +1064,7 @@ msgstr ""
"intercettazione di frodi e non presentano alcun rischio di phishing o furto "
"di identità.</p> "
-#: template/features.html.j2:80
+#: template/features.html.j2:79
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -1027,15 +1086,15 @@ msgstr ""
"intercettazione di frodi e non presentano alcun rischio di phishing o furto "
"di identità.</p> "
-#: template/features.html.j2:88
+#: template/features.html.j2:87
msgid "Try it yourself with the interactive demo!"
msgstr ""
-#: template/features.html.j2:95
+#: template/features.html.j2:94
msgid "Receiving payments with Taler"
msgstr "Ricevere pagamenti con Taler"
-#: template/features.html.j2:97
+#: template/features.html.j2:96
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -1055,21 +1114,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> "
-#: template/features.html.j2:106
+#: template/features.html.j2:105
msgid ""
"Merchant integration is simple, and customers can pay for products without "
"even having to register an account."
msgstr ""
-#: template/features.html.j2:113
+#: template/features.html.j2:112
msgid "See how merchant integration works in our developer documentation!"
msgstr ""
-#: template/features.html.j2:128
+#: template/features.html.j2:127
msgid "Practical"
msgstr "Pratico"
-#: template/features.html.j2:131
+#: template/features.html.j2:130
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
@@ -1079,11 +1138,11 @@ msgstr ""
"sono protetti da crittografia e vengono confermati entro pochi millisecondi "
"con costi di transazione estremamente bassi. "
-#: template/features.html.j2:141
+#: template/features.html.j2:140
msgid "Stable"
msgstr "Stabile"
-#: template/features.html.j2:144
+#: template/features.html.j2:143
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -1096,12 +1155,12 @@ msgstr ""
"corrispondono a valute attuali, come i dollari USA, gli Euro o perfino i "
"Bitcoins. "
-#: template/features.html.j2:155 template/governments.html.j2:55
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr "Sicuro"
-#: template/features.html.j2:158
+#: template/features.html.j2:157
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 "
@@ -1112,11 +1171,11 @@ msgstr ""
"sue misure di sicurezza, Taler non respinge mai un cliente legittimo a causa "
"di un falso positivo in intercettazione di frode. "
-#: template/features.html.j2:170 template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr "Tassabile"
-#: template/features.html.j2:173
+#: template/features.html.j2:172
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -1127,11 +1186,11 @@ msgstr ""
"parte delle valute digitali, Taler aiuta a prevenire il mercato nero. Taler "
"non è adatto ad attività illegali. "
-#: template/features.html.j2:183
+#: template/features.html.j2:182
msgid "Private"
msgstr "Privato"
-#: template/features.html.j2:185
+#: template/features.html.j2:184
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 "
@@ -1142,12 +1201,12 @@ msgstr ""
"moneta elettronica. Tuttavia, si ottiene una conferma di pagamento "
"legalmentevalida. "
-#: template/features.html.j2:196 template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
#, fuzzy
msgid "Libre"
msgstr "Libero"
-#: template/features.html.j2:199
+#: template/features.html.j2:198
#, fuzzy
#| msgid ""
#| "Taler provides protocols and reference implementations that in principle "
@@ -1166,7 +1225,7 @@ msgstr ""
"momento che l'implementazione di riferimento è un pacchetto <a href=\"http://"
"wwww.gnu.org/\"GNU</a>, rimarrà sempre software libero. "
-#: template/features.html.j2:206
+#: template/features.html.j2:205
msgid "package, it will always remain free software."
msgstr ""
@@ -1891,27 +1950,38 @@ msgstr ""
msgid "Dynamic Merchant Instance"
msgstr ""
-#: template/gsoc-codeless.html.j2:97
-msgid "Use Case Diagram"
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"merchant-instance\">here</a>."
msgstr ""
#: template/gsoc-codeless.html.j2:103
+msgid "Use Case Diagram"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:109
msgid "Link to the contributions made"
msgstr ""
-#: template/gsoc-codeless.html.j2:106
+#: template/gsoc-codeless.html.j2:113
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:108
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:127
msgid "Future Work"
msgstr ""
-#: template/gsoc-codeless.html.j2:120
+#: template/gsoc-codeless.html.j2:130
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. "
@@ -1920,7 +1990,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: template/gsoc-codeless.html.j2:130
+#: template/gsoc-codeless.html.j2:140
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 "
@@ -1928,7 +1998,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: template/gsoc-codeless.html.j2:140
+#: template/gsoc-codeless.html.j2:150
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. "
@@ -1940,7 +2010,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: template/gsoc-codeless.html.j2:154
+#: template/gsoc-codeless.html.j2:164
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 "
@@ -1948,7 +2018,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: template/gsoc-codeless.html.j2:164
+#: template/gsoc-codeless.html.j2:174
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1958,10 +2028,56 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: template/gsoc-codeless.html.j2:181
+#: template/gsoc-codeless.html.j2:191
msgid "Screenshots"
msgstr ""
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
#: template/investors.html.j2:6
msgid "Invest in Taler!"
msgstr "Investi in Taler! "
@@ -2002,11 +2118,11 @@ msgid ""
"and the"
msgstr ""
-#: template/investors.html.j2:49
+#: template/investors.html.j2:50
msgid "The Technology"
msgstr "La Tecnologia"
-#: template/investors.html.j2:52
+#: template/investors.html.j2:53
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -2025,11 +2141,11 @@ msgstr ""
"dimostrano che i partecipanti sono stati onesti. I costi effettivi di "
"transazione sono frazioni di un centesimo. "
-#: template/investors.html.j2:65
+#: template/investors.html.j2:66
msgid "The Business"
msgstr "Il Business"
-#: template/investors.html.j2:67
+#: template/investors.html.j2:68
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -2047,11 +2163,11 @@ msgstr ""
"scambiarle per denaro al cambio utilizzando i sistemi di pagamento "
"tradizionali. Il cambio addebita delle spese per facilitare le transazioni. "
-#: template/investors.html.j2:86
+#: template/investors.html.j2:87
msgid "The Business Case"
msgstr "Il Caso Aziendale"
-#: template/investors.html.j2:96
+#: template/investors.html.j2:97
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
@@ -2061,11 +2177,11 @@ msgstr ""
"chiarisce in inglese come Taler può influenzare gli sviluppi attuali nel "
"mercato dei pagamenti globali. "
-#: template/investors.html.j2:119
+#: template/investors.html.j2:120
msgid "Running a Taler payment service operator"
msgstr "Funzionamento di un operatore dei servizi di pagamento Taler "
-#: template/investors.html.j2:122
+#: template/investors.html.j2:123
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -2078,7 +2194,7 @@ msgstr ""
"bonifici con il sistema bancario e al funzionamento dell'infrastruttura di "
"calcolo. "
-#: template/investors.html.j2:132
+#: template/investors.html.j2:133
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2086,7 +2202,7 @@ msgstr ""
"Le operazioni di crittografia, la larghezza di banda e i costi di "
"archiviazione sono inferiori a 0,01 centesimi per transazione. "
-#: template/investors.html.j2:133
+#: template/investors.html.j2:134
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2095,7 +2211,7 @@ msgstr ""
"di denaro più grandi ai commercianti per ridurre al minimo i costi dei "
"bonifici bancari."
-#: template/investors.html.j2:134
+#: template/investors.html.j2:135
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2104,11 +2220,11 @@ msgstr ""
"operazione costosa (prelievo, deposito, aggiornamento, rimborso o bonifici "
"bancari aggregati. "
-#: template/investors.html.j2:135
+#: template/investors.html.j2:136
msgid "Partnership with banks establishes consumer trust."
msgstr "La partnership con le banche instaura fiducia nei consumatori. "
-#: template/investors.html.j2:136
+#: template/investors.html.j2:137
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"La partnership con la comunità del software libero consente una rapida "
@@ -2296,6 +2412,10 @@ msgstr ""
msgid "customer perspective"
msgstr ""
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
#: template/news.html.j2:16
msgid "More news"
msgstr "Altre notizie"
@@ -2312,6 +2432,22 @@ msgstr "Questa pagina documenta la storia di GNU Taler. "
msgid "GNU Taler in the Press"
msgstr "GNU Taler nella Stampa"
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
#: template/principles.html.j2:21
#, fuzzy
#| msgid "GNU Taler in the Press"
@@ -2329,7 +2465,7 @@ msgstr ""
#: template/principles.html.j2:33
msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
msgstr ""
#: template/principles.html.j2:36
@@ -2502,6 +2638,12 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: template/team.html.j2:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "GNU Taler"
+
#: template/team.html.j2:8
msgid ""
"GNU Taler is proudly brought to you by the humans on this page. To contact "
@@ -2518,9 +2660,13 @@ msgstr ""
"GNU"
#: template/team.html.j2:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
msgid ""
"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
msgstr ""
"Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
"diversi settori"
@@ -2530,7 +2676,7 @@ msgid "Lawyer and banker."
msgstr ""
#: template/team.html.j2:38
-msgid "GNU mainatiner, lead developer."
+msgid "GNU maintainer, lead developer."
msgstr ""
#: template/team.html.j2:43
@@ -2675,6 +2821,22 @@ msgstr ""
msgid "Wallets for other browsers will be provided in the near future."
msgstr ""
+#~ msgid ""
+#~ "An archived, public mailing list for GNU Taler is hosted at <a href="
+#~ "\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+#~ "mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+#~ "\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+#~ msgstr ""
+#~ "L'archivio della mailing list di GNU Taler è disponibile all'indirizzo <a "
+#~ "href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu."
+#~ "org/mailman/listinfo/taler</a>. I messaggi per la lista vanno inviati a "
+#~ "<a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+
+#, fuzzy
+#~| msgid "GNU Taler Bibliography"
+#~ msgid "bibliography</a>."
+#~ msgstr "Bibliografia"
+
#, fuzzy
#~| msgid ""
#~| "<p>Contributors to GNU Taler with Git access must sign the <a href=\"/"
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 6469805..b64e822 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-09-03 09:57+0000\n"
+"POT-Creation-Date: 2019-09-03 12:13+0000\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -103,22 +103,22 @@ msgid "The mailing list"
msgstr "A lista de discussão"
#: template/contact.html.j2:15
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
msgstr ""
-"Uma lista de discussão público arquivada para o GNU Taler é hospedada em <a "
-"href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. Você pode enviar mensagens para a lista em <a "
-"href=\"mailto:taler@gnu.org\">taler@gnu.org</a>."
-#: template/contact.html.j2:26
+#: template/contact.html.j2:29
msgid "Contacting individuals"
msgstr "Contatando indivíduos"
-#: template/contact.html.j2:28
+#: template/contact.html.j2:31
msgid ""
"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
"us support receiving GnuPG encrypted e-mails."
@@ -126,36 +126,48 @@ msgstr ""
"Os membros da equipe geralmente são acessíveis em <tt>SOBRENOME@taler.net</"
"tt>. Todos nós apoiamos o recebimento de e-mails criptografados pelo GnuPG."
-#: template/contact.html.j2:37
+#: template/contact.html.j2:40
msgid "General inquiries"
msgstr ""
-#: template/contact.html.j2:39
+#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:50
msgid "Reporting bugs"
msgstr "Relatando bugs"
-#: template/contact.html.j2:49
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "We track open feature requests and bugs in our <a href=\"https://gnunet."
+#| "org/bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You "
+#| "can also report bugs or feature requests to the mailing list."
msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
msgstr ""
"Acompanhamos a abertura de pedidos de recursos e erros em nosso <a href="
"\"https://gnunet.org/bugs/\">rastreador de bugs</a>, que é compartilhado com "
"o projeto GNUnet. Você também pode relatar bugs ou solicitações de recursos "
"para a lista de discussões."
-#: template/contact.html.j2:60
+#: template/contact.html.j2:65
msgid "Executive team"
msgstr "Equipe executiva"
-#: template/contact.html.j2:62
+#: template/contact.html.j2:67
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -174,10 +186,14 @@ msgid ""
msgstr ""
#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
msgid "of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:22
+#: template/copyright.html.j2:24
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -199,7 +215,7 @@ msgstr ""
"distribuir através de lojas de aplicativos (“App stores”) que sejam hostis "
"ao software livre).</p>"
-#: template/copyright.html.j2:32
+#: template/copyright.html.j2:34
#, fuzzy
#| msgid ""
#| "<p>Minor contributions (basically, anyone without Git access) do not "
@@ -279,7 +295,7 @@ msgstr ""
"Web existentes. O protocolo do Taler é documentado em detalhes em <a href="
"\"https://docs.taler.net/\">docs.taler.net</a>."
-#: template/developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
msgid "Code"
msgstr "Código"
@@ -311,45 +327,45 @@ msgstr ""
"lista de repositórios pode ser encontrada em nosso <a href=\"https://git."
"taler.net/\">GitWeb</a>."
-#: template/developers.html.j2:82
+#: template/developers.html.j2:80
msgid "Documentation"
msgstr "Documentação"
-#: template/developers.html.j2:85
+#: template/developers.html.j2:83
msgid "In addition to this website, the"
msgstr ""
-#: template/developers.html.j2:89
+#: template/developers.html.j2:86
msgid "documented code"
msgstr ""
-#: template/developers.html.j2:93
+#: template/developers.html.j2:87
#, fuzzy
#| msgid "and"
msgid "and the"
msgstr "e"
-#: template/developers.html.j2:97
+#: template/developers.html.j2:90
#, fuzzy
#| msgid "Documentation"
msgid "API documentation"
msgstr "Documentação"
-#: template/developers.html.j2:101
+#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
msgstr ""
-#: template/developers.html.j2:105
+#: template/developers.html.j2:94
#, fuzzy
#| msgid "Bibliography"
-msgid "bibliography</a>."
+msgid "bibliography"
msgstr "Bibliografia"
-#: template/developers.html.j2:111
+#: template/developers.html.j2:98
msgid "Discussion"
msgstr "Discussão"
-#: template/developers.html.j2:114
+#: template/developers.html.j2:101
#, fuzzy
#| msgid ""
#| "We have a mailing list for developer discussions. You can subscribe to or "
@@ -363,55 +379,59 @@ msgstr ""
"se inscrever ou ler o arquivo da lista em <a href=\"http://lists.gnu.org/"
"mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
-#: template/developers.html.j2:124
+#: template/developers.html.j2:111
msgid "Regression Testing"
msgstr "Teste de regressão"
-#: template/developers.html.j2:127
+#: template/developers.html.j2:114
+msgid "We have"
+msgstr ""
+
+#: template/developers.html.j2:118
#, fuzzy
#| msgid ""
#| "We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests "
#| "to detect regressions and check for portability at <a href=\"https://"
#| "buildbot.taler.net/\">buildbot.taler.net</a>."
-msgid ""
-"We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests to "
-"detect regressions and check for portability at"
+msgid "automation tests to detect regressions and check for portability at"
msgstr ""
"Nós temos testes de automação com <a href=\"https://buildbot.net/"
"\">Buildbot</a> para detectar regressões e verificar a portabilidade em <a "
"href=\"https://buildbot.taler.net/\">buildbot.taler.net</a>."
-#: template/developers.html.j2:136
+#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
msgstr "Análise de cobertura de código"
-#: template/developers.html.j2:139
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
#, fuzzy
#| msgid ""
#| "We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> "
#| "to analyze the code coverage of our tests, the results are available at "
#| "<a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at"
+msgid "to analyze the code coverage of our tests, the results are available at"
msgstr ""
"Usamos <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> "
"para analisar a cobertura do código de nossos testes, os resultados estão "
"disponíveis em <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
-#: template/developers.html.j2:154
+#: template/developers.html.j2:146
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:157 template/investors.html.j2:92
+#: template/developers.html.j2:149 template/investors.html.j2:93
msgid "Download"
msgstr "Baixar"
-#: template/developers.html.j2:173
+#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr "Visão geral do sistema Taler"
-#: template/developers.html.j2:176
+#: template/developers.html.j2:168
msgid ""
"The Taler system consists of protocols executed among a number of actors as "
"illustrated in the illustration on the right. Typical transactions involve "
@@ -421,11 +441,11 @@ msgstr ""
"ilustrado na ilustração à direita. As transações típicas envolvem as "
"seguintes etapas:"
-#: template/developers.html.j2:183
+#: template/developers.html.j2:175
msgid "system overview"
msgstr "visão geral do sistema"
-#: template/developers.html.j2:186
+#: template/developers.html.j2:178
msgid ""
"A customer instructs his <b>bank</b> to transfer funds from his account to "
"the Taler exchange (top left). In the subject of the transaction, he "
@@ -437,7 +457,7 @@ msgstr ""
"inclui um token de autenticação de sua <b>carteira</b> eletrônica. Na "
"terminologia do Taler, o cliente cria uma reserva no câmbio."
-#: template/developers.html.j2:198
+#: template/developers.html.j2:190
msgid ""
"Once the exchange has received the wire transfer, it allows the customer's "
"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -457,7 +477,7 @@ msgstr ""
"moeda ou o valor total dos fundos (exceto as taxas que a bolsa pode cobrar "
"pelo serviço)."
-#: template/developers.html.j2:216
+#: template/developers.html.j2:208
msgid ""
"Once the customer has the digital coins in his wallet, the wallet can be "
"used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -483,7 +503,7 @@ msgstr ""
"gastar qualquer fração de suas moedas digitais (o sistema cuida dos clientes "
"obtendo troco)."
-#: template/developers.html.j2:238
+#: template/developers.html.j2:230
msgid ""
"Merchants receiving digital coins <b>deposit</b> the respective claims that "
"resulted from the contract signing with the customer at the exchange to "
@@ -508,7 +528,7 @@ msgstr ""
"que o Estado imponha que os comerciantes paguem tributos aplicáveis (e não "
"se envolvam em contratos ilegais)."
-#: template/developers.html.j2:261
+#: template/developers.html.j2:253
msgid ""
"Finally, the exchange transfers funds corresponding to the digital coins "
"redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -523,7 +543,7 @@ msgstr ""
"entre as transferências bancárias e as reivindicações individuais que foram "
"depositadas."
-#: template/developers.html.j2:275
+#: template/developers.html.j2:267
msgid ""
"Most importantly, the exchange keeps cryptographic proofs that allow it to "
"demonstrate that it is operating correctly to third parties. The system "
@@ -539,7 +559,7 @@ msgstr ""
"câmbio e verificar se o saldo bancário corresponde ao valor total das moedas "
"restantes em circulação."
-#: template/developers.html.j2:290
+#: template/developers.html.j2:282
msgid ""
"Without the auditor, the exchange operators could embezzle funds they are "
"holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -553,6 +573,12 @@ msgstr ""
"comprometidos, o dano financeiro é limitado à respectiva parte e "
"proporcional aos fundos em circulação durante o período do comprometimento."
+#: template/docs.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Documentation and Resources"
+msgstr "GNU Taler na imprensa"
+
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
@@ -560,86 +586,114 @@ msgid ""
"\">here</a>."
msgstr ""
-#: template/docs.html.j2:39
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Also available as"
+msgid "Tutorial and manual for operating a merchant. Also available as"
msgstr ""
-#: template/docs.html.j2:46
+#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:48
-#, python-format
+#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:60
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+#, fuzzy
+#| msgid "exchange"
+msgid "Exchange"
+msgstr "câmbio <i>(exchange)</i>"
+
+#: template/docs.html.j2:64
+msgid "Operator's manual for the GNU Taler exchange. Also available as"
msgstr ""
-#: template/docs.html.j2:70
+#: template/docs.html.j2:74
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:72
-#, python-format
+#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:88
+#: template/docs.html.j2:92
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:90
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:94
+msgid "Manual to run the back-office Web application. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:107
+msgid "Internals"
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:124
-#, python-format
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
msgid ""
-"Description of our taler.net setup and how to contribute. Also available as "
-"<a href=\"https://%(docshost)s/pdf/onboarding.pdf\">PDF</a>."
+"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:150
+#: template/docs.html.j2:143
+msgid "Community"
+msgstr ""
+
+#: template/docs.html.j2:154
+#, fuzzy
+#| msgid "The mailing list"
+msgid "Mailing List"
+msgstr "A lista de discussão"
+
+#: template/docs.html.j2:156
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "A lista de discussão"
-#: template/docs.html.j2:158
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:166
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:194
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:196
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -808,7 +862,7 @@ msgstr "<p>O Taler atualmente não oferece conversão entre moedas.</p>"
msgid "How does Taler protect my privacy?"
msgstr "Como o Taler protege minha privacidade?"
-#: template/faq.html.j2:90
+#: template/faq.html.j2:91
#, fuzzy
#| msgid ""
#| "<p>Your wallet stores digital coins that are <a href=\"https://en."
@@ -816,23 +870,23 @@ msgstr "Como o Taler protege minha privacidade?"
#| "The use of a blind signature protects your privacy as it prevents the "
#| "exchange from knowing which coin it signed for which customer.</p>"
msgid ""
-"<p> Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer. </p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
msgstr ""
"<p>A sua carteira armazena moedas digitais que são <a href=\"https://en."
"wikipedia.org/wiki/Blind_signature\">assinadas cegamente</a> por um câmbio. "
"O uso de uma assinatura cega protege sua privacidade, pois impede o câmbio "
"de saber qual moeda assinou para qual cliente.</p>"
-#: template/faq.html.j2:100
+#: template/faq.html.j2:101
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:103
msgid ""
-"<p> The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
"refunding coins. Operators can also charge fees for closing reserves and for "
"(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -840,87 +894,86 @@ msgid ""
"0.001 cent/transaction (at high transaction rates, amortized over billions "
"of transactions, excluding migration costs). Note that this is an early "
"estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher. </p>"
+"regulator and could thus easily be 10x higher."
msgstr ""
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:118
+#: template/faq.html.j2:119
msgid ""
-"<p> Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future. </p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
msgstr ""
-#: template/faq.html.j2:131
+#: template/faq.html.j2:130
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
#: template/faq.html.j2:132
msgid ""
-"<p> We believe the European Electronic Money Directive provides part of the "
+"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
-"have to follow. </p>"
+"have to follow."
msgstr ""
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:142
+#: template/faq.html.j2:141
msgid ""
-"<p> The exchange would be operated by a bank or in cooperation with a bank, "
-"and that bank would hold the funds in escrow. Note that this bank could be a "
+"The exchange would be operated by a bank or in cooperation with a bank, and "
+"that bank would hold the funds in escrow. Note that this bank could be a "
"regular bank or a central bank for a centrally banked electronic currency. "
"Regardless, the bank would fall under the respective banking regulations "
"establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money. </p>"
+"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:153
+#: template/faq.html.j2:152
msgid ""
-"<p> Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
"the auditors, but auditors may also provide a method for manual submission "
"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public. </p>"
+"respective regulatory authorities, or even the general public."
msgstr ""
-#: template/faq.html.j2:163
+#: template/faq.html.j2:161
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:164
+#: template/faq.html.j2:163
msgid ""
-"<p> We are aware of several businesses running exploratory projects or "
-"having developed working prototypes. We are also in discussions with several "
+"We are aware of several businesses running exploratory projects or having "
+"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
"be premature given the state of the project (see also <a href=\"https://"
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues). </p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:176
+#: template/faq.html.j2:174
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:177
+#: template/faq.html.j2:176
msgid ""
-"<p> Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
"in theory possible with Taler, but they come with a few caveats. "
"Specifically, recurring payments can only work if the Taler wallet is "
@@ -932,10 +985,16 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time </p>"
+"feature that we are targeting for Taler 1.0. at this time"
msgstr ""
-#: template/features.html.j2:14
+#: template/features.html.j2:7
+#, fuzzy
+#| msgid "GNU Taler in the Press"
+msgid "GNU Taler: Features"
+msgstr "GNU Taler na imprensa"
+
+#: template/features.html.j2:13
msgid ""
"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
"Customers can stay anonymous, but merchants can not hide their income "
@@ -943,28 +1002,28 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
-#: template/features.html.j2:24
+#: template/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 ""
-#: template/features.html.j2:33
+#: template/features.html.j2:32
msgid ""
"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-#: template/features.html.j2:42
+#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-#: template/features.html.j2:51
+#: template/features.html.j2:50
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 "
@@ -972,11 +1031,11 @@ msgid ""
"gone."
msgstr ""
-#: template/features.html.j2:70
+#: template/features.html.j2:69
msgid "Paying with Taler"
msgstr "Pagando com o Taler"
-#: template/features.html.j2:72
+#: template/features.html.j2:71
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -997,7 +1056,7 @@ msgstr ""
"nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
"risco de phishing ou roubo de identidade.</p>"
-#: template/features.html.j2:80
+#: template/features.html.j2:79
#, fuzzy
#| msgid ""
#| "<p>To pay with Taler, customers install an electronic wallet on their "
@@ -1018,15 +1077,15 @@ msgstr ""
"nunca são falsamente rejeitados pela detecção de fraude e não apresentam "
"risco de phishing ou roubo de identidade.</p>"
-#: template/features.html.j2:88
+#: template/features.html.j2:87
msgid "Try it yourself with the interactive demo!"
msgstr ""
-#: template/features.html.j2:95
+#: template/features.html.j2:94
msgid "Receiving payments with Taler"
msgstr "Recebendo pagamentos com o Taler"
-#: template/features.html.j2:97
+#: template/features.html.j2:96
#, fuzzy
#| msgid ""
#| "<p>To receive Taler payments, a merchant needs a bank account in the "
@@ -1046,21 +1105,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>"
-#: template/features.html.j2:106
+#: template/features.html.j2:105
msgid ""
"Merchant integration is simple, and customers can pay for products without "
"even having to register an account."
msgstr ""
-#: template/features.html.j2:113
+#: template/features.html.j2:112
msgid "See how merchant integration works in our developer documentation!"
msgstr ""
-#: template/features.html.j2:128
+#: template/features.html.j2:127
msgid "Practical"
msgstr "Prático"
-#: template/features.html.j2:131
+#: template/features.html.j2:130
msgid ""
"Taler is easy to integrate with existing Web applications. Payments are "
"cryptographically secured and are confirmed within milliseconds with "
@@ -1070,11 +1129,11 @@ msgstr ""
"são protegidos criptograficamente e são confirmados em milissegundos com "
"custos de transação extremamente baixos."
-#: template/features.html.j2:141
+#: template/features.html.j2:140
msgid "Stable"
msgstr "Estável"
-#: template/features.html.j2:144
+#: template/features.html.j2:143
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -1087,12 +1146,12 @@ msgstr ""
"correspondem às moedas existentes, como Dólares dos EUA, Euros ou até "
"Bitcoins."
-#: template/features.html.j2:155 template/governments.html.j2:55
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr "Seguro"
-#: template/features.html.j2:158
+#: template/features.html.j2:157
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 "
@@ -1103,11 +1162,11 @@ msgstr ""
"o Taler nunca rejeita um cliente legítimo devido a um falso positivo de "
"detecção de fraude."
-#: template/features.html.j2:170 template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr "Tributável"
-#: template/features.html.j2:173
+#: template/features.html.j2:172
msgid ""
"When using Taler, merchant's revenue is transparent for tax collection "
"authorities. Unlike cash and most digital currencies, Taler helps prevent "
@@ -1118,11 +1177,11 @@ msgstr ""
"digitais, o Taler ajuda a evitar os mercados negros. O Taler não é adequado "
"para atividades ilegais."
-#: template/features.html.j2:183
+#: template/features.html.j2:182
msgid "Private"
msgstr "Privado"
-#: template/features.html.j2:185
+#: template/features.html.j2:184
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 "
@@ -1133,11 +1192,11 @@ msgstr ""
"gastou seu dinheiro eletrônico. No entanto, você obtém uma prova de "
"pagamento legalmente válida."
-#: template/features.html.j2:196 template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr "Livre"
-#: template/features.html.j2:199
+#: template/features.html.j2:198
#, fuzzy
#| msgid ""
#| "Taler provides protocols and reference implementations that in principle "
@@ -1156,7 +1215,7 @@ msgstr ""
"implementação de referência é um pacote <a href=\"http://www.gnu.org/\">GNU</"
"a>, ele sempre permanecerá como software livre."
-#: template/features.html.j2:206
+#: template/features.html.j2:205
msgid "package, it will always remain free software."
msgstr ""
@@ -1871,27 +1930,38 @@ msgstr ""
msgid "Dynamic Merchant Instance"
msgstr ""
-#: template/gsoc-codeless.html.j2:97
-msgid "Use Case Diagram"
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"merchant-instance\">here</a>."
msgstr ""
#: template/gsoc-codeless.html.j2:103
+msgid "Use Case Diagram"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:109
msgid "Link to the contributions made"
msgstr ""
-#: template/gsoc-codeless.html.j2:106
+#: template/gsoc-codeless.html.j2:113
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:108
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:127
msgid "Future Work"
msgstr ""
-#: template/gsoc-codeless.html.j2:120
+#: template/gsoc-codeless.html.j2:130
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. "
@@ -1900,7 +1970,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: template/gsoc-codeless.html.j2:130
+#: template/gsoc-codeless.html.j2:140
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 "
@@ -1908,7 +1978,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: template/gsoc-codeless.html.j2:140
+#: template/gsoc-codeless.html.j2:150
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. "
@@ -1920,7 +1990,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: template/gsoc-codeless.html.j2:154
+#: template/gsoc-codeless.html.j2:164
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 "
@@ -1928,7 +1998,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: template/gsoc-codeless.html.j2:164
+#: template/gsoc-codeless.html.j2:174
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1938,10 +2008,56 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: template/gsoc-codeless.html.j2:181
+#: template/gsoc-codeless.html.j2:191
msgid "Screenshots"
msgstr ""
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
#: template/investors.html.j2:6
msgid "Invest in Taler!"
msgstr "Invista no Taler!"
@@ -1980,11 +2096,11 @@ msgid ""
"and the"
msgstr ""
-#: template/investors.html.j2:49
+#: template/investors.html.j2:50
msgid "The Technology"
msgstr "A tecnologia"
-#: template/investors.html.j2:52
+#: template/investors.html.j2:53
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -2003,11 +2119,11 @@ msgstr ""
"demonstração de que os participantes eram honestos. Os custos reais de "
"transação são frações de um centavo."
-#: template/investors.html.j2:65
+#: template/investors.html.j2:66
msgid "The Business"
msgstr "Os negócios"
-#: template/investors.html.j2:67
+#: template/investors.html.j2:68
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -2025,11 +2141,11 @@ msgstr ""
"representado usando sistemas de pagamento tradicionais no câmbio. O câmbio "
"cobra taxas para facilitar as transações."
-#: template/investors.html.j2:86
+#: template/investors.html.j2:87
msgid "The Business Case"
msgstr "O caso de negócio"
-#: template/investors.html.j2:96
+#: template/investors.html.j2:97
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
@@ -2039,11 +2155,11 @@ msgstr ""
"explica, em inglês, como o Taler pode afetar os atuais desenvolvimentos no "
"mercado de pagamento global."
-#: template/investors.html.j2:119
+#: template/investors.html.j2:120
msgid "Running a Taler payment service operator"
msgstr "Executando um operador de serviço de pagamento do Taler"
-#: template/investors.html.j2:122
+#: template/investors.html.j2:123
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -2055,7 +2171,7 @@ msgstr ""
"despesas operacionais são de transferências bancárias com o sistema bancário "
"e a operação da infraestrutura informática."
-#: template/investors.html.j2:132
+#: template/investors.html.j2:133
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2063,7 +2179,7 @@ msgstr ""
"As operações criptográficas, a largura de banda e os custos de armazenamento "
"são inferiores a 0,01 centavos por transação."
-#: template/investors.html.j2:133
+#: template/investors.html.j2:134
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2072,7 +2188,7 @@ msgstr ""
"bancárias maiores para os comerciantes minimizarem os custos de "
"transferência eletrônica."
-#: template/investors.html.j2:134
+#: template/investors.html.j2:135
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2080,11 +2196,11 @@ msgstr ""
"O protocolo permite o câmbio cobrar taxas por qualquer operação cara (saque, "
"depósito, renovação, reembolso ou transferências bancárias agregadas)."
-#: template/investors.html.j2:135
+#: template/investors.html.j2:136
msgid "Partnership with banks establishes consumer trust."
msgstr "A parceria com os bancos estabelece a confiança do cliente."
-#: template/investors.html.j2:136
+#: template/investors.html.j2:137
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"A parceria com a comunidade de software livre permite uma implantação rápida."
@@ -2263,6 +2379,10 @@ msgstr ""
msgid "customer perspective"
msgstr "perspectiva do cliente"
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
#: template/news.html.j2:16
msgid "More news"
msgstr "Mais notícias"
@@ -2279,6 +2399,22 @@ msgstr "Essa página documenta o histórico do GNU Taler."
msgid "GNU Taler in the Press"
msgstr "GNU Taler na imprensa"
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
#: template/principles.html.j2:21
#, fuzzy
#| msgid "GNU Taler in the Press"
@@ -2296,7 +2432,7 @@ msgstr ""
#: template/principles.html.j2:33
msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
msgstr ""
#: template/principles.html.j2:36
@@ -2469,6 +2605,12 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: template/team.html.j2:6
+#, fuzzy
+#| msgid "GNU Taler"
+msgid "GNU Taler: Team"
+msgstr "GNU Taler"
+
#: template/team.html.j2:8
msgid ""
"GNU Taler is proudly brought to you by the humans on this page. To contact "
@@ -2484,9 +2626,13 @@ msgstr ""
"Arquiteto de software."
#: template/team.html.j2:26
+#, fuzzy
+#| msgid ""
+#| "Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+#| "industries, …."
msgid ""
"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
msgstr ""
"Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
"diferentes indústrias, …."
@@ -2496,7 +2642,7 @@ msgid "Lawyer and banker."
msgstr ""
#: template/team.html.j2:38
-msgid "GNU mainatiner, lead developer."
+msgid "GNU maintainer, lead developer."
msgstr ""
#: template/team.html.j2:43
@@ -2632,6 +2778,22 @@ msgstr ""
msgid "Wallets for other browsers will be provided in the near future."
msgstr ""
+#~ msgid ""
+#~ "An archived, public mailing list for GNU Taler is hosted at <a href="
+#~ "\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+#~ "mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+#~ "\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+#~ msgstr ""
+#~ "Uma lista de discussão público arquivada para o GNU Taler é hospedada em "
+#~ "<a href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists."
+#~ "gnu.org/mailman/listinfo/taler</a>. Você pode enviar mensagens para a "
+#~ "lista em <a href=\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+
+#, fuzzy
+#~| msgid "Bibliography"
+#~ msgid "bibliography</a>."
+#~ msgstr "Bibliografia"
+
#, fuzzy
#~| msgid ""
#~| "<p>Contributors to GNU Taler with Git access must sign the <a href=\"/"
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index ff009e6..868cc56 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-09-03 09:57+0000\n"
+"POT-Creation-Date: 2019-09-03 12:13+0000\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <LL@li.org>\n"
@@ -100,49 +100,60 @@ msgid "The mailing list"
msgstr ""
#: template/contact.html.j2:15
-msgid ""
-"An archived, public mailing list for GNU Taler is hosted at <a href="
-"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
-"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
-"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgid "An archived, public mailing list for GNU Taler is hosted at"
+msgstr ""
+
+#: template/contact.html.j2:20
+msgid "archive"
+msgstr ""
+
+#: template/contact.html.j2:21
+msgid "You can send messages to the list at"
msgstr ""
-#: template/contact.html.j2:26
+#: template/contact.html.j2:29
msgid "Contacting individuals"
msgstr ""
-#: template/contact.html.j2:28
+#: template/contact.html.j2:31
msgid ""
"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
"us support receiving GnuPG encrypted e-mails."
msgstr ""
-#: template/contact.html.j2:37
+#: template/contact.html.j2:40
msgid "General inquiries"
msgstr ""
-#: template/contact.html.j2:39
+#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:50
msgid "Reporting bugs"
msgstr ""
-#: template/contact.html.j2:49
+#: template/contact.html.j2:52
+msgid "We track open feature requests and bugs in our"
+msgstr ""
+
+#: template/contact.html.j2:55
+msgid "Bug tracker"
+msgstr ""
+
+#: template/contact.html.j2:56
msgid ""
-"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
-"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
-"also report bugs or feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
msgstr ""
-#: template/contact.html.j2:60
+#: template/contact.html.j2:65
msgid "Executive team"
msgstr ""
-#: template/contact.html.j2:62
+#: template/contact.html.j2:67
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -159,10 +170,14 @@ msgid ""
msgstr ""
#: template/copyright.html.j2:15
+msgid "agreement on licensing and collaborative development"
+msgstr ""
+
+#: template/copyright.html.j2:17
msgid "of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:22
+#: template/copyright.html.j2:24
msgid ""
"The agreements ensure that the code will continue to be made available under "
"free software licenses, but gives developers the freedom to move code "
@@ -171,7 +186,7 @@ msgid ""
"stores that are hostile to free software)."
msgstr ""
-#: template/copyright.html.j2:32
+#: template/copyright.html.j2:34
msgid ""
"Minor contributions (basically, anyone without Git access) do not require "
"copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -214,7 +229,7 @@ msgid ""
"applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58
+#: template/developers.html.j2:58 template/docs.html.j2:182
msgid "Code"
msgstr ""
@@ -230,88 +245,92 @@ msgid ""
"found in our"
msgstr ""
-#: template/developers.html.j2:82
+#: template/developers.html.j2:80
msgid "Documentation"
msgstr ""
-#: template/developers.html.j2:85
+#: template/developers.html.j2:83
msgid "In addition to this website, the"
msgstr ""
-#: template/developers.html.j2:89
+#: template/developers.html.j2:86
msgid "documented code"
msgstr ""
-#: template/developers.html.j2:93
+#: template/developers.html.j2:87
msgid "and the"
msgstr ""
-#: template/developers.html.j2:97
+#: template/developers.html.j2:90
msgid "API documentation"
msgstr ""
-#: template/developers.html.j2:101
+#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
msgstr ""
-#: template/developers.html.j2:105
-msgid "bibliography</a>."
+#: template/developers.html.j2:94
+msgid "bibliography"
msgstr ""
-#: template/developers.html.j2:111
+#: template/developers.html.j2:98
msgid "Discussion"
msgstr ""
-#: template/developers.html.j2:114
+#: template/developers.html.j2:101
msgid ""
"We have a mailing list for developer discussions. You can subscribe to or "
"read the list archive at"
msgstr ""
-#: template/developers.html.j2:124
+#: template/developers.html.j2:111
msgid "Regression Testing"
msgstr ""
-#: template/developers.html.j2:127
-msgid ""
-"We have <a href=\"https://buildbot.net/\">Buildbot</a> automation tests to "
-"detect regressions and check for portability at"
+#: template/developers.html.j2:114
+msgid "We have"
msgstr ""
-#: template/developers.html.j2:136
+#: template/developers.html.j2:118
+msgid "automation tests to detect regressions and check for portability at"
+msgstr ""
+
+#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
msgstr ""
-#: template/developers.html.j2:139
-msgid ""
-"We use <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> to "
-"analyze the code coverage of our tests, the results are available at"
+#: template/developers.html.j2:129
+msgid "We use"
+msgstr ""
+
+#: template/developers.html.j2:133
+msgid "to analyze the code coverage of our tests, the results are available at"
msgstr ""
-#: template/developers.html.j2:154
+#: template/developers.html.j2:146
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:157 template/investors.html.j2:92
+#: template/developers.html.j2:149 template/investors.html.j2:93
msgid "Download"
msgstr ""
-#: template/developers.html.j2:173
+#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
-#: template/developers.html.j2:176
+#: template/developers.html.j2:168
msgid ""
"The Taler system consists of protocols executed among a number of actors as "
"illustrated in the illustration on the right. Typical transactions involve "
"the following steps:"
msgstr ""
-#: template/developers.html.j2:183
+#: template/developers.html.j2:175
msgid "system overview"
msgstr ""
-#: template/developers.html.j2:186
+#: template/developers.html.j2:178
msgid ""
"A customer instructs his <b>bank</b> to transfer funds from his account to "
"the Taler exchange (top left). In the subject of the transaction, he "
@@ -319,7 +338,7 @@ msgid ""
"terminology, the customer creates a reserve at the exchange."
msgstr ""
-#: template/developers.html.j2:198
+#: template/developers.html.j2:190
msgid ""
"Once the exchange has received the wire transfer, it allows the customer's "
"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
@@ -331,7 +350,7 @@ msgid ""
"the exchange may charge for the service)."
msgstr ""
-#: template/developers.html.j2:216
+#: template/developers.html.j2:208
msgid ""
"Once the customer has the digital coins in his wallet, the wallet can be "
"used to <b>spend</b> the coins with merchant portals that support the Taler "
@@ -346,7 +365,7 @@ msgid ""
"change)."
msgstr ""
-#: template/developers.html.j2:238
+#: template/developers.html.j2:230
msgid ""
"Merchants receiving digital coins <b>deposit</b> the respective claims that "
"resulted from the contract signing with the customer at the exchange to "
@@ -360,7 +379,7 @@ msgid ""
"that merchants pay applicable taxes (and do not engage in illegal contracts)."
msgstr ""
-#: template/developers.html.j2:261
+#: template/developers.html.j2:253
msgid ""
"Finally, the exchange transfers funds corresponding to the digital coins "
"redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -369,7 +388,7 @@ msgid ""
"the bank transfers and the individual claims that were deposited."
msgstr ""
-#: template/developers.html.j2:275
+#: template/developers.html.j2:267
msgid ""
"Most importantly, the exchange keeps cryptographic proofs that allow it to "
"demonstrate that it is operating correctly to third parties. The system "
@@ -379,7 +398,7 @@ msgid ""
"in circulation."
msgstr ""
-#: template/developers.html.j2:290
+#: template/developers.html.j2:282
msgid ""
"Without the auditor, the exchange operators could embezzle funds they are "
"holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -388,6 +407,10 @@ msgid ""
"circulation during the period of the compromise."
msgstr ""
+#: template/docs.html.j2:7
+msgid "GNU Taler: Documentation and Resources"
+msgstr ""
+
#: template/docs.html.j2:13
msgid ""
"This is an overview of documentation and other resources for GNU Taler. The "
@@ -395,84 +418,108 @@ msgid ""
"\">here</a>."
msgstr ""
-#: template/docs.html.j2:39
-msgid "Tutorial and manual for operating a merchant"
+#: template/docs.html.j2:27
+msgid "Components"
+msgstr ""
+
+#: template/docs.html.j2:38
+msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Also available as"
+msgid "Tutorial and manual for operating a merchant. Also available as"
msgstr ""
-#: template/docs.html.j2:46
+#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:48
-#, python-format
+#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:60
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:70
+#: template/docs.html.j2:64
+msgid "Operator's manual for the GNU Taler exchange. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:74
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:72
-#, python-format
+#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(docshost)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"available as"
msgstr ""
-#: template/docs.html.j2:88
+#: template/docs.html.j2:92
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:90
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:94
+msgid "Manual to run the back-office Web application. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:107
+msgid "Internals"
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:118
+msgid "HTTP API"
+msgstr ""
+
+#: template/docs.html.j2:120
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:124
-#, python-format
+#: template/docs.html.j2:128
+msgid "Onboarding"
+msgstr ""
+
+#: template/docs.html.j2:130
msgid ""
-"Description of our taler.net setup and how to contribute. Also available as "
-"<a href=\"https://%(docshost)s/pdf/onboarding.pdf\">PDF</a>."
+"Description of our taler.net setup and how to contribute. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:143
+msgid "Community"
msgstr ""
-#: template/docs.html.j2:150
+#: template/docs.html.j2:154
+msgid "Mailing List"
+msgstr ""
+
+#: template/docs.html.j2:156
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:158
+#: template/docs.html.j2:162
+msgid "IRC"
+msgstr ""
+
+#: template/docs.html.j2:164
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:166
+#: template/docs.html.j2:170
+msgid "Bug Tracker"
+msgstr ""
+
+#: template/docs.html.j2:172
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:194
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:196
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -569,21 +616,21 @@ msgstr ""
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:90
+#: template/faq.html.j2:91
msgid ""
-"<p> Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
-"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
-"blind signature protects your privacy as it prevents the exchange from "
-"knowing which coin it signed for which customer. </p>"
+"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
+"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
+"signature protects your privacy as it prevents the exchange from knowing "
+"which coin it signed for which customer."
msgstr ""
-#: template/faq.html.j2:100
+#: template/faq.html.j2:101
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:103
msgid ""
-"<p> The Taler protocol allows any exchange to set its own fee structure, "
+"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
"refunding coins. Operators can also charge fees for closing reserves and for "
"(aggregated) wire transfers to merchants. Merchants may choose to cover some "
@@ -591,87 +638,86 @@ msgid ""
"0.001 cent/transaction (at high transaction rates, amortized over billions "
"of transactions, excluding migration costs). Note that this is an early "
"estimate, details may depend on hosting and backup requirements from the "
-"regulator and could thus easily be 10x higher. </p>"
+"regulator and could thus easily be 10x higher."
msgstr ""
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:118
+#: template/faq.html.j2:119
msgid ""
-"<p> Taler's wallet supports multiple currencies, but the system currently "
-"does not support conversion between currencies. However, in principle an "
-"entity that accepts deposits in one currency and allows withdrawals in "
-"another currency could be created. Still, the regulatory hurdles in this "
-"case tend to be particularly complex. The focus for Taler is on day-to-day "
-"payments, so we have no plans to support currency conversion in the near "
-"future. </p>"
+"Taler's wallet supports multiple currencies, but the system currently does "
+"not support conversion between currencies. However, in principle an entity "
+"that accepts deposits in one currency and allows withdrawals in another "
+"currency could be created. Still, the regulatory hurdles in this case tend "
+"to be particularly complex. The focus for Taler is on day-to-day payments, "
+"so we have no plans to support currency conversion in the near future."
msgstr ""
-#: template/faq.html.j2:131
+#: template/faq.html.j2:130
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
#: template/faq.html.j2:132
msgid ""
-"<p> We believe the European Electronic Money Directive provides part of the "
+"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
-"have to follow. </p>"
+"have to follow."
msgstr ""
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:142
+#: template/faq.html.j2:141
msgid ""
-"<p> The exchange would be operated by a bank or in cooperation with a bank, "
-"and that bank would hold the funds in escrow. Note that this bank could be a "
+"The exchange would be operated by a bank or in cooperation with a bank, and "
+"that bank would hold the funds in escrow. Note that this bank could be a "
"regular bank or a central bank for a centrally banked electronic currency. "
"Regardless, the bank would fall under the respective banking regulations "
"establishing a reason why consumers would have faith in the conversion from "
-"Taler coins into regular bank money. </p>"
+"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:153
+#: template/faq.html.j2:152
msgid ""
-"<p> Any exchange should be audited by one or more independent auditors. "
+"Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
"the auditors, but auditors may also provide a method for manual submission "
"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public. </p>"
+"respective regulatory authorities, or even the general public."
msgstr ""
-#: template/faq.html.j2:163
+#: template/faq.html.j2:161
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:164
+#: template/faq.html.j2:163
msgid ""
-"<p> We are aware of several businesses running exploratory projects or "
-"having developed working prototypes. We are also in discussions with several "
+"We are aware of several businesses running exploratory projects or having "
+"developed working prototypes. We are also in discussions with several "
"regular banks as well as several central banks about the project. That said, "
"there are currently no products in the market yet, and we believe this would "
"be premature given the state of the project (see also <a href=\"https://"
-"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues). </p>"
+"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:176
+#: template/faq.html.j2:174
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:177
+#: template/faq.html.j2:176
msgid ""
-"<p> Today, our wallet implementation does not support recurring payments. "
+"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
"in theory possible with Taler, but they come with a few caveats. "
"Specifically, recurring payments can only work if the Taler wallet is "
@@ -683,10 +729,14 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time </p>"
+"feature that we are targeting for Taler 1.0. at this time"
+msgstr ""
+
+#: template/features.html.j2:7
+msgid "GNU Taler: Features"
msgstr ""
-#: template/features.html.j2:14
+#: template/features.html.j2:13
msgid ""
"GNU Taler is a <span class=\"tlr\">privacy-preserving</span> payment system. "
"Customers can stay anonymous, but merchants can not hide their income "
@@ -694,28 +744,28 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
-#: template/features.html.j2:24
+#: template/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 ""
-#: template/features.html.j2:33
+#: template/features.html.j2:32
msgid ""
"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-#: template/features.html.j2:42
+#: template/features.html.j2:41
msgid ""
"When making a payment, customers only need a charged wallet. A merchant can "
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-#: template/features.html.j2:51
+#: template/features.html.j2:50
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 "
@@ -723,33 +773,33 @@ msgid ""
"gone."
msgstr ""
-#: template/features.html.j2:70
+#: template/features.html.j2:69
msgid "Paying with Taler"
msgstr ""
-#: template/features.html.j2:72
+#: template/features.html.j2:71
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 ""
-#: template/features.html.j2:80
+#: template/features.html.j2:79
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 ""
-#: template/features.html.j2:88
+#: template/features.html.j2:87
msgid "Try it yourself with the interactive demo!"
msgstr ""
-#: template/features.html.j2:95
+#: template/features.html.j2:94
msgid "Receiving payments with Taler"
msgstr ""
-#: template/features.html.j2:97
+#: template/features.html.j2:96
msgid ""
"To receive Taler payments, a merchant needs a bank account in the desired "
"currency. We provide supporting software in various programming languages to "
@@ -757,32 +807,32 @@ msgid ""
"processing can run on the merchant's premises or be hosted by a third party."
msgstr ""
-#: template/features.html.j2:106
+#: template/features.html.j2:105
msgid ""
"Merchant integration is simple, and customers can pay for products without "
"even having to register an account."
msgstr ""
-#: template/features.html.j2:113
+#: template/features.html.j2:112
msgid "See how merchant integration works in our developer documentation!"
msgstr ""
-#: template/features.html.j2:128
+#: template/features.html.j2:127
msgid "Practical"
msgstr ""
-#: template/features.html.j2:131
+#: template/features.html.j2:130
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 ""
-#: template/features.html.j2:141
+#: template/features.html.j2:140
msgid "Stable"
msgstr ""
-#: template/features.html.j2:144
+#: template/features.html.j2:143
msgid ""
"Taler does not introduce a new currency. Taler uses a digital wallet storing "
"coins and payment service providers with escrow accounts in existing "
@@ -790,52 +840,52 @@ msgid ""
"currencies, such as US Dollars, Euros or even Bitcoins."
msgstr ""
-#: template/features.html.j2:155 template/governments.html.j2:55
+#: template/features.html.j2:154 template/governments.html.j2:55
#: template/merchants.html.j2:41
msgid "Secure"
msgstr ""
-#: template/features.html.j2:158
+#: template/features.html.j2:157
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 ""
-#: template/features.html.j2:170 template/governments.html.j2:25
+#: template/features.html.j2:169 template/governments.html.j2:25
msgid "Taxable"
msgstr ""
-#: template/features.html.j2:173
+#: template/features.html.j2:172
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 ""
-#: template/features.html.j2:183
+#: template/features.html.j2:182
msgid "Private"
msgstr ""
-#: template/features.html.j2:185
+#: template/features.html.j2:184
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 ""
-#: template/features.html.j2:196 template/governments.html.j2:85
+#: template/features.html.j2:195 template/governments.html.j2:85
msgid "Libre"
msgstr ""
-#: template/features.html.j2:199
+#: template/features.html.j2:198
msgid ""
"Taler provides protocols and reference implementations that in principle "
"enables anybody to run their own payment infrastructure, be it individuals, "
"organizations or whole countries. Since the reference implementation is a"
msgstr ""
-#: template/features.html.j2:206
+#: template/features.html.j2:205
msgid "package, it will always remain free software."
msgstr ""
@@ -1427,27 +1477,38 @@ msgstr ""
msgid "Dynamic Merchant Instance"
msgstr ""
-#: template/gsoc-codeless.html.j2:97
-msgid "Use Case Diagram"
+#: template/gsoc-codeless.html.j2:95
+msgid ""
+"The documentation for the API to dynamically manage merchant instance can be "
+"found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"merchant-instance\">here</a>."
msgstr ""
#: template/gsoc-codeless.html.j2:103
+msgid "Use Case Diagram"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:109
msgid "Link to the contributions made"
msgstr ""
-#: template/gsoc-codeless.html.j2:106
+#: template/gsoc-codeless.html.j2:113
msgid "Codeless Payment Backend"
msgstr ""
-#: template/gsoc-codeless.html.j2:108
+#: template/gsoc-codeless.html.j2:114 template/gsoc-codeless.html.j2:117
+msgid "Link"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:116
msgid "Documentation to dynamically manage Merchant Instances"
msgstr ""
-#: template/gsoc-codeless.html.j2:117
+#: template/gsoc-codeless.html.j2:127
msgid "Future Work"
msgstr ""
-#: template/gsoc-codeless.html.j2:120
+#: template/gsoc-codeless.html.j2:130
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. "
@@ -1456,7 +1517,7 @@ msgid ""
"of future work is as follows:"
msgstr ""
-#: template/gsoc-codeless.html.j2:130
+#: template/gsoc-codeless.html.j2:140
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 "
@@ -1464,7 +1525,7 @@ msgid ""
"notification system is designed."
msgstr ""
-#: template/gsoc-codeless.html.j2:140
+#: template/gsoc-codeless.html.j2:150
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. "
@@ -1476,7 +1537,7 @@ msgid ""
"codeless payments service."
msgstr ""
-#: template/gsoc-codeless.html.j2:154
+#: template/gsoc-codeless.html.j2:164
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 "
@@ -1484,7 +1545,7 @@ msgid ""
"service then can also double as a hosting service for merchants."
msgstr ""
-#: template/gsoc-codeless.html.j2:164
+#: template/gsoc-codeless.html.j2:174
msgid ""
"To add various analytics for the merchant. Various analysis could be "
"performed on the orders placed for the respective merchant. Some of the "
@@ -1494,10 +1555,56 @@ msgid ""
"research have to be done before proceeding to the implementation."
msgstr ""
-#: template/gsoc-codeless.html.j2:181
+#: template/gsoc-codeless.html.j2:191
msgid "Screenshots"
msgstr ""
+#: template/gsoc-codeless.html.j2:193
+msgid "Home page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:197
+msgid "Product page"
+msgstr ""
+
+#: template/gsoc-codeless.html.j2:201
+msgid "Shipment Tracking"
+msgstr ""
+
+#: template/index.html.j2:23
+msgid ""
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
+msgstr ""
+
+#: template/index.html.j2:27
+msgid "Payments without registration"
+msgstr ""
+
+#: template/index.html.j2:31
+msgid "Data protection by default"
+msgstr ""
+
+#: template/index.html.j2:35
+msgid "Fraud eliminated by design"
+msgstr ""
+
+#: template/index.html.j2:39
+msgid "Not a new currency!"
+msgstr ""
+
+#: template/index.html.j2:43
+msgid "Empowers communities to run their own payment infrastructure"
+msgstr ""
+
+#: template/index.html.j2:46
+msgid "Try Demo!"
+msgstr ""
+
+#: template/index.html.j2:47
+msgid "Read Docs"
+msgstr ""
+
#: template/investors.html.j2:6
msgid "Invest in Taler!"
msgstr ""
@@ -1530,11 +1637,11 @@ msgid ""
"and the"
msgstr ""
-#: template/investors.html.j2:49
+#: template/investors.html.j2:50
msgid "The Technology"
msgstr ""
-#: template/investors.html.j2:52
+#: template/investors.html.j2:53
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
@@ -1545,11 +1652,11 @@ msgid ""
"transaction costs are fractions of a cent."
msgstr ""
-#: template/investors.html.j2:65
+#: template/investors.html.j2:66
msgid "The Business"
msgstr ""
-#: template/investors.html.j2:67
+#: template/investors.html.j2:68
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -1560,22 +1667,22 @@ msgid ""
"to facilitate the transactions."
msgstr ""
-#: template/investors.html.j2:86
+#: template/investors.html.j2:87
msgid "The Business Case"
msgstr ""
-#: template/investors.html.j2:96
+#: template/investors.html.j2:97
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:119
+#: template/investors.html.j2:120
msgid "Running a Taler payment service operator"
msgstr ""
-#: template/investors.html.j2:122
+#: template/investors.html.j2:123
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1583,29 +1690,29 @@ msgid ""
"of the computing infrastructure."
msgstr ""
-#: template/investors.html.j2:132
+#: template/investors.html.j2:133
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
msgstr ""
-#: template/investors.html.j2:133
+#: template/investors.html.j2:134
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
msgstr ""
-#: template/investors.html.j2:134
+#: template/investors.html.j2:135
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
msgstr ""
-#: template/investors.html.j2:135
+#: template/investors.html.j2:136
msgid "Partnership with banks establishes consumer trust."
msgstr ""
-#: template/investors.html.j2:136
+#: template/investors.html.j2:137
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
@@ -1739,6 +1846,10 @@ msgstr ""
msgid "customer perspective"
msgstr ""
+#: template/news.html.j2:6
+msgid "News"
+msgstr ""
+
#: template/news.html.j2:16
msgid "More news"
msgstr ""
@@ -1755,6 +1866,22 @@ msgstr ""
msgid "GNU Taler in the Press"
msgstr ""
+#: template/press.html.j2:6
+msgid "2018"
+msgstr ""
+
+#: template/press.html.j2:15
+msgid "2017"
+msgstr ""
+
+#: template/press.html.j2:25
+msgid "2016"
+msgstr ""
+
+#: template/press.html.j2:43
+msgid "2015"
+msgstr ""
+
#: template/principles.html.j2:21
msgid "GNU Taler: Design Principles"
msgstr ""
@@ -1770,7 +1897,7 @@ msgstr ""
#: template/principles.html.j2:33
msgid ""
-"... in the are of computing, freedom means not using proprietary software"
+"... in the area of computing, freedom means not using proprietary software"
msgstr ""
#: template/principles.html.j2:36
@@ -1933,6 +2060,10 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: template/team.html.j2:6
+msgid "GNU Taler: Team"
+msgstr ""
+
#: template/team.html.j2:8
msgid ""
"GNU Taler is proudly brought to you by the humans on this page. To contact "
@@ -1948,7 +2079,7 @@ msgstr ""
#: template/team.html.j2:26
msgid ""
"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
+"industries,"
msgstr ""
#: template/team.html.j2:31
@@ -1956,7 +2087,7 @@ msgid "Lawyer and banker."
msgstr ""
#: template/team.html.j2:38
-msgid "GNU mainatiner, lead developer."
+msgid "GNU maintainer, lead developer."
msgstr ""
#: template/team.html.j2:43
diff --git a/template/contact.html.j2 b/template/contact.html.j2
index 67d6685..91c7abe 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -1,70 +1,75 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="jumbotron">
- <div class="container text-center">
- <h1>{{ _("Contact information") }}</h1>
+ <div class="jumbotron">
+ <div class="container text-center">
+ <h1>{{ _("Contact information") }}</h1>
+ </div>
</div>
-</div>
-<div class="container">
-<div class="row">
- <div class="col-lg-4">
- <h2>{{ _("The mailing list") }}</h2>
- <p>
- {% trans %}
- An archived, public mailing list for GNU Taler is
- hosted at
- <a href="https://lists.gnu.org/mailman/listinfo/taler">https://lists.gnu.org/mailman/listinfo/taler</a>.
- You can send messages to the list at
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-4">
+ <h2>{{ _("The mailing list") }}</h2>
+ <p>
+ {% trans %}
+ An archived, public mailing list for GNU Taler is
+ hosted at
+ {% endtrans %}
+ <a href="https://lists.gnu.org/mailman/listinfo/taler">https://lists.gnu.org/mailman/listinfo/taler</a>
+ (<a href="https://lists.gnu.org/archive/html/taler/">{{ _("archive")}}</a>).
+ {% trans %}
+ You can send messages to the list at
+ {% endtrans %}
<a href="mailto:taler@gnu.org">taler@gnu.org</a>.
- {% endtrans %}
- </p>
- </div>
+ </p>
+ </div>
- <div class="col-lg-4">
- <h2>{{ _("Contacting individuals") }}</h2>
- <p>
- {% trans %}
- Team members are generally reachable at
- <tt>LASTNAME@taler.net</tt>. All of us
- support receiving GnuPG encrypted e-mails.
- {% endtrans %}
- </p>
- </div>
+ <div class="col-lg-4">
+ <h2>{{ _("Contacting individuals") }}</h2>
+ <p>
+ {% trans %}
+ Team members are generally reachable at
+ <tt>LASTNAME@taler.net</tt>. All of us
+ support receiving GnuPG encrypted e-mails.
+ {% endtrans %}
+ </p>
+ </div>
- <div class="col-lg-4">
- <h2>{{ _("General inquiries") }}</h2>
- <p>
- {% trans %}
- You can reach a group of team members handling
- general inquiries at <tt>contact AT taler.net</tt>.
- {% endtrans %}
- </p>
- </div>
+ <div class="col-lg-4">
+ <h2>{{ _("General inquiries") }}</h2>
+ <p>
+ {% trans %}
+ You can reach a group of team members handling
+ general inquiries at <tt>contact AT taler.net</tt>.
+ {% endtrans %}
+ </p>
+ </div>
- <div class="col-lg-6">
- <h2>{{ _("Reporting bugs") }}</h2>
- <p>
- {% trans %}
- We track open feature requests and bugs in our
- <a href="https://gnunet.org/bugs/">Bug tracker</a>,
- which is shared with the GNUnet project.
- You can also report bugs or feature requests to the
- mailing list.
- {% endtrans %}
- </p>
- </div>
+ <div class="col-lg-6">
+ <h2>{{ _("Reporting bugs") }}</h2>
+ <p>
+ {% trans %}
+ We track open feature requests and bugs in our
+ {% endtrans %}
+ <a href="https://gnunet.org/bugs/">{{ _("Bug tracker")}}</a>,
+ {% trans %}
+ which is shared with the GNUnet project.
+ You can also report bugs or feature requests to the
+ mailing list.
+ {% endtrans %}
+ </p>
+ </div>
- <div class="col-lg-6">
- <h2>{{ _("Executive team") }}</h2>
- <p>
- {% trans %}
- For non-technical commercial requests, please contact
- <tt>ceo AT taler.net</tt>.
- {% endtrans %}
- </p>
+ <div class="col-lg-6">
+ <h2>{{ _("Executive team") }}</h2>
+ <p>
+ {% trans %}
+ For non-technical commercial requests, please contact
+ <tt>ceo AT taler.net</tt>.
+ {% endtrans %}
+ </p>
+ </div>
+ </div>
</div>
-</div>
-</div>
{% endblock body_content %}
diff --git a/template/copyright.html.j2 b/template/copyright.html.j2
index 7efe056..8ce7357 100644
--- a/template/copyright.html.j2
+++ b/template/copyright.html.j2
@@ -11,7 +11,9 @@
<a href="/pdf/copyright.pdf">copyright assignment</a>
to ensure that the
{% endtrans %}
- <a href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative development</a>
+ <a href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex">
+ GNUnet e.V. --- Taler Systems SA {{ _("agreement on licensing and collaborative development")}}
+ </a>
{% trans %}
of the GNUnet and GNU Taler projects is satisfied.
{% endtrans %}
diff --git a/template/developers.html.j2 b/template/developers.html.j2
index 2fb4982..0fc1f67 100644
--- a/template/developers.html.j2
+++ b/template/developers.html.j2
@@ -68,12 +68,10 @@
{% endtrans %}
<a href="https://gnunet.org/">GNUnet</a>.
{% trans %}
- However,
- contributions from anyone are welcome. Our Git
- repositories can be cloned using the Git and HTTP
- access methods against <tt>git.taler.net</tt> with
- the name of the respective repository. A list of
- repositories can be found in our
+ However, contributions from anyone are welcome. Our Git
+ repositories can be cloned using the Git and HTTP access methods
+ against <tt>git.taler.net</tt> with the name of the respective
+ repository. A list of repositories can be found in our
{% endtrans %}
<a href="https://git.taler.net/">GitWeb</a>.
</p>
@@ -85,26 +83,15 @@
{% trans %}
In addition to this website, the
{% endtrans %}
- <a href="https://git.taler.net/">
- {% trans %}
- documented code
- {% endtrans %}
- </a>
+ <a href="https://git.taler.net/">{{ _("documented code")}}</a>
{% trans %}
and the
{% endtrans %}
- <a href="https://docs.taler.net/">
- {% trans %}
- API documentation
- {% endtrans %}
- </a>.
+ <a href="https://docs.taler.net/">{{ _("API documentation")}}</a>.
{% trans %}
Technical papers can be found in our
{% endtrans %}
- <a href="bibliography.html">
- {% trans %}
- bibliography</a>.
- {% endtrans %}
+ <a href="bibliography.html">{{ _("bibliography")}}</a>.
</p>
</div>
<div class="col-lg-4">
@@ -125,7 +112,10 @@
<p>
{% trans %}
- We have <a href="https://buildbot.net/">Buildbot</a>
+ We have
+ {% endtrans %}
+ <a href="https://buildbot.net/">Buildbot</a>
+ {% trans %}
automation tests to detect regressions and check for
portability at
{% endtrans %}
@@ -138,7 +128,9 @@
<p>
{% trans %}
We use
- <a href="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</a>
+ {% endtrans %}
+ <a href="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</a>
+ {% trans %}
to analyze the code coverage of our tests, the
results are available at
{% endtrans %}
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index 233097c..83fa2e5 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -4,15 +4,16 @@
<div class="container">
<div class="row">
<div class="col">
- <h1>GNU Taler: Documentation and Resources</h1>
+ <h1>{{ _("GNU Taler: Documentation and Resources")}}</h1>
</div>
</div>
<div class="row">
<div class="col">
{% trans %}
- 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>.
+ 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>.
{% endtrans %}
</div>
</div>
@@ -23,7 +24,7 @@
<div class="row justify-content-center text-center">
<div class="col-8">
- <h2>Components</h2>
+ <h2>{{ _("Components")}}</h2>
</div>
</div>
@@ -34,10 +35,13 @@
<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>
+ <h3>{{ _("Merchant Backend Administration")}}</h3>
</a>
- {{ _("Tutorial and manual for operating a merchant") }}.
- {{ _("Also available as") }} <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>.
+ {% trans %}
+ Tutorial and manual for operating a merchant.
+ Also available as
+ {% endtrans %}
+ <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>.
</div>
<div class="col-3">
@@ -48,20 +52,20 @@
{% trans %}
Tutorial for processing Taler payments using the merchant backend API.
Also available as
- <a href="https://{{ docshost }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
{% endtrans %}
+ <a href="https://{{ docshost }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
</div>
<div class="col-3">
<a href="https://{{ docshost }}/taler-exchange-manual.html">
<img src="../icons/icon-exchange.svg" height=60>
- <h3>Exchange</h3>
+ <h3>{{ _("Exchange")}}</h3>
</a>
{% trans %}
Operator's manual for the GNU Taler exchange.
Also available as
- <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>.
{% endtrans %}
+ <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>.
</div>
<div class="col-3">
@@ -72,8 +76,8 @@
{% trans %}
Manual for tightly integrating Taler with banking applications.
Also available as
- <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>.
{% endtrans %}
+ <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>.
</div>
</div>
@@ -90,8 +94,8 @@
{% trans %}
Manual to run the back-office Web application.
Also available as
- <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>.
{% endtrans %}
+ <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>.
</div>
</div>
@@ -100,7 +104,7 @@
<div class="row justify-content-center text-center">
<div class="col-8">
- <h2>Internals</h2>
+ <h2>{{ _("Internals")}}</h2>
</div>
</div>
@@ -111,21 +115,23 @@
<div class="col-3">
<a href="https://{{ docshost }}/core/index.html">
<img src="../icons/icon-api.svg" height=60>
- <h3>HTTP API</h3>
+ <h3>{{ _("HTTP API")}}</h3>
</a>
- {{ _("Reference for the HTTP-based API for Taler components.") }}
- </div>
+ {% trans %}
+ Reference for the HTTP-based API for Taler components.
+ {% endtrans %}
+ </div>
<div class="col-3">
<a href="https://{{ docshost }}/onboarding.html">
<img src="../icons/icon-developers.svg" height=60>
- <h3>Onboarding</h3>
+ <h3>{{ _("Onboarding")}}</h3>
</a>
{% trans %}
Description of our taler.net setup and how to contribute.
Also available as
- <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>.
- {% endtrans %}
+ {% endtrans %}
+ <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>.
</div>
</div>
@@ -134,7 +140,7 @@
<div class="row justify-content-center text-center">
<div class="col-8">
- <h2>Community</h2>
+ <h2>{{ _("Community")}}</h2>
</div>
</div>
@@ -145,7 +151,7 @@
<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>
+ <h3>{{ _("Mailing List")}}</h3>
</a>
{{ _("The official GNU Taler mailing list.") }}
</div>
@@ -153,7 +159,7 @@
<div class="col-3">
<a href="https://webchat.freenode.net/?channels=taler">
<img src="../icons/icon-share.svg" height=60>
- <h3>IRC</h3>
+ <h3>{{ _("IRC")}}</h3>
</a>
{{ _("Our IRC channel is #taler on freenode.") }}
</div>
@@ -161,7 +167,7 @@
<div class="col-3">
<a href="https://gnunet.org/bugs/">
<img src="../icons/icon-share.svg" height=60>
- <h3>Bug Tracker</h3>
+ <h3>{{ _("Bug Tracker")}}</h3>
</a>
{{ _("Our bug tracker for bugs and feature request.") }}
</div>
@@ -173,7 +179,7 @@
<div class="row justify-content-center text-center">
<div class="col-8">
- <h2>Code</h2>
+ <h2>{{ _("Code")}}</h2>
</div>
</div>
diff --git a/template/faq.html.j2 b/template/faq.html.j2
index f9daa01..3a9349d 100644
--- a/template/faq.html.j2
+++ b/template/faq.html.j2
@@ -1,197 +1,195 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
-
-<h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
-
-<p>
- {% trans %}
- Taler does not require any Blockchain technology, and is
- also not based on proof-of-work or any other distributed consensus
- mechanism. Instead, Taler is based on blind signatures.
- However, it is theoretically possible to combine Taler with
- peer-to-peer crypto-currencies like Bitcoin.
- {% endtrans %}
-</p>
-
-<p>
- {% trans %}
- It would be possible, however, to withdraw coins denominated in
- Bitcoin into a Taler wallet (with an appropriate exchange), which
- would give some benefits over plain Bitcoin, such as instant
- confirmation times.
- {% endtrans %}
-</p>
-
-<h2>{{ _("Where is the balance in my wallet stored?") }}</h2>
-<p>
- {% trans %}
- Your wallet stores digital coins and thus ultimately your computer
- holds your balance. The exchange keeps funds matching all unspent
- coins in an escrow bank account.
- {% endtrans %}
-</p>
-
-<h2>{{ _("What if my wallet is lost?") }}</h2>
-<p>
- {% trans %}
- Since the digital coins of value in your wallet are anonymized, the
- exchange can not assist you in recovering a lost or stolen wallet.
- Just like with a physical wallet for cash, you are responsible for
- keeping it safe.
- {% endtrans %}
-</p>
-
-<p>
- {% trans %}
- The risk of losing a wallet can be mitigated by making backups or
- keeping the balance reasonably low.
- {% endtrans %}
-</p>
-
-<h2>{{ _("What if my computer is hacked?") }}</h2>
-<p>
- {% trans %}
- In case of a compromise of one of your devices, an attacker can
- spend coins from your wallet. Checking your balance might reveal
- to you that your device has been compromised.
- {% endtrans %}
-</p>
-
-<h2>{{ _("Can I send money to my friend with Taler?") }}</h2>
-<p>
- {% trans %}
- If your friend provides goods or services for you in exchange for a
- payment, they can easily set up a Taler merchant and receive the
- payment in their bank account.
- {% endtrans %}
-</p>
-<p>
- {% trans %}
- Future versions of the Taler wallet may allow exchanging coins
- among friends directly as well.
- {% endtrans %}
-</p>
-
-<h2>{{ _("How does Taler handle payments in different currencies?") }}</h2>
-<p>
- {% trans %}
- Taler wallets can store digital coins corresponding to multiple
- different currencies such as the Euro, US Dollars or Bitcoins.
- {% endtrans %}
-</p>
-<p>
- {% trans %}
- Taler currently does not offer conversion between currencies.
- {% endtrans %}
-</p>
-
-<h2>{{ _("How does Taler protect my privacy?") }}</h2>
-{% trans %}
- <p>
- Your wallet stores digital coins that are
- <a href="https://en.wikipedia.org/wiki/Blind_signature">blindly signed</a>
- by an exchange. The use of a blind signature protects your
- privacy as it prevents the exchange from knowing which coin it signed
- for which customer.
- </p>
-{% endtrans %}
-
-<h2>{{ _("How much does it cost?") }}</h2>
-{% trans %}
- <p>
- The Taler protocol allows any exchange to set its own fee
- structure, allowing operators to set fees for withdrawing, depositing,
- refreshing or refunding coins. Operators can also charge fees for
- closing reserves and for (aggregated) wire transfers to merchants.
- Merchants may choose to cover some of the fees customers incur.
- Actual transaction costs are estimated around 0.001 cent/transaction
- (at high transaction rates, amortized over billions of transactions,
- excluding migration costs). Note that this is an early estimate,
- details may depend on hosting and backup requirements from the
- regulator and could thus easily be 10x higher.
- </p>
-{% endtrans %}
-
-
-<h2>{{ _("Does Taler work with international payments?") }}</h2>
-{% trans %}
- <p>
- Taler's wallet supports multiple currencies, but the system
- currently does not support conversion between currencies. However,
- in principle an entity that accepts deposits in one currency and
- allows withdrawals in another currency could be created. Still, the
- regulatory hurdles in this case tend to be particularly complex.
- The focus for Taler is on day-to-day payments, so we have no plans
- to support currency conversion in the near future.
- </p>
-{% endtrans %}
-
-
-<h2>{{ _("How does Taler relate to the (European) Electronic Money Directive?") }}</h2>
-{% trans %}
- <p>
- We believe the European Electronic Money Directive provides part
- of the regulatory framework a Taler exchange with coins denominated
- in Euros would have to follow.
- </p>
-{% endtrans %}
-
-
-<h2>{{ _("What bank would guarantee the conversion between Taler coins and bank money in regular bank accounts?") }}</h2>
-{% trans %}
- <p>
- The exchange would be operated by a bank or in cooperation with a bank, and that bank
- would hold the funds in escrow. Note that this bank could be a regular bank or a central
- bank for a centrally banked electronic currency. Regardless, the bank would fall under
- the respective banking regulations establishing a reason why consumers would have faith
- in the conversion from Taler coins into regular bank money.
- </p>
-{% endtrans %}
-
-<h2>{{ _("To whom would consumers complain to in case of non-conversion or non-compliance?") }}</h2>
-{% trans %}
- <p>
- Any exchange should be audited by one or more independent auditors. Merchants and
- consumer wallets will report certain issues automatically to the auditors, but auditors
- may also provide a method for manual submission of issues. The auditors are expected
- to make their reports available to the respective regulatory authorities, or even
- the general public.
- </p>
-{% endtrans %}
-
-<h2>{{ _("Are there any projects already using Taler?") }}</h2>
-{% trans %}
- <p>
- We are aware of several businesses running exploratory projects or having
- developed working prototypes. We are also
- in discussions with several regular banks as well as several central banks
- about the project. That said, there are currently no products in the
- market yet, and we believe this would be premature given the state of
- the project (see also <a href="https://gnunet.org/bugs/">our bugtracker</a>
- for a list of open issues).
- </p>
-{% endtrans %}
-
-<h2>{{ _("Does Taler support recurring payments?") }}</h2>
-{% trans %}
- <p>
- Today, our wallet implementation does not support recurring
- payments. Recurring payments, where some fixed amount is paid on a
- regular basis are in theory possible with Taler, but they come with a
- few caveats. Specifically, recurring payments can only work if the
- Taler wallet is running and online around the desired time.
- Furthermore, given their repetitive nature they are linkable, and
- could thus be used to deanonymize the user making the recurring
- payment, for example by forcing the user offline at the time of the
- payment and observing that it does then not happen on time. Finally,
- the Taler wallet does not work with credit and thus the user would
- have to make sure to carry a sufficient balance for the recurring
- payment to be made. Still, they can be useful, and a future version of
- the Taler wallet will likely support them. But this is not a feature
- that we are targeting for Taler 1.0. at this time
- </p>
-{% endtrans %}
-
-</div>
+ <div class="container">
+
+ <h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
+
+ <p>
+ {% trans %}
+ Taler does not require any Blockchain technology, and is
+ also not based on proof-of-work or any other distributed consensus
+ mechanism. Instead, Taler is based on blind signatures.
+ However, it is theoretically possible to combine Taler with
+ peer-to-peer crypto-currencies like Bitcoin.
+ {% endtrans %}
+ </p>
+
+ <p>
+ {% trans %}
+ It would be possible, however, to withdraw coins denominated in
+ Bitcoin into a Taler wallet (with an appropriate exchange), which
+ would give some benefits over plain Bitcoin, such as instant
+ confirmation times.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("Where is the balance in my wallet stored?") }}</h2>
+ <p>
+ {% trans %}
+ Your wallet stores digital coins and thus ultimately your computer
+ holds your balance. The exchange keeps funds matching all unspent
+ coins in an escrow bank account.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("What if my wallet is lost?") }}</h2>
+ <p>
+ {% trans %}
+ Since the digital coins of value in your wallet are anonymized, the
+ exchange can not assist you in recovering a lost or stolen wallet.
+ Just like with a physical wallet for cash, you are responsible for
+ keeping it safe.
+ {% endtrans %}
+ </p>
+
+ <p>
+ {% trans %}
+ The risk of losing a wallet can be mitigated by making backups or
+ keeping the balance reasonably low.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("What if my computer is hacked?") }}</h2>
+ <p>
+ {% trans %}
+ In case of a compromise of one of your devices, an attacker can
+ spend coins from your wallet. Checking your balance might reveal
+ to you that your device has been compromised.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("Can I send money to my friend with Taler?") }}</h2>
+ <p>
+ {% trans %}
+ If your friend provides goods or services for you in exchange for a
+ payment, they can easily set up a Taler merchant and receive the
+ payment in their bank account.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Future versions of the Taler wallet may allow exchanging coins
+ among friends directly as well.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("How does Taler handle payments in different currencies?") }}</h2>
+ <p>
+ {% trans %}
+ Taler wallets can store digital coins corresponding to multiple
+ different currencies such as the Euro, US Dollars or Bitcoins.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Taler currently does not offer conversion between currencies.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("How does Taler protect my privacy?") }}</h2>
+ <p>
+ {% trans %}
+ Your wallet stores digital coins that are
+ <a href="https://en.wikipedia.org/wiki/Blind_signature">blindly signed</a>
+ by an exchange. The use of a blind signature protects your
+ privacy as it prevents the exchange from knowing which coin it signed
+ for which customer.
+ {% endtrans %}
+ </p>
+
+
+ <h2>{{ _("How much does it cost?") }}</h2>
+ <p>
+ {% trans %}
+ The Taler protocol allows any exchange to set its own fee
+ structure, allowing operators to set fees for withdrawing, depositing,
+ refreshing or refunding coins. Operators can also charge fees for
+ closing reserves and for (aggregated) wire transfers to merchants.
+ Merchants may choose to cover some of the fees customers incur.
+ Actual transaction costs are estimated around 0.001 cent/transaction
+ (at high transaction rates, amortized over billions of transactions,
+ excluding migration costs). Note that this is an early estimate,
+ details may depend on hosting and backup requirements from the
+ regulator and could thus easily be 10x higher.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("Does Taler work with international payments?") }}</h2>
+ <p>
+ {% trans %}
+ Taler's wallet supports multiple currencies, but the system
+ currently does not support conversion between currencies. However,
+ in principle an entity that accepts deposits in one currency and
+ allows withdrawals in another currency could be created. Still, the
+ regulatory hurdles in this case tend to be particularly complex.
+ The focus for Taler is on day-to-day payments, so we have no plans
+ to support currency conversion in the near future.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("How does Taler relate to the (European) Electronic Money Directive?") }}</h2>
+ <p>
+ {% trans %}
+ We believe the European Electronic Money Directive provides part
+ of the regulatory framework a Taler exchange with coins denominated
+ in Euros would have to follow.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("What bank would guarantee the conversion between Taler coins and bank money in regular bank accounts?") }}</h2>
+ <p>
+ {% trans %}
+ The exchange would be operated by a bank or in cooperation with a bank, and that bank
+ would hold the funds in escrow. Note that this bank could be a regular bank or a central
+ bank for a centrally banked electronic currency. Regardless, the bank would fall under
+ the respective banking regulations establishing a reason why consumers would have faith
+ in the conversion from Taler coins into regular bank money.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("To whom would consumers complain to in case of non-conversion or non-compliance?") }}</h2>
+ <p>
+ {% trans %}
+ Any exchange should be audited by one or more independent auditors. Merchants and
+ consumer wallets will report certain issues automatically to the auditors, but auditors
+ may also provide a method for manual submission of issues. The auditors are expected
+ to make their reports available to the respective regulatory authorities, or even
+ the general public.
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("Are there any projects already using Taler?") }}</h2>
+ <p>
+ {% trans %}
+ We are aware of several businesses running exploratory projects or having
+ developed working prototypes. We are also
+ in discussions with several regular banks as well as several central banks
+ about the project. That said, there are currently no products in the
+ market yet, and we believe this would be premature given the state of
+ the project (see also <a href="https://gnunet.org/bugs/">our bugtracker</a>
+ for a list of open issues).
+ {% endtrans %}
+ </p>
+
+ <h2>{{ _("Does Taler support recurring payments?") }}</h2>
+ <p>
+ {% trans %}
+ Today, our wallet implementation does not support recurring
+ payments. Recurring payments, where some fixed amount is paid on a
+ regular basis are in theory possible with Taler, but they come with a
+ few caveats. Specifically, recurring payments can only work if the
+ Taler wallet is running and online around the desired time.
+ Furthermore, given their repetitive nature they are linkable, and
+ could thus be used to deanonymize the user making the recurring
+ payment, for example by forcing the user offline at the time of the
+ payment and observing that it does then not happen on time. Finally,
+ the Taler wallet does not work with credit and thus the user would
+ have to make sure to carry a sufficient balance for the recurring
+ payment to be made. Still, they can be useful, and a future version of
+ the Taler wallet will likely support them. But this is not a feature
+ that we are targeting for Taler 1.0. at this time
+ {% endtrans %}
+ </p>
+
+ </div>
{% endblock body_content %}
diff --git a/template/features.html.j2 b/template/features.html.j2
index 63e5186..22aa783 100644
--- a/template/features.html.j2
+++ b/template/features.html.j2
@@ -1,11 +1,10 @@
{% extends "common/base.j2" %}
{% block body_content %}
-
<div class="container">
<div class="row">
<div class="col">
- <h1>GNU Taler: Features</h1>
+ <h1>{{ _("GNU Taler: Features")}}</h1>
</div>
</div>
<div class="row">
diff --git a/template/gsoc-codeless.html.j2 b/template/gsoc-codeless.html.j2
index 837e557..74fb05d 100644
--- a/template/gsoc-codeless.html.j2
+++ b/template/gsoc-codeless.html.j2
@@ -91,7 +91,13 @@
</li>
</ul>
<h2 id="overview">{{ _("Dynamic Merchant Instance") }}</h2>
- <p>The documentation for the API to dynamically manage merchant instance can be found <a href="https://docs.taler.net/api/api-merchant.html#dynamic-merchant-instance">here</a>.</p>
+ <p>
+ {% trans %}
+ The documentation for the API to dynamically manage merchant
+ instance can be found
+ <a href="https://docs.taler.net/api/api-merchant.html#dynamic-merchant-instance">here</a>.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-6">
<img src="{{ url('images/UseCaseDiagram.png') }}" alt="{{ _("Use Case Diagram")}}" style="float: right; margin: 5px 5px 5px 5px;" width="100%">
@@ -102,13 +108,17 @@
<div class="container">
<h2 id="documentation">{{ _("Link to the contributions made") }}</h2>
<p>
- </p><ul>
+ </p>
+ <ul>
<li>{{ _("Codeless Payment Backend") }}
- (<a href="https://git.taler.net/codeless.git/">Link</a>)</li>
- <li>{{ _("Documentation to dynamically manage Merchant Instances") }}
- (<a href="https://git.taler.net/api.git/commit/?id=53b3fbc3a882975b4ca8ef70d7ae256c9c17a23e">Link</a>)</li>
+ (<a href="https://git.taler.net/codeless.git/">{{ _("Link")}}</a>)
+ </li>
+ <li>{{ _("Documentation to dynamically manage Merchant Instances") }}
+ (<a href="https://git.taler.net/api.git/commit/?id=53b3fbc3a882975b4ca8ef70d7ae256c9c17a23e">{{ _("Link")}}</a>)
+ </li>
</ul>
- <p></p>
+ <p>
+ </p>
</div>
</div>
@@ -180,15 +190,15 @@
<div class="row">
<h2 id="documentation">{{ _("Screenshots") }}</h2>
<div class="col-lg-4">
- <h3>Home page</h3>
+ <h3>{{ _("Home page")}}</h3>
<img src="{{ url('images/home.png') }}" height="240" align="middle">
</div>
<div class="col-lg-4">
- <h3>Product page</h3>
+ <h3>{{ _("Product page")}}</h3>
<img src="{{ url('images/product.png') }}" height="240" align="middle">
</div>
<div class="col-lg-4">
- <h3>Shipment Tracking</h3>
+ <h3>{{ _("Shipment Tracking")}}</h3>
<img src="{{ url('images/shipment.png') }}" height="240" align="middle">
</div>
</div>
diff --git a/template/index.html.j2 b/template/index.html.j2
index 9118cc1..59937c6 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -20,32 +20,31 @@
<div class="row">
<div class="col">
- <h2>We provide a payment system that makes <span class="tlr">privacy-friendly</span> online transactions
- <span class="tlr">fast and easy</span>.</h2>
+ <h2>{{ _("We provide a payment system that makes <span class='tlr'>privacy-friendly</span> online transactions <span class='tlr'>fast and easy</span>.")}}</h2>
<ul class="checklist">
<li>
<img class="checkmark" src="../images/checkmark.png">
- Payments without registration
+ {{ _("Payments without registration")}}
</li>
<li>
<img class="checkmark" src="../images/checkmark.png">
- Data protection by default
+ {{ _("Data protection by default")}}
</li>
<li>
<img class="checkmark" src="../images/checkmark.png">
- Fraud eliminated by design
+ {{ _("Fraud eliminated by design")}}
</li>
<li>
<img class="checkmark" src="../images/checkmark.png">
- Not a new currency!
+ {{ _("Not a new currency!")}}
</li>
<li>
<img class="checkmark" src="../images/checkmark.png">
- Empowers communities to run their own payment infrastructure
+ {{ _("Empowers communities to run their own payment infrastructure")}}
</li>
</ul>
- <form action="https://demo.taler.net/" style="display:inline;"><button type="submit" class="btn btn-primary">Try Demo!</button></form>
- <form action="https://docs.taler.net/" style="display:inline;"><button type="submit" class="btn btn-secondary">Read Docs</button></form>
+ <form action="https://demo.taler.net/" style="display:inline;"><button type="submit" class="btn btn-primary">{{ _("Try Demo!")}}</button></form>
+ <form action="https://docs.taler.net/" style="display:inline;"><button type="submit" class="btn btn-secondary">{{ _("Read Docs")}}</button></form>
</div>
<div class="col align-self-center">
<img class="img-fluid" src="../images/stock1s.jpg" style="border-radius: 1cm;" />
diff --git a/template/investors.html.j2 b/template/investors.html.j2
index aff6644..d31914b 100644
--- a/template/investors.html.j2
+++ b/template/investors.html.j2
@@ -42,6 +42,7 @@
the French national institute for research in informatics and
automation, and the
{% endtrans %}
+ <!-- They do have a German name though, allow translation? -->
<a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>.
</p>
</div>
diff --git a/template/news.html.j2 b/template/news.html.j2
index 421dbaf..311f4c1 100644
--- a/template/news.html.j2
+++ b/template/news.html.j2
@@ -3,7 +3,7 @@
<div class="container">
<div class="col">
- <h1>News</h1>
+ <h1>{{ _("News")}}</h1>
{% include "news/2018-04.inc" %}
{% include "news/2017-10.inc" %}
diff --git a/template/press.html.j2 b/template/press.html.j2
index a8e5d75..323d096 100644
--- a/template/press.html.j2
+++ b/template/press.html.j2
@@ -3,7 +3,7 @@
<div class="container">
<h1>{{ _("GNU Taler in the Press")}}</h1>
- <h2>2018</h2>
+ <h2>{{ _("2018")}}</h2>
<ul>
<li><a href="https://www.coindesk.com/free-software-messiah-richard-stallman-we-can-do-better-than-bitcoin">CoinDesk</a></li>
<li><a href="https://www.theguardian.com/commentisfree/2018/apr/03/facebook-abusing-data-law-privacy-big-tech-surveillance">The Guardian</a></li>
@@ -12,7 +12,7 @@
<li><a href="https://www.developpez.com/actu/196326/Richard-Stallman-remet-en-cause-l-efficacite-du-RGPD-il-veut-plutot-une-loi-qui-empeche-les-systemes-de-collecter-des-donnees-personnelles/">Developpez.com</a></li>
</ul>
- <h2>2017</h2>
+ <h2>{{ _("2017")}}</h2>
<ul>
<li><a href="https://news.ycombinator.com/item?id=15274110">Y-combinator</a></li>
<li><a href="http://hackerpublicradio.org/eps.php?id=2222">Hacker Public Radio</a></li>
@@ -22,7 +22,7 @@
<li><a href="https://www.heise.de/tp/features/Kryptowaehrung-will-sich-an-den-Oelpreis-binden-3702862.html">Heise</a></li>
</ul>
- <h2>2016</h2>
+ <h2>{{ _("2016")}}</h2>
<ul>
<li><a href="https://www.theguardian.com/technology/2016/sep/01/online-publishers-readers-ad-block-surveillance-donate-anonymously">The Guardian</a></li>
<li><a href="https://phoronix.com/scan.php?page=news_item&px=GNU-Taler-0.0.0">Phoronix</a></li>
@@ -40,7 +40,7 @@
<li><a href="http://www.lupa.cz/clanky/stallman-vydavatele-musi-umoznit-ctenarum-platit-za-zpravy-anonymne/">Lupz</a></li>
</ul>
- <h2>2015</h2>
+ <h2>{{ _("2015")}}</h2>
<ul>
<li><a href="https://www.reddit.com/r/Bitcoin/comments/3m037h/taler_a_gnu_attempt_at_replacing_bitcoin/">Reddit</a></li>
<li><a href="https://news.ycombinator.com/item?id=10258312">Y-combinator</a></li>
diff --git a/template/principles.html.j2 b/template/principles.html.j2
index 3c3ffad..7b684b6 100644
--- a/template/principles.html.j2
+++ b/template/principles.html.j2
@@ -30,7 +30,7 @@
<div class="col-lg-12">
<h2>{{ _("1. Free Software implementation") }}</h2>
<a href="https://www.gnu.org/graphics/freedom.html">
- <img style="width:20vw;float:right" src="../images/stallman.medium.png" alt="{{ _("... in the are of computing, freedom means not using proprietary software") }}">
+ <img style="width:20vw;float:right" src="../images/stallman.medium.png" alt="{{ _("... in the area of computing, freedom means not using proprietary software") }}">
</a>
<p>
{% trans %}
diff --git a/template/team.html.j2 b/template/team.html.j2
index 55efd6a..23f7329 100644
--- a/template/team.html.j2
+++ b/template/team.html.j2
@@ -3,7 +3,7 @@
<div class="container">
<div class="row">
<div class="col">
- <h1>GNU Taler: Team</h1>
+ <h1>{{ _("GNU Taler: Team")}}</h1>
<p>
{% trans %}
GNU Taler is proudly brought to you by the humans on this page.
@@ -23,7 +23,7 @@
<div class="col-lg-4">
<h2><a href="http://www.digitalekho.com/about-us/index.html">Leon Schumacher</a></h2>
<img src="{{ url('team-images/leon-schumacher.jpg') }}" height="240" alt="Leon Schumacher" align="middle">
- <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director in different industries, ….") }}</p>
+ <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director in different industries,") }} &#x2026;.</p>
</div>
<div class="col-lg-4">
<h2>Michael Widmer</h2>
@@ -35,7 +35,7 @@
<div class="col-lg-4">
<h2><a href="https://fdold.eu/">Dr. Florian Dold</a></h2>
<img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle">
- <p>{{ _("GNU mainatiner, lead developer.") }}</p>
+ <p>{{ _("GNU maintainer, lead developer.") }}</p>
</div>
<div class="col-lg-4">
<h2>Dr. Jeffrey Burdges</h2>