[taler-www] branch stable updated (1917df4 -> ede1c3a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch stable
in repository www.

    from 1917df4  point to release version of wallet app in play store
     add ad7a243  Translated using Weblate (German)
     add 74b1f0e  add pages for cashier and pos, modify link to wallet to point 
to F-Droid instead of F-Dold
     add 2a63c02  snack launch
     add ede1c3a  merge

No new revisions were added by this update.

Summary of changes:
 locale/de/LC_MESSAGES/messages.po |  6 ++-
 news/2020-09.html.j2              | 17 ++++++++
 template/cashier.html.j2          | 87 ++++++++++++++++++++++++++++++---------
 template/pos.html.j2              | 78 +++++++++++++++++++++++++++++++++++
 template/wallet.html.j2           |  4 +-
 www.yml                           |  5 +++
 6 files changed, 175 insertions(+), 22 deletions(-)
 create mode 100644 news/2020-09.html.j2
 create mode 100644 template/pos.html.j2

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index eba7331..8c5dfc6 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: German (Taler Website)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-07-04 22:21+0200\n"
-"PO-Revision-Date: 2020-09-09 07:56+0000\n"
+"PO-Revision-Date: 2020-09-13 19:53+0000\n"
 "Last-Translator: Stefan <eintritt@hotmail.com>\n"
 "Language-Team: German <http://weblate.taler.net/projects/gnu-taler/";
 "main-web-site/de/>\n"
@@ -1923,6 +1923,10 @@ msgid ""
 "to local laws. In this case, GNU Taler must enable deletion of such data as "
 "soon as it is no longer required."
 msgstr ""
+"Wenn es nötig ist, bestimmte persönliche Daten wie z.B. eine Lieferadresse "
+"zur Bestellabwicklung einzugeben, speichert GNU Taler diese Daten gemäß "
+"gültiger Gesetze und hat sicherzustellen, dass sie auch wieder gelöscht "
+"werden können, sobald man sie nicht mehr benötigt."
 
 #: template/principles.html.j2:83
 #, fuzzy
diff --git a/news/2020-09.html.j2 b/news/2020-09.html.j2
new file mode 100644
index 0000000..e9ab888
--- /dev/null
+++ b/news/2020-09.html.j2
@@ -0,0 +1,17 @@
+{% extends "common/news.j2" %}
+{% block body_content %}
+<h1>2020-09: GNU Taler operational at Bern University of Applied Sciences</h1>
+<p>
+  The GNU Taler payment system was launched at the
+  <a href="https://bfh.ch/";>BFH</a> in the presence of a representative
+  of the <a href="https://snb.ch/";>Swiss National Bank</a>. Students, staff, 
faculty and visitors
+  can visit the cafeteria at Höheweg 80 to withdraw the electronic equivalent 
of Swiss Franks (CHF)
+  onto <a href="https://wallet.taler.net/";>Taler Wallet App</a>
+  running on their mobile phones and pay at a Taler-enabled
+  snack machine. The system is expected to expand to allow payments
+  at other places in the future.  Various faculty members and
+  students are involved various aspects of the project. Students
+  interested in working on projects or theses related to the subject
+  should contact Prof. Grothoff.
+</p>
+{% endblock body_content %}
diff --git a/template/cashier.html.j2 b/template/cashier.html.j2
index c7509e9..6a6b548 100644
--- a/template/cashier.html.j2
+++ b/template/cashier.html.j2
@@ -1,29 +1,78 @@
 {% extends "common/base.j2" %}
 
+{% block head_content %}
+<style type="text/css">
+  .greenbox {
+  background-color: #5EFF64;
+  border: solid;
+  border-radius: 5px;
+  padding: 0.5em;
+  }
+  .bluebox {
+  background-color: #C2C6FF;
+  border: solid;
+  border-radius: 5px;
+  padding: 0.5em;
+  }
+  .error {
+  font-style: italic;
+  display: none;
+  }
+  #install-result {
+  font-weight: bold;
+  }
+
+  main ul li {
+  margin-bottom: 1em;
+  }
+</style>
+{% endblock head_content %}
+
 {% block body_content %}
-<!-- Jumbotron -->
-<div class="jumbotron">
-    <div class="text-center">
-        <h1 lang="en">{{ _("Taler Cashier") }}</h1>
+    <!-- Jumbotron -->
+    <div class="jumbotron">
+      <div class="text-center">
+      <h1 lang="en">Taler Cashier</h1>
+      </div>
     </div>
-</div>
 
-<div class="container">
+  <div class="container">
 
     <div class="row">
