[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch master updated: fix translation markup
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-www] branch master updated: fix translation markup |
|
Date: |
Sun, 11 Aug 2019 12:24:53 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new 348648c fix translation markup
348648c is described below
commit 348648c0cc71183bf1f93ce8decf661d80d40399
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Aug 11 12:24:42 2019 +0200
fix translation markup
---
features.html.j2 | 75 +++++++++---
gsoc-codeless.html.j2 | 16 ++-
locale/de/LC_MESSAGES/messages.po | 231 ++++++++++++++++++++++++------------
locale/en/LC_MESSAGES/messages.po | 206 +++++++++++++++++++++-----------
locale/es/LC_MESSAGES/messages.po | 231 ++++++++++++++++++++++++------------
locale/fr/LC_MESSAGES/messages.po | 236 +++++++++++++++++++++++++------------
locale/it/LC_MESSAGES/messages.po | 242 +++++++++++++++++++++++++-------------
locale/pt/LC_MESSAGES/messages.po | 233 ++++++++++++++++++++++++------------
locale/ru/LC_MESSAGES/messages.po | 206 +++++++++++++++++++++-----------
principles.html.j2 | 107 +++++++++++++----
web-common | 2 +-
11 files changed, 1225 insertions(+), 560 deletions(-)
diff --git a/features.html.j2 b/features.html.j2
index 5be9b6a..5d94cb1 100644
--- a/features.html.j2
+++ b/features.html.j2
@@ -11,21 +11,40 @@
<div class="row">
<div class="col">
- <p>GNU Taler is a <span class="tlr">privacy-preserving</span> payment
system. Customers can stay
+ <p>
+ {% trans %}
+ GNU Taler is a <span class="tlr">privacy-preserving</span> payment
system. Customers can stay
anonymous, but merchants can not hide their income through payments with GNU
Taler.
-This helps to <span class="tlr">avoid tax evasion and money
laundering</span>.</p>
+This helps to <span class="tlr">avoid tax evasion and money laundering</span>.
+ {% endtrans %}
+ </p>
- <p> The primary use case of GNU Taler is <span
class="tlr">payments</span>; it is <span class="tlr">not meant as a
-store</span> of value. Payments are always backed by an existing currency.</p>
+ <p>
+ {% trans %}
+ The primary use case of GNU Taler is <span class="tlr">payments</span>;
it is <span class="tlr">not meant as a
+store</span> of value. Payments are always backed by an existing currency.
+ {% endtrans %}
+ </p>
- <p>Payment are made after <span class="tlr">exchanging existing
money</span> into <em>electronic money</em> with the help of
- an Exchange service, that is, a payment service provider for Taler.</p>
+ <p>
+ {% trans %}
+ Payment are made after <span class="tlr">exchanging existing
money</span> into <em>electronic money</em> with the help of
+ an Exchange service, that is, a payment service provider for Taler.
+ {% endtrans %}
+ </p>
- <p>When making a payment, customers only need a charged wallet. A
merchant can accept payments <span class="tlr">without
- making their customers register</span> on the merchant's Website.</p>
+ <p>
+ {% trans %}
+ When making a payment, customers only need a charged wallet. A
merchant can accept payments <span class="tlr">without
+ making their customers register</span> on the merchant's Website.
+ {% endtrans %}
+ </p>
- <p>GNU Taler is <span class="tlr">immune against many types of
fraud</span>, such as phishing of credit card information
+ <p>
+ {% trans %}
+ GNU Taler is <span class="tlr">immune against many types of
fraud</span>, such as phishing of credit card information
or chargeback fraud. In case of loss or theft, only the limited amount
of money left in the wallet might be gone.
+ {% endtrans %}
</p>
</div>
<div class="col">
@@ -39,28 +58,48 @@ store</span> of value. Payments are always backed by an
existing currency.</p>
<div class="row">
<div class="col-lg-6">
<h2>{{ _("Paying with Taler") }}</h2>
+ <p>
{% trans %}
- <p>To pay with Taler, customers install an electronic wallet
+ To pay with Taler, customers install an electronic wallet
on their device. Before the first payment, the desired currency
must be added to the wallet's balance
- by some other means of payment.</p>
- <p>Once the wallet is charged, payments on websites take only one click,
+ by some other means of payment.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Once the wallet is charged, payments on websites take only one click,
are never falsely rejected by fraud detection and do not pose any risk
- of phishing or identity theft.</p>
- <p><a href="https://demo.taler.net";>Try it yourself with the interactive
demo!</a></p>
+ of phishing or identity theft.
{% endtrans %}
+ </p>
+ <p><a href="https://demo.taler.net";>
+ {% trans %}
+ Try it yourself with the interactive demo!
+ {% endtrans %}
+ </a></p>
</div>
<div class="col-lg-6">
<h2>{{ _("Receiving payments with Taler") }}</h2>
+ <p>
{% trans %}
- <p>To receive Taler payments, a merchant needs a bank account
+ To receive Taler payments, a merchant needs a bank account
in the desired currency. We provide supporting software
in various programming languages to make the integration painless.
The merchant's backend for Taler transaction processing can run
- on the merchant's premises or be hosted by a third party.</p>
- <p>Merchant integration is simple, and customers can pay for products
without even having to register an account.</p>
- <p><a href="https://docs.taler.net";>See how merchant integration works in
our developer documentation!</a></p>
+ on the merchant's premises or be hosted by a third party.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Merchant integration is simple, and customers can pay for products without
even having to register an account.
+ {% endtrans %}
+ </p>
+ <p><a href="https://docs.taler.net";>
+ {% trans %}
+ See how merchant integration works in our developer documentation!
{% endtrans %}
+ </a></p>
</div>
</div>
</div>
diff --git a/gsoc-codeless.html.j2 b/gsoc-codeless.html.j2
index 257b797..1ffce88 100644
--- a/gsoc-codeless.html.j2
+++ b/gsoc-codeless.html.j2
@@ -31,12 +31,20 @@
</li>
<li>
{% trans %}
- Merchant has the flexibility to add two types of inventory
as follows:
+ A merchant has the flexibility to add two types of inventory
as follows:
+ {% endtrans %}
<ul>
- <li>The merchant can upload digital inventory (like a PDF
or HTML page) via the codeless payments frontend and the user can then purchase
it and view the version hosted by the codeless payment frontend.</li>
- <li>The merchant can add any physical inventory available
in his stocks. While adding these inventory, the seller is prompted to add
minimum quantity of product that is required to be maintained in the stock.
Whenever the stocks run below this limit the seller would be notified
(currently this feature has not been added but soon email notification would be
added).</li>
- </ul>
+ <li>
+ {% trans %}
+ The merchant can upload digital inventory (like a PDF or HTML
page) via the codeless payments frontend and the user can then purchase it and
view the version hosted by the codeless payment frontend.
{% endtrans %}
+ </li>
+ <li>
+ {% trans %}
+ The merchant can add any physical inventory available in his
stocks. While adding these inventory, the seller is prompted to add minimum
quantity of product that is required to be maintained in the stock. Whenever
the stocks run below this limit the seller would be notified (currently this
feature has not been added but soon email notification would be added).
+ {% endtrans %}
+ </li>
+ </ul>
</li>
<li>
{% trans %}
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 71e2e16..800f434 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-11 11:49+0200\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <address@hidden>\n"
"Language-Team: de <address@hidden, address@hidden>\n"
@@ -22,16 +22,16 @@ msgid "GNU Taler Bibliography"
msgstr "Bibliografie von GNU Taler"
#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
msgid "by"
msgstr "von"
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
msgid "and"
msgstr "und"
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
msgid "available upon request"
msgstr "erhältlich auf Anfrage"
@@ -80,10 +80,20 @@ msgstr ""
"<tt>address@hidden</tt>, die GnuPG-verschlüsselt empfangen wird. "
#: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
msgid "Reporting bugs"
msgstr "Funktionserweiterungen, Fehler und Bugs melden"
-#: contact.html.j2:38
+#: contact.html.j2:48
#, fuzzy
#| msgid ""
#| "We track open feature requests and bugs in our\n"
@@ -101,11 +111,11 @@ msgstr ""
" Bugs oder Funktionsanfragen können auch an die Mailing-Liste gesendet "
"werden."
-#: contact.html.j2:49
+#: contact.html.j2:59
msgid "Executive team"
msgstr "Leitungsteam"
-#: contact.html.j2:51
+#: contact.html.j2:61
#, fuzzy
#| msgid ""
#| "For non-technical commercial requests, please contact\n"
@@ -1285,44 +1295,61 @@ msgid ""
msgstr ""
#: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
msgstr ""
#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
msgid "implementation of a `wallet` for browsers"
msgstr ""
-#: glossary.html.j2:66
+#: glossary.html.j2:80
msgid "fresh coin"
msgstr ""
-#: glossary.html.j2:68
+#: glossary.html.j2:82
msgid "a `coin` is fresh if its public key is only known to the customer"
msgstr ""
-#: glossary.html.j2:72
+#: glossary.html.j2:86
msgid "master key"
msgstr ""
-#: glossary.html.j2:74
+#: glossary.html.j2:88
msgid ""
"offline key used by the exchange to certify denomination keys and message "
"signing keys"
msgstr ""
-#: glossary.html.j2:78
+#: glossary.html.j2:92
msgid "message signing key"
msgstr ""
-#: glossary.html.j2:80
+#: glossary.html.j2:94
msgid "key used by the exchange to sign online messages, other than coins"
msgstr ""
-#: glossary.html.j2:84
+#: glossary.html.j2:98
msgid "offer"
msgstr ""
-#: glossary.html.j2:86
+#: glossary.html.j2:100
msgid ""
"specification of the details of a transaction, specifies the payment "
"obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1332,156 +1359,196 @@ msgid ""
"and signs it, it becomes a proposal."
msgstr ""
-#: glossary.html.j2:95
+#: glossary.html.j2:109
msgid "owner"
msgstr ""
-#: glossary.html.j2:97
+#: glossary.html.j2:111
msgid "a `coin` is owned by the entity that knows the private key of the coin"
msgstr ""
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
msgid "proof"
msgstr ""
-#: glossary.html.j2:103
+#: glossary.html.j2:125
msgid ""
"message that cryptographically demonstrates that a particular claim is "
"correct"
msgstr ""
-#: glossary.html.j2:107
+#: glossary.html.j2:129
msgid "proposal"
msgstr ""
-#: glossary.html.j2:109
+#: glossary.html.j2:131
msgid "a sketch that has been completed and signed by the merchant backend."
msgstr ""
-#: glossary.html.j2:113
+#: glossary.html.j2:135
msgid "reserve"
msgstr ""
-#: glossary.html.j2:115
+#: glossary.html.j2:137
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"
msgstr ""
-#: glossary.html.j2:119
+#: glossary.html.j2:141
msgid "refreshing"
msgstr ""
-#: glossary.html.j2:121
+#: glossary.html.j2:143
msgid ""
"operation by which a `dirty` `coin` is converted into one or more `fresh` "
"coins"
msgstr ""
-#: glossary.html.j2:125
+#: glossary.html.j2:147
msgid "refund"
msgstr ""
-#: glossary.html.j2:127
+#: glossary.html.j2:149
msgid ""
"operation by which a merchant steps back from the right to funds that he "
"obtained from a `deposit` operation, giving the right to the funds back to "
"the customer"
msgstr ""
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "Documentation"
+msgid "revocation"
+msgstr "Dokumentation"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
msgid "sharing"
msgstr ""
-#: glossary.html.j2:133
+#: glossary.html.j2:161
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."
msgstr ""
-#: glossary.html.j2:137
+#: glossary.html.j2:165
msgid "signing key"
msgstr ""
-#: glossary.html.j2:139
+#: glossary.html.j2:167
msgid "see message signing key."
msgstr ""
-#: glossary.html.j2:143
+#: glossary.html.j2:171
msgid "spending"
msgstr ""
-#: glossary.html.j2:145
+#: glossary.html.j2:173
msgid ""
"operation by which a customer gives a merchant the right to `deposit` coins "
"in return for merchandise"
msgstr ""
-#: glossary.html.j2:149
+#: glossary.html.j2:177
msgid "transfer"
msgstr ""
-#: glossary.html.j2:151
+#: glossary.html.j2:179
msgid "method of sending funds between `bank` accounts"
msgstr ""
-#: glossary.html.j2:155
+#: glossary.html.j2:183
msgid "transaction"
msgstr ""
-#: glossary.html.j2:157
+#: glossary.html.j2:185
msgid ""
"method by which ownership is exclusively transferred from one entity to "
"another"
msgstr ""
-#: glossary.html.j2:161
+#: glossary.html.j2:189
msgid "transaction id"
msgstr ""
-#: glossary.html.j2:163
+#: glossary.html.j2:191
msgid "unique number by which a merchant identifies a `transaction`"
msgstr ""
-#: glossary.html.j2:167
+#: glossary.html.j2:195
#, fuzzy
#| msgid "Wallet"
msgid "wallet"
msgstr "Geldbörse"
-#: glossary.html.j2:169
+#: glossary.html.j2:197
msgid ""
"software running on a customer's computer; withdraws, stores and spends coins"
msgstr ""
-#: glossary.html.j2:173
+#: glossary.html.j2:201
msgid "wire transfer"
msgstr ""
-#: glossary.html.j2:175
+#: glossary.html.j2:203
msgid "see `transfer`"
msgstr ""
-#: glossary.html.j2:179
+#: glossary.html.j2:207
msgid "wire transfer identifier"
msgstr ""
-#: glossary.html.j2:181
+#: glossary.html.j2:209
msgid ""
"subject of a wire `transfer`; usually a random string to uniquely identify "
"the `transfer`"
msgstr ""
-#: glossary.html.j2:185
+#: glossary.html.j2:213
msgid "withdrawal"
msgstr ""
-#: glossary.html.j2:187
+#: glossary.html.j2:215
msgid ""
"operation by which a `wallet` can convert funds from a reserve to fresh coins"
msgstr ""
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr "Vorteile für Staatsregierungen"
@@ -2446,67 +2513,74 @@ msgstr ""
"Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
"verschiedenen Branchen..."
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c & Tor."
-msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
#: team.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Theoretische Grundlagen."
+msgid "GNU mainatiner, lead developer."
+msgstr ""
#: team.html.j2:38
+msgid "Applied cryptography. Contact to W3c & Tor."
+msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
+
+#: team.html.j2:43
msgid "Founder of the GNU project. Ethical guidance and licensing."
msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
-
#: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Doktorand, Inria."
-
-#: team.html.j2:55
msgid "Software engineer."
msgstr "Software-Ingenieur."
-#: team.html.j2:62
+#: team.html.j2:55
msgid "Sustainable business development."
msgstr "Nachhaltige Unternehmensentwicklung."
+#: team.html.j2:60
+msgid "Theoretical foundations."
+msgstr "Theoretische Grundlagen."
+
#: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Software-Ingenieur. Arbeitet an libebics."
+msgid "System administration, Taler Systems SA."
+msgstr ""
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
msgid "Translator (Spanish)"
msgstr "Übersetzer (Spanisch)."
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
msgid "Translator (Italian)"
msgstr "Übersetzer (Italienisch)."
-#: team.html.j2:98
+#: team.html.j2:99
#, fuzzy
#| msgid "Translator (Spanish)"
msgid "Translator (German)"
msgstr "Übersetzer (Deutsch)."
-#: team.html.j2:104
+#: team.html.j2:106
msgid "Hardware security module"
msgstr "Hardware-Sicherheitsmodul"
-#: team.html.j2:108
+#: team.html.j2:110
msgid "Risk management"
msgstr "Risikomanagement"
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
+
+#: team.html.j2:122
msgid "PhD student, TU Munich. Currently teaching."
msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler für Entwickler"
#: common/base.j2:5
msgid "GNU Taler"
@@ -2560,6 +2634,15 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Doktorand, Inria."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Software-Ingenieur. Arbeitet an libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
+
#, fuzzy
#~| msgid "Developers"
#~ msgid "Developer Resources"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 66d6589..acdee47 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-11 11:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <address@hidden>\n"
@@ -22,16 +22,16 @@ msgid "GNU Taler Bibliography"
msgstr ""
#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
msgid "by"
msgstr ""
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
msgid "and"
msgstr ""
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
msgid "available upon request"
msgstr ""
@@ -62,21 +62,31 @@ msgid ""
msgstr ""
#: contact.html.j2:36
-msgid "Reporting bugs"
+msgid "General inquiries"
msgstr ""
#: contact.html.j2:38
msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
+msgid "Reporting bugs"
+msgstr ""
+
+#: contact.html.j2:48
+msgid ""
"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
"also report bugs or feature requests to the mailing list."
msgstr ""
-#: contact.html.j2:49
+#: contact.html.j2:59
msgid "Executive team"
msgstr ""
-#: contact.html.j2:51
+#: contact.html.j2:61
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -811,44 +821,61 @@ msgid ""
msgstr ""
#: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
msgstr ""
#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
msgid "implementation of a `wallet` for browsers"
msgstr ""
-#: glossary.html.j2:66
+#: glossary.html.j2:80
msgid "fresh coin"
msgstr ""
-#: glossary.html.j2:68
+#: glossary.html.j2:82
msgid "a `coin` is fresh if its public key is only known to the customer"
msgstr ""
-#: glossary.html.j2:72
+#: glossary.html.j2:86
msgid "master key"
msgstr ""
-#: glossary.html.j2:74
+#: glossary.html.j2:88
msgid ""
"offline key used by the exchange to certify denomination keys and message "
"signing keys"
msgstr ""
-#: glossary.html.j2:78
+#: glossary.html.j2:92
msgid "message signing key"
msgstr ""
-#: glossary.html.j2:80
+#: glossary.html.j2:94
msgid "key used by the exchange to sign online messages, other than coins"
msgstr ""
-#: glossary.html.j2:84
+#: glossary.html.j2:98
msgid "offer"
msgstr ""
-#: glossary.html.j2:86
+#: glossary.html.j2:100
msgid ""
"specification of the details of a transaction, specifies the payment "
"obligations for the customer (i.e. the amount), the deliverables of the "
@@ -858,154 +885,192 @@ msgid ""
"and signs it, it becomes a proposal."
msgstr ""
-#: glossary.html.j2:95
+#: glossary.html.j2:109
msgid "owner"
msgstr ""
-#: glossary.html.j2:97
+#: glossary.html.j2:111
msgid "a `coin` is owned by the entity that knows the private key of the coin"
msgstr ""
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
msgid "proof"
msgstr ""
-#: glossary.html.j2:103
+#: glossary.html.j2:125
msgid ""
"message that cryptographically demonstrates that a particular claim is "
"correct"
msgstr ""
-#: glossary.html.j2:107
+#: glossary.html.j2:129
msgid "proposal"
msgstr ""
-#: glossary.html.j2:109
+#: glossary.html.j2:131
msgid "a sketch that has been completed and signed by the merchant backend."
msgstr ""
-#: glossary.html.j2:113
+#: glossary.html.j2:135
msgid "reserve"
msgstr ""
-#: glossary.html.j2:115
+#: glossary.html.j2:137
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"
msgstr ""
-#: glossary.html.j2:119
+#: glossary.html.j2:141
msgid "refreshing"
msgstr ""
-#: glossary.html.j2:121
+#: glossary.html.j2:143
msgid ""
"operation by which a `dirty` `coin` is converted into one or more `fresh` "
"coins"
msgstr ""
-#: glossary.html.j2:125
+#: glossary.html.j2:147
msgid "refund"
msgstr ""
-#: glossary.html.j2:127
+#: glossary.html.j2:149
msgid ""
"operation by which a merchant steps back from the right to funds that he "
"obtained from a `deposit` operation, giving the right to the funds back to "
"the customer"
msgstr ""
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+msgid "revocation"
+msgstr ""
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
msgid "sharing"
msgstr ""
-#: glossary.html.j2:133
+#: glossary.html.j2:161
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."
msgstr ""
-#: glossary.html.j2:137
+#: glossary.html.j2:165
msgid "signing key"
msgstr ""
-#: glossary.html.j2:139
+#: glossary.html.j2:167
msgid "see message signing key."
msgstr ""
-#: glossary.html.j2:143
+#: glossary.html.j2:171
msgid "spending"
msgstr ""
-#: glossary.html.j2:145
+#: glossary.html.j2:173
msgid ""
"operation by which a customer gives a merchant the right to `deposit` coins "
"in return for merchandise"
msgstr ""
-#: glossary.html.j2:149
+#: glossary.html.j2:177
msgid "transfer"
msgstr ""
-#: glossary.html.j2:151
+#: glossary.html.j2:179
msgid "method of sending funds between `bank` accounts"
msgstr ""
-#: glossary.html.j2:155
+#: glossary.html.j2:183
msgid "transaction"
msgstr ""
-#: glossary.html.j2:157
+#: glossary.html.j2:185
msgid ""
"method by which ownership is exclusively transferred from one entity to "
"another"
msgstr ""
-#: glossary.html.j2:161
+#: glossary.html.j2:189
msgid "transaction id"
msgstr ""
-#: glossary.html.j2:163
+#: glossary.html.j2:191
msgid "unique number by which a merchant identifies a `transaction`"
msgstr ""
-#: glossary.html.j2:167
+#: glossary.html.j2:195
msgid "wallet"
msgstr ""
-#: glossary.html.j2:169
+#: glossary.html.j2:197
msgid ""
"software running on a customer's computer; withdraws, stores and spends coins"
msgstr ""
-#: glossary.html.j2:173
+#: glossary.html.j2:201
msgid "wire transfer"
msgstr ""
-#: glossary.html.j2:175
+#: glossary.html.j2:203
msgid "see `transfer`"
msgstr ""
-#: glossary.html.j2:179
+#: glossary.html.j2:207
msgid "wire transfer identifier"
msgstr ""
-#: glossary.html.j2:181
+#: glossary.html.j2:209
msgid ""
"subject of a wire `transfer`; usually a random string to uniquely identify "
"the `transfer`"
msgstr ""
-#: glossary.html.j2:185
+#: glossary.html.j2:213
msgid "withdrawal"
msgstr ""
-#: glossary.html.j2:187
+#: glossary.html.j2:215
msgid ""
"operation by which a `wallet` can convert funds from a reserve to fresh coins"
msgstr ""
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
@@ -1580,64 +1645,69 @@ msgid ""
"industries, …."
msgstr ""
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c & Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
msgstr ""
#: team.html.j2:33
-msgid "Theoretical foundations."
+msgid "GNU mainatiner, lead developer."
msgstr ""
#: team.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgid "Applied cryptography. Contact to W3c & Tor."
msgstr ""
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
+#: team.html.j2:43
+msgid "Founder of the GNU project. Ethical guidance and licensing."
msgstr ""
#: team.html.j2:50
-msgid "PhD Student, Inria.."
+msgid "Software engineer."
msgstr ""
#: team.html.j2:55
-msgid "Software engineer."
+msgid "Sustainable business development."
msgstr ""
-#: team.html.j2:62
-msgid "Sustainable business development."
+#: team.html.j2:60
+msgid "Theoretical foundations."
msgstr ""
#: team.html.j2:66
-msgid "Software engineer. Works on libebics."
+msgid "System administration, Taler Systems SA."
msgstr ""
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
msgid "Translator (Spanish)"
msgstr ""
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
msgid "Translator (Italian)"
msgstr ""
-#: team.html.j2:98
+#: team.html.j2:99
msgid "Translator (German)"
msgstr ""
-#: team.html.j2:104
+#: team.html.j2:106
msgid "Hardware security module"
msgstr ""
-#: team.html.j2:108
+#: team.html.j2:110
msgid "Risk management"
msgstr ""
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:122
msgid "PhD student, TU Munich. Currently teaching."
msgstr ""
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+msgid "Free software developer."
msgstr ""
#: common/base.j2:5
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index a236093..94b8344 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-11 11:49+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <address@hidden>\n"
@@ -23,16 +23,16 @@ msgid "GNU Taler Bibliography"
msgstr "Bibliografía de GNU Taler"
#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
msgid "by"
msgstr "por"
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
msgid "and"
msgstr "y"
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
msgid "available upon request"
msgstr "disponible bajo petición"
@@ -70,10 +70,20 @@ msgstr ""
"electrónicos cifrados con GnuPG."
#: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
msgid "Reporting bugs"
msgstr "Reportar errores"
-#: contact.html.j2:38
+#: contact.html.j2:48
msgid ""
"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
@@ -84,11 +94,11 @@ msgstr ""
"a>, que se comparte con el proyecto GNUnet. También puede reportar bugs o "
"solicitudes a través de la lista de correo."
-#: contact.html.j2:49
+#: contact.html.j2:59
msgid "Executive team"
msgstr "Comité Ejecutivo"
-#: contact.html.j2:51
+#: contact.html.j2:61
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -1065,27 +1075,44 @@ msgstr ""
"comerciantes."
#: glossary.html.j2:60
+msgid "expired"
+msgstr ""
+
+#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
msgid "extension"
msgstr "Extensión"
-#: glossary.html.j2:62
+#: glossary.html.j2:76
msgid "implementation of a `wallet` for browsers"
msgstr "Implementación de una `billetera` para navegadores web"
-#: glossary.html.j2:66
+#: glossary.html.j2:80
msgid "fresh coin"
msgstr "Moneda fresca"
-#: glossary.html.j2:68
+#: glossary.html.j2:82
msgid "a `coin` is fresh if its public key is only known to the customer"
msgstr ""
"Una `moneda` es fresca si su clave pública sólo es conocida por el cliente"
-#: glossary.html.j2:72
+#: glossary.html.j2:86
msgid "master key"
msgstr "Clave maestra o 'master key'"
-#: glossary.html.j2:74
+#: glossary.html.j2:88
msgid ""
"offline key used by the exchange to certify denomination keys and message "
"signing keys"
@@ -1093,21 +1120,21 @@ msgstr ""
"La clave offline utilizada por la plataforma de intercambio para certificar "
"claves de denominación y claves de firma de mensajes"
-#: glossary.html.j2:78
+#: glossary.html.j2:92
msgid "message signing key"
msgstr "Clave de firma de mensajes"
-#: glossary.html.j2:80
+#: glossary.html.j2:94
msgid "key used by the exchange to sign online messages, other than coins"
msgstr ""
"Clave utilizada por la plataforma de intercambio para firmar mensajes en "
"línea, que no sean monedas"
-#: glossary.html.j2:84
+#: glossary.html.j2:98
msgid "offer"
msgstr "Oferta"
-#: glossary.html.j2:86
+#: glossary.html.j2:100
msgid ""
"specification of the details of a transaction, specifies the payment "
"obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1123,41 +1150,52 @@ msgstr ""
"otras palabras, una vez que el backend agrega la información que falta a la "
"oferta y la firma, la convierte en una propuesta."
-#: glossary.html.j2:95
+#: glossary.html.j2:109
msgid "owner"
msgstr "Propiedad"
-#: glossary.html.j2:97
+#: glossary.html.j2:111
msgid "a `coin` is owned by the entity that knows the private key of the coin"
msgstr ""
"Una `moneda` es propiedad de la entidad que conoce la clave privada de la "
"moneda."
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
msgid "proof"
msgstr "Prueba"
-#: glossary.html.j2:103
+#: glossary.html.j2:125
msgid ""
"message that cryptographically demonstrates that a particular claim is "
"correct"
msgstr ""
"Mensaje que demuestra criptográficamente que una afirmación es correcta"
-#: glossary.html.j2:107
+#: glossary.html.j2:129
msgid "proposal"
msgstr "Propuesta"
-#: glossary.html.j2:109
+#: glossary.html.j2:131
msgid "a sketch that has been completed and signed by the merchant backend."
msgstr ""
"Una oferta que ha sido completada y firmado por el backend del comerciante."
-#: glossary.html.j2:113
+#: glossary.html.j2:135
msgid "reserve"
msgstr "Reserva"
-#: glossary.html.j2:115
+#: glossary.html.j2:137
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 "
@@ -1167,11 +1205,11 @@ msgstr ""
"plataforma de intercambio listo para un «retiro», o los fondos previstos en "
"la cuenta bancaria para cubrir las obligaciones de las monedas en circulación"
-#: glossary.html.j2:119
+#: glossary.html.j2:141
msgid "refreshing"
msgstr "Renovación de moneda"
-#: glossary.html.j2:121
+#: glossary.html.j2:143
msgid ""
"operation by which a `dirty` `coin` is converted into one or more `fresh` "
"coins"
@@ -1179,11 +1217,11 @@ msgstr ""
"Operación mediante la cual se convierte una `moneda` `sucia` en una o más "
"monedas `frescas`"
-#: glossary.html.j2:125
+#: glossary.html.j2:147
msgid "refund"
msgstr "Reembolso"
-#: glossary.html.j2:127
+#: glossary.html.j2:149
msgid ""
"operation by which a merchant steps back from the right to funds that he "
"obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1193,11 +1231,25 @@ msgstr ""
"obtuvo de una operación de `depósito', dando nuevamente al cliente el "
"derecho a estos fondos"
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "denomination"
+msgid "revocation"
+msgstr "Denominación"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
msgid "sharing"
msgstr "Compartir"
-#: glossary.html.j2:133
+#: glossary.html.j2:161
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."
@@ -1206,19 +1258,19 @@ msgstr ""
"acceso a la clave privada de la moneda, lo que permite a todos los "
"copropietarios gastar la moneda en cualquier momento."
-#: glossary.html.j2:137
+#: glossary.html.j2:165
msgid "signing key"
msgstr "Clave de firmado"
-#: glossary.html.j2:139
+#: glossary.html.j2:167
msgid "see message signing key."
msgstr "Ver clave de firma de mensajes"
-#: glossary.html.j2:143
+#: glossary.html.j2:171
msgid "spending"
msgstr "Gasto"
-#: glossary.html.j2:145
+#: glossary.html.j2:173
msgid ""
"operation by which a customer gives a merchant the right to `deposit` coins "
"in return for merchandise"
@@ -1226,19 +1278,19 @@ msgstr ""
"Operación mediante la cual un cliente concede a un comerciante el derecho de "
"`depositar` monedas a cambio de mercancía"
-#: glossary.html.j2:149
+#: glossary.html.j2:177
msgid "transfer"
msgstr "Transferencia"
-#: glossary.html.j2:151
+#: glossary.html.j2:179
msgid "method of sending funds between `bank` accounts"
msgstr "Método de envío de fondos entre cuentas `bancarias`"
-#: glossary.html.j2:155
+#: glossary.html.j2:183
msgid "transaction"
msgstr "Transacción"
-#: glossary.html.j2:157
+#: glossary.html.j2:185
msgid ""
"method by which ownership is exclusively transferred from one entity to "
"another"
@@ -1246,38 +1298,38 @@ msgstr ""
"Método mediante el cual la propiedad se transfiere exclusivamente de una "
"entidad a otra"
-#: glossary.html.j2:161
+#: glossary.html.j2:189
msgid "transaction id"
msgstr "Identificador de la transacción o `transaction id`"
-#: glossary.html.j2:163
+#: glossary.html.j2:191
msgid "unique number by which a merchant identifies a `transaction`"
msgstr "Número único por el cual un comerciante identifica una `transacción`"
-#: glossary.html.j2:167
+#: glossary.html.j2:195
msgid "wallet"
msgstr "Billetera "
-#: glossary.html.j2:169
+#: glossary.html.j2:197
msgid ""
"software running on a customer's computer; withdraws, stores and spends coins"
msgstr ""
"Software que opera en la computadora de un cliente; que retira, almacena y "
"gasta monedas"
-#: glossary.html.j2:173
+#: glossary.html.j2:201
msgid "wire transfer"
msgstr "Transferencia bancaria"
-#: glossary.html.j2:175
+#: glossary.html.j2:203
msgid "see `transfer`"
msgstr "Ver 'transferencia'"
-#: glossary.html.j2:179
+#: glossary.html.j2:207
msgid "wire transfer identifier"
msgstr "Identificador de transferencias bancarias"
-#: glossary.html.j2:181
+#: glossary.html.j2:209
msgid ""
"subject of a wire `transfer`; usually a random string to uniquely identify "
"the `transfer`"
@@ -1285,17 +1337,32 @@ msgstr ""
"Asunto de una `transferencia` bancaria; generalmente una serie aleatoria "
"para identificar de forma única la `transferencia`"
-#: glossary.html.j2:185
+#: glossary.html.j2:213
msgid "withdrawal"
msgstr "Retiro"
-#: glossary.html.j2:187
+#: glossary.html.j2:215
msgid ""
"operation by which a `wallet` can convert funds from a reserve to fresh coins"
msgstr ""
"Operación mediante la cual una `billetera` puede convertir fondos de una "
"reserva en monedas nuevas"
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr "Ventajas para los gobiernos"
@@ -2041,65 +2108,72 @@ msgstr ""
"Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
"de TI en diferentes industrias."
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c & Tor."
-msgstr "Criptografía aplicada. Contacto para W3C & Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
#: team.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Fundamentos teóricos."
+msgid "GNU mainatiner, lead developer."
+msgstr ""
#: team.html.j2:38
+msgid "Applied cryptography. Contact to W3c & Tor."
+msgstr "Criptografía aplicada. Contacto para W3C & Tor."
+
+#: team.html.j2:43
msgid "Founder of the GNU project. Ethical guidance and licensing."
msgstr "Fundador del proyecto GNU. Orientación ética y licencias."
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
-
#: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Estudiante de doctorado, INRIA."
-
-#: team.html.j2:55
msgid "Software engineer."
msgstr "Ingeniero de Software."
-#: team.html.j2:62
+#: team.html.j2:55
msgid "Sustainable business development."
msgstr "Desarrollo de negocios sostenibles."
+#: team.html.j2:60
+msgid "Theoretical foundations."
+msgstr "Fundamentos teóricos."
+
#: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Ingeniero de Software. Trabaja en libebics."
+msgid "System administration, Taler Systems SA."
+msgstr ""
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
msgid "Translator (Spanish)"
msgstr "Traductor (español)"
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
msgid "Translator (Italian)"
msgstr "Traductora (italiano)"
-#: team.html.j2:98
+#: team.html.j2:99
msgid "Translator (German)"
msgstr "Traductor (alemán)"
-#: team.html.j2:104
+#: team.html.j2:106
msgid "Hardware security module"
msgstr "Módulo de seguridad de hardware"
-#: team.html.j2:108
+#: team.html.j2:110
msgid "Risk management"
msgstr "Gestión de riesgos"
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
+
+#: team.html.j2:122
msgid "PhD student, TU Munich. Currently teaching."
msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler para programadores"
#: common/base.j2:5
msgid "GNU Taler"
@@ -2153,6 +2227,15 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Estudiante de doctorado, INRIA."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Ingeniero de Software. Trabaja en libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
+
#~ msgid "Developer Resources"
#~ msgstr "Recursos de desarrollo"
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 275261b..a634660 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-11 11:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <address@hidden>\n"
@@ -24,16 +24,16 @@ msgid "GNU Taler Bibliography"
msgstr ""
#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
msgid "by"
msgstr ""
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
msgid "and"
msgstr ""
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
msgid "available upon request"
msgstr ""
@@ -64,21 +64,31 @@ msgid ""
msgstr ""
#: contact.html.j2:36
-msgid "Reporting bugs"
+msgid "General inquiries"
msgstr ""
#: contact.html.j2:38
msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
+msgid "Reporting bugs"
+msgstr ""
+
+#: contact.html.j2:48
+msgid ""
"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
"also report bugs or feature requests to the mailing list."
msgstr ""
-#: contact.html.j2:49
+#: contact.html.j2:59
msgid "Executive team"
msgstr ""
-#: contact.html.j2:51
+#: contact.html.j2:61
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -821,44 +831,61 @@ msgid ""
msgstr ""
#: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
msgstr ""
#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
msgid "implementation of a `wallet` for browsers"
msgstr ""
-#: glossary.html.j2:66
+#: glossary.html.j2:80
msgid "fresh coin"
msgstr ""
-#: glossary.html.j2:68
+#: glossary.html.j2:82
msgid "a `coin` is fresh if its public key is only known to the customer"
msgstr ""
-#: glossary.html.j2:72
+#: glossary.html.j2:86
msgid "master key"
msgstr ""
-#: glossary.html.j2:74
+#: glossary.html.j2:88
msgid ""
"offline key used by the exchange to certify denomination keys and message "
"signing keys"
msgstr ""
-#: glossary.html.j2:78
+#: glossary.html.j2:92
msgid "message signing key"
msgstr ""
-#: glossary.html.j2:80
+#: glossary.html.j2:94
msgid "key used by the exchange to sign online messages, other than coins"
msgstr ""
-#: glossary.html.j2:84
+#: glossary.html.j2:98
msgid "offer"
msgstr ""
-#: glossary.html.j2:86
+#: glossary.html.j2:100
msgid ""
"specification of the details of a transaction, specifies the payment "
"obligations for the customer (i.e. the amount), the deliverables of the "
@@ -868,154 +895,194 @@ msgid ""
"and signs it, it becomes a proposal."
msgstr ""
-#: glossary.html.j2:95
+#: glossary.html.j2:109
msgid "owner"
msgstr ""
-#: glossary.html.j2:97
+#: glossary.html.j2:111
msgid "a `coin` is owned by the entity that knows the private key of the coin"
msgstr ""
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
msgid "proof"
msgstr ""
-#: glossary.html.j2:103
+#: glossary.html.j2:125
msgid ""
"message that cryptographically demonstrates that a particular claim is "
"correct"
msgstr ""
-#: glossary.html.j2:107
+#: glossary.html.j2:129
msgid "proposal"
msgstr ""
-#: glossary.html.j2:109
+#: glossary.html.j2:131
msgid "a sketch that has been completed and signed by the merchant backend."
msgstr ""
-#: glossary.html.j2:113
+#: glossary.html.j2:135
msgid "reserve"
msgstr ""
-#: glossary.html.j2:115
+#: glossary.html.j2:137
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"
msgstr ""
-#: glossary.html.j2:119
+#: glossary.html.j2:141
msgid "refreshing"
msgstr ""
-#: glossary.html.j2:121
+#: glossary.html.j2:143
msgid ""
"operation by which a `dirty` `coin` is converted into one or more `fresh` "
"coins"
msgstr ""
-#: glossary.html.j2:125
+#: glossary.html.j2:147
msgid "refund"
msgstr ""
-#: glossary.html.j2:127
+#: glossary.html.j2:149
msgid ""
"operation by which a merchant steps back from the right to funds that he "
"obtained from a `deposit` operation, giving the right to the funds back to "
"the customer"
msgstr ""
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "Documentation"
+msgid "revocation"
+msgstr "Documentation"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
msgid "sharing"
msgstr ""
-#: glossary.html.j2:133
+#: glossary.html.j2:161
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."
msgstr ""
-#: glossary.html.j2:137
+#: glossary.html.j2:165
msgid "signing key"
msgstr ""
-#: glossary.html.j2:139
+#: glossary.html.j2:167
msgid "see message signing key."
msgstr ""
-#: glossary.html.j2:143
+#: glossary.html.j2:171
msgid "spending"
msgstr ""
-#: glossary.html.j2:145
+#: glossary.html.j2:173
msgid ""
"operation by which a customer gives a merchant the right to `deposit` coins "
"in return for merchandise"
msgstr ""
-#: glossary.html.j2:149
+#: glossary.html.j2:177
msgid "transfer"
msgstr ""
-#: glossary.html.j2:151
+#: glossary.html.j2:179
msgid "method of sending funds between `bank` accounts"
msgstr ""
-#: glossary.html.j2:155
+#: glossary.html.j2:183
msgid "transaction"
msgstr ""
-#: glossary.html.j2:157
+#: glossary.html.j2:185
msgid ""
"method by which ownership is exclusively transferred from one entity to "
"another"
msgstr ""
-#: glossary.html.j2:161
+#: glossary.html.j2:189
msgid "transaction id"
msgstr ""
-#: glossary.html.j2:163
+#: glossary.html.j2:191
msgid "unique number by which a merchant identifies a `transaction`"
msgstr ""
-#: glossary.html.j2:167
+#: glossary.html.j2:195
msgid "wallet"
msgstr ""
-#: glossary.html.j2:169
+#: glossary.html.j2:197
msgid ""
"software running on a customer's computer; withdraws, stores and spends coins"
msgstr ""
-#: glossary.html.j2:173
+#: glossary.html.j2:201
msgid "wire transfer"
msgstr ""
-#: glossary.html.j2:175
+#: glossary.html.j2:203
msgid "see `transfer`"
msgstr ""
-#: glossary.html.j2:179
+#: glossary.html.j2:207
msgid "wire transfer identifier"
msgstr ""
-#: glossary.html.j2:181
+#: glossary.html.j2:209
msgid ""
"subject of a wire `transfer`; usually a random string to uniquely identify "
"the `transfer`"
msgstr ""
-#: glossary.html.j2:185
+#: glossary.html.j2:213
msgid "withdrawal"
msgstr ""
-#: glossary.html.j2:187
+#: glossary.html.j2:215
msgid ""
"operation by which a `wallet` can convert funds from a reserve to fresh coins"
msgstr ""
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
@@ -1597,78 +1664,83 @@ msgid ""
"industries, …."
msgstr ""
-#: team.html.j2:28
-#, fuzzy
-msgid "Applied cryptography. Contact to W3c & Tor."
-msgstr "mathématicien"
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
#: team.html.j2:33
-#, fuzzy
-msgid "Theoretical foundations."
-msgstr "Fatale (en théorie)"
+msgid "GNU mainatiner, lead developer."
+msgstr ""
#: team.html.j2:38
#, fuzzy
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Enthousiaste Ethique"
+msgid "Applied cryptography. Contact to W3c & Tor."
+msgstr "mathématicien"
-#: team.html.j2:45
+#: team.html.j2:43
#, fuzzy
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Principalement inoffensif"
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Enthousiaste Ethique"
#: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-
-#: team.html.j2:55
#, fuzzy
#| msgid "Software engineer. Works on libebics."
msgid "Software engineer."
msgstr "EBICS."
-#: team.html.j2:62
+#: team.html.j2:55
#, fuzzy
msgid "Sustainable business development."
msgstr "Basse fréquence"
+#: team.html.j2:60
+#, fuzzy
+msgid "Theoretical foundations."
+msgstr "Fatale (en théorie)"
+
#: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "EBICS."
+msgid "System administration, Taler Systems SA."
+msgstr ""
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
#, fuzzy
msgid "Translator (Spanish)"
msgstr "Traductrice"
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
#, fuzzy
msgid "Translator (Italian)"
msgstr "Traductrice"
-#: team.html.j2:98
+#: team.html.j2:99
#, fuzzy
msgid "Translator (German)"
msgstr "Traductrice"
-#: team.html.j2:104
+#: team.html.j2:106
msgid "Hardware security module"
msgstr ""
-#: team.html.j2:108
+#: team.html.j2:110
msgid "Risk management"
msgstr ""
-#: team.html.j2:112
+#: team.html.j2:118
+#, fuzzy
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Principalement inoffensif"
+
+#: team.html.j2:122
#, fuzzy
msgid "PhD student, TU Munich. Currently teaching."
msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
-#: team.html.j2:118
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
#, fuzzy
-#| msgid "Software engineer. Works on libebics."
-msgid "Software engineer. Works on Android wallet."
-msgstr "EBICS."
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler pour les développeurs"
#: common/base.j2:5
msgid "GNU Taler"
@@ -1718,6 +1790,14 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "EBICS."
+
+#, fuzzy
+#~| msgid "Software engineer. Works on libebics."
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "EBICS."
+
#, fuzzy
#~ msgid "Merchants"
#~ msgstr "Documentation"
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index ca91d72..3d4a349 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-11 11:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <address@hidden>\n"
@@ -22,16 +22,16 @@ msgid "GNU Taler Bibliography"
msgstr "Bibliografia GNU Taler"
#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
msgid "by"
msgstr "di"
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
msgid "and"
msgstr "e"
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
msgid "available upon request"
msgstr "disponibile su richiesta"
@@ -68,10 +68,20 @@ msgstr ""
"net</tt> Sono particolarmente gradite e-mail criptate via GnuPG."
#: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
msgid "Reporting bugs"
msgstr "Riporta un bug"
-#: contact.html.j2:38
+#: contact.html.j2:48
msgid ""
"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
@@ -82,11 +92,11 @@ msgstr ""
"GNUnet. Bugs e nuove funzionalità possono essere riportate anche nella "
"mailing-list."
-#: contact.html.j2:49
+#: contact.html.j2:59
msgid "Executive team"
msgstr "Dirigenza"
-#: contact.html.j2:51
+#: contact.html.j2:61
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -1057,28 +1067,45 @@ msgstr ""
"'depositate' dai commercianti"
#: glossary.html.j2:60
+msgid "expired"
+msgstr ""
+
+#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
msgid "extension"
msgstr "estensione"
-#: glossary.html.j2:62
+#: glossary.html.j2:76
msgid "implementation of a `wallet` for browsers"
msgstr "implementazione di un 'portafoglio' per i browsers"
-#: glossary.html.j2:66
+#: glossary.html.j2:80
msgid "fresh coin"
msgstr "moneta fresca"
-#: glossary.html.j2:68
+#: glossary.html.j2:82
msgid "a `coin` is fresh if its public key is only known to the customer"
msgstr ""
"la 'moneta' è fresca se la sua chiave pubblica è conosciuta soltanto dal "
"cliente"
-#: glossary.html.j2:72
+#: glossary.html.j2:86
msgid "master key"
msgstr "chiave master"
-#: glossary.html.j2:74
+#: glossary.html.j2:88
msgid ""
"offline key used by the exchange to certify denomination keys and message "
"signing keys"
@@ -1086,21 +1113,21 @@ msgstr ""
"chiave offline utilizzata dal cambio per certificare le chiavi di "
"denominazione e le chiavi di firma dei messaggi "
-#: glossary.html.j2:78
+#: glossary.html.j2:92
msgid "message signing key"
msgstr "chiave di firma del messaggio"
-#: glossary.html.j2:80
+#: glossary.html.j2:94
msgid "key used by the exchange to sign online messages, other than coins"
msgstr ""
"chiave utilizzata dal cambio per firmare messaggi online, diversi dalle "
"monete "
-#: glossary.html.j2:84
+#: glossary.html.j2:98
msgid "offer"
msgstr "offerta"
-#: glossary.html.j2:86
+#: glossary.html.j2:100
msgid ""
"specification of the details of a transaction, specifies the payment "
"obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1116,21 +1143,32 @@ msgstr ""
"altre parole, dopo che il backend aggiunge le informazioni mancanti "
"all'offerta e la firma, essa diventa una proposta."
-#: glossary.html.j2:95
+#: glossary.html.j2:109
msgid "owner"
msgstr "possessore"
-#: glossary.html.j2:97
+#: glossary.html.j2:111
msgid "a `coin` is owned by the entity that knows the private key of the coin"
msgstr ""
"la 'moneta' è di proprietà dell'entità che conosce la chiave privata della "
"moneta"
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
msgid "proof"
msgstr "prova"
-#: glossary.html.j2:103
+#: glossary.html.j2:125
msgid ""
"message that cryptographically demonstrates that a particular claim is "
"correct"
@@ -1138,19 +1176,19 @@ msgstr ""
"messaggio che dimostra crittograficamente che una particolare richiesta di "
"risarchimento è corretta "
-#: glossary.html.j2:107
+#: glossary.html.j2:129
msgid "proposal"
msgstr "proposta"
-#: glossary.html.j2:109
+#: glossary.html.j2:131
msgid "a sketch that has been completed and signed by the merchant backend."
msgstr "una bozza completata e firmata dal backend del commerciante"
-#: glossary.html.j2:113
+#: glossary.html.j2:135
msgid "reserve"
msgstr "riserva"
-#: glossary.html.j2:115
+#: glossary.html.j2:137
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 "
@@ -1160,11 +1198,11 @@ msgstr ""
"per il 'prelievo', sia i fondi conservati sul conto bancario del cambio per "
"coprire gli obblighi derivanti dalle monete in circolazione "
-#: glossary.html.j2:119
+#: glossary.html.j2:141
msgid "refreshing"
msgstr "aggiornamento"
-#: glossary.html.j2:121
+#: glossary.html.j2:143
msgid ""
"operation by which a `dirty` `coin` is converted into one or more `fresh` "
"coins"
@@ -1172,11 +1210,11 @@ msgstr ""
"operazione mediante la quale una moneta 'sporca' viene convertita in una o "
"più monete 'fresche' "
-#: glossary.html.j2:125
+#: glossary.html.j2:147
msgid "refund"
msgstr "rimborso"
-#: glossary.html.j2:127
+#: glossary.html.j2:149
msgid ""
"operation by which a merchant steps back from the right to funds that he "
"obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1186,11 +1224,25 @@ msgstr ""
"ottenere i fondi da un operazione di 'deposito', resitituendo il diritto ai "
"fondi al cliente"
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "denomination"
+msgid "revocation"
+msgstr "denominazione"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
msgid "sharing"
msgstr "condivisione"
-#: glossary.html.j2:133
+#: glossary.html.j2:161
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."
@@ -1199,19 +1251,19 @@ msgstr ""
"l'accesso alla chiave privata della moneta, consentendo così a tutti i co-"
"possessori di spendere la moneta in qualsiasi momento"
-#: glossary.html.j2:137
+#: glossary.html.j2:165
msgid "signing key"
msgstr "chiave di firma"
-#: glossary.html.j2:139
+#: glossary.html.j2:167
msgid "see message signing key."
msgstr "vedi 'chiave di firma del messaggio' "
-#: glossary.html.j2:143
+#: glossary.html.j2:171
msgid "spending"
msgstr "spesa"
-#: glossary.html.j2:145
+#: glossary.html.j2:173
msgid ""
"operation by which a customer gives a merchant the right to `deposit` coins "
"in return for merchandise"
@@ -1219,19 +1271,19 @@ msgstr ""
"operazione mediante la quale un cliente dà ad un commerciante il diritto di "
"'depositare le monete in cambio di merce"
-#: glossary.html.j2:149
+#: glossary.html.j2:177
msgid "transfer"
msgstr "trasferimento"
-#: glossary.html.j2:151
+#: glossary.html.j2:179
msgid "method of sending funds between `bank` accounts"
msgstr "metodo per l'invio di fondi tra conti 'bancari' "
-#: glossary.html.j2:155
+#: glossary.html.j2:183
msgid "transaction"
msgstr "transazione"
-#: glossary.html.j2:157
+#: glossary.html.j2:185
msgid ""
"method by which ownership is exclusively transferred from one entity to "
"another"
@@ -1239,39 +1291,39 @@ msgstr ""
"metodo in base al quale la proprietà è trasferita esclusivamente da "
"un'entità ad un'altra "
-#: glossary.html.j2:161
+#: glossary.html.j2:189
msgid "transaction id"
msgstr "ID di transazione"
-#: glossary.html.j2:163
+#: glossary.html.j2:191
msgid "unique number by which a merchant identifies a `transaction`"
msgstr ""
"numero univoco con il quale un commerciante identifica una 'transazione' "
-#: glossary.html.j2:167
+#: glossary.html.j2:195
msgid "wallet"
msgstr "portafoglio"
-#: glossary.html.j2:169
+#: glossary.html.j2:197
msgid ""
"software running on a customer's computer; withdraws, stores and spends coins"
msgstr ""
"software in esecuzione sul computer di un cliente; prelieva, conserva e "
"spende monete"
-#: glossary.html.j2:173
+#: glossary.html.j2:201
msgid "wire transfer"
msgstr "bonifico bancario"
-#: glossary.html.j2:175
+#: glossary.html.j2:203
msgid "see `transfer`"
msgstr "vedi 'trasferimento' "
-#: glossary.html.j2:179
+#: glossary.html.j2:207
msgid "wire transfer identifier"
msgstr "identificatore del bonifico bancario"
-#: glossary.html.j2:181
+#: glossary.html.j2:209
msgid ""
"subject of a wire `transfer`; usually a random string to uniquely identify "
"the `transfer`"
@@ -1279,17 +1331,32 @@ msgstr ""
"oggetto di un 'bonifico bancario'; solitamente una stringa casuale per "
"identificare in modo univoco il 'trasferimento' "
-#: glossary.html.j2:185
+#: glossary.html.j2:213
msgid "withdrawal"
msgstr "prelievo"
-#: glossary.html.j2:187
+#: glossary.html.j2:215
msgid ""
"operation by which a `wallet` can convert funds from a reserve to fresh coins"
msgstr ""
"operazione mediante la quale un 'portafoglio' può convertire i fondi da una "
"riserva a monete fresche"
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr "Vantaggi per le Pubbliche Amministrazioni"
@@ -2035,77 +2102,82 @@ msgstr ""
"Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
"diversi settori"
-#: team.html.j2:28
-#, fuzzy
-msgid "Applied cryptography. Contact to W3c & Tor."
-msgstr "Matematico e crittografo. Attivo nel W3C & Tor"
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
#: team.html.j2:33
-#, fuzzy
-msgid "Theoretical foundations."
-msgstr "Teorica della sicurezza dei protocolli"
+msgid "GNU mainatiner, lead developer."
+msgstr ""
#: team.html.j2:38
#, fuzzy
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
+msgid "Applied cryptography. Contact to W3c & Tor."
+msgstr "Matematico e crittografo. Attivo nel W3C & Tor"
-#: team.html.j2:45
+#: team.html.j2:43
#, fuzzy
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
#: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-"Dottorando a Inria Rennes.. Programmatore e architetto del protocollo Taler."
-
-#: team.html.j2:55
msgid "Software engineer."
msgstr "Programmatore."
-#: team.html.j2:62
+#: team.html.j2:55
msgid "Sustainable business development."
msgstr "Sviluppo di business sostenibile."
-#: team.html.j2:66
+#: team.html.j2:60
#, fuzzy
-msgid "Software engineer. Works on libebics."
-msgstr "Programmatore. Attualmente coinvolto in libebics."
+msgid "Theoretical foundations."
+msgstr "Teorica della sicurezza dei protocolli"
+
+#: team.html.j2:66
+msgid "System administration, Taler Systems SA."
+msgstr ""
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
#, fuzzy
msgid "Translator (Spanish)"
msgstr "Traduttore per lo spagnolo."
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
#, fuzzy
msgid "Translator (Italian)"
msgstr "Traduttrice per l'italiano."
-#: team.html.j2:98
+#: team.html.j2:99
#, fuzzy
msgid "Translator (German)"
msgstr "Traduttore per lo spagnolo."
-#: team.html.j2:104
+#: team.html.j2:106
msgid "Hardware security module"
msgstr "Sicurezza hardware."
-#: team.html.j2:108
+#: team.html.j2:110
msgid "Risk management"
msgstr "Gestione del rischio."
-#: team.html.j2:112
+#: team.html.j2:118
+#, fuzzy
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
+
+#: team.html.j2:122
#, fuzzy
msgid "PhD student, TU Munich. Currently teaching."
msgstr ""
"Dottorando alla TU di Monaco di Baviera. Linux, FreeBSD, siti web e il deep "
"state nel tempo libero."
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler per programmatori"
#: common/base.j2:5
msgid "GNU Taler"
@@ -2161,6 +2233,18 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "PhD Student, Inria.."
+#~ msgstr ""
+#~ "Dottorando a Inria Rennes.. Programmatore e architetto del protocollo "
+#~ "Taler."
+
+#, fuzzy
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Programmatore. Attualmente coinvolto in libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
+
#~ msgid "Developer Resources"
#~ msgstr "Risorse per i programmatori"
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index f60bc4d..094b178 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-11 11:49+0200\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -27,16 +27,16 @@ msgid "GNU Taler Bibliography"
msgstr "Bibliografia do GNU Taler"
#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
msgid "by"
msgstr "por"
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
msgid "and"
msgstr "e"
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
msgid "available upon request"
msgstr "disponível mediante solicitação"
@@ -73,10 +73,20 @@ msgstr ""
"tt>. Todos nós apoiamos o recebimento de e-mails criptografados pelo GnuPG."
#: contact.html.j2:36
+msgid "General inquiries"
+msgstr ""
+
+#: contact.html.j2:38
+msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
msgid "Reporting bugs"
msgstr "Relatando bugs"
-#: contact.html.j2:38
+#: contact.html.j2:48
msgid ""
"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
@@ -87,11 +97,11 @@ msgstr ""
"o projeto GNUnet. Você também pode relatar bugs ou solicitações de recursos "
"para a lista de discussões."
-#: contact.html.j2:49
+#: contact.html.j2:59
msgid "Executive team"
msgstr "Equipe executiva"
-#: contact.html.j2:51
+#: contact.html.j2:61
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -1047,28 +1057,45 @@ msgstr ""
"durante o “saque” e as resgata quando são “depositadas” pelos comerciantes."
#: glossary.html.j2:60
+msgid "expired"
+msgstr ""
+
+#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
msgid "extension"
msgstr "extensão <i>(extension)</i>"
-#: glossary.html.j2:62
+#: glossary.html.j2:76
msgid "implementation of a `wallet` for browsers"
msgstr "implementação de uma “carteira” para navegadores."
-#: glossary.html.j2:66
+#: glossary.html.j2:80
msgid "fresh coin"
msgstr "moeda nova <i>(fresh coin)</i>"
-#: glossary.html.j2:68
+#: glossary.html.j2:82
msgid "a `coin` is fresh if its public key is only known to the customer"
msgstr ""
"uma “moeda” é nova se a sua chave pública só for conhecida apenas pelo "
"cliente."
-#: glossary.html.j2:72
+#: glossary.html.j2:86
msgid "master key"
msgstr "chave mestre <i>(master key)</i>"
-#: glossary.html.j2:74
+#: glossary.html.j2:88
msgid ""
"offline key used by the exchange to certify denomination keys and message "
"signing keys"
@@ -1076,19 +1103,19 @@ msgstr ""
"chave offline usada pelo câmbio para certificar chaves de denominação e "
"chaves de assinatura de mensagem."
-#: glossary.html.j2:78
+#: glossary.html.j2:92
msgid "message signing key"
msgstr "chave de assinatura de mensagem <i>(message signing key)</i>"
-#: glossary.html.j2:80
+#: glossary.html.j2:94
msgid "key used by the exchange to sign online messages, other than coins"
msgstr "chave usada pelo câmbio para assinar mensagens online, além de moedas."
-#: glossary.html.j2:84
+#: glossary.html.j2:98
msgid "offer"
msgstr "oferta <i>(offer)</i>"
-#: glossary.html.j2:86
+#: glossary.html.j2:100
msgid ""
"specification of the details of a transaction, specifies the payment "
"obligations for the customer (i.e. the amount), the deliverables of the "
@@ -1104,21 +1131,32 @@ msgstr ""
"após o backend adicionar a informação faltando à oferta e a assiná-la, torna-"
"se uma proposta."
-#: glossary.html.j2:95
+#: glossary.html.j2:109
msgid "owner"
msgstr "proprietário <i>(owner)</i>"
-#: glossary.html.j2:97
+#: glossary.html.j2:111
msgid "a `coin` is owned by the entity that knows the private key of the coin"
msgstr ""
"uma “moeda” é de propriedade da entidade que conhece a chave privada da "
"moeda."
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
msgid "proof"
msgstr "prova <i>(proof)</i>"
-#: glossary.html.j2:103
+#: glossary.html.j2:125
msgid ""
"message that cryptographically demonstrates that a particular claim is "
"correct"
@@ -1126,19 +1164,19 @@ msgstr ""
"mensagem que demonstra criptograficamente que uma reivindicação particular "
"é .correta"
-#: glossary.html.j2:107
+#: glossary.html.j2:129
msgid "proposal"
msgstr "proposta <i>(proposal)</i>"
-#: glossary.html.j2:109
+#: glossary.html.j2:131
msgid "a sketch that has been completed and signed by the merchant backend."
msgstr "um esboço que foi concluído e assinado pelo backend do comerciante."
-#: glossary.html.j2:113
+#: glossary.html.j2:135
msgid "reserve"
msgstr "reserva <i>(reserve)</i>"
-#: glossary.html.j2:115
+#: glossary.html.j2:137
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 "
@@ -1148,11 +1186,11 @@ msgstr ""
"para “saque”, ou os fundos mantidos na conta bancária do câmbio para cobrir "
"obrigações de moedas em circulação."
-#: glossary.html.j2:119
+#: glossary.html.j2:141
msgid "refreshing"
msgstr "renovação <i>(refreshing)</i>"
-#: glossary.html.j2:121
+#: glossary.html.j2:143
msgid ""
"operation by which a `dirty` `coin` is converted into one or more `fresh` "
"coins"
@@ -1160,11 +1198,11 @@ msgstr ""
"operação através da qual uma moeda “suja” é convertida em uma ou mais moedas "
"“frescas”."
-#: glossary.html.j2:125
+#: glossary.html.j2:147
msgid "refund"
msgstr "restituição <i>(refund)</i>"
-#: glossary.html.j2:127
+#: glossary.html.j2:149
msgid ""
"operation by which a merchant steps back from the right to funds that he "
"obtained from a `deposit` operation, giving the right to the funds back to "
@@ -1174,11 +1212,25 @@ msgstr ""
"de uma operação de “depósito”, dando o direito aos fundos de volta ao "
"cliente."
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+#, fuzzy
+#| msgid "denomination"
+msgid "revocation"
+msgstr "denominação <i>(denomination)</i>"
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
msgid "sharing"
msgstr "compartilhamento <i>(sharing)</i>"
-#: glossary.html.j2:133
+#: glossary.html.j2:161
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."
@@ -1187,19 +1239,19 @@ msgstr ""
"acesso à chave privada da moeda, permitindo que todos os coproprietários "
"gastem a moeda a qualquer momento."
-#: glossary.html.j2:137
+#: glossary.html.j2:165
msgid "signing key"
msgstr "chave de assinatura <i>(signing key)</i>"
-#: glossary.html.j2:139
+#: glossary.html.j2:167
msgid "see message signing key."
msgstr "ver chave de assinatura de mensagem."
-#: glossary.html.j2:143
+#: glossary.html.j2:171
msgid "spending"
msgstr "gasto <i>(spending)</i>"
-#: glossary.html.j2:145
+#: glossary.html.j2:173
msgid ""
"operation by which a customer gives a merchant the right to `deposit` coins "
"in return for merchandise"
@@ -1207,19 +1259,19 @@ msgstr ""
"operação pela qual um cliente dá a um comerciante o direito de “depositar” "
"moedas em troca de mercadorias."
-#: glossary.html.j2:149
+#: glossary.html.j2:177
msgid "transfer"
msgstr "transferência <i>(transfer)</i>"
-#: glossary.html.j2:151
+#: glossary.html.j2:179
msgid "method of sending funds between `bank` accounts"
msgstr "método de envio de fundos entre contas de “banco”."
-#: glossary.html.j2:155
+#: glossary.html.j2:183
msgid "transaction"
msgstr "transação <i>(transaction)</i>"
-#: glossary.html.j2:157
+#: glossary.html.j2:185
msgid ""
"method by which ownership is exclusively transferred from one entity to "
"another"
@@ -1227,39 +1279,39 @@ msgstr ""
"método pelo qual a propriedade é transferida exclusivamente de uma entidade "
"para outra."
-#: glossary.html.j2:161
+#: glossary.html.j2:189
msgid "transaction id"
msgstr "id de transação <i>(transaction id)</i>"
-#: glossary.html.j2:163
+#: glossary.html.j2:191
msgid "unique number by which a merchant identifies a `transaction`"
msgstr "número único pelo qual um comerciante identifica uma “transação”."
-#: glossary.html.j2:167
+#: glossary.html.j2:195
msgid "wallet"
msgstr "carteira <i>(wallet)</i>"
-#: glossary.html.j2:169
+#: glossary.html.j2:197
msgid ""
"software running on a customer's computer; withdraws, stores and spends coins"
msgstr ""
"software sendo executado no computador de um cliente; saca, armazena e gasta "
"moedas."
-#: glossary.html.j2:173
+#: glossary.html.j2:201
msgid "wire transfer"
msgstr "transferência eletrônica <i>(wire transfer)</i>"
-#: glossary.html.j2:175
+#: glossary.html.j2:203
msgid "see `transfer`"
msgstr "veja “transferência”."
-#: glossary.html.j2:179
+#: glossary.html.j2:207
msgid "wire transfer identifier"
msgstr ""
"identificador de transferência eletrônica <i>(wire transfer identifier)</i>"
-#: glossary.html.j2:181
+#: glossary.html.j2:209
msgid ""
"subject of a wire `transfer`; usually a random string to uniquely identify "
"the `transfer`"
@@ -1267,17 +1319,32 @@ msgstr ""
"assunto de uma “transferência” bancária; geralmente, uma string aleatória "
"para identificar de forma única a “transferência”."
-#: glossary.html.j2:185
+#: glossary.html.j2:213
msgid "withdrawal"
msgstr "saque <i>(withdrawal)</i>"
-#: glossary.html.j2:187
+#: glossary.html.j2:215
msgid ""
"operation by which a `wallet` can convert funds from a reserve to fresh coins"
msgstr ""
"operação através da qual uma “carteira” pode converter fundos de uma reserva "
"para moedas novas."
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr "Vantagens para governos"
@@ -2004,66 +2071,73 @@ msgstr ""
"Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
"diferentes indústrias, …."
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c & Tor."
-msgstr "Criptografia aplicada. Contato para W3c & Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
+msgstr ""
#: team.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Fundações teóricas."
+msgid "GNU mainatiner, lead developer."
+msgstr ""
#: team.html.j2:38
+msgid "Applied cryptography. Contact to W3c & Tor."
+msgstr "Criptografia aplicada. Contato para W3c & Tor."
+
+#: team.html.j2:43
msgid "Founder of the GNU project. Ethical guidance and licensing."
msgstr "Fundador do projeto GNU. Orientação ética e licenciamento."
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr ""
-"Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
-
#: team.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Estudante de PhD, Inria."
-
-#: team.html.j2:55
msgid "Software engineer."
msgstr "Engenheiro de software."
-#: team.html.j2:62
+#: team.html.j2:55
msgid "Sustainable business development."
msgstr "Desenvolvimento empresarial sustentável."
+#: team.html.j2:60
+msgid "Theoretical foundations."
+msgstr "Fundações teóricas."
+
#: team.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Engenheiro de software. Funciona em libebics."
+msgid "System administration, Taler Systems SA."
+msgstr ""
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
msgid "Translator (Spanish)"
msgstr "Tradutor (Espanhol)"
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
msgid "Translator (Italian)"
msgstr "Tradutor (Italiano)"
-#: team.html.j2:98
+#: team.html.j2:99
msgid "Translator (German)"
msgstr "Tradutor (Alemão)"
-#: team.html.j2:104
+#: team.html.j2:106
msgid "Hardware security module"
msgstr "Módulo de segurança de hardware"
-#: team.html.j2:108
+#: team.html.j2:110
msgid "Risk management"
msgstr "Gerenciamento de risco"
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+"Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
+
+#: team.html.j2:122
msgid "PhD student, TU Munich. Currently teaching."
msgstr "Estudante PhD, Universidade Técnica de Munique. Atualmente lecionando."
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+#, fuzzy
+#| msgid "Taler for developers"
+msgid "Free software developer."
+msgstr "Taler para desenvolvedores"
#: common/base.j2:5
msgid "GNU Taler"
@@ -2117,6 +2191,15 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "PhD Student, Inria.."
+#~ msgstr "Estudante de PhD, Inria."
+
+#~ msgid "Software engineer. Works on libebics."
+#~ msgstr "Engenheiro de software. Funciona em libebics."
+
+#~ msgid "Software engineer. Works on Android wallet."
+#~ msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
+
#~ msgid "Developer Resources"
#~ msgstr "Recursos para desenvolvedores"
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index b493b0a..1fad3bf 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-06-27 22:51+0200\n"
+"POT-Creation-Date: 2019-08-11 11:49+0200\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <address@hidden>\n"
@@ -28,16 +28,16 @@ msgid "GNU Taler Bibliography"
msgstr ""
#: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
-#: bibliography.html.j2:29
+#: bibliography.html.j2:30 bibliography.html.j2:36
msgid "by"
msgstr ""
-#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:32
+#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:30
+#: bibliography.html.j2:36 common/footer.j2.inc:32
msgid "and"
msgstr ""
-#: bibliography.html.j2:30
+#: bibliography.html.j2:37
msgid "available upon request"
msgstr ""
@@ -68,21 +68,31 @@ msgid ""
msgstr ""
#: contact.html.j2:36
-msgid "Reporting bugs"
+msgid "General inquiries"
msgstr ""
#: contact.html.j2:38
msgid ""
+"You can reach a group of team members handling general inquiries at "
+"<tt>contact AT taler.net</tt>."
+msgstr ""
+
+#: contact.html.j2:46
+msgid "Reporting bugs"
+msgstr ""
+
+#: contact.html.j2:48
+msgid ""
"We track open feature requests and bugs in our <a href=\"https://gnunet.org/";
"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
"also report bugs or feature requests to the mailing list."
msgstr ""
-#: contact.html.j2:49
+#: contact.html.j2:59
msgid "Executive team"
msgstr ""
-#: contact.html.j2:51
+#: contact.html.j2:61
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
@@ -817,44 +827,61 @@ msgid ""
msgstr ""
#: glossary.html.j2:60
-msgid "extension"
+msgid "expired"
msgstr ""
#: glossary.html.j2:62
+msgid ""
+"Various operations come with time limits. In particular, `denomination keys` "
+"come with strict time limits for the various operations involving the `coin` "
+"issued under the `denomination`. The most important limit is the `deposit` "
+"expiration, which specifies until when wallets are allowed to use the coin "
+"in `deposit` or `refreshing` operations. There is also a \"legal\" "
+"expiration, which specifies how long the exchange keeps records beyond the "
+"`deposit` expiration time. This latter expiration matters for legal disputes "
+"in courts and also creates an upper limit for `refreshing` operations on "
+"special `zombie coin`."
+msgstr ""
+
+#: glossary.html.j2:74
+msgid "extension"
+msgstr ""
+
+#: glossary.html.j2:76
msgid "implementation of a `wallet` for browsers"
msgstr ""
-#: glossary.html.j2:66
+#: glossary.html.j2:80
msgid "fresh coin"
msgstr ""
-#: glossary.html.j2:68
+#: glossary.html.j2:82
msgid "a `coin` is fresh if its public key is only known to the customer"
msgstr ""
-#: glossary.html.j2:72
+#: glossary.html.j2:86
msgid "master key"
msgstr ""
-#: glossary.html.j2:74
+#: glossary.html.j2:88
msgid ""
"offline key used by the exchange to certify denomination keys and message "
"signing keys"
msgstr ""
-#: glossary.html.j2:78
+#: glossary.html.j2:92
msgid "message signing key"
msgstr ""
-#: glossary.html.j2:80
+#: glossary.html.j2:94
msgid "key used by the exchange to sign online messages, other than coins"
msgstr ""
-#: glossary.html.j2:84
+#: glossary.html.j2:98
msgid "offer"
msgstr ""
-#: glossary.html.j2:86
+#: glossary.html.j2:100
msgid ""
"specification of the details of a transaction, specifies the payment "
"obligations for the customer (i.e. the amount), the deliverables of the "
@@ -864,154 +891,192 @@ msgid ""
"and signs it, it becomes a proposal."
msgstr ""
-#: glossary.html.j2:95
+#: glossary.html.j2:109
msgid "owner"
msgstr ""
-#: glossary.html.j2:97
+#: glossary.html.j2:111
msgid "a `coin` is owned by the entity that knows the private key of the coin"
msgstr ""
-#: glossary.html.j2:101
+#: glossary.html.j2:115
+msgid "payback"
+msgstr ""
+
+#: glossary.html.j2:117
+msgid ""
+"operation by which an exchange returns the value of coins affected by a "
+"`revocation` to their `owner`, either by allowing the owner to withdraw new "
+"coins or wiring funds back to the bank account of the `owner`"
+msgstr ""
+
+#: glossary.html.j2:123
msgid "proof"
msgstr ""
-#: glossary.html.j2:103
+#: glossary.html.j2:125
msgid ""
"message that cryptographically demonstrates that a particular claim is "
"correct"
msgstr ""
-#: glossary.html.j2:107
+#: glossary.html.j2:129
msgid "proposal"
msgstr ""
-#: glossary.html.j2:109
+#: glossary.html.j2:131
msgid "a sketch that has been completed and signed by the merchant backend."
msgstr ""
-#: glossary.html.j2:113
+#: glossary.html.j2:135
msgid "reserve"
msgstr ""
-#: glossary.html.j2:115
+#: glossary.html.j2:137
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"
msgstr ""
-#: glossary.html.j2:119
+#: glossary.html.j2:141
msgid "refreshing"
msgstr ""
-#: glossary.html.j2:121
+#: glossary.html.j2:143
msgid ""
"operation by which a `dirty` `coin` is converted into one or more `fresh` "
"coins"
msgstr ""
-#: glossary.html.j2:125
+#: glossary.html.j2:147
msgid "refund"
msgstr ""
-#: glossary.html.j2:127
+#: glossary.html.j2:149
msgid ""
"operation by which a merchant steps back from the right to funds that he "
"obtained from a `deposit` operation, giving the right to the funds back to "
"the customer"
msgstr ""
-#: glossary.html.j2:131
+#: glossary.html.j2:153
+msgid "revocation"
+msgstr ""
+
+#: glossary.html.j2:155
+msgid ""
+"exceptional operation by which an exchange withdraws a denomination from "
+"circulation, either because the signing key was compromised or because the "
+"exchange is going out of operation; unspent coins of a revoked denomination "
+"are subjected to payback."
+msgstr ""
+
+#: glossary.html.j2:159
msgid "sharing"
msgstr ""
-#: glossary.html.j2:133
+#: glossary.html.j2:161
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."
msgstr ""
-#: glossary.html.j2:137
+#: glossary.html.j2:165
msgid "signing key"
msgstr ""
-#: glossary.html.j2:139
+#: glossary.html.j2:167
msgid "see message signing key."
msgstr ""
-#: glossary.html.j2:143
+#: glossary.html.j2:171
msgid "spending"
msgstr ""
-#: glossary.html.j2:145
+#: glossary.html.j2:173
msgid ""
"operation by which a customer gives a merchant the right to `deposit` coins "
"in return for merchandise"
msgstr ""
-#: glossary.html.j2:149
+#: glossary.html.j2:177
msgid "transfer"
msgstr ""
-#: glossary.html.j2:151
+#: glossary.html.j2:179
msgid "method of sending funds between `bank` accounts"
msgstr ""
-#: glossary.html.j2:155
+#: glossary.html.j2:183
msgid "transaction"
msgstr ""
-#: glossary.html.j2:157
+#: glossary.html.j2:185
msgid ""
"method by which ownership is exclusively transferred from one entity to "
"another"
msgstr ""
-#: glossary.html.j2:161
+#: glossary.html.j2:189
msgid "transaction id"
msgstr ""
-#: glossary.html.j2:163
+#: glossary.html.j2:191
msgid "unique number by which a merchant identifies a `transaction`"
msgstr ""
-#: glossary.html.j2:167
+#: glossary.html.j2:195
msgid "wallet"
msgstr ""
-#: glossary.html.j2:169
+#: glossary.html.j2:197
msgid ""
"software running on a customer's computer; withdraws, stores and spends coins"
msgstr ""
-#: glossary.html.j2:173
+#: glossary.html.j2:201
msgid "wire transfer"
msgstr ""
-#: glossary.html.j2:175
+#: glossary.html.j2:203
msgid "see `transfer`"
msgstr ""
-#: glossary.html.j2:179
+#: glossary.html.j2:207
msgid "wire transfer identifier"
msgstr ""
-#: glossary.html.j2:181
+#: glossary.html.j2:209
msgid ""
"subject of a wire `transfer`; usually a random string to uniquely identify "
"the `transfer`"
msgstr ""
-#: glossary.html.j2:185
+#: glossary.html.j2:213
msgid "withdrawal"
msgstr ""
-#: glossary.html.j2:187
+#: glossary.html.j2:215
msgid ""
"operation by which a `wallet` can convert funds from a reserve to fresh coins"
msgstr ""
+#: glossary.html.j2:219
+msgid "zombie coin"
+msgstr ""
+
+#: glossary.html.j2:221
+msgid ""
+"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
+"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
+"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
+"the refresh operation being subjected to `payback`; as a result, the "
+"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
+"denomination is `expired` for `deposit` operations (but not if it is expired "
+"past the legal data retention requirement)."
+msgstr ""
+
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
@@ -1586,64 +1651,69 @@ msgid ""
"industries, …."
msgstr ""
-#: team.html.j2:28
-msgid "Applied cryptography. Contact to W3c & Tor."
+#: team.html.j2:26
+msgid "Lawyer and banker."
msgstr ""
#: team.html.j2:33
-msgid "Theoretical foundations."
+msgid "GNU mainatiner, lead developer."
msgstr ""
#: team.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgid "Applied cryptography. Contact to W3c & Tor."
msgstr ""
-#: team.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
+#: team.html.j2:43
+msgid "Founder of the GNU project. Ethical guidance and licensing."
msgstr ""
#: team.html.j2:50
-msgid "PhD Student, Inria.."
+msgid "Software engineer."
msgstr ""
#: team.html.j2:55
-msgid "Software engineer."
+msgid "Sustainable business development."
msgstr ""
-#: team.html.j2:62
-msgid "Sustainable business development."
+#: team.html.j2:60
+msgid "Theoretical foundations."
msgstr ""
#: team.html.j2:66
-msgid "Software engineer. Works on libebics."
+msgid "System administration, Taler Systems SA."
msgstr ""
-#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#: team.html.j2:73 team.html.j2:77 team.html.j2:81
msgid "Translator (Spanish)"
msgstr ""
-#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#: team.html.j2:87 team.html.j2:91 team.html.j2:95
msgid "Translator (Italian)"
msgstr ""
-#: team.html.j2:98
+#: team.html.j2:99
msgid "Translator (German)"
msgstr ""
-#: team.html.j2:104
+#: team.html.j2:106
msgid "Hardware security module"
msgstr ""
-#: team.html.j2:108
+#: team.html.j2:110
msgid "Risk management"
msgstr ""
-#: team.html.j2:112
+#: team.html.j2:118
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:122
msgid "PhD student, TU Munich. Currently teaching."
msgstr ""
-#: team.html.j2:118
-msgid "Software engineer. Works on Android wallet."
+#: team.html.j2:128 team.html.j2:132 team.html.j2:136 team.html.j2:142
+#: team.html.j2:146
+msgid "Free software developer."
msgstr ""
#: common/base.j2:5
diff --git a/principles.html.j2 b/principles.html.j2
index 854ebce..e1b94e1 100644
--- a/principles.html.j2
+++ b/principles.html.j2
@@ -18,129 +18,194 @@ h2 {
<div class="container">
<div class="row">
<div class="col">
- <h1>GNU Taler: Design Principles</h1>
+ <h1>
+ {% trans %}
+ GNU Taler: Design Principles
+ {% endtrans %}
+ </h1>
</div>
</div>
- <p>When designing GNU Taler, we had the following design principles in
mind:</p>
+ <p>
+ {% trans %}
+ When designing GNU Taler, we had the following design principles in mind:
+ {% endtrans %}
+ </p>
<div class="row">
<div class="col-lg-12">
- <h2>1. Free Software implementation</h2>
- <a href="https://www.gnu.org/graphics/freedom.html";><img
style="width:20vw;float:right" src="../images/stallman.medium.png" alt="... in
the are of computing, freedom means not using proprietary software"></a>
+ <h2>
+ {% trans %}
+ 1. Free Software implementation
+ {% endtrans %}
+ </h2>
+ <a href="https://www.gnu.org/graphics/freedom.html";><img
style="width:20vw;float:right" src="../images/stallman.medium.png"
alt="{{_("... in the are of computing, freedom means not using proprietary
software")}}"></a>
<p>
+ {% trans %}
GNU Taler must be <a
href="https://www.gnu.org/philosophy/free-sw.html";>Free Software</a>.
For merchants, our Free Software
reference implementation prevents vendor lock-in. As
the software of the payment provider itself is free, countries can
deploy the payment system without compromising sovereignty.
+ {% endtrans %}
</p>
<p>
+ {% trans %}
Customers benefit from Free Software
as the wallet software can be made to run on a variety of platforms,
and
the absence of user-hostile features such as tracking or telemetry can
easily be
assured.
+ {% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>2. Protect the privacy of buyers</h2>
+ <h2>
+ {% trans %}
+ 2. Protect the privacy of buyers
+ {% endtrans %}
+ </h2>
<!-- From https://www.pixabay.com/ -->
- <img style="width:20vw;float:left;padding:15px"
src="../images/anonymous.jpg" alt="You deserve some privacy">
+ <img style="width:20vw;float:left;padding:15px"
src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}">
<p>
+ {% trans %}
Privacy should be guaranteed via technical measures, as opposed to mere
policies. Especially with micropayments for online content, a
disproportion-
ate amount of rather private data about buyers would be revealed, if
the
payment system does not have privacy protections.
+ {% endtrans %}
</p>
<p>
+ {% trans %}
In legislations with data protection regulations (such as the recently
introduced GDPR in Europe),
merchants benefit from this as well, as
no data breach of customers can happen if this information is, by
design,
not collected in the first place. Obviously some private data, such as
the
shipping address for a physical delivery, must still be collected
according to
business needs.
- </p>
+ {% endtrans %}
+ </p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>3. Enable the state to tax income and crack down on illegal business
activities</h2>
+ <h2>
+ {% trans %}
+ 3. Enable the state to tax income and crack down on illegal business
activities
+ {% endtrans %}
+ </h2>
<!-- From https://www.pxhere.com/ -->
- <img style="width:20vw;float:right;padding:15px"
src="../images/money-laundering.medium.jpg" alt="Money laundering">
+ <img style="width:20vw;float:right;padding:15px"
src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}">
<p>
+ {% trans %}
As a payment system must still be legal to operate and use, it must
comply
with these requirements. Furthermore, we consider levying of taxes as
beneficial to society.
+ {% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>4. Prevent payment fraud</h2>
+ <h2>
+ {% trans %}
+ 4. Prevent payment fraud
+ {% endtrans %}
+ </h2>
<!-- From https://www.maxpixel.net/ -->
- <img style="width:20vw;float:left;padding:15px"
src="../images/fraud.medium.jpg" alt="Phishing attack">
+ <img style="width:20vw;float:left;padding:15px"
src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}">
<p>
+ {% trans %}
This imposes requirements on the security of the system, as well as on
the
general design, as payment fraud can also happen through misleading
user
interface design or the lack of cryptographic evidence for certain
processes.
+ {% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>5. Only disclose the minimal amount of information necessary</h2>
- <img style="width:20vw;float:right;padding:15px"
src="../images/gdpr.medium.jpg" alt="Privacy by design, privacy by default,
General Data Protection Regulation (GDPR) compliant"></a>
+ <h2>
+ {% trans %}
+ 5. Only disclose the minimal amount of information necessary
+ {% endtrans %}
+ </h2>
+ <img style="width:20vw;float:right;padding:15px"
src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by
default, General Data Protection Regulation (GDPR) compliant")}}"></a>
<p>
+ {% trans %}
The reason behind this goal is similar to (2). The privacy of buyers
is given
priority, but other parties such as merchants still benefit from it,
for example,
by keeping details about the merchant’s financials hidden from
competitors.
+ {% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>6. Be usable</h2>
- <img style="width:20vw;float:left;padding:15px"
src="../images/buy.medium.jpg" alt="Buy with one click"></a>
+ <h2>{% trans %}
+ 6. Be usable
+ {% endtrans %}
+ </h2>
+ <img style="width:20vw;float:left;padding:15px"
src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}"></a>
<p>
+ {% trans %}
Specifically it must be usable for non-expert customers. Usability also
applies to the integration with merchants, and informs choices about the
architecture, such as encapsulating procedures that require cryptographic
operations into an isolated component with a simple API.
+ {% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>7. Be efficient</h2>
- <img style="width:20vw;float:right;padding:15px"
src="../images/efficient.png" alt="Energy efficiency"></a>
+ <h2>
+ {% trans %}
+ 7. Be efficient
+ {% endtrans %}
+ </h2>
+ <img style="width:20vw;float:right;padding:15px"
src="../images/efficient.png" alt="{{_("Energy efficiency")}}"></a>
<p>
+ {% trans %}
Approaches such as proof-of-work are ruled out by this requirement.
Efficiency is necessary for GNU Taler to be used for micropayments.
+ {% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>8. Fault-tolerant design</a></h2>
- <img style="width:20vw;float:left;padding:15px"
src="../images/life-safer.medium.jpg" alt="Life Safers"></a>
+ <h2>
+ {% trans %}
+ 8. Fault-tolerant design
+ {% endtrans %}
+ </a></h2>
+ <img style="width:20vw;float:left;padding:15px"
src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}"></a>
<p>
+ {% trans %}
Taler should tolerate failure of individual components and systems,
including malicious operators compromising core secrets.
This manifests in architectural choices such
as the isolation of certain components, and auditing procedures.
+ {% endtrans %}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
- <h2>9. Foster competition</h2>
- <img style="width:20vw;float:right;padding:15px"
src="../images/market.medium.jpg" alt="A competitive market"></a>
+ <h2>
+ {% trans %}
+ 9. Foster competition
+ {% endtrans %}
+ </h2>
+ <img style="width:20vw;float:right;padding:15px"
src="../images/market.medium.jpg" alt="{{_("A competitive market")}}"></a>
<p>
+ {% trans %}
It must be relatively easy for competitors to join the systems. While the
barriers for this in traditional financial systems are rather high, the
technical
burden for new competitors to join must be minimized. Another design
choice that supports this is to split the whole system into smaller components
that can be operated, developed and improved upon independently,
instead of having one completely monolithic system.
+ {% endtrans %}
</p>
</div>
</div>
diff --git a/web-common b/web-common
index caf5a98..dc9d5ab 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c
+Subproject commit dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bfb
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-www] branch master updated: fix translation markup,
gnunet <=