summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@taler.net>2019-12-11 11:21:48 +0000
committerng0 <ng0@taler.net>2019-12-11 11:21:48 +0000
commitfcb8a94a1b82f84f5453df0e4ab740bff5f3b610 (patch)
treed297a821773a0577916e706daed2d986272e8889
parentca901e4b99a037553a5afe1beeb50255aeecb27c (diff)
downloadwww-fcb8a94a1b82f84f5453df0e4ab740bff5f3b610.tar.gz
www-fcb8a94a1b82f84f5453df0e4ab740bff5f3b610.tar.bz2
www-fcb8a94a1b82f84f5453df0e4ab740bff5f3b610.zip
finally merge new layout
-rw-r--r--GNUmakefile17
-rw-r--r--Makefile85
-rw-r--r--__init__.py2
-rw-r--r--common/navigation.j2.inc2
-rw-r--r--common/news.j22
-rwxr-xr-xconfigure2
m---------help0
m---------inc0
-rw-r--r--locale/de/LC_MESSAGES/messages.po168
-rw-r--r--locale/es/LC_MESSAGES/messages.po245
-rw-r--r--locale/fr/LC_MESSAGES/messages.po168
-rw-r--r--locale/it/LC_MESSAGES/messages.po245
-rw-r--r--locale/pt/LC_MESSAGES/messages.po249
-rw-r--r--locale/ru/LC_MESSAGES/messages.po168
-rw-r--r--news/2014-11.html.j21
-rw-r--r--news/2014-12.html.j25
-rw-r--r--news/2015-02.html.j21
-rw-r--r--news/2015-11.html.j25
-rw-r--r--news/2015-12.html.j21
-rw-r--r--news/2016-06.html.j21
-rw-r--r--news/2016-08.html.j21
-rw-r--r--news/2016-09.html.j21
-rw-r--r--news/2016-10.html.j21
-rw-r--r--news/2016-12.html.j25
-rw-r--r--news/2017-01.html.j21
-rw-r--r--news/2017-02.html.j25
-rw-r--r--news/2017-03.html.j25
-rw-r--r--news/2017-04.html.j25
-rw-r--r--news/2017-08.html.j25
-rw-r--r--news/2017-10.html.j21
-rw-r--r--news/2018-04.html.j24
-rw-r--r--template/architecture.html.j22
-rw-r--r--template/contact.html.j22
-rw-r--r--template/copyright.html.j275
-rw-r--r--template/developers.html.j218
-rw-r--r--template/docs.html.j248
-rw-r--r--template/faq.html.j22
-rw-r--r--template/glossary.html.j28
-rw-r--r--template/governments.html.j24
-rw-r--r--template/gsoc-codeless.html.j216
-rw-r--r--template/investors.html.j215
-rw-r--r--template/merchants.html.j210
-rw-r--r--template/wallet.html.j210
m---------web-common0
44 files changed, 824 insertions, 787 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 6fae6c8..a3520cb 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,9 +29,10 @@ all: locale template
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 pdf presentations ; do \
+ (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
@@ -86,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 309d899..0000000
--- 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>
diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index 0895f23..0000000
--- a/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import os, sys
-sys.path.append(os.path.dirname(os.path.realpath(__file__)))
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 3e35373..63d8ac4 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -48,7 +48,5 @@
-->
</ul>
</div>
-
-
</div>
</nav>
diff --git a/common/news.j2 b/common/news.j2
index 15cfb17..7113f5b 100644
--- a/common/news.j2
+++ b/common/news.j2
@@ -2,7 +2,7 @@
<html lang="{{ lang }}">
<head>
<meta charset="UTF-8"/>
- <title>{{ _("GNUnet") }}</title>
+ <title>{{ _("GNU Taler") }}</title>
<meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" />
{% include "common/header.j2.inc" %}
{% block head_content %}{% endblock %}
diff --git a/configure b/configure
index 4ffb738..7749566 100755
--- a/configure
+++ b/configure
@@ -32,7 +32,7 @@
# we invoke configure not as a symlink but as a copy,
# so we have to use a fixed location for the repository!
-dir=$(dirname "$(readlink -f -- "$0")")/build-system/taler-build-scripts
+dir=$(dirname "$(readlink -- "$0")")/build-system/taler-build-scripts
. $dir/sh/lib.sh/existence.sh
. $dir/sh/lib.sh/existence_python.sh
diff --git a/help b/help
-Subproject 1ca9f1b35b286625b05672feea1c16a4de368ed
+Subproject 183cb78c3aa2415b038f6030ca353c3d592301a
diff --git a/inc b/inc
-Subproject 8ba672a9a16cbf11aac394b183668cb916d601f
+Subproject bdef602fcbd13d59aef971307b3730247a8b9c5
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index bca5809..7a4577f 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\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"
@@ -13,7 +13,7 @@ msgstr ""
"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"
@@ -35,7 +35,7 @@ msgstr ""
msgid "Bibliography"
msgstr "Bibliografie von GNU Taler"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "und"
@@ -68,10 +68,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -184,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"
-msgstr ""
-
-#: template/copyright.html.j2:15
-msgid "agreement on licensing and collaborative development"
+"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: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 "
@@ -207,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 "
@@ -274,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&#39;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&#39;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 "
@@ -427,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 ""
@@ -494,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 &quot;serial "
-"numbers&quot; 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&#39;"
+"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 &quot;"
+"serial numbers&quot; 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 "
@@ -1025,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&#39;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
@@ -1467,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&#39;s owner if the coin is not refreshed first"
msgstr ""
#: template/glossary.html.j2:61
@@ -1476,7 +1468,7 @@ msgstr ""
#: template/glossary.html.j2:63
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
@@ -1589,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&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
#: template/glossary.html.j2:152
@@ -1634,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&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
@@ -1841,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&#39;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) "
@@ -2045,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&#39;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 ""
@@ -2074,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&#39;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 &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2316,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"
@@ -2346,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 &#x28;for customers, merchants and the exchange&#x29; 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 "
@@ -2362,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"
@@ -2396,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"
@@ -2430,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."
@@ -2438,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."
@@ -2447,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)."
@@ -2457,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 "
@@ -2587,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&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2630,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&#39;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."
@@ -2672,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&#39;s frontend needs to "
+"give the customer&#39;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 "
@@ -2691,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&#39;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 "
@@ -2938,7 +2928,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2956,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&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2974,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&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 0e6b067..e9df2b7 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\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"
@@ -14,7 +14,7 @@ msgstr ""
"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"
@@ -34,7 +34,7 @@ msgstr "Preguntas frecuentes"
msgid "Bibliography"
msgstr "Bibliografía"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "y"
@@ -69,10 +69,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -175,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"
-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
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -211,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 "
@@ -277,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&#39;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&#39;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, "
@@ -422,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 ""
@@ -458,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 &quot;serial "
-"numbers&quot; 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 &quot;serial numbers&quot; 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&#39;"
+"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 &quot;"
+"serial numbers&quot; 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> "
@@ -915,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&#39;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
@@ -1337,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&#39;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 "
@@ -1357,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&#39;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 "
@@ -1486,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&#39;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 "
@@ -1540,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&#39;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 "
@@ -1711,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&#39;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 "
@@ -1862,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&#39;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 ""
@@ -1893,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&#39;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 &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2127,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 &#x28;for customers, merchants and the exchange&#x29; 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 "
@@ -2160,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 "
@@ -2183,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 "
@@ -2211,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."
@@ -2219,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."
@@ -2228,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)."
@@ -2237,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 "
@@ -2320,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&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2357,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&#39;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."
@@ -2393,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&#39;s frontend needs to "
+"give the customer&#39;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 "
@@ -2404,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&#39;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 "
@@ -2649,7 +2712,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2667,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&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2687,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&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 4b3bab3..f6aa299 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\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"
@@ -13,7 +13,7 @@ msgstr ""
"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 ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr ""
@@ -66,10 +66,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -160,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"
+"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: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 "
@@ -183,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 "
@@ -219,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&#39;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&#39;s protocol is documented in detail at"
msgstr ""
#: template/developers.html.j2:58 template/docs.html.j2:182
@@ -310,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 ""
@@ -341,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 &quot;serial "
-"numbers&quot; 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&#39;"
+"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 &quot;"
+"serial numbers&quot; 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
@@ -648,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&#39;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
@@ -981,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&#39;s owner if the coin is not refreshed first"
msgstr ""
#: template/glossary.html.j2:61
@@ -990,7 +982,7 @@ msgstr ""
#: template/glossary.html.j2:63
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
@@ -1103,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&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
#: template/glossary.html.j2:152
@@ -1148,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&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
@@ -1284,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&#39;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
@@ -1395,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&#39;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 ""
@@ -1419,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&#39;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 &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -1640,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 &#x28;for customers, merchants and the exchange&#x29; 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 "
@@ -1679,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 "
@@ -1702,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 ""
@@ -1781,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&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -1803,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&#39;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."
@@ -1837,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&#39;s frontend needs to "
+"give the customer&#39;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&#39;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
@@ -2071,7 +2061,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2089,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&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2105,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&#39;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 181be43..36d022f 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\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"
@@ -13,7 +13,7 @@ msgstr ""
"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"
@@ -35,7 +35,7 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "e"
@@ -70,10 +70,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -175,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"
-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
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -210,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 "
@@ -276,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&#39;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&#39;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 "
@@ -423,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"
@@ -460,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 &quot;serial "
-"numbers&quot; 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 &quot;serial numbers&quot; 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&#39;"
+"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 &quot;"
+"serial numbers&quot; 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 "
@@ -909,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&#39;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
@@ -1334,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&#39;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 "
@@ -1354,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&#39;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' "
@@ -1484,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&#39;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 "
@@ -1538,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&#39;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 "
@@ -1710,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&#39;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) "
@@ -1860,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&#39;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 ""
@@ -1891,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&#39;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 &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2126,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 &#x28;for customers, merchants and the exchange&#x29; 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 "
@@ -2158,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 "
@@ -2180,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 "
@@ -2194,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 "
@@ -2211,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."
@@ -2219,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."
@@ -2228,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)."
@@ -2237,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 "
@@ -2320,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&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2356,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&#39;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."
@@ -2393,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&#39;s frontend needs to "
+"give the customer&#39;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&#39;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). "
@@ -2648,7 +2711,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2666,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&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2686,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&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 9ba988f..5e5ab94 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\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"
@@ -18,7 +18,7 @@ msgstr ""
"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"
@@ -38,7 +38,7 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "e"
@@ -73,10 +73,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -178,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"
-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
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -214,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 "
@@ -278,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&#39;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&#39;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, "
@@ -422,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"
@@ -457,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 &quot;serial "
-"numbers&quot; 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 &quot;serial numbers&quot; 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&#39;"
+"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 &quot;"
+"serial numbers&quot; 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 "
@@ -902,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&#39;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
@@ -1325,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&#39;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 "
@@ -1340,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&#39;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 "
@@ -1468,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&#39;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 "
@@ -1522,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&#39;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 "
@@ -1693,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&#39;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 "
@@ -1840,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&#39;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 ""
@@ -1871,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&#39;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 &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2104,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 &#x28;for customers, merchants and the exchange&#x29; 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 é "
@@ -2136,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 "
@@ -2158,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 "
@@ -2172,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 "
@@ -2188,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."
@@ -2196,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."
@@ -2205,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)."
@@ -2213,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."
@@ -2294,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&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2325,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&#39;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."
@@ -2361,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&#39;s frontend needs to "
+"give the customer&#39;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&#39;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 "
@@ -2615,7 +2682,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2633,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&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2653,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&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index d7331c2..c56bdf8 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\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"
@@ -19,7 +19,7 @@ msgstr ""
"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 ""
@@ -39,7 +39,7 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr ""
@@ -72,10 +72,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -164,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"
+"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: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 "
@@ -187,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 "
@@ -223,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&#39;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&#39;s protocol is documented in detail at"
msgstr ""
#: template/developers.html.j2:58 template/docs.html.j2:182
@@ -312,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 ""
@@ -341,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 &quot;serial "
-"numbers&quot; 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&#39;"
+"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 &quot;"
+"serial numbers&quot; 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
@@ -648,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&#39;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
@@ -975,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&#39;s owner if the coin is not refreshed first"
msgstr ""
#: template/glossary.html.j2:61
@@ -984,7 +976,7 @@ msgstr ""
#: template/glossary.html.j2:63
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
@@ -1097,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&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
#: template/glossary.html.j2:152
@@ -1140,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&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
@@ -1276,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&#39;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
@@ -1387,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&#39;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 ""
@@ -1409,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&#39;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 &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -1630,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 &#x28;for customers, merchants and the exchange&#x29; 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 "
@@ -1669,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 "
@@ -1692,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 ""
@@ -1770,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&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -1792,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&#39;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."
@@ -1825,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&#39;s frontend needs to "
+"give the customer&#39;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&#39;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
@@ -2055,7 +2045,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2071,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&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2087,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&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/news/2014-11.html.j2 b/news/2014-11.html.j2
index aabb301..0280963 100644
--- a/news/2014-11.html.j2
+++ b/news/2014-11.html.j2
@@ -1,6 +1,5 @@
{% 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.
diff --git a/news/2014-12.html.j2 b/news/2014-12.html.j2
index adff6e6..6542cc9 100644
--- a/news/2014-12.html.j2
+++ b/news/2014-12.html.j2
@@ -1,14 +1,13 @@
{% extends "common/news.j2" %}
{% block body_content %}
-
<h1>2014-12: Watch Christian Grothoff&#39;s FOSSA talk on Taler</h1>
<p>
- <video id="video" poster="/images/fossa2014.png" autobuffer="" height="360" width="640" controls="controls">
+ <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('/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>.
+ <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/2015-02.html.j2 b/news/2015-02.html.j2
index 0880a59..efdcf37 100644
--- a/news/2015-02.html.j2
+++ b/news/2015-02.html.j2
@@ -1,6 +1,5 @@
{% 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,
diff --git a/news/2015-11.html.j2 b/news/2015-11.html.j2
index b45a2b0..9a633c9 100644
--- a/news/2015-11.html.j2
+++ b/news/2015-11.html.j2
@@ -1,14 +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('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+ <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('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>.
+ <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-12.html.j2 b/news/2015-12.html.j2
index 506b07d..f443e61 100644
--- a/news/2015-12.html.j2
+++ b/news/2015-12.html.j2
@@ -1,6 +1,5 @@
{% 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
diff --git a/news/2016-06.html.j2 b/news/2016-06.html.j2
index f79421f..0a19549 100644
--- a/news/2016-06.html.j2
+++ b/news/2016-06.html.j2
@@ -1,6 +1,5 @@
{% 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!
diff --git a/news/2016-08.html.j2 b/news/2016-08.html.j2
index f2a7d34..e0e303d 100644
--- a/news/2016-08.html.j2
+++ b/news/2016-08.html.j2
@@ -1,6 +1,5 @@
{% 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
diff --git a/news/2016-09.html.j2 b/news/2016-09.html.j2
index 24046a8..c1a9151 100644
--- a/news/2016-09.html.j2
+++ b/news/2016-09.html.j2
@@ -1,6 +1,5 @@
{% 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
diff --git a/news/2016-10.html.j2 b/news/2016-10.html.j2
index f21d933..3f381df 100644
--- a/news/2016-10.html.j2
+++ b/news/2016-10.html.j2
@@ -1,6 +1,5 @@
{% 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.
diff --git a/news/2016-12.html.j2 b/news/2016-12.html.j2
index 25aa385..418d8bc 100644
--- a/news/2016-12.html.j2
+++ b/news/2016-12.html.j2
@@ -1,14 +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('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="720" controls="controls">
+ <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('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>.
+ <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/2017-01.html.j2 b/news/2017-01.html.j2
index b44bff4..6708b3c 100644
--- a/news/2017-01.html.j2
+++ b/news/2017-01.html.j2
@@ -1,6 +1,5 @@
{% 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
diff --git a/news/2017-02.html.j2 b/news/2017-02.html.j2
index 1a5ab1d..a7e02c7 100644
--- a/news/2017-02.html.j2
+++ b/news/2017-02.html.j2
@@ -1,14 +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('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+ <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('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>.
+ <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-03.html.j2 b/news/2017-03.html.j2
index 605010e..84f87ba 100644
--- a/news/2017-03.html.j2
+++ b/news/2017-03.html.j2
@@ -1,14 +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('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+ <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('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>.
+ <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-04.html.j2 b/news/2017-04.html.j2
index 1d1f5fb..f02c80d 100644
--- a/news/2017-04.html.j2
+++ b/news/2017-04.html.j2
@@ -1,15 +1,14 @@
{% extends "common/news.j2" %}
{% block body_content %}
-
<h1>2017-04: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child&#39;s play</h1>
<p>
- <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+ <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('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>.
+ <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-08.html.j2 b/news/2017-08.html.j2
index 50e8250..3eb7884 100644
--- a/news/2017-08.html.j2
+++ b/news/2017-08.html.j2
@@ -1,15 +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('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+ <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('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>.
+ <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-10.html.j2 b/news/2017-10.html.j2
index 726c612..e9d847e 100644
--- a/news/2017-10.html.j2
+++ b/news/2017-10.html.j2
@@ -1,6 +1,5 @@
{% 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
diff --git a/news/2018-04.html.j2 b/news/2018-04.html.j2
index edf91b9..4fdba8d 100644
--- a/news/2018-04.html.j2
+++ b/news/2018-04.html.j2
@@ -1,6 +1,5 @@
{% 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.
@@ -11,7 +10,8 @@
API for merchants that also enables the implementation of
GNU Taler wallets on platforms that do not support
WebExtensions.
- <br>
+</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.
diff --git a/template/architecture.html.j2 b/template/architecture.html.j2
index d9170b2..2710768 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/contact.html.j2 b/template/contact.html.j2
index 91c7abe..b6c64cf 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 8ce7357..3c580c5 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 0fc1f67..0a52128 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&#39;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&#39;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&#39;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 2b9c1b0..c6b5554 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -33,51 +33,51 @@
<div class="row">
<div class="col-3">
- <a href="https://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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&#39;s manual for the GNU Taler exchange.
Also available as
{% endtrans %}
- <a href="https://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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://{{ siteconfitem["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.") }}
diff --git a/template/faq.html.j2 b/template/faq.html.j2
index 3a9349d..d1f5cfa 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&#39;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/glossary.html.j2 b/template/glossary.html.j2
index cb5862e..81b593f 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&#39;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&#39;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&#39;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&#39;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 1f169d6..78fbd48 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&#39;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&#39;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 74fb05d..c2c297a 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&#39;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'.
+ &#39;Buy Now&#39; button for a specific product. This code can be directly
+ copy pasted on the seller&#39;s frontend and can be used for &#39;Pay with
+ Taler&#39;.
{% 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/investors.html.j2 b/template/investors.html.j2
index 784d989..4fb5025 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
+ &#x28;for customers, merchants and the exchange&#x29; 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 57e14ed..9583605 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&#39;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&#39;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&#39;s frontend needs to give the
+ customer&#39;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&#39;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/wallet.html.j2 b/template/wallet.html.j2
index 94024e6..1b3998a 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&#39;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&#39;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&#39;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/web-common b/web-common
-Subproject caf5a98114402d057ba08b14279eb8e46481a02
+Subproject 0968eb3d4023a8a0a37f7069f162eb786a6e04d