diff options
78 files changed, 1759 insertions, 1526 deletions
@@ -19,8 +19,18 @@ es/ ru/ pt/ -config.mk __pycache__ *.pyc +sitemap.html +sitemap.xml + +*~ +\#*\# + +config.mk + *.core + +.style.yapf +configure diff --git a/.gitmodules b/.gitmodules index d578e5df..88d819a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,7 @@ [submodule "build-system/taler-build-scripts"] path = build-system/taler-build-scripts url = git://git.taler.net/build-common +[submodule "inc"] + path = inc + url = https://git.gnunet.org/www_shared.git + branch = default diff --git a/GNUmakefile b/GNUmakefile index c460217f..a3520cb0 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,27 +1,38 @@ # This file is in the public domain. -# Hardly anyone seems to read README files anymore, so keep this note here: -# Don't remove the variables for python etc. They exist -# because one system sticks with PEPs, and others opt -# for installing every version side-by-side, -# Same goes for babel. - include config.mk # All: build HTML pages in all languages and compile the # TypeScript logic in web-common. .PHONY: all all: locale template - cd web-common && $(tsc) - $(sh) make_sitemap.sh - for x in en de fr it es ru pt ; do $(cp) robots.txt rendered/$$x ; done - for x in en de fr it es ru pt ; do $(cp) favicon.ico rendered/$$x ; done - for x in en de fr it es ru pt ; do $(cp) rendered/sitemap.xml rendered/$$x ; done - $(cp) styles.css rendered/ - $(cp) -R images rendered/ - for x in en de fr it es ru pt ; do $(cp) -R images rendered/$$x ; done - for x in en de fr it es ru pt ; do $(cp) -R web-common rendered/$$x ; done - for d in dist icons papers pdf presentations ; do $(cp) -R $$d rendered/ ; done + (cd web-common && $(tsc)) + ($(cp) rendered/static/robots.txt rendered/robots.txt) + ($(cp) rendered/static/robots.txt rendered/dist/robots.txt) + (for lang in en de fr it es ru pt ; do \ + $(cp) rendered/static/robots.txt rendered/$$lang/robots.txt; \ + done) + ($(python) inc/make_sitemap.py -i rendered) + ($(cp) sitemap.xml rendered/sitemap.xml) + ($(cp) sitemap.xml rendered/en/sitemap.xml) + (for x in en de fr it es ru pt ; do \ + $(cp) rendered/sitemap.xml rendered/$$x ; \ + done) + ($(cp) -R images rendered/static/) + (for lang in en de fr it es ru pt ; \ + do $(cp) -R images rendered/$$lang ; \ + done) + (for lang in en de fr it es ru pt ; do \ + $(cp) -R web-common rendered/$$lang ; \ + done) + (cd rendered; \ + for lang in en de fr it es ru pt; do \ + $(cp) $$lang/rss.xml $$lang/news/rss.xml; \ + done) + (for d in dist icons papers presentations ; do \ + $(cp) -R $$d rendered/ ; \ + done) + ($(cp) -R pdf rendered/static/) # Extract translateable strings from jinja2 templates. locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc @@ -30,26 +41,18 @@ locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc # Update translation (.po) files with new strings. .PHONY: locale-update locale-update: locale/messages.pot - $(msgmerge) -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot - $(msgmerge) -U -m --previous locale/de/LC_MESSAGES/messages.po locale/messages.pot - $(msgmerge) -U -m --previous locale/fr/LC_MESSAGES/messages.po locale/messages.pot - $(msgmerge) -U -m --previous locale/es/LC_MESSAGES/messages.po locale/messages.pot - $(msgmerge) -U -m --previous locale/it/LC_MESSAGES/messages.po locale/messages.pot - $(msgmerge) -U -m --previous locale/ru/LC_MESSAGES/messages.po locale/messages.pot - $(msgmerge) -U -m --previous locale/pt/LC_MESSAGES/messages.po locale/messages.pot + (for lang in de fr es it ru pt; do \ + $(msgmerge) -q -U -m --previous locale/$$lang/LC_MESSAGES/messages.po locale/messages.pot ; \ + done) if $(grep) -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then $(echo) -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi # Compile translation files for use. .PHONY: locale-compile locale-compile: - $(pybabel) compile -d locale -l en --use-fuzzy - $(pybabel) compile -d locale -l de --use-fuzzy - $(pybabel) compile -d locale -l fr --use-fuzzy - $(pybabel) compile -d locale -l it --use-fuzzy - $(pybabel) compile -d locale -l es --use-fuzzy - $(pybabel) compile -d locale -l ru --use-fuzzy - $(pybabel) compile -d locale -l pt --use-fuzzy + (for lang in de fr it es ru pt; do \ + $(pybabel) -q compile -d locale -l $$lang --use-fuzzy ; \ + done) # Process everything related to gettext translations. .PHONY: locale @@ -58,11 +61,11 @@ locale: locale-update locale-compile # Run the jinja2 templating engine to expand templates to HTML # incorporating translations. template: locale-compile - $(python) ./template.py + $(python) ./make_site.py .PHONY: run run: all - $(browser) http://0.0.0.0:8000 & + $(browser) http://0.0.0.0:8000/rendered/en & $(python) -m http.server .PHONY: install @@ -84,17 +87,3 @@ submodules/init: submodules/update: $(git) submodule update --recursive --remote - -.SILENT: show-help -show-help: - $(printf) "install:\t\tInstall the website\n" - $(printf) "all:\t\t\tBuild the website\n" - $(printf) "locale/messages.pot:\tExtract translateable strings from jinja2 templates.\n" - $(printf) "locale-update:\t\tUpdate translation files with new strings.\n" - $(printf) "locale-compile:\t\tCompile translation files for use.\n" - $(printf) "locale:\t\t\tProcess everything related to gettext translations.\n" - $(printf) "template:\t\texpand jinja2 templates to html.\n" - $(printf) "run:\t\t\tspawn python webserver and open the current directory.\n" - $(printf) "clean:\t\t\tclean.\n" - $(printf) "submodules/init:\tinit git submodules\n" - $(printf) "submodules/update:\tupdate git submodules\n" diff --git a/Makefile b/Makefile deleted file mode 100644 index 309d899b..00000000 --- a/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -# Makefile for NetBSD make (portable version: "bmake"), -# GNU make will find 'GNUmakefile' first and use that file instead. -# This file is in the public domain. -# -# I keep and maintain this file for personal use, it is faster than -# the gmake approach. - -.include "config.mk" - -DESTDIR=$(prefix) - -_LOCALELIST= en de fr it es ru pt -_DIRLIST= dist icons papers pdf presentations images - -.PHONY: all run locale-compile locale install clean - -.OBJDIR=rendered - -# Work this into an mk file - -# All: build HTML pages in all languages and compile the -# TypeScript logic in web-common. -all: locale template - cd web-common && $(tsc) - $(sh) make_sitemap.sh -.for _lang in ${_LOCALELIST} - $(cp) robots.txt rendered/${_lang} - $(cp) favicon.ico rendered/${_lang} - $(cp) rendered/sitemap.xml rendered/${_lang} -.endfor -.for _dir in ${_DIRLIST} - $(cp) -R ${_dir} rendered/ -.endfor - $(cp) styles.css rendered/ - -# Extract translateable strings from jinja2 templates. -locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc - $(env) PYTHONPATH="." $(pybabel) -q extract -F locale/babel.map -o locale/messages.pot . - -# Update translation (.po) files with new strings. -locale-update: locale/messages.pot -.for _lang in ${_LOCALELIST} - $(msgmerge) -q -U -m --previous locale/${_lang}/LC_MESSAGES/messages.po locale/messages.pot -.endfor - if $(grep) -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then \ - $(echo) -e "\nERROR: Conflicts encountered in PO files.\n"; \ - exit 1; \ - fi - -# Compile translation files for use. -locale-compile: -.for _lang in ${_LOCALELIST} - $(pybabel) -q compile -d locale -l ${_lang} --use-fuzzy -.endfor - -# Process everything related to gettext translations. -locale: locale-update locale-compile - -# Run the jinja2 templating engine to expand templates to HTML -# incorporating translations. -template: locale-compile - $(python) ./template.py - -run: -.if defined(browser) && !empty(DESTDIR) && !empty(python) - $(browser) http://0.0.0.0:8000 & - $(python) -m http.server -.endif - -install: - $(mkdir) -p $(prefix)/share/taler-www - $(cp) -R rendered/* $(prefix)/share/taler-www - -uninstall: - $(rm) -rf $(prefix)/share/taler-www - -submodules/init: - $(git) submodule update --init --recursive - -submodules/update: - $(git) submodule update --recursive --remote - -CLEANFILES+= *.pyc *~ \.*~ *.core - -.include <bsd.prog.mk> @@ -11,4 +11,8 @@ if ! git --version >/dev/null; then fi git submodule update --init -cp build-system/taler-build-scripts/configure ./configure +git submodule update --recursive --remote +git submodule sync + +cp build-system/taler-build-scripts/configure ./configure || true +cp build-system/taler-build-scripts/conf/.style.yapf .style.yapf || true diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts -Subproject d725a0cd1b4aa3ff54452a702b8c19db3f3c339 +Subproject 1915a74bbb4cd2ae9bc541a382dfebc37064a2f diff --git a/common/footer.j2.inc b/common/footer.j2.inc index bce2b9a1..0d5be467 100644 --- a/common/footer.j2.inc +++ b/common/footer.j2.inc @@ -8,27 +8,29 @@ <div class="row"> <div class="col-12 col-sm-4"> <ul class="footer-list"> - <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li> + <li><a href="{{ url_localized('contact.html') }}">{{ _("Contact") }}</a></li> </ul> </div> <div class="col-12 col-sm-4"> <ul class="footer-list"> - <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li> + <li><a href="{{ url_localized('faq.html') }}">{{ _("FAQ") }}</a></li> </ul> </div> <div class="col-12 col-sm-4"> <ul class="footer-list"> - <li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li> + <li><a href="{{ url_localized('bibliography.html') }}">{{ _("Bibliography") }}</a></li> </ul> </div> </div> </div> <div class="text-center mt-5"> - <p>© <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }} + <p> + © <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }} Taler Systems SA 2015-2019 <br> {{ _("We are grateful for support and free hosting of this site by <a href='http://www.bfh.ch/'>BFH</a>") }}. <br> - {{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p> + {{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }} + </p> </div> </footer> diff --git a/common/header.j2.inc b/common/header.j2.inc index e75a9433..53320ced 100644 --- a/common/header.j2.inc +++ b/common/header.j2.inc @@ -37,15 +37,17 @@ <!-- <link rel="icon" href="../../favicon.ico"> --> <!-- Bootstrap core CSS --> - <link href="{{ url('dist/css/bootstrap.min.css') }}" rel="stylesheet"> + <link href="{{ url_dist('css/bootstrap.min.css') }}" rel="stylesheet"> <!-- Custom styles for this template --> - <link href="{{ url('styles.css') }}" rel="stylesheet"> + <link href="{{ url_static('styles.css') }}" rel="stylesheet"> - <script src="{{ url('dist/js/jquery-1.11.1.min.js') }}"></script> - <script src="{{ url('dist/js/bootstrap.min.js') }}"></script> + <script src="{{ url_dist('js/jquery-1.11.1.min.js') }}"></script> + <script src="{{ url_dist('js/bootstrap.min.js') }}"></script> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> + + <link rel="alternate" type="application/rss+xml" title="Taler.net rss" href="{{ url_localized('news/rss.xml') }}" /> diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index 278a70c2..b9846031 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc @@ -6,7 +6,7 @@ {%- endmacro %} <nav class="navbar navbar-expand-lg navbar-light"> - <a class="navbar-brand taler_home" href="/{{ lang }}/index.html">Taler</a> + <a class="navbar-brand taler_home" href="{{ url_localized('index.html') }}">Taler</a> <button class="navbar-toggler" type="button" data-toggle="collapse" @@ -21,6 +21,7 @@ {{ navlink('features.html', _('Features')) }} {{ navlink('principles.html', _('Principles')) }} {{ navlink('docs.html', _('Docs')) }} + {{ navlink('news/index.html', _('News')) }} </div> <div class="nav-item dropdown"> @@ -30,7 +31,7 @@ data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> - <img src="{{ url('images/languageicon.svg') }}" + <img src="{{ url_static('images/languageicon.svg') }}" height="35" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] @@ -47,7 +48,5 @@ --> </ul> </div> - - </div> </nav> diff --git a/common/news.j2 b/common/news.j2 new file mode 100644 index 00000000..7113f5b1 --- /dev/null +++ b/common/news.j2 @@ -0,0 +1,29 @@ +<!DOCTYPE html> +<html lang="{{ lang }}"> + <head> + <meta charset="UTF-8"/> + <title>{{ _("GNU Taler") }}</title> + <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" /> + {% include "common/header.j2.inc" %} + {% block head_content %}{% endblock %} + </head> + <body id="mybody"> + {% include "common/navigation.j2.inc" %} + <div id="body_content" class="bg-near-white"> + <a href="#" id="jump-top" role="button"> + <i class="fas fa-chevron-up"></i> + </a> + <div class="container-fluid"> + <div class="container text-center"> + <h1>News</h1> + </div> + </div> + <div class="container"> + <article id="newspost-content"> + {% block body_content %}{% endblock %} + </article> + </div> + </div> + {% include "common/footer.j2.inc" %} + </body> +</html> diff --git a/inc b/inc new file mode 160000 +Subproject bdef602fcbd13d59aef971307b3730247a8b9c5 diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index 54506c2a..7a4577f3 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po @@ -2,22 +2,22 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-12-01 21:29+0100\n" +"POT-Creation-Date: 2019-12-10 14:34+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" -"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en\n" "Plural-Forms: nplurals=2; plural=(n!=1)\n" "Generated-By: Babel 2.4.0\n" -#: common/base.j2:5 +#: common/base.j2:5 common/news.j2:5 msgid "GNU Taler" msgstr "Das Taler-Bezahlsystem" -#: common/base.j2:6 +#: common/base.j2:6 common/news.j2:6 msgid "Taxable Anonymous Libre Electronic Reserves" msgstr "Taxierbare Anonyme Liberale Elektronische Reserven" @@ -35,19 +35,18 @@ msgstr "" msgid "Bibliography" msgstr "Bibliografie von GNU Taler" -#: common/footer.j2.inc:27 template/bibliography.html.j2:23 -#: template/bibliography.html.j2:30 template/bibliography.html.j2:37 -#: template/bibliography.html.j2:43 template/developers.html.j2:66 +#: common/footer.j2.inc:28 template/bibliography.html.j2:34 +#: template/developers.html.j2:66 msgid "and" msgstr "und" -#: common/footer.j2.inc:30 +#: common/footer.j2.inc:31 msgid "" "We are grateful for support and free hosting of this site by <a href='http://" "www.bfh.ch/'>BFH</a>" msgstr "" -#: common/footer.j2.inc:32 +#: common/footer.j2.inc:33 msgid "" "This page was created using <a href='https://www.gnu.org/'>Free Software</a> " "only." @@ -65,24 +64,26 @@ msgstr "" msgid "Docs" msgstr "" +#: common/navigation.j2.inc:24 news/index.html.j2:9 +msgid "News" +msgstr "" + +#: inc/news.macro.j2:22 +msgid "read more" +msgstr "" + #: template/architecture.html.j2:6 msgid "Taler System Architecture" msgstr "Systemarchitektur von Taler" -#: template/bibliography.html.j2:4 +#: template/bibliography.html.j2:5 msgid "GNU Taler Bibliography" msgstr "Bibliografie von GNU Taler" -#: template/bibliography.html.j2:9 template/bibliography.html.j2:16 -#: template/bibliography.html.j2:23 template/bibliography.html.j2:30 -#: template/bibliography.html.j2:37 template/bibliography.html.j2:43 +#: template/bibliography.html.j2:27 msgid "by" msgstr "von" -#: template/bibliography.html.j2:44 -msgid "available upon request" -msgstr "erhältlich auf Anfrage" - #: template/contact.html.j2:6 msgid "Contact information" msgstr "Kontakt" @@ -179,21 +180,16 @@ msgstr "" msgid "Copyright Assignment" msgstr "" -#: template/copyright.html.j2:9 +#: template/copyright.html.j2:8 msgid "" "Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/" -"copyright.pdf\">copyright assignment</a> to ensure that the" +"copyright.pdf\">copyright assignment</a> to ensure that the <a href=" +"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex" +"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative " +"development</a> of the GNUnet and GNU Taler projects is satisfied." msgstr "" -#: 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:24 +#: template/copyright.html.j2:19 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 " @@ -202,7 +198,7 @@ msgid "" "stores that are hostile to free software)." msgstr "" -#: template/copyright.html.j2:34 +#: template/copyright.html.j2:29 msgid "" "Minor contributions (basically, anyone without Git access) do not require " "copyright assignment. Pseudonymous contributions are accepted, in this case " @@ -245,9 +241,9 @@ msgstr "" "Taler ist freie Software mit einem offenen Protokoll. Alle Programmierer " "sind dazu eingeladen, unseren Referenzcode in ihre Anwendungen aufzunehmen. " "Verschiedene Taler-Komponenten sind unter verschiedenen Lizenzformen " -"verfügbar. Für die Taler-Wechselstube (den \"Exchange\") dient Affero " -"GPLv3+, LGPLv3+ für den Referenzcode der Integration in Handelsplattformen, " -"GPLv3+-Lizenzen gelten für Geldbörsen (\"Wallets\") und Kundeninteraktions-" +"verfügbar. Für die Taler-Wechselstube (den \"Exchange\") dient Affero GPLv3" +"+, LGPLv3+ für den Referenzcode der Integration in Handelsplattformen, GPLv3" +"+-Lizenzen gelten für Geldbörsen (\"Wallets\") und Kundeninteraktions-" "Software. Wir heißen alle konstruktiven Vorschläge willkommen, die Taler-" "Komponenten in eigene Anwendungen zu integrieren." @@ -269,11 +265,11 @@ msgstr "RESTful-basiert" msgid "" "Taler is designed to work on the Internet. To ensure that Taler payments can " "work with restrictive network setups, Taler uses a RESTful protocol over " -"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but " -"obviously merchants may choose to offer HTTPS for consistency and because it " -"generally is better for privacy compared to HTTP. Taler uses JSON to encode " -"structure data, making it easy to integrate Taler with existing Web " -"applications. Taler's protocol is documented in detail at" +"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, " +"but obviously merchants may choose to offer HTTPS for consistency and " +"because it generally is better for privacy compared to HTTP. Taler uses JSON " +"to encode structure data, making it easy to integrate Taler with existing " +"Web applications. Taler's protocol is documented in detail at" msgstr "" "Taler als Bezahlsystem benutzt ein RESTful-Protokoll über HTTP oder HTTPS-" "Verbindungen, um auch in eingeschränkten Netzwerkumgebungen sichere " @@ -422,7 +418,7 @@ msgstr "" msgid "Technical Presentation" msgstr "" -#: template/developers.html.j2:149 template/investors.html.j2:93 +#: template/developers.html.j2:149 template/investors.html.j2:90 msgid "Download" msgstr "" @@ -489,14 +485,14 @@ msgstr "" #| "value of the funds (except for fees which the\n" #| "exchange may charge for the service).\n" 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 " -"are digital representations of the original currency from the transfer. It " -"is important to note that the exchange does not learn the "serial " -"numbers" of the coins created in this process, so it cannot tell later " -"which customer purchased what at which merchant. The use of Taler does not " -"change the currency or the total value of the funds (except for fees which " -"the exchange may charge for the service)." +"Once the exchange has received the wire transfer, it allows the customer'" +"s electronic wallet to <b>withdraw</b> electronic coins. The electronic " +"coins are digital representations of the original currency from the " +"transfer. It is important to note that the exchange does not learn the "" +"serial numbers" of the coins created in this process, so it cannot tell " +"later which customer purchased what at which merchant. The use of Taler does " +"not change the currency or the total value of the funds (except for fees " +"which the exchange may charge for the service)." msgstr "" "Sobald die Taler-Wechselstube die Überweisung von der Bank erhalten hat, " "erlaubt sie die Verwendung der digitalen Münzen in der Taler-Geldbörse. Die " @@ -721,7 +717,7 @@ msgid "Exchange" msgstr "" #: template/docs.html.j2:64 -msgid "Operator's manual for the GNU Taler exchange. Also available as" +msgid "Operator's manual for the GNU Taler exchange. Also available as" msgstr "" #: template/docs.html.j2:74 @@ -1020,12 +1016,13 @@ msgstr "" #: template/faq.html.j2:119 msgid "" -"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." +"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:130 @@ -1137,7 +1134,7 @@ msgstr "" 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." +"span> on the merchant's Website." msgstr "" #: template/features.html.j2:50 @@ -1163,8 +1160,8 @@ msgstr "Bezahlen mit Taler" #| "of phishing or identity theft.</p>\n" 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." +"Before the first payment, the desired currency must be added to the " +"wallet's balance by some other means of payment." msgstr "" "Um mit dem Taler-Bezahlsystem einkaufen zu können, muss man eine " "elektronische Geldbörse auf einem Endgerät installieren. Vor der ersten " @@ -1219,8 +1216,9 @@ msgstr "Verkaufen mit Taler" msgid "" "To receive Taler payments, a merchant needs a bank account in the desired " "currency. We provide supporting software in various programming languages to " -"make the integration painless. The merchant's backend for Taler transaction " -"processing can run on the merchant's premises or be hosted by a third party." +"make the integration painless. The merchant's backend for Taler " +"transaction processing can run on the merchant's premises or be hosted " +"by a third party." msgstr "" "Um Zahlungen erhalten zu können, brauchen Verkäufer ein Girokonto in der " "gewünschten Währung bei einer Geschäftsbank. Das Taler-Bezahlsystem " @@ -1274,7 +1272,7 @@ msgstr "Stabil" msgid "" "Taler does not introduce a new currency. Taler uses a digital wallet storing " "coins and payment service providers with escrow accounts in existing " -"currencies. Thus, Taler's cryptographic coins correspond to existing " +"currencies. Thus, Taler's cryptographic coins correspond to existing " "currencies, such as US Dollars, Euros or even Bitcoins." msgstr "" "Als Bezahlsystem stellt Taler noch keine neue Währung dar. Taler verbindet " @@ -1316,7 +1314,7 @@ msgstr "Besteuerbar" #| "Taler helps prevent black markets. Taler is not suitable for\n" #| "illegal activities.\n" msgid "" -"When using Taler, merchant's revenue is transparent for tax collection " +"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 "" @@ -1461,7 +1459,7 @@ msgstr "" msgid "" "a `coin` is dirty if its public key may be known to an entity other than the " "customer, thereby creating the danger of some entity being able to link " -"multiple transactions of coin's owner if the coin is not refreshed first" +"multiple transactions of coin's owner if the coin is not refreshed first" msgstr "" #: template/glossary.html.j2:61 @@ -1470,7 +1468,7 @@ msgstr "" #: template/glossary.html.j2:63 msgid "" -"Taler's payment service provider. Issues electronic `coins` during " +"Taler's payment service provider. Issues electronic `coins` during " "`withdrawal` and redeems them when they are `deposited` by merchants." msgstr "" @@ -1583,8 +1581,8 @@ msgstr "" #: template/glossary.html.j2:146 msgid "" "funds set aside for future use; either the balance of a customer at the " -"exchange ready for `withdrawal`, or the funds kept in the exchange's bank " -"account to cover obligations from coins in circulation" +"exchange ready for `withdrawal`, or the funds kept in the exchange's " +"bank account to cover obligations from coins in circulation" msgstr "" #: template/glossary.html.j2:152 @@ -1628,7 +1626,7 @@ msgstr "" #: template/glossary.html.j2:178 msgid "" -"users can share ownership of a `coin` by sharing access to the coin's " +"users can share ownership of a `coin` by sharing access to the coin's " "private key, thereby allowing all co-owners to spend the coin at any time." msgstr "" @@ -1835,11 +1833,11 @@ msgstr "" #| "improving economic security for individuals, merchants,\n" #| "the exchange and the state.\n" msgid "" -"Taler's payments are cryptographically secured. Thus, customers, merchants " -"and the Taler payment service provider (the exchange) can mathematically " -"demonstrate their lawful behavior in court in case of disputes. Financial " -"damages are strictly limited, improving economic security for individuals, " -"merchants, the exchange and the state." +"Taler's payments are cryptographically secured. Thus, customers, " +"merchants and the Taler payment service provider (the exchange) can " +"mathematically demonstrate their lawful behavior in court in case of " +"disputes. Financial damages are strictly limited, improving economic " +"security for individuals, merchants, the exchange and the state." msgstr "" "Zahlungen in Taler sind kryptographisch verschlüsselt. Sowohl Käufer als " "auch Verkäufer und das Taler-Bezahlsystem selbst (die Taler-Wechselstube) " @@ -2039,8 +2037,8 @@ msgstr "" #| "and the income of the exchange from transaction fees.\n" msgid "" "The amounts of digital coins legitimately withdrawn by customers from the " -"exchange, the value of non-redeemed digital coins in customer's wallets, the " -"value and corresponding wire details of deposit operations performed by " +"exchange, the value of non-redeemed digital coins in customer's wallets, " +"the value and corresponding wire details of deposit operations performed by " "merchants with the exchange, and the income of the exchange from transaction " "fees." msgstr "" @@ -2068,12 +2066,12 @@ msgstr "Das Taler-System im Überblick" #: template/gsoc-codeless.html.j2:14 msgid "" -"Codeless payment is a component that sits between the seller's frontend and " -"the GNU Taler merchant backend. This component has a web interface, where " -"payment buttons are configured. Registered merchants can manage their " -"inventory and simultaneously create a 'Buy Now' button for a specific " -"product. This code can be directly copy pasted on the seller's frontend and " -"can be used for 'Pay with Taler'." +"Codeless payment is a component that sits between the seller's frontend " +"and the GNU Taler merchant backend. This component has a web interface, " +"where payment buttons are configured. Registered merchants can manage their " +"inventory and simultaneously create a 'Buy Now' button for a " +"specific product. This code can be directly copy pasted on the seller's " +"frontend and can be used for 'Pay with Taler'." msgstr "" #: template/gsoc-codeless.html.j2:29 @@ -2232,37 +2230,37 @@ msgstr "" msgid "Shipment Tracking" msgstr "" -#: template/index.html.j2:23 +#: template/index.html.j2:25 msgid "" "We provide a payment system that makes <span class='tlr'>privacy-friendly</" "span> online transactions <span class='tlr'>fast and easy</span>." msgstr "" -#: template/index.html.j2:27 +#: template/index.html.j2:29 msgid "Payments without registration" msgstr "" -#: template/index.html.j2:31 +#: template/index.html.j2:33 msgid "Data protection by default" msgstr "" -#: template/index.html.j2:35 +#: template/index.html.j2:37 msgid "Fraud eliminated by design" msgstr "" -#: template/index.html.j2:39 +#: template/index.html.j2:41 msgid "Not a new currency!" msgstr "" -#: template/index.html.j2:43 +#: template/index.html.j2:45 msgid "Empowers communities to run their own payment infrastructure" msgstr "" -#: template/index.html.j2:46 +#: template/index.html.j2:48 msgid "Try Demo!" msgstr "" -#: template/index.html.j2:47 +#: template/index.html.j2:49 msgid "Read Docs" msgstr "" @@ -2310,20 +2308,18 @@ msgstr "" "Vision in die Welt zu bringen." #: template/investors.html.j2:37 -msgid "We are currently supported by" -msgstr "" - -#: template/investors.html.j2:41 msgid "" +"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, " "the French national institute for research in informatics and automation, " -"and the" +"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom " +"Foundation</a>." msgstr "" -#: template/investors.html.j2:50 +#: template/investors.html.j2:47 msgid "The Technology" msgstr "Die Technologie" -#: template/investors.html.j2:53 +#: template/investors.html.j2:50 #, fuzzy #| msgid "" #| "All transactions in Taler are secured using <a href=\"bibliography.html" @@ -2340,11 +2336,11 @@ msgstr "Die Technologie" msgid "" "All transactions in Taler are secured using <a href=\"bibliography.html" "\">modern cryptography</a> and trust in all parties is minimized. Financial " -"damage is bounded (for customers, merchants and the exchange) even in the " -"case that systems are compromised and private keys are stolen. Databases can " -"be audited for consistency, resulting in either the detection of compromised " -"systems or the demonstration that participants were honest. Actual " -"transaction costs are fractions of a cent." +"damage is bounded (for customers, merchants and the exchange) even " +"in the case that systems are compromised and private keys are stolen. " +"Databases can be audited for consistency, resulting in either the detection " +"of compromised systems or the demonstration that participants were honest. " +"Actual transaction costs are fractions of a cent." msgstr "" "Alle Buchungen im Taler-Bezahlsystem sind mit aktuellen Methoden der <a href=" "\"bibliography.html\">Kryptographie</a> geschützt. Selbst im Fall eines " @@ -2356,11 +2352,11 @@ msgstr "" "Beteiligten dar. Die Buchungskosten betragen übrigens nur Bruchteile eines " "Cent pro Buchung." -#: template/investors.html.j2:66 +#: template/investors.html.j2:63 msgid "The Business" msgstr "Das Geschäftsmodell des Taler-Bezahlsystems" -#: template/investors.html.j2:68 +#: template/investors.html.j2:65 #, fuzzy #| msgid "" #| "The scalable business model for Taler is the operation\n" @@ -2390,22 +2386,22 @@ msgstr "" "gutgeschrieben bekommt. Die Wechselstube erhebt für die Überweisungen " "geringe Gebühren." -#: template/investors.html.j2:87 +#: template/investors.html.j2:84 msgid "The Business Case" msgstr "Der Businessplan" -#: template/investors.html.j2:97 +#: template/investors.html.j2:94 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:120 +#: template/investors.html.j2:117 msgid "Running a Taler payment service operator" msgstr "Ein Taler-Bezahlsystem als Serviceanbieter betreiben" -#: template/investors.html.j2:123 +#: template/investors.html.j2:120 #, fuzzy #| msgid "" #| "The payment service operator runs the <em>Taler exchange</em>.\n" @@ -2424,7 +2420,7 @@ msgstr "" "Banküberweisungen von und zu Geschäftsbanken und für den Betrieb der IT-" "Infrastruktur." -#: template/investors.html.j2:133 +#: template/investors.html.j2:130 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." @@ -2432,7 +2428,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:134 +#: template/investors.html.j2:131 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." @@ -2441,7 +2437,7 @@ msgstr "" "können mehrere kleine Überweisungen auf das Girokonto der Verkäufer in einer " "Transaktion zusammengefasst und übertragen werden." -#: template/investors.html.j2:135 +#: template/investors.html.j2:132 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." @@ -2451,11 +2447,11 @@ msgstr "" "Geldbörse, Deponieren von Münzen, Refresh-Funktion, Erstattungen und " "aggregierte Überweisungen an Geschäftsbanken." -#: template/investors.html.j2:136 +#: template/investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "Partnerschaften mit Banken erhöhen das Kundenvertrauen." -#: template/investors.html.j2:137 +#: template/investors.html.j2:134 msgid "Partnership with free software community enables rapid deployment." msgstr "" "Partnerschaften mit der Free-Software-Bewegung ermöglichen eine rasche " @@ -2581,7 +2577,7 @@ msgstr "Günstig" #| "thus offer low transaction fees.\n" msgid "" "Taler is uses efficient cryptographic constructions with low bandwidth and " -"storage requirements. Combined with Taler's strong security which makes " +"storage requirements. Combined with Taler's strong security which makes " "fraud impossible, Taler payment service providers can operate with very low " "overhead and thus offer low transaction fees." msgstr "" @@ -2624,7 +2620,7 @@ msgstr "Ethisch" #| "transparency by providing an open standard and free\n" #| "software reference implementations.\n" msgid "" -"Taler prevents tax evasion and money laundering. Taler's protocols are " +"Taler prevents tax evasion and money laundering. Taler's protocols are " "efficient and do not use wasteful proof-of-work calculations. Taler " "encourages transparency by providing an open standard and free software " "reference implementations." @@ -2666,8 +2662,8 @@ msgstr "Händler verwenden das Taler-Backend zur Zahlungsabwicklung:" #| "customer's order in a JSON format to the backend.\n" msgid "" "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made " -"by the merchant to customers. For this, the merchant's frontend needs to " -"give the customer's order in a JSON format to the backend." +"by the merchant to customers. For this, the merchant's frontend needs to " +"give the customer's order in a JSON format to the backend." msgstr "" "Das Backend signiert und speichert sämtliche Bedingungen der Verträge, die " "Käufer und Verkäufer vorher vereinbart hatten. Das Händlerfrontend liefert " @@ -2685,8 +2681,8 @@ msgstr "" msgid "" "The backend <b>validates</b> payments received from the wallet and " "<b>executes</b> them with the Taler payment service provider (the exchange). " -"For this, the merchant's frontend must pass the payment request through to " -"the Taler backend and check the HTTP status code that is returned." +"For this, the merchant's frontend must pass the payment request through " +"to the Taler backend and check the HTTP status code that is returned." msgstr "" "Das Backend validiert die Signaturen aus den Taler-Geldbörsen und sendet sie " "der Taler-Wechselstube zur Ausführung. Das Händlerfrontend muss dann die " @@ -2713,24 +2709,6 @@ msgstr "" msgid "customer perspective" msgstr "" -#: template/news.html.j2:6 -msgid "News" -msgstr "" - -#: template/news.html.j2:16 -msgid "More news" -msgstr "" - -#: template/old-news.html.j2:6 -#, fuzzy -#| msgid "Taler News" -msgid "Older News" -msgstr "Taler-News" - -#: template/old-news.html.j2:9 -msgid "This page documents the GNU Taler history." -msgstr "" - #: template/press.html.j2:4 msgid "GNU Taler in the Press" msgstr "Taler in den Medien" @@ -2950,7 +2928,7 @@ msgid "demo" msgstr "" #: template/wallet.html.j2:119 -msgid "You don't have a wallet installed yet." +msgid "You don't have a wallet installed yet." msgstr "" #: template/wallet.html.j2:128 @@ -2968,7 +2946,7 @@ msgid "or" msgstr "" #: template/wallet.html.j2:149 -msgid "is required, but it appears you don't have it installed." +msgid "is required, but it appears you don't have it installed." msgstr "" #: template/wallet.html.j2:159 @@ -2986,7 +2964,7 @@ msgid "Install wallet" msgstr "Geldbörse" #: template/wallet.html.j2:177 -msgid "JavaScript is disabled, installation won't work." +msgid "JavaScript is disabled, installation won't work." msgstr "" #: template/wallet.html.j2:216 @@ -3011,6 +2989,14 @@ msgstr "" msgid "Wallets for other browsers will be provided in the near future." msgstr "" +#~ msgid "available upon request" +#~ msgstr "erhältlich auf Anfrage" + +#, fuzzy +#~| msgid "Taler News" +#~ msgid "Older News" +#~ msgstr "Taler-News" + #, fuzzy #~| msgid "The Team" #~ msgid "Team" diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po index d1f1086e..76355995 100644 --- a/locale/en/LC_MESSAGES/messages.po +++ b/locale/en/LC_MESSAGES/messages.po @@ -2,14 +2,14 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-12-01 21:29+0100\n" +"POT-Creation-Date: 2019-12-09 20:43+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" -"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en\n" "Plural-Forms: nplurals=2; plural=(n!=1)\n" "Generated-By: Babel 2.3.4\n" @@ -17,7 +17,7 @@ msgstr "" msgid "GNU Taler" msgstr "" -#: common/base.j2:6 +#: common/base.j2:6 common/news.j2:6 msgid "Taxable Anonymous Libre Electronic Reserves" msgstr "" @@ -63,6 +63,18 @@ msgstr "" msgid "Docs" msgstr "" +#: common/navigation.j2.inc:24 news/index.html.j2:9 +msgid "News" +msgstr "" + +#: common/news.j2:5 +msgid "GNUnet" +msgstr "" + +#: inc/news.macro.j2:22 +msgid "read more" +msgstr "" + #: template/architecture.html.j2:6 msgid "Taler System Architecture" msgstr "" @@ -1561,37 +1573,37 @@ msgstr "" msgid "Shipment Tracking" msgstr "" -#: template/index.html.j2:23 +#: template/index.html.j2:25 msgid "" "We provide a payment system that makes <span class='tlr'>privacy-friendly</" "span> online transactions <span class='tlr'>fast and easy</span>." msgstr "" -#: template/index.html.j2:27 +#: template/index.html.j2:29 msgid "Payments without registration" msgstr "" -#: template/index.html.j2:31 +#: template/index.html.j2:33 msgid "Data protection by default" msgstr "" -#: template/index.html.j2:35 +#: template/index.html.j2:37 msgid "Fraud eliminated by design" msgstr "" -#: template/index.html.j2:39 +#: template/index.html.j2:41 msgid "Not a new currency!" msgstr "" -#: template/index.html.j2:43 +#: template/index.html.j2:45 msgid "Empowers communities to run their own payment infrastructure" msgstr "" -#: template/index.html.j2:46 +#: template/index.html.j2:48 msgid "Try Demo!" msgstr "" -#: template/index.html.j2:47 +#: template/index.html.j2:49 msgid "Read Docs" msgstr "" @@ -1836,22 +1848,6 @@ msgstr "" msgid "customer perspective" msgstr "" -#: template/news.html.j2:6 -msgid "News" -msgstr "" - -#: template/news.html.j2:16 -msgid "More news" -msgstr "" - -#: template/old-news.html.j2:6 -msgid "Older News" -msgstr "" - -#: template/old-news.html.j2:9 -msgid "This page documents the GNU Taler history." -msgstr "" - #: template/press.html.j2:4 msgid "GNU Taler in the Press" msgstr "" diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index e20c1fe7..e9df2b71 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -2,23 +2,23 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-12-01 21:29+0100\n" +"POT-Creation-Date: 2019-12-10 14:34+0000\n" "PO-Revision-Date: 2017-08-10 06:24+0200\n" "Last-Translator: \n" "Language-Team: es <LL@li.org>\n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "Generated-By: Babel 2.3.4\n" "X-Generator: Poedit 2.0.2\n" -#: common/base.j2:5 +#: common/base.j2:5 common/news.j2:5 msgid "GNU Taler" msgstr "GNU Taler" -#: common/base.j2:6 +#: common/base.j2:6 common/news.j2:6 msgid "Taxable Anonymous Libre Electronic Reserves" msgstr "Reservas Electrónicas Gravales, Anónimas y Libres" @@ -34,19 +34,18 @@ msgstr "Preguntas frecuentes" msgid "Bibliography" msgstr "Bibliografía" -#: common/footer.j2.inc:27 template/bibliography.html.j2:23 -#: template/bibliography.html.j2:30 template/bibliography.html.j2:37 -#: template/bibliography.html.j2:43 template/developers.html.j2:66 +#: common/footer.j2.inc:28 template/bibliography.html.j2:34 +#: template/developers.html.j2:66 msgid "and" msgstr "y" -#: common/footer.j2.inc:30 +#: common/footer.j2.inc:31 msgid "" "We are grateful for support and free hosting of this site by <a href='http://" "www.bfh.ch/'>BFH</a>" msgstr "" -#: common/footer.j2.inc:32 +#: common/footer.j2.inc:33 msgid "" "This page was created using <a href='https://www.gnu.org/'>Free Software</a> " "only." @@ -66,24 +65,26 @@ msgstr "" msgid "Docs" msgstr "" +#: common/navigation.j2.inc:24 news/index.html.j2:9 +msgid "News" +msgstr "" + +#: inc/news.macro.j2:22 +msgid "read more" +msgstr "" + #: template/architecture.html.j2:6 msgid "Taler System Architecture" msgstr "Arquitectura del Sistema Taler" -#: template/bibliography.html.j2:4 +#: template/bibliography.html.j2:5 msgid "GNU Taler Bibliography" msgstr "Bibliografía de GNU Taler" -#: template/bibliography.html.j2:9 template/bibliography.html.j2:16 -#: template/bibliography.html.j2:23 template/bibliography.html.j2:30 -#: template/bibliography.html.j2:37 template/bibliography.html.j2:43 +#: template/bibliography.html.j2:27 msgid "by" msgstr "por" -#: template/bibliography.html.j2:44 -msgid "available upon request" -msgstr "disponible bajo petición" - #: template/contact.html.j2:6 msgid "Contact information" msgstr "Contacto" @@ -170,21 +171,16 @@ msgstr "" msgid "Copyright Assignment" msgstr "Asignación de derechos de autor" -#: template/copyright.html.j2:9 +#: template/copyright.html.j2:8 msgid "" "Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/" -"copyright.pdf\">copyright assignment</a> to ensure that the" +"copyright.pdf\">copyright assignment</a> to ensure that the <a href=" +"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex" +"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative " +"development</a> of the GNUnet and GNU Taler projects is satisfied." msgstr "" -#: 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:24 +#: template/copyright.html.j2:19 #, fuzzy #| msgid "" #| "<p>The agreements ensure that the code will continue to be made available " @@ -206,7 +202,7 @@ msgstr "" "para que podamos distribuir a través de las App-stores que son hostiles al " "software libre).</p>" -#: template/copyright.html.j2:34 +#: template/copyright.html.j2:29 #, fuzzy #| msgid "" #| "<p>Minor contributions (basically, anyone without Git access) do not " @@ -272,11 +268,11 @@ msgstr "Basado en REST" msgid "" "Taler is designed to work on the Internet. To ensure that Taler payments can " "work with restrictive network setups, Taler uses a RESTful protocol over " -"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but " -"obviously merchants may choose to offer HTTPS for consistency and because it " -"generally is better for privacy compared to HTTP. Taler uses JSON to encode " -"structure data, making it easy to integrate Taler with existing Web " -"applications. Taler's protocol is documented in detail at" +"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, " +"but obviously merchants may choose to offer HTTPS for consistency and " +"because it generally is better for privacy compared to HTTP. Taler uses JSON " +"to encode structure data, making it easy to integrate Taler with existing " +"Web applications. Taler's protocol is documented in detail at" msgstr "" "Taler está diseñado para trabajar con Internet. Para garantizar que los " "pagos de Taler puedan funcionar con configuraciones restrictivas de red, " @@ -417,7 +413,7 @@ msgstr "" msgid "Technical Presentation" msgstr "" -#: template/developers.html.j2:149 template/investors.html.j2:93 +#: template/developers.html.j2:149 template/investors.html.j2:90 msgid "Download" msgstr "" @@ -453,15 +449,26 @@ msgstr "" "una reserva en la plataforma de intercambio." #: 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 " -"are digital representations of the original currency from the transfer. It " -"is important to note that the exchange does not learn the "serial " -"numbers" of the coins created in this process, so it cannot tell later " -"which customer purchased what at which merchant. The use of Taler does not " -"change the currency or the total value of the funds (except for fees which " -"the exchange may charge for the service)." +#, fuzzy +#| 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 are digital representations of the original currency " +#| "from the transfer. It is important to note that the exchange does not " +#| "learn the "serial numbers" of the coins created in this " +#| "process, so it cannot tell later which customer purchased what at which " +#| "merchant. The use of Taler does not change the currency or the total " +#| "value of the funds (except for fees which the exchange may charge for the " +#| "service)." +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 are digital representations of the original currency from the " +"transfer. It is important to note that the exchange does not learn the "" +"serial numbers" of the coins created in this process, so it cannot tell " +"later which customer purchased what at which merchant. The use of Taler does " +"not change the currency or the total value of the funds (except for fees " +"which the exchange may charge for the service)." msgstr "" "Una vez que la plataforma de intercambio ha recibido la transferencia " "bancaria, permite que la billetera electrónica del cliente <b>retire</b> " @@ -619,7 +626,7 @@ msgid "Exchange" msgstr "Plataforma de intercambio" #: template/docs.html.j2:64 -msgid "Operator's manual for the GNU Taler exchange. Also available as" +msgid "Operator's manual for the GNU Taler exchange. Also available as" msgstr "" #: template/docs.html.j2:74 @@ -910,12 +917,13 @@ msgstr "" #: template/faq.html.j2:119 msgid "" -"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." +"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:130 @@ -1027,7 +1035,7 @@ msgstr "" 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." +"span> on the merchant's Website." msgstr "" #: template/features.html.j2:50 @@ -1053,8 +1061,8 @@ msgstr "Pagando con Taler" #| "or identity theft.</p>" msgid "" "To pay with Taler, customers install an electronic wallet on their device. " -"Before the first payment, the desired currency must be added to the wallet's " -"balance by some other means of payment." +"Before the first payment, the desired currency must be added to the " +"wallet's balance by some other means of payment." msgstr "" "<p>Para pagar con Taler, los clientes instalan una billetera electrónica en " "su dispositivo. Antes del primer pago, el saldo de la billetera debe ser " @@ -1103,8 +1111,9 @@ msgstr "Recibiendo pagos con Taler" msgid "" "To receive Taler payments, a merchant needs a bank account in the desired " "currency. We provide supporting software in various programming languages to " -"make the integration painless. The merchant's backend for Taler transaction " -"processing can run on the merchant's premises or be hosted by a third party." +"make the integration painless. The merchant's backend for Taler " +"transaction processing can run on the merchant's premises or be hosted " +"by a third party." msgstr "" "<p>Para recibir pagos con Taler, un comerciante necesita una cuenta bancaria " "en la moneda deseada. Nosotros proporcionamos el software de apoyo en varios " @@ -1142,10 +1151,16 @@ msgid "Stable" msgstr "Estable" #: template/features.html.j2:143 +#, fuzzy +#| msgid "" +#| "Taler does not introduce a new currency. Taler uses a digital wallet " +#| "storing coins and payment service providers with escrow accounts in " +#| "existing currencies. Thus, Taler's cryptographic coins correspond to " +#| "existing currencies, such as US Dollars, Euros or even Bitcoins." msgid "" "Taler does not introduce a new currency. Taler uses a digital wallet storing " "coins and payment service providers with escrow accounts in existing " -"currencies. Thus, Taler's cryptographic coins correspond to existing " +"currencies. Thus, Taler's cryptographic coins correspond to existing " "currencies, such as US Dollars, Euros or even Bitcoins." msgstr "" "Taler no introduce una nueva moneda. Taler utiliza una billetera electrónica " @@ -1175,8 +1190,13 @@ msgid "Taxable" msgstr "Imponible" #: template/features.html.j2:172 +#, fuzzy +#| 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." msgid "" -"When using Taler, merchant's revenue is transparent for tax collection " +"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 "" @@ -1320,10 +1340,16 @@ msgid "dirty" msgstr "Moneda sucia" #: template/glossary.html.j2:54 +#, fuzzy +#| msgid "" +#| "a `coin` is dirty if its public key may be known to an entity other than " +#| "the customer, thereby creating the danger of some entity being able to " +#| "link multiple transactions of coin's owner if the coin is not refreshed " +#| "first" msgid "" "a `coin` is dirty if its public key may be known to an entity other than the " "customer, thereby creating the danger of some entity being able to link " -"multiple transactions of coin's owner if the coin is not refreshed first" +"multiple transactions of coin's owner if the coin is not refreshed first" msgstr "" "Una `moneda` está sucia si su clave pública pudiese ser conocida por otra " "entidad aparte del cliente, creando así el peligro de que alguna entidad " @@ -1340,7 +1366,7 @@ msgstr "Plataforma de intercambio" #| "Taler's payment service provider. Issues eletronic `coins` during " #| "`withdrawal` and redeems them when they are `deposited` by merchants." msgid "" -"Taler's payment service provider. Issues electronic `coins` during " +"Taler's payment service provider. Issues electronic `coins` during " "`withdrawal` and redeems them when they are `deposited` by merchants." msgstr "" "Proveedor de servicios de pago basado en Taler. Emite `monedas` electrónicas " @@ -1469,10 +1495,15 @@ msgid "reserve" msgstr "Reserva" #: template/glossary.html.j2:146 +#, fuzzy +#| msgid "" +#| "funds set aside for future use; either the balance of a customer at the " +#| "exchange ready for `withdrawal`, or the funds kept in the exchange's bank " +#| "account to cover obligations from coins in circulation" msgid "" "funds set aside for future use; either the balance of a customer at the " -"exchange ready for `withdrawal`, or the funds kept in the exchange's bank " -"account to cover obligations from coins in circulation" +"exchange ready for `withdrawal`, or the funds kept in the exchange's " +"bank account to cover obligations from coins in circulation" msgstr "" "Fondos reservados para uso futuro; ya sea el saldo de un cliente en la " "plataforma de intercambio listo para un «retiro», o los fondos previstos en " @@ -1523,8 +1554,12 @@ msgid "sharing" msgstr "Compartir" #: template/glossary.html.j2:178 +#, fuzzy +#| msgid "" +#| "users can share ownership of a `coin` by sharing access to the coin's " +#| "private key, thereby allowing all co-owners to spend the coin at any time." msgid "" -"users can share ownership of a `coin` by sharing access to the coin's " +"users can share ownership of a `coin` by sharing access to the coin's " "private key, thereby allowing all co-owners to spend the coin at any time." msgstr "" "Los usuarios pueden compartir la propiedad de una `moneda` compartiendo el " @@ -1694,12 +1729,19 @@ msgstr "" "sincronización de billeteras a través de múltiples dispositivos." #: template/governments.html.j2:58 -msgid "" -"Taler's payments are cryptographically secured. Thus, customers, merchants " -"and the Taler payment service provider (the exchange) can mathematically " -"demonstrate their lawful behavior in court in case of disputes. Financial " -"damages are strictly limited, improving economic security for individuals, " -"merchants, the exchange and the state." +#, fuzzy +#| msgid "" +#| "Taler's payments are cryptographically secured. Thus, customers, " +#| "merchants and the Taler payment service provider (the exchange) can " +#| "mathematically demonstrate their lawful behavior in court in case of " +#| "disputes. Financial damages are strictly limited, improving economic " +#| "security for individuals, merchants, the exchange and the state." +msgid "" +"Taler's payments are cryptographically secured. Thus, customers, " +"merchants and the Taler payment service provider (the exchange) can " +"mathematically demonstrate their lawful behavior in court in case of " +"disputes. Financial damages are strictly limited, improving economic " +"security for individuals, merchants, the exchange and the state." msgstr "" "Los pagos de Taler están asegurados criptográficamente. Así, los clientes, " "comerciantes y el proveedor de servicios de pago de Taler (la plataforma de " @@ -1845,10 +1887,17 @@ msgstr "" "identidad del cliente." #: template/governments.html.j2:170 +#, fuzzy +#| msgid "" +#| "The amounts of digital coins legitimately withdrawn by customers from the " +#| "exchange, the value of non-redeemed digital coins in customer's wallets, " +#| "the value and corresponding wire details of deposit operations performed " +#| "by merchants with the exchange, and the income of the exchange from " +#| "transaction fees." msgid "" "The amounts of digital coins legitimately withdrawn by customers from the " -"exchange, the value of non-redeemed digital coins in customer's wallets, the " -"value and corresponding wire details of deposit operations performed by " +"exchange, the value of non-redeemed digital coins in customer's wallets, " +"the value and corresponding wire details of deposit operations performed by " "merchants with the exchange, and the income of the exchange from transaction " "fees." msgstr "" @@ -1876,12 +1925,12 @@ msgstr "Diagrama general del sistema" #: template/gsoc-codeless.html.j2:14 msgid "" -"Codeless payment is a component that sits between the seller's frontend and " -"the GNU Taler merchant backend. This component has a web interface, where " -"payment buttons are configured. Registered merchants can manage their " -"inventory and simultaneously create a 'Buy Now' button for a specific " -"product. This code can be directly copy pasted on the seller's frontend and " -"can be used for 'Pay with Taler'." +"Codeless payment is a component that sits between the seller's frontend " +"and the GNU Taler merchant backend. This component has a web interface, " +"where payment buttons are configured. Registered merchants can manage their " +"inventory and simultaneously create a 'Buy Now' button for a " +"specific product. This code can be directly copy pasted on the seller's " +"frontend and can be used for 'Pay with Taler'." msgstr "" #: template/gsoc-codeless.html.j2:29 @@ -2040,37 +2089,37 @@ msgstr "" msgid "Shipment Tracking" msgstr "" -#: template/index.html.j2:23 +#: template/index.html.j2:25 msgid "" "We provide a payment system that makes <span class='tlr'>privacy-friendly</" "span> online transactions <span class='tlr'>fast and easy</span>." msgstr "" -#: template/index.html.j2:27 +#: template/index.html.j2:29 msgid "Payments without registration" msgstr "" -#: template/index.html.j2:31 +#: template/index.html.j2:33 msgid "Data protection by default" msgstr "" -#: template/index.html.j2:35 +#: template/index.html.j2:37 msgid "Fraud eliminated by design" msgstr "" -#: template/index.html.j2:39 +#: template/index.html.j2:41 msgid "Not a new currency!" msgstr "" -#: template/index.html.j2:43 +#: template/index.html.j2:45 msgid "Empowers communities to run their own payment infrastructure" msgstr "" -#: template/index.html.j2:46 +#: template/index.html.j2:48 msgid "Try Demo!" msgstr "" -#: template/index.html.j2:47 +#: template/index.html.j2:49 msgid "Read Docs" msgstr "" @@ -2110,28 +2159,35 @@ msgstr "" "funcionar los pagos y nuestra meta es imponer esta visión sobre el mundo." #: template/investors.html.j2:37 -msgid "We are currently supported by" -msgstr "" - -#: template/investors.html.j2:41 msgid "" +"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, " "the French national institute for research in informatics and automation, " -"and the" +"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom " +"Foundation</a>." msgstr "" -#: template/investors.html.j2:50 +#: template/investors.html.j2:47 msgid "The Technology" msgstr "La Tecnología" -#: template/investors.html.j2:53 +#: template/investors.html.j2:50 +#, fuzzy +#| msgid "" +#| "All transactions in Taler are secured using <a href=\"bibliography.html" +#| "\">modern cryptography</a> and trust in all parties is minimized. " +#| "Financial damage is bounded (for customers, merchants and the exchange) " +#| "even in the case that systems are compromised and private keys are " +#| "stolen. Databases can be audited for consistency, resulting in either the " +#| "detection of compromised systems or the demonstration that participants " +#| "were honest. Actual transaction costs are fractions of a cent." msgid "" "All transactions in Taler are secured using <a href=\"bibliography.html" "\">modern cryptography</a> and trust in all parties is minimized. Financial " -"damage is bounded (for customers, merchants and the exchange) even in the " -"case that systems are compromised and private keys are stolen. Databases can " -"be audited for consistency, resulting in either the detection of compromised " -"systems or the demonstration that participants were honest. Actual " -"transaction costs are fractions of a cent." +"damage is bounded (for customers, merchants and the exchange) even " +"in the case that systems are compromised and private keys are stolen. " +"Databases can be audited for consistency, resulting in either the detection " +"of compromised systems or the demonstration that participants were honest. " +"Actual transaction costs are fractions of a cent." msgstr "" "Todas las transacciones en Taler son seguras ya que usan <a href=" "\"bibliography.html\">criptografía moderna</a> y la confianza depositada en " @@ -2143,11 +2199,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:66 +#: template/investors.html.j2:63 msgid "The Business" msgstr "El Negocio" -#: template/investors.html.j2:68 +#: template/investors.html.j2:65 msgid "" "The scalable business model for Taler is the operation of the payment " "service provider, which converts money from traditional payment systems " @@ -2166,22 +2222,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:87 +#: template/investors.html.j2:84 msgid "The Business Case" msgstr "El Caso de los Negocios" -#: template/investors.html.j2:97 +#: template/investors.html.j2:94 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:120 +#: template/investors.html.j2:117 msgid "Running a Taler payment service operator" msgstr "Operar una plataforma de servicio de pago de Taler" -#: template/investors.html.j2:123 +#: template/investors.html.j2:120 msgid "" "The payment service operator runs the <em>Taler exchange</em>. The exchange " "charges <b>transaction fees</b> to customers or merchants. Its operational " @@ -2194,7 +2250,7 @@ msgstr "" "transferencias electrónicas y del funcionamiento de la infraestructura " "informática." -#: template/investors.html.j2:133 +#: template/investors.html.j2:130 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." @@ -2202,7 +2258,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:134 +#: template/investors.html.j2:131 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." @@ -2211,7 +2267,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:135 +#: template/investors.html.j2:132 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." @@ -2220,11 +2276,11 @@ msgstr "" "cualquier operación que tenga un coste (retirar, depositar, actualizar, " "reembolsar o realizar transferencias electrónicas agrupadas)." -#: template/investors.html.j2:136 +#: template/investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "La asociación con bancos consolida la confianza del consumidor." -#: template/investors.html.j2:137 +#: template/investors.html.j2:134 msgid "Partnership with free software community enables rapid deployment." msgstr "" "La asociación con la comunidad de software libre permite un despliegue " @@ -2303,9 +2359,15 @@ msgid "Cheap" msgstr "Barato" #: template/merchants.html.j2:78 +#, fuzzy +#| msgid "" +#| "Taler is uses efficient cryptographic constructions with low bandwidth " +#| "and storage requirements. Combined with Taler's strong security which " +#| "makes fraud impossible, Taler payment service providers can operate with " +#| "very low overhead and thus offer low transaction fees." msgid "" "Taler is uses efficient cryptographic constructions with low bandwidth and " -"storage requirements. Combined with Taler's strong security which makes " +"storage requirements. Combined with Taler's strong security which makes " "fraud impossible, Taler payment service providers can operate with very low " "overhead and thus offer low transaction fees." msgstr "" @@ -2340,8 +2402,14 @@ msgid "Ethical" msgstr "Ético" #: template/merchants.html.j2:101 +#, fuzzy +#| msgid "" +#| "Taler prevents tax evasion and money laundering. Taler's protocols are " +#| "efficient and do not use wasteful proof-of-work calculations. Taler " +#| "encourages transparency by providing an open standard and free software " +#| "reference implementations." msgid "" -"Taler prevents tax evasion and money laundering. Taler's protocols are " +"Taler prevents tax evasion and money laundering. Taler's protocols are " "efficient and do not use wasteful proof-of-work calculations. Taler " "encourages transparency by providing an open standard and free software " "reference implementations." @@ -2376,10 +2444,15 @@ msgid "Merchants process payments using the Taler backend:" msgstr "Proceso de pagos del comerciante usando el backend de Taler:" #: template/merchants.html.j2:144 +#, fuzzy +#| msgid "" +#| "The backend <b>signs</b> and <b>stores</b> the complete terms of offers " +#| "made by the merchant to customers. For this, the merchant's frontend " +#| "needs to give the customer's order in a JSON format to the backend." msgid "" "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made " -"by the merchant to customers. For this, the merchant's frontend needs to " -"give the customer's order in a JSON format to the backend." +"by the merchant to customers. For this, the merchant's frontend needs to " +"give the customer's order in a JSON format to the backend." msgstr "" "El backend <b>firma</b> y <b>almacena</b> los términos completos de las " "ofertas hechas por el comerciante a los clientes. Para esto, el frontend del " @@ -2387,11 +2460,18 @@ msgstr "" "JSON." #: template/merchants.html.j2:153 +#, fuzzy +#| msgid "" +#| "The backend <b>validates</b> payments received from the wallet and " +#| "<b>executes</b> them with the Taler payment service provider (the " +#| "exchange). For this, the merchant's frontend must pass the payment " +#| "request through to the Taler backend and check the HTTP status code that " +#| "is returned." msgid "" "The backend <b>validates</b> payments received from the wallet and " "<b>executes</b> them with the Taler payment service provider (the exchange). " -"For this, the merchant's frontend must pass the payment request through to " -"the Taler backend and check the HTTP status code that is returned." +"For this, the merchant's frontend must pass the payment request through " +"to the Taler backend and check the HTTP status code that is returned." msgstr "" "El backend <b>valida</b> los pagos recibidos de la billetera y los " "<b>ejecuta</b> con el proveedor de servicios de pago de Taler (la plataforma " @@ -2413,24 +2493,6 @@ 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 "" - -#: template/old-news.html.j2:6 -#, fuzzy -#| msgid "Taler News" -msgid "Older News" -msgstr "Noticias de Taler" - -#: template/old-news.html.j2:9 -msgid "This page documents the GNU Taler history." -msgstr "" - #: template/press.html.j2:4 msgid "GNU Taler in the Press" msgstr "GNU Taler en la Prensa" @@ -2650,7 +2712,7 @@ msgid "demo" msgstr "" #: template/wallet.html.j2:119 -msgid "You don't have a wallet installed yet." +msgid "You don't have a wallet installed yet." msgstr "" #: template/wallet.html.j2:128 @@ -2668,7 +2730,7 @@ msgid "or" msgstr "" #: template/wallet.html.j2:149 -msgid "is required, but it appears you don't have it installed." +msgid "is required, but it appears you don't have it installed." msgstr "" #: template/wallet.html.j2:159 @@ -2688,7 +2750,7 @@ msgid "Install wallet" msgstr "Billetera " #: template/wallet.html.j2:177 -msgid "JavaScript is disabled, installation won't work." +msgid "JavaScript is disabled, installation won't work." msgstr "" #: template/wallet.html.j2:216 @@ -2713,6 +2775,14 @@ msgstr "" msgid "Wallets for other browsers will be provided in the near future." msgstr "" +#~ msgid "available upon request" +#~ msgstr "disponible bajo petición" + +#, fuzzy +#~| msgid "Taler News" +#~ msgid "Older News" +#~ msgstr "Noticias de Taler" + #, fuzzy #~| msgid "The Team" #~ msgid "Team" diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 4746f681..f6aa2998 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -2,22 +2,22 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-12-01 21:29+0100\n" +"POT-Creation-Date: 2019-12-10 14:34+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" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n!=1)\n" "Generated-By: Babel 2.3.4\n" -#: common/base.j2:5 +#: common/base.j2:5 common/news.j2:5 msgid "GNU Taler" msgstr "" -#: common/base.j2:6 +#: common/base.j2:6 common/news.j2:6 msgid "Taxable Anonymous Libre Electronic Reserves" msgstr "" @@ -33,19 +33,18 @@ msgstr "" msgid "Bibliography" msgstr "" -#: common/footer.j2.inc:27 template/bibliography.html.j2:23 -#: template/bibliography.html.j2:30 template/bibliography.html.j2:37 -#: template/bibliography.html.j2:43 template/developers.html.j2:66 +#: common/footer.j2.inc:28 template/bibliography.html.j2:34 +#: template/developers.html.j2:66 msgid "and" msgstr "" -#: common/footer.j2.inc:30 +#: common/footer.j2.inc:31 msgid "" "We are grateful for support and free hosting of this site by <a href='http://" "www.bfh.ch/'>BFH</a>" msgstr "" -#: common/footer.j2.inc:32 +#: common/footer.j2.inc:33 msgid "" "This page was created using <a href='https://www.gnu.org/'>Free Software</a> " "only." @@ -63,26 +62,28 @@ msgstr "" msgid "Docs" msgstr "" +#: common/navigation.j2.inc:24 news/index.html.j2:9 +msgid "News" +msgstr "" + +#: inc/news.macro.j2:22 +msgid "read more" +msgstr "" + #: template/architecture.html.j2:6 #, fuzzy #| msgid "Taler system overview" msgid "Taler System Architecture" msgstr "Vue d'ensemble de Taler" -#: template/bibliography.html.j2:4 +#: template/bibliography.html.j2:5 msgid "GNU Taler Bibliography" msgstr "" -#: template/bibliography.html.j2:9 template/bibliography.html.j2:16 -#: template/bibliography.html.j2:23 template/bibliography.html.j2:30 -#: template/bibliography.html.j2:37 template/bibliography.html.j2:43 +#: template/bibliography.html.j2:27 msgid "by" msgstr "" -#: template/bibliography.html.j2:44 -msgid "available upon request" -msgstr "" - #: template/contact.html.j2:6 msgid "Contact information" msgstr "" @@ -155,21 +156,16 @@ msgstr "" msgid "Copyright Assignment" msgstr "" -#: template/copyright.html.j2:9 +#: template/copyright.html.j2:8 msgid "" "Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/" -"copyright.pdf\">copyright assignment</a> to ensure that the" -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." +"copyright.pdf\">copyright assignment</a> to ensure that the <a href=" +"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex" +"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative " +"development</a> of the GNUnet and GNU Taler projects is satisfied." msgstr "" -#: template/copyright.html.j2:24 +#: template/copyright.html.j2:19 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 " @@ -178,7 +174,7 @@ msgid "" "stores that are hostile to free software)." msgstr "" -#: template/copyright.html.j2:34 +#: template/copyright.html.j2:29 msgid "" "Minor contributions (basically, anyone without Git access) do not require " "copyright assignment. Pseudonymous contributions are accepted, in this case " @@ -214,11 +210,11 @@ msgstr "Avec REST" msgid "" "Taler is designed to work on the Internet. To ensure that Taler payments can " "work with restrictive network setups, Taler uses a RESTful protocol over " -"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but " -"obviously merchants may choose to offer HTTPS for consistency and because it " -"generally is better for privacy compared to HTTP. Taler uses JSON to encode " -"structure data, making it easy to integrate Taler with existing Web " -"applications. Taler's protocol is documented in detail at" +"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, " +"but obviously merchants may choose to offer HTTPS for consistency and " +"because it generally is better for privacy compared to HTTP. Taler uses JSON " +"to encode structure data, making it easy to integrate Taler with existing " +"Web applications. Taler's protocol is documented in detail at" msgstr "" #: template/developers.html.j2:58 template/docs.html.j2:182 @@ -305,7 +301,7 @@ msgstr "" msgid "Technical Presentation" msgstr "" -#: template/developers.html.j2:149 template/investors.html.j2:93 +#: template/developers.html.j2:149 template/investors.html.j2:90 msgid "Download" msgstr "" @@ -336,14 +332,14 @@ msgstr "" #: 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 " -"are digital representations of the original currency from the transfer. It " -"is important to note that the exchange does not learn the "serial " -"numbers" of the coins created in this process, so it cannot tell later " -"which customer purchased what at which merchant. The use of Taler does not " -"change the currency or the total value of the funds (except for fees which " -"the exchange may charge for the service)." +"Once the exchange has received the wire transfer, it allows the customer'" +"s electronic wallet to <b>withdraw</b> electronic coins. The electronic " +"coins are digital representations of the original currency from the " +"transfer. It is important to note that the exchange does not learn the "" +"serial numbers" of the coins created in this process, so it cannot tell " +"later which customer purchased what at which merchant. The use of Taler does " +"not change the currency or the total value of the funds (except for fees " +"which the exchange may charge for the service)." msgstr "" #: template/developers.html.j2:208 @@ -441,7 +437,7 @@ msgid "Exchange" msgstr "" #: template/docs.html.j2:64 -msgid "Operator's manual for the GNU Taler exchange. Also available as" +msgid "Operator's manual for the GNU Taler exchange. Also available as" msgstr "" #: template/docs.html.j2:74 @@ -643,12 +639,13 @@ msgstr "" #: template/faq.html.j2:119 msgid "" -"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." +"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:130 @@ -758,7 +755,7 @@ msgstr "" 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." +"span> on the merchant's Website." msgstr "" #: template/features.html.j2:50 @@ -776,8 +773,8 @@ msgstr "" #: 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." +"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:79 @@ -799,8 +796,9 @@ msgstr "" msgid "" "To receive Taler payments, a merchant needs a bank account in the desired " "currency. We provide supporting software in various programming languages to " -"make the integration painless. The merchant's backend for Taler transaction " -"processing can run on the merchant's premises or be hosted by a third party." +"make the integration painless. The merchant's backend for Taler " +"transaction processing can run on the merchant's premises or be hosted " +"by a third party." msgstr "" #: template/features.html.j2:105 @@ -836,7 +834,7 @@ msgstr "Taxable" msgid "" "Taler does not introduce a new currency. Taler uses a digital wallet storing " "coins and payment service providers with escrow accounts in existing " -"currencies. Thus, Taler's cryptographic coins correspond to existing " +"currencies. Thus, Taler's cryptographic coins correspond to existing " "currencies, such as US Dollars, Euros or even Bitcoins." msgstr "" @@ -858,7 +856,7 @@ msgstr "Taxable" #: template/features.html.j2:172 msgid "" -"When using Taler, merchant's revenue is transparent for tax collection " +"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 "" @@ -975,7 +973,7 @@ msgstr "" msgid "" "a `coin` is dirty if its public key may be known to an entity other than the " "customer, thereby creating the danger of some entity being able to link " -"multiple transactions of coin's owner if the coin is not refreshed first" +"multiple transactions of coin's owner if the coin is not refreshed first" msgstr "" #: template/glossary.html.j2:61 @@ -984,7 +982,7 @@ msgstr "" #: template/glossary.html.j2:63 msgid "" -"Taler's payment service provider. Issues electronic `coins` during " +"Taler's payment service provider. Issues electronic `coins` during " "`withdrawal` and redeems them when they are `deposited` by merchants." msgstr "" @@ -1097,8 +1095,8 @@ msgstr "" #: template/glossary.html.j2:146 msgid "" "funds set aside for future use; either the balance of a customer at the " -"exchange ready for `withdrawal`, or the funds kept in the exchange's bank " -"account to cover obligations from coins in circulation" +"exchange ready for `withdrawal`, or the funds kept in the exchange's " +"bank account to cover obligations from coins in circulation" msgstr "" #: template/glossary.html.j2:152 @@ -1142,7 +1140,7 @@ msgstr "" #: template/glossary.html.j2:178 msgid "" -"users can share ownership of a `coin` by sharing access to the coin's " +"users can share ownership of a `coin` by sharing access to the coin's " "private key, thereby allowing all co-owners to spend the coin at any time." msgstr "" @@ -1278,11 +1276,11 @@ msgstr "" #: template/governments.html.j2:58 msgid "" -"Taler's payments are cryptographically secured. Thus, customers, merchants " -"and the Taler payment service provider (the exchange) can mathematically " -"demonstrate their lawful behavior in court in case of disputes. Financial " -"damages are strictly limited, improving economic security for individuals, " -"merchants, the exchange and the state." +"Taler's payments are cryptographically secured. Thus, customers, " +"merchants and the Taler payment service provider (the exchange) can " +"mathematically demonstrate their lawful behavior in court in case of " +"disputes. Financial damages are strictly limited, improving economic " +"security for individuals, merchants, the exchange and the state." msgstr "" #: template/governments.html.j2:70 @@ -1389,8 +1387,8 @@ msgstr "" #: template/governments.html.j2:170 msgid "" "The amounts of digital coins legitimately withdrawn by customers from the " -"exchange, the value of non-redeemed digital coins in customer's wallets, the " -"value and corresponding wire details of deposit operations performed by " +"exchange, the value of non-redeemed digital coins in customer's wallets, " +"the value and corresponding wire details of deposit operations performed by " "merchants with the exchange, and the income of the exchange from transaction " "fees." msgstr "" @@ -1413,12 +1411,12 @@ msgstr "Vue d'ensemble de Taler" #: template/gsoc-codeless.html.j2:14 msgid "" -"Codeless payment is a component that sits between the seller's frontend and " -"the GNU Taler merchant backend. This component has a web interface, where " -"payment buttons are configured. Registered merchants can manage their " -"inventory and simultaneously create a 'Buy Now' button for a specific " -"product. This code can be directly copy pasted on the seller's frontend and " -"can be used for 'Pay with Taler'." +"Codeless payment is a component that sits between the seller's frontend " +"and the GNU Taler merchant backend. This component has a web interface, " +"where payment buttons are configured. Registered merchants can manage their " +"inventory and simultaneously create a 'Buy Now' button for a " +"specific product. This code can be directly copy pasted on the seller's " +"frontend and can be used for 'Pay with Taler'." msgstr "" #: template/gsoc-codeless.html.j2:29 @@ -1577,37 +1575,37 @@ msgstr "" msgid "Shipment Tracking" msgstr "" -#: template/index.html.j2:23 +#: template/index.html.j2:25 msgid "" "We provide a payment system that makes <span class='tlr'>privacy-friendly</" "span> online transactions <span class='tlr'>fast and easy</span>." msgstr "" -#: template/index.html.j2:27 +#: template/index.html.j2:29 msgid "Payments without registration" msgstr "" -#: template/index.html.j2:31 +#: template/index.html.j2:33 msgid "Data protection by default" msgstr "" -#: template/index.html.j2:35 +#: template/index.html.j2:37 msgid "Fraud eliminated by design" msgstr "" -#: template/index.html.j2:39 +#: template/index.html.j2:41 msgid "Not a new currency!" msgstr "" -#: template/index.html.j2:43 +#: template/index.html.j2:45 msgid "Empowers communities to run their own payment infrastructure" msgstr "" -#: template/index.html.j2:46 +#: template/index.html.j2:48 msgid "Try Demo!" msgstr "" -#: template/index.html.j2:47 +#: template/index.html.j2:49 msgid "Read Docs" msgstr "" @@ -1634,35 +1632,33 @@ msgid "" msgstr "" #: template/investors.html.j2:37 -msgid "We are currently supported by" -msgstr "" - -#: template/investors.html.j2:41 msgid "" +"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, " "the French national institute for research in informatics and automation, " -"and the" +"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom " +"Foundation</a>." msgstr "" -#: template/investors.html.j2:50 +#: template/investors.html.j2:47 msgid "The Technology" msgstr "" -#: template/investors.html.j2:53 +#: template/investors.html.j2:50 msgid "" "All transactions in Taler are secured using <a href=\"bibliography.html" "\">modern cryptography</a> and trust in all parties is minimized. Financial " -"damage is bounded (for customers, merchants and the exchange) even in the " -"case that systems are compromised and private keys are stolen. Databases can " -"be audited for consistency, resulting in either the detection of compromised " -"systems or the demonstration that participants were honest. Actual " -"transaction costs are fractions of a cent." +"damage is bounded (for customers, merchants and the exchange) even " +"in the case that systems are compromised and private keys are stolen. " +"Databases can be audited for consistency, resulting in either the detection " +"of compromised systems or the demonstration that participants were honest. " +"Actual transaction costs are fractions of a cent." msgstr "" -#: template/investors.html.j2:66 +#: template/investors.html.j2:63 msgid "The Business" msgstr "" -#: template/investors.html.j2:68 +#: template/investors.html.j2:65 msgid "" "The scalable business model for Taler is the operation of the payment " "service provider, which converts money from traditional payment systems " @@ -1673,22 +1669,22 @@ msgid "" "to facilitate the transactions." msgstr "" -#: template/investors.html.j2:87 +#: template/investors.html.j2:84 msgid "The Business Case" msgstr "" -#: template/investors.html.j2:97 +#: template/investors.html.j2:94 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:120 +#: template/investors.html.j2:117 msgid "Running a Taler payment service operator" msgstr "" -#: template/investors.html.j2:123 +#: template/investors.html.j2:120 msgid "" "The payment service operator runs the <em>Taler exchange</em>. The exchange " "charges <b>transaction fees</b> to customers or merchants. Its operational " @@ -1696,29 +1692,29 @@ msgid "" "of the computing infrastructure." msgstr "" -#: template/investors.html.j2:133 +#: template/investors.html.j2:130 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." msgstr "" -#: template/investors.html.j2:134 +#: template/investors.html.j2:131 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." msgstr "" -#: template/investors.html.j2:135 +#: template/investors.html.j2:132 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." msgstr "" -#: template/investors.html.j2:136 +#: template/investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "" -#: template/investors.html.j2:137 +#: template/investors.html.j2:134 msgid "Partnership with free software community enables rapid deployment." msgstr "" @@ -1775,7 +1771,7 @@ msgstr "" #: template/merchants.html.j2:78 msgid "" "Taler is uses efficient cryptographic constructions with low bandwidth and " -"storage requirements. Combined with Taler's strong security which makes " +"storage requirements. Combined with Taler's strong security which makes " "fraud impossible, Taler payment service providers can operate with very low " "overhead and thus offer low transaction fees." msgstr "" @@ -1797,7 +1793,7 @@ msgstr "Ethique" #: template/merchants.html.j2:101 msgid "" -"Taler prevents tax evasion and money laundering. Taler's protocols are " +"Taler prevents tax evasion and money laundering. Taler's protocols are " "efficient and do not use wasteful proof-of-work calculations. Taler " "encourages transparency by providing an open standard and free software " "reference implementations." @@ -1831,16 +1827,16 @@ msgstr "" #: template/merchants.html.j2:144 msgid "" "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made " -"by the merchant to customers. For this, the merchant's frontend needs to " -"give the customer's order in a JSON format to the backend." +"by the merchant to customers. For this, the merchant's frontend needs to " +"give the customer's order in a JSON format to the backend." msgstr "" #: template/merchants.html.j2:153 msgid "" "The backend <b>validates</b> payments received from the wallet and " "<b>executes</b> them with the Taler payment service provider (the exchange). " -"For this, the merchant's frontend must pass the payment request through to " -"the Taler backend and check the HTTP status code that is returned." +"For this, the merchant's frontend must pass the payment request through " +"to the Taler backend and check the HTTP status code that is returned." msgstr "" #: template/merchants.html.j2:164 @@ -1854,22 +1850,6 @@ msgstr "" msgid "customer perspective" msgstr "" -#: template/news.html.j2:6 -msgid "News" -msgstr "" - -#: template/news.html.j2:16 -msgid "More news" -msgstr "" - -#: template/old-news.html.j2:6 -msgid "Older News" -msgstr "" - -#: template/old-news.html.j2:9 -msgid "This page documents the GNU Taler history." -msgstr "" - #: template/press.html.j2:4 msgid "GNU Taler in the Press" msgstr "" @@ -2081,7 +2061,7 @@ msgid "demo" msgstr "" #: template/wallet.html.j2:119 -msgid "You don't have a wallet installed yet." +msgid "You don't have a wallet installed yet." msgstr "" #: template/wallet.html.j2:128 @@ -2099,7 +2079,7 @@ msgid "or" msgstr "" #: template/wallet.html.j2:149 -msgid "is required, but it appears you don't have it installed." +msgid "is required, but it appears you don't have it installed." msgstr "" #: template/wallet.html.j2:159 @@ -2115,7 +2095,7 @@ msgid "Install wallet" msgstr "" #: template/wallet.html.j2:177 -msgid "JavaScript is disabled, installation won't work." +msgid "JavaScript is disabled, installation won't work." msgstr "" #: template/wallet.html.j2:216 diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index a4d17740..36d022fc 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po @@ -2,22 +2,22 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-12-01 21:29+0100\n" +"POT-Creation-Date: 2019-12-10 14:34+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" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n!=1)\n" "Generated-By: Babel 2.3.4\n" -#: common/base.j2:5 +#: common/base.j2:5 common/news.j2:5 msgid "GNU Taler" msgstr "GNU Taler" -#: common/base.j2:6 +#: common/base.j2:6 common/news.j2:6 msgid "Taxable Anonymous Libre Electronic Reserves" msgstr "Tassabili Anonime Libere Elettroniche Riserve" @@ -35,19 +35,18 @@ msgstr "FAQ" msgid "Bibliography" msgstr "Bibliografia" -#: common/footer.j2.inc:27 template/bibliography.html.j2:23 -#: template/bibliography.html.j2:30 template/bibliography.html.j2:37 -#: template/bibliography.html.j2:43 template/developers.html.j2:66 +#: common/footer.j2.inc:28 template/bibliography.html.j2:34 +#: template/developers.html.j2:66 msgid "and" msgstr "e" -#: common/footer.j2.inc:30 +#: common/footer.j2.inc:31 msgid "" "We are grateful for support and free hosting of this site by <a href='http://" "www.bfh.ch/'>BFH</a>" msgstr "" -#: common/footer.j2.inc:32 +#: common/footer.j2.inc:33 msgid "" "This page was created using <a href='https://www.gnu.org/'>Free Software</a> " "only." @@ -67,24 +66,26 @@ msgstr "" msgid "Docs" msgstr "" +#: common/navigation.j2.inc:24 news/index.html.j2:9 +msgid "News" +msgstr "" + +#: inc/news.macro.j2:22 +msgid "read more" +msgstr "" + #: template/architecture.html.j2:6 msgid "Taler System Architecture" msgstr "Architettura Taler" -#: template/bibliography.html.j2:4 +#: template/bibliography.html.j2:5 msgid "GNU Taler Bibliography" msgstr "Bibliografia GNU Taler" -#: template/bibliography.html.j2:9 template/bibliography.html.j2:16 -#: template/bibliography.html.j2:23 template/bibliography.html.j2:30 -#: template/bibliography.html.j2:37 template/bibliography.html.j2:43 +#: template/bibliography.html.j2:27 msgid "by" msgstr "di" -#: template/bibliography.html.j2:44 -msgid "available upon request" -msgstr "disponibile su richiesta" - #: template/contact.html.j2:6 msgid "Contact information" msgstr "Contatti" @@ -170,21 +171,16 @@ msgstr "" msgid "Copyright Assignment" msgstr "Diritti d'autore" -#: template/copyright.html.j2:9 +#: template/copyright.html.j2:8 msgid "" "Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/" -"copyright.pdf\">copyright assignment</a> to ensure that the" +"copyright.pdf\">copyright assignment</a> to ensure that the <a href=" +"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex" +"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative " +"development</a> of the GNUnet and GNU Taler projects is satisfied." msgstr "" -#: 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:24 +#: template/copyright.html.j2:19 #, fuzzy #| msgid "" #| "<p>The agreements ensure that the code will continue to be made available " @@ -205,7 +201,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:34 +#: template/copyright.html.j2:29 #, fuzzy #| msgid "" #| "<p>Minor contributions (basically, anyone without Git access) do not " @@ -271,11 +267,11 @@ msgstr "RESTful" msgid "" "Taler is designed to work on the Internet. To ensure that Taler payments can " "work with restrictive network setups, Taler uses a RESTful protocol over " -"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but " -"obviously merchants may choose to offer HTTPS for consistency and because it " -"generally is better for privacy compared to HTTP. Taler uses JSON to encode " -"structure data, making it easy to integrate Taler with existing Web " -"applications. Taler's protocol is documented in detail at" +"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, " +"but obviously merchants may choose to offer HTTPS for consistency and " +"because it generally is better for privacy compared to HTTP. Taler uses JSON " +"to encode structure data, making it easy to integrate Taler with existing " +"Web applications. Taler's protocol is documented in detail at" msgstr "" "Taler è progettato per funzionare su Internet. Per garantire che i pagamenti " "con Taler funzionino con configurazioni di rete restrittive, Taler utilizza " @@ -418,7 +414,7 @@ msgstr "" msgid "Technical Presentation" msgstr "" -#: template/developers.html.j2:149 template/investors.html.j2:93 +#: template/developers.html.j2:149 template/investors.html.j2:90 msgid "Download" msgstr "Scarica" @@ -455,15 +451,26 @@ msgstr "" "Nella terminologia di Taler, il cliente crea una riserva al cambio." #: 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 " -"are digital representations of the original currency from the transfer. It " -"is important to note that the exchange does not learn the "serial " -"numbers" of the coins created in this process, so it cannot tell later " -"which customer purchased what at which merchant. The use of Taler does not " -"change the currency or the total value of the funds (except for fees which " -"the exchange may charge for the service)." +#, fuzzy +#| 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 are digital representations of the original currency " +#| "from the transfer. It is important to note that the exchange does not " +#| "learn the "serial numbers" of the coins created in this " +#| "process, so it cannot tell later which customer purchased what at which " +#| "merchant. The use of Taler does not change the currency or the total " +#| "value of the funds (except for fees which the exchange may charge for the " +#| "service)." +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 are digital representations of the original currency from the " +"transfer. It is important to note that the exchange does not learn the "" +"serial numbers" of the coins created in this process, so it cannot tell " +"later which customer purchased what at which merchant. The use of Taler does " +"not change the currency or the total value of the funds (except for fees " +"which the exchange may charge for the service)." msgstr "" "Una volta che il cambio ha ricevuto il bonifico bancario, consentirà al " "portafoglio elettronico del cliente di <b>prelevare</b> le monete " @@ -614,7 +621,7 @@ msgid "Exchange" msgstr "cambio" #: template/docs.html.j2:64 -msgid "Operator's manual for the GNU Taler exchange. Also available as" +msgid "Operator's manual for the GNU Taler exchange. Also available as" msgstr "" #: template/docs.html.j2:74 @@ -904,12 +911,13 @@ msgstr "" #: template/faq.html.j2:119 msgid "" -"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." +"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:130 @@ -1021,7 +1029,7 @@ msgstr "" 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." +"span> on the merchant's Website." msgstr "" #: template/features.html.j2:50 @@ -1047,8 +1055,8 @@ msgstr "Pagare con Taler" #| "or identity theft.</p>" msgid "" "To pay with Taler, customers install an electronic wallet on their device. " -"Before the first payment, the desired currency must be added to the wallet's " -"balance by some other means of payment." +"Before the first payment, the desired currency must be added to the " +"wallet's balance by some other means of payment." msgstr "" "<p>Per pagare con Taler, i clienti installano un portafoglio elettronico sul " "proprio dispositivo. Prima del primo pagamento, il saldo del portafoglio " @@ -1099,8 +1107,9 @@ msgstr "Ricevere pagamenti con Taler" msgid "" "To receive Taler payments, a merchant needs a bank account in the desired " "currency. We provide supporting software in various programming languages to " -"make the integration painless. The merchant's backend for Taler transaction " -"processing can run on the merchant's premises or be hosted by a third party." +"make the integration painless. The merchant's backend for Taler " +"transaction processing can run on the merchant's premises or be hosted " +"by a third party." msgstr "" "<p>Per ricevere i pagamenti di Taler, un commerciante ha bisogno di un conto " "bancario nella valuta desiderata. Forniamo software di supporto in vari " @@ -1137,10 +1146,16 @@ msgid "Stable" msgstr "Stabile" #: template/features.html.j2:143 +#, fuzzy +#| msgid "" +#| "Taler does not introduce a new currency. Taler uses a digital wallet " +#| "storing coins and payment service providers with escrow accounts in " +#| "existing currencies. Thus, Taler's cryptographic coins correspond to " +#| "existing currencies, such as US Dollars, Euros or even Bitcoins." msgid "" "Taler does not introduce a new currency. Taler uses a digital wallet storing " "coins and payment service providers with escrow accounts in existing " -"currencies. Thus, Taler's cryptographic coins correspond to existing " +"currencies. Thus, Taler's cryptographic coins correspond to existing " "currencies, such as US Dollars, Euros or even Bitcoins." msgstr "" "Taler non introduce una nuova valuta. Taler utilizza un portafoglio digitale " @@ -1170,8 +1185,13 @@ msgid "Taxable" msgstr "Tassabile" #: template/features.html.j2:172 +#, fuzzy +#| 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." msgid "" -"When using Taler, merchant's revenue is transparent for tax collection " +"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 "" @@ -1317,10 +1337,16 @@ msgid "dirty" msgstr "sporco" #: template/glossary.html.j2:54 +#, fuzzy +#| msgid "" +#| "a `coin` is dirty if its public key may be known to an entity other than " +#| "the customer, thereby creating the danger of some entity being able to " +#| "link multiple transactions of coin's owner if the coin is not refreshed " +#| "first" msgid "" "a `coin` is dirty if its public key may be known to an entity other than the " "customer, thereby creating the danger of some entity being able to link " -"multiple transactions of coin's owner if the coin is not refreshed first" +"multiple transactions of coin's owner if the coin is not refreshed first" msgstr "" "la 'moneta' è sporca se la sua chiave pubblica può essere conosciuta da " "un'entità diversa dal cliente, creando così il pericolo che, se la moneta " @@ -1337,7 +1363,7 @@ msgstr "cambio" #| "Taler's payment service provider. Issues eletronic `coins` during " #| "`withdrawal` and redeems them when they are `deposited` by merchants." msgid "" -"Taler's payment service provider. Issues electronic `coins` during " +"Taler's payment service provider. Issues electronic `coins` during " "`withdrawal` and redeems them when they are `deposited` by merchants." msgstr "" "il fornitore dei servizi di pagamento di Taler. Emette le 'monete' " @@ -1467,10 +1493,15 @@ msgid "reserve" msgstr "riserva" #: template/glossary.html.j2:146 +#, fuzzy +#| msgid "" +#| "funds set aside for future use; either the balance of a customer at the " +#| "exchange ready for `withdrawal`, or the funds kept in the exchange's bank " +#| "account to cover obligations from coins in circulation" msgid "" "funds set aside for future use; either the balance of a customer at the " -"exchange ready for `withdrawal`, or the funds kept in the exchange's bank " -"account to cover obligations from coins in circulation" +"exchange ready for `withdrawal`, or the funds kept in the exchange's " +"bank account to cover obligations from coins in circulation" msgstr "" "fondi destinati all'uso futuro; sia il saldo di un cliente al cambio pronto " "per il 'prelievo', sia i fondi conservati sul conto bancario del cambio per " @@ -1521,8 +1552,12 @@ msgid "sharing" msgstr "condivisione" #: template/glossary.html.j2:178 +#, fuzzy +#| msgid "" +#| "users can share ownership of a `coin` by sharing access to the coin's " +#| "private key, thereby allowing all co-owners to spend the coin at any time." msgid "" -"users can share ownership of a `coin` by sharing access to the coin's " +"users can share ownership of a `coin` by sharing access to the coin's " "private key, thereby allowing all co-owners to spend the coin at any time." msgstr "" "gli utenti possono condividere la proprietà della 'moneta' condividendo " @@ -1693,12 +1728,19 @@ msgstr "" "sincronizzazione dei portafogli tra più dispositivi. " #: template/governments.html.j2:58 -msgid "" -"Taler's payments are cryptographically secured. Thus, customers, merchants " -"and the Taler payment service provider (the exchange) can mathematically " -"demonstrate their lawful behavior in court in case of disputes. Financial " -"damages are strictly limited, improving economic security for individuals, " -"merchants, the exchange and the state." +#, fuzzy +#| msgid "" +#| "Taler's payments are cryptographically secured. Thus, customers, " +#| "merchants and the Taler payment service provider (the exchange) can " +#| "mathematically demonstrate their lawful behavior in court in case of " +#| "disputes. Financial damages are strictly limited, improving economic " +#| "security for individuals, merchants, the exchange and the state." +msgid "" +"Taler's payments are cryptographically secured. Thus, customers, " +"merchants and the Taler payment service provider (the exchange) can " +"mathematically demonstrate their lawful behavior in court in case of " +"disputes. Financial damages are strictly limited, improving economic " +"security for individuals, merchants, the exchange and the state." msgstr "" "I pagamenti di Taler sono protetti da crittografia. Pertanto, i clienti, i " "commercianti e il provider di servici di pagamento di Taler (il cambio) " @@ -1843,10 +1885,17 @@ msgstr "" "l'identità del cliente. " #: template/governments.html.j2:170 +#, fuzzy +#| msgid "" +#| "The amounts of digital coins legitimately withdrawn by customers from the " +#| "exchange, the value of non-redeemed digital coins in customer's wallets, " +#| "the value and corresponding wire details of deposit operations performed " +#| "by merchants with the exchange, and the income of the exchange from " +#| "transaction fees." msgid "" "The amounts of digital coins legitimately withdrawn by customers from the " -"exchange, the value of non-redeemed digital coins in customer's wallets, the " -"value and corresponding wire details of deposit operations performed by " +"exchange, the value of non-redeemed digital coins in customer's wallets, " +"the value and corresponding wire details of deposit operations performed by " "merchants with the exchange, and the income of the exchange from transaction " "fees." msgstr "" @@ -1874,12 +1923,12 @@ msgstr "Panoramica del sistema" #: template/gsoc-codeless.html.j2:14 msgid "" -"Codeless payment is a component that sits between the seller's frontend and " -"the GNU Taler merchant backend. This component has a web interface, where " -"payment buttons are configured. Registered merchants can manage their " -"inventory and simultaneously create a 'Buy Now' button for a specific " -"product. This code can be directly copy pasted on the seller's frontend and " -"can be used for 'Pay with Taler'." +"Codeless payment is a component that sits between the seller's frontend " +"and the GNU Taler merchant backend. This component has a web interface, " +"where payment buttons are configured. Registered merchants can manage their " +"inventory and simultaneously create a 'Buy Now' button for a " +"specific product. This code can be directly copy pasted on the seller's " +"frontend and can be used for 'Pay with Taler'." msgstr "" #: template/gsoc-codeless.html.j2:29 @@ -2038,37 +2087,37 @@ msgstr "" msgid "Shipment Tracking" msgstr "" -#: template/index.html.j2:23 +#: template/index.html.j2:25 msgid "" "We provide a payment system that makes <span class='tlr'>privacy-friendly</" "span> online transactions <span class='tlr'>fast and easy</span>." msgstr "" -#: template/index.html.j2:27 +#: template/index.html.j2:29 msgid "Payments without registration" msgstr "" -#: template/index.html.j2:31 +#: template/index.html.j2:33 msgid "Data protection by default" msgstr "" -#: template/index.html.j2:35 +#: template/index.html.j2:37 msgid "Fraud eliminated by design" msgstr "" -#: template/index.html.j2:39 +#: template/index.html.j2:41 msgid "Not a new currency!" msgstr "" -#: template/index.html.j2:43 +#: template/index.html.j2:45 msgid "Empowers communities to run their own payment infrastructure" msgstr "" -#: template/index.html.j2:46 +#: template/index.html.j2:48 msgid "Try Demo!" msgstr "" -#: template/index.html.j2:47 +#: template/index.html.j2:49 msgid "Read Docs" msgstr "" @@ -2109,28 +2158,35 @@ msgstr "" "visione al mondo. " #: template/investors.html.j2:37 -msgid "We are currently supported by" -msgstr "" - -#: template/investors.html.j2:41 msgid "" +"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, " "the French national institute for research in informatics and automation, " -"and the" +"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom " +"Foundation</a>." msgstr "" -#: template/investors.html.j2:50 +#: template/investors.html.j2:47 msgid "The Technology" msgstr "La Tecnologia" -#: template/investors.html.j2:53 +#: template/investors.html.j2:50 +#, fuzzy +#| msgid "" +#| "All transactions in Taler are secured using <a href=\"bibliography.html" +#| "\">modern cryptography</a> and trust in all parties is minimized. " +#| "Financial damage is bounded (for customers, merchants and the exchange) " +#| "even in the case that systems are compromised and private keys are " +#| "stolen. Databases can be audited for consistency, resulting in either the " +#| "detection of compromised systems or the demonstration that participants " +#| "were honest. Actual transaction costs are fractions of a cent." msgid "" "All transactions in Taler are secured using <a href=\"bibliography.html" "\">modern cryptography</a> and trust in all parties is minimized. Financial " -"damage is bounded (for customers, merchants and the exchange) even in the " -"case that systems are compromised and private keys are stolen. Databases can " -"be audited for consistency, resulting in either the detection of compromised " -"systems or the demonstration that participants were honest. Actual " -"transaction costs are fractions of a cent." +"damage is bounded (for customers, merchants and the exchange) even " +"in the case that systems are compromised and private keys are stolen. " +"Databases can be audited for consistency, resulting in either the detection " +"of compromised systems or the demonstration that participants were honest. " +"Actual transaction costs are fractions of a cent." msgstr "" "Tutte le transazioni in Taler sono garantite utilizzando la <a href=" "\"bibliography.html\">crittografia moderna</a> e gli accordi fiduciari tra " @@ -2141,11 +2197,11 @@ msgstr "" "dimostrano che i partecipanti sono stati onesti. I costi effettivi di " "transazione sono frazioni di un centesimo. " -#: template/investors.html.j2:66 +#: template/investors.html.j2:63 msgid "The Business" msgstr "Il Business" -#: template/investors.html.j2:68 +#: template/investors.html.j2:65 msgid "" "The scalable business model for Taler is the operation of the payment " "service provider, which converts money from traditional payment systems " @@ -2163,11 +2219,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:87 +#: template/investors.html.j2:84 msgid "The Business Case" msgstr "Il Caso Aziendale" -#: template/investors.html.j2:97 +#: template/investors.html.j2:94 msgid "" "Our <a href=\"financial-news.html\">financial news</a> page explains in " "English how Taler can impact current developments in the global payment " @@ -2177,11 +2233,11 @@ msgstr "" "chiarisce in inglese come Taler può influenzare gli sviluppi attuali nel " "mercato dei pagamenti globali. " -#: template/investors.html.j2:120 +#: template/investors.html.j2:117 msgid "Running a Taler payment service operator" msgstr "Funzionamento di un operatore dei servizi di pagamento Taler " -#: template/investors.html.j2:123 +#: template/investors.html.j2:120 msgid "" "The payment service operator runs the <em>Taler exchange</em>. The exchange " "charges <b>transaction fees</b> to customers or merchants. Its operational " @@ -2194,7 +2250,7 @@ msgstr "" "bonifici con il sistema bancario e al funzionamento dell'infrastruttura di " "calcolo. " -#: template/investors.html.j2:133 +#: template/investors.html.j2:130 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." @@ -2202,7 +2258,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:134 +#: template/investors.html.j2:131 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." @@ -2211,7 +2267,7 @@ msgstr "" "di denaro più grandi ai commercianti per ridurre al minimo i costi dei " "bonifici bancari." -#: template/investors.html.j2:135 +#: template/investors.html.j2:132 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." @@ -2220,11 +2276,11 @@ msgstr "" "operazione costosa (prelievo, deposito, aggiornamento, rimborso o bonifici " "bancari aggregati. " -#: template/investors.html.j2:136 +#: template/investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "La partnership con le banche instaura fiducia nei consumatori. " -#: template/investors.html.j2:137 +#: template/investors.html.j2:134 msgid "Partnership with free software community enables rapid deployment." msgstr "" "La partnership con la comunità del software libero consente una rapida " @@ -2303,9 +2359,15 @@ msgid "Cheap" msgstr "Conveniente" #: template/merchants.html.j2:78 +#, fuzzy +#| msgid "" +#| "Taler is uses efficient cryptographic constructions with low bandwidth " +#| "and storage requirements. Combined with Taler's strong security which " +#| "makes fraud impossible, Taler payment service providers can operate with " +#| "very low overhead and thus offer low transaction fees." msgid "" "Taler is uses efficient cryptographic constructions with low bandwidth and " -"storage requirements. Combined with Taler's strong security which makes " +"storage requirements. Combined with Taler's strong security which makes " "fraud impossible, Taler payment service providers can operate with very low " "overhead and thus offer low transaction fees." msgstr "" @@ -2339,8 +2401,14 @@ msgid "Ethical" msgstr "Etico" #: template/merchants.html.j2:101 +#, fuzzy +#| msgid "" +#| "Taler prevents tax evasion and money laundering. Taler's protocols are " +#| "efficient and do not use wasteful proof-of-work calculations. Taler " +#| "encourages transparency by providing an open standard and free software " +#| "reference implementations." msgid "" -"Taler prevents tax evasion and money laundering. Taler's protocols are " +"Taler prevents tax evasion and money laundering. Taler's protocols are " "efficient and do not use wasteful proof-of-work calculations. Taler " "encourages transparency by providing an open standard and free software " "reference implementations." @@ -2376,21 +2444,33 @@ msgid "Merchants process payments using the Taler backend:" msgstr "I commercianti effettuano pagamenti utilizzando il backend di Taler: " #: template/merchants.html.j2:144 +#, fuzzy +#| msgid "" +#| "The backend <b>signs</b> and <b>stores</b> the complete terms of offers " +#| "made by the merchant to customers. For this, the merchant's frontend " +#| "needs to give the customer's order in a JSON format to the backend." msgid "" "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made " -"by the merchant to customers. For this, the merchant's frontend needs to " -"give the customer's order in a JSON format to the backend." +"by the merchant to customers. For this, the merchant's frontend needs to " +"give the customer's order in a JSON format to the backend." msgstr "" "Il backend <b>sottoscrive</b> ed <b>archivia</b> le condizioni finali delle " "offerte fatte dal commerciante ai clienti. Per questo, il frontend del " "commerciante deve dare l'ordine del cliente al backend in un formato JSON. " #: template/merchants.html.j2:153 +#, fuzzy +#| msgid "" +#| "The backend <b>validates</b> payments received from the wallet and " +#| "<b>executes</b> them with the Taler payment service provider (the " +#| "exchange). For this, the merchant's frontend must pass the payment " +#| "request through to the Taler backend and check the HTTP status code that " +#| "is returned." msgid "" "The backend <b>validates</b> payments received from the wallet and " "<b>executes</b> them with the Taler payment service provider (the exchange). " -"For this, the merchant's frontend must pass the payment request through to " -"the Taler backend and check the HTTP status code that is returned." +"For this, the merchant's frontend must pass the payment request through " +"to the Taler backend and check the HTTP status code that is returned." msgstr "" "Il backend <b>convalida</b> i pagamenti ricevuti dal portafoglio e li " "<b>esegue</b> con il provider dei servizi di pagamento di Taler (il cambio). " @@ -2412,22 +2492,6 @@ msgstr "" msgid "customer perspective" msgstr "" -#: template/news.html.j2:6 -msgid "News" -msgstr "" - -#: template/news.html.j2:16 -msgid "More news" -msgstr "Altre notizie" - -#: template/old-news.html.j2:6 -msgid "Older News" -msgstr "Notizie precedenti" - -#: template/old-news.html.j2:9 -msgid "This page documents the GNU Taler history." -msgstr "Questa pagina documenta la storia di GNU Taler. " - #: template/press.html.j2:4 msgid "GNU Taler in the Press" msgstr "GNU Taler nella Stampa" @@ -2647,7 +2711,7 @@ msgid "demo" msgstr "" #: template/wallet.html.j2:119 -msgid "You don't have a wallet installed yet." +msgid "You don't have a wallet installed yet." msgstr "" #: template/wallet.html.j2:128 @@ -2665,7 +2729,7 @@ msgid "or" msgstr "" #: template/wallet.html.j2:149 -msgid "is required, but it appears you don't have it installed." +msgid "is required, but it appears you don't have it installed." msgstr "" #: template/wallet.html.j2:159 @@ -2685,7 +2749,7 @@ msgid "Install wallet" msgstr "portafoglio" #: template/wallet.html.j2:177 -msgid "JavaScript is disabled, installation won't work." +msgid "JavaScript is disabled, installation won't work." msgstr "" #: template/wallet.html.j2:216 @@ -2710,6 +2774,18 @@ msgstr "" msgid "Wallets for other browsers will be provided in the near future." msgstr "" +#~ msgid "available upon request" +#~ msgstr "disponibile su richiesta" + +#~ msgid "More news" +#~ msgstr "Altre notizie" + +#~ msgid "Older News" +#~ msgstr "Notizie precedenti" + +#~ msgid "This page documents the GNU Taler history." +#~ msgstr "Questa pagina documenta la storia di GNU Taler. " + #, fuzzy #~| msgid "The Team" #~ msgid "Team" diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po index eebdf7a2..5e5ab945 100644 --- a/locale/pt/LC_MESSAGES/messages.po +++ b/locale/pt/LC_MESSAGES/messages.po @@ -6,23 +6,23 @@ msgid "" msgstr "" "Project-Id-Version: GNU taler master\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-12-01 21:29+0100\n" +"POT-Creation-Date: 2019-12-10 14:34+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" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Virtaal 1.0.0-beta1\n" "Generated-By: Babel 2.5.3\n" -#: common/base.j2:5 +#: common/base.j2:5 common/news.j2:5 msgid "GNU Taler" msgstr "GNU Taler" -#: common/base.j2:6 +#: common/base.j2:6 common/news.j2:6 msgid "Taxable Anonymous Libre Electronic Reserves" msgstr "Reservas eletrônicas livres, anônimas, tributáveis" @@ -38,19 +38,18 @@ msgstr "FAQ" msgid "Bibliography" msgstr "Bibliografia" -#: common/footer.j2.inc:27 template/bibliography.html.j2:23 -#: template/bibliography.html.j2:30 template/bibliography.html.j2:37 -#: template/bibliography.html.j2:43 template/developers.html.j2:66 +#: common/footer.j2.inc:28 template/bibliography.html.j2:34 +#: template/developers.html.j2:66 msgid "and" msgstr "e" -#: common/footer.j2.inc:30 +#: common/footer.j2.inc:31 msgid "" "We are grateful for support and free hosting of this site by <a href='http://" "www.bfh.ch/'>BFH</a>" msgstr "" -#: common/footer.j2.inc:32 +#: common/footer.j2.inc:33 msgid "" "This page was created using <a href='https://www.gnu.org/'>Free Software</a> " "only." @@ -70,24 +69,26 @@ msgstr "" msgid "Docs" msgstr "" +#: common/navigation.j2.inc:24 news/index.html.j2:9 +msgid "News" +msgstr "" + +#: inc/news.macro.j2:22 +msgid "read more" +msgstr "" + #: template/architecture.html.j2:6 msgid "Taler System Architecture" msgstr "Arquitetura do sistema Taler" -#: template/bibliography.html.j2:4 +#: template/bibliography.html.j2:5 msgid "GNU Taler Bibliography" msgstr "Bibliografia do GNU Taler" -#: template/bibliography.html.j2:9 template/bibliography.html.j2:16 -#: template/bibliography.html.j2:23 template/bibliography.html.j2:30 -#: template/bibliography.html.j2:37 template/bibliography.html.j2:43 +#: template/bibliography.html.j2:27 msgid "by" msgstr "por" -#: template/bibliography.html.j2:44 -msgid "available upon request" -msgstr "disponível mediante solicitação" - #: template/contact.html.j2:6 msgid "Contact information" msgstr "Informações de contato" @@ -173,21 +174,16 @@ msgstr "" msgid "Copyright Assignment" msgstr "Atribuição de direitos autorais" -#: template/copyright.html.j2:9 +#: template/copyright.html.j2:8 msgid "" "Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/" -"copyright.pdf\">copyright assignment</a> to ensure that the" +"copyright.pdf\">copyright assignment</a> to ensure that the <a href=" +"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex" +"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative " +"development</a> of the GNUnet and GNU Taler projects is satisfied." msgstr "" -#: 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:24 +#: template/copyright.html.j2:19 #, fuzzy #| msgid "" #| "<p>The agreements ensure that the code will continue to be made available " @@ -209,7 +205,7 @@ msgstr "" "distribuir através de lojas de aplicativos (“App stores”) que sejam hostis " "ao software livre).</p>" -#: template/copyright.html.j2:34 +#: template/copyright.html.j2:29 #, fuzzy #| msgid "" #| "<p>Minor contributions (basically, anyone without Git access) do not " @@ -273,11 +269,11 @@ msgstr "RESTful" msgid "" "Taler is designed to work on the Internet. To ensure that Taler payments can " "work with restrictive network setups, Taler uses a RESTful protocol over " -"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but " -"obviously merchants may choose to offer HTTPS for consistency and because it " -"generally is better for privacy compared to HTTP. Taler uses JSON to encode " -"structure data, making it easy to integrate Taler with existing Web " -"applications. Taler's protocol is documented in detail at" +"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, " +"but obviously merchants may choose to offer HTTPS for consistency and " +"because it generally is better for privacy compared to HTTP. Taler uses JSON " +"to encode structure data, making it easy to integrate Taler with existing " +"Web applications. Taler's protocol is documented in detail at" msgstr "" "O Taler foi projetado para trabalhar na Internet. Para garantir que os " "pagamentos do Taler possam funcionar com configurações de rede restritivas, " @@ -417,7 +413,7 @@ msgstr "" msgid "Technical Presentation" msgstr "" -#: template/developers.html.j2:149 template/investors.html.j2:93 +#: template/developers.html.j2:149 template/investors.html.j2:90 msgid "Download" msgstr "Baixar" @@ -452,15 +448,26 @@ msgstr "" "terminologia do Taler, o cliente cria uma reserva no câmbio." #: 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 " -"are digital representations of the original currency from the transfer. It " -"is important to note that the exchange does not learn the "serial " -"numbers" of the coins created in this process, so it cannot tell later " -"which customer purchased what at which merchant. The use of Taler does not " -"change the currency or the total value of the funds (except for fees which " -"the exchange may charge for the service)." +#, fuzzy +#| 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 are digital representations of the original currency " +#| "from the transfer. It is important to note that the exchange does not " +#| "learn the "serial numbers" of the coins created in this " +#| "process, so it cannot tell later which customer purchased what at which " +#| "merchant. The use of Taler does not change the currency or the total " +#| "value of the funds (except for fees which the exchange may charge for the " +#| "service)." +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 are digital representations of the original currency from the " +"transfer. It is important to note that the exchange does not learn the "" +"serial numbers" of the coins created in this process, so it cannot tell " +"later which customer purchased what at which merchant. The use of Taler does " +"not change the currency or the total value of the funds (except for fees " +"which the exchange may charge for the service)." msgstr "" "Uma vez que o câmbio recebeu a transferência eletrônica, ele permite que a " "carteira eletrônica do cliente <b>saque</b> moedas eletrônicas. As moedas " @@ -609,7 +616,7 @@ 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" +msgid "Operator's manual for the GNU Taler exchange. Also available as" msgstr "" #: template/docs.html.j2:74 @@ -897,12 +904,13 @@ msgstr "" #: template/faq.html.j2:119 msgid "" -"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." +"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:130 @@ -1014,7 +1022,7 @@ msgstr "" 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." +"span> on the merchant's Website." msgstr "" #: template/features.html.j2:50 @@ -1040,8 +1048,8 @@ msgstr "Pagando com o Taler" #| "or identity theft.</p>" msgid "" "To pay with Taler, customers install an electronic wallet on their device. " -"Before the first payment, the desired currency must be added to the wallet's " -"balance by some other means of payment." +"Before the first payment, the desired currency must be added to the " +"wallet's balance by some other means of payment." msgstr "" "<p>Para pagar com o Taler, os clientes instalam uma carteira eletrônica em " "seu dispositivo. Antes do primeiro pagamento, a moeda desejada deve ser " @@ -1090,8 +1098,9 @@ msgstr "Recebendo pagamentos com o Taler" msgid "" "To receive Taler payments, a merchant needs a bank account in the desired " "currency. We provide supporting software in various programming languages to " -"make the integration painless. The merchant's backend for Taler transaction " -"processing can run on the merchant's premises or be hosted by a third party." +"make the integration painless. The merchant's backend for Taler " +"transaction processing can run on the merchant's premises or be hosted " +"by a third party." msgstr "" "<p>Para receber pagamentos do Taler, um comerciante precisa de uma conta " "bancária na moeda desejada. Nós fornecemos software de suporte em várias " @@ -1128,10 +1137,16 @@ msgid "Stable" msgstr "Estável" #: template/features.html.j2:143 +#, fuzzy +#| msgid "" +#| "Taler does not introduce a new currency. Taler uses a digital wallet " +#| "storing coins and payment service providers with escrow accounts in " +#| "existing currencies. Thus, Taler's cryptographic coins correspond to " +#| "existing currencies, such as US Dollars, Euros or even Bitcoins." msgid "" "Taler does not introduce a new currency. Taler uses a digital wallet storing " "coins and payment service providers with escrow accounts in existing " -"currencies. Thus, Taler's cryptographic coins correspond to existing " +"currencies. Thus, Taler's cryptographic coins correspond to existing " "currencies, such as US Dollars, Euros or even Bitcoins." msgstr "" "O Taler não introduz uma nova moeda. A Taler usa uma carteira digital que " @@ -1161,8 +1176,13 @@ msgid "Taxable" msgstr "Tributável" #: template/features.html.j2:172 +#, fuzzy +#| 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." msgid "" -"When using Taler, merchant's revenue is transparent for tax collection " +"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 "" @@ -1308,10 +1328,16 @@ msgid "dirty" msgstr "suja <i>(dirty)</i>" #: template/glossary.html.j2:54 +#, fuzzy +#| msgid "" +#| "a `coin` is dirty if its public key may be known to an entity other than " +#| "the customer, thereby creating the danger of some entity being able to " +#| "link multiple transactions of coin's owner if the coin is not refreshed " +#| "first" msgid "" "a `coin` is dirty if its public key may be known to an entity other than the " "customer, thereby creating the danger of some entity being able to link " -"multiple transactions of coin's owner if the coin is not refreshed first" +"multiple transactions of coin's owner if the coin is not refreshed first" msgstr "" "uma “moeda” está suja se a sua chave pública pode ser conhecida por uma " "entidade diferente do cliente, criando assim o perigo de alguma entidade " @@ -1323,8 +1349,12 @@ msgid "exchange" msgstr "câmbio <i>(exchange)</i>" #: template/glossary.html.j2:63 +#, fuzzy +#| msgid "" +#| "Taler's payment service provider. Issues electronic `coins` during " +#| "`withdrawal` and redeems them when they are `deposited` by merchants." msgid "" -"Taler's payment service provider. Issues electronic `coins` during " +"Taler's payment service provider. Issues electronic `coins` during " "`withdrawal` and redeems them when they are `deposited` by merchants." msgstr "" "provedor de serviços de pagamento do Taler. Emite “moedas” eletrônicas " @@ -1451,10 +1481,15 @@ msgid "reserve" msgstr "reserva <i>(reserve)</i>" #: template/glossary.html.j2:146 +#, fuzzy +#| msgid "" +#| "funds set aside for future use; either the balance of a customer at the " +#| "exchange ready for `withdrawal`, or the funds kept in the exchange's bank " +#| "account to cover obligations from coins in circulation" msgid "" "funds set aside for future use; either the balance of a customer at the " -"exchange ready for `withdrawal`, or the funds kept in the exchange's bank " -"account to cover obligations from coins in circulation" +"exchange ready for `withdrawal`, or the funds kept in the exchange's " +"bank account to cover obligations from coins in circulation" msgstr "" "fundos reservados para uso futuro; ou o saldo de um cliente na bolsa pronta " "para “saque”, ou os fundos mantidos na conta bancária do câmbio para cobrir " @@ -1505,8 +1540,12 @@ msgid "sharing" msgstr "compartilhamento <i>(sharing)</i>" #: template/glossary.html.j2:178 +#, fuzzy +#| msgid "" +#| "users can share ownership of a `coin` by sharing access to the coin's " +#| "private key, thereby allowing all co-owners to spend the coin at any time." msgid "" -"users can share ownership of a `coin` by sharing access to the coin's " +"users can share ownership of a `coin` by sharing access to the coin's " "private key, thereby allowing all co-owners to spend the coin at any time." msgstr "" "os usuários podem compartilhar a propriedade de uma “moeda” compartilhando o " @@ -1676,12 +1715,19 @@ msgstr "" "em vários dispositivos." #: template/governments.html.j2:58 -msgid "" -"Taler's payments are cryptographically secured. Thus, customers, merchants " -"and the Taler payment service provider (the exchange) can mathematically " -"demonstrate their lawful behavior in court in case of disputes. Financial " -"damages are strictly limited, improving economic security for individuals, " -"merchants, the exchange and the state." +#, fuzzy +#| msgid "" +#| "Taler's payments are cryptographically secured. Thus, customers, " +#| "merchants and the Taler payment service provider (the exchange) can " +#| "mathematically demonstrate their lawful behavior in court in case of " +#| "disputes. Financial damages are strictly limited, improving economic " +#| "security for individuals, merchants, the exchange and the state." +msgid "" +"Taler's payments are cryptographically secured. Thus, customers, " +"merchants and the Taler payment service provider (the exchange) can " +"mathematically demonstrate their lawful behavior in court in case of " +"disputes. Financial damages are strictly limited, improving economic " +"security for individuals, merchants, the exchange and the state." msgstr "" "Os pagamentos do Taler são protegidos criptograficamente. Assim, clientes, " "comerciantes e o provedor de serviços de pagamento do Taler (o câmbio) podem " @@ -1823,10 +1869,17 @@ msgstr "" "do cliente." #: template/governments.html.j2:170 +#, fuzzy +#| msgid "" +#| "The amounts of digital coins legitimately withdrawn by customers from the " +#| "exchange, the value of non-redeemed digital coins in customer's wallets, " +#| "the value and corresponding wire details of deposit operations performed " +#| "by merchants with the exchange, and the income of the exchange from " +#| "transaction fees." msgid "" "The amounts of digital coins legitimately withdrawn by customers from the " -"exchange, the value of non-redeemed digital coins in customer's wallets, the " -"value and corresponding wire details of deposit operations performed by " +"exchange, the value of non-redeemed digital coins in customer's wallets, " +"the value and corresponding wire details of deposit operations performed by " "merchants with the exchange, and the income of the exchange from transaction " "fees." msgstr "" @@ -1854,12 +1907,12 @@ msgstr "visão geral do sistema" #: template/gsoc-codeless.html.j2:14 msgid "" -"Codeless payment is a component that sits between the seller's frontend and " -"the GNU Taler merchant backend. This component has a web interface, where " -"payment buttons are configured. Registered merchants can manage their " -"inventory and simultaneously create a 'Buy Now' button for a specific " -"product. This code can be directly copy pasted on the seller's frontend and " -"can be used for 'Pay with Taler'." +"Codeless payment is a component that sits between the seller's frontend " +"and the GNU Taler merchant backend. This component has a web interface, " +"where payment buttons are configured. Registered merchants can manage their " +"inventory and simultaneously create a 'Buy Now' button for a " +"specific product. This code can be directly copy pasted on the seller's " +"frontend and can be used for 'Pay with Taler'." msgstr "" #: template/gsoc-codeless.html.j2:29 @@ -2018,37 +2071,37 @@ msgstr "" msgid "Shipment Tracking" msgstr "" -#: template/index.html.j2:23 +#: template/index.html.j2:25 msgid "" "We provide a payment system that makes <span class='tlr'>privacy-friendly</" "span> online transactions <span class='tlr'>fast and easy</span>." msgstr "" -#: template/index.html.j2:27 +#: template/index.html.j2:29 msgid "Payments without registration" msgstr "" -#: template/index.html.j2:31 +#: template/index.html.j2:33 msgid "Data protection by default" msgstr "" -#: template/index.html.j2:35 +#: template/index.html.j2:37 msgid "Fraud eliminated by design" msgstr "" -#: template/index.html.j2:39 +#: template/index.html.j2:41 msgid "Not a new currency!" msgstr "" -#: template/index.html.j2:43 +#: template/index.html.j2:45 msgid "Empowers communities to run their own payment infrastructure" msgstr "" -#: template/index.html.j2:46 +#: template/index.html.j2:48 msgid "Try Demo!" msgstr "" -#: template/index.html.j2:47 +#: template/index.html.j2:49 msgid "Read Docs" msgstr "" @@ -2087,28 +2140,35 @@ msgstr "" "deveriam funcionar e o objetivo de impor essa visão ao mundo." #: template/investors.html.j2:37 -msgid "We are currently supported by" -msgstr "" - -#: template/investors.html.j2:41 msgid "" +"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, " "the French national institute for research in informatics and automation, " -"and the" +"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom " +"Foundation</a>." msgstr "" -#: template/investors.html.j2:50 +#: template/investors.html.j2:47 msgid "The Technology" msgstr "A tecnologia" -#: template/investors.html.j2:53 +#: template/investors.html.j2:50 +#, fuzzy +#| msgid "" +#| "All transactions in Taler are secured using <a href=\"bibliography.html" +#| "\">modern cryptography</a> and trust in all parties is minimized. " +#| "Financial damage is bounded (for customers, merchants and the exchange) " +#| "even in the case that systems are compromised and private keys are " +#| "stolen. Databases can be audited for consistency, resulting in either the " +#| "detection of compromised systems or the demonstration that participants " +#| "were honest. Actual transaction costs are fractions of a cent." msgid "" "All transactions in Taler are secured using <a href=\"bibliography.html" "\">modern cryptography</a> and trust in all parties is minimized. Financial " -"damage is bounded (for customers, merchants and the exchange) even in the " -"case that systems are compromised and private keys are stolen. Databases can " -"be audited for consistency, resulting in either the detection of compromised " -"systems or the demonstration that participants were honest. Actual " -"transaction costs are fractions of a cent." +"damage is bounded (for customers, merchants and the exchange) even " +"in the case that systems are compromised and private keys are stolen. " +"Databases can be audited for consistency, resulting in either the detection " +"of compromised systems or the demonstration that participants were honest. " +"Actual transaction costs are fractions of a cent." msgstr "" "Todas as transações no Taler são protegidas usando <a href=\"bibliography." "html\">criptografia moderna</a> e a confiança em todas as partes é " @@ -2119,11 +2179,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:66 +#: template/investors.html.j2:63 msgid "The Business" msgstr "Os negócios" -#: template/investors.html.j2:68 +#: template/investors.html.j2:65 msgid "" "The scalable business model for Taler is the operation of the payment " "service provider, which converts money from traditional payment systems " @@ -2141,11 +2201,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:87 +#: template/investors.html.j2:84 msgid "The Business Case" msgstr "O caso de negócio" -#: template/investors.html.j2:97 +#: template/investors.html.j2:94 msgid "" "Our <a href=\"financial-news.html\">financial news</a> page explains in " "English how Taler can impact current developments in the global payment " @@ -2155,11 +2215,11 @@ msgstr "" "explica, em inglês, como o Taler pode afetar os atuais desenvolvimentos no " "mercado de pagamento global." -#: template/investors.html.j2:120 +#: template/investors.html.j2:117 msgid "Running a Taler payment service operator" msgstr "Executando um operador de serviço de pagamento do Taler" -#: template/investors.html.j2:123 +#: template/investors.html.j2:120 msgid "" "The payment service operator runs the <em>Taler exchange</em>. The exchange " "charges <b>transaction fees</b> to customers or merchants. Its operational " @@ -2171,7 +2231,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:133 +#: template/investors.html.j2:130 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." @@ -2179,7 +2239,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:134 +#: template/investors.html.j2:131 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." @@ -2188,7 +2248,7 @@ msgstr "" "bancárias maiores para os comerciantes minimizarem os custos de " "transferência eletrônica." -#: template/investors.html.j2:135 +#: template/investors.html.j2:132 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." @@ -2196,11 +2256,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:136 +#: template/investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "A parceria com os bancos estabelece a confiança do cliente." -#: template/investors.html.j2:137 +#: template/investors.html.j2:134 msgid "Partnership with free software community enables rapid deployment." msgstr "" "A parceria com a comunidade de software livre permite uma implantação rápida." @@ -2277,9 +2337,15 @@ msgid "Cheap" msgstr "Barato" #: template/merchants.html.j2:78 +#, fuzzy +#| msgid "" +#| "Taler is uses efficient cryptographic constructions with low bandwidth " +#| "and storage requirements. Combined with Taler's strong security which " +#| "makes fraud impossible, Taler payment service providers can operate with " +#| "very low overhead and thus offer low transaction fees." msgid "" "Taler is uses efficient cryptographic constructions with low bandwidth and " -"storage requirements. Combined with Taler's strong security which makes " +"storage requirements. Combined with Taler's strong security which makes " "fraud impossible, Taler payment service providers can operate with very low " "overhead and thus offer low transaction fees." msgstr "" @@ -2308,8 +2374,14 @@ msgid "Ethical" msgstr "Ético" #: template/merchants.html.j2:101 +#, fuzzy +#| msgid "" +#| "Taler prevents tax evasion and money laundering. Taler's protocols are " +#| "efficient and do not use wasteful proof-of-work calculations. Taler " +#| "encourages transparency by providing an open standard and free software " +#| "reference implementations." msgid "" -"Taler prevents tax evasion and money laundering. Taler's protocols are " +"Taler prevents tax evasion and money laundering. Taler's protocols are " "efficient and do not use wasteful proof-of-work calculations. Taler " "encourages transparency by providing an open standard and free software " "reference implementations." @@ -2344,21 +2416,33 @@ msgid "Merchants process payments using the Taler backend:" msgstr "Os comerciantes processam pagamentos usando o backend do Taler:" #: template/merchants.html.j2:144 +#, fuzzy +#| msgid "" +#| "The backend <b>signs</b> and <b>stores</b> the complete terms of offers " +#| "made by the merchant to customers. For this, the merchant's frontend " +#| "needs to give the customer's order in a JSON format to the backend." msgid "" "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made " -"by the merchant to customers. For this, the merchant's frontend needs to " -"give the customer's order in a JSON format to the backend." +"by the merchant to customers. For this, the merchant's frontend needs to " +"give the customer's order in a JSON format to the backend." msgstr "" "O backend <b>assina</b> e <b>armazena</b> os termos completos das ofertas " "feitas pelo comerciante aos clientes. Para isso, o frontend do comerciante " "precisa dar a ordem do cliente em um formato JSON para o backend." #: template/merchants.html.j2:153 +#, fuzzy +#| msgid "" +#| "The backend <b>validates</b> payments received from the wallet and " +#| "<b>executes</b> them with the Taler payment service provider (the " +#| "exchange). For this, the merchant's frontend must pass the payment " +#| "request through to the Taler backend and check the HTTP status code that " +#| "is returned." msgid "" "The backend <b>validates</b> payments received from the wallet and " "<b>executes</b> them with the Taler payment service provider (the exchange). " -"For this, the merchant's frontend must pass the payment request through to " -"the Taler backend and check the HTTP status code that is returned." +"For this, the merchant's frontend must pass the payment request through " +"to the Taler backend and check the HTTP status code that is returned." msgstr "" "O backend <b>valida</b> pagamentos recebidos da carteira e os <b>executa</b> " "com o provedor de serviços de pagamento do Taler (o câmbio). Para isso, o " @@ -2379,22 +2463,6 @@ 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" - -#: template/old-news.html.j2:6 -msgid "Older News" -msgstr "Notícias mais antigas" - -#: template/old-news.html.j2:9 -msgid "This page documents the GNU Taler history." -msgstr "Essa página documenta o histórico do GNU Taler." - #: template/press.html.j2:4 msgid "GNU Taler in the Press" msgstr "GNU Taler na imprensa" @@ -2614,7 +2682,7 @@ msgid "demo" msgstr "" #: template/wallet.html.j2:119 -msgid "You don't have a wallet installed yet." +msgid "You don't have a wallet installed yet." msgstr "" #: template/wallet.html.j2:128 @@ -2632,7 +2700,7 @@ msgid "or" msgstr "" #: template/wallet.html.j2:149 -msgid "is required, but it appears you don't have it installed." +msgid "is required, but it appears you don't have it installed." msgstr "" #: template/wallet.html.j2:159 @@ -2652,7 +2720,7 @@ msgid "Install wallet" msgstr "carteira <i>(wallet)</i>" #: template/wallet.html.j2:177 -msgid "JavaScript is disabled, installation won't work." +msgid "JavaScript is disabled, installation won't work." msgstr "" #: template/wallet.html.j2:216 @@ -2677,6 +2745,18 @@ msgstr "" msgid "Wallets for other browsers will be provided in the near future." msgstr "" +#~ msgid "available upon request" +#~ msgstr "disponível mediante solicitação" + +#~ msgid "More news" +#~ msgstr "Mais notícias" + +#~ msgid "Older News" +#~ msgstr "Notícias mais antigas" + +#~ msgid "This page documents the GNU Taler history." +#~ msgstr "Essa página documenta o histórico do GNU Taler." + #, fuzzy #~| msgid "The Team" #~ msgid "Team" diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index 236a3316..c56bdf82 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -7,23 +7,23 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-12-01 21:29+0100\n" +"POT-Creation-Date: 2019-12-10 14:34+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" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "Generated-By: Babel 2.5.1\n" -#: common/base.j2:5 +#: common/base.j2:5 common/news.j2:5 msgid "GNU Taler" msgstr "" -#: common/base.j2:6 +#: common/base.j2:6 common/news.j2:6 msgid "Taxable Anonymous Libre Electronic Reserves" msgstr "" @@ -39,19 +39,18 @@ msgstr "" msgid "Bibliography" msgstr "" -#: common/footer.j2.inc:27 template/bibliography.html.j2:23 -#: template/bibliography.html.j2:30 template/bibliography.html.j2:37 -#: template/bibliography.html.j2:43 template/developers.html.j2:66 +#: common/footer.j2.inc:28 template/bibliography.html.j2:34 +#: template/developers.html.j2:66 msgid "and" msgstr "" -#: common/footer.j2.inc:30 +#: common/footer.j2.inc:31 msgid "" "We are grateful for support and free hosting of this site by <a href='http://" "www.bfh.ch/'>BFH</a>" msgstr "" -#: common/footer.j2.inc:32 +#: common/footer.j2.inc:33 msgid "" "This page was created using <a href='https://www.gnu.org/'>Free Software</a> " "only." @@ -69,24 +68,26 @@ msgstr "" msgid "Docs" msgstr "" +#: common/navigation.j2.inc:24 news/index.html.j2:9 +msgid "News" +msgstr "" + +#: inc/news.macro.j2:22 +msgid "read more" +msgstr "" + #: template/architecture.html.j2:6 msgid "Taler System Architecture" msgstr "" -#: template/bibliography.html.j2:4 +#: template/bibliography.html.j2:5 msgid "GNU Taler Bibliography" msgstr "" -#: template/bibliography.html.j2:9 template/bibliography.html.j2:16 -#: template/bibliography.html.j2:23 template/bibliography.html.j2:30 -#: template/bibliography.html.j2:37 template/bibliography.html.j2:43 +#: template/bibliography.html.j2:27 msgid "by" msgstr "" -#: template/bibliography.html.j2:44 -msgid "available upon request" -msgstr "" - #: template/contact.html.j2:6 msgid "Contact information" msgstr "" @@ -159,21 +160,16 @@ msgstr "" msgid "Copyright Assignment" msgstr "" -#: template/copyright.html.j2:9 +#: template/copyright.html.j2:8 msgid "" "Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/" -"copyright.pdf\">copyright assignment</a> to ensure that the" -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." +"copyright.pdf\">copyright assignment</a> to ensure that the <a href=" +"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex" +"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative " +"development</a> of the GNUnet and GNU Taler projects is satisfied." msgstr "" -#: template/copyright.html.j2:24 +#: template/copyright.html.j2:19 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 " @@ -182,7 +178,7 @@ msgid "" "stores that are hostile to free software)." msgstr "" -#: template/copyright.html.j2:34 +#: template/copyright.html.j2:29 msgid "" "Minor contributions (basically, anyone without Git access) do not require " "copyright assignment. Pseudonymous contributions are accepted, in this case " @@ -218,11 +214,11 @@ msgstr "" msgid "" "Taler is designed to work on the Internet. To ensure that Taler payments can " "work with restrictive network setups, Taler uses a RESTful protocol over " -"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but " -"obviously merchants may choose to offer HTTPS for consistency and because it " -"generally is better for privacy compared to HTTP. Taler uses JSON to encode " -"structure data, making it easy to integrate Taler with existing Web " -"applications. Taler's protocol is documented in detail at" +"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, " +"but obviously merchants may choose to offer HTTPS for consistency and " +"because it generally is better for privacy compared to HTTP. Taler uses JSON " +"to encode structure data, making it easy to integrate Taler with existing " +"Web applications. Taler's protocol is documented in detail at" msgstr "" #: template/developers.html.j2:58 template/docs.html.j2:182 @@ -307,7 +303,7 @@ msgstr "" msgid "Technical Presentation" msgstr "" -#: template/developers.html.j2:149 template/investors.html.j2:93 +#: template/developers.html.j2:149 template/investors.html.j2:90 msgid "Download" msgstr "" @@ -336,14 +332,14 @@ msgstr "" #: 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 " -"are digital representations of the original currency from the transfer. It " -"is important to note that the exchange does not learn the "serial " -"numbers" of the coins created in this process, so it cannot tell later " -"which customer purchased what at which merchant. The use of Taler does not " -"change the currency or the total value of the funds (except for fees which " -"the exchange may charge for the service)." +"Once the exchange has received the wire transfer, it allows the customer'" +"s electronic wallet to <b>withdraw</b> electronic coins. The electronic " +"coins are digital representations of the original currency from the " +"transfer. It is important to note that the exchange does not learn the "" +"serial numbers" of the coins created in this process, so it cannot tell " +"later which customer purchased what at which merchant. The use of Taler does " +"not change the currency or the total value of the funds (except for fees " +"which the exchange may charge for the service)." msgstr "" #: template/developers.html.j2:208 @@ -441,7 +437,7 @@ msgid "Exchange" msgstr "" #: template/docs.html.j2:64 -msgid "Operator's manual for the GNU Taler exchange. Also available as" +msgid "Operator's manual for the GNU Taler exchange. Also available as" msgstr "" #: template/docs.html.j2:74 @@ -643,12 +639,13 @@ msgstr "" #: template/faq.html.j2:119 msgid "" -"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." +"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:130 @@ -758,7 +755,7 @@ msgstr "" 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." +"span> on the merchant's Website." msgstr "" #: template/features.html.j2:50 @@ -776,8 +773,8 @@ msgstr "" #: 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." +"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:79 @@ -799,8 +796,9 @@ msgstr "" msgid "" "To receive Taler payments, a merchant needs a bank account in the desired " "currency. We provide supporting software in various programming languages to " -"make the integration painless. The merchant's backend for Taler transaction " -"processing can run on the merchant's premises or be hosted by a third party." +"make the integration painless. The merchant's backend for Taler " +"transaction processing can run on the merchant's premises or be hosted " +"by a third party." msgstr "" #: template/features.html.j2:105 @@ -832,7 +830,7 @@ msgstr "" msgid "" "Taler does not introduce a new currency. Taler uses a digital wallet storing " "coins and payment service providers with escrow accounts in existing " -"currencies. Thus, Taler's cryptographic coins correspond to existing " +"currencies. Thus, Taler's cryptographic coins correspond to existing " "currencies, such as US Dollars, Euros or even Bitcoins." msgstr "" @@ -854,7 +852,7 @@ msgstr "" #: template/features.html.j2:172 msgid "" -"When using Taler, merchant's revenue is transparent for tax collection " +"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 "" @@ -969,7 +967,7 @@ msgstr "" msgid "" "a `coin` is dirty if its public key may be known to an entity other than the " "customer, thereby creating the danger of some entity being able to link " -"multiple transactions of coin's owner if the coin is not refreshed first" +"multiple transactions of coin's owner if the coin is not refreshed first" msgstr "" #: template/glossary.html.j2:61 @@ -978,7 +976,7 @@ msgstr "" #: template/glossary.html.j2:63 msgid "" -"Taler's payment service provider. Issues electronic `coins` during " +"Taler's payment service provider. Issues electronic `coins` during " "`withdrawal` and redeems them when they are `deposited` by merchants." msgstr "" @@ -1091,8 +1089,8 @@ msgstr "" #: template/glossary.html.j2:146 msgid "" "funds set aside for future use; either the balance of a customer at the " -"exchange ready for `withdrawal`, or the funds kept in the exchange's bank " -"account to cover obligations from coins in circulation" +"exchange ready for `withdrawal`, or the funds kept in the exchange's " +"bank account to cover obligations from coins in circulation" msgstr "" #: template/glossary.html.j2:152 @@ -1134,7 +1132,7 @@ msgstr "" #: template/glossary.html.j2:178 msgid "" -"users can share ownership of a `coin` by sharing access to the coin's " +"users can share ownership of a `coin` by sharing access to the coin's " "private key, thereby allowing all co-owners to spend the coin at any time." msgstr "" @@ -1270,11 +1268,11 @@ msgstr "" #: template/governments.html.j2:58 msgid "" -"Taler's payments are cryptographically secured. Thus, customers, merchants " -"and the Taler payment service provider (the exchange) can mathematically " -"demonstrate their lawful behavior in court in case of disputes. Financial " -"damages are strictly limited, improving economic security for individuals, " -"merchants, the exchange and the state." +"Taler's payments are cryptographically secured. Thus, customers, " +"merchants and the Taler payment service provider (the exchange) can " +"mathematically demonstrate their lawful behavior in court in case of " +"disputes. Financial damages are strictly limited, improving economic " +"security for individuals, merchants, the exchange and the state." msgstr "" #: template/governments.html.j2:70 @@ -1381,8 +1379,8 @@ msgstr "" #: template/governments.html.j2:170 msgid "" "The amounts of digital coins legitimately withdrawn by customers from the " -"exchange, the value of non-redeemed digital coins in customer's wallets, the " -"value and corresponding wire details of deposit operations performed by " +"exchange, the value of non-redeemed digital coins in customer's wallets, " +"the value and corresponding wire details of deposit operations performed by " "merchants with the exchange, and the income of the exchange from transaction " "fees." msgstr "" @@ -1403,12 +1401,12 @@ msgstr "" #: template/gsoc-codeless.html.j2:14 msgid "" -"Codeless payment is a component that sits between the seller's frontend and " -"the GNU Taler merchant backend. This component has a web interface, where " -"payment buttons are configured. Registered merchants can manage their " -"inventory and simultaneously create a 'Buy Now' button for a specific " -"product. This code can be directly copy pasted on the seller's frontend and " -"can be used for 'Pay with Taler'." +"Codeless payment is a component that sits between the seller's frontend " +"and the GNU Taler merchant backend. This component has a web interface, " +"where payment buttons are configured. Registered merchants can manage their " +"inventory and simultaneously create a 'Buy Now' button for a " +"specific product. This code can be directly copy pasted on the seller's " +"frontend and can be used for 'Pay with Taler'." msgstr "" #: template/gsoc-codeless.html.j2:29 @@ -1567,37 +1565,37 @@ msgstr "" msgid "Shipment Tracking" msgstr "" -#: template/index.html.j2:23 +#: template/index.html.j2:25 msgid "" "We provide a payment system that makes <span class='tlr'>privacy-friendly</" "span> online transactions <span class='tlr'>fast and easy</span>." msgstr "" -#: template/index.html.j2:27 +#: template/index.html.j2:29 msgid "Payments without registration" msgstr "" -#: template/index.html.j2:31 +#: template/index.html.j2:33 msgid "Data protection by default" msgstr "" -#: template/index.html.j2:35 +#: template/index.html.j2:37 msgid "Fraud eliminated by design" msgstr "" -#: template/index.html.j2:39 +#: template/index.html.j2:41 msgid "Not a new currency!" msgstr "" -#: template/index.html.j2:43 +#: template/index.html.j2:45 msgid "Empowers communities to run their own payment infrastructure" msgstr "" -#: template/index.html.j2:46 +#: template/index.html.j2:48 msgid "Try Demo!" msgstr "" -#: template/index.html.j2:47 +#: template/index.html.j2:49 msgid "Read Docs" msgstr "" @@ -1624,35 +1622,33 @@ msgid "" msgstr "" #: template/investors.html.j2:37 -msgid "We are currently supported by" -msgstr "" - -#: template/investors.html.j2:41 msgid "" +"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, " "the French national institute for research in informatics and automation, " -"and the" +"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom " +"Foundation</a>." msgstr "" -#: template/investors.html.j2:50 +#: template/investors.html.j2:47 msgid "The Technology" msgstr "" -#: template/investors.html.j2:53 +#: template/investors.html.j2:50 msgid "" "All transactions in Taler are secured using <a href=\"bibliography.html" "\">modern cryptography</a> and trust in all parties is minimized. Financial " -"damage is bounded (for customers, merchants and the exchange) even in the " -"case that systems are compromised and private keys are stolen. Databases can " -"be audited for consistency, resulting in either the detection of compromised " -"systems or the demonstration that participants were honest. Actual " -"transaction costs are fractions of a cent." +"damage is bounded (for customers, merchants and the exchange) even " +"in the case that systems are compromised and private keys are stolen. " +"Databases can be audited for consistency, resulting in either the detection " +"of compromised systems or the demonstration that participants were honest. " +"Actual transaction costs are fractions of a cent." msgstr "" -#: template/investors.html.j2:66 +#: template/investors.html.j2:63 msgid "The Business" msgstr "" -#: template/investors.html.j2:68 +#: template/investors.html.j2:65 msgid "" "The scalable business model for Taler is the operation of the payment " "service provider, which converts money from traditional payment systems " @@ -1663,22 +1659,22 @@ msgid "" "to facilitate the transactions." msgstr "" -#: template/investors.html.j2:87 +#: template/investors.html.j2:84 msgid "The Business Case" msgstr "" -#: template/investors.html.j2:97 +#: template/investors.html.j2:94 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:120 +#: template/investors.html.j2:117 msgid "Running a Taler payment service operator" msgstr "" -#: template/investors.html.j2:123 +#: template/investors.html.j2:120 msgid "" "The payment service operator runs the <em>Taler exchange</em>. The exchange " "charges <b>transaction fees</b> to customers or merchants. Its operational " @@ -1686,29 +1682,29 @@ msgid "" "of the computing infrastructure." msgstr "" -#: template/investors.html.j2:133 +#: template/investors.html.j2:130 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." msgstr "" -#: template/investors.html.j2:134 +#: template/investors.html.j2:131 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." msgstr "" -#: template/investors.html.j2:135 +#: template/investors.html.j2:132 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." msgstr "" -#: template/investors.html.j2:136 +#: template/investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "" -#: template/investors.html.j2:137 +#: template/investors.html.j2:134 msgid "Partnership with free software community enables rapid deployment." msgstr "" @@ -1764,7 +1760,7 @@ msgstr "" #: template/merchants.html.j2:78 msgid "" "Taler is uses efficient cryptographic constructions with low bandwidth and " -"storage requirements. Combined with Taler's strong security which makes " +"storage requirements. Combined with Taler's strong security which makes " "fraud impossible, Taler payment service providers can operate with very low " "overhead and thus offer low transaction fees." msgstr "" @@ -1786,7 +1782,7 @@ msgstr "" #: template/merchants.html.j2:101 msgid "" -"Taler prevents tax evasion and money laundering. Taler's protocols are " +"Taler prevents tax evasion and money laundering. Taler's protocols are " "efficient and do not use wasteful proof-of-work calculations. Taler " "encourages transparency by providing an open standard and free software " "reference implementations." @@ -1819,16 +1815,16 @@ msgstr "" #: template/merchants.html.j2:144 msgid "" "The backend <b>signs</b> and <b>stores</b> the complete terms of offers made " -"by the merchant to customers. For this, the merchant's frontend needs to " -"give the customer's order in a JSON format to the backend." +"by the merchant to customers. For this, the merchant's frontend needs to " +"give the customer's order in a JSON format to the backend." msgstr "" #: template/merchants.html.j2:153 msgid "" "The backend <b>validates</b> payments received from the wallet and " "<b>executes</b> them with the Taler payment service provider (the exchange). " -"For this, the merchant's frontend must pass the payment request through to " -"the Taler backend and check the HTTP status code that is returned." +"For this, the merchant's frontend must pass the payment request through " +"to the Taler backend and check the HTTP status code that is returned." msgstr "" #: template/merchants.html.j2:164 @@ -1842,22 +1838,6 @@ msgstr "" msgid "customer perspective" msgstr "" -#: template/news.html.j2:6 -msgid "News" -msgstr "" - -#: template/news.html.j2:16 -msgid "More news" -msgstr "" - -#: template/old-news.html.j2:6 -msgid "Older News" -msgstr "" - -#: template/old-news.html.j2:9 -msgid "This page documents the GNU Taler history." -msgstr "" - #: template/press.html.j2:4 msgid "GNU Taler in the Press" msgstr "" @@ -2065,7 +2045,7 @@ msgid "demo" msgstr "" #: template/wallet.html.j2:119 -msgid "You don't have a wallet installed yet." +msgid "You don't have a wallet installed yet." msgstr "" #: template/wallet.html.j2:128 @@ -2081,7 +2061,7 @@ msgid "or" msgstr "" #: template/wallet.html.j2:149 -msgid "is required, but it appears you don't have it installed." +msgid "is required, but it appears you don't have it installed." msgstr "" #: template/wallet.html.j2:159 @@ -2097,7 +2077,7 @@ msgid "Install wallet" msgstr "" #: template/wallet.html.j2:177 -msgid "JavaScript is disabled, installation won't work." +msgid "JavaScript is disabled, installation won't work." msgstr "" #: template/wallet.html.j2:216 diff --git a/make_site.py b/make_site.py new file mode 100755 index 00000000..4c2605ac --- /dev/null +++ b/make_site.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 +# coding: utf-8 +# +# This file is in the public domain. +# +# This script runs the jinja2 templating engine on an input template-file +# using the specified locale for gettext translations, and outputs +# the resulting (HTML) ouptut-file. +# +# Note that the gettext files need to be prepared first. This script +# is thus to be invoked via the Makefile. +import jinja2 +import sys +from pathlib import Path, PurePath +from inc.site import gen_site +from inc.fileproc import copy_files + +env = jinja2.Environment(loader=jinja2.FileSystemLoader(str(PurePath(__file__).parent)), + extensions=["jinja2.ext.i18n"], + lstrip_blocks=True, + trim_blocks=True, + undefined=jinja2.StrictUndefined, + autoescape=False) + +if len(sys.argv) >= 2 and sys.argv[1] == "-vv": + DEBUG=1 +elif len(sys.argv) >= 2 and sys.argv[1] == "-vvv": + DEBUG=2 +elif len(sys.argv) >= 2 and sys.argv[1] == "-vvvv": + DEBUG=3 +else: + DEBUG=0 + +def main(): + x = gen_site(DEBUG) + conf = x.load_config("www.yml") + x.gen_abstract(conf, "newsposts", "abstract", "page", 1000) + x.gen_newspost_content(conf, "newsposts", "content", "page", "en") + x.gen_rss("inc", conf, env) + if DEBUG: + print("generating html from jinja2 templates...") + x.run("template", conf, env) + if DEBUG >= 2: + print(Path.cwd()) + _ = Path("rendered") + for child in _.iterdir(): + print(child) + if DEBUG >= 2: + print(Path.cwd()) + if DEBUG: + print("generating html from jinja2 news templates...") + x.run("news", conf, env) + if DEBUG: + print("copying directories...") + x.copy_trees("static") + x.copy_trees("dist") + +if __name__ == "__main__": + main() diff --git a/make_sitemap.sh b/make_sitemap.sh deleted file mode 100755 index bc2578d7..00000000 --- a/make_sitemap.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2018, 2019 GNUnet e.V. -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. -# -# This initial version builds on code from ssg4 -# copyright is as follows: -# ----- -# https://www.romanzolotarev.com/bin/ssg4 -# Copyright 2018 Roman Zolotarev <hi@romanzolotarev.com> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# ----- - -list_pages(){ -cd rendered && find . -type f ! -path '*/.*' ! -path '*/_*' -name '*.html' | sed 's#^./##;#' -} - -main(){ - dst=rendered - base_url="$4" - date=$(date +%Y-%m-%d) - urls=$(list_pages "$src") - - test -n "$urls" && - render_sitemap "$urls" "$base_url" "$date" > "$dst/sitemap.xml" - - print_status 'url' 'urls' "$urls" >&2 - echo >&2 -} - -print_status() { - test -z "$3" && printf 'no %s' "$2" && return - - echo "$3" | awk -v singular="$1" -v plural="$2" ' - END { - if (NR==1) printf NR " " singular - if (NR>1) printf NR " " plural - }' -} - -render_sitemap() { - urls="$1" - base_url="$2" - date="$3" - - echo '<?xml version="1.0" encoding="UTF-8"?>' - echo '<urlset' - echo 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' - echo 'xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9' - echo 'http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"' - echo 'xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' - echo "$urls" | - sed -E 's#^(.*)$#<url><loc>'"$base_url"'/\1</loc><lastmod>'\ -"$date"'</lastmod><priority>1.0</priority></url>#' - echo '</urlset>' -} - -main "$@" - diff --git a/news/2014-11.html.j2 b/news/2014-11.html.j2 new file mode 100644 index 00000000..0280963e --- /dev/null +++ b/news/2014-11.html.j2 @@ -0,0 +1,7 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2014-11: Launching taler.net</h1> +<p> + Welcome to our new site about the Taler electronic payment system. +</p> +{% endblock body_content %} diff --git a/news/2014-11.inc b/news/2014-11.inc deleted file mode 100644 index 774a5ac4..00000000 --- a/news/2014-11.inc +++ /dev/null @@ -1,2 +0,0 @@ - <h3>2014-11: Launching <tt>taler.net</tt></h3> - <p>Welcome to our new site about the Taler electronic payment system.</p> diff --git a/news/2014-12.html.j2 b/news/2014-12.html.j2 new file mode 100644 index 00000000..6542cc9e --- /dev/null +++ b/news/2014-12.html.j2 @@ -0,0 +1,13 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2014-12: Watch Christian Grothoff's FOSSA talk on Taler</h1> +<p> + <video id="video" poster="{{ url_static('images/fossa2014.png') }}" autobuffer="" height="360" width="640" controls="controls"> + <source src="/videos/grothoff2014fossa.webm" type="video/webm"> + <source src="/videos/grothoff2014fossa.ogv" type="video/ogv"> + </video> +</p> +<p> + <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by FOSSA, Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. +</p> +{% endblock body_content %} diff --git a/news/2014-12.inc b/news/2014-12.inc deleted file mode 100644 index 81455583..00000000 --- a/news/2014-12.inc +++ /dev/null @@ -1,10 +0,0 @@ - <h3>2014-12: Watch Christian Grothoff's FOSSA talk on Taler</h3> - <p> - <video id="video" poster="/images/fossa2014.png" autobuffer="" height="360" width="640" controls="controls"> - <source src="/videos/grothoff2014fossa.webm" type="video/webm"> - <source src="/videos/grothoff2014fossa.ogv" type="video/ogv"> - </video> - </p> - <p> - <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('/images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by FOSSA, Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. - </p> diff --git a/news/2015-02.html.j2 b/news/2015-02.html.j2 new file mode 100644 index 00000000..efdcf375 --- /dev/null +++ b/news/2015-02.html.j2 @@ -0,0 +1,9 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2015-02x: Taler becomes an official GNU package</h1> +<p> + Taler was accepted into the GNU project today. GNU will offer advice, + advocacy and cooperation --- and host our official public + mailinglist <a href="mailto:taler@gnu.org">taler@gnu.org</a>. +</p> +{% endblock body_content %} diff --git a/news/2015-02.inc b/news/2015-02.inc deleted file mode 100644 index 6840b017..00000000 --- a/news/2015-02.inc +++ /dev/null @@ -1,4 +0,0 @@ - <h3>2015-02x: Taler becomes an official GNU package</h3> - <p>Taler was accepted into the GNU project today. GNU will offer advice, - advocacy and cooperation --- and host our official public - mailinglist <a href="mailto:taler@gnu.org">taler@gnu.org</a>.</p>
\ No newline at end of file diff --git a/news/2015-11.html.j2 b/news/2015-11.html.j2 new file mode 100644 index 00000000..9a633c9f --- /dev/null +++ b/news/2015-11.html.j2 @@ -0,0 +1,13 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2015-11: Christian Grothoff explains the goals behind Taler</h1> +<p> + <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> + <source src="/videos/inria2015interview.webm" type="video/webm"> + <source src="/videos/inria2015interview.ogv" type="video/ogv"> + </video> +</p> +<p> + <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png') }}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. +</p> +{% endblock body_content %} diff --git a/news/2015-11.inc b/news/2015-11.inc deleted file mode 100644 index 8be3e405..00000000 --- a/news/2015-11.inc +++ /dev/null @@ -1,10 +0,0 @@ - <h3>2015-11: Christian Grothoff's explains the goals behind Taler</h3> - <p> - <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> - <source src="/videos/inria2015interview.webm" type="video/webm"> - <source src="/videos/inria2015interview.ogv" type="video/ogv"> - </video> - </p> - <p> - <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png') }}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. - </p> diff --git a/news/2015-12.html.j2 b/news/2015-12.html.j2 new file mode 100644 index 00000000..f443e614 --- /dev/null +++ b/news/2015-12.html.j2 @@ -0,0 +1,10 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2015-12: Taler Demo for Chrome/Chromium online</h1> +<p> + We finally have a first simple demo for Taler online. The Firefox-variant + still needs some love, but you can start to try out the demo using + the Chrome/Chromium browser at <a href="https://demo.taler.net/">demo.taler.net</a>. + Please provide feedback to our <a href="https://gnunet.org/bugs/">bug tracker</a>. +</p> +{% endblock body_content %} diff --git a/news/2015-12.inc b/news/2015-12.inc deleted file mode 100644 index 401166c4..00000000 --- a/news/2015-12.inc +++ /dev/null @@ -1,5 +0,0 @@ - <h3>2015-12: Taler Demo for Chrome/Chromium online</h3> - <p>We finally have a first simple demo for Taler online. The Firefox-variant - still needs some love, but you can start to try out the demo using - the Chrome/Chromium browser at <a href="https://demo.taler.net/">demo.taler.net</a>. - Please provide feedback to our <a href="https://gnunet.org/bugs/">bug tracker</a>.</p>
\ No newline at end of file diff --git a/news/2016-06.html.j2 b/news/2016-06.html.j2 new file mode 100644 index 00000000..0a19549f --- /dev/null +++ b/news/2016-06.html.j2 @@ -0,0 +1,28 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2016-06: GNU Taler 0.0.0 released</h1> +<p> + We have reached our first big milestone, the 0.0.0 release! + The release includes implementations of a bank, exchange, merchant and wallet + and is available on the GNU FTP mirrors. +</p> +<p> + While the exchange implements the + complete protocol, the implementations of merchant and wallet are both + fundamentally incomplete and still lack key features, including important + error handling. GNU Taler still lacks an implementation of an auditor or + logic for integration with "real" banks. + Thus, this release should not yet be used for actual financial + transactions. +</p> +<p> + That said, you can already setup your own functional payment system + and run your own toy currency -- or just try out the demo using + the Chrome/Chromium browser at <a href="https://demo.taler.net/">demo.taler.net</a>. +</p> +<p> + Please provide feedback to our <a href="https://gnunet.org/bugs/">bug tracker</a>. + There, you can also find our <a href="https://gnunet.org/bugs/roadmap_page.php">roadmap</a> + which contains a list of known open issues and our plans for the near future. +</p> +{% endblock body_content %} diff --git a/news/2016-06.inc b/news/2016-06.inc deleted file mode 100644 index 72744aa6..00000000 --- a/news/2016-06.inc +++ /dev/null @@ -1,21 +0,0 @@ - <h3>2016-06: GNU Taler 0.0.0 released</h3> - <p>We have reached our first big milestone, the 0.0.0 release! - The release includes implementations of a bank, exchange, merchant and wallet - and is available on the GNU FTP mirrors. - <br> - While the exchange implements the - complete protocol, the implementations of merchant and wallet are both - fundamentally incomplete and still lack key features, including important - error handling. GNU Taler still lacks an implementation of an auditor or - logic for integration with "real" banks. - Thus, this release should not yet be used for actual financial - transactions. - <br> - That said, you can already setup your own functional payment system - and run your own toy currency -- or just try out the demo using - the Chrome/Chromium browser at <a href="https://demo.taler.net/">demo.taler.net</a>. - <br> - Please provide feedback to our <a href="https://gnunet.org/bugs/">bug tracker</a>. - There, you can also find our <a href="https://gnunet.org/bugs/roadmap_page.php">roadmap</a> - which contains a list of known open issues and our plans for the near future. - </p> diff --git a/news/2016-08.html.j2 b/news/2016-08.html.j2 new file mode 100644 index 00000000..e0e303d9 --- /dev/null +++ b/news/2016-08.html.j2 @@ -0,0 +1,8 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2016-08: Taler Systems S.A. created</h1> +<p> + We now have a business entity for Taler. Potential investors may + contact the executive team at <a href="mailto:clevel@taler.net">clevel@taler.net</a>. +</p> +{% endblock body_content %} diff --git a/news/2016-08.inc b/news/2016-08.inc deleted file mode 100644 index 00bbe4a9..00000000 --- a/news/2016-08.inc +++ /dev/null @@ -1,3 +0,0 @@ - <h3>2016-08: Taler Systems S.A. created</h3> - <p>We now have a business entity for Taler. Potential investors may - contact the executive team at <a href="mailto:clevel@taler.net">clevel@taler.net</a>.</p> diff --git a/news/2016-09.html.j2 b/news/2016-09.html.j2 new file mode 100644 index 00000000..c1a91513 --- /dev/null +++ b/news/2016-09.html.j2 @@ -0,0 +1,13 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2016-09: Taler Web Payments paper published</h1> +<p> + We just finished the camera-ready version of our paper on how to use Taler + for Web payments. This paper does not discuss the cryptography + behind Taler, but focuses on the practical aspects of how the + wallet and the merchants interact over the Web. Hence, this + paper should be a good read for anyone who wants to integrate + Taler support with their Web site. We have posted the + paper <a href="https://gnunet.org/taler2016space">here</a>. +</p> +{% endblock body_content %} diff --git a/news/2016-09.inc b/news/2016-09.inc deleted file mode 100644 index d9d67c1e..00000000 --- a/news/2016-09.inc +++ /dev/null @@ -1,7 +0,0 @@ - <h3>2016-09: Taler Web Payments paper published</h3> - <p>We just finished the camera-ready version of our paper on how to use Taler - for Web payments. This paper does not discuss the cryptography behind - Taler, but focuses on the practical aspects of how the wallet and the merchants - interact over the Web. Hence, this paper should be a good read for - anyone who wants to integrate Taler support with their Web site. - We have posted the paper <a href="https://gnunet.org/taler2016space">here</a>.</p>
\ No newline at end of file diff --git a/news/2016-10.html.j2 b/news/2016-10.html.j2 new file mode 100644 index 00000000..3f381df0 --- /dev/null +++ b/news/2016-10.html.j2 @@ -0,0 +1,9 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2016-10: Taler Wallet for Firefox online</h1> +<p> + We now have a first version of the Taler wallet for Firefox. + For now, a development build of Firefox is required. + Installation instructions are on the <a href="/wallet">Wallet page</a>. +</p> +{% endblock body_content %} diff --git a/news/2016-10.inc b/news/2016-10.inc deleted file mode 100644 index 8ad14484..00000000 --- a/news/2016-10.inc +++ /dev/null @@ -1,4 +0,0 @@ - <h3>2016-10: Taler Wallet for Firefox online</h3> - <p>We now have a first version of the Taler wallet for Firefox. - For now, a development build of Firefox is required. - Installation instructions are on the <a href="/wallet">Wallet page</a>.</p> diff --git a/news/2016-12.html.j2 b/news/2016-12.html.j2 new file mode 100644 index 00000000..418d8bc7 --- /dev/null +++ b/news/2016-12.html.j2 @@ -0,0 +1,13 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2016-12: Christian Grothoff explains Taler at hasgeek in Bangalore</h1> +<p> + <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="720" controls="controls"> + <source src="/videos/grothoff2016bangalore.webm" type="video/webm"> + <source src="/videos/grothoff2016bangalore.ogv" type="video/ogv"> + </video> +</p> +<p> + <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by hasgeek</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. +</p> +{% endblock body_content %} diff --git a/news/2016-12.inc b/news/2016-12.inc deleted file mode 100644 index 79993b7c..00000000 --- a/news/2016-12.inc +++ /dev/null @@ -1,10 +0,0 @@ - <h3>2016-12: Christian Grothoff explains Taler at hasgeek in Bangalore</h3> - <p> - <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="720" controls="controls"> - <source src="/videos/grothoff2016bangalore.webm" type="video/webm"> - <source src="/videos/grothoff2016bangalore.ogv" type="video/ogv"> - </video> - </p> - <p> - <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by hasgeek</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. - </p> diff --git a/news/2017-01.html.j2 b/news/2017-01.html.j2 new file mode 100644 index 00000000..6708b3c6 --- /dev/null +++ b/news/2017-01.html.j2 @@ -0,0 +1,8 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2017-01: Taler Documentation pages updated</h1> +<p> + <a href="https://docs.taler.net/">docs.taler.net</a> is now + online, providing a new portal to the Taler system documentation. +</p> +{% endblock body_content %} diff --git a/news/2017-01.inc b/news/2017-01.inc deleted file mode 100644 index 49040a1a..00000000 --- a/news/2017-01.inc +++ /dev/null @@ -1,3 +0,0 @@ - <h3>2017-01: Taler Documentation pages updated</h3> - <p><a href="https://docs.taler.net/">docs.taler.net</a> is now - online, providing a new portal to the Taler system documentation.</p> diff --git a/news/2017-02.html.j2 b/news/2017-02.html.j2 new file mode 100644 index 00000000..a7e02c75 --- /dev/null +++ b/news/2017-02.html.j2 @@ -0,0 +1,13 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2017-02: Florian Dold explains Taler at 50p in Bangalore</h1> +<p> + <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> + <source src="/videos/dold50p.webm" type="video/webm"> + <source src="/videos/dold50p.ogv" type="video/ogv"> + </video> +</p> +<p> + <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Florian Dold, produced by 50p</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. +</p> +{% endblock body_content %} diff --git a/news/2017-02.inc b/news/2017-02.inc deleted file mode 100644 index 5f4082a3..00000000 --- a/news/2017-02.inc +++ /dev/null @@ -1,10 +0,0 @@ - <h3>2017-02: Florian Dold explains Taler at 50p in Bangalore</h3> - <p> - <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> - <source src="/videos/dold50p.webm" type="video/webm"> - <source src="/videos/dold50p.ogv" type="video/ogv"> - </video> - </p> - <p> - <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Florian Dold, produced by 50p</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. - </p> diff --git a/news/2017-03.html.j2 b/news/2017-03.html.j2 new file mode 100644 index 00000000..84f87baa --- /dev/null +++ b/news/2017-03.html.j2 @@ -0,0 +1,13 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2017-03: Sva explains GNU Taler at FOSSASIA in Singapore</h1> +<p> + <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> + <source src="/videos/taler2017fossasia.webm" type="video/webm"> + <source src="/videos/taler2017fossasia.ogv" type="video/ogv"> + </video> +</p> +<p> + <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by Engineers.SG</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. +</p> +{% endblock body_content %} diff --git a/news/2017-03.inc b/news/2017-03.inc deleted file mode 100644 index 37a99ef0..00000000 --- a/news/2017-03.inc +++ /dev/null @@ -1,10 +0,0 @@ - <h3>2017-03: Sva explains GNU Taler at FOSSASIA in Singapore</h3> - <p> - <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> - <source src="/videos/taler2017fossasia.webm" type="video/webm"> - <source src="/videos/taler2017fossasia.ogv" type="video/ogv"> - </video> - </p> - <p> - <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by Engineers.SG</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. - </p> diff --git a/news/2017-04.html.j2 b/news/2017-04.html.j2 new file mode 100644 index 00000000..f02c80d5 --- /dev/null +++ b/news/2017-04.html.j2 @@ -0,0 +1,14 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2017-04: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child's play</h1> +<p> + <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> + <source src="/videos/taler2017eh.webm" type="video/webm"> + <source src="/videos/taler2017eh.ogv" type="video/ogv"> + <source src="/videos/taler2017eh.mp4" type="video/mp4"> + </video> +</p> +<p> + <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. +</p> +{% endblock body_content %} diff --git a/news/2017-04.inc b/news/2017-04.inc deleted file mode 100644 index b16b3b74..00000000 --- a/news/2017-04.inc +++ /dev/null @@ -1,11 +0,0 @@ - <h3>2017-04: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child's play</h3> - <p> - <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> - <source src="/videos/taler2017eh.webm" type="video/webm"> - <source src="/videos/taler2017eh.ogv" type="video/ogv"> - <source src="/videos/taler2017eh.mp4" type="video/mp4"> - </video> - </p> - <p> - <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. - </p> diff --git a/news/2017-08.html.j2 b/news/2017-08.html.j2 new file mode 100644 index 00000000..3eb78841 --- /dev/null +++ b/news/2017-08.html.j2 @@ -0,0 +1,14 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2017-08: We explain GNU Taler at SHA 2017</h1> +<p> + <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> + <source src="/videos/sha2017taler.webm" type="video/webm"> + <source src="/videos/sha2017taler.ogv" type="video/ogv"> + <source src="/videos/sha2017taler.mp4" type="video/mp4"> + </video> +</p> +<p> + <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jeff Burdges, Christian Grothoff and Sereni-T, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. +</p> +{% endblock body_content %} diff --git a/news/2017-08.inc b/news/2017-08.inc deleted file mode 100644 index 6d78cf4b..00000000 --- a/news/2017-08.inc +++ /dev/null @@ -1,11 +0,0 @@ - <h3>2017-08: We explain GNU Taler at SHA 2017</h3> - <p> - <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls"> - <source src="/videos/sha2017taler.webm" type="video/webm"> - <source src="/videos/sha2017taler.ogv" type="video/ogv"> - <source src="/videos/sha2017taler.mp4" type="video/mp4"> - </video> - </p> - <p> - <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jeff Burdges, Christian Grothoff and Sereni-T, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>. - </p> diff --git a/news/2017-10.html.j2 b/news/2017-10.html.j2 new file mode 100644 index 00000000..e9d847ea --- /dev/null +++ b/news/2017-10.html.j2 @@ -0,0 +1,14 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2017-10: GNU Taler v0.4.0 released</h1> +<p> + We are happy to announce the release GNU Taler v0.4.0 with support for customer + refunds, protocol versioning, incremental key material download, returning funds + from the wallet directly back into one's bank account, + and various other minor improvements. The Chrome and Chromium wallets + are available for download via the App store. The exchange, merchant + backend and bank components are on the GNU FTP mirrors. Note that the + Firefox wallet will take a few more days to become available in the + App store due to the Mozilla review process. +</p> +{% endblock body_content %} diff --git a/news/2017-10.inc b/news/2017-10.inc deleted file mode 100644 index d5d5b9f9..00000000 --- a/news/2017-10.inc +++ /dev/null @@ -1,9 +0,0 @@ - <h3>2017-10: GNU Taler v0.4.0 released</h3> - <p>We are happy to announce the release GNU Taler v0.4.0 with support for customer - refunds, protocol versioning, incremental key material download, returning funds - from the wallet directly back into one's bank account, - and various other minor improvements. The Chrome and Chromium wallets - are available for download via the App store. The exchange, merchant - backend and bank components are on the GNU FTP mirrors. Note that the - Firefox wallet will take a few more days to become available in the - App store due to the Mozilla review process.</p> diff --git a/news/2018-04.html.j2 b/news/2018-04.html.j2 new file mode 100644 index 00000000..4fdba8dc --- /dev/null +++ b/news/2018-04.html.j2 @@ -0,0 +1,19 @@ +{% extends "common/news.j2" %} +{% block body_content %} +<h1>2018-04: GNU Taler v0.5.0 released</h1> +<p> + We are happy to announce the release of GNU Taler v0.5.0. + The main new feature is customer tipping, which allows + merchants to pay small rewards directly into a customer's + wallet. Technical improvements include numerous performance + improvements and bug fixes, as well as a new, simpler to use + API for merchants that also enables the implementation of + GNU Taler wallets on platforms that do not support + WebExtensions. +</p> +<p> + The Chrome and Chromium wallets are available for download + via the App store. The exchange, merchant backend and bank + components are on the GNU FTP mirrors. +</p> +{% endblock body_content %} diff --git a/news/2018-04.inc b/news/2018-04.inc deleted file mode 100644 index 7f2f6fa8..00000000 --- a/news/2018-04.inc +++ /dev/null @@ -1,15 +0,0 @@ - <h3>2018-04: GNU Taler v0.5.0 released</h3> - <p> - We are happy to announce the release of GNU Taler v0.5.0. - The main new feature is customer tipping, which allows - merchants to pay small rewards directly into a customer's - wallet. Technical improvements include numerous performance - improvements and bug fixes, as well as a new, simpler to use - API for merchants that also enables the implementation of - GNU Taler wallets on platforms that do not support - WebExtensions. - <br> - The Chrome and Chromium wallets are available for download - via the App store. The exchange, merchant backend and bank - components are on the GNU FTP mirrors. - </p> diff --git a/news/index.html.j2 b/news/index.html.j2 new file mode 100644 index 00000000..cffcaf98 --- /dev/null +++ b/news/index.html.j2 @@ -0,0 +1,28 @@ +{% extends "common/base.j2" %} +{% block body_content %} + {% import 'inc/news.macro.j2' as news %} + <div class="container-fluid"> + <div class="container"> + <article> + <div class="row"> + <div class="container text-center"> + <h1>{{ _("News") }}<a name="news"></a></h1> + <section> + <p> + News posts published by Taler about changes related to + GNUnet, releases, and events – <a href="{{ url_localized('rss.xml')}}">subscribe to our RSS feed</a> + </p> + </section> + </div> + </div> + <div class="row"> + {% for item in newsdata %} + <div class="col-lg-4"> + {{ news.newspreview(item) }} + </div> + {% endfor %} + </div> + </article> + </div> + </div> +{% endblock body_content %} diff --git a/favicon.ico b/static/favicon.ico Binary files differindex 6702382d..6702382d 100644 --- a/favicon.ico +++ b/static/favicon.ico diff --git a/robots.txt b/static/robots.txt index 0a639917..0a639917 100644 --- a/robots.txt +++ b/static/robots.txt diff --git a/styles.css b/static/styles.css index 2307a5f7..2307a5f7 100644 --- a/styles.css +++ b/static/styles.css diff --git a/template.py b/template.py deleted file mode 100755 index d7be569f..00000000 --- a/template.py +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env python3 -# coding: utf-8 -# -# This file is in the public domain. -# -# This script runs the jinja2 templating engine on an input template-file -# using the specified locale for gettext translations, and outputs -# the resulting (HTML) ouptut-file. -# -# Note that the gettext files need to be prepared first. This script -# is thus to be invoked via the Makefile. -import os -import os.path -import sys -import re -import gettext -import jinja2 -import glob -import codecs -import os -sys.path.append(os.getcwd()) -import i18nfix - -env = jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(__file__)), - extensions=["jinja2.ext.i18n"], - lstrip_blocks=True, - trim_blocks=True, - undefined=jinja2.StrictUndefined, - autoescape=False) - -langs_full = {"en": "English", - "fr": "Français", - "it": "Italiano", - "es": "Español", - "de": "Deutsch", - "ru": "Ру́сский язы́к", - "pt": "Português"} - -for in_file in glob.glob("template/*.j2"): - name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups() - tmpl = env.get_template(in_file) - - def self_localized(other_locale): - """ - Return URL for the current page in another locale. - """ - return "../" + other_locale + "/" + in_file.replace('template/', '').rstrip(".j2") - - def url_localized(filename): - return "../" + locale + "/" + filename - - def svg_localized(filename): - lf = filename + "." + locale + ".svg" - if "en" == locale or not os.path.isfile (lf): - return "../" + filename + ".svg" - else: - return "../" + lf - - def url(x): - # TODO: look at the app root environment variable - # TODO: check if file exists - return "../" + x - - for l in glob.glob("locale/*/"): - locale = os.path.basename(l[:-1]) - - tr = gettext.translation("messages", - localedir="locale", - languages=[locale]) - - tr.gettext = i18nfix.wrap_gettext(tr.gettext) - - env.install_gettext_translations(tr, newstyle=True) - - content = tmpl.render( - docshost="docs.taler.net", - lang=locale, - lang_full=langs_full[locale], - url=url, - self_localized=self_localized, - url_localized=url_localized, - svg_localized=svg_localized, - filename=name + "." + ext) - out_name = "./rendered/" + locale + "/" + in_file.replace('template/', '').rstrip(".j2") - os.makedirs("./rendered/" + locale, exist_ok=True) - with codecs.open(out_name, "w", encoding='utf-8') as f: - f.write(content) diff --git a/template/architecture.html.j2 b/template/architecture.html.j2 index d9170b20..27107683 100644 --- a/template/architecture.html.j2 +++ b/template/architecture.html.j2 @@ -1,6 +1,6 @@ {% extends "common/base.j2" %} {% block body_content %} -<!-- Jumbotron --> + <div class="jumbotron"> <div class="container text-center"> <h1>{{ _("Taler System Architecture") }}</h1> diff --git a/template/bibliography.html.j2 b/template/bibliography.html.j2 index af91b8d6..10654830 100644 --- a/template/bibliography.html.j2 +++ b/template/bibliography.html.j2 @@ -1,48 +1,50 @@ {% extends "common/base.j2" %} {% block body_content %} -<div class="container"> -<h1>{{ _("GNU Taler Bibliography")}}</h1> - -<h2>The GNU Taler System: Practical and Provably Secure Electronic Payments</h2> -<p> -<a href="{{ url('papers/thesis-dold-phd-2019.pdf') }}"><img border=0 align=right alt="PDF" width=32 height=32 src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} Florian Dold<br> -PhD Thesis, 2019<br> -</p> - -<h2>Blind Signatures for Untraceable Payments</h2> -<p> -<a href="{{ url('papers/chaum-blind-signatures.pdf') }}"><img border=0 align=right alt="PDF" width=32 height=32 src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} David Chaum<br> -CRYPTO '82<br> -</p> - -<h2>The One-More-RSA-Inversion Problems and the Security of Chaum's Blind Signature Scheme</h2> -<p> -<a href="{{ url('papers/bellare_blindsigs_proof.pdf') }}"><img border=0 align=right alt="PDF" width=32 height=32 src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} M. Bellare, C. Namprempre, D. Pointcheval {{ _("and") }} M. Semanko<br> -Financial Cryptography '01<br> -</p> - -<h2>Enabling Secure Web Payments with GNU Taler</h2> -<p> -<a href="{{ url('papers/taler2016space.pdf') }}"><img border=0 align=right width=32 height=32 alt="PDF" src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} Jeff Burdges, Florian Dold, Christian Grothoff {{ _("and") }} Marcello Stanisci<br> -SPACE 2016<br> -</p> - -<h2>Digital cash and privacy: What are the alternatives to Libra?</h2> -<p> -<a href="https://www.media.mit.edu/posts/digital-cash-and-privacy-what-are-the-alternatives-to-libra/"><img border=0 align=right alt="HTML" width=32 height=32 src="{{ url('images/html.svg') }}"></a> -{{_("by")}} Christian Grothoff {{ _("and") }} Alex Pentland<br> -MIT Media Lab, 2019<br> -</p> - -<h2>Refreshing Coins for Giving Change and Refunds in Chaum-style Anonymous Payment Systems</h2> -<p> -{{_("by")}} Florian Dold, Sree Harsha Totakura, Benedikt Müller, Jeff Burdges {{ _("and") }} Christian Grothoff<br> -<em>{{_("available upon request")}}</em><br> -</p> - -</div> + <article class="container"> + <header> + <h1>{{ _("GNU Taler Bibliography")}}</h1> + </header> + <div class="row"> + <div class="col-lg-12"> + {% for item in conf["paperslist"] %} + <section> + <header> + <h2>{{ item['name']|e }}</h2> + </header> + <div class="row container"> + <div class="col"> + <p> + {% if item['url_pdf'] %} + <a href="{{ url(item['url_pdf']) }}"> + <img border=0 align=right alt="PDF" width=32 height=32 src="{{ url_static('images/pdf.svg') }}"> + </a> + {% endif %} + {% if item['url_html'] %} + <a href="{{ item['url_html'] }}"> + <img border=0 align=right alt="HTML" width=32 height=32 src="{{ url_static('images/html.svg') }}"> + </a> + {% endif %} + {{_("by")}} + {% if item['authors'] %} + {% for name in item['authors'] %} + {{ name|e }} + {% if not loop.last %} + , + {% elif loop.revindex0 == 1 %} + {{ _("and") }} + {% endif %} + {% endfor %} + {% endif %} + <br> + {% if item['kind'] %} {{ item['kind']|e }} {% endif %} + {% if item['year'] %} ({{ item['year'] }}) {% endif %} + {% if item['comment'] %}<br>{{ item['comment'] }} {% endif %} + </p> + </div> + </div> + </section> + {% endfor %} + </div> + </div> + </article> {% endblock body_content %} diff --git a/template/contact.html.j2 b/template/contact.html.j2 index 91c7abe8..b6c64cf0 100644 --- a/template/contact.html.j2 +++ b/template/contact.html.j2 @@ -52,7 +52,7 @@ {% trans %} We track open feature requests and bugs in our {% endtrans %} - <a href="https://gnunet.org/bugs/">{{ _("Bug tracker")}}</a>, + <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 diff --git a/template/copyright.html.j2 b/template/copyright.html.j2 index 8ce7357b..3c580c58 100644 --- a/template/copyright.html.j2 +++ b/template/copyright.html.j2 @@ -1,44 +1,39 @@ {% extends "common/base.j2" %} {% block body_content %} -<!-- Jumbotron --> -<div class="jumbotron"> - <div class="container text-center"> - <h1>{{ _("Copyright Assignment") }}</h1> - <!-- Note: source of the pdf/copyright.pdf is in gitolite-admin/ --> - <p> - {% trans %} - Contributors to GNU Taler with Git access must sign the - <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> - {% trans %} - of the GNUnet and GNU Taler projects is satisfied. - {% endtrans %} - </p> + + <div class="jumbotron"> + <div class="container text-center"> + <h1>{{ _("Copyright Assignment") }}</h1> + <p> + {% trans %} + Contributors to GNU Taler with Git access must sign the + <a href="/pdf/copyright.pdf">copyright assignment</a> + to ensure that the + <a href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative development</a> + of the GNUnet and GNU Taler projects is satisfied. + {% endtrans %} + </p> + </div> + <div class="container"> + <p> + {% trans %} + The agreements ensure that the code will continue to be made + available under free software licenses, but gives developers + the freedom to move code between GNUnet and GNU Taler without + worrying about licenses and the company the ability to + dual-license (for example, so that we can distribute via + App-stores that are hostile to free software). + {% endtrans %} + </p> + <p> + {% trans %} + Minor contributions (basically, anyone without Git access) do + not require copyright assignment. Pseudonymous contributions are + accepted, in this case simply sign the agreement with your + pseudonym. Scanned copies are sufficient, but snail mail is + preferred. + {% endtrans %} + </p> + </div> </div> - <div class="container"> - <p> - {% trans %} - The agreements ensure that the code will continue to be made - available under free software licenses, but gives developers - the freedom to move code between GNUnet and GNU Taler without - worrying about licenses and the company the ability to - dual-license (for example, so that we can distribute via - App-stores that are hostile to free software). - {% endtrans %} - </p> - <p> - {% trans %} - Minor contributions (basically, anyone without Git access) do - not require copyright assignment. Pseudonymous contributions are - accepted, in this case simply sign the agreement with your - pseudonym. Scanned copies are sufficient, but snail mail is - preferred. - {% endtrans %} - </p> - </div> -</div> {% endblock body_content %} diff --git a/template/developers.html.j2 b/template/developers.html.j2 index 0fc1f67a..0a52128b 100644 --- a/template/developers.html.j2 +++ b/template/developers.html.j2 @@ -36,13 +36,13 @@ Taler is designed to work on the Internet. To ensure that Taler payments can work with restrictive network setups, Taler uses a RESTful - protocol over HTTP or HTTPS. Taler's security does + protocol over HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but obviously merchants may choose to offer HTTPS for consistency and because it generally is better for privacy compared to HTTP. Taler uses JSON to encode structure data, making it easy to integrate Taler - with existing Web applications. Taler's protocol + with existing Web applications. Taler's protocol is documented in detail at {% endtrans %} <a href="https://docs.taler.net/">docs.taler.net</a>. @@ -91,7 +91,7 @@ {% trans %} Technical papers can be found in our {% endtrans %} - <a href="bibliography.html">{{ _("bibliography")}}</a>. + <a href="{{ url_localized('bibliography.html') }}">{{ _("bibliography")}}</a>. </p> </div> <div class="col-lg-4"> @@ -146,7 +146,7 @@ <h2>{{ _("Technical Presentation") }}</h2> <div class="row"> <div class="col-lg-4"> - <a href="{{ url('presentations/tech.pdf') }}"><img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') }}"><br><p align="center">{{ _("Download") }}</p></a> + <a href="{{ url('presentations/tech.pdf') }}"><img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url_static('images/pdf.svg') }}"><br><p align="center">{{ _("Download") }}</p></a> </div> <div class="col-lg-4" id="canvas-left" style="display:none"> <canvas id="the-canvas-left"></canvas> @@ -154,8 +154,8 @@ <div class="col-lg-4" id="canvas-right" style="display:none"> <canvas id="the-canvas-right"></canvas> </div> - <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') }}"></script> - <script type="text/javascript" src="{{ url('dist/js/pdf-view-tech.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf.min.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf-view-tech.js') }}"></script> </div> </div> </div> @@ -172,7 +172,7 @@ {% endtrans %} </p> - <img src="/images/taler-arch-full.svg" alt="{{_("system overview")}}" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> + <img src="{{ url_static('images/taler-arch-full.svg') }}" alt="{{_("system overview")}}" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> <ol> <li> {% trans %} @@ -189,7 +189,7 @@ <li> {% trans %} Once the exchange has received the wire - transfer, it allows the customer's electronic + transfer, it allows the customer's electronic wallet to <b>withdraw</b> electronic coins. The electronic coins are digital representations of the original currency from @@ -293,7 +293,7 @@ </li> </ol> <div class="col"> - <img class="img-fluid" src="../images/diagram-complex.png"> + <img class="img-fluid" src="{{ url_static('images/diagram-complex.png') }}"> </div> </div> </div> <!-- /container --> diff --git a/template/docs.html.j2 b/template/docs.html.j2 index 83fa2e53..c6b55547 100644 --- a/template/docs.html.j2 +++ b/template/docs.html.j2 @@ -1,6 +1,6 @@ {% extends "common/base.j2" %} {% block body_content %} - +{% for siteconfitem in siteconf %} <div class="container"> <div class="row"> <div class="col"> @@ -33,51 +33,51 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/taler-merchant-manual.html"> - <img src="../icons/icon-backend.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-merchant-manual.html"> + <img src="{{ url('icons/icon-backend.svg') }}" height=60> <h3>{{ _("Merchant Backend Administration")}}</h3> </a> {% trans %} Tutorial and manual for operating a merchant. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem['docshost'] }}/pdf/taler-merchant-manual.pdf">PDF</a>. </div> <div class="col-3"> - <a href="https://{{ docshost }}/taler-merchant-api-tutorial.html"> - <img src="../icons/icon-market.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-merchant-api-tutorial.html"> + <img src="{{ url('icons/icon-market.svg') }}" height=60> <h3>{{ _("Merchant API Tutorial") }}</h3> </a> {% trans %} Tutorial for processing Taler payments using the merchant backend API. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>. + <a href="https://{{ siteconfitem['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> + <a href="https://{{ siteconfitem['docshost'] }}/taler-exchange-manual.html"> + <img src="{{ url('icons/icon-exchange.svg') }}" height=60> <h3>{{ _("Exchange")}}</h3> </a> {% trans %} - Operator's manual for the GNU Taler exchange. + Operator's manual for the GNU Taler exchange. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem['docshost'] }}/pdf/taler-exchange-manual.pdf">PDF</a>. </div> <div class="col-3"> - <a href="https://{{ docshost }}/taler-bank-manual.html"> - <img src="../icons/icon-bank.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-bank-manual.html"> + <img src="{{ url('icons/icon-bank.svg') }}" height=60> <h3>{{ _("Bank Integration") }}</h3> </a> {% trans %} Manual for tightly integrating Taler with banking applications. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem['docshost'] }}/pdf/taler-bank-manual.pdf">PDF</a>. </div> </div> @@ -87,15 +87,15 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/taler-backoffice-manual.html"> - <img src="../icons/icon-backoffice.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-backoffice-manual.html"> + <img src="{{ url('icons/icon-backoffice.svg') }}" height=60> <h3>{{ _("Back office") }}</h3> </a> {% trans %} Manual to run the back-office Web application. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem['docshost'] }}/pdf/taler-backoffice-manual.pdf">PDF</a>. </div> </div> @@ -113,8 +113,8 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/core/index.html"> - <img src="../icons/icon-api.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/core/index.html"> + <img src="{{ url('icons/icon-api.svg') }}" height=60> <h3>{{ _("HTTP API")}}</h3> </a> {% trans %} @@ -123,15 +123,15 @@ </div> <div class="col-3"> - <a href="https://{{ docshost }}/onboarding.html"> - <img src="../icons/icon-developers.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/onboarding.html"> + <img src="{{ url('icons/icon-developers.svg') }}" height=60> <h3>{{ _("Onboarding")}}</h3> </a> {% trans %} Description of our taler.net setup and how to contribute. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>. + <a href="https://{{ siteconfitem['docshost'] }}/pdf/onboarding.pdf">PDF</a>. </div> </div> @@ -150,7 +150,7 @@ <div class="row"> <div class="col-3"> <a href="https://lists.gnu.org/mailman/listinfo/taler"> - <img src="../icons/icon-share.svg" height=60> + <img src="{{ url('icons/icon-share.svg') }}" height=60> <h3>{{ _("Mailing List")}}</h3> </a> {{ _("The official GNU Taler mailing list.") }} @@ -158,7 +158,7 @@ <div class="col-3"> <a href="https://webchat.freenode.net/?channels=taler"> - <img src="../icons/icon-share.svg" height=60> + <img src="{{ url('icons/icon-share.svg') }}" height=60> <h3>{{ _("IRC")}}</h3> </a> {{ _("Our IRC channel is #taler on freenode.") }} @@ -166,7 +166,7 @@ <div class="col-3"> <a href="https://gnunet.org/bugs/"> - <img src="../icons/icon-share.svg" height=60> + <img src="{{ url('icons/icon-share.svg') }}" height=60> <h3>{{ _("Bug Tracker")}}</h3> </a> {{ _("Our bug tracker for bugs and feature request.") }} @@ -190,7 +190,7 @@ <div class="col-3"> <a href="https://git.taler.net"> - <img src="../icons/icon-code.svg" height=60> + <img src="{{ url('icons/icon-code.svg') }}" height=60> <h3>{{ _("Git repositories") }}</h3> </a> {{ _("Git repositories for all of GNU Taler.") }} @@ -199,5 +199,5 @@ </div> </div> - +{% endfor %} {% endblock body_content %} diff --git a/template/faq.html.j2 b/template/faq.html.j2 index 3a9349da..d1f5cfa9 100644 --- a/template/faq.html.j2 +++ b/template/faq.html.j2 @@ -117,7 +117,7 @@ <h2>{{ _("Does Taler work with international payments?") }}</h2> <p> {% trans %} - Taler's wallet supports multiple currencies, but the system + 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 diff --git a/template/features.html.j2 b/template/features.html.j2 index e4c44485..c97517ee 100644 --- a/template/features.html.j2 +++ b/template/features.html.j2 @@ -42,7 +42,7 @@ 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. + on the merchant's Website. {% endtrans %} </p> @@ -57,7 +57,7 @@ </p> </div> <div class="col"> - <img class="img-fluid" src="../images/diagram-simple.png"> + <img class="img-fluid" src="{{ url_static('images/diagram-simple.png') }}"> </div> </div> </div> @@ -71,7 +71,7 @@ {% trans %} 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 + must be added to the wallet's balance by some other means of payment. {% endtrans %} </p> @@ -97,8 +97,8 @@ To receive Taler payments, a merchant needs a bank account in the desired currency. We provide supporting software in various programming languages to make the integration painless. - The merchant's backend for Taler transaction processing can run - on the merchant's premises or be hosted by a third party. + The merchant's backend for Taler transaction processing can run + on the merchant's premises or be hosted by a third party. {% endtrans %} </p> <p> @@ -144,7 +144,7 @@ Taler does not introduce a new currency. Taler uses a digital wallet storing coins and payment service providers with escrow accounts in existing currencies. - Thus, Taler's cryptographic coins correspond to existing + Thus, Taler's cryptographic coins correspond to existing currencies, such as US Dollars, Euros or even Bitcoins. {% endtrans %} </p> @@ -170,7 +170,7 @@ <p> {% trans %} - When using Taler, merchant's revenue is transparent for tax + 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. diff --git a/template/glossary.html.j2 b/template/glossary.html.j2 index cb5862e1..81b593f7 100644 --- a/template/glossary.html.j2 +++ b/template/glossary.html.j2 @@ -54,14 +54,14 @@ {% trans %} a `coin` is dirty if its public key may be known to an entity other than the customer, thereby creating the danger of some entity being able to - link multiple transactions of coin's owner if the coin is not refreshed + link multiple transactions of coin's owner if the coin is not refreshed first {% endtrans %} </dd> <dt>{{ _("exchange") }}</dt> <dd> {% trans %} - Taler's payment service provider. Issues electronic `coins` during + Taler's payment service provider. Issues electronic `coins` during `withdrawal` and redeems them when they are `deposited` by merchants. {% endtrans %} </dd> @@ -145,7 +145,7 @@ <dd> {% trans %} funds set aside for future use; either the balance of a customer at the - exchange ready for `withdrawal`, or the funds kept in the exchange's bank + exchange ready for `withdrawal`, or the funds kept in the exchange's bank account to cover obligations from coins in circulation {% endtrans %} </dd> @@ -176,7 +176,7 @@ <dt>{{ _("sharing") }}</dt> <dd> {% trans %} - users can share ownership of a `coin` by sharing access to the coin's + users can share ownership of a `coin` by sharing access to the coin's private key, thereby allowing all co-owners to spend the coin at any time. {% endtrans %} diff --git a/template/governments.html.j2 b/template/governments.html.j2 index 1f169d6f..78fbd487 100644 --- a/template/governments.html.j2 +++ b/template/governments.html.j2 @@ -56,7 +56,7 @@ <p> {% trans %} - Taler's payments are cryptographically secured. Thus, + Taler's payments are cryptographically secured. Thus, customers, merchants and the Taler payment service provider (the exchange) can mathematically demonstrate their lawful behavior in court in case of @@ -170,7 +170,7 @@ {% trans %} The amounts of digital coins legitimately withdrawn by customers from the exchange, the value of - non-redeemed digital coins in customer's wallets, the + non-redeemed digital coins in customer's wallets, the value and corresponding wire details of deposit operations performed by merchants with the exchange, and the income of the exchange from transaction fees. diff --git a/template/gsoc-codeless.html.j2 b/template/gsoc-codeless.html.j2 index 74fb05da..c2c297a7 100644 --- a/template/gsoc-codeless.html.j2 +++ b/template/gsoc-codeless.html.j2 @@ -12,13 +12,13 @@ <h2 id="overview">{{ _("Overview") }}</h2> <p> {% trans %} - Codeless payment is a component that sits between the seller's + Codeless payment is a component that sits between the seller's frontend and the GNU Taler merchant backend. This component has a web interface, where payment buttons are configured. Registered merchants can manage their inventory and simultaneously create a - 'Buy Now' button for a specific product. This code can be directly - copy pasted on the seller's frontend and can be used for 'Pay with - Taler'. + 'Buy Now' button for a specific product. This code can be directly + copy pasted on the seller's frontend and can be used for 'Pay with + Taler'. {% endtrans %} </p> </div> @@ -100,7 +100,7 @@ </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%"> + <img src="{{ url_static('images/UseCaseDiagram.png') }}" alt="{{ _("Use Case Diagram")}}" style="float: right; margin: 5px 5px 5px 5px;" width="100%"> </div> </div> <!-- /container --> @@ -191,15 +191,15 @@ <h2 id="documentation">{{ _("Screenshots") }}</h2> <div class="col-lg-4"> <h3>{{ _("Home page")}}</h3> - <img src="{{ url('images/home.png') }}" height="240" align="middle"> + <img src="{{ url_static('images/home.png') }}" height="240" align="middle"> </div> <div class="col-lg-4"> <h3>{{ _("Product page")}}</h3> - <img src="{{ url('images/product.png') }}" height="240" align="middle"> + <img src="{{ url_static('images/product.png') }}" height="240" align="middle"> </div> <div class="col-lg-4"> <h3>{{ _("Shipment Tracking")}}</h3> - <img src="{{ url('images/shipment.png') }}" height="240" align="middle"> + <img src="{{ url_static('images/shipment.png') }}" height="240" align="middle"> </div> </div> </div> diff --git a/template/index.html.j2 b/template/index.html.j2 index 59937c6a..e74f82cd 100644 --- a/template/index.html.j2 +++ b/template/index.html.j2 @@ -1,17 +1,19 @@ {% extends "common/base.j2" %} {% block body_content %} - + {% import 'inc/news.macro.j2' as news %} <div class="container"> <div class="row justify-content-center"> <div class="col-8"> - <img src="../images/logo-2018-dold.svg"> + <img src="{{ url_static('images/logo-2018-dold.svg') }}"> </div> </div> <div class="row justify-content-center text-center"> <div class="col-8"> - <a href="news.html">2018-04: GNU Taler v0.5.0 released</a> + {% for item in newsdata[:1] %} + {{ news.tinylinkpreview(item, prefix="news/") }} + {% endfor %} </div> </div> @@ -23,23 +25,23 @@ <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"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Payments without registration")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Data protection by default")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Fraud eliminated by design")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Not a new currency!")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Empowers communities to run their own payment infrastructure")}} </li> </ul> @@ -47,7 +49,7 @@ <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;" /> + <img class="img-fluid" src="{{ url_static('images/stock1s.jpg') }}" style="border-radius: 1cm;" /> </div> </div> </div> diff --git a/template/investors.html.j2 b/template/investors.html.j2 index 784d9897..4fb50259 100644 --- a/template/investors.html.j2 +++ b/template/investors.html.j2 @@ -36,14 +36,11 @@ <p> {% trans %} We are currently supported by - {% endtrans %} - <a href="http://www.inria.fr/">Inria</a>, - {% trans %} + <a href="http://www.inria.fr/">Inria</a>, the French national institute for research in informatics and automation, and the + <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>. {% endtrans %} - <!-- They do have a German name though, allow translation? --> - <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>. </p> </div> <div class="col-lg-4"> @@ -54,7 +51,7 @@ All transactions in Taler are secured using <a href="bibliography.html">modern cryptography</a> and trust in all parties is minimized. Financial damage is bounded - (for customers, merchants and the exchange) even in the case that + (for customers, merchants and the exchange) even in the case that systems are compromised and private keys are stolen. Databases can be audited for consistency, resulting in either the detection of compromised systems or the demonstration that participants were @@ -88,7 +85,7 @@ <div class="row"> <div class="col-lg-4"> <a href="{{ url('presentations/investors2018.pdf') }}"> - <img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') }}"> + <img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url_static('images/pdf.svg') }}"> <br> <p align="center">{{ _("Download") }}</p> </a> @@ -107,8 +104,8 @@ <div class="col-lg-4" id="canvas-right" style="display:none"> <canvas id="the-canvas-right"></canvas> </div> - <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') }}"></script> - <script type="text/javascript" src="{{ url('dist/js/pdf-view.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf.min.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf-view.js') }}"></script> </div> </div> </div> diff --git a/template/merchants.html.j2 b/template/merchants.html.j2 index 57e14ed5..95836059 100644 --- a/template/merchants.html.j2 +++ b/template/merchants.html.j2 @@ -77,7 +77,7 @@ <p> {% trans %} Taler is uses efficient cryptographic constructions with low - bandwidth and storage requirements. Combined with Taler's strong + bandwidth and storage requirements. Combined with Taler's strong security which makes fraud impossible, Taler payment service providers can operate with very low overhead and thus offer low transaction fees. @@ -100,7 +100,7 @@ <p> {% trans %} Taler prevents tax evasion and money laundering. - Taler's protocols are efficient and do not use wasteful + Taler's protocols are efficient and do not use wasteful proof-of-work calculations. Taler encourages transparency by providing an open standard and free software reference implementations. @@ -144,8 +144,8 @@ {% trans %} The backend <b>signs</b> and <b>stores</b> the complete terms of offers made by the merchant to customers. - For this, the merchant's frontend needs to give the - customer's order in a JSON format to the backend. + For this, the merchant's frontend needs to give the + customer's order in a JSON format to the backend. {% endtrans %} </li> @@ -154,7 +154,7 @@ The backend <b>validates</b> payments received from the wallet and <b>executes</b> them with the Taler payment service provider (the exchange). For this, - the merchant's frontend must pass the payment + the merchant's frontend must pass the payment request through to the Taler backend and check the HTTP status code that is returned. {% endtrans %} diff --git a/template/news.html.j2 b/template/news.html.j2 deleted file mode 100644 index 311f4c15..00000000 --- a/template/news.html.j2 +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "common/base.j2" %} -{% block body_content %} - - <div class="container"> - <div class="col"> - <h1>{{ _("News")}}</h1> - - {% include "news/2018-04.inc" %} - {% include "news/2017-10.inc" %} - {# include "news/2017-08.inc" #} - {# include "news/2017-04.inc" #} - {# include "news/2017-03.inc" #} - {# include "news/2017-02.inc" #} - {% include "news/2017-01.inc" %} - - <a href="old-news.html"><h3>{{ _("More news")}}</h3></a> - </div> - </div> - -{% endblock body_content %} diff --git a/template/old-news.html.j2 b/template/old-news.html.j2 deleted file mode 100644 index 611b4ae8..00000000 --- a/template/old-news.html.j2 +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "common/base.j2" %} -{% block body_content %} - - <div class="jumbotron"> - <div class="container text-center"> - <h1>{{ _("Older News") }}</h1> - <div class="col-lg-12"> - <p> - {% trans %} - This page documents the GNU Taler history. - {% endtrans %} - </p> - </div> - </div> - </div> - - <div class="container"> - <div class="row"> - <div class="col-lg-12"> - - {# - {% include "news/2016-12.inc" %} - #} - {% include "news/2016-10.inc" %} - {% include "news/2016-09.inc" %} - {% include "news/2016-08.inc" %} - {% include "news/2016-06.inc" %} - {% include "news/2015-12.inc" %} - - {# - {% include "news/2015-11.inc" %} - #} - - {% include "news/2015-02.inc" %} - {# - {% include "news/2014-12.inc" %} - #} - {% include "news/2014-11.inc" %} - - </div> - </div> - </div> <!-- /container --> - -{% endblock body_content %} diff --git a/template/principles.html.j2 b/template/principles.html.j2 index f81c01b8..d16a8fb6 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 area of computing, freedom means not using proprietary software") }}"> + <img style="width:20vw;float:right" src="{{ url_static('images/stallman.medium.png') }}" alt="{{ _("... in the area of computing, freedom means not using proprietary software") }}"> </a> <p> {% trans %} @@ -55,7 +55,7 @@ <div class="col-lg-12"> <h2>{{ _("2. Protect the privacy of buyers") }}</h2> <!-- From https://www.pixabay.com/ --> - <img style="width:20vw;float:left;padding:15px" src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/anonymous.jpg') }}" alt="{{_("You deserve some privacy")}}"> <p> {% trans %} Privacy should be guaranteed via technical measures, as opposed to mere @@ -80,7 +80,7 @@ <div class="col-lg-12"> <h2>{{ _("3. Enable the state to tax income and crack down on illegal business activities") }}</h2> <!-- From https://www.pxhere.com/ --> - <img style="width:20vw;float:right;padding:15px" src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/money-laundering.medium.jpg') }}" alt="{{_("Money laundering")}}"> <p> {% trans %} As a payment system must still be legal to operate and use, it must comply @@ -94,7 +94,7 @@ <div class="col-lg-12"> <h2>{{ _("4. Prevent payment fraud") }}</h2> <!-- From https://www.maxpixel.net/ --> - <img style="width:20vw;float:left;padding:15px" src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/fraud.medium.jpg') }}" alt="{{_("Phishing attack")}}"> <p> {% trans %} This imposes requirements on the security of the system, as well as on the @@ -107,7 +107,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("5. Only disclose the minimal amount of information necessary") }}</h2> - <img style="width:20vw;float:right;padding:15px" src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by default, General Data Protection Regulation (GDPR) compliant")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/gdpr.medium.jpg') }}" alt="{{_("Privacy by design, privacy by default, General Data Protection Regulation (GDPR) compliant")}}"> <p> {% trans %} The reason behind this goal is similar to (2). The privacy of buyers is given @@ -120,7 +120,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("6. Be usable") }}</h2> - <img style="width:20vw;float:left;padding:15px" src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/buy.medium.jpg') }}" alt="{{_("Buy with one click")}}"> <p> {% trans %} Specifically it must be usable for non-expert customers. Usability also @@ -134,7 +134,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("7. Be efficient")}}</h2> - <img style="width:20vw;float:right;padding:15px" src="../images/efficient.png" alt="{{_("Energy efficiency")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/efficient.png') }}" alt="{{_("Energy efficiency")}}"> <p> {% trans %} Approaches such as proof-of-work are ruled out by this @@ -147,7 +147,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("8. Fault-tolerant design")}}</h2> - <img style="width:20vw;float:left;padding:15px" src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/life-safer.medium.jpg') }}" alt="{{_("Life Safers")}}"> <p> {% trans %} Taler should tolerate failure of individual components and systems, @@ -161,7 +161,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("9. Foster competition")}}</h2> - <img style="width:20vw;float:right;padding:15px" src="../images/market.medium.jpg" alt="{{_("A competitive market")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/market.medium.jpg') }}" alt="{{_("A competitive market")}}"> <p> {% trans %} It must be relatively easy for competitors to join the systems. While the diff --git a/template/wallet.html.j2 b/template/wallet.html.j2 index 94024e6a..1b3998a0 100644 --- a/template/wallet.html.j2 +++ b/template/wallet.html.j2 @@ -2,7 +2,7 @@ {% block head_content %} <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" /> -<script src="web-common/taler-wallet-lib.js" type="text/javascript"></script> +<script src="{{ url('web-common/taler-wallet-lib.js') }}" type="text/javascript"></script> <script type="application/javascript"> /* @@ -117,7 +117,7 @@ document.addEventListener('DOMContentLoaded', onLoad); </p> <p class="bluebox" id="box-not-present" style="display:none"> {% trans %} - You don't have a wallet installed yet. + You don't have a wallet installed yet. {% endtrans %} </p> </div> <!-- /col-lg-12 --> @@ -147,7 +147,7 @@ document.addEventListener('DOMContentLoaded', onLoad); {% endtrans %} <a href="https://www.chromium.org/">Chromium</a> {% trans %} - is required, but it appears you don't have it installed. + is required, but it appears you don't have it installed. {% endtrans %} </p> <p id="error-chrome-version" class="error"> @@ -175,7 +175,7 @@ document.addEventListener('DOMContentLoaded', onLoad); <noscript> <em style="color:darkred;"> {% trans %} - JavaScript is disabled, installation won't work. + JavaScript is disabled, installation won't work. {% endtrans %} </em> </noscript> @@ -194,7 +194,7 @@ document.addEventListener('DOMContentLoaded', onLoad); <!-- <h3>Firefox Beta</h3> <ol> - <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Download the wallet</a> (right click, Save Link As...)</li> + <li><a href="{{ url('releases/taler-wallet/taler-wallet-stable.xpi') }}">Download the wallet</a> (right click, Save Link As...)</li> <li>On the <code>about:debugging</code> page, "Load temporary extension"</li> </ol> diff --git a/www.yml b/www.yml new file mode 100644 index 00000000..ff589c52 --- /dev/null +++ b/www.yml @@ -0,0 +1,180 @@ +siteconf: + - baseurl: taler.net + newsloc: /news/ + newsdir: news + rsstitle: Taler.net + rssdescr: "News posts published by Taler about changes related to Taler, releases and events" + rssloc: + rsslink: + rsslang: + docshost: docs.taler.net +langs_full: &langs + en: English + fr: Français + it: Italiano + es: Español + de: Deutsch + ru: Ру́сский язы́к + pt: Português +symlinks: +staticfiles: + - file: favicon.ico + targets: + - favicon.ico + - file: robots.txt + targets: + - robots.txt +meetingnotes: +newsposts: + - page: 2018-04.html + date: 2018-04-01 + title: GNU Taler v0.5.0 released + abstract: + content: + - page: 2017-10.html + date: 2017-10-01 + title: GNU Taler v0.4.0 released + abstract: + content: + - page: 2017-08.html + date: 2017-08-01 + title: We explain GNU Taler at SHA 2017 + abstract: + content: + - page: 2017-04.html + date: 2017-04-01 + title: "Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child's play" + abstract: + content: + - page: 2017-03.html + date: 2017-03-01 + title: Sva explains GNU Taler at FOSSASIA in Singapore + abstract: + content: + - page: 2017-02.html + date: 2017-02-01 + title: Florian Dold explains Taler at 50p in Bangalore + abstract: + content: + - page: 2017-01.html + date: 2017-01-01 + title: Taler Documentation pages updated + abstract: + content: + - page: 2016-12.html + date: 2016-12-01 + title: Christian Grothoff explains Taler at hasgeek in Bangalore + abstract: + content: + - page: 2016-10.html + date: 2016-10-01 + title: Taler Wallet for Firefox online + abstract: + content: + - page: 2016-09.html + date: 2016-09-01 + title: Taler Web Payments paper published + abstract: + content: + - page: 2016-08.html + date: 2016-08-01 + title: Taler Systems S.A. created + abstract: + content: + - page: 2016-06.html + date: 2016-06-01 + title: GNU Taler 0.0.0 released + abstract: + content: + - page: 2015-12.html + date: 2015-12-01 + title: "Taler Demo for Chrome/Chromium online" + abstract: + content: + - page: 2015-11.html + date: 2015-11-01 + title: "Christian Grothoff explains the goals behind Taler" + abstract: + content: + - page: 2015-02.html + date: 2015-02-01 + title: Taler becomes an official GNU package + abstract: + content: + - page: 2014-12.html + date: 2014-12-01 + title: "Watch Christian Grothoff's FOSSA talk on Taler" + abstract: + content: + - page: 2014-11.html + date: 2014-11-01 + title: Launching taler.net + abstract: + content: +videoslist: +paperslist: + - year: 2019 + authors: + - Florian Dold + name: "The GNU Taler System: Practical and Provably Secure Electronic Payments" + kind: PhD Thesis + url: + url_html: + url_pdf: "papers/thesis-dold-phd-2019.pdf" + comment: + - year: 1982 + authors: + - David Chaum + name: "Blind Signatures for Untraceable Payments" + kind: "CRYPTO '82" + url: + url_html: + url_pdf: "papers/chaum-blind-signatures.pdf" + comment: + - year: + authors: + - M. Bellare + - C. Namprempre + - D. Pointcheval + - M. Semanko + name: "The One-More-RSA-Inversion Problems and the Security of Chaum's Blind Signature Scheme" + kind: Financial Cryptography + url: + url_html: + url_pdf: "papers/bellare_blindsigs_proof.pdf" + comment: + - year: 2016 + authors: + - Jeff Burdges + - Florian Dold + - Christian Grothoff + - Marcello Stanisci + name: "Enabling Secure Web Payments with GNU Taler" + kind: SPACE 2016 + url: + url_html: + url_pdf: "papers/taler2016space.pdf" + comment: + - year: 2019 + authors: + - Christian Grothoff + - Alex Pentland + name: "Digital cash and privacy: What are the alternatives to Libra?" + kind: MIT Media Lab + url: + url_html: https://www.media.mit.edu/posts/digital-cash-and-privacy-what-are-the-alternatives-to-libra/ + url_pdf: + comment: + - year: + authors: + - Florian Dold + - Sree Harsha Totakura + - Benedikt Müller + - Jeff Burdges + - Christian Grothoff + name: "Refreshing Coins for Giving Change and Refunds in Chaum-style Anonymous Payment Systems" + kind: + url: + url_pdf: + url_html: + comment: "<em>available upon request</em>" |