-        <div class="col-lg-12">
-            <p>
-                {% trans %}
-                The Taler Cashier is an Android app
-                that enables you to take cash and give out electronic cash.
-                {% endtrans %}
-            </p>
-            <h2>{{ _("Download") }}</h2>
-            <p>
-                Coming soon!
-            </p>
-        </div> <!-- /col-lg-12 -->
+      <div class="col-lg-12">
+        {% trans %}
+          This is the page for the Taler cashier App. It allows
+          the cashier to grant Taler users the right to withdraw
+          a certain amount of e-cash from the cashier's bank
+          account. Thus, it offers
+          an equivalent functionality to what you may find
+          on the bank Web site when withdrawing from an account there.
+        {% endtrans %}
+        </a>.
+      </div>
     </div> <!-- /row -->
 
-</div> <!-- /container -->
+    <div class="row">
+      <div class="col-lg-6">
+        <h2>Android 4.4 (API 18) or later</h2>
+        <ul>
+          <li>
+            <a href="https://play.google.com/apps/testing/net.taler.cashier";>
+               {% trans %}
+                 Install Android App from Google App Store, or
+               {% endtrans %}
+            </a>
+          </li>
+          <li>
+            <a href="https://f-droid.org/en/packages/net.taler.cashier/";>
+               {% trans %}
+                 Download App from F-Droid.org.
+               {% endtrans %}
+            </a>
+          </li>
+        </ul>
+      </div> <!-- /col-lg-6 -->
+
+    </div> <!-- /row -->
+  </div> <!-- /container -->
 {% endblock body_content %}
diff --git a/template/pos.html.j2 b/template/pos.html.j2
new file mode 100644
index 0000000..85222c1
--- /dev/null
+++ b/template/pos.html.j2
@@ -0,0 +1,78 @@
+{% extends "common/base.j2" %}
+
+{% block head_content %}
+<style type="text/css">
+  .greenbox {
+  background-color: #5EFF64;
+  border: solid;
+  border-radius: 5px;
+  padding: 0.5em;
+  }
+  .bluebox {
+  background-color: #C2C6FF;
+  border: solid;
+  border-radius: 5px;
+  padding: 0.5em;
+  }
+  .error {
+  font-style: italic;
+  display: none;
+  }
+  #install-result {
+  font-weight: bold;
+  }
+
+  main ul li {
+  margin-bottom: 1em;
+  }
+</style>
+{% endblock head_content %}
+
+{% block body_content %}
+    <!-- Jumbotron -->
+    <div class="jumbotron">
+      <div class="text-center">
+      <h1 lang="en">Taler Point of Sale (PoS)</h1>
+      </div>
+    </div>
+
+  <div class="container">
+
+    <div class="row">
+      <div class="col-lg-12">
+        {% trans %}
+          This is the page for the Taler PoS App. It allows
+          a vendor to maintain a list of products and to
+          quickly build up Taler contracts and process Taler
+          payments for these contracts. Its main use-case
+          is for a mensa, cafeteria or restaurant when vending
+          food from a menu.
+        {% endtrans %}
+        </a>.
+      </div>
+    </div> <!-- /row -->
+
+    <div class="row">
+      <div class="col-lg-6">
+        <h2>Android 4.4 (API 18) or later</h2>
+        <ul>
+          <li>
+            <a 
href="https://play.google.com/apps/testing/net.taler.merchantpos";>
+               {% trans %}
+                 Install Android App from Google App Store, or
+               {% endtrans %}
+            </a>
+          </li>
+          <li>
+            <a href="https://f-droid.org/en/packages/net.taler.merchantpos/";>
+               {% trans %}
+                 Download App from F-Droid.org.
+               {% endtrans %}
+            </a>
+          </li>
+        </ul>
+      </div> <!-- /col-lg-6 -->
+
+    </div> <!-- /row -->
+  </div> <!-- /container -->
+{% endblock body_content %}
diff --git a/template/wallet.html.j2 b/template/wallet.html.j2
index f41a087..9edd931 100644
--- a/template/wallet.html.j2
+++ b/template/wallet.html.j2
@@ -244,9 +244,9 @@ document.addEventListener('DOMContentLoaded', onLoad);
             </a>
           </li>
           <li>
-            <a 
href="https://gitlab.com/fdroid/fdroiddata/-/merge_requests/7401";>
+            <a href="https://f-droid.org/en/packages/net.taler.wallet.fdroid/";>
                {% trans %}
-                  Download via F-Droid (available soon).
+                 Download Android App from F-Droid (bypassing Google 
registration).
                {% endtrans %}
             </a>
           </li>
diff --git a/www.yml b/www.yml
index c46a784..361cd3a 100644
--- a/www.yml
+++ b/www.yml
@@ -26,6 +26,11 @@ staticfiles:
       - robots.txt
 meetingnotes:
 newsposts:
+  - page: 2020-09.html
+    date: 2020-09-16
+    title: GNU Taler launched at BFH
+    abstract:
+    content:
   - page: 2020-07.html
     date: 2020-07-01
     title: Exchange independent security audit report published

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.