adaptations based on suggestions from RMS

author: Christian Grothoff <christian@grothoff.org> 2020-10-24 10:12:52 +0200
committer: Christian Grothoff <christian@grothoff.org> 2020-10-24 10:12:52 +0200
commit: f87130713a9e04bb2c017b11c47d32d9f8635958 (patch)
tree: 0755a6257b5e780e3e2df79491b59c9f116ce66a
parent: 3009120bf5e40a3ab2881b7cdf02bb228ecb77de (diff)
download: www-f87130713a9e04bb2c017b11c47d32d9f8635958.tar.gz
www-f87130713a9e04bb2c017b11c47d32d9f8635958.tar.bz2
www-f87130713a9e04bb2c017b11c47d32d9f8635958.zip
11 files changed, 777 insertions, 650 deletions
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 92ab8c1..36ed6b3 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -25,10 +25,12 @@
   </div>
   <div class="text-center mt-5">
     <p>
-      &copy; <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }}
-              Taler Systems SA 2015-2019
+       {{ _("GNU Taler is developed as part of the <a href='https://www.gnu.org/'>GNU project</a> for the GNU operating system.") }}
        <br>
-       {{ _("We are grateful for support and free hosting of this site by <a href='https://www.bfh.ch/'>BFH</a>") }}.
+       &copy; <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }}
+               Taler Systems SA 2015-2020
+       <br>
+       {{ _("We are grateful for support and free hosting of this site by <a href='https://www.bfh.ch/'>BFH</a>.") }}
        <br>
        {{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}
     </p>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index d003c89..9347809 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,11 +2,11 @@ msgid ""
 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"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: 2020-10-21 13:16+0000\n"
 "Last-Translator: Christian Grothoff <christian@grothoff.org>\n"
-"Language-Team: German <http://weblate.taler.net/projects/gnu-taler/"
-"main-web-site/de/>\n"
+"Language-Team: German <http://weblate.taler.net/projects/gnu-taler/main-web-"
+"site/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,9 +39,13 @@ msgid "and"
 msgstr "und"
 
 #: common/footer.j2.inc:31
+#, fuzzy
+#| msgid ""
+#| "We are grateful for support and free hosting of this site by <a "
+#| "href='http://www.bfh.ch/'>BFH</a>"
 msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://"
-"www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 "Wir danken der <a href='http://www.bfh.ch/'>Fachhochschule Bern</a> für ihre "
 "Unterstützung und das kostenlose Hosting dieser Webseiten"
@@ -54,19 +58,19 @@ msgstr ""
 "Diese Webseiten wurden ausschließlich mit <a href='https://www.gnu."
 "org/'>freier Software</a> erstellt."
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr "Features"
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr "Prinzipien"
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr "Dokumente/Links"
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr "Aktuelles"
 
@@ -97,23 +101,22 @@ msgstr "Bibliografie von GNU Taler"
 msgid "by"
 msgstr "von"
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
-msgstr "Taler Cashier"
-
-#: template/cashier.html.j2:16
+#: template/cashier.html.j2:43
 msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and give "
-"out electronic cash."
+"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."
 msgstr ""
-"Taler Cashier ist eine Android-App, mit der man Bargeld von einem Kassierer "
-"persönlich entgegennehmen und in Taler-Coins auf das Taler-Wallet buchen "
-"lassen kann. Die Aufbuchung kann auf das eigene oder ein fremdes Wallet "
-"erfolgen."
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
-msgstr "Download"
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
+msgstr "Installation der GNU Taler Android-App vom Google App-Store"
+
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
+msgstr ""
 
 #: template/contact.html.j2:6
 msgid "Contact information"
@@ -289,8 +292,8 @@ msgid ""
 "Tutorial and manual for operating a merchant. Also available as <a href="
 "\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
 msgstr ""
-"Anleitung zum Aufsetzen der Verkäufer-Backends. Hier auch als <a href=\"https"
-"://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Anleitung zum Aufsetzen der Verkäufer-Backends. Hier auch als <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
 
 #: template/docs.html.j2:50
 msgid "Merchant API Tutorial"
@@ -304,8 +307,8 @@ msgid ""
 "pdf\">PDF</a>."
 msgstr ""
 "Anleitung zur Zahlungsabwicklung mit Taler unter Verwendung der API für "
-"Verkäufer (merchant backend API). Hier auch als <a href=\"https://%(baseurl)"
-"s/pdf/taler-merchant-api-tutorial.pdf\">PDF</a>."
+"Verkäufer (merchant backend API). Hier auch als <a href=\"https://"
+"%(baseurl)s/pdf/taler-merchant-api-tutorial.pdf\">PDF</a>."
 
 #: template/docs.html.j2:62
 msgid "Exchange"
@@ -317,8 +320,8 @@ msgid ""
 "Operator&#39;s manual for the GNU Taler exchange. Also available as <a href="
 "\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
 msgstr ""
-"Anleitung für Exchange-Betreiber. Hier auch als <a href=\"https://%(baseurl)"
-"s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+"Anleitung für Exchange-Betreiber. Hier auch als <a href=\"https://"
+"%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
 
 #: template/docs.html.j2:74
 msgid "Bank Integration"
@@ -359,8 +362,8 @@ msgid ""
 "Manual to run the back-office Web application. Also available as <a href="
 "\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
 msgstr ""
-"Anleitung der Anwendung, die Zahlungseingänge an Verkäufer prüft ("
-"webbasiertes Back-Office). Hier auch als <a href=\"https://%(baseurl)s/pdf/"
+"Anleitung der Anwendung, die Zahlungseingänge an Verkäufer prüft "
+"(webbasiertes Back-Office). Hier auch als <a href=\"https://%(baseurl)s/pdf/"
 "taler-backoffice-manual.pdf\">PDF</a>."
 
 #: template/docs.html.j2:116
@@ -374,8 +377,8 @@ msgid ""
 "href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
 msgstr ""
 "Anleitung zur Konfiguration und Verwendung der POS-App Taler Merchant. Hier "
-"auch als <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\""
-">PDF</a>."
+"auch als <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf"
+"\">PDF</a>."
 
 #: template/docs.html.j2:128
 msgid "Cashier"
@@ -1609,6 +1612,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr "Download"
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1803,6 +1810,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler in den Medien"
@@ -2270,14 +2285,12 @@ msgstr "Installation von Chrome mit GNU Taler"
 msgid "from the Chrome Web Store"
 msgstr "vom Chrome-Webstore"
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr "Installation der GNU Taler Android-App vom Google App-Store"
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in a "
-"File Manager to install."
+#, fuzzy
+#| msgid ""
+#| "Download Android App from us (bypassing Google registration) and Open in "
+#| "a File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 "Download der GNU Taler Android-App direkt bei uns (ohne Registrierung bei "
 "Google) und Installation über einen Dateimanager."
@@ -2290,6 +2303,18 @@ msgstr "Andere Browser"
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "Wallets für andere Browser werden zukünftig bereitgestellt."
 
+#~ msgid "Taler Cashier"
+#~ msgstr "Taler Cashier"
+
+#~ msgid ""
+#~ "The Taler Cashier is an Android app that enables you to take cash and "
+#~ "give out electronic cash."
+#~ msgstr ""
+#~ "Taler Cashier ist eine Android-App, mit der man Bargeld von einem "
+#~ "Kassierer persönlich entgegennehmen und in Taler-Coins auf das Taler-"
+#~ "Wallet buchen lassen kann. Die Aufbuchung kann auf das eigene oder ein "
+#~ "fremdes Wallet erfolgen."
+
 #~ msgid ""
 #~ "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
 #~ "\">Free Software</a>. For merchants, our Free Software reference "
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index ff87e51..4989a78 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -39,8 +39,8 @@ msgstr ""
 
 #: common/footer.j2.inc:31
 msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://"
-"www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 
 #: common/footer.j2.inc:33
@@ -49,19 +49,19 @@ msgid ""
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr ""
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr ""
 
@@ -90,18 +90,21 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
+#: template/cashier.html.j2:43
+msgid ""
+"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."
 msgstr ""
 
-#: template/cashier.html.j2:16
-msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and give "
-"out electronic cash."
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
 msgstr ""
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
 msgstr ""
 
 #: template/contact.html.j2:6
@@ -1201,6 +1204,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1380,6 +1387,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
@@ -1665,14 +1680,8 @@ msgstr ""
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in a "
-"File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 
 #: template/wallet.html.j2:261
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 56d8714..5d26b67 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: 2020-10-22 14:51+0000\n"
 "Last-Translator: Javier Sepulveda <javier.sepulveda@uv.es>\n"
-"Language-Team: Spanish <http://weblate.taler.net/projects/gnu-taler/"
-"main-web-site/es/>\n"
+"Language-Team: Spanish <http://weblate.taler.net/projects/gnu-taler/main-web-"
+"site/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,9 +40,13 @@ msgid "and"
 msgstr "y"
 
 #: common/footer.j2.inc:31
+#, fuzzy
+#| msgid ""
+#| "We are grateful for support and free hosting of this site by <a "
+#| "href='http://www.bfh.ch/'>BFH</a>"
 msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://"
-"www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 "Estamos agradecidos por el soporte y el hospedaje gratuito de este sitio por "
 "<a href='http://www.bfh.ch/'>BFH</a>"
@@ -55,19 +59,19 @@ msgstr ""
 "Esta página fue creada usando solo <a href='https://www.gnu.org/'>Software "
 "Libre</a>."
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr "Funcionalidades"
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr "Principios"
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr "Docs"
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr "Noticias"
 
@@ -98,21 +102,22 @@ msgstr "Bibliografía GNU Taler"
 msgid "by"
 msgstr "por"
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
-msgstr "Cajero Taler"
-
-#: template/cashier.html.j2:16
+#: template/cashier.html.j2:43
 msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and give "
-"out electronic cash."
+"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."
 msgstr ""
-"El cajero Taler es una aplicación Android que te permite tomar efectivo y "
-"recibir efectivo electrónico."
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
-msgstr "Descargar"
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
+msgstr ""
+
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
+msgstr ""
 
 #: template/contact.html.j2:6
 msgid "Contact information"
@@ -216,10 +221,10 @@ msgid ""
 "development</a> of the GNUnet and GNU Taler projects is satisfied."
 msgstr ""
 "Contribuidores con GNU Taler con acceso GIT deben firmar la <a href=\"/pdf/"
-"copyright.pdf\">asignación de copyright</a> para asegurar que <a href=\"https"
-"://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex\">el acuerdo "
-"de licencia y desarrollo colaborativo GNUnet e.V. --- Taler Systems SA </"
-"a>de los proyectos GNUnet y GNU Taler está satisfecho."
+"copyright.pdf\">asignación de copyright</a> para asegurar que <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex\">el "
+"acuerdo de licencia y desarrollo colaborativo GNUnet e.V. --- Taler Systems "
+"SA </a>de los proyectos GNUnet y GNU Taler está satisfecho."
 
 #: template/copyright.html.j2:19
 msgid ""
@@ -318,8 +323,8 @@ msgid ""
 "a>."
 msgstr ""
 "Manual para integrar estrechamente Taler con aplicaciones bancarias. También "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\""
-">PDF</a>."
+"disponible en <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
 
 #: template/docs.html.j2:92
 msgid "Wallet"
@@ -346,8 +351,8 @@ msgid ""
 "\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
 msgstr ""
 "Manual para ejecutar el panel de control de la aplicación Web. También "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\""
-">PDF</a>."
+"disponible en <a href=\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf"
+"\">PDF</a>."
 
 #: template/docs.html.j2:116
 msgid "Merchant POS Terminal"
@@ -360,8 +365,8 @@ msgid ""
 "href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
 msgstr ""
 "Manual para configurar y usar la app de punto de venta. También disponible "
-"en <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\""
-">PDF</a>."
+"en <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</"
+"a>."
 
 #: template/docs.html.j2:128
 msgid "Cashier"
@@ -717,8 +722,8 @@ msgstr ""
 "exploración o han desarrollado prototipos en funcionamiento. Nosotros "
 "también estamos en discusiones sobre el proyecto con varios bancos normales "
 "y también con bancos centrales. Dicho esto, no hay productos en el mercado "
-"todavía, y nosotros creemos que sería prematuro dado el estado del proyecto.("
-"ver también <a href=\"https://gnunet.org/bugs/\">nuestro rastreador de "
+"todavía, y nosotros creemos que sería prematuro dado el estado del proyecto."
+"(ver también <a href=\"https://gnunet.org/bugs/\">nuestro rastreador de "
 "errores </a> para ver una lista de incidencias abiertas)."
 
 #: template/faq.html.j2:174
@@ -799,8 +804,8 @@ msgid ""
 "accept payments <span class=\"tlr\">without making their customers register</"
 "span> on the merchant&#39;s Website."
 msgstr ""
-"Cuando se realiza un pago, los clientes solo necesitan un cartera con "
-"saldo.El comerciante puede aceptar pagos <span class=\"tlr\">sin hacer a sus "
+"Cuando se realiza un pago, los clientes solo necesitan un cartera con saldo."
+"El comerciante puede aceptar pagos <span class=\"tlr\">sin hacer a sus "
 "clientes registrarse</span> en su página."
 
 #: template/features.html.j2:50
@@ -1463,6 +1468,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr "Descargar"
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1642,6 +1651,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
@@ -1927,14 +1944,8 @@ msgstr ""
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in a "
-"File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 
 #: template/wallet.html.j2:261
@@ -1944,3 +1955,13 @@ msgstr ""
 #: template/wallet.html.j2:263
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
+
+#~ msgid "Taler Cashier"
+#~ msgstr "Cajero Taler"
+
+#~ msgid ""
+#~ "The Taler Cashier is an Android app that enables you to take cash and "
+#~ "give out electronic cash."
+#~ msgstr ""
+#~ "El cajero Taler es una aplicación Android que te permite tomar efectivo y "
+#~ "recibir efectivo electrónico."
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 01ab03d..212d381 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French (Taler Website)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: 2020-10-04 10:16+0000\n"
 "Last-Translator: pitchum <pitchum@gramaton.org>\n"
-"Language-Team: French <http://weblate.taler.net/projects/gnu-taler/"
-"main-web-site/fr/>\n"
+"Language-Team: French <http://weblate.taler.net/projects/gnu-taler/main-web-"
+"site/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,9 +39,13 @@ msgid "and"
 msgstr "et"
 
 #: common/footer.j2.inc:31
+#, fuzzy
+#| msgid ""
+#| "We are grateful for support and free hosting of this site by <a "
+#| "href='http://www.bfh.ch/'>BFH</a>"
 msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://"
-"www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 "Nous remercions <a href='http://www.bfh.ch/'>BFH</a> pour le support et pour "
 "l'hébergement gratuit de ce site"
@@ -54,19 +58,19 @@ msgstr ""
 "Cette page a été créée exclusivement avec des <a href='https://www.gnu."
 "org/'>logiciels libres</a>."
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr "Principes"
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr "Docs"
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr "Actualité"
 
@@ -97,21 +101,24 @@ msgstr "Bibliographie autour de GNU Taler"
 msgid "by"
 msgstr "par"
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
-msgstr "Caisse enregistreuse Taler"
-
-#: template/cashier.html.j2:16
+#: template/cashier.html.j2:43
 msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and give "
-"out electronic cash."
+"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."
 msgstr ""
-"La caisse enregistreuse Taler est une application Android qui vous permet "
-"d'encaisser des espèces et rendre la monnaie en monnaie numérique."
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
-msgstr "Télécharger"
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
+msgstr ""
+"Installer l'application Android à partir du magasin d'applications Google "
+"Play, ou"
+
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
+msgstr ""
 
 #: template/contact.html.j2:6
 msgid "Contact information"
@@ -1445,6 +1452,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr "Télécharger"
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1624,6 +1635,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler dans la presse"
@@ -2018,16 +2037,12 @@ msgstr "Installer GNU Taler"
 msgid "from the Chrome Web Store"
 msgstr "à partir du Chrome Web Store"
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-"Installer l'application Android à partir du magasin d'applications Google "
-"Play, ou"
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in a "
-"File Manager to install."
+#, fuzzy
+#| msgid ""
+#| "Download Android App from us (bypassing Google registration) and Open in "
+#| "a File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 "Télécharger l'application Android directement chez nous (évitant d'avoir "
 "besoin d'un compte Google) et ouvrir dans un gestionnaire de fichier pour "
@@ -2043,6 +2058,16 @@ msgstr ""
 "Les porte-monnaies pour d'autres navigateurs seront rendus disponibles dès "
 "que possible."
 
+#~ msgid "Taler Cashier"
+#~ msgstr "Caisse enregistreuse Taler"
+
+#~ msgid ""
+#~ "The Taler Cashier is an Android app that enables you to take cash and "
+#~ "give out electronic cash."
+#~ msgstr ""
+#~ "La caisse enregistreuse Taler est une application Android qui vous permet "
+#~ "d'encaisser des espèces et rendre la monnaie en monnaie numérique."
+
 #~ msgid ""
 #~ "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
 #~ "\">Free Software</a>. For merchants, our Free Software reference "
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index df72d12..6e8d0e6 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: it <LL@li.org>\n"
@@ -39,8 +39,8 @@ msgstr ""
 
 #: common/footer.j2.inc:31
 msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://"
-"www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 
 #: common/footer.j2.inc:33
@@ -49,19 +49,19 @@ msgid ""
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr ""
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr ""
 
@@ -90,18 +90,21 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
+#: template/cashier.html.j2:43
+msgid ""
+"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."
 msgstr ""
 
-#: template/cashier.html.j2:16
-msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and give "
-"out electronic cash."
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
 msgstr ""
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
 msgstr ""
 
 #: template/contact.html.j2:6
@@ -1201,6 +1204,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1380,6 +1387,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
@@ -1665,14 +1680,8 @@ msgstr ""
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in a "
-"File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 
 #: template/wallet.html.j2:261
diff --git a/locale/jp/LC_MESSAGES/messages.po b/locale/jp/LC_MESSAGES/messages.po
index bdd8611..bcdbef0 100644
--- a/locale/jp/LC_MESSAGES/messages.po
+++ b/locale/jp/LC_MESSAGES/messages.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: 2020-09-25 22:16+0000\n"
 "Last-Translator: Maki Konno <maki.7719@gmail.com>\n"
-"Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/"
-"main-web-site/jp/>\n"
+"Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/main-"
+"web-site/jp/>\n"
 "Language: jp\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.2.2\n"
@@ -47,36 +47,44 @@ msgid "and"
 msgstr "と"
 
 #: common/footer.j2.inc:31
+#, fuzzy
+#| msgid ""
+#| "We are grateful for support and free hosting of this site by <a "
+#| "href='http://www.bfh.ch/'>BFH</a>"
 msgid ""
 "We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
+msgstr ""
+"私達は、このサイトによるサポートと貢献にとても感謝しています  <a "
 "href='http://www.bfh.ch/'>BFH</a>"
-msgstr "私達は、このサイトによるサポートと貢献にとても感謝しています  <a href='http://www.bfh.ch/'>BFH</a>"
 
 #: common/footer.j2.inc:33
 msgid ""
-"This page was created using <a href='https://www.gnu.org/'>Free "
-"Software</a> only."
+"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
+"only."
 msgstr ""
-"このページは、使用して作成されています<a href='https://www.gnu.org/'>Free Software</a> only."
+"このページは、使用して作成されています<a href='https://www.gnu.org/'>Free "
+"Software</a> only."
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr "特徴"
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr "原則"
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr "資料"
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr "ニュース"
 
 #: news/index.html.j2:11
-msgid "News posts about changes related to GNU Taler such as releases and events"
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
 msgstr "封切と出来事など、GNU通貨に関連する変更に関する新たな投稿"
 
 #: news/index.html.j2:16
@@ -99,19 +107,22 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
+#: template/cashier.html.j2:43
+msgid ""
+"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."
 msgstr ""
 
-#: template/cashier.html.j2:16
-msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and "
-"give out electronic cash."
-msgstr "通貨の出納は、現金を受け取って電子現金を分配できるアンドロイドアプリです。"
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
+msgstr ""
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
-msgstr "取得"
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
+msgstr ""
 
 #: template/contact.html.j2:6
 msgid "Contact information"
@@ -139,8 +150,8 @@ msgstr ""
 
 #: template/contact.html.j2:31
 msgid ""
-"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."
 msgstr ""
 
 #: template/contact.html.j2:40
@@ -149,8 +160,8 @@ msgstr ""
 
 #: template/contact.html.j2:42
 msgid ""
-"You can find some team members in the IRC channel <tt>#taler</tt> on "
-"<tt>irc.freenode.net</tt>."
+"You can find some team members in the IRC channel <tt>#taler</tt> on <tt>irc."
+"freenode.net</tt>."
 msgstr ""
 
 #: template/contact.html.j2:50
@@ -167,8 +178,8 @@ msgstr ""
 
 #: template/contact.html.j2:56
 msgid ""
-"which is shared with the GNUnet project. You can also report bugs or "
-"feature requests to the mailing list."
+"which is shared with the GNUnet project. You can also report bugs or feature "
+"requests to the mailing list."
 msgstr ""
 
 #: template/contact.html.j2:65
@@ -187,8 +198,8 @@ msgstr ""
 
 #: template/contact.html.j2:77
 msgid ""
-"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>."
 msgstr ""
 
 #: template/copyright.html.j2:6
@@ -197,28 +208,27 @@ msgstr ""
 
 #: template/copyright.html.j2:8
 msgid ""
-"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://git.gnunet.org/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."
+"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://git.gnunet.org/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."
 msgstr ""
 
 #: template/copyright.html.j2:19
 msgid ""
-"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)."
+"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)."
 msgstr ""
 
 #: template/copyright.html.j2:29
 msgid ""
-"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 "
+"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."
 msgstr ""
 
@@ -228,9 +238,9 @@ msgstr ""
 
 #: template/docs.html.j2:13
 msgid ""
-"This is an overview of documentation and other resources for GNU Taler. "
-"The full documentation contents can be found <a "
-"href=\"https://docs.taler.net/\">here</a>."
+"This is an overview of documentation and other resources for GNU Taler. The "
+"full documentation contents can be found <a href=\"https://docs.taler.net/"
+"\">here</a>."
 msgstr ""
 
 #: template/docs.html.j2:27
@@ -244,8 +254,8 @@ msgstr ""
 #: template/docs.html.j2:40
 #, python-format
 msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
 msgstr ""
 
 #: template/docs.html.j2:50
@@ -255,9 +265,9 @@ msgstr ""
 #: template/docs.html.j2:52
 #, python-format
 msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. "
-"Also available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-"
-"tutorial.pdf\">PDF</a>."
+"Tutorial for processing Taler payments using the merchant backend API. Also "
+"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
+"pdf\">PDF</a>."
 msgstr ""
 
 #: template/docs.html.j2:62
@@ -267,8 +277,8 @@ msgstr ""
 #: template/docs.html.j2:64
 #, python-format
 msgid ""
-"Operator&#39;s manual for the GNU Taler exchange. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+"Operator&#39;s manual for the GNU Taler exchange. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
 msgstr ""
 
 #: template/docs.html.j2:74
@@ -279,8 +289,8 @@ msgstr ""
 #, python-format
 msgid ""
 "Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-"
-"manual.pdf\">PDF</a>."
+"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
 msgstr ""
 
 #: template/docs.html.j2:92
@@ -290,8 +300,8 @@ msgstr ""
 #: template/docs.html.j2:94
 msgid ""
 "Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
-"download pre-packaged binaries from <a href=\"wallet.html\">the Taler "
-"wallet Web site</a>."
+"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
+"Web site</a>."
 msgstr ""
 
 #: template/docs.html.j2:104
@@ -301,8 +311,8 @@ msgstr ""
 #: template/docs.html.j2:106
 #, python-format
 msgid ""
-"Manual to run the back-office Web application. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+"Manual to run the back-office Web application. Also available as <a href="
+"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
 msgstr ""
 
 #: template/docs.html.j2:116
@@ -312,9 +322,8 @@ msgstr ""
 #: template/docs.html.j2:118
 #, python-format
 msgid ""
-"Manual for configuring and using the point of sale app. Also available as"
-" <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-"
-"terminal.pdf\">PDF</a>."
+"Manual for configuring and using the point of sale app. Also available as <a "
+"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
 msgstr ""
 
 #: template/docs.html.j2:128
@@ -343,8 +352,7 @@ msgstr ""
 
 #: template/docs.html.j2:164
 msgid ""
-"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"
 msgstr ""
 
 #: template/docs.html.j2:177
@@ -409,17 +417,17 @@ msgstr ""
 
 #: template/faq.html.j2:8
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:18
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:26
@@ -439,16 +447,15 @@ msgstr ""
 
 #: template/faq.html.j2:37
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:46
 msgid ""
-"The risk of losing a wallet can be mitigated by making backups or keeping"
-" the balance reasonably low."
+"The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low."
 msgstr ""
 
 #: template/faq.html.j2:52
@@ -457,9 +464,9 @@ msgstr ""
 
 #: template/faq.html.j2:54
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:61
@@ -468,15 +475,15 @@ msgstr ""
 
 #: template/faq.html.j2:63
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:70
 msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well."
+"Future versions of the Taler wallet may allow exchanging coins among friends "
+"directly as well."
 msgstr ""
 
 #: template/faq.html.j2:76
@@ -485,8 +492,8 @@ msgstr ""
 
 #: template/faq.html.j2:78
 msgid ""
-"Taler wallets can store digital coins corresponding to multiple different"
-" currencies such as the Euro, US Dollars or Bitcoins."
+"Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins."
 msgstr ""
 
 #: template/faq.html.j2:84
@@ -499,11 +506,10 @@ msgstr ""
 
 #: template/faq.html.j2:91
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:101
@@ -513,14 +519,14 @@ msgstr ""
 #: template/faq.html.j2:103
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:117
@@ -529,13 +535,13 @@ msgstr ""
 
 #: template/faq.html.j2:119
 msgid ""
-"Taler&#39;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 "
+"Taler&#39;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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:130
@@ -545,24 +551,24 @@ msgstr ""
 #: template/faq.html.j2:132
 msgid ""
 "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."
+"regulatory framework a Taler exchange with coins denominated in Euros would "
+"have to follow."
 msgstr ""
 
 #: template/faq.html.j2:139
 msgid ""
-"What bank would guarantee the conversion between Taler coins and bank "
-"money in regular bank accounts?"
+"What bank would guarantee the conversion between Taler coins and bank money "
+"in regular bank accounts?"
 msgstr ""
 
 #: template/faq.html.j2:141
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:150
@@ -574,11 +580,10 @@ msgstr ""
 #: template/faq.html.j2:152
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/faq.html.j2:161
@@ -587,13 +592,12 @@ msgstr ""
 
 #: template/faq.html.j2:163
 msgid ""
-"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)."
+"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)."
 msgstr ""
 
 #: template/faq.html.j2:174
@@ -603,18 +607,18 @@ msgstr ""
 #: template/faq.html.j2:176
 msgid ""
 "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. "
+"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."
+"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."
 msgstr ""
 
 #: template/features.html.j2:7
@@ -623,39 +627,39 @@ msgstr ""
 
 #: template/features.html.j2:13
 msgid ""
-"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>."
+"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>."
 msgstr ""
 
 #: template/features.html.j2:23
 msgid ""
-"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."
 msgstr ""
 
 #: template/features.html.j2:32
 msgid ""
-"Payments 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."
+"Payments 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."
 msgstr ""
 
 #: template/features.html.j2:41
 msgid ""
-"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&#39;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&#39;s Website."
 msgstr ""
 
 #: template/features.html.j2:50
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/features.html.j2:69
@@ -664,15 +668,15 @@ msgstr ""
 
 #: template/features.html.j2:71
 msgid ""
-"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&#39;s balance by some other means of payment."
+"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&#39;s balance by some other means of payment."
 msgstr ""
 
 #: template/features.html.j2:79
 msgid ""
-"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 "
+"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."
 msgstr ""
 
@@ -686,17 +690,17 @@ msgstr ""
 
 #: template/features.html.j2:96
 msgid ""
-"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&#39;s backend "
-"for Taler transaction processing can run on the merchant&#39;s premises "
-"or be hosted by a third party."
+"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&#39;s backend for Taler "
+"transaction processing can run on the merchant&#39;s premises or be hosted "
+"by a third party."
 msgstr ""
 
 #: template/features.html.j2:105
 msgid ""
-"Merchant integration is simple, and customers can pay for products "
-"without even having to register an account."
+"Merchant integration is simple, and customers can pay for products without "
+"even having to register an account."
 msgstr ""
 
 #: template/features.html.j2:112
@@ -720,10 +724,10 @@ msgstr ""
 
 #: template/features.html.j2:143
 msgid ""
-"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&#39;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&#39;s cryptographic coins correspond to existing "
+"currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 
 #: template/features.html.j2:154 template/governments.html.j2:55
@@ -733,10 +737,9 @@ msgstr ""
 
 #: template/features.html.j2:157
 msgid ""
-"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."
 msgstr ""
 
 #: template/features.html.j2:169 template/governments.html.j2:25
@@ -745,10 +748,9 @@ msgstr ""
 
 #: template/features.html.j2:172
 msgid ""
-"When using Taler, merchant&#39;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&#39;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."
 msgstr ""
 
 #: template/features.html.j2:182
@@ -757,9 +759,9 @@ msgstr ""
 
 #: template/features.html.j2:184
 msgid ""
-"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."
 msgstr ""
 
 #: template/features.html.j2:195 template/governments.html.j2:85
@@ -769,9 +771,8 @@ msgstr ""
 #: template/features.html.j2:198
 msgid ""
 "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"
+"enables anybody to run their own payment infrastructure, be it individuals, "
+"organizations or whole countries. Since the reference implementation is a"
 msgstr ""
 
 #: template/features.html.j2:205
@@ -794,34 +795,33 @@ msgstr ""
 
 #: template/governments.html.j2:8
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/governments.html.j2:27
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/governments.html.j2:40
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/governments.html.j2:58
@@ -835,20 +835,19 @@ msgstr ""
 
 #: template/governments.html.j2:70
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/governments.html.j2:88
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/governments.html.j2:98
@@ -857,9 +856,9 @@ msgstr ""
 
 #: template/governments.html.j2:101
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/governments.html.j2:117
@@ -872,8 +871,8 @@ msgstr ""
 
 #: template/governments.html.j2:120
 msgid ""
-"With Taler, income is visible and can be tied to the contract signed by "
-"both parties."
+"With Taler, income is visible and can be tied to the contract signed by both "
+"parties."
 msgstr ""
 
 #: template/governments.html.j2:121
@@ -882,8 +881,8 @@ msgstr ""
 
 #: template/governments.html.j2:122
 msgid ""
-"In Taler, payer and payee are known by their bank accounts when "
-"withdrawing or depositing coins respectively"
+"In Taler, payer and payee are known by their bank accounts when withdrawing "
+"or depositing coins respectively"
 msgstr ""
 
 #: template/governments.html.j2:123
@@ -892,8 +891,8 @@ msgstr ""
 
 #: template/governments.html.j2:124
 msgid ""
-"Taler cryptographically protects citizen's privacy, and by design "
-"implements data minimization and privacy by default."
+"Taler cryptographically protects citizen's privacy, and by design implements "
+"data minimization and privacy by default."
 msgstr ""
 
 #: template/governments.html.j2:125
@@ -912,16 +911,16 @@ msgstr ""
 
 #: template/governments.html.j2:137
 msgid ""
-"Taler assumes governments can observe traditional wire transfers entering"
-" and leaving the Taler payment system. Starting with the wire transfers, "
+"Taler assumes governments can observe traditional wire transfers entering "
+"and leaving the Taler payment system. Starting with the wire transfers, "
 "governments can obtain:"
 msgstr ""
 
 #: template/governments.html.j2:145
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/governments.html.j2:154
@@ -931,17 +930,17 @@ msgstr ""
 #: template/governments.html.j2:161
 msgid ""
 "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."
+"customer and merchant. However, this information would typically not include "
+"the identity of the customer."
 msgstr ""
 
 #: template/governments.html.j2:170
 msgid ""
-"The amounts of digital coins legitimately withdrawn by customers from the"
-" exchange, the value of non-redeemed digital coins in customer&#39;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."
+"The amounts of digital coins legitimately withdrawn by customers from the "
+"exchange, the value of non-redeemed digital coins in customer&#39;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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:5
@@ -960,12 +959,12 @@ msgstr ""
 
 #: template/gsoc-codeless.html.j2:14
 msgid ""
-"Codeless payment is a component that sits between the seller&#39;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 &#39;Buy Now&#39; "
-"button for a specific product. This code can be directly copy pasted on "
-"the seller&#39;s frontend and can be used for &#39;Pay with Taler&#39;."
+"Codeless payment is a component that sits between the seller&#39;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 &#39;Buy Now&#39; button for a "
+"specific product. This code can be directly copy pasted on the seller&#39;s "
+"frontend and can be used for &#39;Pay with Taler&#39;."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:29
@@ -980,51 +979,50 @@ msgstr ""
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:48
-msgid "A merchant has the flexibility to add two types of inventory as follows:"
+msgid ""
+"A merchant has the flexibility to add two types of inventory as follows:"
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:53
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:61
 msgid ""
-"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)."
+"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)."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:73
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:84
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:93
@@ -1033,8 +1031,8 @@ msgstr ""
 
 #: template/gsoc-codeless.html.j2:95
 msgid ""
-"The documentation for the API to dynamically manage merchant instance can"
-" be found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-"
+"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>."
 msgstr ""
 
@@ -1064,50 +1062,49 @@ msgstr ""
 
 #: template/gsoc-codeless.html.j2:130
 msgid ""
-"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:"
+"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:"
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:140
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:150
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:164
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:174
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/gsoc-codeless.html.j2:191
@@ -1128,9 +1125,8 @@ msgstr ""
 
 #: template/index.html.j2:24
 msgid ""
-"We provide a payment system that makes <span class='tlr'>privacy-"
-"friendly</span> online transactions <span class='tlr'>fast and "
-"easy</span>."
+"We provide a payment system that makes <span class='tlr'>privacy-friendly</"
+"span> online transactions <span class='tlr'>fast and easy</span>."
 msgstr ""
 
 #: template/index.html.j2:28
@@ -1178,17 +1174,17 @@ msgstr ""
 #: template/investors.html.j2:27
 msgid ""
 "Our team 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."
+"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."
 msgstr ""
 
 #: template/investors.html.j2:37
 msgid ""
-"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>."
+"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>."
 msgstr ""
 
 #: template/investors.html.j2:47
@@ -1197,14 +1193,13 @@ msgstr ""
 
 #: template/investors.html.j2:50
 msgid ""
-"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 &#x28;for customers, "
-"merchants and the exchange&#x29; 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."
+"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 &#x28;for customers, merchants and the exchange&#x29; 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."
 msgstr ""
 
 #: template/investors.html.j2:63
@@ -1217,15 +1212,19 @@ msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/investors.html.j2:84
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr "取得"
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1239,10 +1238,10 @@ msgstr ""
 
 #: template/investors.html.j2:120
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/investors.html.j2:130
@@ -1253,8 +1252,8 @@ msgstr ""
 
 #: template/investors.html.j2:131
 msgid ""
-"Multiple Taler transactions can be aggregated into larger wire transfers "
-"to merchants to minimize wire transfer costs."
+"Multiple Taler transactions can be aggregated into larger wire transfers to "
+"merchants to minimize wire transfer costs."
 msgstr ""
 
 #: template/investors.html.j2:132
@@ -1277,10 +1276,10 @@ msgstr ""
 
 #: template/merchants.html.j2:8
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/merchants.html.j2:22
@@ -1290,22 +1289,21 @@ msgstr ""
 #: template/merchants.html.j2:25
 msgid ""
 "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."
+"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."
 msgstr ""
 
 #: template/merchants.html.j2:44
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #: template/merchants.html.j2:58
@@ -1327,10 +1325,10 @@ msgstr ""
 
 #: template/merchants.html.j2:78
 msgid ""
-"Taler is uses efficient cryptographic constructions with low bandwidth "
-"and storage requirements. Combined with Taler&#39;s strong security which"
-" makes fraud impossible, Taler payment service providers can operate with"
-" very low overhead and thus offer low transaction fees."
+"Taler is uses efficient cryptographic constructions with low bandwidth and "
+"storage requirements. Combined with Taler&#39;s strong security which makes "
+"fraud impossible, Taler payment service providers can operate with very low "
+"overhead and thus offer low transaction fees."
 msgstr ""
 
 #: template/merchants.html.j2:88
@@ -1350,8 +1348,8 @@ msgstr ""
 
 #: template/merchants.html.j2:101
 msgid ""
-"Taler prevents tax evasion and money laundering. Taler&#39;s protocols "
-"are efficient and do not use wasteful proof-of-work calculations. Taler "
+"Taler prevents tax evasion and money laundering. Taler&#39;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."
 msgstr ""
@@ -1382,18 +1380,17 @@ msgstr ""
 
 #: template/merchants.html.j2:144
 msgid ""
-"The backend <b>signs</b> and <b>stores</b> the complete terms of offers "
-"made by the merchant to customers. For this, the merchant&#39;s frontend "
-"needs to give the customer&#39;s order in a JSON format to the backend."
+"The backend <b>signs</b> and <b>stores</b> the complete terms of offers made "
+"by the merchant to customers. For this, the merchant&#39;s frontend needs to "
+"give the customer&#39;s order in a JSON format to the backend."
 msgstr ""
 
 #: template/merchants.html.j2:153
 msgid ""
 "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&#39;s frontend must pass the payment "
-"request through to the Taler backend and check the HTTP status code that "
-"is returned."
+"<b>executes</b> them with the Taler payment service provider (the exchange). "
+"For this, the merchant&#39;s frontend must pass the payment request through "
+"to the Taler backend and check the HTTP status code that is returned."
 msgstr ""
 
 #: template/merchants.html.j2:164
@@ -1407,6 +1404,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
@@ -1432,7 +1437,8 @@ msgid "GNU Taler: Design Principles"
 msgstr ""
 
 #: template/principles.html.j2:25
-msgid "When designing GNU Taler, we had the following design principles in mind:"
+msgid ""
+"When designing GNU Taler, we had the following design principles in mind:"
 msgstr ""
 
 #: template/principles.html.j2:31
@@ -1440,28 +1446,28 @@ msgid "1. Free/Libre Software"
 msgstr ""
 
 #: template/principles.html.j2:33
-msgid "... in the area of computing, freedom means not using proprietary software"
+msgid ""
+"... in the area of computing, freedom means not using proprietary software"
 msgstr ""
 
 #: template/principles.html.j2:36
 msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-"
-"sw.html\">Free/Libre Software</a>. For merchants, Free/Libre Software "
-"prevents vendor lock-in meaning merchants can easily choose another "
-"service provider to process their payments. For countries, Free/Libre "
-"software means GNU Taler can not compromise sovereignty by imposing "
-"restrictions or requirements. And for exchange operators, transparency is"
-" crucial to satisfy <a "
-"href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's"
-" principle</a> and to establish public confidence."
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
+"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"vendor lock-in meaning merchants can easily choose another service provider "
+"to process their payments. For countries, Free/Libre software means GNU "
+"Taler can not compromise sovereignty by imposing restrictions or "
+"requirements. And for exchange operators, transparency is crucial to satisfy "
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
 msgstr ""
 
 #: template/principles.html.j2:49
 msgid ""
-"Customers benefit from Free/Libre Software because anyone is free to "
-"modify the wallet software support additional platforms. The source code "
-"must be available and make it easy to verify that user-hostile features "
-"such as tracking or telemetry are absent."
+"Customers benefit from Free/Libre Software because anyone is free to modify "
+"the wallet software support additional platforms. The source code must be "
+"available and make it easy to verify that user-hostile features such as "
+"tracking or telemetry are absent."
 msgstr ""
 
 #: template/principles.html.j2:60
@@ -1474,26 +1480,26 @@ msgstr ""
 
 #: template/principles.html.j2:64
 msgid ""
-"Privacy is most meaningful when it is guaranteed via technical measures, "
-"as opposed to mere policies. Without a technical layer providing privacy-"
-"by-default, financial transactions reveal unnecessary levels of personal "
-"or private data. This would be especially true when making micropayments "
-"for online publications. Thus, GNU Taler must protect the privacy of "
-"buyers to avoid facilitating totalitarian control over the population."
+"Privacy is most meaningful when it is guaranteed via technical measures, as "
+"opposed to mere policies. Without a technical layer providing privacy-by-"
+"default, financial transactions reveal unnecessary levels of personal or "
+"private data. This would be especially true when making micropayments for "
+"online publications. Thus, GNU Taler must protect the privacy of buyers to "
+"avoid facilitating totalitarian control over the population."
 msgstr ""
 
 #: template/principles.html.j2:72
 msgid ""
-"Limited private data, such as the shipping address for a physical "
-"delivery, may need to be collected according to business needs and "
-"protected according to local laws. In this case, GNU Taler must enable "
-"deletion of such data as soon as it is no longer required."
+"Limited private data, such as the shipping address for a physical delivery, "
+"may need to be collected according to business needs and protected according "
+"to local laws. In this case, GNU Taler must enable deletion of such data as "
+"soon as it is no longer required."
 msgstr ""
 
 #: template/principles.html.j2:83
 msgid ""
-"3. Auditability - enable the state to tax income and crack down on "
-"illegal business activities"
+"3. Auditability - enable the state to tax income and crack down on illegal "
+"business activities"
 msgstr ""
 
 #: template/principles.html.j2:85
@@ -1502,12 +1508,12 @@ msgstr ""
 
 #: template/principles.html.j2:87
 msgid ""
-"As a payment system must comply with local laws in order to operate "
-"legally, GNU Taler must be designed to comply with these requirements. "
-"GNU Taler must provide an audit trail for investigators operating under "
-"the law. Furthermore, we consider levying of taxes as beneficial to "
-"society, and fair taxation requires income transparency. Thus, GNU Taler "
-"must enable authorities to track income."
+"As a payment system must comply with local laws in order to operate legally, "
+"GNU Taler must be designed to comply with these requirements. GNU Taler must "
+"provide an audit trail for investigators operating under the law. "
+"Furthermore, we consider levying of taxes as beneficial to society, and fair "
+"taxation requires income transparency. Thus, GNU Taler must enable "
+"authorities to track income."
 msgstr ""
 
 #: template/principles.html.j2:102
@@ -1520,12 +1526,12 @@ msgstr ""
 
 #: template/principles.html.j2:106
 msgid ""
-"GNU Taler must mitigate the most common sources of payment fraud. We must"
-" follow best practices in software design, 3rd party design guidelines "
-"that prevent confusion and misleading user interfaces, and must have "
-"others inspect our publicly available code. Furthermore, GNU Taler must "
-"provide extensive cryptographic evidence for all key processes to enable "
-"all parties to precisely attribute bad behavior."
+"GNU Taler must mitigate the most common sources of payment fraud. We must "
+"follow best practices in software design, 3rd party design guidelines that "
+"prevent confusion and misleading user interfaces, and must have others "
+"inspect our publicly available code. Furthermore, GNU Taler must provide "
+"extensive cryptographic evidence for all key processes to enable all parties "
+"to precisely attribute bad behavior."
 msgstr ""
 
 #: template/principles.html.j2:120
@@ -1534,17 +1540,16 @@ msgstr ""
 
 #: template/principles.html.j2:121
 msgid ""
-"Privacy by design, privacy by default, General Data Protection Regulation"
-" (GDPR) compliant"
+"Privacy by design, privacy by default, General Data Protection Regulation "
+"(GDPR) compliant"
 msgstr ""
 
 #: template/principles.html.j2:123
 msgid ""
-"The privacy of buyers is given particular priority as part of principle "
-"(2). However, other parties - such as merchants - also must have data "
-"protection. Generally, GNU Taler must collect the minimum information "
-"necessary: data that is not collected or is no longer stored can not be "
-"compromised."
+"The privacy of buyers is given particular priority as part of principle (2). "
+"However, other parties - such as merchants - also must have data protection. "
+"Generally, GNU Taler must collect the minimum information necessary: data "
+"that is not collected or is no longer stored can not be compromised."
 msgstr ""
 
 #: template/principles.html.j2:137
@@ -1557,14 +1562,14 @@ msgstr ""
 
 #: template/principles.html.j2:140
 msgid ""
-"GNU Taler must be usable for non-expert customers including end-users of "
-"a GNU Taler wallet, merchants who wish to accept payments using GNU "
-"Taler, and 3rd party application developers for e-commerce and other "
-"platforms. GNU Taler must follow best-practices usability guidelines and "
-"incorporate feedback from experts and users. Free/Libre software also "
-"requires Free/Libre documentation to allow for informed choices. GNU "
-"Taler must provide well-documented Advanced Programming Interfaces (APIs)"
-" to allow frictionless integrations between GNU Taler and other projects."
+"GNU Taler must be usable for non-expert customers including end-users of a "
+"GNU Taler wallet, merchants who wish to accept payments using GNU Taler, and "
+"3rd party application developers for e-commerce and other platforms. GNU "
+"Taler must follow best-practices usability guidelines and incorporate "
+"feedback from experts and users. Free/Libre software also requires Free/"
+"Libre documentation to allow for informed choices. GNU Taler must provide "
+"well-documented Advanced Programming Interfaces (APIs) to allow frictionless "
+"integrations between GNU Taler and other projects."
 msgstr ""
 
 #: template/principles.html.j2:157
@@ -1577,11 +1582,11 @@ msgstr ""
 
 #: template/principles.html.j2:160
 msgid ""
-"GNU Taler must be designed to be efficient. Quite simply, efficiency "
-"means fewer things to break, and it means more transactions per second "
-"and lowers our environmental impact. Efficiency is also critical for GNU "
-"Taler to be used for micropayments. Therefore certain expensive "
-"primitives, such as proof-of-work, must not be used by GNU Taler."
+"GNU Taler must be designed to be efficient. Quite simply, efficiency means "
+"fewer things to break, and it means more transactions per second and lowers "
+"our environmental impact. Efficiency is also critical for GNU Taler to be "
+"used for micropayments. Therefore certain expensive primitives, such as "
+"proof-of-work, must not be used by GNU Taler."
 msgstr ""
 
 #: template/principles.html.j2:173
@@ -1598,9 +1603,9 @@ msgid ""
 "wrong. GNU Taler must be designed to tolerate failure of individual "
 "components and systems. Where the system can continue running safely, it "
 "will continue running safely. Where it must halt an operation, other "
-"operations must not be needlessly pulled offline. Where systems fail, "
-"they must fail gracefully. GNU Taler must have a plan to recover from "
-"malicious operators compromising core secrets."
+"operations must not be needlessly pulled offline. Where systems fail, they "
+"must fail gracefully. GNU Taler must have a plan to recover from malicious "
+"operators compromising core secrets."
 msgstr ""
 
 #: template/principles.html.j2:194
@@ -1615,22 +1620,21 @@ msgstr ""
 msgid ""
 "It must be relatively easy for competitors to deploy interoperable "
 "alternatives. The barriers for this in traditional financial systems are "
-"rather high and outside of our control. However, GNU Taler must minimize "
-"the technical burden for new competitors to enter the market."
+"rather high and outside of our control. However, GNU Taler must minimize the "
+"technical burden for new competitors to enter the market."
 msgstr ""
 
 #: template/principles.html.j2:204
 msgid ""
-"GNU Taler must enable a diverse set of operators, breaking up the current"
-" system where only a few global companies dominate the market."
+"GNU Taler must enable a diverse set of operators, breaking up the current "
+"system where only a few global companies dominate the market."
 msgstr ""
 
 #: template/principles.html.j2:209
 msgid ""
 "An example for a 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."
+"system into smaller components that can be operated, developed and improved "
+"upon independently, instead of having one completely monolithic system."
 msgstr ""
 
 #: template/schemafuzz.html.j2:6
@@ -1693,14 +1697,8 @@ msgstr ""
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in "
-"a File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 
 #: template/wallet.html.j2:261
@@ -1710,3 +1708,9 @@ msgstr ""
 #: template/wallet.html.j2:263
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
+
+#~ msgid ""
+#~ "The Taler Cashier is an Android app that enables you to take cash and "
+#~ "give out electronic cash."
+#~ msgstr ""
+#~ "通貨の出納は、現金を受け取って電子現金を分配できるアンドロイドアプリです。"
diff --git a/locale/messages.pot b/locale/messages.pot
index 7ca20c7..5eb2fdf 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgstr ""
 #: common/footer.j2.inc:31
 msgid ""
 "We are grateful for support and free hosting of this site by <a "
-"href='http://www.bfh.ch/'>BFH</a>"
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 
 #: common/footer.j2.inc:33
@@ -53,19 +53,19 @@ msgid ""
 "Software</a> only."
 msgstr ""
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr ""
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr ""
 
@@ -93,18 +93,22 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
+#: template/cashier.html.j2:43
+msgid ""
+"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."
 msgstr ""
 
-#: template/cashier.html.j2:16
-msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and "
-"give out electronic cash."
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
 msgstr ""
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
 msgstr ""
 
 #: template/contact.html.j2:6
@@ -1220,6 +1224,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1401,6 +1409,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
@@ -1687,14 +1703,8 @@ msgstr ""
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in "
-"a File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 
 #: template/wallet.html.j2:261
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index f2f32a2..24448b0 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU taler master\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: 2018-01-28 15:27-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -44,8 +44,8 @@ msgstr ""
 
 #: common/footer.j2.inc:31
 msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://"
-"www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 
 #: common/footer.j2.inc:33
@@ -54,19 +54,19 @@ msgid ""
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr ""
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr ""
 
@@ -95,18 +95,21 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
+#: template/cashier.html.j2:43
+msgid ""
+"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."
 msgstr ""
 
-#: template/cashier.html.j2:16
-msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and give "
-"out electronic cash."
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
 msgstr ""
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
 msgstr ""
 
 #: template/contact.html.j2:6
@@ -1206,6 +1209,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1385,6 +1392,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
@@ -1670,14 +1685,8 @@ msgstr ""
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in a "
-"File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 
 #: template/wallet.html.j2:261
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index ec90f40..d68f799 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-23 17:42+0200\n"
 "PO-Revision-Date: 2017-12-29 11:14+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ru <LL@li.org>\n"
@@ -45,8 +45,8 @@ msgstr ""
 
 #: common/footer.j2.inc:31
 msgid ""
-"We are grateful for support and free hosting of this site by <a href='http://"
-"www.bfh.ch/'>BFH</a>"
+"We are grateful for support and free hosting of this site by <a "
+"href='https://www.bfh.ch/'>BFH</a>"
 msgstr ""
 
 #: common/footer.j2.inc:33
@@ -55,19 +55,19 @@ msgid ""
 "only."
 msgstr ""
 
-#: common/navigation.j2.inc:21
+#: common/navigation.j2.inc:23
 msgid "Features"
 msgstr ""
 
-#: common/navigation.j2.inc:22
+#: common/navigation.j2.inc:24
 msgid "Principles"
 msgstr ""
 
-#: common/navigation.j2.inc:23
+#: common/navigation.j2.inc:25
 msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:24 news/index.html.j2:8
+#: common/navigation.j2.inc:26 news/index.html.j2:8
 msgid "News"
 msgstr ""
 
@@ -96,18 +96,21 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: template/cashier.html.j2:7
-msgid "Taler Cashier"
+#: template/cashier.html.j2:43
+msgid ""
+"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."
 msgstr ""
 
-#: template/cashier.html.j2:16
-msgid ""
-"The Taler Cashier is an Android app that enables you to take cash and give "
-"out electronic cash."
+#: template/cashier.html.j2:61 template/pos.html.j2:61
+#: template/wallet.html.j2:241
+msgid "Install Android App from Google App Store, or"
 msgstr ""
 
-#: template/cashier.html.j2:21 template/investors.html.j2:90
-msgid "Download"
+#: template/cashier.html.j2:68 template/pos.html.j2:68
+msgid "Download App from F-Droid.org."
 msgstr ""
 
 #: template/contact.html.j2:6
@@ -1207,6 +1210,10 @@ msgstr ""
 msgid "The Business Case"
 msgstr ""
 
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
 #: template/investors.html.j2:94
 msgid ""
 "Our <a href=\"financial-news.html\">financial news</a> page explains in "
@@ -1386,6 +1393,14 @@ msgstr ""
 msgid "customer perspective"
 msgstr ""
 
+#: template/pos.html.j2:43
+msgid ""
+"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."
+msgstr ""
+
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr ""
@@ -1671,14 +1686,8 @@ msgstr ""
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:241
-msgid "Install Android App from Google App Store, or"
-msgstr ""
-
 #: template/wallet.html.j2:248
-msgid ""
-"Download Android App from us (bypassing Google registration) and Open in a "
-"File Manager to install."
+msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr ""
 
 #: template/wallet.html.j2:261
diff --git a/template/index.html.j2 b/template/index.html.j2
index d0feda9..2598536 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -43,6 +43,10 @@
             <img class="checkmark" src="{{ url_static('images/checkmark.png') }}">
             {{ _("Empowers communities to run their own payment infrastructure")}}
           </li>
+          <li>
+            <img class="checkmark" src="{{ url_static('images/checkmark.png') }}">
+            <a href="https://gnu.org/philosophy/free-sw.html">{{ _("Free Software") }}</a>
+          </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>
author	Christian Grothoff <christian@grothoff.org>	2020-10-24 10:12:52 +0200
committer	Christian Grothoff <christian@grothoff.org>	2020-10-24 10:12:52 +0200
commit	f87130713a9e04bb2c017b11c47d32d9f8635958 (patch)
tree	0755a6257b5e780e3e2df79491b59c9f116ce66a
parent	3009120bf5e40a3ab2881b7cdf02bb228ecb77de (diff)
download	www-f87130713a9e04bb2c017b11c47d32d9f8635958.tar.gz www-f87130713a9e04bb2c017b11c47d32d9f8635958.tar.bz2 www-f87130713a9e04bb2c017b11c47d32d9f8635958.zip