[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch master updated: update gov page
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-www] branch master updated: update gov page |
Date: |
Tue, 07 Mar 2017 11:57:40 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new bb1f435 update gov page
bb1f435 is described below
commit bb1f4354d871b6b68294d6500da8bcae6e6bc715
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Mar 7 11:57:37 2017 +0100
update gov page
---
common/footer.j2.inc | 4 ++--
governments.html.j2 | 53 ++++++++++++++++++----------------------------------
2 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 40f9780..55d181d 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -11,9 +11,9 @@
</div>
<div class="col-xs-12 col-sm-4">
<ul class="footer-list">
- <li><p><a href="governments.html">{{ _("Governments") }}
</a></p></li>
- <li><p><a href="merchants.html">{{ _("Merchants") }}</a></p></li>
<li><p><a href="citizens.html">{{ _("Citizens")}} </a></p></li>
+ <li><p><a href="merchants.html">{{ _("Merchants") }}</a></p></li>
+ <li><p><a href="governments.html">{{ _("Governments") }}
</a></p></li>
</ul>
</div>
<div class="col-xs-12 col-sm-4">
diff --git a/governments.html.j2 b/governments.html.j2
index 2b627c3..a0a7eb0 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -113,32 +113,28 @@
<div class="container">
<div class="col-lg-12">
- <h2 id="overview">{{ _("Taler as seen by governments") }}</h2>
-
- <p>{{ _("Governments can observe traditional wire transfers
- entering and leaving the Taler system, and require
- merchants and exchange operators to provide certain
- information during financial audits. Exchange
- operators are expected to be permanently checked by
- auditors, while merchants may be required to reveal
- information during regular tax audits. Information
- available to the government includes: ") }}</p>
-
- <p>
- <img src="{{ url('images/government.svg') }}" alt="government perspective"
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
- </p><ul>
-
- <li>{{ _("From the banking system: The total amount of
- digital currency obtained by a customer. The
- government could impose limits on how many
- digital coins a customer may withdraw within a
+ <h2 id="overview">{{ _("Taler provides privacy and accountability") }}</h2>
+
+ <p>{{ _("Taler assumes governments can observe traditional wire transfers
+ entering and leaving the Taler payment system. Starting with the
+ wire transfers, governments can obtain: ") }}</p>
+ <ul>
+
+ <li>{{ _("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 timeframe.") }}</li>
- <li>{{ _("From the banking system: The total amount of
- income received by any merchant via the Taler
+ <li>{{ _("The income received by any merchant via the Taler
system.") }}</li>
- <li>{{ _("From auditing the exchange: The amounts of
+ <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.") }}</li>
+
+ <li>{{ _("The amounts of
digital coins legitimately withdrawn by
customers from the exchange, the value of
non-redeemed digital coins in customer's
@@ -147,19 +143,6 @@
merchants with the exchange, and the income of
the exchange from transaction fees.") }}</li>
- <li>{{ _("From auditing merchants: For each deposit
- operation, 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. Note that while the customer can
- decide to prove that it was his transaction
- (i.e. in court when suing the merchant if the
- merchant failed to deliver on the contract),
- merchant, exchange and government cannot find
- out the customer's identity from the information
- that Taler collects.") }}</li>
-
</ul>
<p></p>
</div>
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-www] branch master updated: update gov page,
gnunet <=