summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorng0 <ng0@taler.net>2019-12-11 11:21:48 +0000
committerng0 <ng0@taler.net>2019-12-11 11:21:48 +0000
commitfcb8a94a1b82f84f5453df0e4ab740bff5f3b610 (patch)
treed297a821773a0577916e706daed2d986272e8889 /locale
parentca901e4b99a037553a5afe1beeb50255aeecb27c (diff)
downloadwww-fcb8a94a1b82f84f5453df0e4ab740bff5f3b610.tar.gz
www-fcb8a94a1b82f84f5453df0e4ab740bff5f3b610.tar.bz2
www-fcb8a94a1b82f84f5453df0e4ab740bff5f3b610.zip
finally merge new layout
Diffstat (limited to 'locale')
-rw-r--r--locale/de/LC_MESSAGES/messages.po168
-rw-r--r--locale/es/LC_MESSAGES/messages.po245
-rw-r--r--locale/fr/LC_MESSAGES/messages.po168
-rw-r--r--locale/it/LC_MESSAGES/messages.po245
-rw-r--r--locale/pt/LC_MESSAGES/messages.po249
-rw-r--r--locale/ru/LC_MESSAGES/messages.po168
6 files changed, 703 insertions, 540 deletions
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index bca5809..7a4577f 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\n"
+"POT-Creation-Date: 2019-12-10 14:34+0000\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: de <LL@li.org, de@taler.net>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.4.0\n"
-#: common/base.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr "Das Taler-Bezahlsystem"
@@ -35,7 +35,7 @@ msgstr ""
msgid "Bibliography"
msgstr "Bibliografie von GNU Taler"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "und"
@@ -68,10 +68,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -184,21 +180,16 @@ msgstr ""
msgid "Copyright Assignment"
msgstr ""
-#: template/copyright.html.j2:9
+#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the"
-msgstr ""
-
-#: template/copyright.html.j2:15
-msgid "agreement on licensing and collaborative development"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:17
-msgid "of the GNUnet and GNU Taler projects is satisfied."
-msgstr ""
-
-#: template/copyright.html.j2:24
+#: template/copyright.html.j2:19
msgid ""
"The agreements ensure that the code will continue to be made available under "
"free software licenses, but gives developers the freedom to move code "
@@ -207,7 +198,7 @@ msgid ""
"stores that are hostile to free software)."
msgstr ""
-#: template/copyright.html.j2:34
+#: template/copyright.html.j2:29
msgid ""
"Minor contributions (basically, anyone without Git access) do not require "
"copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -274,11 +265,11 @@ msgstr "RESTful-basiert"
msgid ""
"Taler is designed to work on the Internet. To ensure that Taler payments can "
"work with restrictive network setups, Taler uses a RESTful protocol over "
-"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
-"obviously merchants may choose to offer HTTPS for consistency and because it "
-"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
-"structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at"
+"HTTP or HTTPS. Taler&#39;s security does not depend upon the use of HTTPS, "
+"but obviously merchants may choose to offer HTTPS for consistency and "
+"because it generally is better for privacy compared to HTTP. Taler uses JSON "
+"to encode structure data, making it easy to integrate Taler with existing "
+"Web applications. Taler&#39;s protocol is documented in detail at"
msgstr ""
"Taler als Bezahlsystem benutzt ein RESTful-Protokoll über HTTP oder HTTPS-"
"Verbindungen, um auch in eingeschränkten Netzwerkumgebungen sichere "
@@ -427,7 +418,7 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:93
+#: template/developers.html.j2:149 template/investors.html.j2:90
msgid "Download"
msgstr ""
@@ -494,14 +485,14 @@ msgstr ""
#| "value of the funds (except for fees which the\n"
#| "exchange may charge for the service).\n"
msgid ""
-"Once the exchange has received the wire transfer, it allows the customer's "
-"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
-"are digital representations of the original currency from the transfer. It "
-"is important to note that the exchange does not learn the &quot;serial "
-"numbers&quot; of the coins created in this process, so it cannot tell later "
-"which customer purchased what at which merchant. The use of Taler does not "
-"change the currency or the total value of the funds (except for fees which "
-"the exchange may charge for the service)."
+"Once the exchange has received the wire transfer, it allows the customer&#39;"
+"s electronic wallet to <b>withdraw</b> electronic coins. The electronic "
+"coins are digital representations of the original currency from the "
+"transfer. It is important to note that the exchange does not learn the &quot;"
+"serial numbers&quot; of the coins created in this process, so it cannot tell "
+"later which customer purchased what at which merchant. The use of Taler does "
+"not change the currency or the total value of the funds (except for fees "
+"which the exchange may charge for the service)."
msgstr ""
"Sobald die Taler-Wechselstube die Überweisung von der Bank erhalten hat, "
"erlaubt sie die Verwendung der digitalen Münzen in der Taler-Geldbörse. Die "
@@ -1025,12 +1016,13 @@ msgstr ""
#: template/faq.html.j2:119
msgid ""
-"Taler's wallet supports multiple currencies, but the system currently does "
-"not support conversion between currencies. However, in principle an entity "
-"that accepts deposits in one currency and allows withdrawals in another "
-"currency could be created. Still, the regulatory hurdles in this case tend "
-"to be particularly complex. The focus for Taler is on day-to-day payments, "
-"so we have no plans to support currency conversion in the near future."
+"Taler&#39;s wallet supports multiple currencies, but the system currently "
+"does not support conversion between currencies. However, in principle an "
+"entity that accepts deposits in one currency and allows withdrawals in "
+"another currency could be created. Still, the regulatory hurdles in this "
+"case tend to be particularly complex. The focus for Taler is on day-to-day "
+"payments, so we have no plans to support currency conversion in the near "
+"future."
msgstr ""
#: template/faq.html.j2:130
@@ -1467,7 +1459,7 @@ msgstr ""
msgid ""
"a `coin` is dirty if its public key may be known to an entity other than the "
"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
+"multiple transactions of coin&#39;s owner if the coin is not refreshed first"
msgstr ""
#: template/glossary.html.j2:61
@@ -1476,7 +1468,7 @@ msgstr ""
#: template/glossary.html.j2:63
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
@@ -1589,8 +1581,8 @@ msgstr ""
#: template/glossary.html.j2:146
msgid ""
"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
-"account to cover obligations from coins in circulation"
+"exchange ready for `withdrawal`, or the funds kept in the exchange&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
#: template/glossary.html.j2:152
@@ -1634,7 +1626,7 @@ msgstr ""
#: template/glossary.html.j2:178
msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
+"users can share ownership of a `coin` by sharing access to the coin&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
@@ -1841,11 +1833,11 @@ msgstr ""
#| "improving economic security for individuals, merchants,\n"
#| "the exchange and the state.\n"
msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, merchants "
-"and the Taler payment service provider (the exchange) can mathematically "
-"demonstrate their lawful behavior in court in case of disputes. Financial "
-"damages are strictly limited, improving economic security for individuals, "
-"merchants, the exchange and the state."
+"Taler&#39;s payments are cryptographically secured. Thus, customers, "
+"merchants and the Taler payment service provider (the exchange) can "
+"mathematically demonstrate their lawful behavior in court in case of "
+"disputes. Financial damages are strictly limited, improving economic "
+"security for individuals, merchants, the exchange and the state."
msgstr ""
"Zahlungen in Taler sind kryptographisch verschlüsselt. Sowohl Käufer als "
"auch Verkäufer und das Taler-Bezahlsystem selbst (die Taler-Wechselstube) "
@@ -2045,8 +2037,8 @@ msgstr ""
#| "and the income of the exchange from transaction fees.\n"
msgid ""
"The amounts of digital coins legitimately withdrawn by customers from the "
-"exchange, the value of non-redeemed digital coins in customer's wallets, the "
-"value and corresponding wire details of deposit operations performed by "
+"exchange, the value of non-redeemed digital coins in customer&#39;s wallets, "
+"the value and corresponding wire details of deposit operations performed by "
"merchants with the exchange, and the income of the exchange from transaction "
"fees."
msgstr ""
@@ -2074,12 +2066,12 @@ msgstr "Das Taler-System im Überblick"
#: template/gsoc-codeless.html.j2:14
msgid ""
-"Codeless payment is a component that sits between the seller's frontend and "
-"the GNU Taler merchant backend. This component has a web interface, where "
-"payment buttons are configured. Registered merchants can manage their "
-"inventory and simultaneously create a 'Buy Now' button for a specific "
-"product. This code can be directly copy pasted on the seller's frontend and "
-"can be used for 'Pay with Taler'."
+"Codeless payment is a component that sits between the seller&#39;s frontend "
+"and the GNU Taler merchant backend. This component has a web interface, "
+"where payment buttons are configured. Registered merchants can manage their "
+"inventory and simultaneously create a &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2316,20 +2308,18 @@ msgstr ""
"Vision in die Welt zu bringen."
#: template/investors.html.j2:37
-msgid "We are currently supported by"
-msgstr ""
-
-#: template/investors.html.j2:41
msgid ""
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
"the French national institute for research in informatics and automation, "
-"and the"
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
msgstr ""
-#: template/investors.html.j2:50
+#: template/investors.html.j2:47
msgid "The Technology"
msgstr "Die Technologie"
-#: template/investors.html.j2:53
+#: template/investors.html.j2:50
#, fuzzy
#| msgid ""
#| "All transactions in Taler are secured using <a href=\"bibliography.html"
@@ -2346,11 +2336,11 @@ msgstr "Die Technologie"
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
-"damage is bounded (for customers, merchants and the exchange) even in the "
-"case that systems are compromised and private keys are stolen. Databases can "
-"be audited for consistency, resulting in either the detection of compromised "
-"systems or the demonstration that participants were honest. Actual "
-"transaction costs are fractions of a cent."
+"damage is bounded &#x28;for customers, merchants and the exchange&#x29; even "
+"in the case that systems are compromised and private keys are stolen. "
+"Databases can be audited for consistency, resulting in either the detection "
+"of compromised systems or the demonstration that participants were honest. "
+"Actual transaction costs are fractions of a cent."
msgstr ""
"Alle Buchungen im Taler-Bezahlsystem sind mit aktuellen Methoden der <a href="
"\"bibliography.html\">Kryptographie</a> geschützt. Selbst im Fall eines "
@@ -2362,11 +2352,11 @@ msgstr ""
"Beteiligten dar. Die Buchungskosten betragen übrigens nur Bruchteile eines "
"Cent pro Buchung."
-#: template/investors.html.j2:66
+#: template/investors.html.j2:63
msgid "The Business"
msgstr "Das Geschäftsmodell des Taler-Bezahlsystems"
-#: template/investors.html.j2:68
+#: template/investors.html.j2:65
#, fuzzy
#| msgid ""
#| "The scalable business model for Taler is the operation\n"
@@ -2396,22 +2386,22 @@ msgstr ""
"gutgeschrieben bekommt. Die Wechselstube erhebt für die Überweisungen "
"geringe Gebühren."
-#: template/investors.html.j2:87
+#: template/investors.html.j2:84
msgid "The Business Case"
msgstr "Der Businessplan"
-#: template/investors.html.j2:97
+#: template/investors.html.j2:94
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:120
+#: template/investors.html.j2:117
msgid "Running a Taler payment service operator"
msgstr "Ein Taler-Bezahlsystem als Serviceanbieter betreiben"
-#: template/investors.html.j2:123
+#: template/investors.html.j2:120
#, fuzzy
#| msgid ""
#| "The payment service operator runs the <em>Taler exchange</em>.\n"
@@ -2430,7 +2420,7 @@ msgstr ""
"Banküberweisungen von und zu Geschäftsbanken und für den Betrieb der IT-"
"Infrastruktur."
-#: template/investors.html.j2:133
+#: template/investors.html.j2:130
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2438,7 +2428,7 @@ msgstr ""
"Die Kosten für die kryptographischen Berechnungen, die Bandbreite und "
"Datenspeicherung betragen weniger als 0,01 Eurocent pro Transaktion."
-#: template/investors.html.j2:134
+#: template/investors.html.j2:131
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2447,7 +2437,7 @@ msgstr ""
"können mehrere kleine Überweisungen auf das Girokonto der Verkäufer in einer "
"Transaktion zusammengefasst und übertragen werden."
-#: template/investors.html.j2:135
+#: template/investors.html.j2:132
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2457,11 +2447,11 @@ msgstr ""
"Geldbörse, Deponieren von Münzen, Refresh-Funktion, Erstattungen und "
"aggregierte Überweisungen an Geschäftsbanken."
-#: template/investors.html.j2:136
+#: template/investors.html.j2:133
msgid "Partnership with banks establishes consumer trust."
msgstr "Partnerschaften mit Banken erhöhen das Kundenvertrauen."
-#: template/investors.html.j2:137
+#: template/investors.html.j2:134
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"Partnerschaften mit der Free-Software-Bewegung ermöglichen eine rasche "
@@ -2587,7 +2577,7 @@ msgstr "Günstig"
#| "thus offer low transaction fees.\n"
msgid ""
"Taler is uses efficient cryptographic constructions with low bandwidth and "
-"storage requirements. Combined with Taler's strong security which makes "
+"storage requirements. Combined with Taler&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2630,7 +2620,7 @@ msgstr "Ethisch"
#| "transparency by providing an open standard and free\n"
#| "software reference implementations.\n"
msgid ""
-"Taler prevents tax evasion and money laundering. Taler's protocols are "
+"Taler prevents tax evasion and money laundering. Taler&#39;s protocols are "
"efficient and do not use wasteful proof-of-work calculations. Taler "
"encourages transparency by providing an open standard and free software "
"reference implementations."
@@ -2672,8 +2662,8 @@ msgstr "Händler verwenden das Taler-Backend zur Zahlungsabwicklung:"
#| "customer's order in a JSON format to the backend.\n"
msgid ""
"The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
-"by the merchant to customers. For this, the merchant's frontend needs to "
-"give the customer's order in a JSON format to the backend."
+"by the merchant to customers. For this, the merchant&#39;s frontend needs to "
+"give the customer&#39;s order in a JSON format to the backend."
msgstr ""
"Das Backend signiert und speichert sämtliche Bedingungen der Verträge, die "
"Käufer und Verkäufer vorher vereinbart hatten. Das Händlerfrontend liefert "
@@ -2691,8 +2681,8 @@ msgstr ""
msgid ""
"The backend <b>validates</b> payments received from the wallet and "
"<b>executes</b> them with the Taler payment service provider (the exchange). "
-"For this, the merchant's frontend must pass the payment request through to "
-"the Taler backend and check the HTTP status code that is returned."
+"For this, the merchant&#39;s frontend must pass the payment request through "
+"to the Taler backend and check the HTTP status code that is returned."
msgstr ""
"Das Backend validiert die Signaturen aus den Taler-Geldbörsen und sendet sie "
"der Taler-Wechselstube zur Ausführung. Das Händlerfrontend muss dann die "
@@ -2938,7 +2928,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2956,7 +2946,7 @@ msgid "or"
msgstr ""
#: template/wallet.html.j2:149
-msgid "is required, but it appears you don't have it installed."
+msgid "is required, but it appears you don&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2974,7 +2964,7 @@ msgid "Install wallet"
msgstr "Geldbörse"
#: template/wallet.html.j2:177
-msgid "JavaScript is disabled, installation won't work."
+msgid "JavaScript is disabled, installation won&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 0e6b067..e9df2b7 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\n"
+"POT-Creation-Date: 2019-12-10 14:34+0000\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Generated-By: Babel 2.3.4\n"
"X-Generator: Poedit 2.0.2\n"
-#: common/base.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr "GNU Taler"
@@ -34,7 +34,7 @@ msgstr "Preguntas frecuentes"
msgid "Bibliography"
msgstr "Bibliografía"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "y"
@@ -69,10 +69,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -175,21 +171,16 @@ msgstr ""
msgid "Copyright Assignment"
msgstr "Asignación de derechos de autor"
-#: template/copyright.html.j2:9
+#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the"
-msgstr ""
-
-#: template/copyright.html.j2:15
-msgid "agreement on licensing and collaborative development"
-msgstr ""
-
-#: template/copyright.html.j2:17
-msgid "of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:24
+#: template/copyright.html.j2:19
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -211,7 +202,7 @@ msgstr ""
"para que podamos distribuir a través de las App-stores que son hostiles al "
"software libre).</p>"
-#: template/copyright.html.j2:34
+#: template/copyright.html.j2:29
#, fuzzy
#| msgid ""
#| "<p>Minor contributions (basically, anyone without Git access) do not "
@@ -277,11 +268,11 @@ msgstr "Basado en REST"
msgid ""
"Taler is designed to work on the Internet. To ensure that Taler payments can "
"work with restrictive network setups, Taler uses a RESTful protocol over "
-"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
-"obviously merchants may choose to offer HTTPS for consistency and because it "
-"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
-"structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at"
+"HTTP or HTTPS. Taler&#39;s security does not depend upon the use of HTTPS, "
+"but obviously merchants may choose to offer HTTPS for consistency and "
+"because it generally is better for privacy compared to HTTP. Taler uses JSON "
+"to encode structure data, making it easy to integrate Taler with existing "
+"Web applications. Taler&#39;s protocol is documented in detail at"
msgstr ""
"Taler está diseñado para trabajar con Internet. Para garantizar que los "
"pagos de Taler puedan funcionar con configuraciones restrictivas de red, "
@@ -422,7 +413,7 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:93
+#: template/developers.html.j2:149 template/investors.html.j2:90
msgid "Download"
msgstr ""
@@ -458,15 +449,26 @@ msgstr ""
"una reserva en la plataforma de intercambio."
#: template/developers.html.j2:190
-msgid ""
-"Once the exchange has received the wire transfer, it allows the customer's "
-"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
-"are digital representations of the original currency from the transfer. It "
-"is important to note that the exchange does not learn the &quot;serial "
-"numbers&quot; of the coins created in this process, so it cannot tell later "
-"which customer purchased what at which merchant. The use of Taler does not "
-"change the currency or the total value of the funds (except for fees which "
-"the exchange may charge for the service)."
+#, fuzzy
+#| msgid ""
+#| "Once the exchange has received the wire transfer, it allows the "
+#| "customer's electronic wallet to <b>withdraw</b> electronic coins. The "
+#| "electronic coins are digital representations of the original currency "
+#| "from the transfer. It is important to note that the exchange does not "
+#| "learn the &quot;serial numbers&quot; of the coins created in this "
+#| "process, so it cannot tell later which customer purchased what at which "
+#| "merchant. The use of Taler does not change the currency or the total "
+#| "value of the funds (except for fees which the exchange may charge for the "
+#| "service)."
+msgid ""
+"Once the exchange has received the wire transfer, it allows the customer&#39;"
+"s electronic wallet to <b>withdraw</b> electronic coins. The electronic "
+"coins are digital representations of the original currency from the "
+"transfer. It is important to note that the exchange does not learn the &quot;"
+"serial numbers&quot; of the coins created in this process, so it cannot tell "
+"later which customer purchased what at which merchant. The use of Taler does "
+"not change the currency or the total value of the funds (except for fees "
+"which the exchange may charge for the service)."
msgstr ""
"Una vez que la plataforma de intercambio ha recibido la transferencia "
"bancaria, permite que la billetera electrónica del cliente <b>retire</b> "
@@ -915,12 +917,13 @@ msgstr ""
#: template/faq.html.j2:119
msgid ""
-"Taler's wallet supports multiple currencies, but the system currently does "
-"not support conversion between currencies. However, in principle an entity "
-"that accepts deposits in one currency and allows withdrawals in another "
-"currency could be created. Still, the regulatory hurdles in this case tend "
-"to be particularly complex. The focus for Taler is on day-to-day payments, "
-"so we have no plans to support currency conversion in the near future."
+"Taler&#39;s wallet supports multiple currencies, but the system currently "
+"does not support conversion between currencies. However, in principle an "
+"entity that accepts deposits in one currency and allows withdrawals in "
+"another currency could be created. Still, the regulatory hurdles in this "
+"case tend to be particularly complex. The focus for Taler is on day-to-day "
+"payments, so we have no plans to support currency conversion in the near "
+"future."
msgstr ""
#: template/faq.html.j2:130
@@ -1337,10 +1340,16 @@ msgid "dirty"
msgstr "Moneda sucia"
#: template/glossary.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "a `coin` is dirty if its public key may be known to an entity other than "
+#| "the customer, thereby creating the danger of some entity being able to "
+#| "link multiple transactions of coin's owner if the coin is not refreshed "
+#| "first"
msgid ""
"a `coin` is dirty if its public key may be known to an entity other than the "
"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
+"multiple transactions of coin&#39;s owner if the coin is not refreshed first"
msgstr ""
"Una `moneda` está sucia si su clave pública pudiese ser conocida por otra "
"entidad aparte del cliente, creando así el peligro de que alguna entidad "
@@ -1357,7 +1366,7 @@ msgstr "Plataforma de intercambio"
#| "Taler's payment service provider. Issues eletronic `coins` during "
#| "`withdrawal` and redeems them when they are `deposited` by merchants."
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
"Proveedor de servicios de pago basado en Taler. Emite `monedas` electrónicas "
@@ -1486,10 +1495,15 @@ msgid "reserve"
msgstr "Reserva"
#: template/glossary.html.j2:146
+#, fuzzy
+#| msgid ""
+#| "funds set aside for future use; either the balance of a customer at the "
+#| "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+#| "account to cover obligations from coins in circulation"
msgid ""
"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
-"account to cover obligations from coins in circulation"
+"exchange ready for `withdrawal`, or the funds kept in the exchange&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
"Fondos reservados para uso futuro; ya sea el saldo de un cliente en la "
"plataforma de intercambio listo para un «retiro», o los fondos previstos en "
@@ -1540,8 +1554,12 @@ msgid "sharing"
msgstr "Compartir"
#: template/glossary.html.j2:178
+#, fuzzy
+#| msgid ""
+#| "users can share ownership of a `coin` by sharing access to the coin's "
+#| "private key, thereby allowing all co-owners to spend the coin at any time."
msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
+"users can share ownership of a `coin` by sharing access to the coin&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
"Los usuarios pueden compartir la propiedad de una `moneda` compartiendo el "
@@ -1711,12 +1729,19 @@ msgstr ""
"sincronización de billeteras a través de múltiples dispositivos."
#: template/governments.html.j2:58
-msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, merchants "
-"and the Taler payment service provider (the exchange) can mathematically "
-"demonstrate their lawful behavior in court in case of disputes. Financial "
-"damages are strictly limited, improving economic security for individuals, "
-"merchants, the exchange and the state."
+#, fuzzy
+#| msgid ""
+#| "Taler's payments are cryptographically secured. Thus, customers, "
+#| "merchants and the Taler payment service provider (the exchange) can "
+#| "mathematically demonstrate their lawful behavior in court in case of "
+#| "disputes. Financial damages are strictly limited, improving economic "
+#| "security for individuals, merchants, the exchange and the state."
+msgid ""
+"Taler&#39;s payments are cryptographically secured. Thus, customers, "
+"merchants and the Taler payment service provider (the exchange) can "
+"mathematically demonstrate their lawful behavior in court in case of "
+"disputes. Financial damages are strictly limited, improving economic "
+"security for individuals, merchants, the exchange and the state."
msgstr ""
"Los pagos de Taler están asegurados criptográficamente. Así, los clientes, "
"comerciantes y el proveedor de servicios de pago de Taler (la plataforma de "
@@ -1862,10 +1887,17 @@ msgstr ""
"identidad del cliente."
#: template/governments.html.j2:170
+#, fuzzy
+#| msgid ""
+#| "The amounts of digital coins legitimately withdrawn by customers from the "
+#| "exchange, the value of non-redeemed digital coins in customer's wallets, "
+#| "the value and corresponding wire details of deposit operations performed "
+#| "by merchants with the exchange, and the income of the exchange from "
+#| "transaction fees."
msgid ""
"The amounts of digital coins legitimately withdrawn by customers from the "
-"exchange, the value of non-redeemed digital coins in customer's wallets, the "
-"value and corresponding wire details of deposit operations performed by "
+"exchange, the value of non-redeemed digital coins in customer&#39;s wallets, "
+"the value and corresponding wire details of deposit operations performed by "
"merchants with the exchange, and the income of the exchange from transaction "
"fees."
msgstr ""
@@ -1893,12 +1925,12 @@ msgstr "Diagrama general del sistema"
#: template/gsoc-codeless.html.j2:14
msgid ""
-"Codeless payment is a component that sits between the seller's frontend and "
-"the GNU Taler merchant backend. This component has a web interface, where "
-"payment buttons are configured. Registered merchants can manage their "
-"inventory and simultaneously create a 'Buy Now' button for a specific "
-"product. This code can be directly copy pasted on the seller's frontend and "
-"can be used for 'Pay with Taler'."
+"Codeless payment is a component that sits between the seller&#39;s frontend "
+"and the GNU Taler merchant backend. This component has a web interface, "
+"where payment buttons are configured. Registered merchants can manage their "
+"inventory and simultaneously create a &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2127,28 +2159,35 @@ msgstr ""
"funcionar los pagos y nuestra meta es imponer esta visión sobre el mundo."
#: template/investors.html.j2:37
-msgid "We are currently supported by"
-msgstr ""
-
-#: template/investors.html.j2:41
msgid ""
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
"the French national institute for research in informatics and automation, "
-"and the"
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
msgstr ""
-#: template/investors.html.j2:50
+#: template/investors.html.j2:47
msgid "The Technology"
msgstr "La Tecnología"
-#: template/investors.html.j2:53
+#: template/investors.html.j2:50
+#, fuzzy
+#| msgid ""
+#| "All transactions in Taler are secured using <a href=\"bibliography.html"
+#| "\">modern cryptography</a> and trust in all parties is minimized. "
+#| "Financial damage is bounded (for customers, merchants and the exchange) "
+#| "even in the case that systems are compromised and private keys are "
+#| "stolen. Databases can be audited for consistency, resulting in either the "
+#| "detection of compromised systems or the demonstration that participants "
+#| "were honest. Actual transaction costs are fractions of a cent."
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
-"damage is bounded (for customers, merchants and the exchange) even in the "
-"case that systems are compromised and private keys are stolen. Databases can "
-"be audited for consistency, resulting in either the detection of compromised "
-"systems or the demonstration that participants were honest. Actual "
-"transaction costs are fractions of a cent."
+"damage is bounded &#x28;for customers, merchants and the exchange&#x29; even "
+"in the case that systems are compromised and private keys are stolen. "
+"Databases can be audited for consistency, resulting in either the detection "
+"of compromised systems or the demonstration that participants were honest. "
+"Actual transaction costs are fractions of a cent."
msgstr ""
"Todas las transacciones en Taler son seguras ya que usan <a href="
"\"bibliography.html\">criptografía moderna</a> y la confianza depositada en "
@@ -2160,11 +2199,11 @@ msgstr ""
"puesta en evidencia de la honestidad de los participantes. Los costos reales "
"de las transacciones son fracciones de un centavo."
-#: template/investors.html.j2:66
+#: template/investors.html.j2:63
msgid "The Business"
msgstr "El Negocio"
-#: template/investors.html.j2:68
+#: template/investors.html.j2:65
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -2183,22 +2222,22 @@ msgstr ""
"pago tradicionales en la plataforma de intercambio. La plataforma de "
"intercambio cobra una comisión para facilitar las transacciones."
-#: template/investors.html.j2:87
+#: template/investors.html.j2:84
msgid "The Business Case"
msgstr "El Caso de los Negocios"
-#: template/investors.html.j2:97
+#: template/investors.html.j2:94
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:120
+#: template/investors.html.j2:117
msgid "Running a Taler payment service operator"
msgstr "Operar una plataforma de servicio de pago de Taler"
-#: template/investors.html.j2:123
+#: template/investors.html.j2:120
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -2211,7 +2250,7 @@ msgstr ""
"transferencias electrónicas y del funcionamiento de la infraestructura "
"informática."
-#: template/investors.html.j2:133
+#: template/investors.html.j2:130
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2219,7 +2258,7 @@ msgstr ""
"Las operaciones criptográficas, el ancho de banda y los costes de "
"almacenamiento son inferiores a 0.01 centavos por transacción."
-#: template/investors.html.j2:134
+#: template/investors.html.j2:131
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2228,7 +2267,7 @@ msgstr ""
"electrónicas más grandes de los comerciantes para reducir al mínimo los "
"costes de la transferencia bancaria."
-#: template/investors.html.j2:135
+#: template/investors.html.j2:132
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2237,11 +2276,11 @@ msgstr ""
"cualquier operación que tenga un coste (retirar, depositar, actualizar, "
"reembolsar o realizar transferencias electrónicas agrupadas)."
-#: template/investors.html.j2:136
+#: template/investors.html.j2:133
msgid "Partnership with banks establishes consumer trust."
msgstr "La asociación con bancos consolida la confianza del consumidor."
-#: template/investors.html.j2:137
+#: template/investors.html.j2:134
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"La asociación con la comunidad de software libre permite un despliegue "
@@ -2320,9 +2359,15 @@ msgid "Cheap"
msgstr "Barato"
#: template/merchants.html.j2:78
+#, fuzzy
+#| msgid ""
+#| "Taler is uses efficient cryptographic constructions with low bandwidth "
+#| "and storage requirements. Combined with Taler's strong security which "
+#| "makes fraud impossible, Taler payment service providers can operate with "
+#| "very low overhead and thus offer low transaction fees."
msgid ""
"Taler is uses efficient cryptographic constructions with low bandwidth and "
-"storage requirements. Combined with Taler's strong security which makes "
+"storage requirements. Combined with Taler&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2357,8 +2402,14 @@ msgid "Ethical"
msgstr "Ético"
#: template/merchants.html.j2:101
+#, fuzzy
+#| msgid ""
+#| "Taler prevents tax evasion and money laundering. Taler's protocols are "
+#| "efficient and do not use wasteful proof-of-work calculations. Taler "
+#| "encourages transparency by providing an open standard and free software "
+#| "reference implementations."
msgid ""
-"Taler prevents tax evasion and money laundering. Taler's protocols are "
+"Taler prevents tax evasion and money laundering. Taler&#39;s protocols are "
"efficient and do not use wasteful proof-of-work calculations. Taler "
"encourages transparency by providing an open standard and free software "
"reference implementations."
@@ -2393,10 +2444,15 @@ msgid "Merchants process payments using the Taler backend:"
msgstr "Proceso de pagos del comerciante usando el backend de Taler:"
#: template/merchants.html.j2:144
+#, fuzzy
+#| msgid ""
+#| "The backend <b>signs</b> and <b>stores</b> the complete terms of offers "
+#| "made by the merchant to customers. For this, the merchant's frontend "
+#| "needs to give the customer's order in a JSON format to the backend."
msgid ""
"The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
-"by the merchant to customers. For this, the merchant's frontend needs to "
-"give the customer's order in a JSON format to the backend."
+"by the merchant to customers. For this, the merchant&#39;s frontend needs to "
+"give the customer&#39;s order in a JSON format to the backend."
msgstr ""
"El backend <b>firma</b> y <b>almacena</b> los términos completos de las "
"ofertas hechas por el comerciante a los clientes. Para esto, el frontend del "
@@ -2404,11 +2460,18 @@ msgstr ""
"JSON."
#: template/merchants.html.j2:153
+#, fuzzy
+#| msgid ""
+#| "The backend <b>validates</b> payments received from the wallet and "
+#| "<b>executes</b> them with the Taler payment service provider (the "
+#| "exchange). For this, the merchant's frontend must pass the payment "
+#| "request through to the Taler backend and check the HTTP status code that "
+#| "is returned."
msgid ""
"The backend <b>validates</b> payments received from the wallet and "
"<b>executes</b> them with the Taler payment service provider (the exchange). "
-"For this, the merchant's frontend must pass the payment request through to "
-"the Taler backend and check the HTTP status code that is returned."
+"For this, the merchant&#39;s frontend must pass the payment request through "
+"to the Taler backend and check the HTTP status code that is returned."
msgstr ""
"El backend <b>valida</b> los pagos recibidos de la billetera y los "
"<b>ejecuta</b> con el proveedor de servicios de pago de Taler (la plataforma "
@@ -2649,7 +2712,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2667,7 +2730,7 @@ msgid "or"
msgstr ""
#: template/wallet.html.j2:149
-msgid "is required, but it appears you don't have it installed."
+msgid "is required, but it appears you don&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2687,7 +2750,7 @@ msgid "Install wallet"
msgstr "Billetera "
#: template/wallet.html.j2:177
-msgid "JavaScript is disabled, installation won't work."
+msgid "JavaScript is disabled, installation won&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 4b3bab3..f6aa299 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\n"
+"POT-Creation-Date: 2019-12-10 14:34+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <LL@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\n"
-#: common/base.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr ""
@@ -66,10 +66,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -160,21 +156,16 @@ msgstr ""
msgid "Copyright Assignment"
msgstr ""
-#: template/copyright.html.j2:9
+#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the"
-msgstr ""
-
-#: template/copyright.html.j2:15
-msgid "agreement on licensing and collaborative development"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:17
-msgid "of the GNUnet and GNU Taler projects is satisfied."
-msgstr ""
-
-#: template/copyright.html.j2:24
+#: template/copyright.html.j2:19
msgid ""
"The agreements ensure that the code will continue to be made available under "
"free software licenses, but gives developers the freedom to move code "
@@ -183,7 +174,7 @@ msgid ""
"stores that are hostile to free software)."
msgstr ""
-#: template/copyright.html.j2:34
+#: template/copyright.html.j2:29
msgid ""
"Minor contributions (basically, anyone without Git access) do not require "
"copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -219,11 +210,11 @@ msgstr "Avec REST"
msgid ""
"Taler is designed to work on the Internet. To ensure that Taler payments can "
"work with restrictive network setups, Taler uses a RESTful protocol over "
-"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
-"obviously merchants may choose to offer HTTPS for consistency and because it "
-"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
-"structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at"
+"HTTP or HTTPS. Taler&#39;s security does not depend upon the use of HTTPS, "
+"but obviously merchants may choose to offer HTTPS for consistency and "
+"because it generally is better for privacy compared to HTTP. Taler uses JSON "
+"to encode structure data, making it easy to integrate Taler with existing "
+"Web applications. Taler&#39;s protocol is documented in detail at"
msgstr ""
#: template/developers.html.j2:58 template/docs.html.j2:182
@@ -310,7 +301,7 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:93
+#: template/developers.html.j2:149 template/investors.html.j2:90
msgid "Download"
msgstr ""
@@ -341,14 +332,14 @@ msgstr ""
#: template/developers.html.j2:190
msgid ""
-"Once the exchange has received the wire transfer, it allows the customer's "
-"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
-"are digital representations of the original currency from the transfer. It "
-"is important to note that the exchange does not learn the &quot;serial "
-"numbers&quot; of the coins created in this process, so it cannot tell later "
-"which customer purchased what at which merchant. The use of Taler does not "
-"change the currency or the total value of the funds (except for fees which "
-"the exchange may charge for the service)."
+"Once the exchange has received the wire transfer, it allows the customer&#39;"
+"s electronic wallet to <b>withdraw</b> electronic coins. The electronic "
+"coins are digital representations of the original currency from the "
+"transfer. It is important to note that the exchange does not learn the &quot;"
+"serial numbers&quot; of the coins created in this process, so it cannot tell "
+"later which customer purchased what at which merchant. The use of Taler does "
+"not change the currency or the total value of the funds (except for fees "
+"which the exchange may charge for the service)."
msgstr ""
#: template/developers.html.j2:208
@@ -648,12 +639,13 @@ msgstr ""
#: template/faq.html.j2:119
msgid ""
-"Taler's wallet supports multiple currencies, but the system currently does "
-"not support conversion between currencies. However, in principle an entity "
-"that accepts deposits in one currency and allows withdrawals in another "
-"currency could be created. Still, the regulatory hurdles in this case tend "
-"to be particularly complex. The focus for Taler is on day-to-day payments, "
-"so we have no plans to support currency conversion in the near future."
+"Taler&#39;s wallet supports multiple currencies, but the system currently "
+"does not support conversion between currencies. However, in principle an "
+"entity that accepts deposits in one currency and allows withdrawals in "
+"another currency could be created. Still, the regulatory hurdles in this "
+"case tend to be particularly complex. The focus for Taler is on day-to-day "
+"payments, so we have no plans to support currency conversion in the near "
+"future."
msgstr ""
#: template/faq.html.j2:130
@@ -981,7 +973,7 @@ msgstr ""
msgid ""
"a `coin` is dirty if its public key may be known to an entity other than the "
"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
+"multiple transactions of coin&#39;s owner if the coin is not refreshed first"
msgstr ""
#: template/glossary.html.j2:61
@@ -990,7 +982,7 @@ msgstr ""
#: template/glossary.html.j2:63
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
@@ -1103,8 +1095,8 @@ msgstr ""
#: template/glossary.html.j2:146
msgid ""
"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
-"account to cover obligations from coins in circulation"
+"exchange ready for `withdrawal`, or the funds kept in the exchange&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
#: template/glossary.html.j2:152
@@ -1148,7 +1140,7 @@ msgstr ""
#: template/glossary.html.j2:178
msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
+"users can share ownership of a `coin` by sharing access to the coin&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
@@ -1284,11 +1276,11 @@ msgstr ""
#: template/governments.html.j2:58
msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, merchants "
-"and the Taler payment service provider (the exchange) can mathematically "
-"demonstrate their lawful behavior in court in case of disputes. Financial "
-"damages are strictly limited, improving economic security for individuals, "
-"merchants, the exchange and the state."
+"Taler&#39;s payments are cryptographically secured. Thus, customers, "
+"merchants and the Taler payment service provider (the exchange) can "
+"mathematically demonstrate their lawful behavior in court in case of "
+"disputes. Financial damages are strictly limited, improving economic "
+"security for individuals, merchants, the exchange and the state."
msgstr ""
#: template/governments.html.j2:70
@@ -1395,8 +1387,8 @@ msgstr ""
#: template/governments.html.j2:170
msgid ""
"The amounts of digital coins legitimately withdrawn by customers from the "
-"exchange, the value of non-redeemed digital coins in customer's wallets, the "
-"value and corresponding wire details of deposit operations performed by "
+"exchange, the value of non-redeemed digital coins in customer&#39;s wallets, "
+"the value and corresponding wire details of deposit operations performed by "
"merchants with the exchange, and the income of the exchange from transaction "
"fees."
msgstr ""
@@ -1419,12 +1411,12 @@ msgstr "Vue d'ensemble de Taler"
#: template/gsoc-codeless.html.j2:14
msgid ""
-"Codeless payment is a component that sits between the seller's frontend and "
-"the GNU Taler merchant backend. This component has a web interface, where "
-"payment buttons are configured. Registered merchants can manage their "
-"inventory and simultaneously create a 'Buy Now' button for a specific "
-"product. This code can be directly copy pasted on the seller's frontend and "
-"can be used for 'Pay with Taler'."
+"Codeless payment is a component that sits between the seller&#39;s frontend "
+"and the GNU Taler merchant backend. This component has a web interface, "
+"where payment buttons are configured. Registered merchants can manage their "
+"inventory and simultaneously create a &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -1640,35 +1632,33 @@ msgid ""
msgstr ""
#: template/investors.html.j2:37
-msgid "We are currently supported by"
-msgstr ""
-
-#: template/investors.html.j2:41
msgid ""
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
"the French national institute for research in informatics and automation, "
-"and the"
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
msgstr ""
-#: template/investors.html.j2:50
+#: template/investors.html.j2:47
msgid "The Technology"
msgstr ""
-#: template/investors.html.j2:53
+#: template/investors.html.j2:50
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
-"damage is bounded (for customers, merchants and the exchange) even in the "
-"case that systems are compromised and private keys are stolen. Databases can "
-"be audited for consistency, resulting in either the detection of compromised "
-"systems or the demonstration that participants were honest. Actual "
-"transaction costs are fractions of a cent."
+"damage is bounded &#x28;for customers, merchants and the exchange&#x29; even "
+"in the case that systems are compromised and private keys are stolen. "
+"Databases can be audited for consistency, resulting in either the detection "
+"of compromised systems or the demonstration that participants were honest. "
+"Actual transaction costs are fractions of a cent."
msgstr ""
-#: template/investors.html.j2:66
+#: template/investors.html.j2:63
msgid "The Business"
msgstr ""
-#: template/investors.html.j2:68
+#: template/investors.html.j2:65
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -1679,22 +1669,22 @@ msgid ""
"to facilitate the transactions."
msgstr ""
-#: template/investors.html.j2:87
+#: template/investors.html.j2:84
msgid "The Business Case"
msgstr ""
-#: template/investors.html.j2:97
+#: template/investors.html.j2:94
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:120
+#: template/investors.html.j2:117
msgid "Running a Taler payment service operator"
msgstr ""
-#: template/investors.html.j2:123
+#: template/investors.html.j2:120
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1702,29 +1692,29 @@ msgid ""
"of the computing infrastructure."
msgstr ""
-#: template/investors.html.j2:133
+#: template/investors.html.j2:130
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
msgstr ""
-#: template/investors.html.j2:134
+#: template/investors.html.j2:131
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
msgstr ""
-#: template/investors.html.j2:135
+#: template/investors.html.j2:132
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
msgstr ""
-#: template/investors.html.j2:136
+#: template/investors.html.j2:133
msgid "Partnership with banks establishes consumer trust."
msgstr ""
-#: template/investors.html.j2:137
+#: template/investors.html.j2:134
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
@@ -1781,7 +1771,7 @@ msgstr ""
#: template/merchants.html.j2:78
msgid ""
"Taler is uses efficient cryptographic constructions with low bandwidth and "
-"storage requirements. Combined with Taler's strong security which makes "
+"storage requirements. Combined with Taler&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -1803,7 +1793,7 @@ msgstr "Ethique"
#: template/merchants.html.j2:101
msgid ""
-"Taler prevents tax evasion and money laundering. Taler's protocols are "
+"Taler prevents tax evasion and money laundering. Taler&#39;s protocols are "
"efficient and do not use wasteful proof-of-work calculations. Taler "
"encourages transparency by providing an open standard and free software "
"reference implementations."
@@ -1837,16 +1827,16 @@ msgstr ""
#: template/merchants.html.j2:144
msgid ""
"The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
-"by the merchant to customers. For this, the merchant's frontend needs to "
-"give the customer's order in a JSON format to the backend."
+"by the merchant to customers. For this, the merchant&#39;s frontend needs to "
+"give the customer&#39;s order in a JSON format to the backend."
msgstr ""
#: template/merchants.html.j2:153
msgid ""
"The backend <b>validates</b> payments received from the wallet and "
"<b>executes</b> them with the Taler payment service provider (the exchange). "
-"For this, the merchant's frontend must pass the payment request through to "
-"the Taler backend and check the HTTP status code that is returned."
+"For this, the merchant&#39;s frontend must pass the payment request through "
+"to the Taler backend and check the HTTP status code that is returned."
msgstr ""
#: template/merchants.html.j2:164
@@ -2071,7 +2061,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2089,7 +2079,7 @@ msgid "or"
msgstr ""
#: template/wallet.html.j2:149
-msgid "is required, but it appears you don't have it installed."
+msgid "is required, but it appears you don&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2105,7 +2095,7 @@ msgid "Install wallet"
msgstr ""
#: template/wallet.html.j2:177
-msgid "JavaScript is disabled, installation won't work."
+msgid "JavaScript is disabled, installation won&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 181be43..36d022f 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\n"
+"POT-Creation-Date: 2019-12-10 14:34+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <LL@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\n"
-#: common/base.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr "GNU Taler"
@@ -35,7 +35,7 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "e"
@@ -70,10 +70,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -175,21 +171,16 @@ msgstr ""
msgid "Copyright Assignment"
msgstr "Diritti d'autore"
-#: template/copyright.html.j2:9
+#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the"
-msgstr ""
-
-#: template/copyright.html.j2:15
-msgid "agreement on licensing and collaborative development"
-msgstr ""
-
-#: template/copyright.html.j2:17
-msgid "of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:24
+#: template/copyright.html.j2:19
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -210,7 +201,7 @@ msgstr ""
"alla società la capacità di doppia licenza (ad esempio, in modo da poter "
"distribuire attraverso App-store ostili al software libero).</p>"
-#: template/copyright.html.j2:34
+#: template/copyright.html.j2:29
#, fuzzy
#| msgid ""
#| "<p>Minor contributions (basically, anyone without Git access) do not "
@@ -276,11 +267,11 @@ msgstr "RESTful"
msgid ""
"Taler is designed to work on the Internet. To ensure that Taler payments can "
"work with restrictive network setups, Taler uses a RESTful protocol over "
-"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
-"obviously merchants may choose to offer HTTPS for consistency and because it "
-"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
-"structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at"
+"HTTP or HTTPS. Taler&#39;s security does not depend upon the use of HTTPS, "
+"but obviously merchants may choose to offer HTTPS for consistency and "
+"because it generally is better for privacy compared to HTTP. Taler uses JSON "
+"to encode structure data, making it easy to integrate Taler with existing "
+"Web applications. Taler&#39;s protocol is documented in detail at"
msgstr ""
"Taler è progettato per funzionare su Internet. Per garantire che i pagamenti "
"con Taler funzionino con configurazioni di rete restrittive, Taler utilizza "
@@ -423,7 +414,7 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:93
+#: template/developers.html.j2:149 template/investors.html.j2:90
msgid "Download"
msgstr "Scarica"
@@ -460,15 +451,26 @@ msgstr ""
"Nella terminologia di Taler, il cliente crea una riserva al cambio."
#: template/developers.html.j2:190
-msgid ""
-"Once the exchange has received the wire transfer, it allows the customer's "
-"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
-"are digital representations of the original currency from the transfer. It "
-"is important to note that the exchange does not learn the &quot;serial "
-"numbers&quot; of the coins created in this process, so it cannot tell later "
-"which customer purchased what at which merchant. The use of Taler does not "
-"change the currency or the total value of the funds (except for fees which "
-"the exchange may charge for the service)."
+#, fuzzy
+#| msgid ""
+#| "Once the exchange has received the wire transfer, it allows the "
+#| "customer's electronic wallet to <b>withdraw</b> electronic coins. The "
+#| "electronic coins are digital representations of the original currency "
+#| "from the transfer. It is important to note that the exchange does not "
+#| "learn the &quot;serial numbers&quot; of the coins created in this "
+#| "process, so it cannot tell later which customer purchased what at which "
+#| "merchant. The use of Taler does not change the currency or the total "
+#| "value of the funds (except for fees which the exchange may charge for the "
+#| "service)."
+msgid ""
+"Once the exchange has received the wire transfer, it allows the customer&#39;"
+"s electronic wallet to <b>withdraw</b> electronic coins. The electronic "
+"coins are digital representations of the original currency from the "
+"transfer. It is important to note that the exchange does not learn the &quot;"
+"serial numbers&quot; of the coins created in this process, so it cannot tell "
+"later which customer purchased what at which merchant. The use of Taler does "
+"not change the currency or the total value of the funds (except for fees "
+"which the exchange may charge for the service)."
msgstr ""
"Una volta che il cambio ha ricevuto il bonifico bancario, consentirà al "
"portafoglio elettronico del cliente di <b>prelevare</b> le monete "
@@ -909,12 +911,13 @@ msgstr ""
#: template/faq.html.j2:119
msgid ""
-"Taler's wallet supports multiple currencies, but the system currently does "
-"not support conversion between currencies. However, in principle an entity "
-"that accepts deposits in one currency and allows withdrawals in another "
-"currency could be created. Still, the regulatory hurdles in this case tend "
-"to be particularly complex. The focus for Taler is on day-to-day payments, "
-"so we have no plans to support currency conversion in the near future."
+"Taler&#39;s wallet supports multiple currencies, but the system currently "
+"does not support conversion between currencies. However, in principle an "
+"entity that accepts deposits in one currency and allows withdrawals in "
+"another currency could be created. Still, the regulatory hurdles in this "
+"case tend to be particularly complex. The focus for Taler is on day-to-day "
+"payments, so we have no plans to support currency conversion in the near "
+"future."
msgstr ""
#: template/faq.html.j2:130
@@ -1334,10 +1337,16 @@ msgid "dirty"
msgstr "sporco"
#: template/glossary.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "a `coin` is dirty if its public key may be known to an entity other than "
+#| "the customer, thereby creating the danger of some entity being able to "
+#| "link multiple transactions of coin's owner if the coin is not refreshed "
+#| "first"
msgid ""
"a `coin` is dirty if its public key may be known to an entity other than the "
"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
+"multiple transactions of coin&#39;s owner if the coin is not refreshed first"
msgstr ""
"la 'moneta' è sporca se la sua chiave pubblica può essere conosciuta da "
"un'entità diversa dal cliente, creando così il pericolo che, se la moneta "
@@ -1354,7 +1363,7 @@ msgstr "cambio"
#| "Taler's payment service provider. Issues eletronic `coins` during "
#| "`withdrawal` and redeems them when they are `deposited` by merchants."
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
"il fornitore dei servizi di pagamento di Taler. Emette le 'monete' "
@@ -1484,10 +1493,15 @@ msgid "reserve"
msgstr "riserva"
#: template/glossary.html.j2:146
+#, fuzzy
+#| msgid ""
+#| "funds set aside for future use; either the balance of a customer at the "
+#| "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+#| "account to cover obligations from coins in circulation"
msgid ""
"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
-"account to cover obligations from coins in circulation"
+"exchange ready for `withdrawal`, or the funds kept in the exchange&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
"fondi destinati all'uso futuro; sia il saldo di un cliente al cambio pronto "
"per il 'prelievo', sia i fondi conservati sul conto bancario del cambio per "
@@ -1538,8 +1552,12 @@ msgid "sharing"
msgstr "condivisione"
#: template/glossary.html.j2:178
+#, fuzzy
+#| msgid ""
+#| "users can share ownership of a `coin` by sharing access to the coin's "
+#| "private key, thereby allowing all co-owners to spend the coin at any time."
msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
+"users can share ownership of a `coin` by sharing access to the coin&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
"gli utenti possono condividere la proprietà della 'moneta' condividendo "
@@ -1710,12 +1728,19 @@ msgstr ""
"sincronizzazione dei portafogli tra più dispositivi. "
#: template/governments.html.j2:58
-msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, merchants "
-"and the Taler payment service provider (the exchange) can mathematically "
-"demonstrate their lawful behavior in court in case of disputes. Financial "
-"damages are strictly limited, improving economic security for individuals, "
-"merchants, the exchange and the state."
+#, fuzzy
+#| msgid ""
+#| "Taler's payments are cryptographically secured. Thus, customers, "
+#| "merchants and the Taler payment service provider (the exchange) can "
+#| "mathematically demonstrate their lawful behavior in court in case of "
+#| "disputes. Financial damages are strictly limited, improving economic "
+#| "security for individuals, merchants, the exchange and the state."
+msgid ""
+"Taler&#39;s payments are cryptographically secured. Thus, customers, "
+"merchants and the Taler payment service provider (the exchange) can "
+"mathematically demonstrate their lawful behavior in court in case of "
+"disputes. Financial damages are strictly limited, improving economic "
+"security for individuals, merchants, the exchange and the state."
msgstr ""
"I pagamenti di Taler sono protetti da crittografia. Pertanto, i clienti, i "
"commercianti e il provider di servici di pagamento di Taler (il cambio) "
@@ -1860,10 +1885,17 @@ msgstr ""
"l'identità del cliente. "
#: template/governments.html.j2:170
+#, fuzzy
+#| msgid ""
+#| "The amounts of digital coins legitimately withdrawn by customers from the "
+#| "exchange, the value of non-redeemed digital coins in customer's wallets, "
+#| "the value and corresponding wire details of deposit operations performed "
+#| "by merchants with the exchange, and the income of the exchange from "
+#| "transaction fees."
msgid ""
"The amounts of digital coins legitimately withdrawn by customers from the "
-"exchange, the value of non-redeemed digital coins in customer's wallets, the "
-"value and corresponding wire details of deposit operations performed by "
+"exchange, the value of non-redeemed digital coins in customer&#39;s wallets, "
+"the value and corresponding wire details of deposit operations performed by "
"merchants with the exchange, and the income of the exchange from transaction "
"fees."
msgstr ""
@@ -1891,12 +1923,12 @@ msgstr "Panoramica del sistema"
#: template/gsoc-codeless.html.j2:14
msgid ""
-"Codeless payment is a component that sits between the seller's frontend and "
-"the GNU Taler merchant backend. This component has a web interface, where "
-"payment buttons are configured. Registered merchants can manage their "
-"inventory and simultaneously create a 'Buy Now' button for a specific "
-"product. This code can be directly copy pasted on the seller's frontend and "
-"can be used for 'Pay with Taler'."
+"Codeless payment is a component that sits between the seller&#39;s frontend "
+"and the GNU Taler merchant backend. This component has a web interface, "
+"where payment buttons are configured. Registered merchants can manage their "
+"inventory and simultaneously create a &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2126,28 +2158,35 @@ msgstr ""
"visione al mondo. "
#: template/investors.html.j2:37
-msgid "We are currently supported by"
-msgstr ""
-
-#: template/investors.html.j2:41
msgid ""
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
"the French national institute for research in informatics and automation, "
-"and the"
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
msgstr ""
-#: template/investors.html.j2:50
+#: template/investors.html.j2:47
msgid "The Technology"
msgstr "La Tecnologia"
-#: template/investors.html.j2:53
+#: template/investors.html.j2:50
+#, fuzzy
+#| msgid ""
+#| "All transactions in Taler are secured using <a href=\"bibliography.html"
+#| "\">modern cryptography</a> and trust in all parties is minimized. "
+#| "Financial damage is bounded (for customers, merchants and the exchange) "
+#| "even in the case that systems are compromised and private keys are "
+#| "stolen. Databases can be audited for consistency, resulting in either the "
+#| "detection of compromised systems or the demonstration that participants "
+#| "were honest. Actual transaction costs are fractions of a cent."
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
-"damage is bounded (for customers, merchants and the exchange) even in the "
-"case that systems are compromised and private keys are stolen. Databases can "
-"be audited for consistency, resulting in either the detection of compromised "
-"systems or the demonstration that participants were honest. Actual "
-"transaction costs are fractions of a cent."
+"damage is bounded &#x28;for customers, merchants and the exchange&#x29; even "
+"in the case that systems are compromised and private keys are stolen. "
+"Databases can be audited for consistency, resulting in either the detection "
+"of compromised systems or the demonstration that participants were honest. "
+"Actual transaction costs are fractions of a cent."
msgstr ""
"Tutte le transazioni in Taler sono garantite utilizzando la <a href="
"\"bibliography.html\">crittografia moderna</a> e gli accordi fiduciari tra "
@@ -2158,11 +2197,11 @@ msgstr ""
"dimostrano che i partecipanti sono stati onesti. I costi effettivi di "
"transazione sono frazioni di un centesimo. "
-#: template/investors.html.j2:66
+#: template/investors.html.j2:63
msgid "The Business"
msgstr "Il Business"
-#: template/investors.html.j2:68
+#: template/investors.html.j2:65
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -2180,11 +2219,11 @@ msgstr ""
"scambiarle per denaro al cambio utilizzando i sistemi di pagamento "
"tradizionali. Il cambio addebita delle spese per facilitare le transazioni. "
-#: template/investors.html.j2:87
+#: template/investors.html.j2:84
msgid "The Business Case"
msgstr "Il Caso Aziendale"
-#: template/investors.html.j2:97
+#: template/investors.html.j2:94
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
@@ -2194,11 +2233,11 @@ msgstr ""
"chiarisce in inglese come Taler può influenzare gli sviluppi attuali nel "
"mercato dei pagamenti globali. "
-#: template/investors.html.j2:120
+#: template/investors.html.j2:117
msgid "Running a Taler payment service operator"
msgstr "Funzionamento di un operatore dei servizi di pagamento Taler "
-#: template/investors.html.j2:123
+#: template/investors.html.j2:120
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -2211,7 +2250,7 @@ msgstr ""
"bonifici con il sistema bancario e al funzionamento dell'infrastruttura di "
"calcolo. "
-#: template/investors.html.j2:133
+#: template/investors.html.j2:130
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2219,7 +2258,7 @@ msgstr ""
"Le operazioni di crittografia, la larghezza di banda e i costi di "
"archiviazione sono inferiori a 0,01 centesimi per transazione. "
-#: template/investors.html.j2:134
+#: template/investors.html.j2:131
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2228,7 +2267,7 @@ msgstr ""
"di denaro più grandi ai commercianti per ridurre al minimo i costi dei "
"bonifici bancari."
-#: template/investors.html.j2:135
+#: template/investors.html.j2:132
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2237,11 +2276,11 @@ msgstr ""
"operazione costosa (prelievo, deposito, aggiornamento, rimborso o bonifici "
"bancari aggregati. "
-#: template/investors.html.j2:136
+#: template/investors.html.j2:133
msgid "Partnership with banks establishes consumer trust."
msgstr "La partnership con le banche instaura fiducia nei consumatori. "
-#: template/investors.html.j2:137
+#: template/investors.html.j2:134
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"La partnership con la comunità del software libero consente una rapida "
@@ -2320,9 +2359,15 @@ msgid "Cheap"
msgstr "Conveniente"
#: template/merchants.html.j2:78
+#, fuzzy
+#| msgid ""
+#| "Taler is uses efficient cryptographic constructions with low bandwidth "
+#| "and storage requirements. Combined with Taler's strong security which "
+#| "makes fraud impossible, Taler payment service providers can operate with "
+#| "very low overhead and thus offer low transaction fees."
msgid ""
"Taler is uses efficient cryptographic constructions with low bandwidth and "
-"storage requirements. Combined with Taler's strong security which makes "
+"storage requirements. Combined with Taler&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2356,8 +2401,14 @@ msgid "Ethical"
msgstr "Etico"
#: template/merchants.html.j2:101
+#, fuzzy
+#| msgid ""
+#| "Taler prevents tax evasion and money laundering. Taler's protocols are "
+#| "efficient and do not use wasteful proof-of-work calculations. Taler "
+#| "encourages transparency by providing an open standard and free software "
+#| "reference implementations."
msgid ""
-"Taler prevents tax evasion and money laundering. Taler's protocols are "
+"Taler prevents tax evasion and money laundering. Taler&#39;s protocols are "
"efficient and do not use wasteful proof-of-work calculations. Taler "
"encourages transparency by providing an open standard and free software "
"reference implementations."
@@ -2393,21 +2444,33 @@ msgid "Merchants process payments using the Taler backend:"
msgstr "I commercianti effettuano pagamenti utilizzando il backend di Taler: "
#: template/merchants.html.j2:144
+#, fuzzy
+#| msgid ""
+#| "The backend <b>signs</b> and <b>stores</b> the complete terms of offers "
+#| "made by the merchant to customers. For this, the merchant's frontend "
+#| "needs to give the customer's order in a JSON format to the backend."
msgid ""
"The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
-"by the merchant to customers. For this, the merchant's frontend needs to "
-"give the customer's order in a JSON format to the backend."
+"by the merchant to customers. For this, the merchant&#39;s frontend needs to "
+"give the customer&#39;s order in a JSON format to the backend."
msgstr ""
"Il backend <b>sottoscrive</b> ed <b>archivia</b> le condizioni finali delle "
"offerte fatte dal commerciante ai clienti. Per questo, il frontend del "
"commerciante deve dare l'ordine del cliente al backend in un formato JSON. "
#: template/merchants.html.j2:153
+#, fuzzy
+#| msgid ""
+#| "The backend <b>validates</b> payments received from the wallet and "
+#| "<b>executes</b> them with the Taler payment service provider (the "
+#| "exchange). For this, the merchant's frontend must pass the payment "
+#| "request through to the Taler backend and check the HTTP status code that "
+#| "is returned."
msgid ""
"The backend <b>validates</b> payments received from the wallet and "
"<b>executes</b> them with the Taler payment service provider (the exchange). "
-"For this, the merchant's frontend must pass the payment request through to "
-"the Taler backend and check the HTTP status code that is returned."
+"For this, the merchant&#39;s frontend must pass the payment request through "
+"to the Taler backend and check the HTTP status code that is returned."
msgstr ""
"Il backend <b>convalida</b> i pagamenti ricevuti dal portafoglio e li "
"<b>esegue</b> con il provider dei servizi di pagamento di Taler (il cambio). "
@@ -2648,7 +2711,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2666,7 +2729,7 @@ msgid "or"
msgstr ""
#: template/wallet.html.j2:149
-msgid "is required, but it appears you don't have it installed."
+msgid "is required, but it appears you don&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2686,7 +2749,7 @@ msgid "Install wallet"
msgstr "portafoglio"
#: template/wallet.html.j2:177
-msgid "JavaScript is disabled, installation won't work."
+msgid "JavaScript is disabled, installation won&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 9ba988f..5e5ab94 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\n"
+"POT-Creation-Date: 2019-12-10 14:34+0000\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Virtaal 1.0.0-beta1\n"
"Generated-By: Babel 2.5.3\n"
-#: common/base.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr "GNU Taler"
@@ -38,7 +38,7 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr "e"
@@ -73,10 +73,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -178,21 +174,16 @@ msgstr ""
msgid "Copyright Assignment"
msgstr "Atribuição de direitos autorais"
-#: template/copyright.html.j2:9
+#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the"
-msgstr ""
-
-#: template/copyright.html.j2:15
-msgid "agreement on licensing and collaborative development"
-msgstr ""
-
-#: template/copyright.html.j2:17
-msgid "of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:24
+#: template/copyright.html.j2:19
#, fuzzy
#| msgid ""
#| "<p>The agreements ensure that the code will continue to be made available "
@@ -214,7 +205,7 @@ msgstr ""
"distribuir através de lojas de aplicativos (“App stores”) que sejam hostis "
"ao software livre).</p>"
-#: template/copyright.html.j2:34
+#: template/copyright.html.j2:29
#, fuzzy
#| msgid ""
#| "<p>Minor contributions (basically, anyone without Git access) do not "
@@ -278,11 +269,11 @@ msgstr "RESTful"
msgid ""
"Taler is designed to work on the Internet. To ensure that Taler payments can "
"work with restrictive network setups, Taler uses a RESTful protocol over "
-"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
-"obviously merchants may choose to offer HTTPS for consistency and because it "
-"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
-"structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at"
+"HTTP or HTTPS. Taler&#39;s security does not depend upon the use of HTTPS, "
+"but obviously merchants may choose to offer HTTPS for consistency and "
+"because it generally is better for privacy compared to HTTP. Taler uses JSON "
+"to encode structure data, making it easy to integrate Taler with existing "
+"Web applications. Taler&#39;s protocol is documented in detail at"
msgstr ""
"O Taler foi projetado para trabalhar na Internet. Para garantir que os "
"pagamentos do Taler possam funcionar com configurações de rede restritivas, "
@@ -422,7 +413,7 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:93
+#: template/developers.html.j2:149 template/investors.html.j2:90
msgid "Download"
msgstr "Baixar"
@@ -457,15 +448,26 @@ msgstr ""
"terminologia do Taler, o cliente cria uma reserva no câmbio."
#: template/developers.html.j2:190
-msgid ""
-"Once the exchange has received the wire transfer, it allows the customer's "
-"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
-"are digital representations of the original currency from the transfer. It "
-"is important to note that the exchange does not learn the &quot;serial "
-"numbers&quot; of the coins created in this process, so it cannot tell later "
-"which customer purchased what at which merchant. The use of Taler does not "
-"change the currency or the total value of the funds (except for fees which "
-"the exchange may charge for the service)."
+#, fuzzy
+#| msgid ""
+#| "Once the exchange has received the wire transfer, it allows the "
+#| "customer's electronic wallet to <b>withdraw</b> electronic coins. The "
+#| "electronic coins are digital representations of the original currency "
+#| "from the transfer. It is important to note that the exchange does not "
+#| "learn the &quot;serial numbers&quot; of the coins created in this "
+#| "process, so it cannot tell later which customer purchased what at which "
+#| "merchant. The use of Taler does not change the currency or the total "
+#| "value of the funds (except for fees which the exchange may charge for the "
+#| "service)."
+msgid ""
+"Once the exchange has received the wire transfer, it allows the customer&#39;"
+"s electronic wallet to <b>withdraw</b> electronic coins. The electronic "
+"coins are digital representations of the original currency from the "
+"transfer. It is important to note that the exchange does not learn the &quot;"
+"serial numbers&quot; of the coins created in this process, so it cannot tell "
+"later which customer purchased what at which merchant. The use of Taler does "
+"not change the currency or the total value of the funds (except for fees "
+"which the exchange may charge for the service)."
msgstr ""
"Uma vez que o câmbio recebeu a transferência eletrônica, ele permite que a "
"carteira eletrônica do cliente <b>saque</b> moedas eletrônicas. As moedas "
@@ -902,12 +904,13 @@ msgstr ""
#: template/faq.html.j2:119
msgid ""
-"Taler's wallet supports multiple currencies, but the system currently does "
-"not support conversion between currencies. However, in principle an entity "
-"that accepts deposits in one currency and allows withdrawals in another "
-"currency could be created. Still, the regulatory hurdles in this case tend "
-"to be particularly complex. The focus for Taler is on day-to-day payments, "
-"so we have no plans to support currency conversion in the near future."
+"Taler&#39;s wallet supports multiple currencies, but the system currently "
+"does not support conversion between currencies. However, in principle an "
+"entity that accepts deposits in one currency and allows withdrawals in "
+"another currency could be created. Still, the regulatory hurdles in this "
+"case tend to be particularly complex. The focus for Taler is on day-to-day "
+"payments, so we have no plans to support currency conversion in the near "
+"future."
msgstr ""
#: template/faq.html.j2:130
@@ -1325,10 +1328,16 @@ msgid "dirty"
msgstr "suja <i>(dirty)</i>"
#: template/glossary.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "a `coin` is dirty if its public key may be known to an entity other than "
+#| "the customer, thereby creating the danger of some entity being able to "
+#| "link multiple transactions of coin's owner if the coin is not refreshed "
+#| "first"
msgid ""
"a `coin` is dirty if its public key may be known to an entity other than the "
"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
+"multiple transactions of coin&#39;s owner if the coin is not refreshed first"
msgstr ""
"uma “moeda” está suja se a sua chave pública pode ser conhecida por uma "
"entidade diferente do cliente, criando assim o perigo de alguma entidade "
@@ -1340,8 +1349,12 @@ msgid "exchange"
msgstr "câmbio <i>(exchange)</i>"
#: template/glossary.html.j2:63
+#, fuzzy
+#| msgid ""
+#| "Taler's payment service provider. Issues electronic `coins` during "
+#| "`withdrawal` and redeems them when they are `deposited` by merchants."
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
"provedor de serviços de pagamento do Taler. Emite “moedas” eletrônicas "
@@ -1468,10 +1481,15 @@ msgid "reserve"
msgstr "reserva <i>(reserve)</i>"
#: template/glossary.html.j2:146
+#, fuzzy
+#| msgid ""
+#| "funds set aside for future use; either the balance of a customer at the "
+#| "exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+#| "account to cover obligations from coins in circulation"
msgid ""
"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
-"account to cover obligations from coins in circulation"
+"exchange ready for `withdrawal`, or the funds kept in the exchange&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
"fundos reservados para uso futuro; ou o saldo de um cliente na bolsa pronta "
"para “saque”, ou os fundos mantidos na conta bancária do câmbio para cobrir "
@@ -1522,8 +1540,12 @@ msgid "sharing"
msgstr "compartilhamento <i>(sharing)</i>"
#: template/glossary.html.j2:178
+#, fuzzy
+#| msgid ""
+#| "users can share ownership of a `coin` by sharing access to the coin's "
+#| "private key, thereby allowing all co-owners to spend the coin at any time."
msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
+"users can share ownership of a `coin` by sharing access to the coin&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
"os usuários podem compartilhar a propriedade de uma “moeda” compartilhando o "
@@ -1693,12 +1715,19 @@ msgstr ""
"em vários dispositivos."
#: template/governments.html.j2:58
-msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, merchants "
-"and the Taler payment service provider (the exchange) can mathematically "
-"demonstrate their lawful behavior in court in case of disputes. Financial "
-"damages are strictly limited, improving economic security for individuals, "
-"merchants, the exchange and the state."
+#, fuzzy
+#| msgid ""
+#| "Taler's payments are cryptographically secured. Thus, customers, "
+#| "merchants and the Taler payment service provider (the exchange) can "
+#| "mathematically demonstrate their lawful behavior in court in case of "
+#| "disputes. Financial damages are strictly limited, improving economic "
+#| "security for individuals, merchants, the exchange and the state."
+msgid ""
+"Taler&#39;s payments are cryptographically secured. Thus, customers, "
+"merchants and the Taler payment service provider (the exchange) can "
+"mathematically demonstrate their lawful behavior in court in case of "
+"disputes. Financial damages are strictly limited, improving economic "
+"security for individuals, merchants, the exchange and the state."
msgstr ""
"Os pagamentos do Taler são protegidos criptograficamente. Assim, clientes, "
"comerciantes e o provedor de serviços de pagamento do Taler (o câmbio) podem "
@@ -1840,10 +1869,17 @@ msgstr ""
"do cliente."
#: template/governments.html.j2:170
+#, fuzzy
+#| msgid ""
+#| "The amounts of digital coins legitimately withdrawn by customers from the "
+#| "exchange, the value of non-redeemed digital coins in customer's wallets, "
+#| "the value and corresponding wire details of deposit operations performed "
+#| "by merchants with the exchange, and the income of the exchange from "
+#| "transaction fees."
msgid ""
"The amounts of digital coins legitimately withdrawn by customers from the "
-"exchange, the value of non-redeemed digital coins in customer's wallets, the "
-"value and corresponding wire details of deposit operations performed by "
+"exchange, the value of non-redeemed digital coins in customer&#39;s wallets, "
+"the value and corresponding wire details of deposit operations performed by "
"merchants with the exchange, and the income of the exchange from transaction "
"fees."
msgstr ""
@@ -1871,12 +1907,12 @@ msgstr "visão geral do sistema"
#: template/gsoc-codeless.html.j2:14
msgid ""
-"Codeless payment is a component that sits between the seller's frontend and "
-"the GNU Taler merchant backend. This component has a web interface, where "
-"payment buttons are configured. Registered merchants can manage their "
-"inventory and simultaneously create a 'Buy Now' button for a specific "
-"product. This code can be directly copy pasted on the seller's frontend and "
-"can be used for 'Pay with Taler'."
+"Codeless payment is a component that sits between the seller&#39;s frontend "
+"and the GNU Taler merchant backend. This component has a web interface, "
+"where payment buttons are configured. Registered merchants can manage their "
+"inventory and simultaneously create a &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -2104,28 +2140,35 @@ msgstr ""
"deveriam funcionar e o objetivo de impor essa visão ao mundo."
#: template/investors.html.j2:37
-msgid "We are currently supported by"
-msgstr ""
-
-#: template/investors.html.j2:41
msgid ""
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
"the French national institute for research in informatics and automation, "
-"and the"
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
msgstr ""
-#: template/investors.html.j2:50
+#: template/investors.html.j2:47
msgid "The Technology"
msgstr "A tecnologia"
-#: template/investors.html.j2:53
+#: template/investors.html.j2:50
+#, fuzzy
+#| msgid ""
+#| "All transactions in Taler are secured using <a href=\"bibliography.html"
+#| "\">modern cryptography</a> and trust in all parties is minimized. "
+#| "Financial damage is bounded (for customers, merchants and the exchange) "
+#| "even in the case that systems are compromised and private keys are "
+#| "stolen. Databases can be audited for consistency, resulting in either the "
+#| "detection of compromised systems or the demonstration that participants "
+#| "were honest. Actual transaction costs are fractions of a cent."
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
-"damage is bounded (for customers, merchants and the exchange) even in the "
-"case that systems are compromised and private keys are stolen. Databases can "
-"be audited for consistency, resulting in either the detection of compromised "
-"systems or the demonstration that participants were honest. Actual "
-"transaction costs are fractions of a cent."
+"damage is bounded &#x28;for customers, merchants and the exchange&#x29; even "
+"in the case that systems are compromised and private keys are stolen. "
+"Databases can be audited for consistency, resulting in either the detection "
+"of compromised systems or the demonstration that participants were honest. "
+"Actual transaction costs are fractions of a cent."
msgstr ""
"Todas as transações no Taler são protegidas usando <a href=\"bibliography."
"html\">criptografia moderna</a> e a confiança em todas as partes é "
@@ -2136,11 +2179,11 @@ msgstr ""
"demonstração de que os participantes eram honestos. Os custos reais de "
"transação são frações de um centavo."
-#: template/investors.html.j2:66
+#: template/investors.html.j2:63
msgid "The Business"
msgstr "Os negócios"
-#: template/investors.html.j2:68
+#: template/investors.html.j2:65
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -2158,11 +2201,11 @@ msgstr ""
"representado usando sistemas de pagamento tradicionais no câmbio. O câmbio "
"cobra taxas para facilitar as transações."
-#: template/investors.html.j2:87
+#: template/investors.html.j2:84
msgid "The Business Case"
msgstr "O caso de negócio"
-#: template/investors.html.j2:97
+#: template/investors.html.j2:94
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
@@ -2172,11 +2215,11 @@ msgstr ""
"explica, em inglês, como o Taler pode afetar os atuais desenvolvimentos no "
"mercado de pagamento global."
-#: template/investors.html.j2:120
+#: template/investors.html.j2:117
msgid "Running a Taler payment service operator"
msgstr "Executando um operador de serviço de pagamento do Taler"
-#: template/investors.html.j2:123
+#: template/investors.html.j2:120
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -2188,7 +2231,7 @@ msgstr ""
"despesas operacionais são de transferências bancárias com o sistema bancário "
"e a operação da infraestrutura informática."
-#: template/investors.html.j2:133
+#: template/investors.html.j2:130
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
@@ -2196,7 +2239,7 @@ msgstr ""
"As operações criptográficas, a largura de banda e os custos de armazenamento "
"são inferiores a 0,01 centavos por transação."
-#: template/investors.html.j2:134
+#: template/investors.html.j2:131
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
@@ -2205,7 +2248,7 @@ msgstr ""
"bancárias maiores para os comerciantes minimizarem os custos de "
"transferência eletrônica."
-#: template/investors.html.j2:135
+#: template/investors.html.j2:132
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
@@ -2213,11 +2256,11 @@ msgstr ""
"O protocolo permite o câmbio cobrar taxas por qualquer operação cara (saque, "
"depósito, renovação, reembolso ou transferências bancárias agregadas)."
-#: template/investors.html.j2:136
+#: template/investors.html.j2:133
msgid "Partnership with banks establishes consumer trust."
msgstr "A parceria com os bancos estabelece a confiança do cliente."
-#: template/investors.html.j2:137
+#: template/investors.html.j2:134
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
"A parceria com a comunidade de software livre permite uma implantação rápida."
@@ -2294,9 +2337,15 @@ msgid "Cheap"
msgstr "Barato"
#: template/merchants.html.j2:78
+#, fuzzy
+#| msgid ""
+#| "Taler is uses efficient cryptographic constructions with low bandwidth "
+#| "and storage requirements. Combined with Taler's strong security which "
+#| "makes fraud impossible, Taler payment service providers can operate with "
+#| "very low overhead and thus offer low transaction fees."
msgid ""
"Taler is uses efficient cryptographic constructions with low bandwidth and "
-"storage requirements. Combined with Taler's strong security which makes "
+"storage requirements. Combined with Taler&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -2325,8 +2374,14 @@ msgid "Ethical"
msgstr "Ético"
#: template/merchants.html.j2:101
+#, fuzzy
+#| msgid ""
+#| "Taler prevents tax evasion and money laundering. Taler's protocols are "
+#| "efficient and do not use wasteful proof-of-work calculations. Taler "
+#| "encourages transparency by providing an open standard and free software "
+#| "reference implementations."
msgid ""
-"Taler prevents tax evasion and money laundering. Taler's protocols are "
+"Taler prevents tax evasion and money laundering. Taler&#39;s protocols are "
"efficient and do not use wasteful proof-of-work calculations. Taler "
"encourages transparency by providing an open standard and free software "
"reference implementations."
@@ -2361,21 +2416,33 @@ msgid "Merchants process payments using the Taler backend:"
msgstr "Os comerciantes processam pagamentos usando o backend do Taler:"
#: template/merchants.html.j2:144
+#, fuzzy
+#| msgid ""
+#| "The backend <b>signs</b> and <b>stores</b> the complete terms of offers "
+#| "made by the merchant to customers. For this, the merchant's frontend "
+#| "needs to give the customer's order in a JSON format to the backend."
msgid ""
"The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
-"by the merchant to customers. For this, the merchant's frontend needs to "
-"give the customer's order in a JSON format to the backend."
+"by the merchant to customers. For this, the merchant&#39;s frontend needs to "
+"give the customer&#39;s order in a JSON format to the backend."
msgstr ""
"O backend <b>assina</b> e <b>armazena</b> os termos completos das ofertas "
"feitas pelo comerciante aos clientes. Para isso, o frontend do comerciante "
"precisa dar a ordem do cliente em um formato JSON para o backend."
#: template/merchants.html.j2:153
+#, fuzzy
+#| msgid ""
+#| "The backend <b>validates</b> payments received from the wallet and "
+#| "<b>executes</b> them with the Taler payment service provider (the "
+#| "exchange). For this, the merchant's frontend must pass the payment "
+#| "request through to the Taler backend and check the HTTP status code that "
+#| "is returned."
msgid ""
"The backend <b>validates</b> payments received from the wallet and "
"<b>executes</b> them with the Taler payment service provider (the exchange). "
-"For this, the merchant's frontend must pass the payment request through to "
-"the Taler backend and check the HTTP status code that is returned."
+"For this, the merchant&#39;s frontend must pass the payment request through "
+"to the Taler backend and check the HTTP status code that is returned."
msgstr ""
"O backend <b>valida</b> pagamentos recebidos da carteira e os <b>executa</b> "
"com o provedor de serviços de pagamento do Taler (o câmbio). Para isso, o "
@@ -2615,7 +2682,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2633,7 +2700,7 @@ msgid "or"
msgstr ""
#: template/wallet.html.j2:149
-msgid "is required, but it appears you don't have it installed."
+msgid "is required, but it appears you don&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2653,7 +2720,7 @@ msgid "Install wallet"
msgstr "carteira <i>(wallet)</i>"
#: template/wallet.html.j2:177
-msgid "JavaScript is disabled, installation won't work."
+msgid "JavaScript is disabled, installation won&#39;t work."
msgstr ""
#: template/wallet.html.j2:216
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index d7331c2..c56bdf8 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-10 00:42+0000\n"
+"POT-Creation-Date: 2019-12-10 14:34+0000\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"Generated-By: Babel 2.5.1\n"
-#: common/base.j2:5
+#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
msgstr ""
@@ -39,7 +39,7 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
msgstr ""
@@ -72,10 +72,6 @@ msgstr ""
msgid "News"
msgstr ""
-#: common/news.j2:5
-msgid "GNUnet"
-msgstr ""
-
#: inc/news.macro.j2:22
msgid "read more"
msgstr ""
@@ -164,21 +160,16 @@ msgstr ""
msgid "Copyright Assignment"
msgstr ""
-#: template/copyright.html.j2:9
+#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the"
-msgstr ""
-
-#: template/copyright.html.j2:15
-msgid "agreement on licensing and collaborative development"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
-#: template/copyright.html.j2:17
-msgid "of the GNUnet and GNU Taler projects is satisfied."
-msgstr ""
-
-#: template/copyright.html.j2:24
+#: template/copyright.html.j2:19
msgid ""
"The agreements ensure that the code will continue to be made available under "
"free software licenses, but gives developers the freedom to move code "
@@ -187,7 +178,7 @@ msgid ""
"stores that are hostile to free software)."
msgstr ""
-#: template/copyright.html.j2:34
+#: template/copyright.html.j2:29
msgid ""
"Minor contributions (basically, anyone without Git access) do not require "
"copyright assignment. Pseudonymous contributions are accepted, in this case "
@@ -223,11 +214,11 @@ msgstr ""
msgid ""
"Taler is designed to work on the Internet. To ensure that Taler payments can "
"work with restrictive network setups, Taler uses a RESTful protocol over "
-"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
-"obviously merchants may choose to offer HTTPS for consistency and because it "
-"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
-"structure data, making it easy to integrate Taler with existing Web "
-"applications. Taler's protocol is documented in detail at"
+"HTTP or HTTPS. Taler&#39;s security does not depend upon the use of HTTPS, "
+"but obviously merchants may choose to offer HTTPS for consistency and "
+"because it generally is better for privacy compared to HTTP. Taler uses JSON "
+"to encode structure data, making it easy to integrate Taler with existing "
+"Web applications. Taler&#39;s protocol is documented in detail at"
msgstr ""
#: template/developers.html.j2:58 template/docs.html.j2:182
@@ -312,7 +303,7 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:93
+#: template/developers.html.j2:149 template/investors.html.j2:90
msgid "Download"
msgstr ""
@@ -341,14 +332,14 @@ msgstr ""
#: template/developers.html.j2:190
msgid ""
-"Once the exchange has received the wire transfer, it allows the customer's "
-"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
-"are digital representations of the original currency from the transfer. It "
-"is important to note that the exchange does not learn the &quot;serial "
-"numbers&quot; of the coins created in this process, so it cannot tell later "
-"which customer purchased what at which merchant. The use of Taler does not "
-"change the currency or the total value of the funds (except for fees which "
-"the exchange may charge for the service)."
+"Once the exchange has received the wire transfer, it allows the customer&#39;"
+"s electronic wallet to <b>withdraw</b> electronic coins. The electronic "
+"coins are digital representations of the original currency from the "
+"transfer. It is important to note that the exchange does not learn the &quot;"
+"serial numbers&quot; of the coins created in this process, so it cannot tell "
+"later which customer purchased what at which merchant. The use of Taler does "
+"not change the currency or the total value of the funds (except for fees "
+"which the exchange may charge for the service)."
msgstr ""
#: template/developers.html.j2:208
@@ -648,12 +639,13 @@ msgstr ""
#: template/faq.html.j2:119
msgid ""
-"Taler's wallet supports multiple currencies, but the system currently does "
-"not support conversion between currencies. However, in principle an entity "
-"that accepts deposits in one currency and allows withdrawals in another "
-"currency could be created. Still, the regulatory hurdles in this case tend "
-"to be particularly complex. The focus for Taler is on day-to-day payments, "
-"so we have no plans to support currency conversion in the near future."
+"Taler&#39;s wallet supports multiple currencies, but the system currently "
+"does not support conversion between currencies. However, in principle an "
+"entity that accepts deposits in one currency and allows withdrawals in "
+"another currency could be created. Still, the regulatory hurdles in this "
+"case tend to be particularly complex. The focus for Taler is on day-to-day "
+"payments, so we have no plans to support currency conversion in the near "
+"future."
msgstr ""
#: template/faq.html.j2:130
@@ -975,7 +967,7 @@ msgstr ""
msgid ""
"a `coin` is dirty if its public key may be known to an entity other than the "
"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
+"multiple transactions of coin&#39;s owner if the coin is not refreshed first"
msgstr ""
#: template/glossary.html.j2:61
@@ -984,7 +976,7 @@ msgstr ""
#: template/glossary.html.j2:63
msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
+"Taler&#39;s payment service provider. Issues electronic `coins` during "
"`withdrawal` and redeems them when they are `deposited` by merchants."
msgstr ""
@@ -1097,8 +1089,8 @@ msgstr ""
#: template/glossary.html.j2:146
msgid ""
"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
-"account to cover obligations from coins in circulation"
+"exchange ready for `withdrawal`, or the funds kept in the exchange&#39;s "
+"bank account to cover obligations from coins in circulation"
msgstr ""
#: template/glossary.html.j2:152
@@ -1140,7 +1132,7 @@ msgstr ""
#: template/glossary.html.j2:178
msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
+"users can share ownership of a `coin` by sharing access to the coin&#39;s "
"private key, thereby allowing all co-owners to spend the coin at any time."
msgstr ""
@@ -1276,11 +1268,11 @@ msgstr ""
#: template/governments.html.j2:58
msgid ""
-"Taler's payments are cryptographically secured. Thus, customers, merchants "
-"and the Taler payment service provider (the exchange) can mathematically "
-"demonstrate their lawful behavior in court in case of disputes. Financial "
-"damages are strictly limited, improving economic security for individuals, "
-"merchants, the exchange and the state."
+"Taler&#39;s payments are cryptographically secured. Thus, customers, "
+"merchants and the Taler payment service provider (the exchange) can "
+"mathematically demonstrate their lawful behavior in court in case of "
+"disputes. Financial damages are strictly limited, improving economic "
+"security for individuals, merchants, the exchange and the state."
msgstr ""
#: template/governments.html.j2:70
@@ -1387,8 +1379,8 @@ msgstr ""
#: template/governments.html.j2:170
msgid ""
"The amounts of digital coins legitimately withdrawn by customers from the "
-"exchange, the value of non-redeemed digital coins in customer's wallets, the "
-"value and corresponding wire details of deposit operations performed by "
+"exchange, the value of non-redeemed digital coins in customer&#39;s wallets, "
+"the value and corresponding wire details of deposit operations performed by "
"merchants with the exchange, and the income of the exchange from transaction "
"fees."
msgstr ""
@@ -1409,12 +1401,12 @@ msgstr ""
#: template/gsoc-codeless.html.j2:14
msgid ""
-"Codeless payment is a component that sits between the seller's frontend and "
-"the GNU Taler merchant backend. This component has a web interface, where "
-"payment buttons are configured. Registered merchants can manage their "
-"inventory and simultaneously create a 'Buy Now' button for a specific "
-"product. This code can be directly copy pasted on the seller's frontend and "
-"can be used for 'Pay with Taler'."
+"Codeless payment is a component that sits between the seller&#39;s frontend "
+"and the GNU Taler merchant backend. This component has a web interface, "
+"where payment buttons are configured. Registered merchants can manage their "
+"inventory and simultaneously create a &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
msgstr ""
#: template/gsoc-codeless.html.j2:29
@@ -1630,35 +1622,33 @@ msgid ""
msgstr ""
#: template/investors.html.j2:37
-msgid "We are currently supported by"
-msgstr ""
-
-#: template/investors.html.j2:41
msgid ""
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
"the French national institute for research in informatics and automation, "
-"and the"
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
msgstr ""
-#: template/investors.html.j2:50
+#: template/investors.html.j2:47
msgid "The Technology"
msgstr ""
-#: template/investors.html.j2:53
+#: template/investors.html.j2:50
msgid ""
"All transactions in Taler are secured using <a href=\"bibliography.html"
"\">modern cryptography</a> and trust in all parties is minimized. Financial "
-"damage is bounded (for customers, merchants and the exchange) even in the "
-"case that systems are compromised and private keys are stolen. Databases can "
-"be audited for consistency, resulting in either the detection of compromised "
-"systems or the demonstration that participants were honest. Actual "
-"transaction costs are fractions of a cent."
+"damage is bounded &#x28;for customers, merchants and the exchange&#x29; even "
+"in the case that systems are compromised and private keys are stolen. "
+"Databases can be audited for consistency, resulting in either the detection "
+"of compromised systems or the demonstration that participants were honest. "
+"Actual transaction costs are fractions of a cent."
msgstr ""
-#: template/investors.html.j2:66
+#: template/investors.html.j2:63
msgid "The Business"
msgstr ""
-#: template/investors.html.j2:68
+#: template/investors.html.j2:65
msgid ""
"The scalable business model for Taler is the operation of the payment "
"service provider, which converts money from traditional payment systems "
@@ -1669,22 +1659,22 @@ msgid ""
"to facilitate the transactions."
msgstr ""
-#: template/investors.html.j2:87
+#: template/investors.html.j2:84
msgid "The Business Case"
msgstr ""
-#: template/investors.html.j2:97
+#: template/investors.html.j2:94
msgid ""
"Our <a href=\"financial-news.html\">financial news</a> page explains in "
"English how Taler can impact current developments in the global payment "
"market."
msgstr ""
-#: template/investors.html.j2:120
+#: template/investors.html.j2:117
msgid "Running a Taler payment service operator"
msgstr ""
-#: template/investors.html.j2:123
+#: template/investors.html.j2:120
msgid ""
"The payment service operator runs the <em>Taler exchange</em>. The exchange "
"charges <b>transaction fees</b> to customers or merchants. Its operational "
@@ -1692,29 +1682,29 @@ msgid ""
"of the computing infrastructure."
msgstr ""
-#: template/investors.html.j2:133
+#: template/investors.html.j2:130
msgid ""
"Cryptographic operations, bandwidth and storage costs are less than 0.01 "
"cent per transaction."
msgstr ""
-#: template/investors.html.j2:134
+#: template/investors.html.j2:131
msgid ""
"Multiple Taler transactions can be aggregated into larger wire transfers to "
"merchants to minimize wire transfer costs."
msgstr ""
-#: template/investors.html.j2:135
+#: template/investors.html.j2:132
msgid ""
"Protocol allows the exchange to charge fees for any expensive operation "
"(withdraw, deposit, refresh, refund or aggregated wire transfers)."
msgstr ""
-#: template/investors.html.j2:136
+#: template/investors.html.j2:133
msgid "Partnership with banks establishes consumer trust."
msgstr ""
-#: template/investors.html.j2:137
+#: template/investors.html.j2:134
msgid "Partnership with free software community enables rapid deployment."
msgstr ""
@@ -1770,7 +1760,7 @@ msgstr ""
#: template/merchants.html.j2:78
msgid ""
"Taler is uses efficient cryptographic constructions with low bandwidth and "
-"storage requirements. Combined with Taler's strong security which makes "
+"storage requirements. Combined with Taler&#39;s strong security which makes "
"fraud impossible, Taler payment service providers can operate with very low "
"overhead and thus offer low transaction fees."
msgstr ""
@@ -1792,7 +1782,7 @@ msgstr ""
#: template/merchants.html.j2:101
msgid ""
-"Taler prevents tax evasion and money laundering. Taler's protocols are "
+"Taler prevents tax evasion and money laundering. Taler&#39;s protocols are "
"efficient and do not use wasteful proof-of-work calculations. Taler "
"encourages transparency by providing an open standard and free software "
"reference implementations."
@@ -1825,16 +1815,16 @@ msgstr ""
#: template/merchants.html.j2:144
msgid ""
"The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
-"by the merchant to customers. For this, the merchant's frontend needs to "
-"give the customer's order in a JSON format to the backend."
+"by the merchant to customers. For this, the merchant&#39;s frontend needs to "
+"give the customer&#39;s order in a JSON format to the backend."
msgstr ""
#: template/merchants.html.j2:153
msgid ""
"The backend <b>validates</b> payments received from the wallet and "
"<b>executes</b> them with the Taler payment service provider (the exchange). "
-"For this, the merchant's frontend must pass the payment request through to "
-"the Taler backend and check the HTTP status code that is returned."
+"For this, the merchant&#39;s frontend must pass the payment request through "
+"to the Taler backend and check the HTTP status code that is returned."
msgstr ""
#: template/merchants.html.j2:164
@@ -2055,7 +2045,7 @@ msgid "demo"
msgstr ""
#: template/wallet.html.j2:119
-msgid "You don't have a wallet installed yet."
+msgid "You don&#39;t have a wallet installed yet."
msgstr ""
#: template/wallet.html.j2:128
@@ -2071,7 +2061,7 @@ msgid "or"
msgstr ""
#: template/wallet.html.j2:149
-msgid "is required, but it appears you don't have it installed."
+msgid "is required, but it appears you don&#39;t have it installed."
msgstr ""
#: template/wallet.html.j2:159
@@ -2087,7 +2077,7 @@ msgid "Install wallet"
msgstr ""
#: template/wallet.html.j2:177
-msgid "JavaScript is disabled, installation won't work."
+msgid "JavaScript is disabled, installation won&#39;t work."
msgstr ""
#: template/wallet.html.j2:216