summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/footer.j2.inc3
-rw-r--r--locale/de/LC_MESSAGES/messages.po259
-rw-r--r--locale/en/LC_MESSAGES/messages.po233
-rw-r--r--locale/es/LC_MESSAGES/messages.po258
-rw-r--r--locale/fr/LC_MESSAGES/messages.po265
-rw-r--r--locale/it/LC_MESSAGES/messages.po284
-rw-r--r--locale/pt/LC_MESSAGES/messages.po260
-rw-r--r--locale/ru/LC_MESSAGES/messages.po233
8 files changed, 927 insertions, 868 deletions
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index ebee7fd8..74c5c18e 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -30,8 +30,7 @@
<p>&copy; <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }}
Taler Systems SA 2015-2019
<br>
- {{ _("We are grateful for support and free hosting of this site by
- <a href="http://www.bfh.ch/">BFH</a>") }}.
+ {{ _("We are grateful for support and free hosting of this site by <a href='http://www.bfh.ch/'>BFH</a>") }}.
<br>
{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
</div>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 430c309b..5e43e578 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\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,83 +13,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.4.0\n"
-#: about.html.j2:16
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-"GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-"Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
-"verschiedenen Branchen..."
-
-#: about.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
-
-#: about.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Theoretische Grundlagen."
-
-#: about.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
-
-#: about.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Doktorand, Inria."
-
-#: about.html.j2:55
-msgid "Software engineer."
-msgstr "Software-Ingenieur."
-
-#: about.html.j2:62
-msgid "Sustainable business development."
-msgstr "Nachhaltige Unternehmensentwicklung."
-
-#: about.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Software-Ingenieur. Arbeitet an libebics."
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-msgid "Translator (Spanish)"
-msgstr "Übersetzer (Spanisch)."
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-msgid "Translator (Italian)"
-msgstr "Übersetzer (Italienisch)."
-
-#: about.html.j2:98
-#, fuzzy
-#| msgid "Translator (Spanish)"
-msgid "Translator (German)"
-msgstr "Übersetzer (Deutsch)."
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr "Hardware-Sicherheitsmodul"
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr "Risikomanagement"
-
-#: about.html.j2:112
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
-
-#: about.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
-
#: architecture.html.j2:6
msgid "Taler System Architecture"
msgstr "Systemarchitektur von Taler"
@@ -677,16 +600,17 @@ msgstr "In welchem Zusammenhang steht Taler mit Bitcoin oder Blockchains?"
#| "Taler is not based on proof-of-work or any other distributed consensus\n"
#| "mechanism. Instead Taler is based on blind signatures.</p>\n"
msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
msgstr ""
"Taler verwendet keine Blockchain-Technologie oder Bitcoin selbst. Auch auf "
"elektronisches gegenseitiges Beglaubigen in einem Web-of-trust- oder proof-"
"of-work-Verfahren verzichtet Taler. Stattdessen setzt Taler auf Verfahren "
"mit blinden Signaturen."
-#: faq.html.j2:11
+#: faq.html.j2:13
#, fuzzy
#| msgid ""
#| "<p>It would be possible, however, to withdraw coins denominated in\n"
@@ -702,11 +626,11 @@ msgstr ""
"einer dafür geeigneten Wechselstube zu überweisen. Dies brächte gegenüber "
"Bitcoin sogar den Vorteil von sofortigen Zahlungsbestätigungen."
-#: faq.html.j2:18
+#: faq.html.j2:20
msgid "Where is the balance in my wallet stored?"
msgstr "Wo ist der Münzbestand in meiner Taler-Geldbörse gespeichert?"
-#: faq.html.j2:19
+#: faq.html.j2:21
#, fuzzy
#| msgid ""
#| "<p>Your wallet stores digital coins and thus ultimately your computer\n"
@@ -722,11 +646,11 @@ msgstr ""
"speichert dagegen auf einem Konto, das sie treuhänderisch verwaltet, die "
"Forderungen von noch nicht gebuchten Münzen."
-#: faq.html.j2:25
+#: faq.html.j2:27
msgid "What if my wallet is lost?"
msgstr "Was passiert bei Verlust der Taler-Geldbörse?"
-#: faq.html.j2:26
+#: faq.html.j2:28
#, fuzzy
#| msgid ""
#| "<p>Since the digital coins of value in your wallet are anonymized, the\n"
@@ -743,7 +667,7 @@ msgstr ""
"wiederherstellen. Wie bei echten Geldbörsen mit Banknoten und Münzen sind "
"ihre Eigentümer allein verantwortlich für deren Sicherung."
-#: faq.html.j2:32
+#: faq.html.j2:34
#, fuzzy
#| msgid ""
#| "<p>The risk of losing a wallet can be mitigated by making backups or\n"
@@ -756,11 +680,11 @@ msgstr ""
"man Backups von ihnen anfertigt oder ihren Bestand an digitalen Münzen "
"niedrig hält."
-#: faq.html.j2:37
+#: faq.html.j2:39
msgid "What if my computer is hacked?"
msgstr "Was ist, wenn mein Computer gehackt wurde?"
-#: faq.html.j2:38
+#: faq.html.j2:40
#, fuzzy
#| msgid ""
#| "<p>In case of a compromise of one of your devices, an attacker can\n"
@@ -776,13 +700,13 @@ msgstr ""
"an, den Bestand regelmäßig zu kontrollieren, um einen solchen Einbruch "
"festzustellen."
-#: faq.html.j2:44
+#: faq.html.j2:46
msgid "Can I send money to my friend with Taler?"
msgstr ""
"Kann ich mit Taler anderen Personen oder Freunden meine digitalen Münzen "
"senden?"
-#: faq.html.j2:45
+#: faq.html.j2:47
#, fuzzy
#| msgid ""
#| "<p>If your friend provides goods or services for you in exchange for a\n"
@@ -798,7 +722,7 @@ msgstr ""
"einrichten, um deine Zahlung von der Taler-Geldbörse auf dem Girokonto ihrer "
"Geschäftsbank zu erhalten."
-#: faq.html.j2:50
+#: faq.html.j2:52
#, fuzzy
#| msgid ""
#| "<p>Future versions of the Taler wallet may allow exchanging coins\n"
@@ -810,11 +734,11 @@ msgstr ""
"Zukünftige Versionen der Taler-Geldbörse sehen vor, unter Freunden auch "
"direkt digitale Münzen auszutauschen."
-#: faq.html.j2:56
+#: faq.html.j2:58
msgid "How does Taler handle payments in different currencies?"
msgstr "Wie geht Taler um mit digitalen Münzen anderer Währungen?"
-#: faq.html.j2:57
+#: faq.html.j2:59
#, fuzzy
#| msgid ""
#| "<p>Taler wallets can store digital coins corresponding to multiple\n"
@@ -827,18 +751,18 @@ msgstr ""
"die in unterschiedlichen Währungen wie Euro, US-Dollar oder Bitcoin notiert "
"sind."
-#: faq.html.j2:61
+#: faq.html.j2:63
#, fuzzy
#| msgid ""
#| "<p>Taler currently does not offer conversion between currencies.</p>\n"
msgid "<p>Taler currently does not offer conversion between currencies.</p>"
msgstr "Taler bietet jedoch derzeitig keinen Umtausch zwischen Währungen."
-#: faq.html.j2:65
+#: faq.html.j2:67
msgid "How does Taler protect my privacy?"
msgstr "Wie schützt Taler meine privaten Daten?"
-#: faq.html.j2:66
+#: faq.html.j2:68
#, fuzzy
#| msgid ""
#| "<p>Your wallet stores digital coins that are <a\n"
@@ -859,11 +783,11 @@ msgstr ""
"privaten Daten, weil die Taler-Wechselstube dadurch keine Kenntnis davon "
"erlangt, welche der Münzen von welchen Käufern sie signiert."
-#: faq.html.j2:77
+#: faq.html.j2:79
msgid "How much does it cost?"
msgstr ""
-#: faq.html.j2:78
+#: faq.html.j2:80
msgid ""
"<p>The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -876,11 +800,11 @@ msgid ""
"regulator and could thus easily be 10x higher.</p>"
msgstr ""
-#: faq.html.j2:93
+#: faq.html.j2:95
msgid "Does Taler work with international payments?"
msgstr ""
-#: faq.html.j2:94
+#: faq.html.j2:96
msgid ""
"<p>Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -891,24 +815,24 @@ msgid ""
"future.</p>"
msgstr ""
-#: faq.html.j2:107
+#: faq.html.j2:109
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: faq.html.j2:108
+#: faq.html.j2:110
msgid ""
"<p>We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow.</p>"
msgstr ""
-#: faq.html.j2:116
+#: faq.html.j2:118
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: faq.html.j2:117
+#: faq.html.j2:119
msgid ""
"<p>The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -918,13 +842,13 @@ msgid ""
"Taler coins into regular bank money.</p>"
msgstr ""
-#: faq.html.j2:127
+#: faq.html.j2:129
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: faq.html.j2:128
+#: faq.html.j2:130
msgid ""
"<p>Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
@@ -933,11 +857,11 @@ msgid ""
"respective regulatory authorities, or even the general public.</p>"
msgstr ""
-#: faq.html.j2:138
+#: faq.html.j2:140
msgid "Are there any projects already using Taler?"
msgstr ""
-#: faq.html.j2:139
+#: faq.html.j2:141
msgid ""
"<p>We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -947,11 +871,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
msgstr ""
-#: faq.html.j2:151
+#: faq.html.j2:153
msgid "Does Taler support recurring payments?"
msgstr ""
-#: faq.html.j2:153
+#: faq.html.j2:155
msgid ""
"<p>Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -2408,6 +2332,83 @@ msgstr "Taler in den Medien"
msgid "SchemaFuzz"
msgstr ""
+#: team.html.j2:16
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+"GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+"Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
+"verschiedenen Branchen..."
+
+#: team.html.j2:28
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
+
+#: team.html.j2:33
+msgid "Theoretical foundations."
+msgstr "Theoretische Grundlagen."
+
+#: team.html.j2:38
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
+
+#: team.html.j2:45
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr "Doktorand, Inria."
+
+#: team.html.j2:55
+msgid "Software engineer."
+msgstr "Software-Ingenieur."
+
+#: team.html.j2:62
+msgid "Sustainable business development."
+msgstr "Nachhaltige Unternehmensentwicklung."
+
+#: team.html.j2:66
+msgid "Software engineer. Works on libebics."
+msgstr "Software-Ingenieur. Arbeitet an libebics."
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+msgid "Translator (Spanish)"
+msgstr "Übersetzer (Spanisch)."
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+msgid "Translator (Italian)"
+msgstr "Übersetzer (Italienisch)."
+
+#: team.html.j2:98
+#, fuzzy
+#| msgid "Translator (Spanish)"
+msgid "Translator (German)"
+msgstr "Übersetzer (Deutsch)."
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr "Hardware-Sicherheitsmodul"
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr "Risikomanagement"
+
+#: team.html.j2:112
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
+
+#: team.html.j2:118
+msgid "Software engineer. Works on Android wallet."
+msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
+
#: common/base.j2:5
msgid "GNU Taler"
msgstr "Das Taler-Bezahlsystem"
@@ -2416,21 +2417,19 @@ msgstr "Das Taler-Bezahlsystem"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
-#: common/footer.j2.inc:11
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
#, fuzzy
-#| msgid "About us"
-msgid "About"
-msgstr "Über uns"
+#| msgid "The Team"
+msgid "Team"
+msgstr "Das Taler-Team"
#: common/footer.j2.inc:12
msgid "Contact"
msgstr ""
#: common/footer.j2.inc:17
-#, fuzzy
-#| msgid "Investors"
-msgid "For Investors"
-msgstr "Investoren"
+msgid "GSoc 2018"
+msgstr ""
#: common/footer.j2.inc:18
#, fuzzy
@@ -2448,7 +2447,13 @@ msgstr ""
msgid "Bibliography"
msgstr "Bibliografie von GNU Taler"
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2459,18 +2464,22 @@ msgid "Features"
msgstr ""
#: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
msgstr ""
#: common/navigation.j2.inc:17
msgid "Docs"
msgstr ""
-#: common/navigation.j2.inc:18
#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "Das Taler-Team"
+#~| msgid "About us"
+#~ msgid "About"
+#~ msgstr "Über uns"
+
+#, fuzzy
+#~| msgid "Investors"
+#~ msgid "For Investors"
+#~ msgstr "Investoren"
#~ msgid "Citizens"
#~ msgstr "Bürger"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 30bbb77a..b6b62a09 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@@ -13,78 +13,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:16
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-
-#: about.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr ""
-
-#: about.html.j2:33
-msgid "Theoretical foundations."
-msgstr ""
-
-#: about.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr ""
-
-#: about.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr ""
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-
-#: about.html.j2:55
-msgid "Software engineer."
-msgstr ""
-
-#: about.html.j2:62
-msgid "Sustainable business development."
-msgstr ""
-
-#: about.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr ""
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-msgid "Translator (Spanish)"
-msgstr ""
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-msgid "Translator (Italian)"
-msgstr ""
-
-#: about.html.j2:98
-msgid "Translator (German)"
-msgstr ""
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr ""
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr ""
-
-#: about.html.j2:112
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr ""
-
-#: about.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr ""
-
#: architecture.html.j2:6
msgid "Taler System Architecture"
msgstr ""
@@ -386,93 +314,94 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
msgstr ""
-#: faq.html.j2:11
+#: faq.html.j2:13
msgid ""
"<p>It would be possible, however, to withdraw coins denominated in Bitcoin "
"into a Taler wallet (with an appropriate exchange), which would give some "
"benefits over plain Bitcoin, such as instant confirmation times.</p>"
msgstr ""
-#: faq.html.j2:18
+#: faq.html.j2:20
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:19
+#: faq.html.j2:21
msgid ""
"<p>Your wallet stores digital coins and thus ultimately your computer holds "
"your balance. The exchange keeps funds matching all unspent coins in an "
"escrow bank account.</p>"
msgstr ""
-#: faq.html.j2:25
+#: faq.html.j2:27
msgid "What if my wallet is lost?"
msgstr ""
-#: faq.html.j2:26
+#: faq.html.j2:28
msgid ""
"<p>Since the digital coins of value in your wallet are anonymized, the "
"exchange can not assist you in recovering a lost or stolen wallet. Just like "
"with a physical wallet for cash, you are responsible for keeping it safe.</p>"
msgstr ""
-#: faq.html.j2:32
+#: faq.html.j2:34
msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
"the balance reasonably low.</p>"
msgstr ""
-#: faq.html.j2:37
+#: faq.html.j2:39
msgid "What if my computer is hacked?"
msgstr ""
-#: faq.html.j2:38
+#: faq.html.j2:40
msgid ""
"<p>In case of a compromise of one of your devices, an attacker can spend "
"coins from your wallet. Checking your balance might reveal to you that your "
"device has been compromised.</p>"
msgstr ""
-#: faq.html.j2:44
+#: faq.html.j2:46
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:45
+#: faq.html.j2:47
msgid ""
"<p>If your friend provides goods or services for you in exchange for a "
"payment, they can easily set up a Taler merchant and receive the payment in "
"their bank account.</p>"
msgstr ""
-#: faq.html.j2:50
+#: faq.html.j2:52
msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins among "
"friends directly as well.</p>"
msgstr ""
-#: faq.html.j2:56
+#: faq.html.j2:58
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:57
+#: faq.html.j2:59
msgid ""
"<p>Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins.</p>"
msgstr ""
-#: faq.html.j2:61
+#: faq.html.j2:63
msgid "<p>Taler currently does not offer conversion between currencies.</p>"
msgstr ""
-#: faq.html.j2:65
+#: faq.html.j2:67
msgid "How does Taler protect my privacy?"
msgstr ""
-#: faq.html.j2:66
+#: faq.html.j2:68
msgid ""
"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
@@ -480,11 +409,11 @@ msgid ""
"knowing which coin it signed for which customer.</p>"
msgstr ""
-#: faq.html.j2:77
+#: faq.html.j2:79
msgid "How much does it cost?"
msgstr ""
-#: faq.html.j2:78
+#: faq.html.j2:80
msgid ""
"<p>The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -497,11 +426,11 @@ msgid ""
"regulator and could thus easily be 10x higher.</p>"
msgstr ""
-#: faq.html.j2:93
+#: faq.html.j2:95
msgid "Does Taler work with international payments?"
msgstr ""
-#: faq.html.j2:94
+#: faq.html.j2:96
msgid ""
"<p>Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -512,24 +441,24 @@ msgid ""
"future.</p>"
msgstr ""
-#: faq.html.j2:107
+#: faq.html.j2:109
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: faq.html.j2:108
+#: faq.html.j2:110
msgid ""
"<p>We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow.</p>"
msgstr ""
-#: faq.html.j2:116
+#: faq.html.j2:118
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: faq.html.j2:117
+#: faq.html.j2:119
msgid ""
"<p>The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -539,13 +468,13 @@ msgid ""
"Taler coins into regular bank money.</p>"
msgstr ""
-#: faq.html.j2:127
+#: faq.html.j2:129
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: faq.html.j2:128
+#: faq.html.j2:130
msgid ""
"<p>Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
@@ -554,11 +483,11 @@ msgid ""
"respective regulatory authorities, or even the general public.</p>"
msgstr ""
-#: faq.html.j2:138
+#: faq.html.j2:140
msgid "Are there any projects already using Taler?"
msgstr ""
-#: faq.html.j2:139
+#: faq.html.j2:141
msgid ""
"<p>We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -568,11 +497,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
msgstr ""
-#: faq.html.j2:151
+#: faq.html.j2:153
msgid "Does Taler support recurring payments?"
msgstr ""
-#: faq.html.j2:153
+#: faq.html.j2:155
msgid ""
"<p>Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1544,6 +1473,78 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: team.html.j2:16
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+
+#: team.html.j2:28
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr ""
+
+#: team.html.j2:33
+msgid "Theoretical foundations."
+msgstr ""
+
+#: team.html.j2:38
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr ""
+
+#: team.html.j2:45
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr ""
+
+#: team.html.j2:55
+msgid "Software engineer."
+msgstr ""
+
+#: team.html.j2:62
+msgid "Sustainable business development."
+msgstr ""
+
+#: team.html.j2:66
+msgid "Software engineer. Works on libebics."
+msgstr ""
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+msgid "Translator (Spanish)"
+msgstr ""
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+msgid "Translator (Italian)"
+msgstr ""
+
+#: team.html.j2:98
+msgid "Translator (German)"
+msgstr ""
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr ""
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr ""
+
+#: team.html.j2:112
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:118
+msgid "Software engineer. Works on Android wallet."
+msgstr ""
+
#: common/base.j2:5
msgid "GNU Taler"
msgstr ""
@@ -1552,8 +1553,8 @@ msgstr ""
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr ""
-#: common/footer.j2.inc:11
-msgid "About"
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+msgid "Team"
msgstr ""
#: common/footer.j2.inc:12
@@ -1561,7 +1562,7 @@ msgid "Contact"
msgstr ""
#: common/footer.j2.inc:17
-msgid "For Investors"
+msgid "GSoc 2018"
msgstr ""
#: common/footer.j2.inc:18
@@ -1576,7 +1577,13 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -1587,13 +1594,9 @@ msgid "Features"
msgstr ""
#: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
msgstr ""
#: common/navigation.j2.inc:17
msgid "Docs"
msgstr ""
-
-#: common/navigation.j2.inc:18
-msgid "Team"
-msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 15b95657..68aeaa83 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -14,82 +14,6 @@ msgstr ""
"Generated-By: Babel 2.3.4\n"
"X-Generator: Poedit 2.0.2\n"
-#: about.html.j2:16
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-"Responsable del mantenimiento de GNU. Especialista en seguridad de redes. "
-"Investigador en privacidad informática. Arquitecto de Software."
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-"Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
-"de TI en diferentes industrias."
-
-#: about.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Criptografía aplicada. Contacto para W3C &amp; Tor."
-
-#: about.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Fundamentos teóricos."
-
-#: about.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Fundador del proyecto GNU. Orientación ética y licencias."
-
-#: about.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Estudiante de doctorado, INRIA."
-
-#: about.html.j2:55
-msgid "Software engineer."
-msgstr "Ingeniero de Software."
-
-#: about.html.j2:62
-msgid "Sustainable business development."
-msgstr "Desarrollo de negocios sostenibles."
-
-#: about.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Ingeniero de Software. Trabaja en libebics."
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-msgid "Translator (Spanish)"
-msgstr "Traductor (español)"
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-msgid "Translator (Italian)"
-msgstr "Traductora (italiano)"
-
-#: about.html.j2:98
-msgid "Translator (German)"
-msgstr "Traductor (alemán)"
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr "Módulo de seguridad de hardware"
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr "Gestión de riesgos"
-
-#: about.html.j2:112
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
-
-#: about.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
-
#: architecture.html.j2:6
msgid "Taler System Architecture"
msgstr "Arquitectura del Sistema Taler"
@@ -524,17 +448,23 @@ msgid "How is Taler related to Bitcoin or Blockchains?"
msgstr "¿Cómo se relaciona Taler con Bitcoin o blockchains?"
#: faq.html.j2:6
+#, fuzzy
+#| msgid ""
+#| "<p>Taler does not use any Blockchain technology or Bitcoin directly. "
+#| "Taler is not based on proof-of-work or any other distributed consensus "
+#| "mechanism. Instead Taler is based on blind signatures.</p>"
msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
msgstr ""
"<p>Taler no utiliza ninguna tecnología blockchain o Bitcoin directamente. "
"Taler no se basa en pruebas de autorización ni en ningún otro mecanismo de "
"consenso distribuido. A diferencia de ellos,Taler se basa en firmas ciegas.</"
"p>"
-#: faq.html.j2:11
+#: faq.html.j2:13
msgid ""
"<p>It would be possible, however, to withdraw coins denominated in Bitcoin "
"into a Taler wallet (with an appropriate exchange), which would give some "
@@ -545,11 +475,11 @@ msgstr ""
"que lo permita), lo que otorgaría algunas ventajas sobre Bitcoin simple, "
"como por ejemplo, tiempos de confirmación instantánea.</p>"
-#: faq.html.j2:18
+#: faq.html.j2:20
msgid "Where is the balance in my wallet stored?"
msgstr "¿Dónde está almacenado el saldo de mi billetera electrónica?"
-#: faq.html.j2:19
+#: faq.html.j2:21
msgid ""
"<p>Your wallet stores digital coins and thus ultimately your computer holds "
"your balance. The exchange keeps funds matching all unspent coins in an "
@@ -560,11 +490,11 @@ msgstr ""
"equivalentes a las monedas no gastadas en una cuenta bancaria de fondos en "
"custodia.</p>"
-#: faq.html.j2:25
+#: faq.html.j2:27
msgid "What if my wallet is lost?"
msgstr "¿Qué pasa si mi billetera se pierde?"
-#: faq.html.j2:26
+#: faq.html.j2:28
msgid ""
"<p>Since the digital coins of value in your wallet are anonymized, the "
"exchange can not assist you in recovering a lost or stolen wallet. Just like "
@@ -575,7 +505,7 @@ msgstr ""
"billetera perdida o robada. Al igual que con una billetera física con dinero "
"en efectivo, usted es responsable de velar por su seguridad.</p>"
-#: faq.html.j2:32
+#: faq.html.j2:34
msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
"the balance reasonably low.</p>"
@@ -583,11 +513,11 @@ msgstr ""
"<p>El riesgo de perder una billetera puede mitigarse haciendo copias de "
"seguridad o manteniendo el saldo razonablemente bajo.</p>"
-#: faq.html.j2:37
+#: faq.html.j2:39
msgid "What if my computer is hacked?"
msgstr "¿Qué pasa si mi computadora es hackeada?"
-#: faq.html.j2:38
+#: faq.html.j2:40
msgid ""
"<p>In case of a compromise of one of your devices, an attacker can spend "
"coins from your wallet. Checking your balance might reveal to you that your "
@@ -597,11 +527,11 @@ msgstr ""
"gastar monedas de su billetera. La verificación de su saldo puede indicarle "
"que uno de sus dispositivos ha sido comprometido.</p>"
-#: faq.html.j2:44
+#: faq.html.j2:46
msgid "Can I send money to my friend with Taler?"
msgstr "¿Puedo enviar dinero a un amigo con Taler?"
-#: faq.html.j2:45
+#: faq.html.j2:47
msgid ""
"<p>If your friend provides goods or services for you in exchange for a "
"payment, they can easily set up a Taler merchant and receive the payment in "
@@ -611,7 +541,7 @@ msgstr ""
"puede habilitar fácilmente como un comerciante Taler y recibir el pago a su "
"cuenta bancaria.</p>"
-#: faq.html.j2:50
+#: faq.html.j2:52
msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins among "
"friends directly as well.</p>"
@@ -619,11 +549,11 @@ msgstr ""
"<p>Versiones futuras de la billetera Taler pueden permitir también el "
"intercambio de monedas directamente entre amigos.</p>"
-#: faq.html.j2:56
+#: faq.html.j2:58
msgid "How does Taler handle payments in different currencies?"
msgstr "¿Cómo maneja Taler los pagos en diferentes monedas?"
-#: faq.html.j2:57
+#: faq.html.j2:59
msgid ""
"<p>Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins.</p>"
@@ -631,15 +561,15 @@ msgstr ""
"<p>Las carpetas de Taler pueden almacenar monedas electrónicas "
"correspondientes a monedas diferentes, como euros, dólares o bitcoins.</p>"
-#: faq.html.j2:61
+#: faq.html.j2:63
msgid "<p>Taler currently does not offer conversion between currencies.</p>"
msgstr "<p>Actualmente Taler no ofrece conversiones entre monedas.</p>"
-#: faq.html.j2:65
+#: faq.html.j2:67
msgid "How does Taler protect my privacy?"
msgstr "¿De qué manera Taler protege mi privacidad?"
-#: faq.html.j2:66
+#: faq.html.j2:68
msgid ""
"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
@@ -652,11 +582,11 @@ msgstr ""
"ya que impide que se conozcan las monedas utilizadas o los clientes "
"involucrados.</p>"
-#: faq.html.j2:77
+#: faq.html.j2:79
msgid "How much does it cost?"
msgstr ""
-#: faq.html.j2:78
+#: faq.html.j2:80
msgid ""
"<p>The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -669,11 +599,11 @@ msgid ""
"regulator and could thus easily be 10x higher.</p>"
msgstr ""
-#: faq.html.j2:93
+#: faq.html.j2:95
msgid "Does Taler work with international payments?"
msgstr ""
-#: faq.html.j2:94
+#: faq.html.j2:96
msgid ""
"<p>Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -684,24 +614,24 @@ msgid ""
"future.</p>"
msgstr ""
-#: faq.html.j2:107
+#: faq.html.j2:109
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: faq.html.j2:108
+#: faq.html.j2:110
msgid ""
"<p>We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow.</p>"
msgstr ""
-#: faq.html.j2:116
+#: faq.html.j2:118
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: faq.html.j2:117
+#: faq.html.j2:119
msgid ""
"<p>The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -711,13 +641,13 @@ msgid ""
"Taler coins into regular bank money.</p>"
msgstr ""
-#: faq.html.j2:127
+#: faq.html.j2:129
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: faq.html.j2:128
+#: faq.html.j2:130
msgid ""
"<p>Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
@@ -726,11 +656,11 @@ msgid ""
"respective regulatory authorities, or even the general public.</p>"
msgstr ""
-#: faq.html.j2:138
+#: faq.html.j2:140
msgid "Are there any projects already using Taler?"
msgstr ""
-#: faq.html.j2:139
+#: faq.html.j2:141
msgid ""
"<p>We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -740,11 +670,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
msgstr ""
-#: faq.html.j2:151
+#: faq.html.j2:153
msgid "Does Taler support recurring payments?"
msgstr ""
-#: faq.html.j2:153
+#: faq.html.j2:155
msgid ""
"<p>Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1994,6 +1924,82 @@ msgstr "GNU Taler en la Prensa"
msgid "SchemaFuzz"
msgstr ""
+#: team.html.j2:16
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+"Responsable del mantenimiento de GNU. Especialista en seguridad de redes. "
+"Investigador en privacidad informática. Arquitecto de Software."
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+"Emprendedor, inversor, CIO seleccionado por la revista Fortune 100, Director "
+"de TI en diferentes industrias."
+
+#: team.html.j2:28
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Criptografía aplicada. Contacto para W3C &amp; Tor."
+
+#: team.html.j2:33
+msgid "Theoretical foundations."
+msgstr "Fundamentos teóricos."
+
+#: team.html.j2:38
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Fundador del proyecto GNU. Orientación ética y licencias."
+
+#: team.html.j2:45
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr "Estudiante de doctorado, INRIA."
+
+#: team.html.j2:55
+msgid "Software engineer."
+msgstr "Ingeniero de Software."
+
+#: team.html.j2:62
+msgid "Sustainable business development."
+msgstr "Desarrollo de negocios sostenibles."
+
+#: team.html.j2:66
+msgid "Software engineer. Works on libebics."
+msgstr "Ingeniero de Software. Trabaja en libebics."
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+msgid "Translator (Spanish)"
+msgstr "Traductor (español)"
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+msgid "Translator (Italian)"
+msgstr "Traductora (italiano)"
+
+#: team.html.j2:98
+msgid "Translator (German)"
+msgstr "Traductor (alemán)"
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr "Módulo de seguridad de hardware"
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr "Gestión de riesgos"
+
+#: team.html.j2:112
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
+
+#: team.html.j2:118
+msgid "Software engineer. Works on Android wallet."
+msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
+
#: common/base.j2:5
msgid "GNU Taler"
msgstr "GNU Taler"
@@ -2002,17 +2008,19 @@ msgstr "GNU Taler"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Reservas Electrónicas Gravales, Anónimas y Libres"
-#: common/footer.j2.inc:11
-msgid "About"
-msgstr "Acerca de GNU Taler"
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "El Equipo"
#: common/footer.j2.inc:12
msgid "Contact"
msgstr "Contacto"
#: common/footer.j2.inc:17
-msgid "For Investors"
-msgstr "Inversionistas"
+msgid "GSoc 2018"
+msgstr ""
#: common/footer.j2.inc:18
msgid "Developer Resources"
@@ -2026,7 +2034,13 @@ msgstr "Preguntas frecuentes"
msgid "Bibliography"
msgstr "Bibliografía"
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2039,18 +2053,18 @@ msgid "Features"
msgstr ""
#: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
msgstr ""
#: common/navigation.j2.inc:17
msgid "Docs"
msgstr ""
-#: common/navigation.j2.inc:18
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "El Equipo"
+#~ msgid "About"
+#~ msgstr "Acerca de GNU Taler"
+
+#~ msgid "For Investors"
+#~ msgstr "Inversionistas"
#~ msgid "Citizens"
#~ msgstr "Ciudadanos"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 554de076..40ec987f 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\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,94 +13,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:16
-#, fuzzy
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-"Mégalomane local, C'est à dire, qui voudrait créer un nouveau système de "
-"paiement et un nouvel Internet ?"
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-
-#: about.html.j2:28
-#, fuzzy
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "mathématicien"
-
-#: about.html.j2:33
-#, fuzzy
-msgid "Theoretical foundations."
-msgstr "Fatale (en théorie)"
-
-#: about.html.j2:38
-#, fuzzy
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Enthousiaste Ethique"
-
-#: about.html.j2:45
-#, fuzzy
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Principalement inoffensif"
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-
-#: about.html.j2:55
-#, fuzzy
-#| msgid "Software engineer. Works on libebics."
-msgid "Software engineer."
-msgstr "EBICS."
-
-#: about.html.j2:62
-#, fuzzy
-msgid "Sustainable business development."
-msgstr "Basse fréquence"
-
-#: about.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "EBICS."
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-#, fuzzy
-msgid "Translator (Spanish)"
-msgstr "Traductrice"
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-#, fuzzy
-msgid "Translator (Italian)"
-msgstr "Traductrice"
-
-#: about.html.j2:98
-#, fuzzy
-msgid "Translator (German)"
-msgstr "Traductrice"
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr ""
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr ""
-
-#: about.html.j2:112
-#, fuzzy
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
-
-#: about.html.j2:118
-#, fuzzy
-#| msgid "Software engineer. Works on libebics."
-msgid "Software engineer. Works on Android wallet."
-msgstr "EBICS."
-
#: architecture.html.j2:6
#, fuzzy
#| msgid "Taler system overview"
@@ -406,93 +318,94 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
msgstr ""
-#: faq.html.j2:11
+#: faq.html.j2:13
msgid ""
"<p>It would be possible, however, to withdraw coins denominated in Bitcoin "
"into a Taler wallet (with an appropriate exchange), which would give some "
"benefits over plain Bitcoin, such as instant confirmation times.</p>"
msgstr ""
-#: faq.html.j2:18
+#: faq.html.j2:20
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:19
+#: faq.html.j2:21
msgid ""
"<p>Your wallet stores digital coins and thus ultimately your computer holds "
"your balance. The exchange keeps funds matching all unspent coins in an "
"escrow bank account.</p>"
msgstr ""
-#: faq.html.j2:25
+#: faq.html.j2:27
msgid "What if my wallet is lost?"
msgstr ""
-#: faq.html.j2:26
+#: faq.html.j2:28
msgid ""
"<p>Since the digital coins of value in your wallet are anonymized, the "
"exchange can not assist you in recovering a lost or stolen wallet. Just like "
"with a physical wallet for cash, you are responsible for keeping it safe.</p>"
msgstr ""
-#: faq.html.j2:32
+#: faq.html.j2:34
msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
"the balance reasonably low.</p>"
msgstr ""
-#: faq.html.j2:37
+#: faq.html.j2:39
msgid "What if my computer is hacked?"
msgstr ""
-#: faq.html.j2:38
+#: faq.html.j2:40
msgid ""
"<p>In case of a compromise of one of your devices, an attacker can spend "
"coins from your wallet. Checking your balance might reveal to you that your "
"device has been compromised.</p>"
msgstr ""
-#: faq.html.j2:44
+#: faq.html.j2:46
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:45
+#: faq.html.j2:47
msgid ""
"<p>If your friend provides goods or services for you in exchange for a "
"payment, they can easily set up a Taler merchant and receive the payment in "
"their bank account.</p>"
msgstr ""
-#: faq.html.j2:50
+#: faq.html.j2:52
msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins among "
"friends directly as well.</p>"
msgstr ""
-#: faq.html.j2:56
+#: faq.html.j2:58
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:57
+#: faq.html.j2:59
msgid ""
"<p>Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins.</p>"
msgstr ""
-#: faq.html.j2:61
+#: faq.html.j2:63
msgid "<p>Taler currently does not offer conversion between currencies.</p>"
msgstr ""
-#: faq.html.j2:65
+#: faq.html.j2:67
msgid "How does Taler protect my privacy?"
msgstr ""
-#: faq.html.j2:66
+#: faq.html.j2:68
msgid ""
"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
@@ -500,11 +413,11 @@ msgid ""
"knowing which coin it signed for which customer.</p>"
msgstr ""
-#: faq.html.j2:77
+#: faq.html.j2:79
msgid "How much does it cost?"
msgstr ""
-#: faq.html.j2:78
+#: faq.html.j2:80
msgid ""
"<p>The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -517,11 +430,11 @@ msgid ""
"regulator and could thus easily be 10x higher.</p>"
msgstr ""
-#: faq.html.j2:93
+#: faq.html.j2:95
msgid "Does Taler work with international payments?"
msgstr ""
-#: faq.html.j2:94
+#: faq.html.j2:96
msgid ""
"<p>Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -532,24 +445,24 @@ msgid ""
"future.</p>"
msgstr ""
-#: faq.html.j2:107
+#: faq.html.j2:109
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: faq.html.j2:108
+#: faq.html.j2:110
msgid ""
"<p>We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow.</p>"
msgstr ""
-#: faq.html.j2:116
+#: faq.html.j2:118
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: faq.html.j2:117
+#: faq.html.j2:119
msgid ""
"<p>The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -559,13 +472,13 @@ msgid ""
"Taler coins into regular bank money.</p>"
msgstr ""
-#: faq.html.j2:127
+#: faq.html.j2:129
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: faq.html.j2:128
+#: faq.html.j2:130
msgid ""
"<p>Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
@@ -574,11 +487,11 @@ msgid ""
"respective regulatory authorities, or even the general public.</p>"
msgstr ""
-#: faq.html.j2:138
+#: faq.html.j2:140
msgid "Are there any projects already using Taler?"
msgstr ""
-#: faq.html.j2:139
+#: faq.html.j2:141
msgid ""
"<p>We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -588,11 +501,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
msgstr ""
-#: faq.html.j2:151
+#: faq.html.j2:153
msgid "Does Taler support recurring payments?"
msgstr ""
-#: faq.html.j2:153
+#: faq.html.j2:155
msgid ""
"<p>Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1574,6 +1487,94 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: team.html.j2:16
+#, fuzzy
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+"Mégalomane local, C'est à dire, qui voudrait créer un nouveau système de "
+"paiement et un nouvel Internet ?"
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+
+#: team.html.j2:28
+#, fuzzy
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "mathématicien"
+
+#: team.html.j2:33
+#, fuzzy
+msgid "Theoretical foundations."
+msgstr "Fatale (en théorie)"
+
+#: team.html.j2:38
+#, fuzzy
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Enthousiaste Ethique"
+
+#: team.html.j2:45
+#, fuzzy
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Principalement inoffensif"
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr ""
+
+#: team.html.j2:55
+#, fuzzy
+#| msgid "Software engineer. Works on libebics."
+msgid "Software engineer."
+msgstr "EBICS."
+
+#: team.html.j2:62
+#, fuzzy
+msgid "Sustainable business development."
+msgstr "Basse fréquence"
+
+#: team.html.j2:66
+msgid "Software engineer. Works on libebics."
+msgstr "EBICS."
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#, fuzzy
+msgid "Translator (Spanish)"
+msgstr "Traductrice"
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#, fuzzy
+msgid "Translator (Italian)"
+msgstr "Traductrice"
+
+#: team.html.j2:98
+#, fuzzy
+msgid "Translator (German)"
+msgstr "Traductrice"
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr ""
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr ""
+
+#: team.html.j2:112
+#, fuzzy
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
+
+#: team.html.j2:118
+#, fuzzy
+#| msgid "Software engineer. Works on libebics."
+msgid "Software engineer. Works on Android wallet."
+msgstr "EBICS."
+
#: common/base.j2:5
msgid "GNU Taler"
msgstr ""
@@ -1582,8 +1583,8 @@ msgstr ""
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr ""
-#: common/footer.j2.inc:11
-msgid "About"
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+msgid "Team"
msgstr ""
#: common/footer.j2.inc:12
@@ -1591,7 +1592,7 @@ msgid "Contact"
msgstr ""
#: common/footer.j2.inc:17
-msgid "For Investors"
+msgid "GSoc 2018"
msgstr ""
#: common/footer.j2.inc:18
@@ -1606,7 +1607,13 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -1617,17 +1624,13 @@ msgid "Features"
msgstr ""
#: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
msgstr ""
#: common/navigation.j2.inc:17
msgid "Docs"
msgstr ""
-#: common/navigation.j2.inc:18
-msgid "Team"
-msgstr ""
-
#, fuzzy
#~ msgid "Merchants"
#~ msgstr "Documentation"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 47b4d9d3..62de095b 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\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,95 +13,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:16
-#, fuzzy
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-"Ricercatore in reti e sicurezza, ingegnere del software; autore di software "
-"GNU"
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-"Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
-"diversi settori"
-
-#: about.html.j2:28
-#, fuzzy
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Matematico e crittografo. Attivo nel W3C &amp; Tor"
-
-#: about.html.j2:33
-#, fuzzy
-msgid "Theoretical foundations."
-msgstr "Teorica della sicurezza dei protocolli"
-
-#: about.html.j2:38
-#, fuzzy
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
-
-#: about.html.j2:45
-#, fuzzy
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-"Dottorando a Inria Rennes.. Programmatore e architetto del protocollo Taler."
-
-#: about.html.j2:55
-msgid "Software engineer."
-msgstr "Programmatore."
-
-#: about.html.j2:62
-msgid "Sustainable business development."
-msgstr "Sviluppo di business sostenibile."
-
-#: about.html.j2:66
-#, fuzzy
-msgid "Software engineer. Works on libebics."
-msgstr "Programmatore. Attualmente coinvolto in libebics."
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-#, fuzzy
-msgid "Translator (Spanish)"
-msgstr "Traduttore per lo spagnolo."
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-#, fuzzy
-msgid "Translator (Italian)"
-msgstr "Traduttrice per l'italiano."
-
-#: about.html.j2:98
-#, fuzzy
-msgid "Translator (German)"
-msgstr "Traduttore per lo spagnolo."
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr "Sicurezza hardware."
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr "Gestione del rischio."
-
-#: about.html.j2:112
-#, fuzzy
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr ""
-"Dottorando alla TU di Monaco di Baviera. Linux, FreeBSD, siti web e il deep "
-"state nel tempo libero."
-
-#: about.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
-
#: architecture.html.j2:6
msgid "Taler System Architecture"
msgstr "Architettura Taler"
@@ -528,17 +439,23 @@ msgid "How is Taler related to Bitcoin or Blockchains?"
msgstr "Com'è correlato Taler a Bitcoin o Blockchains?"
#: faq.html.j2:6
+#, fuzzy
+#| msgid ""
+#| "<p>Taler does not use any Blockchain technology or Bitcoin directly. "
+#| "Taler is not based on proof-of-work or any other distributed consensus "
+#| "mechanism. Instead Taler is based on blind signatures.</p>"
msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
msgstr ""
"<p>Taler non utilizza in maniera diretta nessuna tecnologia Blockchain o "
"Bitcoin. Taler non si basa su proof-of-work o qualsiasi altro modello di "
"consenso distribuito. Al contrario, esso è basato sulle firme cieche (blind "
"signatures).</p>"
-#: faq.html.j2:11
+#: faq.html.j2:13
msgid ""
"<p>It would be possible, however, to withdraw coins denominated in Bitcoin "
"into a Taler wallet (with an appropriate exchange), which would give some "
@@ -549,11 +466,11 @@ msgstr ""
"vantaggi rispetto al semplice Bitcoin, come ad esempio i tempi di conferma "
"immediati.</p>"
-#: faq.html.j2:18
+#: faq.html.j2:20
msgid "Where is the balance in my wallet stored?"
msgstr "Dov'è conservato il saldo nel mio portafoglio?"
-#: faq.html.j2:19
+#: faq.html.j2:21
msgid ""
"<p>Your wallet stores digital coins and thus ultimately your computer holds "
"your balance. The exchange keeps funds matching all unspent coins in an "
@@ -564,11 +481,11 @@ msgstr ""
"corrispondono a tutte le monete non spese in un conto bancario di garanzia.</"
"p>"
-#: faq.html.j2:25
+#: faq.html.j2:27
msgid "What if my wallet is lost?"
msgstr "Cosa accade se il mio portafoglio si perde? "
-#: faq.html.j2:26
+#: faq.html.j2:28
msgid ""
"<p>Since the digital coins of value in your wallet are anonymized, the "
"exchange can not assist you in recovering a lost or stolen wallet. Just like "
@@ -579,7 +496,7 @@ msgstr ""
"rubato. Proprio come accade con un portafoglio materiale per denaro "
"contante, sei tu responsabile per tenerlo al sicuro.</p>"
-#: faq.html.j2:32
+#: faq.html.j2:34
msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
"the balance reasonably low.</p>"
@@ -587,11 +504,11 @@ msgstr ""
"<p>Il rischio di perdere un portafoglio puà essere ridotto facendo backup o "
"mantenendo il saldo ragionevolmente basso.</p> "
-#: faq.html.j2:37
+#: faq.html.j2:39
msgid "What if my computer is hacked?"
msgstr "Cosa accade se il mio computer viene attaccato?"
-#: faq.html.j2:38
+#: faq.html.j2:40
msgid ""
"<p>In case of a compromise of one of your devices, an attacker can spend "
"coins from your wallet. Checking your balance might reveal to you that your "
@@ -601,11 +518,11 @@ msgstr ""
"spendere le monete del tuo portafoglio. Controllare il tuo saldo potrebbe "
"rivelarti se il tuo dispositivo è stato compromesso.</p>"
-#: faq.html.j2:44
+#: faq.html.j2:46
msgid "Can I send money to my friend with Taler?"
msgstr "Posso inviare denaro ai miei amici con Taler?"
-#: faq.html.j2:45
+#: faq.html.j2:47
msgid ""
"<p>If your friend provides goods or services for you in exchange for a "
"payment, they can easily set up a Taler merchant and receive the payment in "
@@ -615,7 +532,7 @@ msgstr ""
"possono facilmente creare un commerciante Taler e ricevere il pagamento nel "
"loro conto bancario.</p>"
-#: faq.html.j2:50
+#: faq.html.j2:52
msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins among "
"friends directly as well.</p>"
@@ -623,11 +540,11 @@ msgstr ""
"<p>Le versioni future del portafoglio Taler potranno consentire lo scambio "
"di monete anche direttamente tra amici.</p>"
-#: faq.html.j2:56
+#: faq.html.j2:58
msgid "How does Taler handle payments in different currencies?"
msgstr "Come gestisce Taler i pagamenti in valute diverse?"
-#: faq.html.j2:57
+#: faq.html.j2:59
msgid ""
"<p>Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins.</p>"
@@ -635,15 +552,15 @@ msgstr ""
"<p>I portafogli Taler possono contenere monete digitali corrispondenti a più "
"valute diverse, come l'Euro, il Dollaro americano o i Bitcoin.</p> "
-#: faq.html.j2:61
+#: faq.html.j2:63
msgid "<p>Taler currently does not offer conversion between currencies.</p>"
msgstr "<p>Al momento Taler non offre la conversione tra le valute.</p> "
-#: faq.html.j2:65
+#: faq.html.j2:67
msgid "How does Taler protect my privacy?"
msgstr "Come protegge Taler la mia privacy?"
-#: faq.html.j2:66
+#: faq.html.j2:68
msgid ""
"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
@@ -655,11 +572,11 @@ msgstr ""
"L'uso della blind signature protegge la tua privacy in quanto impedisce al "
"cambio di sapere quale moneta ha firmato e per quale cliente.</p> "
-#: faq.html.j2:77
+#: faq.html.j2:79
msgid "How much does it cost?"
msgstr ""
-#: faq.html.j2:78
+#: faq.html.j2:80
msgid ""
"<p>The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -672,11 +589,11 @@ msgid ""
"regulator and could thus easily be 10x higher.</p>"
msgstr ""
-#: faq.html.j2:93
+#: faq.html.j2:95
msgid "Does Taler work with international payments?"
msgstr ""
-#: faq.html.j2:94
+#: faq.html.j2:96
msgid ""
"<p>Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -687,24 +604,24 @@ msgid ""
"future.</p>"
msgstr ""
-#: faq.html.j2:107
+#: faq.html.j2:109
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: faq.html.j2:108
+#: faq.html.j2:110
msgid ""
"<p>We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow.</p>"
msgstr ""
-#: faq.html.j2:116
+#: faq.html.j2:118
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: faq.html.j2:117
+#: faq.html.j2:119
msgid ""
"<p>The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -714,13 +631,13 @@ msgid ""
"Taler coins into regular bank money.</p>"
msgstr ""
-#: faq.html.j2:127
+#: faq.html.j2:129
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: faq.html.j2:128
+#: faq.html.j2:130
msgid ""
"<p>Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
@@ -729,11 +646,11 @@ msgid ""
"respective regulatory authorities, or even the general public.</p>"
msgstr ""
-#: faq.html.j2:138
+#: faq.html.j2:140
msgid "Are there any projects already using Taler?"
msgstr ""
-#: faq.html.j2:139
+#: faq.html.j2:141
msgid ""
"<p>We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -743,11 +660,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
msgstr ""
-#: faq.html.j2:151
+#: faq.html.j2:153
msgid "Does Taler support recurring payments?"
msgstr ""
-#: faq.html.j2:153
+#: faq.html.j2:155
msgid ""
"<p>Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -2000,6 +1917,95 @@ msgstr "GNU Taler nella Stampa"
msgid "SchemaFuzz"
msgstr ""
+#: team.html.j2:16
+#, fuzzy
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+"Ricercatore in reti e sicurezza, ingegnere del software; autore di software "
+"GNU"
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+"Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
+"diversi settori"
+
+#: team.html.j2:28
+#, fuzzy
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Matematico e crittografo. Attivo nel W3C &amp; Tor"
+
+#: team.html.j2:33
+#, fuzzy
+msgid "Theoretical foundations."
+msgstr "Teorica della sicurezza dei protocolli"
+
+#: team.html.j2:38
+#, fuzzy
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
+
+#: team.html.j2:45
+#, fuzzy
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr ""
+"Dottorando a Inria Rennes.. Programmatore e architetto del protocollo Taler."
+
+#: team.html.j2:55
+msgid "Software engineer."
+msgstr "Programmatore."
+
+#: team.html.j2:62
+msgid "Sustainable business development."
+msgstr "Sviluppo di business sostenibile."
+
+#: team.html.j2:66
+#, fuzzy
+msgid "Software engineer. Works on libebics."
+msgstr "Programmatore. Attualmente coinvolto in libebics."
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+#, fuzzy
+msgid "Translator (Spanish)"
+msgstr "Traduttore per lo spagnolo."
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+#, fuzzy
+msgid "Translator (Italian)"
+msgstr "Traduttrice per l'italiano."
+
+#: team.html.j2:98
+#, fuzzy
+msgid "Translator (German)"
+msgstr "Traduttore per lo spagnolo."
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr "Sicurezza hardware."
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr "Gestione del rischio."
+
+#: team.html.j2:112
+#, fuzzy
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr ""
+"Dottorando alla TU di Monaco di Baviera. Linux, FreeBSD, siti web e il deep "
+"state nel tempo libero."
+
+#: team.html.j2:118
+msgid "Software engineer. Works on Android wallet."
+msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
+
#: common/base.j2:5
msgid "GNU Taler"
msgstr "GNU Taler"
@@ -2008,17 +2014,19 @@ msgstr "GNU Taler"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Tassabili Anonime Libere Elettroniche Riserve"
-#: common/footer.j2.inc:11
-msgid "About"
-msgstr "Chi siamo"
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "La Squadra"
#: common/footer.j2.inc:12
msgid "Contact"
msgstr "Contatti"
#: common/footer.j2.inc:17
-msgid "For Investors"
-msgstr "Per gli investitori"
+msgid "GSoc 2018"
+msgstr ""
#: common/footer.j2.inc:18
msgid "Developer Resources"
@@ -2034,7 +2042,13 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2047,18 +2061,18 @@ msgid "Features"
msgstr ""
#: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
msgstr ""
#: common/navigation.j2.inc:17
msgid "Docs"
msgstr ""
-#: common/navigation.j2.inc:18
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "La Squadra"
+#~ msgid "About"
+#~ msgstr "Chi siamo"
+
+#~ msgid "For Investors"
+#~ msgstr "Per gli investitori"
#~ msgid "Citizens"
#~ msgstr "Cittadini"
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index a6afab1a..9fa22d1e 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\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,83 +18,6 @@ msgstr ""
"X-Generator: Virtaal 1.0.0-beta1\n"
"Generated-By: Babel 2.5.3\n"
-#: about.html.j2:16
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-"Mantenedor do GNU. Pesquisador de segurança de rede &amp; privacidade. "
-"Arquiteto de software."
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-"Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
-"diferentes indústrias, …."
-
-#: about.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Criptografia aplicada. Contato para W3c &amp; Tor."
-
-#: about.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Fundações teóricas."
-
-#: about.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Fundador do projeto GNU. Orientação ética e licenciamento."
-
-#: about.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr ""
-"Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Estudante de PhD, Inria."
-
-#: about.html.j2:55
-msgid "Software engineer."
-msgstr "Engenheiro de software."
-
-#: about.html.j2:62
-msgid "Sustainable business development."
-msgstr "Desenvolvimento empresarial sustentável."
-
-#: about.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Engenheiro de software. Funciona em libebics."
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-msgid "Translator (Spanish)"
-msgstr "Tradutor (Espanhol)"
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-msgid "Translator (Italian)"
-msgstr "Tradutor (Italiano)"
-
-#: about.html.j2:98
-msgid "Translator (German)"
-msgstr "Tradutor (Alemão)"
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr "Módulo de segurança de hardware"
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr "Gerenciamento de risco"
-
-#: about.html.j2:112
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr "Estudante PhD, Universidade Técnica de Munique. Atualmente lecionando."
-
-#: about.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
-
#: architecture.html.j2:6
msgid "Taler System Architecture"
msgstr "Arquitetura do sistema Taler"
@@ -514,17 +437,23 @@ msgid "How is Taler related to Bitcoin or Blockchains?"
msgstr "Como o Taler está relacionado com Bitcoin ou Blockchains?"
#: faq.html.j2:6
+#, fuzzy
+#| msgid ""
+#| "<p>Taler does not use any Blockchain technology or Bitcoin directly. "
+#| "Taler is not based on proof-of-work or any other distributed consensus "
+#| "mechanism. Instead Taler is based on blind signatures.</p>"
msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
msgstr ""
"<p>Taler não usa nenhuma tecnologia de Blockchain ou Bitcoin diretamente. O "
"Taler não é baseado na prova de trabalho ou em qualquer outro mecanismo de "
"consenso distribuído. Em vez disso, o Taler é baseado em assinaturas cegas.</"
"p>"
-#: faq.html.j2:11
+#: faq.html.j2:13
msgid ""
"<p>It would be possible, however, to withdraw coins denominated in Bitcoin "
"into a Taler wallet (with an appropriate exchange), which would give some "
@@ -534,11 +463,11 @@ msgstr ""
"carteira do Taler (com um câmbio apropriado), o que daria alguns benefícios "
"sobre o Bitcoin simples, como os tempos de confirmação instantânea.</p>"
-#: faq.html.j2:18
+#: faq.html.j2:20
msgid "Where is the balance in my wallet stored?"
msgstr "Onde é armazenado o saldo da minha carteira?"
-#: faq.html.j2:19
+#: faq.html.j2:21
msgid ""
"<p>Your wallet stores digital coins and thus ultimately your computer holds "
"your balance. The exchange keeps funds matching all unspent coins in an "
@@ -548,11 +477,11 @@ msgstr ""
"mantém seu saldo. O câmbio mantém os fundos correspondentes a todas as "
"moedas não gastadas em uma conta bancária em depósito.</p>"
-#: faq.html.j2:25
+#: faq.html.j2:27
msgid "What if my wallet is lost?"
msgstr "E se minha carteira for perdida?"
-#: faq.html.j2:26
+#: faq.html.j2:28
msgid ""
"<p>Since the digital coins of value in your wallet are anonymized, the "
"exchange can not assist you in recovering a lost or stolen wallet. Just like "
@@ -563,7 +492,7 @@ msgstr ""
"como com uma carteira física para dinheiro, você é responsável por mantê-lo "
"seguro.</p>"
-#: faq.html.j2:32
+#: faq.html.j2:34
msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
"the balance reasonably low.</p>"
@@ -571,11 +500,11 @@ msgstr ""
"<p>O risco de perder uma carteira pode ser mitigado fazendo backups ou "
"mantendo o saldo razoavelmente baixo.</p>"
-#: faq.html.j2:37
+#: faq.html.j2:39
msgid "What if my computer is hacked?"
msgstr "E se meu computador for hackeado?"
-#: faq.html.j2:38
+#: faq.html.j2:40
msgid ""
"<p>In case of a compromise of one of your devices, an attacker can spend "
"coins from your wallet. Checking your balance might reveal to you that your "
@@ -585,11 +514,11 @@ msgstr ""
"pode gastar moedas da sua carteira. Verificar seu equilíbrio pode revelar "
"que seu dispositivo foi comprometido.</p>"
-#: faq.html.j2:44
+#: faq.html.j2:46
msgid "Can I send money to my friend with Taler?"
msgstr "Posso enviar moeda para meu amigo com Taler?"
-#: faq.html.j2:45
+#: faq.html.j2:47
msgid ""
"<p>If your friend provides goods or services for you in exchange for a "
"payment, they can easily set up a Taler merchant and receive the payment in "
@@ -599,7 +528,7 @@ msgstr ""
"pagamento, eles podem configurar facilmente um comerciante no Taler e "
"receber o pagamento em sua conta bancária.</p>"
-#: faq.html.j2:50
+#: faq.html.j2:52
msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins among "
"friends directly as well.</p>"
@@ -607,11 +536,11 @@ msgstr ""
"<p>As versões futuras da carteira do Taler podem permitir também trocar "
"moedas entre amigos.</p>"
-#: faq.html.j2:56
+#: faq.html.j2:58
msgid "How does Taler handle payments in different currencies?"
msgstr "Como o Taler lida com pagamentos em diferentes moedas?"
-#: faq.html.j2:57
+#: faq.html.j2:59
msgid ""
"<p>Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins.</p>"
@@ -619,15 +548,15 @@ msgstr ""
"<p>As carteiras do Taler podem armazenar moedas digitais correspondentes a "
"várias moedas diferentes, como o Euro, Dólares dos EUA ou Bitcoins.</p>"
-#: faq.html.j2:61
+#: faq.html.j2:63
msgid "<p>Taler currently does not offer conversion between currencies.</p>"
msgstr "<p>O Taler atualmente não oferece conversão entre moedas.</p>"
-#: faq.html.j2:65
+#: faq.html.j2:67
msgid "How does Taler protect my privacy?"
msgstr "Como o Taler protege minha privacidade?"
-#: faq.html.j2:66
+#: faq.html.j2:68
msgid ""
"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
@@ -639,11 +568,11 @@ msgstr ""
"O uso de uma assinatura cega protege sua privacidade, pois impede o câmbio "
"de saber qual moeda assinou para qual cliente.</p>"
-#: faq.html.j2:77
+#: faq.html.j2:79
msgid "How much does it cost?"
msgstr ""
-#: faq.html.j2:78
+#: faq.html.j2:80
msgid ""
"<p>The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -656,11 +585,11 @@ msgid ""
"regulator and could thus easily be 10x higher.</p>"
msgstr ""
-#: faq.html.j2:93
+#: faq.html.j2:95
msgid "Does Taler work with international payments?"
msgstr ""
-#: faq.html.j2:94
+#: faq.html.j2:96
msgid ""
"<p>Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -671,24 +600,24 @@ msgid ""
"future.</p>"
msgstr ""
-#: faq.html.j2:107
+#: faq.html.j2:109
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: faq.html.j2:108
+#: faq.html.j2:110
msgid ""
"<p>We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow.</p>"
msgstr ""
-#: faq.html.j2:116
+#: faq.html.j2:118
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: faq.html.j2:117
+#: faq.html.j2:119
msgid ""
"<p>The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -698,13 +627,13 @@ msgid ""
"Taler coins into regular bank money.</p>"
msgstr ""
-#: faq.html.j2:127
+#: faq.html.j2:129
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: faq.html.j2:128
+#: faq.html.j2:130
msgid ""
"<p>Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
@@ -713,11 +642,11 @@ msgid ""
"respective regulatory authorities, or even the general public.</p>"
msgstr ""
-#: faq.html.j2:138
+#: faq.html.j2:140
msgid "Are there any projects already using Taler?"
msgstr ""
-#: faq.html.j2:139
+#: faq.html.j2:141
msgid ""
"<p>We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -727,11 +656,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
msgstr ""
-#: faq.html.j2:151
+#: faq.html.j2:153
msgid "Does Taler support recurring payments?"
msgstr ""
-#: faq.html.j2:153
+#: faq.html.j2:155
msgid ""
"<p>Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1958,6 +1887,83 @@ msgstr "GNU Taler na imprensa"
msgid "SchemaFuzz"
msgstr ""
+#: team.html.j2:16
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+"Mantenedor do GNU. Pesquisador de segurança de rede &amp; privacidade. "
+"Arquiteto de software."
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+"Empreendedor, Investidor, CIO de Fortune 100, diretor de empresa de TI em "
+"diferentes indústrias, …."
+
+#: team.html.j2:28
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Criptografia aplicada. Contato para W3c &amp; Tor."
+
+#: team.html.j2:33
+msgid "Theoretical foundations."
+msgstr "Fundações teóricas."
+
+#: team.html.j2:38
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Fundador do projeto GNU. Orientação ética e licenciamento."
+
+#: team.html.j2:45
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+"Estudante de PhD, Universidade Técnica de Munique. Atualmente lecionando."
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr "Estudante de PhD, Inria."
+
+#: team.html.j2:55
+msgid "Software engineer."
+msgstr "Engenheiro de software."
+
+#: team.html.j2:62
+msgid "Sustainable business development."
+msgstr "Desenvolvimento empresarial sustentável."
+
+#: team.html.j2:66
+msgid "Software engineer. Works on libebics."
+msgstr "Engenheiro de software. Funciona em libebics."
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+msgid "Translator (Spanish)"
+msgstr "Tradutor (Espanhol)"
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+msgid "Translator (Italian)"
+msgstr "Tradutor (Italiano)"
+
+#: team.html.j2:98
+msgid "Translator (German)"
+msgstr "Tradutor (Alemão)"
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr "Módulo de segurança de hardware"
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr "Gerenciamento de risco"
+
+#: team.html.j2:112
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr "Estudante PhD, Universidade Técnica de Munique. Atualmente lecionando."
+
+#: team.html.j2:118
+msgid "Software engineer. Works on Android wallet."
+msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
+
#: common/base.j2:5
msgid "GNU Taler"
msgstr "GNU Taler"
@@ -1966,17 +1972,19 @@ msgstr "GNU Taler"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Reservas eletrônicas livres, anônimas, tributáveis"
-#: common/footer.j2.inc:11
-msgid "About"
-msgstr "Sobre"
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#, fuzzy
+#| msgid "The Team"
+msgid "Team"
+msgstr "A equipe"
#: common/footer.j2.inc:12
msgid "Contact"
msgstr "Contato"
#: common/footer.j2.inc:17
-msgid "For Investors"
-msgstr "Para investidores"
+msgid "GSoc 2018"
+msgstr ""
#: common/footer.j2.inc:18
msgid "Developer Resources"
@@ -1990,7 +1998,13 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2003,18 +2017,18 @@ msgid "Features"
msgstr ""
#: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
msgstr ""
#: common/navigation.j2.inc:17
msgid "Docs"
msgstr ""
-#: common/navigation.j2.inc:18
-#, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "A equipe"
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "For Investors"
+#~ msgstr "Para investidores"
#~ msgid "Citizens"
#~ msgstr "Cidadãos"
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 52b3d6dc..e05e3a4c 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\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,78 +19,6 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"Generated-By: Babel 2.5.1\n"
-#: about.html.j2:16
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-
-#: about.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr ""
-
-#: about.html.j2:33
-msgid "Theoretical foundations."
-msgstr ""
-
-#: about.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr ""
-
-#: about.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr ""
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr ""
-
-#: about.html.j2:55
-msgid "Software engineer."
-msgstr ""
-
-#: about.html.j2:62
-msgid "Sustainable business development."
-msgstr ""
-
-#: about.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr ""
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-msgid "Translator (Spanish)"
-msgstr ""
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-msgid "Translator (Italian)"
-msgstr ""
-
-#: about.html.j2:98
-msgid "Translator (German)"
-msgstr ""
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr ""
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr ""
-
-#: about.html.j2:112
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr ""
-
-#: about.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr ""
-
#: architecture.html.j2:6
msgid "Taler System Architecture"
msgstr ""
@@ -392,93 +320,94 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
msgstr ""
-#: faq.html.j2:11
+#: faq.html.j2:13
msgid ""
"<p>It would be possible, however, to withdraw coins denominated in Bitcoin "
"into a Taler wallet (with an appropriate exchange), which would give some "
"benefits over plain Bitcoin, such as instant confirmation times.</p>"
msgstr ""
-#: faq.html.j2:18
+#: faq.html.j2:20
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:19
+#: faq.html.j2:21
msgid ""
"<p>Your wallet stores digital coins and thus ultimately your computer holds "
"your balance. The exchange keeps funds matching all unspent coins in an "
"escrow bank account.</p>"
msgstr ""
-#: faq.html.j2:25
+#: faq.html.j2:27
msgid "What if my wallet is lost?"
msgstr ""
-#: faq.html.j2:26
+#: faq.html.j2:28
msgid ""
"<p>Since the digital coins of value in your wallet are anonymized, the "
"exchange can not assist you in recovering a lost or stolen wallet. Just like "
"with a physical wallet for cash, you are responsible for keeping it safe.</p>"
msgstr ""
-#: faq.html.j2:32
+#: faq.html.j2:34
msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
"the balance reasonably low.</p>"
msgstr ""
-#: faq.html.j2:37
+#: faq.html.j2:39
msgid "What if my computer is hacked?"
msgstr ""
-#: faq.html.j2:38
+#: faq.html.j2:40
msgid ""
"<p>In case of a compromise of one of your devices, an attacker can spend "
"coins from your wallet. Checking your balance might reveal to you that your "
"device has been compromised.</p>"
msgstr ""
-#: faq.html.j2:44
+#: faq.html.j2:46
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:45
+#: faq.html.j2:47
msgid ""
"<p>If your friend provides goods or services for you in exchange for a "
"payment, they can easily set up a Taler merchant and receive the payment in "
"their bank account.</p>"
msgstr ""
-#: faq.html.j2:50
+#: faq.html.j2:52
msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins among "
"friends directly as well.</p>"
msgstr ""
-#: faq.html.j2:56
+#: faq.html.j2:58
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:57
+#: faq.html.j2:59
msgid ""
"<p>Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins.</p>"
msgstr ""
-#: faq.html.j2:61
+#: faq.html.j2:63
msgid "<p>Taler currently does not offer conversion between currencies.</p>"
msgstr ""
-#: faq.html.j2:65
+#: faq.html.j2:67
msgid "How does Taler protect my privacy?"
msgstr ""
-#: faq.html.j2:66
+#: faq.html.j2:68
msgid ""
"<p>Your wallet stores digital coins that are <a href=\"https://en.wikipedia."
"org/wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a "
@@ -486,11 +415,11 @@ msgid ""
"knowing which coin it signed for which customer.</p>"
msgstr ""
-#: faq.html.j2:77
+#: faq.html.j2:79
msgid "How much does it cost?"
msgstr ""
-#: faq.html.j2:78
+#: faq.html.j2:80
msgid ""
"<p>The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -503,11 +432,11 @@ msgid ""
"regulator and could thus easily be 10x higher.</p>"
msgstr ""
-#: faq.html.j2:93
+#: faq.html.j2:95
msgid "Does Taler work with international payments?"
msgstr ""
-#: faq.html.j2:94
+#: faq.html.j2:96
msgid ""
"<p>Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -518,24 +447,24 @@ msgid ""
"future.</p>"
msgstr ""
-#: faq.html.j2:107
+#: faq.html.j2:109
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: faq.html.j2:108
+#: faq.html.j2:110
msgid ""
"<p>We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow.</p>"
msgstr ""
-#: faq.html.j2:116
+#: faq.html.j2:118
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: faq.html.j2:117
+#: faq.html.j2:119
msgid ""
"<p>The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -545,13 +474,13 @@ msgid ""
"Taler coins into regular bank money.</p>"
msgstr ""
-#: faq.html.j2:127
+#: faq.html.j2:129
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: faq.html.j2:128
+#: faq.html.j2:130
msgid ""
"<p>Any exchange should be audited by one or more independent auditors. "
"Merchants and consumer wallets will report certain issues automatically to "
@@ -560,11 +489,11 @@ msgid ""
"respective regulatory authorities, or even the general public.</p>"
msgstr ""
-#: faq.html.j2:138
+#: faq.html.j2:140
msgid "Are there any projects already using Taler?"
msgstr ""
-#: faq.html.j2:139
+#: faq.html.j2:141
msgid ""
"<p>We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -574,11 +503,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
msgstr ""
-#: faq.html.j2:151
+#: faq.html.j2:153
msgid "Does Taler support recurring payments?"
msgstr ""
-#: faq.html.j2:153
+#: faq.html.j2:155
msgid ""
"<p>Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1550,6 +1479,78 @@ msgstr ""
msgid "SchemaFuzz"
msgstr ""
+#: team.html.j2:16
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+
+#: team.html.j2:28
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr ""
+
+#: team.html.j2:33
+msgid "Theoretical foundations."
+msgstr ""
+
+#: team.html.j2:38
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr ""
+
+#: team.html.j2:45
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr ""
+
+#: team.html.j2:55
+msgid "Software engineer."
+msgstr ""
+
+#: team.html.j2:62
+msgid "Sustainable business development."
+msgstr ""
+
+#: team.html.j2:66
+msgid "Software engineer. Works on libebics."
+msgstr ""
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+msgid "Translator (Spanish)"
+msgstr ""
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+msgid "Translator (Italian)"
+msgstr ""
+
+#: team.html.j2:98
+msgid "Translator (German)"
+msgstr ""
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr ""
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr ""
+
+#: team.html.j2:112
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr ""
+
+#: team.html.j2:118
+msgid "Software engineer. Works on Android wallet."
+msgstr ""
+
#: common/base.j2:5
msgid "GNU Taler"
msgstr ""
@@ -1558,8 +1559,8 @@ msgstr ""
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr ""
-#: common/footer.j2.inc:11
-msgid "About"
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+msgid "Team"
msgstr ""
#: common/footer.j2.inc:12
@@ -1567,7 +1568,7 @@ msgid "Contact"
msgstr ""
#: common/footer.j2.inc:17
-msgid "For Investors"
+msgid "GSoc 2018"
msgstr ""
#: common/footer.j2.inc:18
@@ -1582,7 +1583,13 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -1593,13 +1600,9 @@ msgid "Features"
msgstr ""
#: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
msgstr ""
#: common/navigation.j2.inc:17
msgid "Docs"
msgstr ""
-
-#: common/navigation.j2.inc:18
-msgid "Team"
-msgstr ""