summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorng0 <ng0@taler.net>2019-09-02 15:10:00 +0000
committerng0 <ng0@taler.net>2019-09-02 15:10:00 +0000
commit33339626a1e592919b17ff11a275bccc861e4994 (patch)
treecd0ce048daef5ea8569af7b5d263b26c7bb6d975 /template
parent4cbc23334127699b58b1b5f9822fd312be915507 (diff)
downloadwww-33339626a1e592919b17ff11a275bccc861e4994.tar.gz
www-33339626a1e592919b17ff11a275bccc861e4994.tar.bz2
www-33339626a1e592919b17ff11a275bccc861e4994.zip
syntax fixes, gettext block fixes, commit new po files.
Diffstat (limited to 'template')
-rw-r--r--template/architecture.html.j23
-rw-r--r--template/contact.html.j233
-rw-r--r--template/copyright.html.j250
-rw-r--r--template/developers.html.j2317
-rw-r--r--template/docs.html.j260
-rw-r--r--template/faq.html.j2264
-rw-r--r--template/features.html.j2200
-rw-r--r--template/financial-news.html.j234
-rw-r--r--template/glossary.html.j2478
-rw-r--r--template/governments.html.j2327
-rw-r--r--template/gsoc-codeless.html.j2249
-rw-r--r--template/index.html.j274
-rw-r--r--template/investors.html.j2248
-rw-r--r--template/merchants.html.j2315
-rw-r--r--template/news.html.j226
-rw-r--r--template/old-news.html.j262
-rw-r--r--template/press.html.j298
-rw-r--r--template/principles.html.j2355
-rw-r--r--template/schemafuzz.html.j24
-rw-r--r--template/team.html.j2297
20 files changed, 1790 insertions, 1704 deletions
diff --git a/template/architecture.html.j2 b/template/architecture.html.j2
index 21fd6ba..d9170b2 100644
--- a/template/architecture.html.j2
+++ b/template/architecture.html.j2
@@ -4,10 +4,7 @@
<div class="jumbotron">
<div class="container text-center">
<h1>{{ _("Taler System Architecture") }}</h1>
- <p>
- </p>
</div>
-
</div>
<div class="container">
diff --git a/template/contact.html.j2 b/template/contact.html.j2
index f576ad1..67d6685 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -13,10 +13,11 @@
<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 <a href="mailto:taler@gnu.org">taler@gnu.org</a>.
+ 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
+ <a href="mailto:taler@gnu.org">taler@gnu.org</a>.
{% endtrans %}
</p>
</div>
@@ -25,9 +26,9 @@
<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.
+ Team members are generally reachable at
+ <tt>LASTNAME@taler.net</tt>. All of us
+ support receiving GnuPG encrypted e-mails.
{% endtrans %}
</p>
</div>
@@ -36,8 +37,8 @@
<h2>{{ _("General inquiries") }}</h2>
<p>
{% trans %}
- You can reach a group of team members handling
- general inquiries at <tt>contact AT taler.net</tt>.
+ You can reach a group of team members handling
+ general inquiries at <tt>contact AT taler.net</tt>.
{% endtrans %}
</p>
</div>
@@ -46,11 +47,11 @@
<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.
+ 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>
@@ -59,8 +60,8 @@
<h2>{{ _("Executive team") }}</h2>
<p>
{% trans %}
- For non-technical commercial requests, please contact
- <tt>ceo AT taler.net</tt>.
+ For non-technical commercial requests, please contact
+ <tt>ceo AT taler.net</tt>.
{% endtrans %}
</p>
</div>
diff --git a/template/copyright.html.j2 b/template/copyright.html.j2
index 1c5201b..cf0536b 100644
--- a/template/copyright.html.j2
+++ b/template/copyright.html.j2
@@ -5,30 +5,36 @@
<div class="container text-center">
<h1>{{ _("Copyright Assignment") }}</h1>
<!-- Note: source of the pdf/copyright.pdf is in gitolite-admin/ -->
-{% trans %}
- <p>Contributors to GNU Taler with Git access must sign the
- <a href="/pdf/copyright.pdf">copyright assignment</a> to
- ensure that the <a href="https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement
- on licensing and collaborative development</a> of the GNUnet and
- GNU Taler projects is satisfied.</p>
-{% endtrans %}
+ <p>
+ {% trans %}
+ Contributors to GNU Taler with Git access must sign the
+ <a href="/pdf/copyright.pdf">copyright assignment</a>
+ to ensure that the
+ <a href="https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative development</a>
+ of the GNUnet and GNU Taler projects is satisfied.
+ {% endtrans %}
+ </p>
</div>
<div class="container">
-{% trans %}
- <p>The agreements ensure that the code will continue to be made
- available under free software licenses, but gives developers
- the freedom to move code between GNUnet and GNU Taler without
- worrying about licenses and the company the ability to
- dual-license (for example, so that we can distribute via
- App-stores that are hostile to free software).</p>
-{% endtrans %}
-{% trans %}
- <p>Minor contributions (basically, anyone without Git access) do
- not require copyright assignment. Pseudonymous contributions are
- accepted, in this case simply sign the agreement with your
- pseudonym. Scanned copies are sufficient, but snail mail is
- preferred.</p>
-{% endtrans %}
+ <p>
+ {% trans %}
+ The agreements ensure that the code will continue to be made
+ available under free software licenses, but gives developers
+ the freedom to move code between GNUnet and GNU Taler without
+ worrying about licenses and the company the ability to
+ dual-license (for example, so that we can distribute via
+ App-stores that are hostile to free software).
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Minor contributions (basically, anyone without Git access) do
+ not require copyright assignment. Pseudonymous contributions are
+ accepted, in this case simply sign the agreement with your
+ pseudonym. Scanned copies are sufficient, but snail mail is
+ preferred.
+ {% endtrans %}
+ </p>
</div>
</div>
{% endblock body_content %}
diff --git a/template/developers.html.j2 b/template/developers.html.j2
index 61ae63c..92b1217 100644
--- a/template/developers.html.j2
+++ b/template/developers.html.j2
@@ -13,17 +13,17 @@
<p>
{% trans %}
- GNU Taler is free software implementing an open
- protocol. Anybody is welcome to integrate our reference
- implementation into their applications. Different
- components of Taler are being made available under
- different licenses. The Affero GPLv3+ is used for the
- exchange, the LGPLv3+ is used for reference code
- demonstrating integration with merchant platforms, and
- licenses like GPLv3+ are used for
- wallets and related customer-facing software. We are
- open for constructive suggestions for maximizing the
- adoption of this payment platform.
+ GNU Taler is free software implementing an open
+ protocol. Anybody is welcome to integrate our reference
+ implementation into their applications. Different
+ components of Taler are being made available under
+ different licenses. The Affero GPLv3+ is used for the
+ exchange, the LGPLv3+ is used for reference code
+ demonstrating integration with merchant platforms, and
+ licenses like GPLv3+ are used for
+ wallets and related customer-facing software. We are
+ open for constructive suggestions for maximizing the
+ adoption of this payment platform.
{% endtrans %}
</p>
@@ -33,18 +33,18 @@
<p>
{% trans %}
- Taler is designed to work on the Internet. To
- ensure that Taler payments can work with
- restrictive network setups, Taler uses a RESTful
- protocol over HTTP or HTTPS. Taler's security does
- not depend upon the use of HTTPS, but obviously
- merchants may choose to offer HTTPS for consistency
- and because it generally is better for privacy
- compared to HTTP. Taler uses JSON to encode
- structure data, making it easy to integrate Taler
- with existing Web applications. Taler's protocol
- is documented in
- detail at <a href="https://docs.taler.net/">docs.taler.net</a>.
+ Taler is designed to work on the Internet. To
+ ensure that Taler payments can work with
+ restrictive network setups, Taler uses a RESTful
+ protocol over HTTP or HTTPS. Taler's security does
+ not depend upon the use of HTTPS, but obviously
+ merchants may choose to offer HTTPS for consistency
+ and because it generally is better for privacy
+ compared to HTTP. Taler uses JSON to encode
+ structure data, making it easy to integrate Taler
+ with existing Web applications. Taler's protocol
+ is documented in detail at
+ <a href="https://docs.taler.net/">docs.taler.net</a>.
{% endtrans %}
</p>
</div>
@@ -59,16 +59,16 @@
<p>
{% trans %}
- Taler is currently primarily developed by a
- research team at <a href="http://www.inria.fr/">Inria</a> and
- <a href="https://gnunet.org/">GNUnet</a>. 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 <a href="https://git.taler.net/">GitWeb</a>.
- {% endtrans %}
+ Taler is currently primarily developed by a
+ research team at <a href="http://www.inria.fr/">Inria</a> and
+ <a href="https://gnunet.org/">GNUnet</a>. 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
+ <a href="https://git.taler.net/">GitWeb</a>.
+ {% endtrans %}
</p>
</div>
<div class="col-lg-4">
@@ -76,11 +76,12 @@
<p>
{% trans %}
- In addition to this website, the <a
- href="https://git.taler.net/">documented code</a> and
- the <a href="https://docs.taler.net/">API
- documentation</a>. Technical papers can be found in
- our <a href="bibliography.html">bibliography</a>.
+ In addition to this website, the
+ <a href="https://git.taler.net/">documented code</a>
+ and the
+ <a href="https://docs.taler.net/">API documentation</a>.
+ Technical papers can be found in our
+ <a href="bibliography.html">bibliography</a>.
{% endtrans %}
</p>
</div>
@@ -89,9 +90,9 @@
<p>
{% trans %}
- We have a mailing list for developer discussions.
- You can subscribe to or read the list archive at
- <a href="http://lists.gnu.org/mailman/listinfo/taler">http://lists.gnu.org/mailman/listinfo/taler</a>.
+ We have a mailing list for developer discussions.
+ You can subscribe to or read the list archive at
+ <a href="http://lists.gnu.org/mailman/listinfo/taler">http://lists.gnu.org/mailman/listinfo/taler</a>.
{% endtrans %}
</p>
</div>
@@ -102,10 +103,10 @@
<p>
{% trans %}
- We have <a href="https://buildbot.net/">Buildbot</a>
- automation tests to detect regressions and check for
- portability at <a
- href="https://buildbot.taler.net/">buildbot.taler.net</a>.
+ We have <a href="https://buildbot.net/">Buildbot</a>
+ automation tests to detect regressions and check for
+ portability at
+ <a href="https://buildbot.taler.net/">buildbot.taler.net</a>.
{% endtrans %}
</p>
</div>
@@ -114,11 +115,11 @@
<p>
{% trans %}
- We use
- <a href="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</a>
- to analyze the code coverage of our tests, the
- results are available
- at <a href="https://lcov.taler.net/">lcov.taler.net</a>.
+ We use
+ <a href="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</a>
+ to analyze the code coverage of our tests, the
+ results are available at
+ <a href="https://lcov.taler.net/">lcov.taler.net</a>.
{% endtrans %}
</p>
</div>
@@ -149,135 +150,133 @@
<div class="col-lg-12">
<h3 id="overview">{{ _("Taler system overview") }}</h3>
-
-
<p>
- {% trans %}
- The Taler system consists of protocols executed among
- a number of actors as illustrated in the illustration on the right.
- Typical transactions involve the following steps:
- {% endtrans %}
+ {% trans %}
+ The Taler system consists of protocols executed among
+ a number of actors as illustrated in the illustration on the right.
+ Typical transactions involve the following steps:
+ {% endtrans %}
</p>
<img src="/images/taler-arch-full.svg" alt="{{_("system overview")}}" style="float: right; margin: 50px 5px 5px 5px;" width="50%">
<ol>
<li>
- {% trans %}
- A customer instructs his <b>bank</b> to
- transfer funds from his account to the Taler
- exchange (top left). In the subject of the
- transaction, he includes an authentication
- token from his electronic <b>wallet</b>. In
- Taler terminology, the customer creates a
- reserve at the exchange.
- {% endtrans %}
+ {% trans %}
+ A customer instructs his <b>bank</b> to
+ transfer funds from his account to the Taler
+ exchange (top left). In the subject of the
+ transaction, he includes an authentication
+ token from his electronic <b>wallet</b>. In
+ Taler terminology, the customer creates a
+ reserve at the exchange.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- Once the exchange has received the wire
- transfer, it allows the customer's electronic
- wallet to <b>withdraw</b> electronic coins.
- The electronic coins are digital
- representations of the original currency from
- the transfer. It is important to note that the
- exchange does not learn the &quot;serial
- numbers&quot; of the coins created in this
- process, so it cannot tell later which customer
- purchased what at which merchant. The use of
- Taler does not change the currency or the total
- value of the funds (except for fees which the
- exchange may charge for the service).
- {% endtrans %}
- </li>
+ {% trans %}
+ Once the exchange has received the wire
+ transfer, it allows the customer's electronic
+ wallet to <b>withdraw</b> electronic coins.
+ The electronic coins are digital
+ representations of the original currency from
+ the transfer. It is important to note that the
+ exchange does not learn the &quot;serial
+ numbers&quot; of the coins created in this
+ process, so it cannot tell later which customer
+ purchased what at which merchant. The use of
+ Taler does not change the currency or the total
+ value of the funds (except for fees which the
+ exchange may charge for the service).
+ {% endtrans %}
+ </li>
<li>
- {% trans %}
- Once the customer has the digital coins in his
- wallet, the wallet can be used to <b>spend</b>
- the coins with merchant portals that support
- the Taler payment system and accept the
- respective exchange as a business partner
- (bottom arrow). This creates a digital contract
- signed by the customer's coins and the
- merchant. If necessary, the customer can later
- use this digitally signed contract in a court
- of law to prove the exact terms of the contract
- and that he paid the respective amount. The
- customer does not learn the banking details of
- the merchant, and Taler does not require the
- merchant to learn the identity of the
- customer. Naturally, the customer can spend any
- fraction of his digital coins (the system takes
- care of customers getting change).
- {% endtrans %}
+ {% trans %}
+ Once the customer has the digital coins in his
+ wallet, the wallet can be used to <b>spend</b>
+ the coins with merchant portals that support
+ the Taler payment system and accept the
+ respective exchange as a business partner
+ (bottom arrow). This creates a digital contract
+ signed by the customer's coins and the
+ merchant. If necessary, the customer can later
+ use this digitally signed contract in a court
+ of law to prove the exact terms of the contract
+ and that he paid the respective amount. The
+ customer does not learn the banking details of
+ the merchant, and Taler does not require the
+ merchant to learn the identity of the
+ customer. Naturally, the customer can spend any
+ fraction of his digital coins (the system takes
+ care of customers getting change).
+ {% endtrans %}
</li>
<li>
- {% trans %}
- Merchants receiving digital
- coins <b>deposit</b> the respective claims
- that resulted from the contract signing with
- the customer at the exchange to redeem the
- coins. The deposit step does not reveal the
- details of the contract between the customer
- and the merchant or the identity of the
- customer to the exchange in any way. However,
- the exchange does learn the identity of the
- merchant via the provided bank routing
- information. The merchant can, for example
- when compelled by the state for taxation,
- provide information linking the individual
- deposit to the respective contract signed by
- the customer. Thus, the exchange's database
- allows the state to enforce that merchants pay
- applicable taxes (and do not engage in illegal
- contracts).
- {% endtrans %}
- </li>
+ {% trans %}
+ Merchants receiving digital
+ coins <b>deposit</b> the respective claims
+ that resulted from the contract signing with
+ the customer at the exchange to redeem the
+ coins. The deposit step does not reveal the
+ details of the contract between the customer
+ and the merchant or the identity of the
+ customer to the exchange in any way. However,
+ the exchange does learn the identity of the
+ merchant via the provided bank routing
+ information. The merchant can, for example
+ when compelled by the state for taxation,
+ provide information linking the individual
+ deposit to the respective contract signed by
+ the customer. Thus, the exchange's database
+ allows the state to enforce that merchants pay
+ applicable taxes (and do not engage in illegal
+ contracts).
+ {% endtrans %}
+ </li>
<li>
- {% trans %}
- Finally, the exchange transfers funds
- corresponding to the digital coins redeemed by
- the merchants to the merchant's <b>bank</b>
- account. The exchange may combine multiple
- small transactions into one larger bank
- transfer. The merchant can query the exchange
- about the relationship between the bank
- transfers and the individual claims that were
- deposited.
- {% endtrans %}
- </li>
+ {% trans %}
+ Finally, the exchange transfers funds
+ corresponding to the digital coins redeemed by
+ the merchants to the merchant's <b>bank</b>
+ account. The exchange may combine multiple
+ small transactions into one larger bank
+ transfer. The merchant can query the exchange
+ about the relationship between the bank
+ transfers and the individual claims that were
+ deposited.
+ {% endtrans %}
+ </li>
<li>
- {% trans %}
- Most importantly, the exchange keeps
- cryptographic proofs that allow it to
- demonstrate that it is operating correctly to
- third parties. The system requires an
- external <b>auditor</b>, such as a
- government-appointed financial regulatory body,
- to frequently verify the exchange's databases
- and check that its bank balance matches the
- total value of the remaining coins in
- circulation.
- {% endtrans %}
- </li>
+ {% trans %}
+ Most importantly, the exchange keeps
+ cryptographic proofs that allow it to
+ demonstrate that it is operating correctly to
+ third parties. The system requires an
+ external <b>auditor</b>, such as a
+ government-appointed financial regulatory body,
+ to frequently verify the exchange's databases
+ and check that its bank balance matches the
+ total value of the remaining coins in
+ circulation.
+ {% endtrans %}
+ </li>
<li>
- {% trans %}
- Without the auditor, the exchange operators
- could embezzle funds they are holding in
- reserve. Customers and merchants cannot cheat
- each other or the exchange. If any party's
- computers are compromised, the financial damage
- is limited to the respective party and
- proportional to the funds they have in
- circulation during the period of the
- compromise.
- {% endtrans %}
- </li>
+ {% trans %}
+ Without the auditor, the exchange operators
+ could embezzle funds they are holding in
+ reserve. Customers and merchants cannot cheat
+ each other or the exchange. If any party's
+ computers are compromised, the financial damage
+ is limited to the respective party and
+ proportional to the funds they have in
+ circulation during the period of the
+ compromise.
+ {% endtrans %}
+ </li>
</ol>
<p></p>
<div class="col">
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index 46fd154..233097c 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -10,8 +10,10 @@
<div class="row">
<div class="col">
- 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>.
+ {% 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>.
+ {% endtrans %}
</div>
</div>
@@ -40,35 +42,38 @@
<div class="col-3">
<a href="https://{{ docshost }}/taler-merchant-api-tutorial.html">
- <img src="../icons/icon-market.svg" height=60>
- <h3>{{ _("Merchant API Tutorial") }}</h3>
+ <img src="../icons/icon-market.svg" height=60>
+ <h3>{{ _("Merchant API Tutorial") }}</h3>
</a>
{% trans %}
- Tutorial for processing Taler payments using the merchant backend API.
- Also available as
- {% endtrans %} <a href="https://{{ docshost }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
+ 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 %}
</div>
<div class="col-3">
<a href="https://{{ docshost }}/taler-exchange-manual.html">
- <img src="../icons/icon-exchange.svg" height=60>
- <h3>Exchange</h3>
+ <img src="../icons/icon-exchange.svg" height=60>
+ <h3>Exchange</h3>
</a>
{% trans %}
- Operator's manual for the GNU Taler exchange.
- Also available as
- {% endtrans %} <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>.
+ Operator's manual for the GNU Taler exchange.
+ Also available as
+ <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>.
+ {% endtrans %}
</div>
<div class="col-3">
<a href="https://{{ docshost }}/taler-bank-manual.html">
- <img src="../icons/icon-bank.svg" height=60>
- <h3>{{ _("Bank Integration") }}</h3>
+ <img src="../icons/icon-bank.svg" height=60>
+ <h3>{{ _("Bank Integration") }}</h3>
</a>
{% trans %}
- Manual for tightly integrating Taler with banking applications.
- Also available as
- {% endtrans %} <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>.
+ Manual for tightly integrating Taler with banking applications.
+ Also available as
+ <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>.
+ {% endtrans %}
</div>
</div>
@@ -79,13 +84,14 @@
<div class="col-3">
<a href="https://{{ docshost }}/taler-backoffice-manual.html">
- <img src="../icons/icon-backoffice.svg" height=60>
- <h3>{{ _("Back office") }}</h3>
+ <img src="../icons/icon-backoffice.svg" height=60>
+ <h3>{{ _("Back office") }}</h3>
</a>
{% trans %}
- Manual to run the back-office Web application.
- Also available as
- {% endtrans %} <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>.
+ Manual to run the back-office Web application.
+ Also available as
+ <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>.
+ {% endtrans %}
</div>
</div>
@@ -104,8 +110,8 @@
<div class="row">
<div class="col-3">
<a href="https://{{ docshost }}/core/index.html">
- <img src="../icons/icon-api.svg" height=60>
- <h3>HTTP API</h3>
+ <img src="../icons/icon-api.svg" height=60>
+ <h3>HTTP API</h3>
</a>
{{ _("Reference for the HTTP-based API for Taler components.") }}
</div>
@@ -116,10 +122,10 @@
<h3>Onboarding</h3>
</a>
{% trans %}
- Description of our taler.net setup and how to contribute.
- Also available as
+ Description of our taler.net setup and how to contribute.
+ Also available as
+ <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>.
{% endtrans %}
- <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>.
</div>
</div>
diff --git a/template/faq.html.j2 b/template/faq.html.j2
index f3657f7..f9daa01 100644
--- a/template/faq.html.j2
+++ b/template/faq.html.j2
@@ -3,170 +3,194 @@
<div class="container">
<h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
-{% trans %}
-<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>
-{% endtrans %}
-{% trans %}
-<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>
-{% endtrans %}
+
+<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>
-{% trans %}
-<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>
-{% endtrans %}
+<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>
-{% trans %}
-<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>
-{% endtrans %}
-{% trans %}
-<p>The risk of losing a wallet can be mitigated by making backups or
-keeping the balance reasonably low.</p>
-{% endtrans %}
+<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>
-{% trans %}
-<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>
-{% endtrans %}
+<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>
-{% trans %}
-<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>
-{% endtrans %}
-{% trans %}
-<p>Future versions of the Taler wallet may allow exchanging coins
-among friends directly as well.</p>
-{% endtrans %}
-
+<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>
-{% trans %}
-<p>Taler wallets can store digital coins corresponding to multiple
-different currencies such as the Euro, US Dollars or Bitcoins.</p>
-{% endtrans %}
-{% trans %}
-<p>Taler currently does not offer conversion between currencies.</p>
-{% endtrans %}
+<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>
-
+ <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>
+ <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>
-
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
diff --git a/template/features.html.j2 b/template/features.html.j2
index 5d94cb1..63e5186 100644
--- a/template/features.html.j2
+++ b/template/features.html.j2
@@ -10,41 +10,51 @@
</div>
<div class="row">
<div class="col">
-
<p>
- {% trans %}
- GNU Taler is a <span class="tlr">privacy-preserving</span> payment system. Customers can stay
-anonymous, but merchants can not hide their income through payments with GNU Taler.
-This helps to <span class="tlr">avoid tax evasion and money laundering</span>.
+ {% trans %}
+ GNU Taler is a <span class="tlr">privacy-preserving</span>
+ payment system. Customers can stay anonymous, but
+ merchants can not hide their income through payments with GNU Taler.
+ This helps to
+ <span class="tlr">avoid tax evasion and money laundering</span>.
{% endtrans %}
</p>
<p>
{% trans %}
- The primary use case of GNU Taler is <span class="tlr">payments</span>; it is <span class="tlr">not meant as a
-store</span> of value. Payments are always backed by an existing currency.
+ The primary use case of GNU Taler is
+ <span class="tlr">payments</span>; it is
+ <span class="tlr">not meant as a store</span>
+ of value. Payments are always backed by an existing currency.
{% endtrans %}
</p>
<p>
- {% trans %}
- Payment are made after <span class="tlr">exchanging existing money</span> into <em>electronic money</em> with the help of
- an Exchange service, that is, a payment service provider for Taler.
+ {% trans %}
+ Payment are made after
+ <span class="tlr">exchanging existing money</span>
+ into <em>electronic money</em> with the help of
+ an Exchange service, that is, a payment service provider for Taler.
{% endtrans %}
</p>
<p>
{% trans %}
- When making a payment, customers only need a charged wallet. A merchant can accept payments <span class="tlr">without
- making their customers register</span> on the merchant's Website.
+ When making a payment, customers only need a charged wallet.
+ A merchant can accept payments
+ <span class="tlr">without making their customers register</span>
+ on the merchant's Website.
{% endtrans %}
</p>
<p>
- {% trans %}
- GNU Taler is <span class="tlr">immune against many types of fraud</span>, such as phishing of credit card information
- or chargeback fraud. In case of loss or theft, only the limited amount of money left in the wallet might be gone.
- {% endtrans %}
+ {% trans %}
+ GNU Taler is
+ <span class="tlr">immune against many types of fraud</span>,
+ such as phishing of credit card information or
+ chargeback fraud. In case of loss or theft, only the limited amount
+ of money left in the wallet might be gone.
+ {% endtrans %}
</p>
</div>
<div class="col">
@@ -54,56 +64,61 @@ store</span> of value. Payments are always backed by an existing currency.
</div>
<div class="container-fluid">
-<div class="container" style="border: 5px dotted black">
- <div class="row">
- <div class="col-lg-6">
- <h2>{{ _("Paying with Taler") }}</h2>
- <p>
- {% trans %}
- To pay with Taler, customers install an electronic wallet
- on their device. Before the first payment, the desired currency
- must be added to the wallet's balance
- by some other means of payment.
- {% endtrans %}
- </p>
- <p>
- {% trans %}
- Once the wallet is charged, payments on websites take only one click,
- are never falsely rejected by fraud detection and do not pose any risk
- of phishing or identity theft.
- {% endtrans %}
- </p>
- <p><a href="https://demo.taler.net">
- {% trans %}
- Try it yourself with the interactive demo!
- {% endtrans %}
- </a></p>
- </div>
- <div class="col-lg-6">
- <h2>{{ _("Receiving payments with Taler") }}</h2>
- <p>
- {% trans %}
- To receive Taler payments, a merchant needs a bank account
- in the desired currency. We provide supporting software
- in various programming languages to make the integration painless.
- The merchant's backend for Taler transaction processing can run
- on the merchant's premises or be hosted by a third party.
- {% endtrans %}
- </p>
- <p>
- {% trans %}
- Merchant integration is simple, and customers can pay for products without even having to register an account.
- {% endtrans %}
- </p>
- <p><a href="https://docs.taler.net">
- {% trans %}
- See how merchant integration works in our developer documentation!
- {% endtrans %}
- </a></p>
+ <div class="container" style="border: 5px dotted black">
+ <div class="row">
+ <div class="col-lg-6">
+ <h2>{{ _("Paying with Taler") }}</h2>
+ <p>
+ {% trans %}
+ To pay with Taler, customers install an electronic wallet
+ on their device. Before the first payment, the desired currency
+ must be added to the wallet's balance
+ by some other means of payment.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Once the wallet is charged, payments on websites take only one click,
+ are never falsely rejected by fraud detection and do not pose any risk
+ of phishing or identity theft.
+ {% endtrans %}
+ </p>
+ <p>
+ <a href="https://demo.taler.net">
+ {% trans %}
+ Try it yourself with the interactive demo!
+ {% endtrans %}
+ </a>
+ </p>
+ </div>
+ <div class="col-lg-6">
+ <h2>{{ _("Receiving payments with Taler") }}</h2>
+ <p>
+ {% trans %}
+ To receive Taler payments, a merchant needs a bank account
+ in the desired currency. We provide supporting software
+ in various programming languages to make the integration painless.
+ The merchant's backend for Taler transaction processing can run
+ on the merchant's premises or be hosted by a third party.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Merchant integration is simple, and customers can pay for products
+ without even having to register an account.
+ {% endtrans %}
+ </p>
+ <p>
+ <a href="https://docs.taler.net">
+ {% trans %}
+ See how merchant integration works in our developer documentation!
+ {% endtrans %}
+ </a>
+ </p>
+ </div>
</div>
</div>
</div>
-</div>
<div class="container">
@@ -114,10 +129,10 @@ store</span> of value. Payments are always backed by an existing currency.
<p>
{% trans %}
- Taler is easy to integrate with existing Web
- applications. Payments are cryptographically
- secured and are confirmed within milliseconds with
- extremely low transaction costs.
+ Taler is easy to integrate with existing Web
+ applications. Payments are cryptographically
+ secured and are confirmed within milliseconds with
+ extremely low transaction costs.
{% endtrans %}
</p>
@@ -127,11 +142,11 @@ store</span> of value. Payments are always backed by an existing currency.
<p>
{% trans %}
- Taler does not introduce a new currency. Taler
- uses a digital wallet storing coins and payment service
- providers with escrow accounts in existing currencies.
- Thus, Taler's cryptographic coins correspond to existing
- currencies, such as US Dollars, Euros or even Bitcoins.
+ Taler does not introduce a new currency. Taler
+ uses a digital wallet storing coins and payment service
+ providers with escrow accounts in existing currencies.
+ Thus, Taler's cryptographic coins correspond to existing
+ currencies, such as US Dollars, Euros or even Bitcoins.
{% endtrans %}
</p>
@@ -141,10 +156,10 @@ store</span> of value. Payments are always backed by an existing currency.
<p>
{% trans %}
- By design Taler does not suffer from many classes
- of security problems such as phishing or counterfeit.
- Thanks to its security features, Taler never rejects a legitimate
- customer due to a fraud-detection false positive.
+ By design Taler does not suffer from many classes
+ of security problems such as phishing or counterfeit.
+ Thanks to its security features, Taler never rejects a legitimate
+ customer due to a fraud-detection false positive.
{% endtrans %}
</p>
@@ -156,10 +171,10 @@ store</span> of value. Payments are always backed by an existing currency.
<p>
{% trans %}
- When using Taler, merchant's revenue is transparent for tax
- collection authorities. Unlike cash and most digital currencies,
- Taler helps prevent black markets. Taler is not suitable for
- illegal activities.
+ When using Taler, merchant's revenue is transparent for tax
+ collection authorities. Unlike cash and most digital currencies,
+ Taler helps prevent black markets. Taler is not suitable for
+ illegal activities.
{% endtrans %}
</p>
@@ -168,11 +183,11 @@ store</span> of value. Payments are always backed by an existing currency.
<h3>{{ _("Private") }}</h3>
<p>
{% trans %}
- When you pay with Taler, your identity does not
- have to be revealed. Just like
- payments in cash, nobody else can track how you
- spent your electronic money. However, you obtain a
- legally valid proof of payment.
+ When you pay with Taler, your identity does not
+ have to be revealed. Just like
+ payments in cash, nobody else can track how you
+ spent your electronic money. However, you obtain a
+ legally valid proof of payment.
{% endtrans %}
</p>
@@ -182,17 +197,18 @@ store</span> of value. Payments are always backed by an existing currency.
<p>
{% trans %}
- Taler provides protocols and reference implementations that in
- principle enables anybody to run their own payment infrastructure,
- be it individuals, organizations or whole countries. Since the
- reference implementation is a <a href="http://www.gnu.org/">GNU</a>
- package, it will always remain free software.
+ Taler provides protocols and reference implementations that in
+ principle enables anybody to run their own payment infrastructure,
+ be it individuals, organizations or whole countries. Since the
+ reference implementation is a
+ {% endtrans %}
+ <a href="http://www.gnu.org/">GNU</a>
+ {% trans %}
+ package, it will always remain free software.
{% endtrans %}
</p>
</div>
-
</div>
-
</div>
{% endblock body_content %}
diff --git a/template/financial-news.html.j2 b/template/financial-news.html.j2
index 8ebe2d4..f104cbc 100644
--- a/template/financial-news.html.j2
+++ b/template/financial-news.html.j2
@@ -18,24 +18,22 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
-
-{% include "financial-news/2017-07-20.inc" %}
-{% include "financial-news/2017-04-04.inc" %}
-{% include "financial-news/2017-04-03.inc" %}
-{% include "financial-news/2016-10-26.inc" %}
-{% include "financial-news/2016-10-24.inc" %}
-{% include "financial-news/2016-10-21.inc" %}
-{% include "financial-news/2016-10-15.inc" %}
-{% include "financial-news/2016-07-23.inc" %}
-{% include "financial-news/2015-12-22.inc" %}
-{% include "financial-news/2015-04-30.inc" %}
-{% include "financial-news/2015-03-17.inc" %}
-{% include "financial-news/2014-12-06.inc" %}
-{% include "financial-news/2014-12-05.inc" %}
-{% include "financial-news/2014-11-13.inc" %}
-{% include "financial-news/2014-09-10.inc" %}
-{% include "financial-news/2013-09-15.inc" %}
-
+ {% include "financial-news/2017-07-20.inc" %}
+ {% include "financial-news/2017-04-04.inc" %}
+ {% include "financial-news/2017-04-03.inc" %}
+ {% include "financial-news/2016-10-26.inc" %}
+ {% include "financial-news/2016-10-24.inc" %}
+ {% include "financial-news/2016-10-21.inc" %}
+ {% include "financial-news/2016-10-15.inc" %}
+ {% include "financial-news/2016-07-23.inc" %}
+ {% include "financial-news/2015-12-22.inc" %}
+ {% include "financial-news/2015-04-30.inc" %}
+ {% include "financial-news/2015-03-17.inc" %}
+ {% include "financial-news/2014-12-06.inc" %}
+ {% include "financial-news/2014-12-05.inc" %}
+ {% include "financial-news/2014-11-13.inc" %}
+ {% include "financial-news/2014-09-10.inc" %}
+ {% include "financial-news/2013-09-15.inc" %}
</div>
</div>
</div> <!-- /container -->
diff --git a/template/glossary.html.j2 b/template/glossary.html.j2
index 2736935..cb5862e 100644
--- a/template/glossary.html.j2
+++ b/template/glossary.html.j2
@@ -2,233 +2,257 @@
{% block body_content %}
<div class="container">
-<dl>
-<dt>{{ _("auditor") }}</dt>
- <dd>
- {% trans %}
- trusted third party that verifies that the `exchange` is operating correctly
- {% endtrans %}
- </dd>
-<dt>{{ _("bank") }}</dt>
- <dd>
- {% trans %}
- traditional financial service provider who offers wire `transfers` between accounts
- {% endtrans %}
- </dd>
-<dt>{{ _("coin") }}</dt>
- <dd>
- {% trans %}
- coins are individual token representing a certain amount of value, also known as the `denomination` of the coin
- {% endtrans %}
- </dd>
-<dt>{{ _("contract") }}</dt>
- <dd>
- {% trans %}
- the proposal signed by the wallet.
- {% endtrans %}
- </dd>
-<dt>{{ _("denomination") }}</dt>
- <dd>
- {% trans %}
- unit of currency, specifies both the currency and the face value of a `coin`
- {% endtrans %}
- </dd>
-<dt>{{ _("denomination key") }}</dt>
- <dd>
- {% trans %}
- RSA key used by the exchange to certify that a given `coin` is valid and of a particular `denomination`
- {% endtrans %}
- </dd>
-<dt>{{ _("deposit") }}</dt>
- <dd>
- {% trans %}
- operation by which a merchant passes coins to an exchange, expecting the exchange to credit his `bank` account in the future using a wire `transfer`
- {% endtrans %}
- </dd>
-<dt>{{ _("dirty") }}</dt>
- <dd>
- {% trans %}
- a `coin` is dirty if its public key may be known to an entity other than the customer, thereby creating the danger of some entity being able to link multiple transactions of coin's owner if the coin is not refreshed first
- {% endtrans %}
- </dd>
-<dt>{{ _("exchange") }}</dt>
- <dd>
- {% trans %}
- Taler's payment service provider. Issues electronic `coins` during `withdrawal` and redeems them when they are `deposited` by merchants.
- {% endtrans %}
- </dd>
-<dt>{{ _("expired") }}</dt>
- <dd>
- {% trans %}
- Various operations come with time limits. In particular, `denomination keys`
- come with strict time limits for the various operations involving the
- `coin` issued under the `denomination`. The most important limit is the
- `deposit` expiration, which specifies until when wallets are allowed to
- use the coin in `deposit` or `refreshing` operations. There is also a "legal"
- expiration, which specifies how long the exchange keeps records beyond the
- `deposit` expiration time. This latter expiration matters for legal disputes
- in courts and also creates an upper limit for `refreshing` operations on
- special `zombie coin`.
- {% endtrans %}
- </dd>
-<dt>{{ _("extension") }}</dt>
- <dd>
- {% trans %}
- implementation of a `wallet` for browsers
- {% endtrans %}
- </dd>
-<dt>{{ _("fresh coin") }}</dt>
- <dd>
- {% trans %}
- a `coin` is fresh if its public key is only known to the customer
- {% endtrans %}
- </dd>
-<dt>{{ _("master key") }}</dt>
- <dd>
- {% trans %}
- offline key used by the exchange to certify denomination keys and message signing keys
- {% endtrans %}
- </dd>
-<dt>{{ _("message signing key") }}</dt>
- <dd>
- {% trans %}
- key used by the exchange to sign online messages, other than coins
- {% endtrans %}
- </dd>
-<dt>{{ _("offer") }}</dt>
- <dd>
- {% trans %}
- specification of the details of a transaction, specifies the payment obligations
- for the customer (i.e. the amount), the deliverables of the merchant and other
- related information, such as deadlines or locations; However, it lacks some
- information that the backend is supposed to provide.
- In other words, after the backend adds the missing information to the offer and
- signs it, it becomes a proposal.
- {% endtrans %}
- </dd>
-<dt>{{ _("owner") }}</dt>
- <dd>
- {% trans %}
- a `coin` is owned by the entity that knows the private key of the coin
- {% endtrans %}
- </dd>
-<dt>{{ _("payback") }}</dt>
- <dd>
- {% trans %}
- operation by which an exchange returns the value of coins affected
- by a `revocation` to their `owner`, either by allowing the owner to
- withdraw new coins or wiring funds back to the bank account of the `owner`
- {% endtrans %}
- </dd>
-<dt>{{ _("proof") }}</dt>
- <dd>
- {% trans %}
- message that cryptographically demonstrates that a particular claim is correct
- {% endtrans %}
- </dd>
-<dt>{{ _("proposal") }}</dt>
- <dd>
- {% trans %}
- a sketch that has been completed and signed by the merchant backend.
- {% endtrans %}
- </dd>
-<dt>{{ _("reserve") }}</dt>
- <dd>
- {% trans %}
- funds set aside for future use; either the balance of a customer at the exchange ready for `withdrawal`, or the funds kept in the exchange's bank account to cover obligations from coins in circulation
- {% endtrans %}
- </dd>
-<dt>{{ _("refreshing") }}</dt>
- <dd>
- {% trans %}
- operation by which a `dirty` `coin` is converted into one or more `fresh` coins
- {% endtrans %}
- </dd>
-<dt>{{ _("refund") }}</dt>
- <dd>
- {% trans %}
- operation by which a merchant steps back from the right to funds that he obtained from a `deposit` operation, giving the right to the funds back to the customer
- {% endtrans %}
- </dd>
-<dt>{{ _("revocation") }}</dt>
- <dd>
- {% trans %}
- exceptional operation by which an exchange withdraws a denomination from circulation, either because the signing key was compromised or because the exchange is going out of operation; unspent coins of a revoked denomination are subjected to payback.
- {% endtrans %}
- </dd>
-<dt>{{ _("sharing") }}</dt>
- <dd>
- {% trans %}
- users can share ownership of a `coin` by sharing access to the coin's private key, thereby allowing all co-owners to spend the coin at any time.
- {% endtrans %}
- </dd>
-<dt>{{ _("signing key") }}</dt>
- <dd>
- {% trans %}
- see message signing key.
- {% endtrans %}
- </dd>
-<dt>{{ _("spending") }}</dt>
- <dd>
- {% trans %}
- operation by which a customer gives a merchant the right to `deposit` coins in return for merchandise
- {% endtrans %}
- </dd>
-<dt>{{ _("transfer") }}</dt>
- <dd>
- {% trans %}
- method of sending funds between `bank` accounts
- {% endtrans %}
- </dd>
-<dt>{{ _("transaction") }}</dt>
- <dd>
- {% trans %}
- method by which ownership is exclusively transferred from one entity to another
- {% endtrans %}
- </dd>
-<dt>{{ _("transaction id") }}</dt>
- <dd>
- {% trans %}
- unique number by which a merchant identifies a `transaction`
- {% endtrans %}
- </dd>
-<dt>{{ _("wallet") }}</dt>
- <dd>
- {% trans %}
- software running on a customer's computer; withdraws, stores and spends coins
- {% endtrans %}
- </dd>
-<dt>{{ _("wire transfer") }}</dt>
- <dd>
- {% trans %}
- see `transfer`
- {% endtrans %}
- </dd>
-<dt>{{ _("wire transfer identifier") }}</dt>
- <dd>
- {% trans %}
- subject of a wire `transfer`; usually a random string to uniquely identify the `transfer`
- {% endtrans %}
- </dd>
-<dt>{{ _("withdrawal") }}</dt>
- <dd>
- {% trans %}
- operation by which a `wallet` can convert funds from a reserve to fresh coins
- {% endtrans %}
- </dd>
-<dt>{{ _("zombie coin") }}</dt>
- <dd>
- {% trans %}
- a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin
- in `refreshing`, (2) the `denomination` of the `fresh` coins created during the
- `refreshing` was subject to `revocation`, resulting in the `fresh` coin
- from the refresh operation being subjected to `payback`; as a result,
- the formerly `dirty` coin is eligible for
- `refreshing`, even if the dirty coin's denomination is `expired` for
- `deposit` operations (but not if it is expired past the legal
- data retention requirement).
- {% endtrans %}
- </dd>
+ <dl>
+ <dt>{{ _("auditor") }}</dt>
+ <dd>
+ {% trans %}
+ trusted third party that verifies that the `exchange` is operating correctly
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("bank") }}</dt>
+ <dd>
+ {% trans %}
+ traditional financial service provider who offers wire `transfers` between accounts
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("coin") }}</dt>
+ <dd>
+ {% trans %}
+ coins are individual token representing a certain amount of value, also known as the `denomination` of the coin
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("contract") }}</dt>
+ <dd>
+ {% trans %}
+ the proposal signed by the wallet.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("denomination") }}</dt>
+ <dd>
+ {% trans %}
+ unit of currency, specifies both the currency and the face value of a
+ `coin`
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("denomination key") }}</dt>
+ <dd>
+ {% trans %}
+ RSA key used by the exchange to certify that a given `coin` is valid and
+ of a particular `denomination`
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("deposit") }}</dt>
+ <dd>
+ {% trans %}
+ operation by which a merchant passes coins to an exchange, expecting the
+ exchange to credit his `bank` account in the future using a wire
+ `transfer`
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("dirty") }}</dt>
+ <dd>
+ {% trans %}
+ a `coin` is dirty if its public key may be known to an entity other than
+ the customer, thereby creating the danger of some entity being able to
+ link multiple transactions of coin's owner if the coin is not refreshed
+ first
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("exchange") }}</dt>
+ <dd>
+ {% trans %}
+ Taler's payment service provider. Issues electronic `coins` during
+ `withdrawal` and redeems them when they are `deposited` by merchants.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("expired") }}</dt>
+ <dd>
+ {% trans %}
+ Various operations come with time limits. In particular, `denomination keys`
+ come with strict time limits for the various operations involving the
+ `coin` issued under the `denomination`. The most important limit is the
+ `deposit` expiration, which specifies until when wallets are allowed to
+ use the coin in `deposit` or `refreshing` operations. There is also a "legal"
+ expiration, which specifies how long the exchange keeps records beyond the
+ `deposit` expiration time. This latter expiration matters for legal disputes
+ in courts and also creates an upper limit for `refreshing` operations on
+ special `zombie coin`.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("extension") }}</dt>
+ <dd>
+ {% trans %}
+ implementation of a `wallet` for browsers
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("fresh coin") }}</dt>
+ <dd>
+ {% trans %}
+ a `coin` is fresh if its public key is only known to the customer
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("master key") }}</dt>
+ <dd>
+ {% trans %}
+ offline key used by the exchange to certify denomination keys and
+ message signing keys
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("message signing key") }}</dt>
+ <dd>
+ {% trans %}
+ key used by the exchange to sign online messages, other than coins
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("offer") }}</dt>
+ <dd>
+ {% trans %}
+ specification of the details of a transaction, specifies the payment obligations
+ for the customer (i.e. the amount), the deliverables of the merchant and other
+ related information, such as deadlines or locations; However, it lacks some
+ information that the backend is supposed to provide.
+ In other words, after the backend adds the missing information to the offer and
+ signs it, it becomes a proposal.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("owner") }}</dt>
+ <dd>
+ {% trans %}
+ a `coin` is owned by the entity that knows the private key of the coin
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("payback") }}</dt>
+ <dd>
+ {% trans %}
+ operation by which an exchange returns the value of coins affected
+ by a `revocation` to their `owner`, either by allowing the owner to
+ withdraw new coins or wiring funds back to the bank account of the `owner`
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("proof") }}</dt>
+ <dd>
+ {% trans %}
+ message that cryptographically demonstrates that a particular claim is correct
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("proposal") }}</dt>
+ <dd>
+ {% trans %}
+ a sketch that has been completed and signed by the merchant backend.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("reserve") }}</dt>
+ <dd>
+ {% trans %}
+ funds set aside for future use; either the balance of a customer at the
+ exchange ready for `withdrawal`, or the funds kept in the exchange's bank
+ account to cover obligations from coins in circulation
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("refreshing") }}</dt>
+ <dd>
+ {% trans %}
+ operation by which a `dirty` `coin` is converted into one or more
+ `fresh` coins
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("refund") }}</dt>
+ <dd>
+ {% trans %}
+ operation by which a merchant steps back from the right to funds that he
+ obtained from a `deposit` operation, giving the right to the funds back
+ to the customer
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("revocation") }}</dt>
+ <dd>
+ {% trans %}
+ exceptional operation by which an exchange withdraws a denomination from
+ circulation, either because the signing key was compromised or because
+ the exchange is going out of operation; unspent coins of a revoked
+ denomination are subjected to payback.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("sharing") }}</dt>
+ <dd>
+ {% trans %}
+ users can share ownership of a `coin` by sharing access to the coin's
+ private key, thereby allowing all co-owners to spend the coin at any
+ time.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("signing key") }}</dt>
+ <dd>
+ {% trans %}
+ see message signing key.
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("spending") }}</dt>
+ <dd>
+ {% trans %}
+ operation by which a customer gives a merchant the right to `deposit`
+ coins in return for merchandise
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("transfer") }}</dt>
+ <dd>
+ {% trans %}
+ method of sending funds between `bank` accounts
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("transaction") }}</dt>
+ <dd>
+ {% trans %}
+ method by which ownership is exclusively transferred from one entity
+ to another
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("transaction id") }}</dt>
+ <dd>
+ {% trans %}
+ unique number by which a merchant identifies a `transaction`
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("wallet") }}</dt>
+ <dd>
+ {% trans %}
+ software running on a customer's computer; withdraws, stores and
+ spends coins
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("wire transfer") }}</dt>
+ <dd>
+ {% trans %}
+ see `transfer`
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("wire transfer identifier") }}</dt>
+ <dd>
+ {% trans %}
+ subject of a wire `transfer`; usually a random string to uniquely
+ identify the `transfer`
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("withdrawal") }}</dt>
+ <dd>
+ {% trans %}
+ operation by which a `wallet` can convert funds from a reserve to
+ fresh coins
+ {% endtrans %}
+ </dd>
+ <dt>{{ _("zombie coin") }}</dt>
+ <dd>
+ {% trans %}
+ a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin
+ in `refreshing`, (2) the `denomination` of the `fresh` coins created during the
+ `refreshing` was subject to `revocation`, resulting in the `fresh` coin
+ from the refresh operation being subjected to `payback`; as a result,
+ the formerly `dirty` coin is eligible for
+ `refreshing`, even if the dirty coin's denomination is `expired` for
+ `deposit` operations (but not if it is expired past the legal
+ data retention requirement).
+ {% endtrans %}
+ </dd>
</dt>
</div>
{% endblock body_content %}
diff --git a/template/governments.html.j2 b/template/governments.html.j2
index be7ce52..1f169d6 100644
--- a/template/governments.html.j2
+++ b/template/governments.html.j2
@@ -1,188 +1,183 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="jumbotron">
- <div class="container text-center">
- <h1>{{ _("Advantages for Governments") }}</h1>
- <p>
+ <div class="jumbotron">
+ <div class="container text-center">
+ <h1>{{ _("Advantages for Governments") }}</h1>
+ <p>
{% trans %}
- Taler provides accountability to ensure business operate
- legally, while also respecting civil liberties of
- citizens. Taler is a payment system based on
- open standards and free software. Taler needs
- governments as they set a financial framework and act as
- trusted regulators. Taler contributes to digital
- sovereignty in the critical financial infrastructure.
- {% endtrans %}
- </p>
- </div>
-</div>
-
-<!-- Example row of columns -->
-<div class="container adorn_h3_bracket">
- <div class="row">
- <div class="col-lg-6">
- <h3>{{ _("Taxable") }}</h3>
-
- <p>
- {% trans %}
- Taler was built with the goal of fighting corruption and
- supporting taxation. With Taler, the receiver of any
- form of payment is easily identified by the government,
- and the merchant can be compelled to provide the contract
- that was accepted by the customer. Governments can use
- this data to tax businesses and individuals based on
- their income, making tax evasion and black markets less
- viable.
+ Taler provides accountability to ensure business operate
+ legally, while also respecting civil liberties of
+ citizens. Taler is a payment system based on
+ open standards and free software. Taler needs
+ governments as they set a financial framework and act as
+ trusted regulators. Taler contributes to digital
+ sovereignty in the critical financial infrastructure.
{% endtrans %}
</p>
-
- <p>
- {% trans %}
- Thus, despite offering anonymity for citizens spending
- digital cash to buy goods and services, Taler also
- ensures that the state can observe incoming funds. This
- can be used to ensure businesses engage only in legal
- activities, and do not evade income tax, sales tax or
- value-added tax. However, this observational capability
- does not extend to the immediate personal domain. In
- particular, monitoring does not cover shared access to
- funds with trusted friends and family, or synchronizing
- wallets across multiple devices.
- {% endtrans %}
- </p>
-
- </p>
+ </div>
</div>
- <div class="col-lg-6">
- <h3>{{ _("Secure") }}</h3>
- <p>
- {% trans %}
- Taler's payments are cryptographically secured. Thus,
- customers, merchants and the Taler payment service provider
- (the exchange) can mathematically
- demonstrate their lawful behavior in court in case of
- disputes. Financial damages are strictly limited,
- improving economic security for individuals, merchants,
- the exchange and the state.
- {% endtrans %}
- </p>
-
- <p>
- {% trans %}
- As a payment service provider, the Taler exchange is
- subject to financial regulation. Financial regulation and
- regular audits are critical to establish trust. In
- particular, the Taler design mandates the existence of an
- independent auditor who checks cryptographic proofs that
- accumulate at the exchange to ensure that the escrow
- account is managed honestly. This ensures that the
- exchange does not threaten the economy due to fraud.
- {% endtrans %}
- </p>
+ <!-- Example row of columns -->
+ <div class="container adorn_h3_bracket">
+ <div class="row">
+ <div class="col-lg-6">
+ <h3>{{ _("Taxable") }}</h3>
+ <p>
+ {% trans %}
+ Taler was built with the goal of fighting corruption and
+ supporting taxation. With Taler, the receiver of any
+ form of payment is easily identified by the government,
+ and the merchant can be compelled to provide the contract
+ that was accepted by the customer. Governments can use
+ this data to tax businesses and individuals based on
+ their income, making tax evasion and black markets less
+ viable.
+ {% endtrans %}
+ </p>
+
+ <p>
+ {% trans %}
+ Thus, despite offering anonymity for citizens spending
+ digital cash to buy goods and services, Taler also
+ ensures that the state can observe incoming funds. This
+ can be used to ensure businesses engage only in legal
+ activities, and do not evade income tax, sales tax or
+ value-added tax. However, this observational capability
+ does not extend to the immediate personal domain. In
+ particular, monitoring does not cover shared access to
+ funds with trusted friends and family, or synchronizing
+ wallets across multiple devices.
+ {% endtrans %}
+ </p>
+ </div>
+ <div class="col-lg-6">
+ <h3>{{ _("Secure") }}</h3>
+
+ <p>
+ {% trans %}
+ Taler's payments are cryptographically secured. Thus,
+ customers, merchants and the Taler payment service provider
+ (the exchange) can mathematically
+ demonstrate their lawful behavior in court in case of
+ disputes. Financial damages are strictly limited,
+ improving economic security for individuals, merchants,
+ the exchange and the state.
+ {% endtrans %}
+ </p>
+
+ <p>
+ {% trans %}
+ As a payment service provider, the Taler exchange is
+ subject to financial regulation. Financial regulation and
+ regular audits are critical to establish trust. In
+ particular, the Taler design mandates the existence of an
+ independent auditor who checks cryptographic proofs that
+ accumulate at the exchange to ensure that the escrow
+ account is managed honestly. This ensures that the
+ exchange does not threaten the economy due to fraud.
+ {% endtrans %}
+ </p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-6">
+ <h3>{{ _("Libre") }}</h3>
+
+ <p>
+ {% trans %}
+ Taler is free software implementing an open protocol
+ standard. Thus, Taler will enable competition and avoid
+ the monopolization of payment systems that threatens
+ global political and financial stability today.
+ {% endtrans %}
+ </p>
+
+ </div>
+ <div class="col-lg-6">
+ <h3>{{ _("Efficient") }}</h3>
+
+ <p>
+ {% trans %}
+ Taler has an efficient design. Unlike
+ Blockchain-based payment systems, such as Bitcoin,
+ Taler will not threaten the availability of
+ national electric grids or (significantly)
+ contribute to environmental pollution.
+ {% endtrans %}
+ </p>
+ </div>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-6">
- <h3>{{ _("Libre") }}</h3>
- <p>
- {% trans %}
- Taler is free software implementing an open protocol
- standard. Thus, Taler will enable competition and avoid
- the monopolization of payment systems that threatens
- global political and financial stability today.
- {% endtrans %}
- </p>
- </div>
- <div class="col-lg-6">
- <h3>{{ _("Efficient") }}</h3>
- <p>
- {% trans %}
- Taler has an efficient design. Unlike
- Blockchain-based payment systems, such as Bitcoin,
- Taler will not threaten the availability of
- national electric grids or (significantly)
- contribute to environmental pollution.
- {% endtrans %}
- </p>
+ <div class="container-fluid c_acronym">
+ <div class="container">
+ <h2 id="documentation">{{ _("Taler and regulation") }}</h2>
+ <dl>
+ <dt>{{ _("Anti money laundering (AML)")}}</dt>
+ <dd>{{ _("With Taler, income is visible and can be tied to the contract signed by both parties.") }}</dd>
+ <dt>{{ _("Know your customer (KYC)")}}</dt>
+ <dd>{{ _("In Taler, payer and payee are known by their bank accounts when withdrawing or depositing coins respectively") }}</dd>
+ <dt>{{ _("General Data Protection Regulation (GDPR)")}}</dt>
+ <dd>{{ _("Taler cryptographically protects citizen's privacy, and by design implements data minimization and privacy by default.") }}</dd>
+ <dt>{{ _("Payment Services Directive (PSD2)")}}</dt>
+ <dd>{{ _("Taler provides an open standard with public APIs contributing to a competitive banking sector.") }}</dd>
+ </dl>
+ </div>
</div>
- </div>
-</div>
-
-<div class="container-fluid c_acronym">
<div class="container">
- <h2 id="documentation">{{ _("Taler and regulation") }}</h2>
- <dl>
- <dt>{{ _("Anti money laundering (AML)")}}</dt>
- <dd>{{ _("With Taler, income is visible and can be tied to the contract signed by both parties.") }}</li>
- <dt>{{ _("Know your customer (KYC)")}}</dt>
- <dd>{{ _("In Taler, payer and payee are known by their bank accounts when withdrawing or depositing coins respectively") }}</dd>
- <dt>{{ _("General Data Protection Regulation (GDPR)")}}</dt>
- <dd>{{ _("Taler cryptographically protects citizen's privacy, and by design implements data minimization and privacy by default.") }}</dd>
- <dt>{{ _("Payment Services Directive (PSD2)")}}</dt>
- <dd>{{ _("Taler provides an open standard with public APIs contributing to a competitive banking sector.") }}</dt>
- </dl>
- </div>
-</div>
-
-
-<div class="container">
-<div class="col-lg-12">
- <h2 id="overview">{{ _("Taler provides privacy and accountability") }}</h2>
+ <div class="col-lg-12">
+ <h2 id="overview">{{ _("Taler provides privacy and accountability") }}</h2>
- <p>
- {% trans %}
- Taler assumes governments can observe traditional wire transfers
- entering and leaving the Taler payment system. Starting with the
- wire transfers, governments can obtain:
- {% endtrans %}
+ <p>
+ {% trans %}
+ Taler assumes governments can observe traditional wire transfers
+ entering and leaving the Taler payment system.
+ Starting with the wire transfers, governments can obtain:
+ {% endtrans %}
+ </p>
<ul>
-
- <li>
- {% trans %}
- The total amount of digital currency withdrawn by a
- customer. The government can impose limits on how much
- digital cash a customer can withdraw within a
- given time frame.
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- The income received by any merchant via the Taler
- system.
- {% endtrans %}
- </li>
-
- <li>
+ <li>
+ {% trans %}
+ The total amount of digital currency withdrawn by a
+ customer. The government can impose limits on how much
+ digital cash a customer can withdraw within a
+ given time frame.
+ {% endtrans %}
+ </li>
+
+ <li>
{% trans %}
+ The income received by any merchant via the Taler
+ system.
+ {% endtrans %}
+ </li>
- The exact details of the underlying contract that was
- signed between customer and merchant. However, this
- information would typically not include the identity
- of the customer.
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- The amounts of digital coins legitimately withdrawn
- by customers from the exchange, the value of
- non-redeemed digital coins in customer's wallets, the
- value and corresponding wire details of deposit
- operations performed by merchants with the exchange,
- and the income of the exchange from transaction fees.
- {% endtrans %}
- </li>
- </ul>
- </p>
-</div>
-</div>
+ <li>
+ {% trans %}
+ The exact details of the underlying contract that was
+ signed between customer and merchant. However, this
+ information would typically not include the identity
+ of the customer.
+ {% endtrans %}
+ </li>
+
+ <li>
+ {% trans %}
+ The amounts of digital coins legitimately withdrawn
+ by customers from the exchange, the value of
+ non-redeemed digital coins in customer's wallets, the
+ value and corresponding wire details of deposit
+ operations performed by merchants with the exchange,
+ and the income of the exchange from transaction fees.
+ {% endtrans %}
+ </li>
+ </ul>
+ </div>
+ </div>
{% endblock body_content %}
diff --git a/template/gsoc-codeless.html.j2 b/template/gsoc-codeless.html.j2
index 1ffce88..837e557 100644
--- a/template/gsoc-codeless.html.j2
+++ b/template/gsoc-codeless.html.j2
@@ -1,137 +1,196 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="jumbotron">
- <div class="container text-center">
- <h1>{{ _("GSoC 2018: Codeless Payment") }}</h1>
- <h6>{{ _("Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and guidance of Florian Dold.") }}</h6>
+ <div class="jumbotron">
+ <div class="container text-center">
+ <h1>{{ _("GSoC 2018: Codeless Payment") }}</h1>
+ <h6>{{ _("Implemented by Shivam Kohli as part of GSoC 2018 under the mentoring and guidance of Florian Dold.") }}</h6>
+ </div>
</div>
-</div>
-<div class="container">
- <div class="col-lg-12">
- <h2 id="overview">{{ _("Overview") }}</h2>
- <p>
- {% trans %}
- Codeless payment is a component that sits between the seller's frontend and the GNU Taler merchant backend. This component has a web interface, where payment buttons are configured. Registered merchants can manage their inventory and simultaneously create a 'Buy Now' button for a specific product. This code can be directly copy pasted on the seller's frontend and can be used for 'Pay with Taler'.
- {% endtrans %}
- </p>
+ <div class="container">
+ <div class="col-lg-12">
+ <h2 id="overview">{{ _("Overview") }}</h2>
+ <p>
+ {% trans %}
+ Codeless payment is a component that sits between the seller's
+ frontend and the GNU Taler merchant backend. This component has a
+ web interface, where payment buttons are configured. Registered
+ merchants can manage their inventory and simultaneously create a
+ 'Buy Now' button for a specific product. This code can be directly
+ copy pasted on the seller's frontend and can be used for 'Pay with
+ Taler'.
+ {% endtrans %}
+ </p>
+ </div>
</div>
-</div>
-<div class="container">
- <div class="col-lg-6">
- <h2 id="overview">{{ _("Use Cases") }}</h2>
- <p>{{ _("The various use cases and features of codeless payment are:") }}</p>
- <p>
+ <div class="container">
+ <div class="col-lg-6">
+ <h2 id="overview">{{ _("Use Cases") }}</h2>
+ <p>
+ {% trans %}
+ The various use cases and features of codeless payment are:
+ {% endtrans %}
+ </p>
<ul>
<li>
- {% trans %}
- The primary use case is the registration of the merchant. The codeless payment backend provides a secure django authenticated login to the merchant. The registered merchant can add inventory (both digital as well as physical) in their stocks. They can manage inventory and simultaneously create a 'Buy Now' button for the product. The merchant also monitors the orders placed and updates the status of the order which helps in shipment tracking.
- {% endtrans %}
+ {% trans %}
+ The primary use case is the registration of the merchant. The
+ codeless payment backend provides a secure django authenticated
+ login to the merchant. The registered merchant can add inventory
+ (both digital as well as physical) in their stocks. They can
+ manage inventory and simultaneously create a 'Buy Now' button for
+ the product. The merchant also monitors the orders placed and
+ updates the status of the order which helps in shipment tracking.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- A merchant has the flexibility to add two types of inventory as follows:
- {% endtrans %}
- <ul>
- <li>
- {% trans %}
- The merchant can upload digital inventory (like a PDF or HTML page) via the codeless payments frontend and the user can then purchase it and view the version hosted by the codeless payment frontend.
- {% endtrans %}
- </li>
- <li>
- {% trans %}
- The merchant can add any physical inventory available in his stocks. While adding these inventory, the seller is prompted to add minimum quantity of product that is required to be maintained in the stock. Whenever the stocks run below this limit the seller would be notified (currently this feature has not been added but soon email notification would be added).
- {% endtrans %}
- </li>
- </ul>
+ {% trans %}
+ A merchant has the flexibility to add two types of inventory as follows:
+ {% endtrans %}
+ <ul>
+ <li>
+ {% trans %}
+ The merchant can upload digital inventory (like a PDF or HTML
+ page) via the codeless payments frontend and the user can then
+ purchase it and view the version hosted by the codeless
+ payment frontend.
+ {% endtrans %}
+ </li>
+ <li>
+ {% trans %}
+ The merchant can add any physical inventory available in his
+ stocks. While adding these inventory, the seller is prompted
+ to add minimum quantity of product that is required to be
+ maintained in the stock. Whenever the stocks run below this
+ limit the seller would be notified (currently this feature has
+ not been added but soon email notification would be added).
+ {% endtrans %}
+ </li>
+ </ul>
</li>
<li>
- {% trans %}
- The buyers will access the seller's frontend where the code for the 'Buy Now' button is present. When this button is triggered, they are redirected to codeless payment backend and eventually redirected to the payment page. After successful payment, the buyer can also track their shipment for physical products or view the digital version hosted by the codeless payment frontend.
- {% endtrans %}
+ {% trans %}
+ The buyers will access the seller's frontend where the code for
+ the 'Buy Now' button is present. When this button is triggered,
+ they are redirected to codeless payment backend and eventually
+ redirected to the payment page. After successful payment, the
+ buyer can also track their shipment for physical products or
+ view the digital version hosted by the codeless payment
+ frontend.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- The other use case of the codeless payment backend is to handle the event when the 'Buy Now' button is triggered on the seller's frontend. To perform the payment the backend communicates with merchant backend api. After successful payment, the users are redirected to the fulfilment page.
- {% endtrans %}
+ {% trans %}
+ The other use case of the codeless payment backend is to handle
+ the event when the 'Buy Now' button is triggered on the seller's
+ frontend. To perform the payment the backend communicates with
+ merchant backend api. After successful payment, the users are
+ redirected to the fulfilment page.
+ {% endtrans %}
</li>
</ul>
- </p>
- <h2 id="overview">{{ _("Dynamic Merchant Instance") }}</h2>
+ <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>
- </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%">
- </div>
-</div> <!-- /container -->
+ </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%">
+ </div>
+ </div> <!-- /container -->
-<div class="container-fluid c_acronym">
- <div class="container">
- <h2 id="documentation">{{ _("Link to the contributions made") }}</h2>
- <p>
+ <div class="container-fluid c_acronym">
+ <div class="container">
+ <h2 id="documentation">{{ _("Link to the contributions made") }}</h2>
+ <p>
</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>
+ <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>
-</div>
-<div class="container">
- <div class="col-lg-12">
- <h2 id="overview">{{ _("Future Work") }}</h2>
+ <div class="container">
+ <div class="col-lg-12">
+ <h2 id="overview">{{ _("Future Work") }}</h2>
- <p>{{ _("The backend of codeless payment is very robust and can be easily extended as per the requirements. It is adaptive to add new features to this framework. But as per the discussion and the scope of this project, there are various features that will be soon added in the Codeless Merchant Backend. The list of future work is as follows:") }}</p>
- <p>
+ <p>
+ {% trans %}
+ The backend of codeless payment is very robust and can be easily
+ extended as per the requirements. It is adaptive to add new features
+ to this framework. But as per the discussion and the scope of this
+ project, there are various features that will be soon added in the
+ Codeless Merchant Backend. The list of future work is as follows:
+ {% endtrans %}
+ </p>
<ul>
-
<li>
- {% trans %}
- To send email notification to the merchant when the stocks run below a certain limit. The minimum quantity required to be maintained in the stocks is currently taken from the merchant(specific to each product) but no such notification system is designed.
- {% endtrans %}
+ {% trans %}
+ To send email notification to the merchant when the stocks run
+ below a certain limit. The minimum quantity required to be
+ maintained in the stocks is currently taken from the
+ merchant(specific to each product) but no such notification system
+ is designed.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- To add API access to the merchant backend via the codeless payment service. Basically, it would be used as a hosting platform for multiple merchants. There would be an additional user interface part in the codeless payment service where a logged-in merchant can generate an API key. This API key can be used to access the functionality of the merchant backend in a controlled way. After requesting an API key, the page would display the generated key and a base URL for the API to use by the seller, which is handled by the codeless payments service.
- {% endtrans %}
+ {% trans %}
+ To add API access to the merchant backend via the codeless payment
+ service. Basically, it would be used as a hosting platform for
+ multiple merchants. There would be an additional user interface
+ part in the codeless payment service where a logged-in merchant
+ can generate an API key. This API key can be used to access the
+ functionality of the merchant backend in a controlled way. After
+ requesting an API key, the page would display the generated key
+ and a base URL for the API to use by the seller, which is handled
+ by the codeless payments service.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- Mapping every seller account to a separate merchant backend instance. This is not required for a simple version of codeless payments, but as soon as API access for sellers, this is a useful feature. The codeless payment service then can also double as a hosting service for merchants.
- {% endtrans %}
+ {% trans %}
+ Mapping every seller account to a separate merchant backend
+ instance. This is not required for a simple version of codeless
+ payments, but as soon as API access for sellers, this is a useful
+ feature. The codeless payment service then can also double as a
+ hosting service for merchants.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- To add various analytics for the merchant. Various analysis could be performed on the orders placed for the respective merchant. Some of the analysis that can be performed are displaying the most frequently purchased product, some insights about the shipment tracking, analysis of products based on delivery location, etc. For this part, dicussions and some more research have to be done before proceeding to the implementation.
- {% endtrans %}
+ {% trans %}
+ To add various analytics for the merchant. Various analysis
+ could be performed on the orders placed for the respective
+ merchant. Some of the analysis that can be performed are
+ displaying the most frequently purchased product, some insights
+ about the shipment tracking, analysis of products based on
+ delivery location, etc. For this part, dicussions and some more
+ research have to be done before proceeding to the
+ implementation.
+ {% endtrans %}
</li>
-
</ul>
- </p>
- </div>
-</div> <!-- /container -->
-
-<div class="container">
- <div class="row">
- <h2 id="documentation">{{ _("Screenshots") }}</h2>
- <div class="col-lg-4">
- <h3>Home page</h3>
- <img src="{{ url('images/home.png') }}" height="240" align="middle">
- </div>
- <div class="col-lg-4">
- <h3>Product page</h3>
- <img src="{{ url('images/product.png') }}" height="240" align="middle">
</div>
- <div class="col-lg-4">
- <h3>Shipment Tracking</h3>
- <img src="{{ url('images/shipment.png') }}" height="240" align="middle">
+ </div> <!-- /container -->
+
+ <div class="container">
+ <div class="row">
+ <h2 id="documentation">{{ _("Screenshots") }}</h2>
+ <div class="col-lg-4">
+ <h3>Home page</h3>
+ <img src="{{ url('images/home.png') }}" height="240" align="middle">
+ </div>
+ <div class="col-lg-4">
+ <h3>Product page</h3>
+ <img src="{{ url('images/product.png') }}" height="240" align="middle">
+ </div>
+ <div class="col-lg-4">
+ <h3>Shipment Tracking</h3>
+ <img src="{{ url('images/shipment.png') }}" height="240" align="middle">
+ </div>
</div>
</div>
-</div>
{% endblock body_content %}
diff --git a/template/index.html.j2 b/template/index.html.j2
index 0c8124c..9118cc1 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -1,46 +1,56 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
+ <div class="container">
- <div class="row justify-content-center">
- <div class="col-8">
- <img src="../images/logo-2018-dold.svg">
+ <div class="row justify-content-center">
+ <div class="col-8">
+ <img src="../images/logo-2018-dold.svg">
+ </div>
</div>
- </div>
- <div class="row justify-content-center text-center">
- <div class="col-8">
- <a href="news.html">2018-04: GNU Taler v0.5.0 released</a>
+ <div class="row justify-content-center text-center">
+ <div class="col-8">
+ <a href="news.html">2018-04: GNU Taler v0.5.0 released</a>
+ </div>
</div>
- </div>
- <div class="row mt-5">
- </div>
+ <div class="row mt-5">
+ </div>
- <div class="row">
- <div class="col">
- <h2>We provide a payment system that makes <span class="tlr">privacy-friendly</span> online transactions
+ <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>
- <ul class="checklist">
- <li><img class="checkmark" src="../images/checkmark.png">
- Payments without registration</li>
- <li><img class="checkmark" src="../images/checkmark.png">
- Data protection by default</li>
- <li><img class="checkmark" src="../images/checkmark.png">
- Fraud eliminated by design</li>
- <li><img class="checkmark" src="../images/checkmark.png">
- Not a new currency!</li>
- <li><img class="checkmark" src="../images/checkmark.png">
- 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>
- </div>
- <div class="col align-self-center">
- <img class="img-fluid" src="../images/stock1s.jpg" style="border-radius: 1cm;" />
+ <ul class="checklist">
+ <li>
+ <img class="checkmark" src="../images/checkmark.png">
+ Payments without registration
+ </li>
+ <li>
+ <img class="checkmark" src="../images/checkmark.png">
+ Data protection by default
+ </li>
+ <li>
+ <img class="checkmark" src="../images/checkmark.png">
+ Fraud eliminated by design
+ </li>
+ <li>
+ <img class="checkmark" src="../images/checkmark.png">
+ Not a new currency!
+ </li>
+ <li>
+ <img class="checkmark" src="../images/checkmark.png">
+ 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>
+ </div>
+ <div class="col align-self-center">
+ <img class="img-fluid" src="../images/stock1s.jpg" style="border-radius: 1cm;" />
+ </div>
</div>
</div>
-</div>
{% endblock body_content %}
diff --git a/template/investors.html.j2 b/template/investors.html.j2
index 0cce397..ab5f327 100644
--- a/template/investors.html.j2
+++ b/template/investors.html.j2
@@ -1,143 +1,139 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="jumbotron">
- <div class="container text-center">
- <h1>{{ _("Invest in Taler!") }}</h1>
- <div class="col-lg-12">
- <p>
- {% trans %}
- We have created a company, Taler Systems SA in
- Luxembourg.<br>
- Please contact <tt>invest@taler.net</tt>
- if you want to invest in Taler.
- {% endtrans %}
- </p>
+ <div class="jumbotron">
+ <div class="container text-center">
+ <h1>{{ _("Invest in Taler!") }}</h1>
+ <div class="col-lg-12">
+ <p>
+ {% trans %}
+ We have created a company, Taler Systems SA in
+ Luxembourg.<br>
+ Please contact <tt>invest@taler.net</tt>
+ if you want to invest in Taler.
+ {% endtrans %}
+ </p>
+ </div>
</div>
</div>
-</div>
-<div class="container adorn_h3_bracket">
- <div class="row">
- <div class="col-lg-4">
- <h3>{{ _("The Team") }}</h3>
-
- <p>
- {% trans %}
- Our <a href="about.html">team</a> combines world-class business leaders,
- cryptographers, software engineers, civil-rights
- activists and academics. We are unified by a vision
- of how payments should work and the goal of
- imposing this vision upon the world.
- {% endtrans %}
- </p>
-
- <p>
- {% trans %}
- We are currently supported by <a href="http://www.inria.fr/">Inria</a>, the French
- national institute for research in informatics and
- automation, and the <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>.
- {% endtrans %}
- </p>
- </div>
- <div class="col-lg-4">
- <h3>{{ _("The Technology") }}</h3>
-
- <p>
- {% trans %}
- All transactions in Taler are secured using <a href="bibliography.html">modern
- cryptography</a> and trust in all parties is
- minimized. Financial damage is bounded (for
- customers, merchants and the exchange) even in the
- case that systems are compromised and private keys
- are stolen. Databases can be audited for
- consistency, resulting in either the detection of
- compromised systems or the demonstration that
- participants were honest. Actual transaction costs
- are fractions of a cent.
- {% endtrans %}
- </p>
- </div>
- <div class="col-lg-4">
- <h3>{{ _("The Business") }}</h3>
-
- <p>
- {% trans %}
- The scalable business model for Taler is the operation
- of the payment service provider, which converts money from
- traditional payment systems (MasterCard, SEPA, UPI,
- Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous
- electronic coins in the same currency. The customer
- can then redeem the electronic coins at a merchant,
- who can exchange them for money represented using
- traditional payment systems at the exchange. The
- exchange charges fees to facilitate the transactions.
- {% endtrans %}
- </p>
+ <div class="container adorn_h3_bracket">
+ <div class="row">
+ <div class="col-lg-4">
+ <h3>{{ _("The Team") }}</h3>
+
+ <p>
+ {% trans %}
+ Our <a href="about.html">team</a> combines world-class business leaders,
+ cryptographers, software engineers, civil-rights
+ activists and academics. We are unified by a vision
+ of how payments should work and the goal of
+ imposing this vision upon the world.
+ {% endtrans %}
+ </p>
+
+ <p>
+ {% trans %}
+ We are currently supported by <a href="http://www.inria.fr/">Inria</a>, the French
+ national institute for research in informatics and
+ automation, and the <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>.
+ {% endtrans %}
+ </p>
+ </div>
+ <div class="col-lg-4">
+ <h3>{{ _("The Technology") }}</h3>
+
+ <p>
+ {% trans %}
+ All transactions in Taler are secured using
+ <a href="bibliography.html">modern cryptography</a>
+ and trust in all parties is minimized. Financial damage is bounded
+ (for customers, merchants and the exchange) even in the case that
+ systems are compromised and private keys are stolen. Databases
+ can be audited for consistency, resulting in either the detection
+ of compromised systems or the demonstration that participants were
+ honest. Actual transaction costs are fractions of a cent.
+ {% endtrans %}
+ </p>
+ </div>
+ <div class="col-lg-4">
+ <h3>{{ _("The Business") }}</h3>
+ <p>
+ {% trans %}
+ The scalable business model for Taler is the operation
+ of the payment service provider, which converts money from
+ traditional payment systems (MasterCard, SEPA, UPI,
+ Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous
+ electronic coins in the same currency. The customer
+ can then redeem the electronic coins at a merchant,
+ who can exchange them for money represented using
+ traditional payment systems at the exchange. The
+ exchange charges fees to facilitate the transactions.
+ {% endtrans %}
+ </p>
+ </div>
+ </div>
</div>
- </div>
-</div>
-<div class="container-fluid c_acronym">
- <div class="container">
- <h2>{{ _("The Business Case") }}</h2>
- <div class="row">
- <div class="col-lg-4">
- <a href="{{ url('presentations/investors2018.pdf') }}"><img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') }}"><br><p align="center">{{ _("Download") }}</p></a>
-
- <p>
- {% trans %}
- Our <a href="financial-news.html">financial news</a> page
- explains in English how Taler can impact current developments in
- the global payment market.
- {% endtrans %}
- </p>
- </div>
- <div class="col-lg-4" id="canvas-left" style="display:none">
- <canvas id="the-canvas-left"></canvas>
- </div>
- <div class="col-lg-4" id="canvas-right" style="display:none">
- <canvas id="the-canvas-right"></canvas>
- </div>
- <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') }}"></script>
- <script type="text/javascript" src="{{ url('dist/js/pdf-view.js') }}"></script>
+ <div class="container-fluid c_acronym">
+ <div class="container">
+ <h2>{{ _("The Business Case") }}</h2>
+ <div class="row">
+ <div class="col-lg-4">
+ <a href="{{ url('presentations/investors2018.pdf') }}">
+ <img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') }}">
+ <br>
+ <p align="center">{{ _("Download") }}</p>
+ </a>
+
+ <p>
+ {% trans %}
+ Our <a href="financial-news.html">financial news</a> page
+ explains in English how Taler can impact current developments in
+ the global payment market.
+ {% endtrans %}
+ </p>
+ </div>
+ <div class="col-lg-4" id="canvas-left" style="display:none">
+ <canvas id="the-canvas-left"></canvas>
+ </div>
+ <div class="col-lg-4" id="canvas-right" style="display:none">
+ <canvas id="the-canvas-right"></canvas>
+ </div>
+ <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') }}"></script>
+ <script type="text/javascript" src="{{ url('dist/js/pdf-view.js') }}"></script>
+ </div>
+ </div>
</div>
- </div>
-</div>
-<div class="container">
- <div class="row">
- <div class="col-lg-12">
- <h2 id="overview">{{ _("Running a Taler payment service operator") }}</h2>
-
- <p>
- {% trans %}
- The payment service operator runs the <em>Taler exchange</em>.
- The exchange charges <b>transaction fees</b> to customers or merchants.
- Its operational expenses are from wire transfers with the banking
- system and the operation of the computing infrastructure.
- {% endtrans %}
- </p>
-
- <p>
- <ul>
- <li>{{ _("Cryptographic operations, bandwidth and storage costs are less than 0.01 cent per transaction.") }}</li>
-
- <li>{{ _("Multiple Taler transactions can be aggregated into larger wire transfers to merchants to minimize wire transfer costs.") }}</li>
-
- <li>{{ _("Protocol allows the exchange to charge fees for any expensive operation (withdraw, deposit, refresh, refund or aggregated wire transfers).") }}</li>
-
- <li>{{ _("Partnership with banks establishes consumer trust.") }}</li>
-
- <li>{{ _("Partnership with free software community enables rapid deployment.") }}</li>
-
- </ul>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <h2 id="overview">{{ _("Running a Taler payment service operator") }}</h2>
+
+ <p>
+ {% trans %}
+ The payment service operator runs the <em>Taler exchange</em>.
+ The exchange charges <b>transaction fees</b> to customers or merchants.
+ Its operational expenses are from wire transfers with the banking
+ system and the operation of the computing infrastructure.
+ {% endtrans %}
+ </p>
+
+ <p>
+ <ul>
+ <li>{{ _("Cryptographic operations, bandwidth and storage costs are less than 0.01 cent per transaction.") }}</li>
+ <li>{{ _("Multiple Taler transactions can be aggregated into larger wire transfers to merchants to minimize wire transfer costs.") }}</li>
+ <li>{{ _("Protocol allows the exchange to charge fees for any expensive operation (withdraw, deposit, refresh, refund or aggregated wire transfers).") }}</li>
+ <li>{{ _("Partnership with banks establishes consumer trust.") }}</li>
+ <li>{{ _("Partnership with free software community enables rapid deployment.") }}</li>
+ </ul>
+ </div>
+ </div>
</div>
- </div>
-</div>
{% endblock body_content %}
diff --git a/template/merchants.html.j2 b/template/merchants.html.j2
index fff24bf..57e14ed 100644
--- a/template/merchants.html.j2
+++ b/template/merchants.html.j2
@@ -1,186 +1,181 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="jumbotron">
- <div class="container text-center">
- <h1>{{ _("Advantages for Merchants") }}</h1>
+ <div class="jumbotron">
+ <div class="container text-center">
+ <h1>{{ _("Advantages for Merchants") }}</h1>
<p>
- {% trans %}
- Taler is a cost-effective electronic payment system
- which provides you with cryptographic proof that
- the payment worked correctly within milliseconds.
- Your Web customers pay with previously unknown
- levels of convenience without risk of fraud.
- {% endtrans %}
- </p>
+ {% trans %}
+ Taler is a cost-effective electronic payment system
+ which provides you with cryptographic proof that
+ the payment worked correctly within milliseconds.
+ Your Web customers pay with previously unknown
+ levels of convenience without risk of fraud.
+ {% endtrans %}
+ </p>
+ </div>
</div>
-</div>
-
-<div class="container adorn_h3_bracket">
- <div class="row">
- <div class="col-lg-4">
- <h3>{{ _("Fast") }}</h3>
-
- <p>
- {% trans %}
- Processing transactions with Taler is fast,
- allowing you to confirm the transaction with your
- customer virtually immediately. Your customers
- will appreciate that they do not have to type in
- credit card information and play the &quot;verified
- by&quot; game. By making payments significantly
- more convenient for your customers, you may be able
- to use Taler for small transactions that would not
- work with credit card payments due to the mental
- overhead for customers.
- {% endtrans %}
- </p>
+ <div class="container adorn_h3_bracket">
+ <div class="row">
+ <div class="col-lg-4">
+ <h3>{{ _("Fast") }}</h3>
+
+ <p>
+ {% trans %}
+ Processing transactions with Taler is fast,
+ allowing you to confirm the transaction with your
+ customer virtually immediately. Your customers
+ will appreciate that they do not have to type in
+ credit card information and play the &quot;verified
+ by&quot; game. By making payments significantly
+ more convenient for your customers, you may be able
+ to use Taler for small transactions that would not
+ work with credit card payments due to the mental
+ overhead for customers.
+ {% endtrans %}
+ </p>
+
+ </div>
+ <div class="col-lg-4">
+ <h3>{{ _("Secure") }}</h3>
+
+ <p>
+ {% trans %}
+ You will have cryptographic proof of payment from the
+ Taler payment service provider. With Taler you never
+ handle sensitive customer account information and thus
+ do not have to undergo any particular security audits
+ (such as PCI DSS). Your systems will have customer
+ contracts with qualified signatures for all
+ transactions which you can use in court in case of
+ disputes.
+ {% endtrans %}
+ </p>
+
+ </div>
+ <div class="col-lg-4">
+ <h3>{{ _("Free") }}</h3>
+
+ <p>
+ {% trans %}
+ Taler is free software, and you can use the
+ liberally-licensed reference code as a starting
+ point to integrate Taler into your services. To use
+ Taler, you do not need to pay license fees, and the
+ free software development model will ensure that
+ you can select from many competing integrators for
+ support.
+ {% endtrans %}
+ </p>
+
+ </div>
</div>
- <div class="col-lg-4">
- <h3>{{ _("Secure") }}</h3>
-
- <p>
- {% trans %}
- You will have cryptographic proof of payment from the
- Taler payment service provider. With Taler you never
- handle sensitive customer account information and thus
- do not have to undergo any particular security audits
- (such as PCI DSS). Your systems will have customer
- contracts with qualified signatures for all
- transactions which you can use in court in case of
- disputes.
- {% endtrans %}
- </p>
-
- </div>
- <div class="col-lg-4">
- <h3>{{ _("Free") }}</h3>
-
- <p>
- {% trans %}
- Taler is free software, and you can use the
- liberally-licensed reference code as a starting
- point to integrate Taler into your services. To use
- Taler, you do not need to pay license fees, and the
- free software development model will ensure that
- you can select from many competing integrators for
- support.
- {% endtrans %}
- </p>
-
+ <div class="row">
+ <div class="col-lg-4">
+ <h3>{{ _("Cheap") }}</h3>
+ <p>
+ {% trans %}
+ Taler is uses efficient cryptographic constructions with low
+ bandwidth and storage requirements. Combined with Taler's strong
+ security which makes fraud impossible, Taler payment service
+ providers can operate with very low overhead and
+ thus offer low transaction fees.
+ {% endtrans %}
+ </p>
+ </div>
+ <div class="col-lg-4">
+ <h3>{{ _("Flexible") }}</h3>
+ <p>
+ {% trans %}
+ Taler can be used for different currencies (such as
+ Euros, US Dollars or Bitcoins) and any amount, limited
+ only by applicable regulation and what denominations
+ the payment service provider supports.
+ {% endtrans %}
+ </p>
+ </div>
+ <div class="col-lg-4">
+ <h3>{{ _("Ethical") }}</h3>
+ <p>
+ {% trans %}
+ Taler prevents tax evasion and money laundering.
+ Taler's protocols are efficient and do not use wasteful
+ proof-of-work calculations. Taler encourages
+ transparency by providing an open standard and free
+ software reference implementations.
+ {% endtrans %}
+ </p>
+ </div>
</div>
</div>
- <div class="row">
- <div class="col-lg-4">
- <h3>{{ _("Cheap") }}</h3>
- <p>
- {% trans %}
- Taler is uses efficient cryptographic constructions with low
- bandwidth and storage requirements. Combined with Taler's strong
- security which makes fraud impossible, Taler payment service
- providers can operate with very low overhead and
- thus offer low transaction fees.
- {% endtrans %}
- </p>
+ <div class="container-fluid c_acronym">
+ <div class="container">
+ <h2 id="documentation">{{ _("Manuals for merchants") }}</h2>
+ <ul>
+ <li>{{ _("The GNU Taler merchant backend operator manual") }}
+ (<a href="https://docs.taler.net/merchant/backend/html/manual.html">html</a>,
+ <a href="https://docs.taler.net/merchant/backend/pdf/manual.pdf">pdf</a>)
+ </li>
+ <li>{{ _("The GNU Taler Web shop integration tutorial (PHP)") }}
+ (<a href="https://docs.taler.net/merchant/frontend/php/html/tutorial.html">html</a>,
+ <a href="https://docs.taler.net/merchant/frontend/php/pdf/tutorial.pdf">pdf</a>)
+ </li>
+ <li>{{ _("The GNU Taler Web shop integration tutorial (Python)") }}
+ (<a href="https://docs.taler.net/merchant/frontend/python/html/tutorial.html">html</a>,
+ <a href="https://docs.taler.net/merchant/frontend/python/pdf/tutorial.pdf">pdf</a>)
+ </li>
+ </ul>
</div>
- <div class="col-lg-4">
- <h3>{{ _("Flexible") }}</h3>
+ </div>
- <p>
- {% trans %}
- Taler can be used for different currencies (such as
- Euros, US Dollars or Bitcoins) and any amount, limited
- only by applicable regulation and what denominations
- the payment service provider supports.
- {% endtrans %}
- </p>
- </div>
- <div class="col-lg-4">
- <h3>{{ _("Ethical") }}</h3>
+ <div class="container">
+ <div class="col-lg-6">
+ <h2 id="overview">{{ _("The GNU Taler Merchant Backend") }}</h2>
<p>
- {% trans %}
- Taler prevents tax evasion and money laundering.
- Taler's protocols are efficient and do not use wasteful
- proof-of-work calculations. Taler encourages
- transparency by providing an open standard and free
- software reference implementations.
- {% endtrans %}
+ {% trans %}
+ Merchants process payments using the Taler backend:
+ {% endtrans %}
</p>
-
- </div>
- </div>
-</div>
-
-<div class="container-fluid c_acronym">
-<div class="container">
- <h2 id="documentation">{{ _("Manuals for merchants") }}</h2>
- <p>
- </p><ul>
- <li>{{ _("The GNU Taler merchant backend operator manual") }}
- (<a href="https://docs.taler.net/merchant/backend/html/manual.html">html</a>,
- <a href="https://docs.taler.net/merchant/backend/pdf/manual.pdf">pdf</a>)</li>
- <li>{{ _("The GNU Taler Web shop integration tutorial (PHP)") }}
- (<a href="https://docs.taler.net/merchant/frontend/php/html/tutorial.html">html</a>,
- <a href="https://docs.taler.net/merchant/frontend/php/pdf/tutorial.pdf">pdf</a>)</li>
- <li>{{ _("The GNU Taler Web shop integration tutorial (Python)") }}
- (<a href="https://docs.taler.net/merchant/frontend/python/html/tutorial.html">html</a>,
- <a href="https://docs.taler.net/merchant/frontend/python/pdf/tutorial.pdf">pdf</a>)</li>
- </ul>
- <p></p>
-</div>
-</div>
-
-
-<div class="container">
-
- <div class="col-lg-6">
- <h2 id="overview">{{ _("The GNU Taler Merchant Backend") }}</h2>
-
- <p>{{ _("Merchants process payments using the Taler backend:") }}</p>
- <p>
<ul>
-
<li>
- {% trans %}
- The backend <b>signs</b> and <b>stores</b> the
- complete terms of offers made by the merchant to customers.
- For this, the merchant's frontend needs to give the
- customer's order in a JSON format to the backend.
- {% endtrans %}
+ {% trans %}
+ The backend <b>signs</b> and <b>stores</b> the
+ complete terms of offers made by the merchant to customers.
+ For this, the merchant's frontend needs to give the
+ customer's order in a JSON format to the backend.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- The backend <b>validates</b> payments received from
- the wallet and <b>executes</b> them with the Taler
- payment service provider (the exchange). For this,
- the merchant's frontend must pass the payment
- request through to the Taler backend and check the
- HTTP status code that is returned.
- {% endtrans %}
+ {% trans %}
+ The backend <b>validates</b> payments received from
+ the wallet and <b>executes</b> them with the Taler
+ payment service provider (the exchange). For this,
+ the merchant's frontend must pass the payment
+ request through to the Taler backend and check the
+ HTTP status code that is returned.
+ {% endtrans %}
</li>
<li>
- {% trans %}
- The backend can <b>list</b> completed transactions
- and <b>map</b> wire transfers to sets of business
- transactions, including the exact terms of each
- contract.
- {% endtrans %}
+ {% trans %}
+ The backend can <b>list</b> completed transactions
+ and <b>map</b> wire transfers to sets of business
+ transactions, including the exact terms of each
+ contract.
+ {% endtrans %}
</li>
-
</ul>
- </p>
- </div>
- <!--
- FIXME: When we wrap this img in a div of class col,
- FIXME: the image ends up overlaping the footer.
- -->
- <img src="{{ svg_localized('images/backend') }}"
- alt="{{ _("customer perspective")}}"
- class="img-fluid">
-</div> <!-- /container -->
+ </div>
+ <!--
+ FIXME: When we wrap this img in a div of class col,
+ FIXME: the image ends up overlaping the footer.
+ -->
+ <img src="{{ svg_localized('images/backend') }}"
+ alt="{{ _("customer perspective")}}"
+ class="img-fluid">
+ </div> <!-- /container -->
{% endblock body_content %}
diff --git a/template/news.html.j2 b/template/news.html.j2
index 8984afa..421dbaf 100644
--- a/template/news.html.j2
+++ b/template/news.html.j2
@@ -1,22 +1,20 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
- <div class="col">
- <h1>News</h1>
+ <div class="container">
+ <div class="col">
+ <h1>News</h1>
-{% include "news/2018-04.inc" %}
-{% include "news/2017-10.inc" %}
-{# include "news/2017-08.inc" #}
-{# include "news/2017-04.inc" #}
-{# include "news/2017-03.inc" #}
-{# include "news/2017-02.inc" #}
-{% include "news/2017-01.inc" %}
+ {% include "news/2018-04.inc" %}
+ {% include "news/2017-10.inc" %}
+ {# include "news/2017-08.inc" #}
+ {# include "news/2017-04.inc" #}
+ {# include "news/2017-03.inc" #}
+ {# include "news/2017-02.inc" #}
+ {% include "news/2017-01.inc" %}
-<a href="old-news.html"><h3>{{ _("More news")}}</h3></a>
+ <a href="old-news.html"><h3>{{ _("More news")}}</h3></a>
+ </div>
</div>
-</div>
-
-
{% endblock body_content %}
diff --git a/template/old-news.html.j2 b/template/old-news.html.j2
index fe339cd..611b4ae 100644
--- a/template/old-news.html.j2
+++ b/template/old-news.html.j2
@@ -1,44 +1,44 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="jumbotron">
- <div class="container text-center">
- <h1>{{ _("Older News") }}</h1>
- <div class="col-lg-12">
- <p>
- {% trans %}
- This page documents the GNU Taler history.
- {% endtrans %}
- </p>
+ <div class="jumbotron">
+ <div class="container text-center">
+ <h1>{{ _("Older News") }}</h1>
+ <div class="col-lg-12">
+ <p>
+ {% trans %}
+ This page documents the GNU Taler history.
+ {% endtrans %}
+ </p>
+ </div>
</div>
</div>
-</div>
-<div class="container">
- <div class="row">
- <div class="col-lg-12">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
-{#
- {% include "news/2016-12.inc" %}
-#}
-{% include "news/2016-10.inc" %}
-{% include "news/2016-09.inc" %}
-{% include "news/2016-08.inc" %}
-{% include "news/2016-06.inc" %}
-{% include "news/2015-12.inc" %}
+ {#
+ {% include "news/2016-12.inc" %}
+ #}
+ {% include "news/2016-10.inc" %}
+ {% include "news/2016-09.inc" %}
+ {% include "news/2016-08.inc" %}
+ {% include "news/2016-06.inc" %}
+ {% include "news/2015-12.inc" %}
-{#
- {% include "news/2015-11.inc" %}
-#}
+ {#
+ {% include "news/2015-11.inc" %}
+ #}
-{% include "news/2015-02.inc" %}
-{#
- {% include "news/2014-12.inc" %}
-#}
-{% include "news/2014-11.inc" %}
+ {% include "news/2015-02.inc" %}
+ {#
+ {% include "news/2014-12.inc" %}
+ #}
+ {% include "news/2014-11.inc" %}
+ </div>
</div>
- </div>
-</div> <!-- /container -->
+ </div> <!-- /container -->
{% endblock body_content %}
diff --git a/template/press.html.j2 b/template/press.html.j2
index 336ec36..a8e5d75 100644
--- a/template/press.html.j2
+++ b/template/press.html.j2
@@ -1,61 +1,53 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
-<h1>{{ _("GNU Taler in the Press")}}</h1>
+ <div class="container">
+ <h1>{{ _("GNU Taler in the Press")}}</h1>
-<h2>2018</h2>
-<p>
-<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>
- <li><a href="https://fossbytes.com/richard-stallman-proposes-data-collection-ceasing/">FOSSBYTES</a></li>
- <li><a href="http://www.pro-linux.de/news/1/25771/stallman-radikaler-vorschlag-zum-schutz-der-privatsph%C3%83%C2%A4re.html">Pro Linux</a></li>
- <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>
-<p>
+ <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>
+ <li><a href="https://fossbytes.com/richard-stallman-proposes-data-collection-ceasing/">FOSSBYTES</a></li>
+ <li><a href="http://www.pro-linux.de/news/1/25771/stallman-radikaler-vorschlag-zum-schutz-der-privatsph%C3%83%C2%A4re.html">Pro Linux</a></li>
+ <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>
-<p>
-<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>
- <li><a href="https://www.secupay.com/de/Node/932">Secupay</a></li>
- <li><a href="https://www.developpez.com/actu/142082/Taler-le-systeme-de-paiement-electronique-anonyme-developpe-par-GNU-et-l-INRIA-passe-en-version-0-3-0/">Developpez.com</a></li>
- <li><a href="https://yourstory.com/2017/08/techie-tuesdays-richard-stallman/">Techie Tuesdays</a></li>
- <li><a href="https://www.heise.de/tp/features/Kryptowaehrung-will-sich-an-den-Oelpreis-binden-3702862.html">Heise</a></li>
-</ul>
-</p>
+ <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>
+ <li><a href="https://www.secupay.com/de/Node/932">Secupay</a></li>
+ <li><a href="https://www.developpez.com/actu/142082/Taler-le-systeme-de-paiement-electronique-anonyme-developpe-par-GNU-et-l-INRIA-passe-en-version-0-3-0/">Developpez.com</a></li>
+ <li><a href="https://yourstory.com/2017/08/techie-tuesdays-richard-stallman/">Techie Tuesdays</a></li>
+ <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>
-<p>
-<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>
- <li><a href="https://www.reddit.com/r/technology/comments/4mnkin/gnu_taler_000_is_a_free_software_electronic/">Reddit</a></li>
- <li><a href="http://www.heise.de/newsticker/meldung/GNU-Taler-Open-Source-Protokoll-fuer-Zahlungen-in-Version-0-0-0-erschienen-3228525.html">Heise</a></li>
- <li><a href="http://www.golem.de/news/halbanonymes-bezahlsystem-gnu-taler-soll-kryptowaehrungen-gerechter-machen-1606-121323.html">Golem</a></li>
- <li><a href="https://news.ycombinator.com/item?id=11840453">Y-combinator</a></li>
- <li><a href="https://np.reddit.com/r/Anarcho_Capitalism/comments/4mnen4/gnutards_came_up_with_an_alternative_to_bitcoin/">Reddit</a></li>
- <li><a href="http://www.theregister.co.uk/2016/06/06/gnu_cryptocurrency_aims_at_the_mainstream_economy_not_the_black_market/">The Register</a></li>
- <li><a href="http://www.opennet.ru/opennews/art.shtml?num=44544">Opennet</a></li>
- <li><a href="http://www.pro-linux.de/news/1/23626/gnu-startet-anonymes-bezahlsystem-taler.html">Pro-Linux</a></li>
- <li><a href="https://www.nixp.ru/news/13738.html">nixp</a></li>
- <li><a href="https://www.mittelstandswiki.de/2016/06/open-source-geld-gnu-taler-soll-landeswaehrungen-online-verbinden/">Mittelstands Wiki</a></li>
- <li><a href="https://www.genbeta.com/especial/el-usuario-merece-que-sea-obligatorio-que-se-respete-su-libertad-entrevista-a-richard-stallman">Genbeta</a></li>
- <li><a href="http://www.lupa.cz/clanky/stallman-vydavatele-musi-umoznit-ctenarum-platit-za-zpravy-anonymne/">Lupz</a></li>
-</ul>
-</p>
+ <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>
+ <li><a href="https://www.reddit.com/r/technology/comments/4mnkin/gnu_taler_000_is_a_free_software_electronic/">Reddit</a></li>
+ <li><a href="http://www.heise.de/newsticker/meldung/GNU-Taler-Open-Source-Protokoll-fuer-Zahlungen-in-Version-0-0-0-erschienen-3228525.html">Heise</a></li>
+ <li><a href="http://www.golem.de/news/halbanonymes-bezahlsystem-gnu-taler-soll-kryptowaehrungen-gerechter-machen-1606-121323.html">Golem</a></li>
+ <li><a href="https://news.ycombinator.com/item?id=11840453">Y-combinator</a></li>
+ <li><a href="https://np.reddit.com/r/Anarcho_Capitalism/comments/4mnen4/gnutards_came_up_with_an_alternative_to_bitcoin/">Reddit</a></li>
+ <li><a href="http://www.theregister.co.uk/2016/06/06/gnu_cryptocurrency_aims_at_the_mainstream_economy_not_the_black_market/">The Register</a></li>
+ <li><a href="http://www.opennet.ru/opennews/art.shtml?num=44544">Opennet</a></li>
+ <li><a href="http://www.pro-linux.de/news/1/23626/gnu-startet-anonymes-bezahlsystem-taler.html">Pro-Linux</a></li>
+ <li><a href="https://www.nixp.ru/news/13738.html">nixp</a></li>
+ <li><a href="https://www.mittelstandswiki.de/2016/06/open-source-geld-gnu-taler-soll-landeswaehrungen-online-verbinden/">Mittelstands Wiki</a></li>
+ <li><a href="https://www.genbeta.com/especial/el-usuario-merece-que-sea-obligatorio-que-se-respete-su-libertad-entrevista-a-richard-stallman">Genbeta</a></li>
+ <li><a href="http://www.lupa.cz/clanky/stallman-vydavatele-musi-umoznit-ctenarum-platit-za-zpravy-anonymne/">Lupz</a></li>
+ </ul>
-<h2>2015</h2>
-<p>
-<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>
- <li><a href="http://www.heise.de/tp/artikel/46/46089/1.html">Heise</a></li>
- <li><a href="https://bitcoinmagazine.com/21901/bitcoin-governments-without-privacy-taxes/">Bitcoinmagazine</a></li>
- <li><a href="http://www.econotimes.com/Will-identifiable-digital-currency-become-the-new-normal-88131">EconoTimes</a></li>
-</ul>
-</p>
+ <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>
+ <li><a href="http://www.heise.de/tp/artikel/46/46089/1.html">Heise</a></li>
+ <li><a href="https://bitcoinmagazine.com/21901/bitcoin-governments-without-privacy-taxes/">Bitcoinmagazine</a></li>
+ <li><a href="http://www.econotimes.com/Will-identifiable-digital-currency-become-the-new-normal-88131">EconoTimes</a></li>
+ </ul>
-</div>
+ </div>
{% endblock body_content %}
diff --git a/template/principles.html.j2 b/template/principles.html.j2
index e1b94e1..3c3ffad 100644
--- a/template/principles.html.j2
+++ b/template/principles.html.j2
@@ -1,212 +1,177 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<script>
-function expand(n) {
- var x = document.getElementById(n);
- console.log(x);
- x.setAttribute("style", "");
-}
-</script>
+ <script>
+ function expand(n) {
+ var x = document.getElementById(n);
+ console.log(x);
+ x.setAttribute("style", "");
+ }
+ </script>
-<style>
-h2 {
- margin-top: 1em;
-}
-</style>
+ <style>
+ h2 {
+ margin-top: 1em;
+ }
+ </style>
-<div class="container">
- <div class="row">
- <div class="col">
- <h1>
- {% trans %}
- GNU Taler: Design Principles
- {% endtrans %}
- </h1>
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ <h1>{{ _("GNU Taler: Design Principles") }}</h1>
+ </div>
</div>
- </div>
- <p>
- {% trans %}
- When designing GNU Taler, we had the following design principles in mind:
- {% endtrans %}
- </p>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 1. Free Software implementation
- {% endtrans %}
- </h2>
- <a href="https://www.gnu.org/graphics/freedom.html"><img style="width:20vw;float:right" src="../images/stallman.medium.png" alt="{{_("... in the are of computing, freedom means not using proprietary software")}}"></a>
- <p>
- {% trans %}
- GNU Taler must be <a href="https://www.gnu.org/philosophy/free-sw.html">Free Software</a>.
- For merchants, our Free Software
- reference implementation prevents vendor lock-in. As
- the software of the payment provider itself is free, countries can
- deploy the payment system without compromising sovereignty.
- {% endtrans %}
- </p>
- <p>
- {% trans %}
- Customers benefit from Free Software
- as the wallet software can be made to run on a variety of platforms, and
- the absence of user-hostile features such as tracking or telemetry can easily be
- assured.
- {% endtrans %}
- </p>
+ <p>
+ {% trans %}
+ When designing GNU Taler, we had the following design principles in mind:
+ {% endtrans %}
+ </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("1. Free Software implementation") }}</h2>
+ <a href="https://www.gnu.org/graphics/freedom.html">
+ <img style="width:20vw;float:right" src="../images/stallman.medium.png" alt="{{ _("... in the are of computing, freedom means not using proprietary software") }}">
+ </a>
+ <p>
+ {% trans %}
+ GNU Taler must be <a href="https://www.gnu.org/philosophy/free-sw.html">Free Software</a>.
+ For merchants, our Free Software
+ reference implementation prevents vendor lock-in. As
+ the software of the payment provider itself is free, countries can
+ deploy the payment system without compromising sovereignty.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Customers benefit from Free Software
+ as the wallet software can be made to run on a variety of platforms, and
+ the absence of user-hostile features such as tracking or telemetry can easily be
+ assured.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 2. Protect the privacy of buyers
- {% endtrans %}
- </h2>
- <!-- From https://www.pixabay.com/ -->
- <img style="width:20vw;float:left;padding:15px" src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}">
- <p>
- {% trans %}
- Privacy should be guaranteed via technical measures, as opposed to mere
- policies. Especially with micropayments for online content, a disproportion-
- ate amount of rather private data about buyers would be revealed, if the
- payment system does not have privacy protections.
- {% endtrans %}
- </p>
- <p>
- {% trans %}
- In legislations with data protection regulations (such as the recently introduced GDPR in Europe),
- merchants benefit from this as well, as
- no data breach of customers can happen if this information is, by design,
- not collected in the first place. Obviously some private data, such as the
- shipping address for a physical delivery, must still be collected according to
- business needs.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("2. Protect the privacy of buyers") }}</h2>
+ <!-- From https://www.pixabay.com/ -->
+ <img style="width:20vw;float:left;padding:15px" src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}">
+ <p>
+ {% trans %}
+ Privacy should be guaranteed via technical measures, as opposed to mere
+ policies. Especially with micropayments for online content, a disproportion-
+ ate amount of rather private data about buyers would be revealed, if the
+ payment system does not have privacy protections.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ In legislations with data protection regulations (such as the recently introduced GDPR in Europe),
+ merchants benefit from this as well, as
+ no data breach of customers can happen if this information is, by design,
+ not collected in the first place. Obviously some private data, such as the
+ shipping address for a physical delivery, must still be collected according to
+ business needs.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 3. Enable the state to tax income and crack down on illegal business activities
- {% endtrans %}
- </h2>
- <!-- From https://www.pxhere.com/ -->
- <img style="width:20vw;float:right;padding:15px" src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}">
- <p>
- {% trans %}
- As a payment system must still be legal to operate and use, it must comply
- with these requirements. Furthermore, we consider levying of taxes as
- beneficial to society.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("3. Enable the state to tax income and crack down on illegal business activities") }}</h2>
+ <!-- From https://www.pxhere.com/ -->
+ <img style="width:20vw;float:right;padding:15px" src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}">
+ <p>
+ {% trans %}
+ As a payment system must still be legal to operate and use, it must comply
+ with these requirements. Furthermore, we consider levying of taxes as
+ beneficial to society.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 4. Prevent payment fraud
- {% endtrans %}
- </h2>
- <!-- From https://www.maxpixel.net/ -->
- <img style="width:20vw;float:left;padding:15px" src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}">
- <p>
- {% trans %}
- This imposes requirements on the security of the system, as well as on the
- general design, as payment fraud can also happen through misleading user
- interface design or the lack of cryptographic evidence for certain processes.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("4. Prevent payment fraud") }}</h2>
+ <!-- From https://www.maxpixel.net/ -->
+ <img style="width:20vw;float:left;padding:15px" src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}">
+ <p>
+ {% trans %}
+ This imposes requirements on the security of the system, as well as on the
+ general design, as payment fraud can also happen through misleading user
+ interface design or the lack of cryptographic evidence for certain processes.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 5. Only disclose the minimal amount of information necessary
- {% endtrans %}
- </h2>
- <img style="width:20vw;float:right;padding:15px" src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by default, General Data Protection Regulation (GDPR) compliant")}}"></a>
- <p>
- {% trans %}
- The reason behind this goal is similar to (2). The privacy of buyers is given
- priority, but other parties such as merchants still benefit from it, for example,
- by keeping details about the merchant’s financials hidden from competitors.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("5. Only disclose the minimal amount of information necessary") }}</h2>
+ <img style="width:20vw;float:right;padding:15px" src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by default, General Data Protection Regulation (GDPR) compliant")}}">
+ <p>
+ {% trans %}
+ The reason behind this goal is similar to (2). The privacy of buyers is given
+ priority, but other parties such as merchants still benefit from it, for example,
+ by keeping details about the merchant’s financials hidden from competitors.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>{% trans %}
- 6. Be usable
- {% endtrans %}
- </h2>
- <img style="width:20vw;float:left;padding:15px" src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}"></a>
- <p>
- {% trans %}
-Specifically it must be usable for non-expert customers. Usability also
-applies to the integration with merchants, and informs choices about the
-architecture, such as encapsulating procedures that require cryptographic
-operations into an isolated component with a simple API.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("6. Be usable") }}</h2>
+ <img style="width:20vw;float:left;padding:15px" src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}">
+ <p>
+ {% trans %}
+ Specifically it must be usable for non-expert customers. Usability also
+ applies to the integration with merchants, and informs choices about the
+ architecture, such as encapsulating procedures that require cryptographic
+ operations into an isolated component with a simple API.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 7. Be efficient
- {% endtrans %}
- </h2>
- <img style="width:20vw;float:right;padding:15px" src="../images/efficient.png" alt="{{_("Energy efficiency")}}"></a>
- <p>
- {% trans %}
- Approaches such as proof-of-work are ruled out by this requirement. Efficiency is necessary for GNU Taler to be used for micropayments.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("7. Be efficient")}}</h2>
+ <img style="width:20vw;float:right;padding:15px" src="../images/efficient.png" alt="{{_("Energy efficiency")}}">
+ <p>
+ {% trans %}
+ Approaches such as proof-of-work are ruled out by this
+ requirement. Efficiency is necessary for GNU Taler to be used for
+ micropayments.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 8. Fault-tolerant design
- {% endtrans %}
- </a></h2>
- <img style="width:20vw;float:left;padding:15px" src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}"></a>
- <p>
- {% trans %}
- Taler should tolerate failure of individual components and systems,
- including malicious operators compromising core secrets.
- This manifests in architectural choices such
- as the isolation of certain components, and auditing procedures.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("8. Fault-tolerant design")}}</h2>
+ <img style="width:20vw;float:left;padding:15px" src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}">
+ <p>
+ {% trans %}
+ Taler should tolerate failure of individual components and systems,
+ including malicious operators compromising core secrets.
+ This manifests in architectural choices such
+ as the isolation of certain components, and auditing procedures.
+ {% endtrans %}
+ </p>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2>
- {% trans %}
- 9. Foster competition
- {% endtrans %}
- </h2>
- <img style="width:20vw;float:right;padding:15px" src="../images/market.medium.jpg" alt="{{_("A competitive market")}}"></a>
- <p>
- {% trans %}
-It must be relatively easy for competitors to join the systems. While the
-barriers for this in traditional financial systems are rather high, the technical
-burden for new competitors to join must be minimized. Another design
-choice that supports this is to split the whole system into smaller components
-that can be operated, developed and improved upon independently,
-instead of having one completely monolithic system.
- {% endtrans %}
- </p>
+ <div class="row">
+ <div class="col-lg-12">
+ <h2>{{ _("9. Foster competition")}}</h2>
+ <img style="width:20vw;float:right;padding:15px" src="../images/market.medium.jpg" alt="{{_("A competitive market")}}">
+ <p>
+ {% trans %}
+ It must be relatively easy for competitors to join the systems. While the
+ barriers for this in traditional financial systems are rather high, the technical
+ burden for new competitors to join must be minimized. Another design
+ choice that supports this is to split the whole system into smaller components
+ that can be operated, developed and improved upon independently,
+ instead of having one completely monolithic system.
+ {% endtrans %}
+ </p>
</div>
</div>
</div>
diff --git a/template/schemafuzz.html.j2 b/template/schemafuzz.html.j2
index d4bb277..2908ed6 100644
--- a/template/schemafuzz.html.j2
+++ b/template/schemafuzz.html.j2
@@ -1,11 +1,11 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<!-- Jumbotron -->
+ <!-- Jumbotron -->
<div class="jumbotron">
<div class="container text-center">
<h1>{{ _("SchemaFuzz") }}</h1>
<p>
- Blah!
+ Blah!
</p>
</div>
diff --git a/template/team.html.j2 b/template/team.html.j2
index 96182b9..1d99439 100644
--- a/template/team.html.j2
+++ b/template/team.html.j2
@@ -1,150 +1,155 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
-<div class="row">
- <div class="col">
- <h1>GNU Taler: Team</h2>
- GNU Taler is proudly brought to you by the humans on this page. To contact the whole team, please
- write to <a href="mailto:contact@taler.net">contact@taler.net</a>.
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ <h1>GNU Taler: Team</h1>
+ <p>
+ {% trans %}
+ GNU Taler is proudly brought to you by the humans on this page.
+ To contact the whole team, please write to
+ {% endtrans %}
+ <a href="mailto:contact@taler.net">contact@taler.net</a>.
+ </p>
+ </div>
+ </div>
+ <div class="row mt-5"></div>
+ <div class="row">
+ <div class="col-lg-4">
+ <h2><a href="http://grothoff.org/christian/">Dr. Christian Grothoff</a></h2>
+ <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle">
+ <p>{{ _("GNU maintainer. Network security &amp; privacy researcher. Software architect.") }}</p>
+ </div>
+ <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>
+ </div>
+ <div class="col-lg-4">
+ <h2>Michael Widmer</h2>
+ <img src="{{ url('team-images/michael-widmer.jpg') }}" height="240" alt="Michael Widmer" align="middle">
+ <p>{{ _("Lawyer and banker.") }}</p>
+ </div>
+ </div>
+ <div class="row">
+ <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>
+ </div>
+ <div class="col-lg-4">
+ <h2>Dr. Jeffrey Burdges</h2>
+ <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle">
+ <p>{{ _("Applied cryptography. Contact to W3c &amp; Tor.") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2><a href="https://www.stallman.org/">Dr. Richard M. Stallman</a></h2>
+ <img src="{{ url('team-images/richard-stallman.jpg') }}" height="240" alt="Richard Stallman" align="middle">
+ <p>{{ _("Founder of the GNU project. Ethical guidance and licensing.") }}</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4">
+ <h2>Marcello Stanisci</h2>
+ <img src="{{ url('team-images/marcello-stanisci.jpg') }}" height="240" alt="Marcello Stanisci" align="middle">
+ <p>{{ _("Software engineer.") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Dr. Nana Karlstetter</h2>
+ <img src="{{ url('team-images/nana-karlstetter.jpg') }}" height="240" alt="Nana Karlstetter" align="middle">
+ <p>{{ _("Sustainable business development.") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2><a href="http://www.onete.net/">Dr. Cristina Onete</a></h2>
+ <img src="{{ url('team-images/cristina-onete.jpg') }}" height="240" alt="Cristina Onete" align="middle">
+ <p>{{ _("Theoretical foundations.") }}</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4">
+ <h2>ng0</h2>
+ <p>{{ _("System administration, Taler Systems SA.") }}</p>
+ </div>
+ </div>
+ <!-- keep translators together -->
+ <div class="row">
+ <div class="col-lg-4">
+ <h2><a href="https://ar.linkedin.com/in/martinolivera">Mart&#205;n Olivera</a></h2>
+ <p>{{ _("Translator (Spanish)") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Patricia Sunshine</h2>
+ <p>{{ _("Translator (Spanish)") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Fumiko</h2>
+ <p>{{ _("Translator (Spanish)") }}</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4">
+ <h2>Greta Breveglieri</h2>
+ <p>{{ _("Translator (Italian)") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Ylenia Baldanza</h2>
+ <p>{{ _("Translator (Italian)") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Valeria Salerno</h2>
+ <p>{{ _("Translator (Italian)") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Stefan K&uuml;gel</h2>
+ <p>{{ _("Translator (German)") }}</p>
+ </div>
+ </div>
+ <!-- more 'remote' people -->
+ <div class="row">
+ <div class="col-lg-4">
+ <h2><a href="https://www.nitrokey.com/">Jan Suhr</a></h2>
+ <p>{{ _("Hardware security module") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2><a href="http://www.goebel-consult.de/">Hartmut Goebel</a></h2>
+ <p>{{ _("Risk management") }}</p>
+ </div>
+ </div>
+ <!-- students -->
+ <div class="row">
+ <div class="col-lg-4">
+ <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2>
+ <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" alt="Sree Harsha Totakura" align="middle">
+ <p>{{ _("PhD Student, TU Munich. Currently teaching.") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2><a href="https://www.sec.in.tum.de/julian-kirsch/">Julian Kirsch</a></h2>
+ <p>{{ _("PhD student, TU Munich. Currently teaching.") }}</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4">
+ <h2>Oliver Broome</h2>
+ <p>{{ _("Free software developer.") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Shivam Kohli</h2>
+ <p>{{ _("Free software developer.") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Benedikt M&uuml;ller</h2>
+ <p>{{ _("Free software developer.") }}</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4">
+ <h2>Dominique Hofmann</h2>
+ <p>{{ _("Free software developer.") }}</p>
+ </div>
+ <div class="col-lg-4">
+ <h2>Jan Str&uuml;bin</h2>
+ <p>{{ _("Free software developer.") }}</p>
+ </div>
+ </div>
</div>
-</div>
-<div class="row mt-5"></div>
-<div class="row">
- <div class="col-lg-4">
- <h2><a href="http://grothoff.org/christian/">Dr. Christian Grothoff</a></h2>
- <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle">
- <p>{{ _("GNU maintainer. Network security &amp; privacy researcher. Software architect.") }}</p>
- </div>
- <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>
- </div>
- <div class="col-lg-4">
- <h2>Michael Widmer</h2>
- <img src="{{ url('team-images/michael-widmer.jpg') }}" height="240" alt="Michael Widmer" align="middle">
- <p>{{ _("Lawyer and banker.") }}</p>
- </div>
-</div>
-<div class="row">
- <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>
- </div>
- <div class="col-lg-4">
- <h2>Dr. Jeffrey Burdges</h2>
- <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle">
- <p>{{ _("Applied cryptography. Contact to W3c &amp; Tor.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="https://www.stallman.org/">Dr. Richard M. Stallman</a></h2>
- <img src="{{ url('team-images/richard-stallman.jpg') }}" height="240" alt="Richard Stallman" align="middle">
- <p>{{ _("Founder of the GNU project. Ethical guidance and licensing.") }}</p>
- </div>
-</div>
-<div class="row">
- <div class="col-lg-4">
- <h2>Marcello Stanisci</h2>
- <img src="{{ url('team-images/marcello-stanisci.jpg') }}" height="240" alt="Marcello Stanisci" align="middle">
- <p>{{ _("Software engineer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Dr. Nana Karlstetter</h2>
- <img src="{{ url('team-images/nana-karlstetter.jpg') }}" height="240" alt="Nana Karlstetter" align="middle">
- <p>{{ _("Sustainable business development.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="http://www.onete.net/">Dr. Cristina Onete</a></h2>
- <img src="{{ url('team-images/cristina-onete.jpg') }}" height="240" alt="Cristina Onete" align="middle">
- <p>{{ _("Theoretical foundations.") }}</p>
- </div>
-</div>
-<div class="row">
- <div class="col-lg-4">
- <h2>ng0</h2>
- <p>{{ _("System administration, Taler Systems SA.") }}</p>
- </div>
-</div>
-<!-- keep translators together -->
-<div class="row">
- <div class="col-lg-4">
- <h2><a href="https://ar.linkedin.com/in/martinolivera">Martín Olivera</a></h2>
- <p>{{ _("Translator (Spanish)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Patricia Sunshine</h2>
- <p>{{ _("Translator (Spanish)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Fumiko</h2>
- <p>{{ _("Translator (Spanish)") }}</p>
- </div>
-</div>
-<div class="row">
- <div class="col-lg-4">
- <h2>Greta Breveglieri</h2>
- <p>{{ _("Translator (Italian)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Ylenia Baldanza</h2>
- <p>{{ _("Translator (Italian)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Valeria Salerno</h2>
- <p>{{ _("Translator (Italian)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Stefan K&uuml;gel</h2>
- <p>{{ _("Translator (German)") }}</p>
- </div>
-</div>
-<!-- more 'remote' people -->
-<div class="row">
- <div class="col-lg-4">
- <h2><a href="https://www.nitrokey.com/">Jan Suhr</a></h2>
- <p>{{ _("Hardware security module") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="http://www.goebel-consult.de/">Hartmut Goebel</a></h2>
- <p>{{ _("Risk management") }}</p>
- </div>
-</div>
-<!-- students -->
-<div class="row">
- <div class="col-lg-4">
- <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2>
- <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" alt="Sree Harsha Totakura" align="middle">
- <p>{{ _("PhD Student, TU Munich. Currently teaching.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="https://www.sec.in.tum.de/julian-kirsch/">Julian Kirsch</a></h2>
- <p>{{ _("PhD student, TU Munich. Currently teaching.") }}</p>
- </div>
-</div>
-<div class="row">
- <div class="col-lg-4">
- <h2>Oliver Broome</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Shivam Kohli</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Benedikt Müller</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
-</div>
-<div class="row">
- <div class="col-lg-4">
- <h2>Dominique Hofmann</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Jan Str&uuml;bin</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
-</div>
-</div>
{% endblock body_content %}