diff options
Diffstat (limited to 'template')
-rw-r--r-- | template/contact.html.j2 | 121 | ||||
-rw-r--r-- | template/copyright.html.j2 | 4 | ||||
-rw-r--r-- | template/developers.html.j2 | 36 | ||||
-rw-r--r-- | template/docs.html.j2 | 54 | ||||
-rw-r--r-- | template/faq.html.j2 | 386 | ||||
-rw-r--r-- | template/features.html.j2 | 3 | ||||
-rw-r--r-- | template/gsoc-codeless.html.j2 | 28 | ||||
-rw-r--r-- | template/index.html.j2 | 17 | ||||
-rw-r--r-- | template/investors.html.j2 | 1 | ||||
-rw-r--r-- | template/news.html.j2 | 2 | ||||
-rw-r--r-- | template/press.html.j2 | 8 | ||||
-rw-r--r-- | template/principles.html.j2 | 2 | ||||
-rw-r--r-- | template/team.html.j2 | 6 |
13 files changed, 340 insertions, 328 deletions
diff --git a/template/contact.html.j2 b/template/contact.html.j2 index 67d66858..91c7abe8 100644 --- a/template/contact.html.j2 +++ b/template/contact.html.j2 @@ -1,70 +1,75 @@ {% extends "common/base.j2" %} {% block body_content %} -<div class="jumbotron"> - <div class="container text-center"> - <h1>{{ _("Contact information") }}</h1> + <div class="jumbotron"> + <div class="container text-center"> + <h1>{{ _("Contact information") }}</h1> + </div> </div> -</div> -<div class="container"> -<div class="row"> - <div class="col-lg-4"> - <h2>{{ _("The mailing list") }}</h2> - <p> - {% trans %} - An archived, public mailing list for GNU Taler is - hosted at - <a href="https://lists.gnu.org/mailman/listinfo/taler">https://lists.gnu.org/mailman/listinfo/taler</a>. - You can send messages to the list at + <div class="container"> + <div class="row"> + <div class="col-lg-4"> + <h2>{{ _("The mailing list") }}</h2> + <p> + {% trans %} + An archived, public mailing list for GNU Taler is + hosted at + {% endtrans %} + <a href="https://lists.gnu.org/mailman/listinfo/taler">https://lists.gnu.org/mailman/listinfo/taler</a> + (<a href="https://lists.gnu.org/archive/html/taler/">{{ _("archive")}}</a>). + {% trans %} + You can send messages to the list at + {% endtrans %} <a href="mailto:taler@gnu.org">taler@gnu.org</a>. - {% endtrans %} - </p> - </div> + </p> + </div> - <div class="col-lg-4"> - <h2>{{ _("Contacting individuals") }}</h2> - <p> - {% trans %} - Team members are generally reachable at - <tt>LASTNAME@taler.net</tt>. All of us - support receiving GnuPG encrypted e-mails. - {% endtrans %} - </p> - </div> + <div class="col-lg-4"> + <h2>{{ _("Contacting individuals") }}</h2> + <p> + {% trans %} + Team members are generally reachable at + <tt>LASTNAME@taler.net</tt>. All of us + support receiving GnuPG encrypted e-mails. + {% endtrans %} + </p> + </div> - <div class="col-lg-4"> - <h2>{{ _("General inquiries") }}</h2> - <p> - {% trans %} - You can reach a group of team members handling - general inquiries at <tt>contact AT taler.net</tt>. - {% endtrans %} - </p> - </div> + <div class="col-lg-4"> + <h2>{{ _("General inquiries") }}</h2> + <p> + {% trans %} + You can reach a group of team members handling + general inquiries at <tt>contact AT taler.net</tt>. + {% endtrans %} + </p> + </div> - <div class="col-lg-6"> - <h2>{{ _("Reporting bugs") }}</h2> - <p> - {% trans %} - We track open feature requests and bugs in our - <a href="https://gnunet.org/bugs/">Bug tracker</a>, - which is shared with the GNUnet project. - You can also report bugs or feature requests to the - mailing list. - {% endtrans %} - </p> - </div> + <div class="col-lg-6"> + <h2>{{ _("Reporting bugs") }}</h2> + <p> + {% trans %} + We track open feature requests and bugs in our + {% endtrans %} + <a href="https://gnunet.org/bugs/">{{ _("Bug tracker")}}</a>, + {% trans %} + which is shared with the GNUnet project. + You can also report bugs or feature requests to the + mailing list. + {% endtrans %} + </p> + </div> - <div class="col-lg-6"> - <h2>{{ _("Executive team") }}</h2> - <p> - {% trans %} - For non-technical commercial requests, please contact - <tt>ceo AT taler.net</tt>. - {% endtrans %} - </p> + <div class="col-lg-6"> + <h2>{{ _("Executive team") }}</h2> + <p> + {% trans %} + For non-technical commercial requests, please contact + <tt>ceo AT taler.net</tt>. + {% endtrans %} + </p> + </div> + </div> </div> -</div> -</div> {% endblock body_content %} diff --git a/template/copyright.html.j2 b/template/copyright.html.j2 index 7efe0560..8ce7357b 100644 --- a/template/copyright.html.j2 +++ b/template/copyright.html.j2 @@ -11,7 +11,9 @@ <a href="/pdf/copyright.pdf">copyright assignment</a> to ensure that the {% endtrans %} - <a href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative development</a> + <a href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"> + GNUnet e.V. --- Taler Systems SA {{ _("agreement on licensing and collaborative development")}} + </a> {% trans %} of the GNUnet and GNU Taler projects is satisfied. {% endtrans %} diff --git a/template/developers.html.j2 b/template/developers.html.j2 index 2fb4982d..0fc1f67a 100644 --- a/template/developers.html.j2 +++ b/template/developers.html.j2 @@ -68,12 +68,10 @@ {% endtrans %} <a href="https://gnunet.org/">GNUnet</a>. {% trans %} - However, - contributions from anyone are welcome. Our Git - repositories can be cloned using the Git and HTTP - access methods against <tt>git.taler.net</tt> with - the name of the respective repository. A list of - repositories can be found in our + However, contributions from anyone are welcome. Our Git + repositories can be cloned using the Git and HTTP access methods + against <tt>git.taler.net</tt> with the name of the respective + repository. A list of repositories can be found in our {% endtrans %} <a href="https://git.taler.net/">GitWeb</a>. </p> @@ -85,26 +83,15 @@ {% trans %} In addition to this website, the {% endtrans %} - <a href="https://git.taler.net/"> - {% trans %} - documented code - {% endtrans %} - </a> + <a href="https://git.taler.net/">{{ _("documented code")}}</a> {% trans %} and the {% endtrans %} - <a href="https://docs.taler.net/"> - {% trans %} - API documentation - {% endtrans %} - </a>. + <a href="https://docs.taler.net/">{{ _("API documentation")}}</a>. {% trans %} Technical papers can be found in our {% endtrans %} - <a href="bibliography.html"> - {% trans %} - bibliography</a>. - {% endtrans %} + <a href="bibliography.html">{{ _("bibliography")}}</a>. </p> </div> <div class="col-lg-4"> @@ -125,7 +112,10 @@ <p> {% trans %} - We have <a href="https://buildbot.net/">Buildbot</a> + We have + {% endtrans %} + <a href="https://buildbot.net/">Buildbot</a> + {% trans %} automation tests to detect regressions and check for portability at {% endtrans %} @@ -138,7 +128,9 @@ <p> {% trans %} We use - <a href="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</a> + {% endtrans %} + <a href="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</a> + {% trans %} to analyze the code coverage of our tests, the results are available at {% endtrans %} diff --git a/template/docs.html.j2 b/template/docs.html.j2 index 233097cc..83fa2e53 100644 --- a/template/docs.html.j2 +++ b/template/docs.html.j2 @@ -4,15 +4,16 @@ <div class="container"> <div class="row"> <div class="col"> - <h1>GNU Taler: Documentation and Resources</h1> + <h1>{{ _("GNU Taler: Documentation and Resources")}}</h1> </div> </div> <div class="row"> <div class="col"> {% trans %} - This is an overview of documentation and other resources for GNU Taler. The full documentation - contents can be found <a href="https://docs.taler.net/">here</a>. + This is an overview of documentation and other resources for GNU Taler. + The full documentation contents can be found + <a href="https://docs.taler.net/">here</a>. {% endtrans %} </div> </div> @@ -23,7 +24,7 @@ <div class="row justify-content-center text-center"> <div class="col-8"> - <h2>Components</h2> + <h2>{{ _("Components")}}</h2> </div> </div> @@ -34,10 +35,13 @@ <div class="col-3"> <a href="https://{{ docshost }}/taler-merchant-manual.html"> <img src="../icons/icon-backend.svg" height=60> - <h3>Merchant Backend Administration</h3> + <h3>{{ _("Merchant Backend Administration")}}</h3> </a> - {{ _("Tutorial and manual for operating a merchant") }}. - {{ _("Also available as") }} <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>. + {% trans %} + Tutorial and manual for operating a merchant. + Also available as + {% endtrans %} + <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>. </div> <div class="col-3"> @@ -48,20 +52,20 @@ {% trans %} Tutorial for processing Taler payments using the merchant backend API. Also available as - <a href="https://{{ docshost }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>. {% endtrans %} + <a href="https://{{ docshost }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>. </div> <div class="col-3"> <a href="https://{{ docshost }}/taler-exchange-manual.html"> <img src="../icons/icon-exchange.svg" height=60> - <h3>Exchange</h3> + <h3>{{ _("Exchange")}}</h3> </a> {% trans %} Operator's manual for the GNU Taler exchange. Also available as - <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>. {% endtrans %} + <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>. </div> <div class="col-3"> @@ -72,8 +76,8 @@ {% trans %} Manual for tightly integrating Taler with banking applications. Also available as - <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>. {% endtrans %} + <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>. </div> </div> @@ -90,8 +94,8 @@ {% trans %} Manual to run the back-office Web application. Also available as - <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>. {% endtrans %} + <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>. </div> </div> @@ -100,7 +104,7 @@ <div class="row justify-content-center text-center"> <div class="col-8"> - <h2>Internals</h2> + <h2>{{ _("Internals")}}</h2> </div> </div> @@ -111,21 +115,23 @@ <div class="col-3"> <a href="https://{{ docshost }}/core/index.html"> <img src="../icons/icon-api.svg" height=60> - <h3>HTTP API</h3> + <h3>{{ _("HTTP API")}}</h3> </a> - {{ _("Reference for the HTTP-based API for Taler components.") }} - </div> + {% trans %} + Reference for the HTTP-based API for Taler components. + {% endtrans %} + </div> <div class="col-3"> <a href="https://{{ docshost }}/onboarding.html"> <img src="../icons/icon-developers.svg" height=60> - <h3>Onboarding</h3> + <h3>{{ _("Onboarding")}}</h3> </a> {% trans %} Description of our taler.net setup and how to contribute. Also available as - <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>. - {% endtrans %} + {% endtrans %} + <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>. </div> </div> @@ -134,7 +140,7 @@ <div class="row justify-content-center text-center"> <div class="col-8"> - <h2>Community</h2> + <h2>{{ _("Community")}}</h2> </div> </div> @@ -145,7 +151,7 @@ <div class="col-3"> <a href="https://lists.gnu.org/mailman/listinfo/taler"> <img src="../icons/icon-share.svg" height=60> - <h3>Mailing List</h3> + <h3>{{ _("Mailing List")}}</h3> </a> {{ _("The official GNU Taler mailing list.") }} </div> @@ -153,7 +159,7 @@ <div class="col-3"> <a href="https://webchat.freenode.net/?channels=taler"> <img src="../icons/icon-share.svg" height=60> - <h3>IRC</h3> + <h3>{{ _("IRC")}}</h3> </a> {{ _("Our IRC channel is #taler on freenode.") }} </div> @@ -161,7 +167,7 @@ <div class="col-3"> <a href="https://gnunet.org/bugs/"> <img src="../icons/icon-share.svg" height=60> - <h3>Bug Tracker</h3> + <h3>{{ _("Bug Tracker")}}</h3> </a> {{ _("Our bug tracker for bugs and feature request.") }} </div> @@ -173,7 +179,7 @@ <div class="row justify-content-center text-center"> <div class="col-8"> - <h2>Code</h2> + <h2>{{ _("Code")}}</h2> </div> </div> diff --git a/template/faq.html.j2 b/template/faq.html.j2 index f9daa01b..3a9349da 100644 --- a/template/faq.html.j2 +++ b/template/faq.html.j2 @@ -1,197 +1,195 @@ {% extends "common/base.j2" %} {% block body_content %} -<div class="container"> - -<h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2> - -<p> - {% trans %} - 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. - {% endtrans %} -</p> - -<p> - {% trans %} - 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. - {% endtrans %} -</p> - -<h2>{{ _("Where is the balance in my wallet stored?") }}</h2> -<p> - {% trans %} - 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. - {% endtrans %} -</p> - -<h2>{{ _("What if my wallet is lost?") }}</h2> -<p> - {% trans %} - 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. - {% endtrans %} -</p> - -<p> - {% trans %} - The risk of losing a wallet can be mitigated by making backups or - keeping the balance reasonably low. - {% endtrans %} -</p> - -<h2>{{ _("What if my computer is hacked?") }}</h2> -<p> - {% trans %} - 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. - {% endtrans %} -</p> - -<h2>{{ _("Can I send money to my friend with Taler?") }}</h2> -<p> - {% trans %} - 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. - {% endtrans %} -</p> -<p> - {% trans %} - Future versions of the Taler wallet may allow exchanging coins - among friends directly as well. - {% endtrans %} -</p> - -<h2>{{ _("How does Taler handle payments in different currencies?") }}</h2> -<p> - {% trans %} - Taler wallets can store digital coins corresponding to multiple - different currencies such as the Euro, US Dollars or Bitcoins. - {% endtrans %} -</p> -<p> - {% trans %} - Taler currently does not offer conversion between currencies. - {% endtrans %} -</p> - -<h2>{{ _("How does Taler protect my privacy?") }}</h2> -{% trans %} - <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 blind signature protects your - privacy as it prevents the exchange from knowing which coin it signed - for which customer. - </p> -{% endtrans %} - -<h2>{{ _("How much does it cost?") }}</h2> -{% trans %} - <p> - The Taler protocol allows any exchange to set its own fee - structure, allowing operators to set fees for withdrawing, depositing, - refreshing or refunding coins. Operators can also charge fees for - closing reserves and for (aggregated) wire transfers to merchants. - Merchants may choose to cover some of the fees customers incur. - Actual transaction costs are estimated around 0.001 cent/transaction - (at high transaction rates, amortized over billions of transactions, - excluding migration costs). Note that this is an early estimate, - details may depend on hosting and backup requirements from the - regulator and could thus easily be 10x higher. - </p> -{% endtrans %} - - -<h2>{{ _("Does Taler work with international payments?") }}</h2> -{% trans %} - <p> - Taler's wallet supports multiple currencies, but the system - currently does not support conversion between currencies. However, - in principle an entity that accepts deposits in one currency and - allows withdrawals in another currency could be created. Still, the - regulatory hurdles in this case tend to be particularly complex. - The focus for Taler is on day-to-day payments, so we have no plans - to support currency conversion in the near future. - </p> -{% endtrans %} - - -<h2>{{ _("How does Taler relate to the (European) Electronic Money Directive?") }}</h2> -{% trans %} - <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> -{% endtrans %} - - -<h2>{{ _("What bank would guarantee the conversion between Taler coins and bank money in regular bank accounts?") }}</h2> -{% trans %} - <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 regular bank or a central - bank for a centrally banked electronic currency. Regardless, the bank would fall under - the respective banking regulations establishing a reason why consumers would have faith - in the conversion from Taler coins into regular bank money. - </p> -{% endtrans %} - -<h2>{{ _("To whom would consumers complain to in case of non-conversion or non-compliance?") }}</h2> -{% trans %} - <p> - Any exchange should be audited by one or more independent auditors. Merchants and - consumer wallets will report certain issues automatically to the auditors, but auditors - may also provide a method for manual submission of issues. The auditors are expected - to make their reports available to the respective regulatory authorities, or even - the general public. - </p> -{% endtrans %} - -<h2>{{ _("Are there any projects already using Taler?") }}</h2> -{% trans %} - <p> - We are aware of several businesses running exploratory projects or having - developed working prototypes. We are also - in discussions with several regular banks as well as several central banks - about the project. That said, there are currently no products in the - market yet, and we believe this would be premature given the state of - the project (see also <a href="https://gnunet.org/bugs/">our bugtracker</a> - for a list of open issues). - </p> -{% endtrans %} - -<h2>{{ _("Does Taler support recurring payments?") }}</h2> -{% trans %} - <p> - Today, our wallet implementation does not support recurring - payments. Recurring payments, where some fixed amount is paid on a - regular basis are in theory possible with Taler, but they come with a - few caveats. Specifically, recurring payments can only work if the - Taler wallet is running and online around the desired time. - Furthermore, given their repetitive nature they are linkable, and - could thus be used to deanonymize the user making the recurring - payment, for example by forcing the user offline at the time of the - payment and observing that it does then not happen on time. Finally, - the Taler wallet does not work with credit and thus the user would - have to make sure to carry a sufficient balance for the recurring - payment to be made. Still, they can be useful, and a future version of - the Taler wallet will likely support them. But this is not a feature - that we are targeting for Taler 1.0. at this time - </p> -{% endtrans %} - -</div> + <div class="container"> + + <h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2> + + <p> + {% trans %} + 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. + {% endtrans %} + </p> + + <p> + {% trans %} + 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. + {% endtrans %} + </p> + + <h2>{{ _("Where is the balance in my wallet stored?") }}</h2> + <p> + {% trans %} + 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. + {% endtrans %} + </p> + + <h2>{{ _("What if my wallet is lost?") }}</h2> + <p> + {% trans %} + 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. + {% endtrans %} + </p> + + <p> + {% trans %} + The risk of losing a wallet can be mitigated by making backups or + keeping the balance reasonably low. + {% endtrans %} + </p> + + <h2>{{ _("What if my computer is hacked?") }}</h2> + <p> + {% trans %} + 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. + {% endtrans %} + </p> + + <h2>{{ _("Can I send money to my friend with Taler?") }}</h2> + <p> + {% trans %} + 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. + {% endtrans %} + </p> + <p> + {% trans %} + Future versions of the Taler wallet may allow exchanging coins + among friends directly as well. + {% endtrans %} + </p> + + <h2>{{ _("How does Taler handle payments in different currencies?") }}</h2> + <p> + {% trans %} + Taler wallets can store digital coins corresponding to multiple + different currencies such as the Euro, US Dollars or Bitcoins. + {% endtrans %} + </p> + <p> + {% trans %} + Taler currently does not offer conversion between currencies. + {% endtrans %} + </p> + + <h2>{{ _("How does Taler protect my privacy?") }}</h2> + <p> + {% trans %} + 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 blind signature protects your + privacy as it prevents the exchange from knowing which coin it signed + for which customer. + {% endtrans %} + </p> + + + <h2>{{ _("How much does it cost?") }}</h2> + <p> + {% trans %} + The Taler protocol allows any exchange to set its own fee + structure, allowing operators to set fees for withdrawing, depositing, + refreshing or refunding coins. Operators can also charge fees for + closing reserves and for (aggregated) wire transfers to merchants. + Merchants may choose to cover some of the fees customers incur. + Actual transaction costs are estimated around 0.001 cent/transaction + (at high transaction rates, amortized over billions of transactions, + excluding migration costs). Note that this is an early estimate, + details may depend on hosting and backup requirements from the + regulator and could thus easily be 10x higher. + {% endtrans %} + </p> + + <h2>{{ _("Does Taler work with international payments?") }}</h2> + <p> + {% trans %} + Taler's wallet supports multiple currencies, but the system + currently does not support conversion between currencies. However, + in principle an entity that accepts deposits in one currency and + allows withdrawals in another currency could be created. Still, the + regulatory hurdles in this case tend to be particularly complex. + The focus for Taler is on day-to-day payments, so we have no plans + to support currency conversion in the near future. + {% endtrans %} + </p> + + <h2>{{ _("How does Taler relate to the (European) Electronic Money Directive?") }}</h2> + <p> + {% trans %} + 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. + {% endtrans %} + </p> + + <h2>{{ _("What bank would guarantee the conversion between Taler coins and bank money in regular bank accounts?") }}</h2> + <p> + {% trans %} + 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 regular bank or a central + bank for a centrally banked electronic currency. Regardless, the bank would fall under + the respective banking regulations establishing a reason why consumers would have faith + in the conversion from Taler coins into regular bank money. + {% endtrans %} + </p> + + <h2>{{ _("To whom would consumers complain to in case of non-conversion or non-compliance?") }}</h2> + <p> + {% trans %} + Any exchange should be audited by one or more independent auditors. Merchants and + consumer wallets will report certain issues automatically to the auditors, but auditors + may also provide a method for manual submission of issues. The auditors are expected + to make their reports available to the respective regulatory authorities, or even + the general public. + {% endtrans %} + </p> + + <h2>{{ _("Are there any projects already using Taler?") }}</h2> + <p> + {% trans %} + We are aware of several businesses running exploratory projects or having + developed working prototypes. We are also + in discussions with several regular banks as well as several central banks + about the project. That said, there are currently no products in the + market yet, and we believe this would be premature given the state of + the project (see also <a href="https://gnunet.org/bugs/">our bugtracker</a> + for a list of open issues). + {% endtrans %} + </p> + + <h2>{{ _("Does Taler support recurring payments?") }}</h2> + <p> + {% trans %} + Today, our wallet implementation does not support recurring + payments. Recurring payments, where some fixed amount is paid on a + regular basis are in theory possible with Taler, but they come with a + few caveats. Specifically, recurring payments can only work if the + Taler wallet is running and online around the desired time. + Furthermore, given their repetitive nature they are linkable, and + could thus be used to deanonymize the user making the recurring + payment, for example by forcing the user offline at the time of the + payment and observing that it does then not happen on time. Finally, + the Taler wallet does not work with credit and thus the user would + have to make sure to carry a sufficient balance for the recurring + payment to be made. Still, they can be useful, and a future version of + the Taler wallet will likely support them. But this is not a feature + that we are targeting for Taler 1.0. at this time + {% endtrans %} + </p> + + </div> {% endblock body_content %} diff --git a/template/features.html.j2 b/template/features.html.j2 index 63e5186a..22aa7835 100644 --- a/template/features.html.j2 +++ b/template/features.html.j2 @@ -1,11 +1,10 @@ {% extends "common/base.j2" %} {% block body_content %} - <div class="container"> <div class="row"> <div class="col"> - <h1>GNU Taler: Features</h1> + <h1>{{ _("GNU Taler: Features")}}</h1> </div> </div> <div class="row"> diff --git a/template/gsoc-codeless.html.j2 b/template/gsoc-codeless.html.j2 index 837e5573..74fb05da 100644 --- a/template/gsoc-codeless.html.j2 +++ b/template/gsoc-codeless.html.j2 @@ -91,7 +91,13 @@ </li> </ul> <h2 id="overview">{{ _("Dynamic Merchant Instance") }}</h2> - <p>The documentation for the API to dynamically manage merchant instance can be found <a href="https://docs.taler.net/api/api-merchant.html#dynamic-merchant-instance">here</a>.</p> + <p> + {% trans %} + The documentation for the API to dynamically manage merchant + instance can be found + <a href="https://docs.taler.net/api/api-merchant.html#dynamic-merchant-instance">here</a>. + {% endtrans %} + </p> </div> <div class="col-lg-6"> <img src="{{ url('images/UseCaseDiagram.png') }}" alt="{{ _("Use Case Diagram")}}" style="float: right; margin: 5px 5px 5px 5px;" width="100%"> @@ -102,13 +108,17 @@ <div class="container"> <h2 id="documentation">{{ _("Link to the contributions made") }}</h2> <p> - </p><ul> + </p> + <ul> <li>{{ _("Codeless Payment Backend") }} - (<a href="https://git.taler.net/codeless.git/">Link</a>)</li> - <li>{{ _("Documentation to dynamically manage Merchant Instances") }} - (<a href="https://git.taler.net/api.git/commit/?id=53b3fbc3a882975b4ca8ef70d7ae256c9c17a23e">Link</a>)</li> + (<a href="https://git.taler.net/codeless.git/">{{ _("Link")}}</a>) + </li> + <li>{{ _("Documentation to dynamically manage Merchant Instances") }} + (<a href="https://git.taler.net/api.git/commit/?id=53b3fbc3a882975b4ca8ef70d7ae256c9c17a23e">{{ _("Link")}}</a>) + </li> </ul> - <p></p> + <p> + </p> </div> </div> @@ -180,15 +190,15 @@ <div class="row"> <h2 id="documentation">{{ _("Screenshots") }}</h2> <div class="col-lg-4"> - <h3>Home page</h3> + <h3>{{ _("Home page")}}</h3> <img src="{{ url('images/home.png') }}" height="240" align="middle"> </div> <div class="col-lg-4"> - <h3>Product page</h3> + <h3>{{ _("Product page")}}</h3> <img src="{{ url('images/product.png') }}" height="240" align="middle"> </div> <div class="col-lg-4"> - <h3>Shipment Tracking</h3> + <h3>{{ _("Shipment Tracking")}}</h3> <img src="{{ url('images/shipment.png') }}" height="240" align="middle"> </div> </div> diff --git a/template/index.html.j2 b/template/index.html.j2 index 9118cc12..59937c6a 100644 --- a/template/index.html.j2 +++ b/template/index.html.j2 @@ -20,32 +20,31 @@ <div class="row"> <div class="col"> - <h2>We provide a payment system that makes <span class="tlr">privacy-friendly</span> online transactions - <span class="tlr">fast and easy</span>.</h2> + <h2>{{ _("We provide a payment system that makes <span class='tlr'>privacy-friendly</span> online transactions <span class='tlr'>fast and easy</span>.")}}</h2> <ul class="checklist"> <li> <img class="checkmark" src="../images/checkmark.png"> - Payments without registration + {{ _("Payments without registration")}} </li> <li> <img class="checkmark" src="../images/checkmark.png"> - Data protection by default + {{ _("Data protection by default")}} </li> <li> <img class="checkmark" src="../images/checkmark.png"> - Fraud eliminated by design + {{ _("Fraud eliminated by design")}} </li> <li> <img class="checkmark" src="../images/checkmark.png"> - Not a new currency! + {{ _("Not a new currency!")}} </li> <li> <img class="checkmark" src="../images/checkmark.png"> - Empowers communities to run their own payment infrastructure + {{ _("Empowers communities to run their own payment infrastructure")}} </li> </ul> - <form action="https://demo.taler.net/" style="display:inline;"><button type="submit" class="btn btn-primary">Try Demo!</button></form> - <form action="https://docs.taler.net/" style="display:inline;"><button type="submit" class="btn btn-secondary">Read Docs</button></form> + <form action="https://demo.taler.net/" style="display:inline;"><button type="submit" class="btn btn-primary">{{ _("Try Demo!")}}</button></form> + <form action="https://docs.taler.net/" style="display:inline;"><button type="submit" class="btn btn-secondary">{{ _("Read Docs")}}</button></form> </div> <div class="col align-self-center"> <img class="img-fluid" src="../images/stock1s.jpg" style="border-radius: 1cm;" /> diff --git a/template/investors.html.j2 b/template/investors.html.j2 index aff66444..d31914b9 100644 --- a/template/investors.html.j2 +++ b/template/investors.html.j2 @@ -42,6 +42,7 @@ the French national institute for research in informatics and automation, and the {% endtrans %} + <!-- They do have a German name though, allow translation? --> <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>. </p> </div> diff --git a/template/news.html.j2 b/template/news.html.j2 index 421dbaf1..311f4c15 100644 --- a/template/news.html.j2 +++ b/template/news.html.j2 @@ -3,7 +3,7 @@ <div class="container"> <div class="col"> - <h1>News</h1> + <h1>{{ _("News")}}</h1> {% include "news/2018-04.inc" %} {% include "news/2017-10.inc" %} diff --git a/template/press.html.j2 b/template/press.html.j2 index a8e5d750..323d0969 100644 --- a/template/press.html.j2 +++ b/template/press.html.j2 @@ -3,7 +3,7 @@ <div class="container"> <h1>{{ _("GNU Taler in the Press")}}</h1> - <h2>2018</h2> + <h2>{{ _("2018")}}</h2> <ul> <li><a href="https://www.coindesk.com/free-software-messiah-richard-stallman-we-can-do-better-than-bitcoin">CoinDesk</a></li> <li><a href="https://www.theguardian.com/commentisfree/2018/apr/03/facebook-abusing-data-law-privacy-big-tech-surveillance">The Guardian</a></li> @@ -12,7 +12,7 @@ <li><a href="https://www.developpez.com/actu/196326/Richard-Stallman-remet-en-cause-l-efficacite-du-RGPD-il-veut-plutot-une-loi-qui-empeche-les-systemes-de-collecter-des-donnees-personnelles/">Developpez.com</a></li> </ul> - <h2>2017</h2> + <h2>{{ _("2017")}}</h2> <ul> <li><a href="https://news.ycombinator.com/item?id=15274110">Y-combinator</a></li> <li><a href="http://hackerpublicradio.org/eps.php?id=2222">Hacker Public Radio</a></li> @@ -22,7 +22,7 @@ <li><a href="https://www.heise.de/tp/features/Kryptowaehrung-will-sich-an-den-Oelpreis-binden-3702862.html">Heise</a></li> </ul> - <h2>2016</h2> + <h2>{{ _("2016")}}</h2> <ul> <li><a href="https://www.theguardian.com/technology/2016/sep/01/online-publishers-readers-ad-block-surveillance-donate-anonymously">The Guardian</a></li> <li><a href="https://phoronix.com/scan.php?page=news_item&px=GNU-Taler-0.0.0">Phoronix</a></li> @@ -40,7 +40,7 @@ <li><a href="http://www.lupa.cz/clanky/stallman-vydavatele-musi-umoznit-ctenarum-platit-za-zpravy-anonymne/">Lupz</a></li> </ul> - <h2>2015</h2> + <h2>{{ _("2015")}}</h2> <ul> <li><a href="https://www.reddit.com/r/Bitcoin/comments/3m037h/taler_a_gnu_attempt_at_replacing_bitcoin/">Reddit</a></li> <li><a href="https://news.ycombinator.com/item?id=10258312">Y-combinator</a></li> diff --git a/template/principles.html.j2 b/template/principles.html.j2 index 3c3ffad3..7b684b6b 100644 --- a/template/principles.html.j2 +++ b/template/principles.html.j2 @@ -30,7 +30,7 @@ <div class="col-lg-12"> <h2>{{ _("1. Free Software implementation") }}</h2> <a href="https://www.gnu.org/graphics/freedom.html"> - <img style="width:20vw;float:right" src="../images/stallman.medium.png" alt="{{ _("... in the are of computing, freedom means not using proprietary software") }}"> + <img style="width:20vw;float:right" src="../images/stallman.medium.png" alt="{{ _("... in the area of computing, freedom means not using proprietary software") }}"> </a> <p> {% trans %} diff --git a/template/team.html.j2 b/template/team.html.j2 index 55efd6a1..23f73296 100644 --- a/template/team.html.j2 +++ b/template/team.html.j2 @@ -3,7 +3,7 @@ <div class="container"> <div class="row"> <div class="col"> - <h1>GNU Taler: Team</h1> + <h1>{{ _("GNU Taler: Team")}}</h1> <p> {% trans %} GNU Taler is proudly brought to you by the humans on this page. @@ -23,7 +23,7 @@ <div class="col-lg-4"> <h2><a href="http://www.digitalekho.com/about-us/index.html">Leon Schumacher</a></h2> <img src="{{ url('team-images/leon-schumacher.jpg') }}" height="240" alt="Leon Schumacher" align="middle"> - <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director in different industries, ….") }}</p> + <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director in different industries,") }} ….</p> </div> <div class="col-lg-4"> <h2>Michael Widmer</h2> @@ -35,7 +35,7 @@ <div class="col-lg-4"> <h2><a href="https://fdold.eu/">Dr. Florian Dold</a></h2> <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle"> - <p>{{ _("GNU mainatiner, lead developer.") }}</p> + <p>{{ _("GNU maintainer, lead developer.") }}</p> </div> <div class="col-lg-4"> <h2>Dr. Jeffrey Burdges</h2> |