[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch stable updated (d6b7ef0 -> 343c400)
|
From: |
gnunet |
|
Subject: |
[taler-www] branch stable updated (d6b7ef0 -> 343c400) |
|
Date: |
Sat, 21 Mar 2020 14:16:47 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch stable
in repository www.
from d6b7ef0 use mybabel.py wrapper to avoid PYTHONPATH mess
add 9234a77 add small documentation for news system. add initial draft
for 0.6.0 rel.
add 8a289c1 update
add 61e6528 remove developer-centric glossary, it has moved to docs.git
add 5ef1fb6 Merge branch 'master' of git+ssh://git.taler.net/www
add f8cb8c0 install security.txt
add c8e81e9 change to track master (git default)
add 95264a9 Add Cashier and Merchant POS to components
add 795cff9 add wallet
add 3fb8954 link to wallet download site
add 7653b8c add links to buildbot and lcov results to docs page
add d5cf317 fix typo
add beee64f First few lines of new DE translation to the website
add 1c8849b Next few lines of DE translation to the website
add dfb03f5 Typo corrected
add 8cb7363 sample
add a11f8ff wrong repo
add 720ec91 Next few lines added to the DE translation of Taler's website
add c071592 Corrections applied
add 343c400 add reference to IRC channel
No new revisions were added by this update.
Summary of changes:
.gitmodules | 1 -
.well-known/security.txt | 2 +-
Makefile | 1 +
doc/WRITING-NEWS | 68 ++++
icons/buildbot.svg | 13 +
icons/icon-cashier.svg | 55 +++
icons/icon-lcov.svg | 1 +
icons/icon-wallet.svg | 1 +
locale/de/LC_MESSAGES/messages.po | 804 +++++++++++++++++---------------------
locale/en/LC_MESSAGES/messages.po | 406 +++----------------
locale/es/LC_MESSAGES/messages.po | 406 +++----------------
locale/fr/LC_MESSAGES/messages.po | 406 +++----------------
locale/it/LC_MESSAGES/messages.po | 406 +++----------------
locale/pt/LC_MESSAGES/messages.po | 406 +++----------------
locale/ru/LC_MESSAGES/messages.po | 406 +++----------------
news/2019-12.html.j2 | 51 +++
template/cashier.html.j2 | 29 ++
template/contact.html.j2 | 22 +-
template/developers.html.j2 | 300 --------------
template/docs.html.j2 | 50 +++
template/glossary.html.j2 | 258 ------------
www.yml | 5 +
22 files changed, 947 insertions(+), 3150 deletions(-)
create mode 100644 doc/WRITING-NEWS
create mode 100644 icons/buildbot.svg
create mode 100644 icons/icon-cashier.svg
create mode 100644 icons/icon-lcov.svg
create mode 100644 icons/icon-wallet.svg
create mode 100644 news/2019-12.html.j2
create mode 100644 template/cashier.html.j2
delete mode 100644 template/developers.html.j2
delete mode 100644 template/glossary.html.j2
diff --git a/.gitmodules b/.gitmodules
index 88d819a..ce4a8e6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,4 +12,3 @@
[submodule "inc"]
path = inc
url = https://git.gnunet.org/www_shared.git
- branch = default
diff --git a/.well-known/security.txt b/.well-known/security.txt
index 77a1715..1726f52 100644
--- a/.well-known/security.txt
+++ b/.well-known/security.txt
@@ -1,6 +1,6 @@
# Our security address(es). Two just to be safe.
Contact: address@hidden
-Contact: address@hidden
+Contact: address@hidden
# Our PGP keys:
Encryption: https://grothoff.org/christian/grothoff.asc
diff --git a/Makefile b/Makefile
index 881d73e..eb19ed3 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ all: locale template
$(cp) -R $$d rendered/ ; \
done)
($(cp) -R pdf rendered/static/)
+ ($(mkdir) -p rendered/.well-known ; $(cp) .well-known/security.txt
rendered/.well-known/)
# Extract translateable strings from jinja2 templates.
locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
diff --git a/doc/WRITING-NEWS b/doc/WRITING-NEWS
new file mode 100644
index 0000000..65d3ead
--- /dev/null
+++ b/doc/WRITING-NEWS
@@ -0,0 +1,68 @@
+WRITING NEWS
+------------
+
+make_website.py calls gen_site() with "news" and other arguments
+when news are to be created.
+A news item needs to be added in the file www.yml to 'newsposts' like
+so:
+
+- page: filename.html
+ date: YYYY-MM-DD
+ title: the title of the news
+ abstract:
+ content:
+
+abstract and content are filled by make_website.py in a way which works
+but needs further improvements, as you can't use jinja2 templating for
+urls (yet).
+The news are ordered via the yaml file right now, which means that new
+posts should get inserted at the top.
+
+The news is written in the file 'filename.html.j2' in the folder 'news'.
+This .html.j2 file must extend "common/news.j2". Since we already have
+a <div> which wraps the content of the filename.html.j2, we do not need
+further surrounding elements in the news itself.
+
+News previews are generated from the plaintext of the first <p> element
+with common html elements (not jinja2!) stripped out. Some but not all
+jinja2 elements are stripped as well.
+Small newspreviews (as used by taler.net) do not process the first
+<p> element but process the date, title, and pagename.
+
+The rss is generated in a similar fashion like the website, by processing
+a .xml.j2 file and generating a .xml page from it. Too much structure
+relies on the yaml file (www.yml).
+
+
+A news template could look like this:
+
+
+news/2022-09-01.html.j2:
+
+{% extends "common/news.j2" %}
+{% block body_content %}
+<h1>2022-09-01: GNU Taler v0.7.0 released</h1>
+<p>
+ We are happy to announce the release of GNU Taler v0.5.0.
+ The main new feature is customer tipping, which allows
+ merchants to pay small rewards directly into a customer's
+ wallet. Technical improvements include numerous performance
+ improvements and bug fixes, as well as a new, simpler to use
+ API for merchants that also enables the implementation of
+ GNU Taler wallets on platforms that do not support
+ WebExtensions.
+</p>
+<p>
+ The Chrome and Chromium wallets are available for download
+ via the App store. The exchange, merchant backend and bank
+ components are on the GNU FTP mirrors.
+</p>
+{% endblock body_content %}
+
+
+www.yml:
+- page: 2022-09-01.html
+ date: 2022-09-01
+ title: GNU Taler v0.7.0 released
+ abstract:
+ content:
diff --git a/icons/buildbot.svg b/icons/buildbot.svg
new file mode 100644
index 0000000..23ae6c0
--- /dev/null
+++ b/icons/buildbot.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="300" height="300"
fill-rule="evenodd" aria-label="Nut" stroke-width="5" stroke="#000"
stroke-linejoin="round">
+ <defs>
+ <linearGradient id="a" x1="61.3" x2="61.3" y1="31.7" y2="194.3"
gradientTransform="matrix(1.28514 0 0 .76264 1.5 .5)"
gradientUnits="userSpaceOnUse">
+ <stop offset="0%" stop-color="#8da6d8"/>
+ <stop offset="100%" stop-color="#2e5cb8"/>
+ </linearGradient>
+ </defs>
+ <path d="M10.7 205.4v-43l101.9 91.5v42.5z" fill="#24478f"
stroke-width="4.9"/>
+ <path d="M112.7 254l139-33.7v43.2l-139 33.5v-43z" fill="#2e5cb8"
stroke-width="4.9"/>
+ <path d="M251.8 220.3v43.2l37.2-125v-43z" fill="#193366"
stroke-width="4.9"/>
+ <path d="M187.2 4L289 95.5l-37.2 124.8-139.2 33.5-101.8-91.4L48 37.5zm-3.5
72.6c32 16.7 43 53.6 24.4 82.5-18.4 28.8-59.6 38.7-91.8
22-32-16.5-43-53.6-24.4-82.4 18.3-28.9 59.4-38.9 91.7-22.2z" fill="#8da6d8"
stroke-width="4.9"/>
+ <path d="M85.5 146a54.8 54.8 0 0 1 6-47.3c18.8-28.9 60-38.8 92-22 27.5
14.3 39.6 43.4 30.7 69.5a61.8 61.8 0 0 0-30.6-35c-32.2-16.6-73.4-6.7-92
22.2a57.4 57.4 0 0 0-6 12.8z" fill="url(#a)" stroke-width="4.9"/>
+</svg>
diff --git a/icons/icon-cashier.svg b/icons/icon-cashier.svg
new file mode 100644
index 0000000..9d10100
--- /dev/null
+++ b/icons/icon-cashier.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ width="24"
+ height="24"
+ viewBox="0 0 24 24"
+ id="svg4"
+ sodipodi:docname="icon-cashier.svg"
+ inkscape:version="0.92.4 (unknown)">
+ <metadata
+ id="metadata10">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs8" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="982"
+ id="namedview6"
+ showgrid="false"
+ inkscape:zoom="9.8333333"
+ inkscape:cx="5.3475321"
+ inkscape:cy="20.1778"
+ inkscape:window-x="1920"
+ inkscape:window-y="72"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4" />
+ <path
+ d="M 6 3 L 6 6 L 9 6 L 9 7 L 6.25 7 C 5.05 7 4.0507812 8 4.0507812 9 L
3.5 16 L 20.5 16 L 20 9 C 19.8 8 18.800781 7 17.800781 7 L 11 7 L 11 6 L 14 6 L
14 3 L 6 3 z M 7 4 L 13 4 L 13 5 L 7 5 L 7 4 z M 6 9 L 8 9 L 8 10 L 6 10 L 6 9
z M 9 9 L 11 9 L 11 10 L 9 10 L 9 9 z M 13 9 L 18 9 L 18 11 L 13 11 L 13 9 z M
6 11 L 8 11 L 8 12 L 6 12 L 6 11 z M 9 11 L 11 11 L 11 12 L 9 12 L 9 11 z M 6
13 L 8 13 L 8 14 L 6 14 L 6 13 z M 9 13 L 11 13 L 11 14 L 9 14 L 9 13 z M 2 17
L 2 21 L 22 21 L 22 1 [...]
+ id="path2"
+ style="fill:#000000;fill-opacity:1" />
+</svg>
diff --git a/icons/icon-lcov.svg b/icons/icon-lcov.svg
new file mode 100644
index 0000000..6989e05
--- /dev/null
+++ b/icons/icon-lcov.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; version="1.1" x="0px" y="0px"
viewBox="0 0 64 80" style="enable-background:new 0 0 64 64;"
xml:space="preserve"><path
d="M61,2H45c-0.553,0-1,0.448-1,1v22c0,0.552,0.447,1,1,1h7v2H41c-0.553,0-1,0.448-1,1v3h-7v-6h7c0.553,0,1-0.448,1-1V3
c0-0.552-0.447-1-1-1H24c-0.553,0-1,0.448-1,1v22c0,0.552,0.447,1,1,1h7v6h-7v-3c0-0.552-0.447-1-1-1H12v-2h7c0.553,0,1-0.448,1-1V3
c0-0.552-0.447-1-1-1H3C2.447,2,2,2.448,2,3v22 [...]
diff --git a/icons/icon-wallet.svg b/icons/icon-wallet.svg
new file mode 100644
index 0000000..4849cd6
--- /dev/null
+++ b/icons/icon-wallet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; version="1.1" x="0px" y="0px"
viewBox="0 0 100 125" enable-background="new 0 0 100 100"
xml:space="preserve"><g><g><g><g><path fill="none" stroke="#000000"
stroke-width="3" stroke-linecap="round" stroke-linejoin="round"
stroke-miterlimit="10" d="
M41.147,66.634c-2.928,0-5.301-1.951-5.301-4.359s2.373-4.361,5.301-4.361c2.021,0,3.777,0.93,4.673,2.299"/><path
fill="none" stroke="#000000" stroke-width="3" [...]
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 8cdf7e9..ac610d1 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,157 +2,192 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-23 01:47+0100\n"
-"PO-Revision-Date: 2017-06-02 09:46+0100\n"
-"Last-Translator: Stefan Kügel <address@hidden>\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
+"PO-Revision-Date: 2020-03-08 18:19+0100\n"
"Language-Team: de <address@hidden, address@hidden>\n"
-"Language: en\n"
+"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
-"Generated-By: Babel 2.4.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: Babel 2.3.4\n"
+"Last-Translator: Stefan Kügel <address@hidden>\n"
+"X-Generator: Poedit 2.1.1\n"
#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
-msgstr ""
+msgstr "Das Taler-Bezahlsystem"
#: common/base.j2:6 common/news.j2:6
msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr ""
+msgstr "Taxable Anonymous Libre Electronic Reserves"
#: common/footer.j2.inc:11
msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
#: common/footer.j2.inc:16
msgid "FAQ"
-msgstr ""
+msgstr "FAQs"
#: common/footer.j2.inc:21
msgid "Bibliography"
-msgstr ""
+msgstr "Bibliografie von GNU Taler"
#: common/footer.j2.inc:28 template/bibliography.html.j2:34
#: template/developers.html.j2:66
msgid "and"
-msgstr ""
+msgstr "und"
#: 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>"
msgstr ""
+"Wir danken der <a href='http://www.bfh.ch/'>Berner Fachhochschule</a> für "
+"ihre Unterstützung und das kostenlose Hosting dieser Webseiten"
#: common/footer.j2.inc:33
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
msgstr ""
+"Diese Webseiten wurden ausschließlich mit <a href='https://www.gnu.";
+"org/'>freier Software</a> erstellt."
#: common/navigation.j2.inc:21
msgid "Features"
-msgstr ""
+msgstr "Features"
#: common/navigation.j2.inc:22
msgid "Principles"
-msgstr ""
+msgstr "Prinzipien"
#: common/navigation.j2.inc:23
msgid "Docs"
-msgstr ""
+msgstr "Dokumente und Materialien"
#: common/navigation.j2.inc:24 news/index.html.j2:9
msgid "News"
-msgstr ""
+msgstr "Neuigkeiten und Nachrichten zu Taler"
#: inc/news.macro.j2:22
msgid "read more"
-msgstr ""
+msgstr "Hier gibt's noch mehr zu lesen!"
#: template/architecture.html.j2:6
msgid "Taler System Architecture"
-msgstr ""
+msgstr "Die Systemarchitektur des Taler-Bezahlsystems"
#: template/bibliography.html.j2:5
msgid "GNU Taler Bibliography"
-msgstr ""
+msgstr "Bibliografie von GNU Taler"
#: template/bibliography.html.j2:27
msgid "by"
+msgstr "von"
+
+#: template/cashier.html.j2:7
+msgid "Taler Cashier"
+msgstr "Taler Cashier"
+
+#: 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 ""
+"Taler Cashier ist eine Android-App, mit der man Bargeld persönlich "
+"entgegennehmen und dessen Betrag in Taler-Coins auf ein Taler-Wallet buchen "
+"kann (auf das eigene oder ein fremdes Wallet)."
+
+#: template/cashier.html.j2:21 template/developers.html.j2:149
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr "Download"
#: template/contact.html.j2:6
msgid "Contact information"
-msgstr ""
+msgstr "Kontakt"
#: template/contact.html.j2:13
msgid "The mailing list"
-msgstr ""
+msgstr "Die Mailing-Liste"
#: template/contact.html.j2:15
msgid "An archived, public mailing list for GNU Taler is hosted at"
-msgstr ""
+msgstr "Eine archivierte öffentliche Mailing-Liste zu Taler wird gehostet auf"
#: template/contact.html.j2:20
msgid "archive"
-msgstr ""
+msgstr "Archiv"
#: template/contact.html.j2:21
msgid "You can send messages to the list at"
-msgstr ""
+msgstr "Nachrichten an die Liste darf man gerne senden an"
#: template/contact.html.j2:29
msgid "Contacting individuals"
-msgstr ""
+msgstr "Mitglieder kontaktieren"
#: template/contact.html.j2:31
msgid ""
"Team members are generally reachable at <tt>address@hidden</tt>. All of "
"us support receiving GnuPG encrypted e-mails."
msgstr ""
+"Die Mitglieder des Taler-Teams sind erreichbar mit einer E-Mail an "
+"<tt>address@hidden</tt>. Alle E-Mails an uns können auch GnuPG-"
+"verschlüsselt gesendet werden."
#: template/contact.html.j2:40
msgid "General inquiries"
-msgstr ""
+msgstr "Allgemeine Anfragen"
#: template/contact.html.j2:42
msgid ""
"You can reach a group of team members handling general inquiries at "
"<tt>contact AT taler.net</tt>."
msgstr ""
+"Allgemeine Anfragen können mit einer E-Mail an <tt>contact AT taler.net</tt> "
+"gestellt werden, um mehrere Mitglieder unseres Entwicklerteams auf einmal zu "
+"erreichen."
#: template/contact.html.j2:50
msgid "Reporting bugs"
-msgstr ""
+msgstr "Vorschläge, Fehler und Bugs melden"
#: template/contact.html.j2:52
msgid "We track open feature requests and bugs in our"
msgstr ""
+"Haben Sie einen Bug gefunden oder Tipps für Erweiterungen der Funktionalität "
+"von Taler? Bitte erfassen Sie Ihre Vorschläge mit dem"
#: template/contact.html.j2:55
msgid "Bug tracker"
-msgstr ""
+msgstr "Bug Tracker"
#: 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."
msgstr ""
+"der mit dem GNUnet-Projekt geteilt wird. Bugs oder Anfragen zur Erweiterung "
+"von Funktionen können auch an die Mailing-Liste gesendet werden."
#: template/contact.html.j2:65
msgid "Executive team"
-msgstr ""
+msgstr "Geschäftsführung"
#: template/contact.html.j2:67
msgid ""
"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
"tt>."
msgstr ""
+"Für alle nicht-technischen Anfragen und Händleranfragen bitten wir unsere "
+"Geschäftsführung mit einer E-Mail an <tt>ceo AT taler.net</tt> anzuschreiben."
#: template/copyright.html.j2:6
msgid "Copyright Assignment"
-msgstr ""
+msgstr "Vereinbarung zur Abtretung von Urheberrechten"
#: template/copyright.html.j2:8
msgid ""
@@ -162,6 +197,14 @@ msgid ""
"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
"development</a> of the GNUnet and GNU Taler projects is satisfied."
msgstr ""
+"Wer zum Projekt GNU Taler beitragen möchte, ist dazu herzlich eingeladen. "
+"Voraussetzung dafür ist neben einem Zugang über Git, dass die Urheberrechte "
+"des eigenen Beitrags an das Projekt gemäß <a href=\"/pdf/copyright.pdf"
+"\">Copyright Assignment</a> abgetreten werden, um sicherzustellen, dass die "
+"Lizenzvereinbarung und die Richtlinien der Mitarbeit gegenüber GNUnet e.V. "
+"und Taler Systems SA erfüllt werden (siehe <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> )."
#: template/copyright.html.j2:19
msgid ""
@@ -171,6 +214,13 @@ msgid ""
"the ability to dual-license (for example, so that we can distribute via App-"
"stores that are hostile to free software)."
msgstr ""
+"Diese Vereinbarungen stellen sicher, dass der Code des jeweiligen Beitrags "
+"genauso wie das gesamte Projekt dauerhaft unter der Lizenz für freie "
+"Software steht. Gleichzeitig erlauben sie den besseren Austausch von Code "
+"zwischen GNUnet und GNU Taler. Außerdem erhält das Projekt damit die "
+"Möglichkeit zu einer doppelten Lizenzerteilung (beispielsweise in einer "
+"Lizenzform für die Verbreitung über App-Stores, die Anwendungen auf Basis "
+"freier Software sonst auslisten würden)."
#: template/copyright.html.j2:29
msgid ""
@@ -179,14 +229,20 @@ msgid ""
"simply sign the agreement with your pseudonym. Scanned copies are "
"sufficient, but snail mail is preferred."
msgstr ""
+"Weniger umfangreiche Beiträge benötigen keine Abtretung des Urheberrechts "
+"und werden auch ohne einen Git-Zugang gern in Empfang genommen. Anonym "
+"eingereichte Beiträge zu GNU Taler sind ebenfalls willkommen. Die Autoren "
+"anonymer Einreichungen sollten die Vereinbarung zur Abtretung "
+"urheberrechtlicher Ansprüche mit ihrem Pseudonym unterzeichnen und am besten "
+"per Post (oder als Scan) senden."
#: template/developers.html.j2:5
msgid "Taler for developers"
-msgstr ""
+msgstr "Taler für Entwickler"
#: template/developers.html.j2:12 template/merchants.html.j2:58
msgid "Free"
-msgstr ""
+msgstr "Frei"
#: template/developers.html.j2:15
msgid ""
@@ -199,10 +255,19 @@ msgid ""
"open for constructive suggestions for maximizing the adoption of this "
"payment platform."
msgstr ""
+"GNU Taler ist freie Software und verwendet ein offenes Protokoll. Jeder ist "
+"dazu eingeladen, die Codebasis von GNU Taler als unsere "
+"Referenzimplementierung in die eigenen Entwicklungen zu übernehmen. Die "
+"Teile des Taler-Codes weisen unterschiedliche Lizenzen auf, unter denen man "
+"sie weiterverwenden kann. Es gelten Affero GPLv3+ für den Exchange und "
+"LGPLv3+ für den Referenzcode, der die Integration in Händlerplattformen "
+"bewirkt. Lizenzen nach GPLv3+ gelten für den Wallet-Code und die Software "
+"für Kundenschnittstellen. Wir freuen uns über jeden konstruktiven Vorschlag, "
+"unserem Bezahlsystem zu einer möglichst starken Verbreitung zu verhelfen."
#: template/developers.html.j2:32
msgid "RESTful"
-msgstr ""
+msgstr "RESTful-basiert"
#: template/developers.html.j2:35
msgid ""
@@ -214,14 +279,28 @@ msgid ""
"to encode structure data, making it easy to integrate Taler with existing "
"Web applications. Taler's protocol is documented in detail at"
msgstr ""
-
-#: template/developers.html.j2:58 template/docs.html.j2:182
+"Taler funktioniert webbasiert. Wenn ein Internet-Zugang besteht, kann sich "
+"das persönliche Taler-Wallet mit einem Taler-Exchange verbinden. Ein "
+"Exchange verantwortet sowohl den Aufladevorgang, mit dem ein Wallet Coins in "
+"der vom Exchange angebotenen Währung erhält, als auch den Bezahlvorgang beim "
+"Ausgeben der Coins. Um sicherzustellen, dass das Bezahlsystem auch in "
+"beschränkten Netzwerkumgebungen verfügbar bleibt, benutzt es ein RESTful-"
+"Protokoll via HTTP oder HTTPS. Es ist zwar nicht nötig, HTTPS zu verwenden, "
+"damit das System sein Sicherheitsniveau beibehält, doch werden Verkäufer für "
+"ihre Webshops HTTPS aus Konsistenzgründen als Protokoll einsetzen wollen. "
+"HTTPS sorgt im Vergleich mit dem HTTP-Protokoll generell für eine höhere "
+"Sicherheit bei der Datenübertragung. Taler verwendet daneben das JSON-"
+"Protokoll, welches die Integration in bestehende Webanwendungen erleichtert. "
+"Das Protokoll des Taler-Systems befindet sich detailliert auf"
+
+#: template/developers.html.j2:58 template/docs.html.j2:204
msgid "Code"
-msgstr ""
+msgstr "Code"
#: template/developers.html.j2:61
msgid "Taler is currently primarily developed by a research team at"
msgstr ""
+"Taler wird zurzeit von einem Forscherteam entwickelt, das ansässig ist bei"
#: template/developers.html.j2:70
msgid ""
@@ -230,80 +309,83 @@ msgid ""
"with the name of the respective repository. A list of repositories can be "
"found in our"
msgstr ""
+"Unterstützung von externen Beitragenden ist immer willkommen! Unsere Git-"
+"Repositories können mit Git und HTTP-basiertem Zugriff auf <tt>git.taler."
+"net</tt> geklont werden. Eine Liste der Repositories befindet sich auf"
#: template/developers.html.j2:80
msgid "Documentation"
-msgstr ""
+msgstr "Dokumentation"
#: template/developers.html.j2:83
msgid "In addition to this website, the"
-msgstr ""
+msgstr "Neben dieser Webseite bestehen die"
#: template/developers.html.j2:86
msgid "documented code"
-msgstr ""
+msgstr "Code-Dokumentation"
#: template/developers.html.j2:87
msgid "and the"
-msgstr ""
+msgstr "und die"
#: template/developers.html.j2:90
msgid "API documentation"
-msgstr ""
+msgstr "Schnittstellen-Dokumentation"
#: template/developers.html.j2:91
msgid "Technical papers can be found in our"
-msgstr ""
+msgstr "Wissenschaftliche Literatur findet man in der"
#: template/developers.html.j2:94
msgid "bibliography"
-msgstr ""
+msgstr "Bibliografie von GNU Taler"
#: template/developers.html.j2:98
msgid "Discussion"
-msgstr ""
+msgstr "Diskussion"
#: template/developers.html.j2:101
msgid ""
"We have a mailing list for developer discussions. You can subscribe to or "
"read the list archive at"
msgstr ""
+"Wir haben eine Mailing-Liste für die Diskussion unter Entwicklern. Die "
+"archivierten Beiträge und die Anmeldung zur Liste befindet sich auf"
#: template/developers.html.j2:111
msgid "Regression Testing"
-msgstr ""
+msgstr "Regressiontests"
#: template/developers.html.j2:114
msgid "We have"
-msgstr ""
+msgstr "Wir haben"
#: template/developers.html.j2:118
msgid "automation tests to detect regressions and check for portability at"
msgstr ""
+"automatisierte Tests, um Fehler nach Modifikationen des Codes prüfen zu "
+"können und die Portabilität des Codes zu gewährleisten, auf"
#: template/developers.html.j2:126
msgid "Code Coverage Analysis"
-msgstr ""
+msgstr "Testabdeckung"
#: template/developers.html.j2:129
msgid "We use"
-msgstr ""
+msgstr "Wir verwenden"
#: template/developers.html.j2:133
msgid "to analyze the code coverage of our tests, the results are available at"
-msgstr ""
+msgstr ", um die Testabdeckung unserer Funktionstests zu analysieren, auf"
#: template/developers.html.j2:146
msgid "Technical Presentation"
-msgstr ""
-
-#: template/developers.html.j2:149 template/investors.html.j2:90
-msgid "Download"
-msgstr ""
+msgstr "Die Technologie im Überblick"
#: template/developers.html.j2:165
msgid "Taler system overview"
-msgstr ""
+msgstr "Das Taler-System im Überblick"
#: template/developers.html.j2:168
msgid ""
@@ -311,10 +393,14 @@ msgid ""
"illustrated in the illustration on the right. Typical transactions involve "
"the following steps:"
msgstr ""
+"Das Taler-Bezahlsystem besteht aus Protokollen für den Datenaustausch "
+"zwischen den Nutzern des Systems. Die grundlegenden Transaktionen verlaufen "
+"stets nach dem gleichen Schema. Sie umfassen folgende Schritte (wie in der "
+"Grafik dargestellt):"
#: template/developers.html.j2:175
msgid "system overview"
-msgstr ""
+msgstr "Das Taler-System im Überblick"
#: template/developers.html.j2:178
msgid ""
@@ -323,6 +409,17 @@ msgid ""
"includes an authentication token from his electronic <b>wallet</b>. In Taler "
"terminology, the customer creates a reserve at the exchange."
msgstr ""
+"Zuerst überweisen Taler-Nutzer Geld von ihren herkömmlichen Girokonten in "
+"der Währung ihrer Geschäftsbanken (in der Grafik oben links) an den Taler-"
+"Exchange, der in dieser Währung betrieben wird (in der Mitte der Grafik). Im "
+"Betreff jeder Überweisung nennen sie die Transaktionsnummer, die ihnen ihr "
+"Taler-Wallet für die jeweilige Aufbuchung anzeigt. Dadurch bildet sich auf "
+"dem Treuhandkonto des Exchange-Betreibers (im Regelfall eine Geschäftsbank) "
+"eine Reserve. Diese Reserve entspricht genau dem überwiesenen Betrag in Form "
+"von elektronischen \"Münzen\", den Coins. Die Währung bleibt ebenfalls "
+"gleich. Coins stellen also elektronische Repräsentanten des ursprünglichen "
+"aufgebuchten Geldwerts dar, der beim Bezahlen aus dem Treuhandkonto des "
+"Exchange abgebucht und dem Verkäufer-Girokonto zugebucht wird."
#: template/developers.html.j2:190
msgid ""
@@ -335,6 +432,19 @@ msgid ""
"not change the currency or the total value of the funds (except for fees "
"which the exchange may charge for the service)."
msgstr ""
+"Sobald der Taler-Exchange eine Überweisung erhalten hat, kann das Wallet, "
+"welches die Überweisung ins Treuhandkonto des Exchange ausgelöst hat, die "
+"Coins abheben. Die elektronischen Münzen im Wallet werden bis zur Einlösung "
+"der Coins gehalten, also bis zum Einsatz als Zahlungsmittel. Auch die "
+"Geldwerte auf dem Treuhandkonto des Exchange-Betreibers bleiben solange dort "
+"erhalten. Für den Betrieb eines Exchange fallen Kosten an, welche die Taler-"
+"Nutzer in Form von Gebühren tragen. Diese Gebühren sind notwendig für den "
+"dauerhaften Betrieb des Exchange und decken auch die anteiligen Bankgebühren "
+"für die Buchung auf das Treuhandkonto. Von besonderer Bedeutung ist die "
+"Tatsache, dass kein Taler-Exchange jemals Kenntnis über die \"Seriennummern"
+"\" der erzeugten Coins erlangt. Dies bewirkt, dass zu keinem Zeitpunkt "
+"nachvollzogen werden kann, welcher Käufer von welchem Verkäufer welche Güter "
+"erwarb. Auch die gekauften Artikel selbst bleiben unbekannt."
#: template/developers.html.j2:208
msgid ""
@@ -350,6 +460,20 @@ msgid ""
"fraction of his digital coins (the system takes care of customers getting "
"change)."
msgstr ""
+"Die Coins im Taler-Wallet kann man bei allen Verkäufern ausgeben, die das "
+"Taler-Bezahlsystem unterstützen und einen Taler-Exchange als "
+"Geschäftspartner zur Zahlungsabwicklung akzeptieren (in der Grafik unten "
+"rechts). Der Verkaufsvorgang beruht auf einem digitalen Vertrag, der mit "
+"einer Signatur jeweils vom Verkäufer und vom Käufer erzeugt wird (in der "
+"Grafik unten als Pfeil dargestellt). Dieser elektronisch \"unterschriebene\" "
+"Vertrag kann als Verweis auf die genauen Vertragsbedingungen herangezogen "
+"werden und ist für eventuelle Streitfälle auch vor Gericht verwendbar als "
+"Kaufnachweis eines Gutes zum gezahlten Preis. Dazu müssen weder Käufer noch "
+"Verkäufer über die Identität oder Bankdaten ihrer Geschäftspartner Kenntnis "
+"erlangen. Dabei kann jeder beliebige Teilbetrag eines Coin aus dem Taler-"
+"Wallet verwendet werden. Das Bezahlsystem sorgt für das korrekte "
+"Wechselgeld, indem es eine neu erzeugte Coin über den Restbetrag an das "
+"Wallet sendet."
#: template/developers.html.j2:230
msgid ""
@@ -364,6 +488,25 @@ msgid ""
"by the customer. Thus, the exchange's database allows the state to enforce "
"that merchants pay applicable taxes (and do not engage in illegal contracts)."
msgstr ""
+"Mit dem Vertragsschluss übertragen die Käufer ihre Coins an die Verkäufer. "
+"Die Verkäufer erhalten dafür die entsprechenden Geldwerte auf ihre "
+"Girokonten bei ihren Geschäftsbanken. Die Forderungen der Verkäufer "
+"verarbeitet dabei der Taler-Exchange, von dem die vom Käufer eingesetzten "
+"Coins erzeugt wurden. Dieser betreffende Exchange sorgt dafür, dass die "
+"realen Geldwerte der Coins auf die Girokonten der Empfänger gebucht werden. "
+"Der Exchange kennt weder Vertragsdetails noch Käuferdaten und erfährt von "
+"den Verkäufern auch nur die Bankverbindung der Empfängerkonten. Der "
+"Geldeingang auf den empfangenden Konten geht hingegen nicht zu "
+"verheimlichen. Die Verkäufer müssen davon ausgehen, dass ihre Umsätze durch "
+"die Buchung ihrer Einnahmen aus dem Taler-Bezahlsystem auf ihre Girokonten "
+"bei Geschäftsbanken nachvollziehbar sind. Zusätzlich dazu sind sie sich der "
+"Rolle der externen Auditoren bewusst, welcher Unregelmäßigkeiten im Taler-"
+"System automatisiert den Finanzbehörden meldet. Die Verkäufer erhalten "
+"zugleich einfach und unkompliziert einen Nachweis ihrer rechtmäßigen "
+"Geschäftstätigkeit, den sie gegenüber staatlichen Steuerbehörden darlegen "
+"können. Das System unterstützt auf diese Weise die Finanzierung unseres "
+"staatlichen und kommunalen Gemeinwesens, verpflichtet alle Verkäufer zu "
+"Steuerzahlungen und hält sie von illegalen Geschäften ab."
#: template/developers.html.j2:253
msgid ""
@@ -373,6 +516,15 @@ msgid ""
"transfer. The merchant can query the exchange about the relationship between "
"the bank transfers and the individual claims that were deposited."
msgstr ""
+"Die Forderungen der Verkäufer, die Coins aus dem Taler-System annehmen, "
+"sammelt der Exchange und bündelt sie zu Sammelbuchungen zugunsten der "
+"Verkäufer-Girokonten bei Geschäftsbanken (in der Grafik oben rechts). Dies "
+"stellt den letzten Schritt des Bezahlvorgangs dar. Mit diesem wickelt der "
+"Exchange die Forderungen der Verkäufer an realen Geldwerten ab. Die "
+"Verkäufer haben durch die Abfrage mit der Verkäufer-Schnittstelle beim Taler-"
+"Exchange immer ihre angesammelten Forderungen beziehungsweise deren "
+"Überweisung auf die Girokonten bei der eigenen Geschäftsbank leicht "
+"nachvollziehbar im Blick."
#: template/developers.html.j2:267
msgid ""
@@ -383,6 +535,16 @@ msgid ""
"check that its bank balance matches the total value of the remaining coins "
"in circulation."
msgstr ""
+"Eine bedeutende Eigenschaft des Bezahlsystems besteht darin, dass über jeden "
+"Exchange eine kryptografisch verschlüsselte Prüfung bereitgestellt wird. "
+"Diese Prüfung stellt sicher, dass alle Buchungen korrekt ausgeführt wurden. "
+"Sie umfasst die Kommunikation zwischen Exchange und Wallets sowie die "
+"Buchungen zwischen dem Treuhandkonto jedes Exchange von und zu "
+"(Giro-)Konten. Die Prüfberichte werden unabhängigen Auditoren wie z.B. von "
+"Regierungen ernannten Finanzaufsichtsbehörden zur Verfügung gestellt, die "
+"regelmäßig die Datenbanken jedes Exchange auf korrekte Funktionalität "
+"überprüfen. Dabei vergleichen sie die Übereinstimmung der im Umlauf "
+"befindlichen Summe von Coins mit den Überweisungen an die Geschäftsbanken."
#: template/developers.html.j2:282
msgid ""
@@ -392,10 +554,20 @@ msgid ""
"limited to the respective party and proportional to the funds they have in "
"circulation during the period of the compromise."
msgstr ""
+"Die Rolle der Auditoren ist ein wichtiger Sicherheitsaspekt des Systems. "
+"Durch die ständige Begutachtung unabhängiger Auditoren wird dafür gesorgt, "
+"dass kein Taler-Exchange Überweisungen unterschlagen oder Geldwerte in einer "
+"Reserve zurückbehalten kann. Ebenso wenig können Käufer oder Verkäufer "
+"betrügen - weder sich gegenseitig noch einen Exchange. Sollten Coins auf "
+"einem Speichermedium aufgrund dessen Beschädigung verloren gehen (weil kein "
+"Backup angelegt wurde) oder Coins durch Fremdzugriff auf ein Wallet "
+"missbräuchlich verwendet werden, beschränkt sich der finanzielle Verlust "
+"immer nur auf den Wert der Coins, die zum Zeitpunkt des Schadens im Wallet "
+"gehalten wurden."
#: template/docs.html.j2:7
msgid "GNU Taler: Documentation and Resources"
-msgstr ""
+msgstr "Dokumente und Materialien zu GNU Taler"
#: template/docs.html.j2:13
msgid ""
@@ -403,115 +575,147 @@ msgid ""
"full documentation contents can be found <a href=\"https://docs.taler.net/";
"\">here</a>."
msgstr ""
+"Hier befinden sich Verweise auf einzelne Kapitel in der Dokumentation des "
+"Taler-Bezahlsystems. Die vollständige Dokumentation aller Systembestandteile "
+"ist <a href=\"https://docs.taler.net/\";>hier</a> zu finden."
#: template/docs.html.j2:27
msgid "Components"
-msgstr ""
+msgstr "Systembestandteile"
#: template/docs.html.j2:38
msgid "Merchant Backend Administration"
-msgstr ""
+msgstr "Verwaltungsbackend für die Verkäufer-Seite"
#: template/docs.html.j2:40
msgid "Tutorial and manual for operating a merchant. Also available as"
-msgstr ""
+msgstr "Anleitung zum Aufsetzen der Verkäufer-Backends. Hier auch als"
#: template/docs.html.j2:50
msgid "Merchant API Tutorial"
-msgstr ""
+msgstr "Beschreibung der API für Verkäufer"
#: template/docs.html.j2:52
msgid ""
"Tutorial for processing Taler payments using the merchant backend API. Also "
"available as"
msgstr ""
+"Anleitung zur Zahlungsabwicklung mit Taler unter Verwendung der API für "
+"Verkäufer. Hier auch als"
#: template/docs.html.j2:62
msgid "Exchange"
-msgstr ""
+msgstr "Taler-Exchange"
#: template/docs.html.j2:64
msgid "Operator's manual for the GNU Taler exchange. Also available as"
-msgstr ""
+msgstr "Anleitung für Exchange-Betreiber. Hier auch als"
#: template/docs.html.j2:74
msgid "Bank Integration"
-msgstr ""
+msgstr "Bankintegration"
#: template/docs.html.j2:76
msgid ""
"Manual for tightly integrating Taler with banking applications. Also "
"available as"
msgstr ""
+"Anleitung zum Aufsetzen der Schnittstellen für Bank-Anwendungen. Hier auch "
+"als"
#: template/docs.html.j2:92
msgid "Back office"
-msgstr ""
+msgstr "Prüfung des Zahlungseingangs"
#: template/docs.html.j2:94
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
+"Anleitung zum Aufsetzen der Anwendung, welche die Zahlungseingänge an "
+"Verkäufer prüft. Hier auch als"
-#: template/docs.html.j2:107
-msgid "Internals"
+#: template/docs.html.j2:104
+msgid "Merchant POS Terminal"
+msgstr "POS-Terminal für Verkäufer"
+
+#: template/docs.html.j2:106
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
msgstr ""
+"Anleitung zur Konfiguration und Inbetriebnahme der POS-Anwendung. Hier auch "
+"als"
+
+#: template/docs.html.j2:116
+msgid "Cashier"
+msgstr "Taler Cashier"
#: template/docs.html.j2:118
+msgid "An app for taking in cash and handing out electronic cash."
+msgstr "Anwendung für den Erwerb von Coins mit Bargeld."
+
+#: template/docs.html.j2:129
+msgid "Internals"
+msgstr "Weitere Informationen"
+
+#: template/docs.html.j2:140
msgid "HTTP API"
-msgstr ""
+msgstr "HTTP-Schnittstellen"
-#: template/docs.html.j2:120
+#: template/docs.html.j2:142
msgid "Reference for the HTTP-based API for Taler components."
-msgstr ""
+msgstr "Beschreibung der HTTP-basierten Programmierschnittstellen"
-#: template/docs.html.j2:128
+#: template/docs.html.j2:150
msgid "Onboarding"
-msgstr ""
+msgstr "Mitmachen!"
-#: template/docs.html.j2:130
+#: template/docs.html.j2:152
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
+"Informationen für alle, die zur Entwicklung von Taler oder der Taler-"
+"Webseite beitragen möchten. Hier auch als"
-#: template/docs.html.j2:143
+#: template/docs.html.j2:165
msgid "Community"
-msgstr ""
+msgstr "Community"
-#: template/docs.html.j2:154
+#: template/docs.html.j2:176
msgid "Mailing List"
-msgstr ""
+msgstr "Mailing-Liste"
-#: template/docs.html.j2:156
+#: template/docs.html.j2:178
msgid "The official GNU Taler mailing list."
-msgstr ""
+msgstr "Die öffentliche Mailing-Liste zu Taler."
-#: template/docs.html.j2:162
+#: template/docs.html.j2:184
msgid "IRC"
-msgstr ""
+msgstr "Internet Relay Chat"
-#: template/docs.html.j2:164
+#: template/docs.html.j2:186
msgid "Our IRC channel is #taler on freenode."
-msgstr ""
+msgstr "Unser IRC-Kanal befindet sich unter #taler auf freenode."
-#: template/docs.html.j2:170
+#: template/docs.html.j2:192
msgid "Bug Tracker"
-msgstr ""
+msgstr "Bug Tracker"
-#: template/docs.html.j2:172
+#: template/docs.html.j2:194
msgid "Our bug tracker for bugs and feature request."
-msgstr ""
+msgstr "Unser Bug Tracker sammelt Bugs oder Funktionsanfragen."
-#: template/docs.html.j2:194
+#: template/docs.html.j2:216
msgid "Git repositories"
-msgstr ""
+msgstr "Git-Repositories"
-#: template/docs.html.j2:196
+#: template/docs.html.j2:218
msgid "Git repositories for all of GNU Taler."
-msgstr ""
+msgstr "Git-Repos für alle Systemelemente von GNU Taler."
#: template/faq.html.j2:5
msgid "How is Taler related to Bitcoin or Blockchains?"
msgstr ""
+"In welchem Zusammenhang steht Taler zu Bitcoin oder zur Blockchain-"
+"Technologie?"
#: template/faq.html.j2:8
msgid ""
@@ -520,6 +724,11 @@ msgid ""
"is based on blind signatures. However, it is theoretically possible to "
"combine Taler with peer-to-peer crypto-currencies like Bitcoin."
msgstr ""
+"Taler verwendet keine Blockchain-Technologie und steht mit dieser in keinem "
+"Zusammenhang. Elektronische Münzen wie Bitcoin können jedoch in Taler-"
+"Wallets aufbewahrt werden. Taler verwendet blinde Signaturen zum "
+"gegenseitigen Beglaubigen und kann daher auf Web-of-trust- oder Proof-of-"
+"work-Verfahren verzichten."
#: template/faq.html.j2:18
msgid ""
@@ -527,10 +736,15 @@ msgid ""
"a Taler wallet (with an appropriate exchange), which would give some "
"benefits over plain Bitcoin, such as instant confirmation times."
msgstr ""
+"Es ist mit Taler möglich, Bitcoin als elektronische Münzen in einem Taler-"
+"Wallet aufzubewahren und zum Bezahlen auszugeben, sofern ein Taler-Exchange "
+"explizit für Bitcoin eingerichtet und betrieben wird. Dies brächte beim "
+"Einsatz von Bitcoin sogar den Vorteil, dass die mit BTC zahlenden Käufer "
+"Zahlungsbestätigungen in Echtzeit erhalten."
#: template/faq.html.j2:26
msgid "Where is the balance in my wallet stored?"
-msgstr ""
+msgstr "Wo ist der Münzbestand in meinem Taler-Wallet gespeichert?"
#: template/faq.html.j2:28
msgid ""
@@ -538,10 +752,19 @@ msgid ""
"your balance. The exchange keeps funds matching all unspent coins in an "
"escrow bank account."
msgstr ""
+"Das Taler-Wallet speichert die elektronischen Münzen (Coins) als "
+"Repräsentanten realer Geldwerte nur auf den Speichermedien, auf denen das "
+"Wallet angelegt wurde. Dies kann zum Beispiel der persönliche Computer sein. "
+"Es empfiehlt sich, Kopien der Wallets zum sicheren Backup ihrer Daten "
+"mehrfach abzuspeichern, beispielsweise auf USB-Sticks. Der Taler-Exchange "
+"hingegen verwaltet die realen Geldwerte sicher auf einem Treuhandkonto. "
+"Jeder einzelne Exchange, der zum Aufbuchen der Coins in das persönliche "
+"Wallet verwendet wurde, hält diese bis zum Einsatz der im Wallet vorhandenen "
+"Coins."
#: template/faq.html.j2:35
msgid "What if my wallet is lost?"
-msgstr ""
+msgstr "Was passiert bei einem Verlust des Taler-Wallet?"
#: template/faq.html.j2:37
msgid ""
@@ -549,16 +772,24 @@ msgid ""
"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 ""
+"Die elektronischen Münzen im Wallet sind anonymisiert. Daher kann man sie "
+"bei einem Verlust oder Diebstahl des Wallet ohne eine zuvor angelegte Kopie "
+"nicht wiederherstellen. Wie bei echten Geldbörsen mit Banknoten und Münzen "
+"sind ihre Eigentümer allein verantwortlich für deren Sicherung. Im Fall von "
+"Wallets müssen diese an sicheren Orten abgespeichert und vor fremdem Zugriff "
+"geschützt werden."
#: template/faq.html.j2:46
msgid ""
"The risk of losing a wallet can be mitigated by making backups or keeping "
"the balance reasonably low."
msgstr ""
+"Das Risiko bei einem eventuellen Verlust des Wallet kann minimiert werden, "
+"indem man den Bestand an digitalen Münzen niedrig hält."
#: template/faq.html.j2:52
msgid "What if my computer is hacked?"
-msgstr ""
+msgstr "Was ist, wenn mein Computer gehackt wurde?"
#: template/faq.html.j2:54
msgid ""
@@ -566,10 +797,14 @@ msgid ""
"from your wallet. Checking your balance might reveal to you that your device "
"has been compromised."
msgstr ""
+"Im Fall eines Einbruchs in die Geräte können tatsächlich Coins aus Taler-"
+"Wallets ausgegeben werden. Es bietet sich daher an, den Bestand regelmäßig "
+"zu kontrollieren, um einen eventuellen Verlust festzustellen."
#: template/faq.html.j2:61
msgid "Can I send money to my friend with Taler?"
msgstr ""
+"Wie kann ich mit Taler anderen Menschen meine elektronischen Münzen senden?"
#: template/faq.html.j2:63
msgid ""
@@ -577,30 +812,45 @@ msgid ""
"they can easily set up a Taler merchant and receive the payment in their "
"bank account."
msgstr ""
+"Wer Coins aus dem Taler-Bezahlsystem annimmt und wieder in reale Geldwerte "
+"umwandeln möchte, kann sich schnell und einfach die Taler-"
+"Verkäuferschnittstelle einrichten, den sog. \"Merchant\". Die Coins werden "
+"über die Verkäuferschnittstelle durch den Exchange gesammelt und ihre "
+"entsprechenden Geldwerte mit einer Sammelbuchung auf dem (Giro-)Konto des "
+"Verkäufers gutgeschrieben."
#: template/faq.html.j2:70
msgid ""
"Future versions of the Taler wallet may allow exchanging coins among friends "
"directly as well."
msgstr ""
+"Zukünftige Versionen des Taler-Wallet sehen vor, unter Freunden auch direkt "
+"Coins auszutauschen (peer-to-peer). Möchte man Coins aus dem Taler-Wallet an "
+"andere Personen senden, wird dies dann schnell und kostengünstig ermöglicht."
#: template/faq.html.j2:76
msgid "How does Taler handle payments in different currencies?"
-msgstr ""
+msgstr "Wie geht Taler mit Coins verschiedener Währungen um?"
#: 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."
msgstr ""
+"Ein Taler-Wallet verwaltet Coins in verschiedenen Währungen - so viele wie "
+"die Betreiber von Taler-Exchanges an Währungen anbieten. Deshalb kann Taler "
+"viele verschiedene Coins mit Nominalwerten in Euro oder Dollar und sogar "
+"virtuelle Währungen wie Bitcoin im persönlichen Wallet halten."
#: template/faq.html.j2:84
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
+"Taler bietet zurzeit keinen direkten Umtausch zwischen verschiedenen "
+"Währungen und Sorten."
#: template/faq.html.j2:89
msgid "How does Taler protect my privacy?"
-msgstr ""
+msgstr "Wie schützt Taler meine privaten Daten?"
#: template/faq.html.j2:91
msgid ""
@@ -609,10 +859,17 @@ msgid ""
"signature protects your privacy as it prevents the exchange from knowing "
"which coin it signed for which customer."
msgstr ""
+"Wallets verwalten Coins, die von einem Taler-Exchange beim Aufbuchen der "
+"Repräsentanten realer Geldwerte ins Wallet blind signiert werden. Das "
+"Verfahren mit blinden Signaturen sorgt dafür, dass kein Betreiber eines "
+"Taler-Exchange Kenntnis davon erlangt, welche Coins für welches Wallet "
+"erzeugt wurden. Weiterführende Informationen dazu beschreibt die <a href="
+"\"https://de.wikipedia.org/wiki/Digitale_Signatur\";>Wikipedia-Seite zur "
+"digitalen Signatur</a>."
#: template/faq.html.j2:101
msgid "How much does it cost?"
-msgstr ""
+msgstr "Wie hoch sind die Kosten der Nutzung? Welche Gebühren fallen an?"
#: template/faq.html.j2:103
msgid ""
@@ -626,6 +883,19 @@ msgid ""
"estimate, details may depend on hosting and backup requirements from the "
"regulator and could thus easily be 10x higher."
msgstr ""
+"Das Taler-Bezahlsystem erlaubt es, dass jeder Exchange-Betreiber seine "
+"eigene Gebührenordnung anwendet. Gebühren können erhoben werden für das "
+"Abheben von Geldwerten vom Girokonto (zum Aufbuchen in das persönliche "
+"Wallet), das Ausgeben von Coins (Bezahlen), die Rückerstattung nach einem "
+"eventuellen Vertragsrücktritt und für das Wechselgeld bei einer Verwendung "
+"von Coins mit höherem Nennwert als der Zahlbetrag (die sog. \"Refresh-Gebühr"
+"\"). Es können des weiteren Gebühren erhoben werden für die aggregierten "
+"Sammelbuchungen der Verkäuferumsätze sowie für ein eventuelles Nichtabheben "
+"von Coins aus der Reserve eines Exchange (falls ein Wallet eine Abhebung "
+"nicht zu Ende führt). Verkäufer haben die Option, Anteile der Gebühren an "
+"Stelle ihrer Kunden zu übernehmen. Die Kosten für eine Transaktion betragen "
+"gegenwärtig nach eigener Schätzung 0,001 Eurocent (für den Fall von hohen "
+"Transaktionsmengen, auf welche die Betriebskosten degressiv verteilt werden)."
#: template/faq.html.j2:117
msgid "Does Taler work with international payments?"
@@ -721,7 +991,7 @@ msgstr ""
#: template/features.html.j2:7
msgid "GNU Taler: Features"
-msgstr ""
+msgstr "Features"
#: template/features.html.j2:13
msgid ""
@@ -887,344 +1157,6 @@ msgid ""
"developments in the financial industry."
msgstr ""
-#: template/glossary.html.j2:6
-msgid "auditor"
-msgstr ""
-
-#: template/glossary.html.j2:8
-msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
-msgstr ""
-
-#: template/glossary.html.j2:12
-msgid "bank"
-msgstr ""
-
-#: template/glossary.html.j2:14
-msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: template/glossary.html.j2:18
-msgid "coin"
-msgstr ""
-
-#: template/glossary.html.j2:20
-msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:24
-msgid "contract"
-msgstr ""
-
-#: template/glossary.html.j2:26
-msgid "the proposal signed by the wallet."
-msgstr ""
-
-#: template/glossary.html.j2:30
-msgid "denomination"
-msgstr ""
-
-#: template/glossary.html.j2:32
-msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
-msgstr ""
-
-#: template/glossary.html.j2:37
-msgid "denomination key"
-msgstr ""
-
-#: template/glossary.html.j2:39
-msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
-msgstr ""
-
-#: template/glossary.html.j2:44
-msgid "deposit"
-msgstr ""
-
-#: template/glossary.html.j2:46
-msgid ""
-"operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:52
-msgid "dirty"
-msgstr ""
-
-#: template/glossary.html.j2:54
-msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than the "
-"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
-msgstr ""
-
-#: template/glossary.html.j2:61
-msgid "exchange"
-msgstr ""
-
-#: template/glossary.html.j2:63
-msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
-msgstr ""
-
-#: template/glossary.html.j2:68
-msgid "expired"
-msgstr ""
-
-#: template/glossary.html.j2:70
-msgid ""
-"Various operations come with time limits. In particular, `denomination keys` "
-"come with strict time limits for the various operations involving the `coin` "
-"issued under the `denomination`. The most important limit is the `deposit` "
-"expiration, which specifies until when wallets are allowed to use the coin "
-"in `deposit` or `refreshing` operations. There is also a \"legal\" "
-"expiration, which specifies how long the exchange keeps records beyond the "
-"`deposit` expiration time. This latter expiration matters for legal disputes "
-"in courts and also creates an upper limit for `refreshing` operations on "
-"special `zombie coin`."
-msgstr ""
-
-#: template/glossary.html.j2:82
-msgid "extension"
-msgstr ""
-
-#: template/glossary.html.j2:84
-msgid "implementation of a `wallet` for browsers"
-msgstr ""
-
-#: template/glossary.html.j2:88
-msgid "fresh coin"
-msgstr ""
-
-#: template/glossary.html.j2:90
-msgid "a `coin` is fresh if its public key is only known to the customer"
-msgstr ""
-
-#: template/glossary.html.j2:94
-msgid "master key"
-msgstr ""
-
-#: template/glossary.html.j2:96
-msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: template/glossary.html.j2:101
-msgid "message signing key"
-msgstr ""
-
-#: template/glossary.html.j2:103
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
-
-#: template/glossary.html.j2:107
-msgid "offer"
-msgstr ""
-
-#: template/glossary.html.j2:109
-msgid ""
-"specification of the details of a transaction, specifies the payment "
-"obligations for the customer (i.e. the amount), the deliverables of the "
-"merchant and other related information, such as deadlines or locations; "
-"However, it lacks some information that the backend is supposed to provide. "
-"In other words, after the backend adds the missing information to the offer "
-"and signs it, it becomes a proposal."
-msgstr ""
-
-#: template/glossary.html.j2:118
-msgid "owner"
-msgstr ""
-
-#: template/glossary.html.j2:120
-msgid "a `coin` is owned by the entity that knows the private key of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:124
-msgid "payback"
-msgstr ""
-
-#: template/glossary.html.j2:126
-msgid ""
-"operation by which an exchange returns the value of coins affected by a "
-"`revocation` to their `owner`, either by allowing the owner to withdraw new "
-"coins or wiring funds back to the bank account of the `owner`"
-msgstr ""
-
-#: template/glossary.html.j2:132
-msgid "proof"
-msgstr ""
-
-#: template/glossary.html.j2:134
-msgid ""
-"message that cryptographically demonstrates that a particular claim is "
-"correct"
-msgstr ""
-
-#: template/glossary.html.j2:138
-msgid "proposal"
-msgstr ""
-
-#: template/glossary.html.j2:140
-msgid "a sketch that has been completed and signed by the merchant backend."
-msgstr ""
-
-#: template/glossary.html.j2:144
-msgid "reserve"
-msgstr ""
-
-#: template/glossary.html.j2:146
-msgid ""
-"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's "
-"bank account to cover obligations from coins in circulation"
-msgstr ""
-
-#: template/glossary.html.j2:152
-msgid "refreshing"
-msgstr ""
-
-#: template/glossary.html.j2:154
-msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh` "
-"coins"
-msgstr ""
-
-#: template/glossary.html.j2:159
-msgid "refund"
-msgstr ""
-
-#: template/glossary.html.j2:161
-msgid ""
-"operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back to "
-"the customer"
-msgstr ""
-
-#: template/glossary.html.j2:167
-msgid "revocation"
-msgstr ""
-
-#: template/glossary.html.j2:169
-msgid ""
-"exceptional operation by which an exchange withdraws a denomination from "
-"circulation, either because the signing key was compromised or because the "
-"exchange is going out of operation; unspent coins of a revoked denomination "
-"are subjected to payback."
-msgstr ""
-
-#: template/glossary.html.j2:176
-msgid "sharing"
-msgstr ""
-
-#: template/glossary.html.j2:178
-msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any time."
-msgstr ""
-
-#: template/glossary.html.j2:184
-msgid "signing key"
-msgstr ""
-
-#: template/glossary.html.j2:186
-msgid "see message signing key."
-msgstr ""
-
-#: template/glossary.html.j2:190
-msgid "spending"
-msgstr ""
-
-#: template/glossary.html.j2:192
-msgid ""
-"operation by which a customer gives a merchant the right to `deposit` coins "
-"in return for merchandise"
-msgstr ""
-
-#: template/glossary.html.j2:197
-msgid "transfer"
-msgstr ""
-
-#: template/glossary.html.j2:199
-msgid "method of sending funds between `bank` accounts"
-msgstr ""
-
-#: template/glossary.html.j2:203
-msgid "transaction"
-msgstr ""
-
-#: template/glossary.html.j2:205
-msgid ""
-"method by which ownership is exclusively transferred from one entity to "
-"another"
-msgstr ""
-
-#: template/glossary.html.j2:210
-msgid "transaction id"
-msgstr ""
-
-#: template/glossary.html.j2:212
-msgid "unique number by which a merchant identifies a `transaction`"
-msgstr ""
-
-#: template/glossary.html.j2:216
-msgid "wallet"
-msgstr ""
-
-#: template/glossary.html.j2:218
-msgid ""
-"software running on a customer's computer; withdraws, stores and spends coins"
-msgstr ""
-
-#: template/glossary.html.j2:223
-msgid "wire transfer"
-msgstr ""
-
-#: template/glossary.html.j2:225
-msgid "see `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:229
-msgid "wire transfer identifier"
-msgstr ""
-
-#: template/glossary.html.j2:231
-msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely identify "
-"the `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:236
-msgid "withdrawal"
-msgstr ""
-
-#: template/glossary.html.j2:238
-msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh coins"
-msgstr ""
-
-#: template/glossary.html.j2:243
-msgid "zombie coin"
-msgstr ""
-
-#: template/glossary.html.j2:245
-msgid ""
-"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
-"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
-"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
-"the refresh operation being subjected to `payback`; as a result, the "
-"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
-"denomination is `expired` for `deposit` operations (but not if it is expired "
-"past the legal data retention requirement)."
-msgstr ""
-
#: template/governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 7e8d5a3..4355c6c 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: 2019-12-23 01:47+0100\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <address@hidden>\n"
@@ -82,6 +82,21 @@ msgstr ""
msgid "by"
msgstr ""
+#: template/cashier.html.j2:7
+msgid "Taler Cashier"
+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:21 template/developers.html.j2:149
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
#: template/contact.html.j2:6
msgid "Contact information"
msgstr ""
@@ -215,7 +230,7 @@ msgid ""
"Web applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58 template/docs.html.j2:182
+#: template/developers.html.j2:58 template/docs.html.j2:204
msgid "Code"
msgstr ""
@@ -297,10 +312,6 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:90
-msgid "Download"
-msgstr ""
-
#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
@@ -452,60 +463,77 @@ msgstr ""
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: template/docs.html.j2:107
-msgid "Internals"
+#: template/docs.html.j2:104
+msgid "Merchant POS Terminal"
+msgstr ""
+
+#: template/docs.html.j2:106
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:116
+msgid "Cashier"
msgstr ""
#: template/docs.html.j2:118
+msgid "An app for taking in cash and handing out electronic cash."
+msgstr ""
+
+#: template/docs.html.j2:129
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:140
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:120
+#: template/docs.html.j2:142
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:150
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:152
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:143
+#: template/docs.html.j2:165
msgid "Community"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:176
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:156
+#: template/docs.html.j2:178
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:184
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:164
+#: template/docs.html.j2:186
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:170
+#: template/docs.html.j2:192
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:172
+#: template/docs.html.j2:194
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:194
+#: template/docs.html.j2:216
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:218
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -887,344 +915,6 @@ msgid ""
"developments in the financial industry."
msgstr ""
-#: template/glossary.html.j2:6
-msgid "auditor"
-msgstr ""
-
-#: template/glossary.html.j2:8
-msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
-msgstr ""
-
-#: template/glossary.html.j2:12
-msgid "bank"
-msgstr ""
-
-#: template/glossary.html.j2:14
-msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: template/glossary.html.j2:18
-msgid "coin"
-msgstr ""
-
-#: template/glossary.html.j2:20
-msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:24
-msgid "contract"
-msgstr ""
-
-#: template/glossary.html.j2:26
-msgid "the proposal signed by the wallet."
-msgstr ""
-
-#: template/glossary.html.j2:30
-msgid "denomination"
-msgstr ""
-
-#: template/glossary.html.j2:32
-msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
-msgstr ""
-
-#: template/glossary.html.j2:37
-msgid "denomination key"
-msgstr ""
-
-#: template/glossary.html.j2:39
-msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
-msgstr ""
-
-#: template/glossary.html.j2:44
-msgid "deposit"
-msgstr ""
-
-#: template/glossary.html.j2:46
-msgid ""
-"operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:52
-msgid "dirty"
-msgstr ""
-
-#: template/glossary.html.j2:54
-msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than the "
-"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
-msgstr ""
-
-#: template/glossary.html.j2:61
-msgid "exchange"
-msgstr ""
-
-#: template/glossary.html.j2:63
-msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
-msgstr ""
-
-#: template/glossary.html.j2:68
-msgid "expired"
-msgstr ""
-
-#: template/glossary.html.j2:70
-msgid ""
-"Various operations come with time limits. In particular, `denomination keys` "
-"come with strict time limits for the various operations involving the `coin` "
-"issued under the `denomination`. The most important limit is the `deposit` "
-"expiration, which specifies until when wallets are allowed to use the coin "
-"in `deposit` or `refreshing` operations. There is also a \"legal\" "
-"expiration, which specifies how long the exchange keeps records beyond the "
-"`deposit` expiration time. This latter expiration matters for legal disputes "
-"in courts and also creates an upper limit for `refreshing` operations on "
-"special `zombie coin`."
-msgstr ""
-
-#: template/glossary.html.j2:82
-msgid "extension"
-msgstr ""
-
-#: template/glossary.html.j2:84
-msgid "implementation of a `wallet` for browsers"
-msgstr ""
-
-#: template/glossary.html.j2:88
-msgid "fresh coin"
-msgstr ""
-
-#: template/glossary.html.j2:90
-msgid "a `coin` is fresh if its public key is only known to the customer"
-msgstr ""
-
-#: template/glossary.html.j2:94
-msgid "master key"
-msgstr ""
-
-#: template/glossary.html.j2:96
-msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: template/glossary.html.j2:101
-msgid "message signing key"
-msgstr ""
-
-#: template/glossary.html.j2:103
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
-
-#: template/glossary.html.j2:107
-msgid "offer"
-msgstr ""
-
-#: template/glossary.html.j2:109
-msgid ""
-"specification of the details of a transaction, specifies the payment "
-"obligations for the customer (i.e. the amount), the deliverables of the "
-"merchant and other related information, such as deadlines or locations; "
-"However, it lacks some information that the backend is supposed to provide. "
-"In other words, after the backend adds the missing information to the offer "
-"and signs it, it becomes a proposal."
-msgstr ""
-
-#: template/glossary.html.j2:118
-msgid "owner"
-msgstr ""
-
-#: template/glossary.html.j2:120
-msgid "a `coin` is owned by the entity that knows the private key of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:124
-msgid "payback"
-msgstr ""
-
-#: template/glossary.html.j2:126
-msgid ""
-"operation by which an exchange returns the value of coins affected by a "
-"`revocation` to their `owner`, either by allowing the owner to withdraw new "
-"coins or wiring funds back to the bank account of the `owner`"
-msgstr ""
-
-#: template/glossary.html.j2:132
-msgid "proof"
-msgstr ""
-
-#: template/glossary.html.j2:134
-msgid ""
-"message that cryptographically demonstrates that a particular claim is "
-"correct"
-msgstr ""
-
-#: template/glossary.html.j2:138
-msgid "proposal"
-msgstr ""
-
-#: template/glossary.html.j2:140
-msgid "a sketch that has been completed and signed by the merchant backend."
-msgstr ""
-
-#: template/glossary.html.j2:144
-msgid "reserve"
-msgstr ""
-
-#: template/glossary.html.j2:146
-msgid ""
-"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's "
-"bank account to cover obligations from coins in circulation"
-msgstr ""
-
-#: template/glossary.html.j2:152
-msgid "refreshing"
-msgstr ""
-
-#: template/glossary.html.j2:154
-msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh` "
-"coins"
-msgstr ""
-
-#: template/glossary.html.j2:159
-msgid "refund"
-msgstr ""
-
-#: template/glossary.html.j2:161
-msgid ""
-"operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back to "
-"the customer"
-msgstr ""
-
-#: template/glossary.html.j2:167
-msgid "revocation"
-msgstr ""
-
-#: template/glossary.html.j2:169
-msgid ""
-"exceptional operation by which an exchange withdraws a denomination from "
-"circulation, either because the signing key was compromised or because the "
-"exchange is going out of operation; unspent coins of a revoked denomination "
-"are subjected to payback."
-msgstr ""
-
-#: template/glossary.html.j2:176
-msgid "sharing"
-msgstr ""
-
-#: template/glossary.html.j2:178
-msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any time."
-msgstr ""
-
-#: template/glossary.html.j2:184
-msgid "signing key"
-msgstr ""
-
-#: template/glossary.html.j2:186
-msgid "see message signing key."
-msgstr ""
-
-#: template/glossary.html.j2:190
-msgid "spending"
-msgstr ""
-
-#: template/glossary.html.j2:192
-msgid ""
-"operation by which a customer gives a merchant the right to `deposit` coins "
-"in return for merchandise"
-msgstr ""
-
-#: template/glossary.html.j2:197
-msgid "transfer"
-msgstr ""
-
-#: template/glossary.html.j2:199
-msgid "method of sending funds between `bank` accounts"
-msgstr ""
-
-#: template/glossary.html.j2:203
-msgid "transaction"
-msgstr ""
-
-#: template/glossary.html.j2:205
-msgid ""
-"method by which ownership is exclusively transferred from one entity to "
-"another"
-msgstr ""
-
-#: template/glossary.html.j2:210
-msgid "transaction id"
-msgstr ""
-
-#: template/glossary.html.j2:212
-msgid "unique number by which a merchant identifies a `transaction`"
-msgstr ""
-
-#: template/glossary.html.j2:216
-msgid "wallet"
-msgstr ""
-
-#: template/glossary.html.j2:218
-msgid ""
-"software running on a customer's computer; withdraws, stores and spends coins"
-msgstr ""
-
-#: template/glossary.html.j2:223
-msgid "wire transfer"
-msgstr ""
-
-#: template/glossary.html.j2:225
-msgid "see `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:229
-msgid "wire transfer identifier"
-msgstr ""
-
-#: template/glossary.html.j2:231
-msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely identify "
-"the `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:236
-msgid "withdrawal"
-msgstr ""
-
-#: template/glossary.html.j2:238
-msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh coins"
-msgstr ""
-
-#: template/glossary.html.j2:243
-msgid "zombie coin"
-msgstr ""
-
-#: template/glossary.html.j2:245
-msgid ""
-"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
-"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
-"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
-"the refresh operation being subjected to `payback`; as a result, the "
-"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
-"denomination is `expired` for `deposit` operations (but not if it is expired "
-"past the legal data retention requirement)."
-msgstr ""
-
#: template/governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 53226e6..5966f7e 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/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: 2019-12-23 01:47+0100\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <address@hidden>\n"
@@ -83,6 +83,21 @@ msgstr ""
msgid "by"
msgstr ""
+#: template/cashier.html.j2:7
+msgid "Taler Cashier"
+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:21 template/developers.html.j2:149
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
#: template/contact.html.j2:6
msgid "Contact information"
msgstr ""
@@ -216,7 +231,7 @@ msgid ""
"Web applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58 template/docs.html.j2:182
+#: template/developers.html.j2:58 template/docs.html.j2:204
msgid "Code"
msgstr ""
@@ -298,10 +313,6 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:90
-msgid "Download"
-msgstr ""
-
#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
@@ -453,60 +464,77 @@ msgstr ""
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: template/docs.html.j2:107
-msgid "Internals"
+#: template/docs.html.j2:104
+msgid "Merchant POS Terminal"
+msgstr ""
+
+#: template/docs.html.j2:106
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:116
+msgid "Cashier"
msgstr ""
#: template/docs.html.j2:118
+msgid "An app for taking in cash and handing out electronic cash."
+msgstr ""
+
+#: template/docs.html.j2:129
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:140
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:120
+#: template/docs.html.j2:142
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:150
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:152
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:143
+#: template/docs.html.j2:165
msgid "Community"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:176
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:156
+#: template/docs.html.j2:178
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:184
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:164
+#: template/docs.html.j2:186
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:170
+#: template/docs.html.j2:192
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:172
+#: template/docs.html.j2:194
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:194
+#: template/docs.html.j2:216
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:218
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -888,344 +916,6 @@ msgid ""
"developments in the financial industry."
msgstr ""
-#: template/glossary.html.j2:6
-msgid "auditor"
-msgstr ""
-
-#: template/glossary.html.j2:8
-msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
-msgstr ""
-
-#: template/glossary.html.j2:12
-msgid "bank"
-msgstr ""
-
-#: template/glossary.html.j2:14
-msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: template/glossary.html.j2:18
-msgid "coin"
-msgstr ""
-
-#: template/glossary.html.j2:20
-msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:24
-msgid "contract"
-msgstr ""
-
-#: template/glossary.html.j2:26
-msgid "the proposal signed by the wallet."
-msgstr ""
-
-#: template/glossary.html.j2:30
-msgid "denomination"
-msgstr ""
-
-#: template/glossary.html.j2:32
-msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
-msgstr ""
-
-#: template/glossary.html.j2:37
-msgid "denomination key"
-msgstr ""
-
-#: template/glossary.html.j2:39
-msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
-msgstr ""
-
-#: template/glossary.html.j2:44
-msgid "deposit"
-msgstr ""
-
-#: template/glossary.html.j2:46
-msgid ""
-"operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:52
-msgid "dirty"
-msgstr ""
-
-#: template/glossary.html.j2:54
-msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than the "
-"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
-msgstr ""
-
-#: template/glossary.html.j2:61
-msgid "exchange"
-msgstr ""
-
-#: template/glossary.html.j2:63
-msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
-msgstr ""
-
-#: template/glossary.html.j2:68
-msgid "expired"
-msgstr ""
-
-#: template/glossary.html.j2:70
-msgid ""
-"Various operations come with time limits. In particular, `denomination keys` "
-"come with strict time limits for the various operations involving the `coin` "
-"issued under the `denomination`. The most important limit is the `deposit` "
-"expiration, which specifies until when wallets are allowed to use the coin "
-"in `deposit` or `refreshing` operations. There is also a \"legal\" "
-"expiration, which specifies how long the exchange keeps records beyond the "
-"`deposit` expiration time. This latter expiration matters for legal disputes "
-"in courts and also creates an upper limit for `refreshing` operations on "
-"special `zombie coin`."
-msgstr ""
-
-#: template/glossary.html.j2:82
-msgid "extension"
-msgstr ""
-
-#: template/glossary.html.j2:84
-msgid "implementation of a `wallet` for browsers"
-msgstr ""
-
-#: template/glossary.html.j2:88
-msgid "fresh coin"
-msgstr ""
-
-#: template/glossary.html.j2:90
-msgid "a `coin` is fresh if its public key is only known to the customer"
-msgstr ""
-
-#: template/glossary.html.j2:94
-msgid "master key"
-msgstr ""
-
-#: template/glossary.html.j2:96
-msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: template/glossary.html.j2:101
-msgid "message signing key"
-msgstr ""
-
-#: template/glossary.html.j2:103
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
-
-#: template/glossary.html.j2:107
-msgid "offer"
-msgstr ""
-
-#: template/glossary.html.j2:109
-msgid ""
-"specification of the details of a transaction, specifies the payment "
-"obligations for the customer (i.e. the amount), the deliverables of the "
-"merchant and other related information, such as deadlines or locations; "
-"However, it lacks some information that the backend is supposed to provide. "
-"In other words, after the backend adds the missing information to the offer "
-"and signs it, it becomes a proposal."
-msgstr ""
-
-#: template/glossary.html.j2:118
-msgid "owner"
-msgstr ""
-
-#: template/glossary.html.j2:120
-msgid "a `coin` is owned by the entity that knows the private key of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:124
-msgid "payback"
-msgstr ""
-
-#: template/glossary.html.j2:126
-msgid ""
-"operation by which an exchange returns the value of coins affected by a "
-"`revocation` to their `owner`, either by allowing the owner to withdraw new "
-"coins or wiring funds back to the bank account of the `owner`"
-msgstr ""
-
-#: template/glossary.html.j2:132
-msgid "proof"
-msgstr ""
-
-#: template/glossary.html.j2:134
-msgid ""
-"message that cryptographically demonstrates that a particular claim is "
-"correct"
-msgstr ""
-
-#: template/glossary.html.j2:138
-msgid "proposal"
-msgstr ""
-
-#: template/glossary.html.j2:140
-msgid "a sketch that has been completed and signed by the merchant backend."
-msgstr ""
-
-#: template/glossary.html.j2:144
-msgid "reserve"
-msgstr ""
-
-#: template/glossary.html.j2:146
-msgid ""
-"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's "
-"bank account to cover obligations from coins in circulation"
-msgstr ""
-
-#: template/glossary.html.j2:152
-msgid "refreshing"
-msgstr ""
-
-#: template/glossary.html.j2:154
-msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh` "
-"coins"
-msgstr ""
-
-#: template/glossary.html.j2:159
-msgid "refund"
-msgstr ""
-
-#: template/glossary.html.j2:161
-msgid ""
-"operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back to "
-"the customer"
-msgstr ""
-
-#: template/glossary.html.j2:167
-msgid "revocation"
-msgstr ""
-
-#: template/glossary.html.j2:169
-msgid ""
-"exceptional operation by which an exchange withdraws a denomination from "
-"circulation, either because the signing key was compromised or because the "
-"exchange is going out of operation; unspent coins of a revoked denomination "
-"are subjected to payback."
-msgstr ""
-
-#: template/glossary.html.j2:176
-msgid "sharing"
-msgstr ""
-
-#: template/glossary.html.j2:178
-msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any time."
-msgstr ""
-
-#: template/glossary.html.j2:184
-msgid "signing key"
-msgstr ""
-
-#: template/glossary.html.j2:186
-msgid "see message signing key."
-msgstr ""
-
-#: template/glossary.html.j2:190
-msgid "spending"
-msgstr ""
-
-#: template/glossary.html.j2:192
-msgid ""
-"operation by which a customer gives a merchant the right to `deposit` coins "
-"in return for merchandise"
-msgstr ""
-
-#: template/glossary.html.j2:197
-msgid "transfer"
-msgstr ""
-
-#: template/glossary.html.j2:199
-msgid "method of sending funds between `bank` accounts"
-msgstr ""
-
-#: template/glossary.html.j2:203
-msgid "transaction"
-msgstr ""
-
-#: template/glossary.html.j2:205
-msgid ""
-"method by which ownership is exclusively transferred from one entity to "
-"another"
-msgstr ""
-
-#: template/glossary.html.j2:210
-msgid "transaction id"
-msgstr ""
-
-#: template/glossary.html.j2:212
-msgid "unique number by which a merchant identifies a `transaction`"
-msgstr ""
-
-#: template/glossary.html.j2:216
-msgid "wallet"
-msgstr ""
-
-#: template/glossary.html.j2:218
-msgid ""
-"software running on a customer's computer; withdraws, stores and spends coins"
-msgstr ""
-
-#: template/glossary.html.j2:223
-msgid "wire transfer"
-msgstr ""
-
-#: template/glossary.html.j2:225
-msgid "see `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:229
-msgid "wire transfer identifier"
-msgstr ""
-
-#: template/glossary.html.j2:231
-msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely identify "
-"the `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:236
-msgid "withdrawal"
-msgstr ""
-
-#: template/glossary.html.j2:238
-msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh coins"
-msgstr ""
-
-#: template/glossary.html.j2:243
-msgid "zombie coin"
-msgstr ""
-
-#: template/glossary.html.j2:245
-msgid ""
-"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
-"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
-"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
-"the refresh operation being subjected to `payback`; as a result, the "
-"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
-"denomination is `expired` for `deposit` operations (but not if it is expired "
-"past the legal data retention requirement)."
-msgstr ""
-
#: template/governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 6023514..002dc9e 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/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: 2019-12-23 01:47+0100\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <address@hidden>\n"
@@ -82,6 +82,21 @@ msgstr ""
msgid "by"
msgstr ""
+#: template/cashier.html.j2:7
+msgid "Taler Cashier"
+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:21 template/developers.html.j2:149
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
#: template/contact.html.j2:6
msgid "Contact information"
msgstr ""
@@ -215,7 +230,7 @@ msgid ""
"Web applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58 template/docs.html.j2:182
+#: template/developers.html.j2:58 template/docs.html.j2:204
msgid "Code"
msgstr ""
@@ -297,10 +312,6 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:90
-msgid "Download"
-msgstr ""
-
#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
@@ -452,60 +463,77 @@ msgstr ""
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: template/docs.html.j2:107
-msgid "Internals"
+#: template/docs.html.j2:104
+msgid "Merchant POS Terminal"
+msgstr ""
+
+#: template/docs.html.j2:106
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:116
+msgid "Cashier"
msgstr ""
#: template/docs.html.j2:118
+msgid "An app for taking in cash and handing out electronic cash."
+msgstr ""
+
+#: template/docs.html.j2:129
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:140
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:120
+#: template/docs.html.j2:142
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:150
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:152
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:143
+#: template/docs.html.j2:165
msgid "Community"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:176
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:156
+#: template/docs.html.j2:178
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:184
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:164
+#: template/docs.html.j2:186
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:170
+#: template/docs.html.j2:192
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:172
+#: template/docs.html.j2:194
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:194
+#: template/docs.html.j2:216
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:218
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -887,344 +915,6 @@ msgid ""
"developments in the financial industry."
msgstr ""
-#: template/glossary.html.j2:6
-msgid "auditor"
-msgstr ""
-
-#: template/glossary.html.j2:8
-msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
-msgstr ""
-
-#: template/glossary.html.j2:12
-msgid "bank"
-msgstr ""
-
-#: template/glossary.html.j2:14
-msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: template/glossary.html.j2:18
-msgid "coin"
-msgstr ""
-
-#: template/glossary.html.j2:20
-msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:24
-msgid "contract"
-msgstr ""
-
-#: template/glossary.html.j2:26
-msgid "the proposal signed by the wallet."
-msgstr ""
-
-#: template/glossary.html.j2:30
-msgid "denomination"
-msgstr ""
-
-#: template/glossary.html.j2:32
-msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
-msgstr ""
-
-#: template/glossary.html.j2:37
-msgid "denomination key"
-msgstr ""
-
-#: template/glossary.html.j2:39
-msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
-msgstr ""
-
-#: template/glossary.html.j2:44
-msgid "deposit"
-msgstr ""
-
-#: template/glossary.html.j2:46
-msgid ""
-"operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:52
-msgid "dirty"
-msgstr ""
-
-#: template/glossary.html.j2:54
-msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than the "
-"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
-msgstr ""
-
-#: template/glossary.html.j2:61
-msgid "exchange"
-msgstr ""
-
-#: template/glossary.html.j2:63
-msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
-msgstr ""
-
-#: template/glossary.html.j2:68
-msgid "expired"
-msgstr ""
-
-#: template/glossary.html.j2:70
-msgid ""
-"Various operations come with time limits. In particular, `denomination keys` "
-"come with strict time limits for the various operations involving the `coin` "
-"issued under the `denomination`. The most important limit is the `deposit` "
-"expiration, which specifies until when wallets are allowed to use the coin "
-"in `deposit` or `refreshing` operations. There is also a \"legal\" "
-"expiration, which specifies how long the exchange keeps records beyond the "
-"`deposit` expiration time. This latter expiration matters for legal disputes "
-"in courts and also creates an upper limit for `refreshing` operations on "
-"special `zombie coin`."
-msgstr ""
-
-#: template/glossary.html.j2:82
-msgid "extension"
-msgstr ""
-
-#: template/glossary.html.j2:84
-msgid "implementation of a `wallet` for browsers"
-msgstr ""
-
-#: template/glossary.html.j2:88
-msgid "fresh coin"
-msgstr ""
-
-#: template/glossary.html.j2:90
-msgid "a `coin` is fresh if its public key is only known to the customer"
-msgstr ""
-
-#: template/glossary.html.j2:94
-msgid "master key"
-msgstr ""
-
-#: template/glossary.html.j2:96
-msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: template/glossary.html.j2:101
-msgid "message signing key"
-msgstr ""
-
-#: template/glossary.html.j2:103
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
-
-#: template/glossary.html.j2:107
-msgid "offer"
-msgstr ""
-
-#: template/glossary.html.j2:109
-msgid ""
-"specification of the details of a transaction, specifies the payment "
-"obligations for the customer (i.e. the amount), the deliverables of the "
-"merchant and other related information, such as deadlines or locations; "
-"However, it lacks some information that the backend is supposed to provide. "
-"In other words, after the backend adds the missing information to the offer "
-"and signs it, it becomes a proposal."
-msgstr ""
-
-#: template/glossary.html.j2:118
-msgid "owner"
-msgstr ""
-
-#: template/glossary.html.j2:120
-msgid "a `coin` is owned by the entity that knows the private key of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:124
-msgid "payback"
-msgstr ""
-
-#: template/glossary.html.j2:126
-msgid ""
-"operation by which an exchange returns the value of coins affected by a "
-"`revocation` to their `owner`, either by allowing the owner to withdraw new "
-"coins or wiring funds back to the bank account of the `owner`"
-msgstr ""
-
-#: template/glossary.html.j2:132
-msgid "proof"
-msgstr ""
-
-#: template/glossary.html.j2:134
-msgid ""
-"message that cryptographically demonstrates that a particular claim is "
-"correct"
-msgstr ""
-
-#: template/glossary.html.j2:138
-msgid "proposal"
-msgstr ""
-
-#: template/glossary.html.j2:140
-msgid "a sketch that has been completed and signed by the merchant backend."
-msgstr ""
-
-#: template/glossary.html.j2:144
-msgid "reserve"
-msgstr ""
-
-#: template/glossary.html.j2:146
-msgid ""
-"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's "
-"bank account to cover obligations from coins in circulation"
-msgstr ""
-
-#: template/glossary.html.j2:152
-msgid "refreshing"
-msgstr ""
-
-#: template/glossary.html.j2:154
-msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh` "
-"coins"
-msgstr ""
-
-#: template/glossary.html.j2:159
-msgid "refund"
-msgstr ""
-
-#: template/glossary.html.j2:161
-msgid ""
-"operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back to "
-"the customer"
-msgstr ""
-
-#: template/glossary.html.j2:167
-msgid "revocation"
-msgstr ""
-
-#: template/glossary.html.j2:169
-msgid ""
-"exceptional operation by which an exchange withdraws a denomination from "
-"circulation, either because the signing key was compromised or because the "
-"exchange is going out of operation; unspent coins of a revoked denomination "
-"are subjected to payback."
-msgstr ""
-
-#: template/glossary.html.j2:176
-msgid "sharing"
-msgstr ""
-
-#: template/glossary.html.j2:178
-msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any time."
-msgstr ""
-
-#: template/glossary.html.j2:184
-msgid "signing key"
-msgstr ""
-
-#: template/glossary.html.j2:186
-msgid "see message signing key."
-msgstr ""
-
-#: template/glossary.html.j2:190
-msgid "spending"
-msgstr ""
-
-#: template/glossary.html.j2:192
-msgid ""
-"operation by which a customer gives a merchant the right to `deposit` coins "
-"in return for merchandise"
-msgstr ""
-
-#: template/glossary.html.j2:197
-msgid "transfer"
-msgstr ""
-
-#: template/glossary.html.j2:199
-msgid "method of sending funds between `bank` accounts"
-msgstr ""
-
-#: template/glossary.html.j2:203
-msgid "transaction"
-msgstr ""
-
-#: template/glossary.html.j2:205
-msgid ""
-"method by which ownership is exclusively transferred from one entity to "
-"another"
-msgstr ""
-
-#: template/glossary.html.j2:210
-msgid "transaction id"
-msgstr ""
-
-#: template/glossary.html.j2:212
-msgid "unique number by which a merchant identifies a `transaction`"
-msgstr ""
-
-#: template/glossary.html.j2:216
-msgid "wallet"
-msgstr ""
-
-#: template/glossary.html.j2:218
-msgid ""
-"software running on a customer's computer; withdraws, stores and spends coins"
-msgstr ""
-
-#: template/glossary.html.j2:223
-msgid "wire transfer"
-msgstr ""
-
-#: template/glossary.html.j2:225
-msgid "see `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:229
-msgid "wire transfer identifier"
-msgstr ""
-
-#: template/glossary.html.j2:231
-msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely identify "
-"the `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:236
-msgid "withdrawal"
-msgstr ""
-
-#: template/glossary.html.j2:238
-msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh coins"
-msgstr ""
-
-#: template/glossary.html.j2:243
-msgid "zombie coin"
-msgstr ""
-
-#: template/glossary.html.j2:245
-msgid ""
-"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
-"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
-"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
-"the refresh operation being subjected to `payback`; as a result, the "
-"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
-"denomination is `expired` for `deposit` operations (but not if it is expired "
-"past the legal data retention requirement)."
-msgstr ""
-
#: template/governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 30ab0a5..32f0be8 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: 2019-12-23 01:47+0100\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <address@hidden>\n"
@@ -82,6 +82,21 @@ msgstr ""
msgid "by"
msgstr ""
+#: template/cashier.html.j2:7
+msgid "Taler Cashier"
+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:21 template/developers.html.j2:149
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
#: template/contact.html.j2:6
msgid "Contact information"
msgstr ""
@@ -215,7 +230,7 @@ msgid ""
"Web applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58 template/docs.html.j2:182
+#: template/developers.html.j2:58 template/docs.html.j2:204
msgid "Code"
msgstr ""
@@ -297,10 +312,6 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:90
-msgid "Download"
-msgstr ""
-
#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
@@ -452,60 +463,77 @@ msgstr ""
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: template/docs.html.j2:107
-msgid "Internals"
+#: template/docs.html.j2:104
+msgid "Merchant POS Terminal"
+msgstr ""
+
+#: template/docs.html.j2:106
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:116
+msgid "Cashier"
msgstr ""
#: template/docs.html.j2:118
+msgid "An app for taking in cash and handing out electronic cash."
+msgstr ""
+
+#: template/docs.html.j2:129
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:140
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:120
+#: template/docs.html.j2:142
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:150
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:152
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:143
+#: template/docs.html.j2:165
msgid "Community"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:176
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:156
+#: template/docs.html.j2:178
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:184
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:164
+#: template/docs.html.j2:186
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:170
+#: template/docs.html.j2:192
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:172
+#: template/docs.html.j2:194
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:194
+#: template/docs.html.j2:216
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:218
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -887,344 +915,6 @@ msgid ""
"developments in the financial industry."
msgstr ""
-#: template/glossary.html.j2:6
-msgid "auditor"
-msgstr ""
-
-#: template/glossary.html.j2:8
-msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
-msgstr ""
-
-#: template/glossary.html.j2:12
-msgid "bank"
-msgstr ""
-
-#: template/glossary.html.j2:14
-msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: template/glossary.html.j2:18
-msgid "coin"
-msgstr ""
-
-#: template/glossary.html.j2:20
-msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:24
-msgid "contract"
-msgstr ""
-
-#: template/glossary.html.j2:26
-msgid "the proposal signed by the wallet."
-msgstr ""
-
-#: template/glossary.html.j2:30
-msgid "denomination"
-msgstr ""
-
-#: template/glossary.html.j2:32
-msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
-msgstr ""
-
-#: template/glossary.html.j2:37
-msgid "denomination key"
-msgstr ""
-
-#: template/glossary.html.j2:39
-msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
-msgstr ""
-
-#: template/glossary.html.j2:44
-msgid "deposit"
-msgstr ""
-
-#: template/glossary.html.j2:46
-msgid ""
-"operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:52
-msgid "dirty"
-msgstr ""
-
-#: template/glossary.html.j2:54
-msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than the "
-"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
-msgstr ""
-
-#: template/glossary.html.j2:61
-msgid "exchange"
-msgstr ""
-
-#: template/glossary.html.j2:63
-msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
-msgstr ""
-
-#: template/glossary.html.j2:68
-msgid "expired"
-msgstr ""
-
-#: template/glossary.html.j2:70
-msgid ""
-"Various operations come with time limits. In particular, `denomination keys` "
-"come with strict time limits for the various operations involving the `coin` "
-"issued under the `denomination`. The most important limit is the `deposit` "
-"expiration, which specifies until when wallets are allowed to use the coin "
-"in `deposit` or `refreshing` operations. There is also a \"legal\" "
-"expiration, which specifies how long the exchange keeps records beyond the "
-"`deposit` expiration time. This latter expiration matters for legal disputes "
-"in courts and also creates an upper limit for `refreshing` operations on "
-"special `zombie coin`."
-msgstr ""
-
-#: template/glossary.html.j2:82
-msgid "extension"
-msgstr ""
-
-#: template/glossary.html.j2:84
-msgid "implementation of a `wallet` for browsers"
-msgstr ""
-
-#: template/glossary.html.j2:88
-msgid "fresh coin"
-msgstr ""
-
-#: template/glossary.html.j2:90
-msgid "a `coin` is fresh if its public key is only known to the customer"
-msgstr ""
-
-#: template/glossary.html.j2:94
-msgid "master key"
-msgstr ""
-
-#: template/glossary.html.j2:96
-msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: template/glossary.html.j2:101
-msgid "message signing key"
-msgstr ""
-
-#: template/glossary.html.j2:103
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
-
-#: template/glossary.html.j2:107
-msgid "offer"
-msgstr ""
-
-#: template/glossary.html.j2:109
-msgid ""
-"specification of the details of a transaction, specifies the payment "
-"obligations for the customer (i.e. the amount), the deliverables of the "
-"merchant and other related information, such as deadlines or locations; "
-"However, it lacks some information that the backend is supposed to provide. "
-"In other words, after the backend adds the missing information to the offer "
-"and signs it, it becomes a proposal."
-msgstr ""
-
-#: template/glossary.html.j2:118
-msgid "owner"
-msgstr ""
-
-#: template/glossary.html.j2:120
-msgid "a `coin` is owned by the entity that knows the private key of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:124
-msgid "payback"
-msgstr ""
-
-#: template/glossary.html.j2:126
-msgid ""
-"operation by which an exchange returns the value of coins affected by a "
-"`revocation` to their `owner`, either by allowing the owner to withdraw new "
-"coins or wiring funds back to the bank account of the `owner`"
-msgstr ""
-
-#: template/glossary.html.j2:132
-msgid "proof"
-msgstr ""
-
-#: template/glossary.html.j2:134
-msgid ""
-"message that cryptographically demonstrates that a particular claim is "
-"correct"
-msgstr ""
-
-#: template/glossary.html.j2:138
-msgid "proposal"
-msgstr ""
-
-#: template/glossary.html.j2:140
-msgid "a sketch that has been completed and signed by the merchant backend."
-msgstr ""
-
-#: template/glossary.html.j2:144
-msgid "reserve"
-msgstr ""
-
-#: template/glossary.html.j2:146
-msgid ""
-"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's "
-"bank account to cover obligations from coins in circulation"
-msgstr ""
-
-#: template/glossary.html.j2:152
-msgid "refreshing"
-msgstr ""
-
-#: template/glossary.html.j2:154
-msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh` "
-"coins"
-msgstr ""
-
-#: template/glossary.html.j2:159
-msgid "refund"
-msgstr ""
-
-#: template/glossary.html.j2:161
-msgid ""
-"operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back to "
-"the customer"
-msgstr ""
-
-#: template/glossary.html.j2:167
-msgid "revocation"
-msgstr ""
-
-#: template/glossary.html.j2:169
-msgid ""
-"exceptional operation by which an exchange withdraws a denomination from "
-"circulation, either because the signing key was compromised or because the "
-"exchange is going out of operation; unspent coins of a revoked denomination "
-"are subjected to payback."
-msgstr ""
-
-#: template/glossary.html.j2:176
-msgid "sharing"
-msgstr ""
-
-#: template/glossary.html.j2:178
-msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any time."
-msgstr ""
-
-#: template/glossary.html.j2:184
-msgid "signing key"
-msgstr ""
-
-#: template/glossary.html.j2:186
-msgid "see message signing key."
-msgstr ""
-
-#: template/glossary.html.j2:190
-msgid "spending"
-msgstr ""
-
-#: template/glossary.html.j2:192
-msgid ""
-"operation by which a customer gives a merchant the right to `deposit` coins "
-"in return for merchandise"
-msgstr ""
-
-#: template/glossary.html.j2:197
-msgid "transfer"
-msgstr ""
-
-#: template/glossary.html.j2:199
-msgid "method of sending funds between `bank` accounts"
-msgstr ""
-
-#: template/glossary.html.j2:203
-msgid "transaction"
-msgstr ""
-
-#: template/glossary.html.j2:205
-msgid ""
-"method by which ownership is exclusively transferred from one entity to "
-"another"
-msgstr ""
-
-#: template/glossary.html.j2:210
-msgid "transaction id"
-msgstr ""
-
-#: template/glossary.html.j2:212
-msgid "unique number by which a merchant identifies a `transaction`"
-msgstr ""
-
-#: template/glossary.html.j2:216
-msgid "wallet"
-msgstr ""
-
-#: template/glossary.html.j2:218
-msgid ""
-"software running on a customer's computer; withdraws, stores and spends coins"
-msgstr ""
-
-#: template/glossary.html.j2:223
-msgid "wire transfer"
-msgstr ""
-
-#: template/glossary.html.j2:225
-msgid "see `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:229
-msgid "wire transfer identifier"
-msgstr ""
-
-#: template/glossary.html.j2:231
-msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely identify "
-"the `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:236
-msgid "withdrawal"
-msgstr ""
-
-#: template/glossary.html.j2:238
-msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh coins"
-msgstr ""
-
-#: template/glossary.html.j2:243
-msgid "zombie coin"
-msgstr ""
-
-#: template/glossary.html.j2:245
-msgid ""
-"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
-"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
-"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
-"the refresh operation being subjected to `payback`; as a result, the "
-"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
-"denomination is `expired` for `deposit` operations (but not if it is expired "
-"past the legal data retention requirement)."
-msgstr ""
-
#: template/governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index 7bb5472..6c84ae9 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: 2019-12-23 01:47+0100\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -87,6 +87,21 @@ msgstr ""
msgid "by"
msgstr ""
+#: template/cashier.html.j2:7
+msgid "Taler Cashier"
+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:21 template/developers.html.j2:149
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
#: template/contact.html.j2:6
msgid "Contact information"
msgstr ""
@@ -220,7 +235,7 @@ msgid ""
"Web applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58 template/docs.html.j2:182
+#: template/developers.html.j2:58 template/docs.html.j2:204
msgid "Code"
msgstr ""
@@ -302,10 +317,6 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:90
-msgid "Download"
-msgstr ""
-
#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
@@ -457,60 +468,77 @@ msgstr ""
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: template/docs.html.j2:107
-msgid "Internals"
+#: template/docs.html.j2:104
+msgid "Merchant POS Terminal"
+msgstr ""
+
+#: template/docs.html.j2:106
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:116
+msgid "Cashier"
msgstr ""
#: template/docs.html.j2:118
+msgid "An app for taking in cash and handing out electronic cash."
+msgstr ""
+
+#: template/docs.html.j2:129
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:140
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:120
+#: template/docs.html.j2:142
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:150
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:152
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:143
+#: template/docs.html.j2:165
msgid "Community"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:176
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:156
+#: template/docs.html.j2:178
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:184
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:164
+#: template/docs.html.j2:186
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:170
+#: template/docs.html.j2:192
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:172
+#: template/docs.html.j2:194
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:194
+#: template/docs.html.j2:216
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:218
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -892,344 +920,6 @@ msgid ""
"developments in the financial industry."
msgstr ""
-#: template/glossary.html.j2:6
-msgid "auditor"
-msgstr ""
-
-#: template/glossary.html.j2:8
-msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
-msgstr ""
-
-#: template/glossary.html.j2:12
-msgid "bank"
-msgstr ""
-
-#: template/glossary.html.j2:14
-msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: template/glossary.html.j2:18
-msgid "coin"
-msgstr ""
-
-#: template/glossary.html.j2:20
-msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:24
-msgid "contract"
-msgstr ""
-
-#: template/glossary.html.j2:26
-msgid "the proposal signed by the wallet."
-msgstr ""
-
-#: template/glossary.html.j2:30
-msgid "denomination"
-msgstr ""
-
-#: template/glossary.html.j2:32
-msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
-msgstr ""
-
-#: template/glossary.html.j2:37
-msgid "denomination key"
-msgstr ""
-
-#: template/glossary.html.j2:39
-msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
-msgstr ""
-
-#: template/glossary.html.j2:44
-msgid "deposit"
-msgstr ""
-
-#: template/glossary.html.j2:46
-msgid ""
-"operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:52
-msgid "dirty"
-msgstr ""
-
-#: template/glossary.html.j2:54
-msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than the "
-"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
-msgstr ""
-
-#: template/glossary.html.j2:61
-msgid "exchange"
-msgstr ""
-
-#: template/glossary.html.j2:63
-msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
-msgstr ""
-
-#: template/glossary.html.j2:68
-msgid "expired"
-msgstr ""
-
-#: template/glossary.html.j2:70
-msgid ""
-"Various operations come with time limits. In particular, `denomination keys` "
-"come with strict time limits for the various operations involving the `coin` "
-"issued under the `denomination`. The most important limit is the `deposit` "
-"expiration, which specifies until when wallets are allowed to use the coin "
-"in `deposit` or `refreshing` operations. There is also a \"legal\" "
-"expiration, which specifies how long the exchange keeps records beyond the "
-"`deposit` expiration time. This latter expiration matters for legal disputes "
-"in courts and also creates an upper limit for `refreshing` operations on "
-"special `zombie coin`."
-msgstr ""
-
-#: template/glossary.html.j2:82
-msgid "extension"
-msgstr ""
-
-#: template/glossary.html.j2:84
-msgid "implementation of a `wallet` for browsers"
-msgstr ""
-
-#: template/glossary.html.j2:88
-msgid "fresh coin"
-msgstr ""
-
-#: template/glossary.html.j2:90
-msgid "a `coin` is fresh if its public key is only known to the customer"
-msgstr ""
-
-#: template/glossary.html.j2:94
-msgid "master key"
-msgstr ""
-
-#: template/glossary.html.j2:96
-msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: template/glossary.html.j2:101
-msgid "message signing key"
-msgstr ""
-
-#: template/glossary.html.j2:103
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
-
-#: template/glossary.html.j2:107
-msgid "offer"
-msgstr ""
-
-#: template/glossary.html.j2:109
-msgid ""
-"specification of the details of a transaction, specifies the payment "
-"obligations for the customer (i.e. the amount), the deliverables of the "
-"merchant and other related information, such as deadlines or locations; "
-"However, it lacks some information that the backend is supposed to provide. "
-"In other words, after the backend adds the missing information to the offer "
-"and signs it, it becomes a proposal."
-msgstr ""
-
-#: template/glossary.html.j2:118
-msgid "owner"
-msgstr ""
-
-#: template/glossary.html.j2:120
-msgid "a `coin` is owned by the entity that knows the private key of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:124
-msgid "payback"
-msgstr ""
-
-#: template/glossary.html.j2:126
-msgid ""
-"operation by which an exchange returns the value of coins affected by a "
-"`revocation` to their `owner`, either by allowing the owner to withdraw new "
-"coins or wiring funds back to the bank account of the `owner`"
-msgstr ""
-
-#: template/glossary.html.j2:132
-msgid "proof"
-msgstr ""
-
-#: template/glossary.html.j2:134
-msgid ""
-"message that cryptographically demonstrates that a particular claim is "
-"correct"
-msgstr ""
-
-#: template/glossary.html.j2:138
-msgid "proposal"
-msgstr ""
-
-#: template/glossary.html.j2:140
-msgid "a sketch that has been completed and signed by the merchant backend."
-msgstr ""
-
-#: template/glossary.html.j2:144
-msgid "reserve"
-msgstr ""
-
-#: template/glossary.html.j2:146
-msgid ""
-"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's "
-"bank account to cover obligations from coins in circulation"
-msgstr ""
-
-#: template/glossary.html.j2:152
-msgid "refreshing"
-msgstr ""
-
-#: template/glossary.html.j2:154
-msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh` "
-"coins"
-msgstr ""
-
-#: template/glossary.html.j2:159
-msgid "refund"
-msgstr ""
-
-#: template/glossary.html.j2:161
-msgid ""
-"operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back to "
-"the customer"
-msgstr ""
-
-#: template/glossary.html.j2:167
-msgid "revocation"
-msgstr ""
-
-#: template/glossary.html.j2:169
-msgid ""
-"exceptional operation by which an exchange withdraws a denomination from "
-"circulation, either because the signing key was compromised or because the "
-"exchange is going out of operation; unspent coins of a revoked denomination "
-"are subjected to payback."
-msgstr ""
-
-#: template/glossary.html.j2:176
-msgid "sharing"
-msgstr ""
-
-#: template/glossary.html.j2:178
-msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any time."
-msgstr ""
-
-#: template/glossary.html.j2:184
-msgid "signing key"
-msgstr ""
-
-#: template/glossary.html.j2:186
-msgid "see message signing key."
-msgstr ""
-
-#: template/glossary.html.j2:190
-msgid "spending"
-msgstr ""
-
-#: template/glossary.html.j2:192
-msgid ""
-"operation by which a customer gives a merchant the right to `deposit` coins "
-"in return for merchandise"
-msgstr ""
-
-#: template/glossary.html.j2:197
-msgid "transfer"
-msgstr ""
-
-#: template/glossary.html.j2:199
-msgid "method of sending funds between `bank` accounts"
-msgstr ""
-
-#: template/glossary.html.j2:203
-msgid "transaction"
-msgstr ""
-
-#: template/glossary.html.j2:205
-msgid ""
-"method by which ownership is exclusively transferred from one entity to "
-"another"
-msgstr ""
-
-#: template/glossary.html.j2:210
-msgid "transaction id"
-msgstr ""
-
-#: template/glossary.html.j2:212
-msgid "unique number by which a merchant identifies a `transaction`"
-msgstr ""
-
-#: template/glossary.html.j2:216
-msgid "wallet"
-msgstr ""
-
-#: template/glossary.html.j2:218
-msgid ""
-"software running on a customer's computer; withdraws, stores and spends coins"
-msgstr ""
-
-#: template/glossary.html.j2:223
-msgid "wire transfer"
-msgstr ""
-
-#: template/glossary.html.j2:225
-msgid "see `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:229
-msgid "wire transfer identifier"
-msgstr ""
-
-#: template/glossary.html.j2:231
-msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely identify "
-"the `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:236
-msgid "withdrawal"
-msgstr ""
-
-#: template/glossary.html.j2:238
-msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh coins"
-msgstr ""
-
-#: template/glossary.html.j2:243
-msgid "zombie coin"
-msgstr ""
-
-#: template/glossary.html.j2:245
-msgid ""
-"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
-"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
-"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
-"the refresh operation being subjected to `payback`; as a result, the "
-"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
-"denomination is `expired` for `deposit` operations (but not if it is expired "
-"past the legal data retention requirement)."
-msgstr ""
-
#: template/governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index 5d4cbcb..392cc92 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: 2019-12-23 01:47+0100\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <address@hidden>\n"
@@ -88,6 +88,21 @@ msgstr ""
msgid "by"
msgstr ""
+#: template/cashier.html.j2:7
+msgid "Taler Cashier"
+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:21 template/developers.html.j2:149
+#: template/investors.html.j2:90
+msgid "Download"
+msgstr ""
+
#: template/contact.html.j2:6
msgid "Contact information"
msgstr ""
@@ -221,7 +236,7 @@ msgid ""
"Web applications. Taler's protocol is documented in detail at"
msgstr ""
-#: template/developers.html.j2:58 template/docs.html.j2:182
+#: template/developers.html.j2:58 template/docs.html.j2:204
msgid "Code"
msgstr ""
@@ -303,10 +318,6 @@ msgstr ""
msgid "Technical Presentation"
msgstr ""
-#: template/developers.html.j2:149 template/investors.html.j2:90
-msgid "Download"
-msgstr ""
-
#: template/developers.html.j2:165
msgid "Taler system overview"
msgstr ""
@@ -458,60 +469,77 @@ msgstr ""
msgid "Manual to run the back-office Web application. Also available as"
msgstr ""
-#: template/docs.html.j2:107
-msgid "Internals"
+#: template/docs.html.j2:104
+msgid "Merchant POS Terminal"
+msgstr ""
+
+#: template/docs.html.j2:106
+msgid ""
+"Manual for configuring and using the point of sale app. Also available as"
+msgstr ""
+
+#: template/docs.html.j2:116
+msgid "Cashier"
msgstr ""
#: template/docs.html.j2:118
+msgid "An app for taking in cash and handing out electronic cash."
+msgstr ""
+
+#: template/docs.html.j2:129
+msgid "Internals"
+msgstr ""
+
+#: template/docs.html.j2:140
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:120
+#: template/docs.html.j2:142
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:150
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:152
msgid ""
"Description of our taler.net setup and how to contribute. Also available as"
msgstr ""
-#: template/docs.html.j2:143
+#: template/docs.html.j2:165
msgid "Community"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:176
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:156
+#: template/docs.html.j2:178
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:184
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:164
+#: template/docs.html.j2:186
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:170
+#: template/docs.html.j2:192
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:172
+#: template/docs.html.j2:194
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:194
+#: template/docs.html.j2:216
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:218
msgid "Git repositories for all of GNU Taler."
msgstr ""
@@ -893,344 +921,6 @@ msgid ""
"developments in the financial industry."
msgstr ""
-#: template/glossary.html.j2:6
-msgid "auditor"
-msgstr ""
-
-#: template/glossary.html.j2:8
-msgid ""
-"trusted third party that verifies that the `exchange` is operating correctly"
-msgstr ""
-
-#: template/glossary.html.j2:12
-msgid "bank"
-msgstr ""
-
-#: template/glossary.html.j2:14
-msgid ""
-"traditional financial service provider who offers wire `transfers` between "
-"accounts"
-msgstr ""
-
-#: template/glossary.html.j2:18
-msgid "coin"
-msgstr ""
-
-#: template/glossary.html.j2:20
-msgid ""
-"coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:24
-msgid "contract"
-msgstr ""
-
-#: template/glossary.html.j2:26
-msgid "the proposal signed by the wallet."
-msgstr ""
-
-#: template/glossary.html.j2:30
-msgid "denomination"
-msgstr ""
-
-#: template/glossary.html.j2:32
-msgid ""
-"unit of currency, specifies both the currency and the face value of a `coin`"
-msgstr ""
-
-#: template/glossary.html.j2:37
-msgid "denomination key"
-msgstr ""
-
-#: template/glossary.html.j2:39
-msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and of "
-"a particular `denomination`"
-msgstr ""
-
-#: template/glossary.html.j2:44
-msgid "deposit"
-msgstr ""
-
-#: template/glossary.html.j2:46
-msgid ""
-"operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:52
-msgid "dirty"
-msgstr ""
-
-#: template/glossary.html.j2:54
-msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than the "
-"customer, thereby creating the danger of some entity being able to link "
-"multiple transactions of coin's owner if the coin is not refreshed first"
-msgstr ""
-
-#: template/glossary.html.j2:61
-msgid "exchange"
-msgstr ""
-
-#: template/glossary.html.j2:63
-msgid ""
-"Taler's payment service provider. Issues electronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants."
-msgstr ""
-
-#: template/glossary.html.j2:68
-msgid "expired"
-msgstr ""
-
-#: template/glossary.html.j2:70
-msgid ""
-"Various operations come with time limits. In particular, `denomination keys` "
-"come with strict time limits for the various operations involving the `coin` "
-"issued under the `denomination`. The most important limit is the `deposit` "
-"expiration, which specifies until when wallets are allowed to use the coin "
-"in `deposit` or `refreshing` operations. There is also a \"legal\" "
-"expiration, which specifies how long the exchange keeps records beyond the "
-"`deposit` expiration time. This latter expiration matters for legal disputes "
-"in courts and also creates an upper limit for `refreshing` operations on "
-"special `zombie coin`."
-msgstr ""
-
-#: template/glossary.html.j2:82
-msgid "extension"
-msgstr ""
-
-#: template/glossary.html.j2:84
-msgid "implementation of a `wallet` for browsers"
-msgstr ""
-
-#: template/glossary.html.j2:88
-msgid "fresh coin"
-msgstr ""
-
-#: template/glossary.html.j2:90
-msgid "a `coin` is fresh if its public key is only known to the customer"
-msgstr ""
-
-#: template/glossary.html.j2:94
-msgid "master key"
-msgstr ""
-
-#: template/glossary.html.j2:96
-msgid ""
-"offline key used by the exchange to certify denomination keys and message "
-"signing keys"
-msgstr ""
-
-#: template/glossary.html.j2:101
-msgid "message signing key"
-msgstr ""
-
-#: template/glossary.html.j2:103
-msgid "key used by the exchange to sign online messages, other than coins"
-msgstr ""
-
-#: template/glossary.html.j2:107
-msgid "offer"
-msgstr ""
-
-#: template/glossary.html.j2:109
-msgid ""
-"specification of the details of a transaction, specifies the payment "
-"obligations for the customer (i.e. the amount), the deliverables of the "
-"merchant and other related information, such as deadlines or locations; "
-"However, it lacks some information that the backend is supposed to provide. "
-"In other words, after the backend adds the missing information to the offer "
-"and signs it, it becomes a proposal."
-msgstr ""
-
-#: template/glossary.html.j2:118
-msgid "owner"
-msgstr ""
-
-#: template/glossary.html.j2:120
-msgid "a `coin` is owned by the entity that knows the private key of the coin"
-msgstr ""
-
-#: template/glossary.html.j2:124
-msgid "payback"
-msgstr ""
-
-#: template/glossary.html.j2:126
-msgid ""
-"operation by which an exchange returns the value of coins affected by a "
-"`revocation` to their `owner`, either by allowing the owner to withdraw new "
-"coins or wiring funds back to the bank account of the `owner`"
-msgstr ""
-
-#: template/glossary.html.j2:132
-msgid "proof"
-msgstr ""
-
-#: template/glossary.html.j2:134
-msgid ""
-"message that cryptographically demonstrates that a particular claim is "
-"correct"
-msgstr ""
-
-#: template/glossary.html.j2:138
-msgid "proposal"
-msgstr ""
-
-#: template/glossary.html.j2:140
-msgid "a sketch that has been completed and signed by the merchant backend."
-msgstr ""
-
-#: template/glossary.html.j2:144
-msgid "reserve"
-msgstr ""
-
-#: template/glossary.html.j2:146
-msgid ""
-"funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's "
-"bank account to cover obligations from coins in circulation"
-msgstr ""
-
-#: template/glossary.html.j2:152
-msgid "refreshing"
-msgstr ""
-
-#: template/glossary.html.j2:154
-msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh` "
-"coins"
-msgstr ""
-
-#: template/glossary.html.j2:159
-msgid "refund"
-msgstr ""
-
-#: template/glossary.html.j2:161
-msgid ""
-"operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back to "
-"the customer"
-msgstr ""
-
-#: template/glossary.html.j2:167
-msgid "revocation"
-msgstr ""
-
-#: template/glossary.html.j2:169
-msgid ""
-"exceptional operation by which an exchange withdraws a denomination from "
-"circulation, either because the signing key was compromised or because the "
-"exchange is going out of operation; unspent coins of a revoked denomination "
-"are subjected to payback."
-msgstr ""
-
-#: template/glossary.html.j2:176
-msgid "sharing"
-msgstr ""
-
-#: template/glossary.html.j2:178
-msgid ""
-"users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any time."
-msgstr ""
-
-#: template/glossary.html.j2:184
-msgid "signing key"
-msgstr ""
-
-#: template/glossary.html.j2:186
-msgid "see message signing key."
-msgstr ""
-
-#: template/glossary.html.j2:190
-msgid "spending"
-msgstr ""
-
-#: template/glossary.html.j2:192
-msgid ""
-"operation by which a customer gives a merchant the right to `deposit` coins "
-"in return for merchandise"
-msgstr ""
-
-#: template/glossary.html.j2:197
-msgid "transfer"
-msgstr ""
-
-#: template/glossary.html.j2:199
-msgid "method of sending funds between `bank` accounts"
-msgstr ""
-
-#: template/glossary.html.j2:203
-msgid "transaction"
-msgstr ""
-
-#: template/glossary.html.j2:205
-msgid ""
-"method by which ownership is exclusively transferred from one entity to "
-"another"
-msgstr ""
-
-#: template/glossary.html.j2:210
-msgid "transaction id"
-msgstr ""
-
-#: template/glossary.html.j2:212
-msgid "unique number by which a merchant identifies a `transaction`"
-msgstr ""
-
-#: template/glossary.html.j2:216
-msgid "wallet"
-msgstr ""
-
-#: template/glossary.html.j2:218
-msgid ""
-"software running on a customer's computer; withdraws, stores and spends coins"
-msgstr ""
-
-#: template/glossary.html.j2:223
-msgid "wire transfer"
-msgstr ""
-
-#: template/glossary.html.j2:225
-msgid "see `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:229
-msgid "wire transfer identifier"
-msgstr ""
-
-#: template/glossary.html.j2:231
-msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely identify "
-"the `transfer`"
-msgstr ""
-
-#: template/glossary.html.j2:236
-msgid "withdrawal"
-msgstr ""
-
-#: template/glossary.html.j2:238
-msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh coins"
-msgstr ""
-
-#: template/glossary.html.j2:243
-msgid "zombie coin"
-msgstr ""
-
-#: template/glossary.html.j2:245
-msgid ""
-"a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin in "
-"`refreshing`, (2) the `denomination` of the `fresh` coins created during the "
-"`refreshing` was subject to `revocation`, resulting in the `fresh` coin from "
-"the refresh operation being subjected to `payback`; as a result, the "
-"formerly `dirty` coin is eligible for `refreshing`, even if the dirty coin's "
-"denomination is `expired` for `deposit` operations (but not if it is expired "
-"past the legal data retention requirement)."
-msgstr ""
-
#: template/governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
diff --git a/news/2019-12.html.j2 b/news/2019-12.html.j2
new file mode 100644
index 0000000..ab8a59c
--- /dev/null
+++ b/news/2019-12.html.j2
@@ -0,0 +1,51 @@
+{% extends "common/news.j2" %}
+{% block body_content %}
+<h1>2019-12: GNU Taler v0.6.0 released</h1>
+<p>
+We are happy to announce the release of GNU Taler v0.6.0.
+</p>
+<p>
+We have addressed over 200 individual issues, our bug tracker
+has the <a
href="https://bugs.gnunet.org/changelog_page.php?version_id=272";>full list</a>.
+Notable changes include:
+</p>
+<ul>
+<li>Implemented various protocol tweaks addressing corner cases discovered
when writing Florian's the PhD thesis on Taler</li>
+<li>The wallet was ported to Android, and now supports NFC payments</li>
+<li>A Web service to synchronize wallets across devices was implemented (but
is not yet used by the wallets)</li>
+<li>The Taler auditor saw many improvements and extensions, and should now be
usable for the first time</li>
+<li>The exchange protocol has an endpoint to return the terms of service and
privcy policy of the operator</li>
+<li>The new taler-mdb component can be used to combine Taler with vending
machines using the Multi Drop Bus (MDB)</li>
+<li></li>
+<li></li>
+</ul>
+
+<h4>Download links</h4>
+<p>
+The wallet has its own download site <a
+href="https://wallet.taler.net/";>here</a>. The exchange, merchant backend,
+sync and bank components are distributed via the GNU FTP mirrors.
+</p>
+<ul>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-exchange-0.6.0.tar.gz";>http://ftpmirror.gnu.org/taler/taler-exchange-0.6.0.tar.gz</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-exchange-0.6.0.tar.gz.sig";>http://ftpmirror.gnu.org/taler/taler-exchange-0.6.0.tar.gz.sig</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-merchant-0.6.0.tar.gz";>http://ftpmirror.gnu.org/taler/taler-merchant-0.6.0.tar.gz</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-merchant-0.6.0.tar.gz.sig";>http://ftpmirror.gnu.org/taler/taler-merchant-0.6.0.tar.gz.sig</a></li>
+
+<!-- STILL TO BE UPLOADED! -->
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-bank-0.6.0.tar.gz";>http://ftpmirror.gnu.org/taler/taler-bank-0.6.0.tar.gz</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-bank-0.6.0.tar.gz.sig";>http://ftpmirror.gnu.org/taler/taler-bank-0.6.0.tar.gz.sig</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-wallet-webex-0.6.0.tar.gz";>http://ftpmirror.gnu.org/taler/taler-wallet-webex-0.6.0.tar.gz</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-wallet-webex-0.6.0.tar.gz.sig";>http://ftpmirror.gnu.org/taler/taler-wallet-webex-0.6.0.tar.gz.sig</a></li>
+<!-- Android wallet source? Wallet core? -->
+
+<li><a
href="http://ftpmirror.gnu.org/taler/sync-0.6.0.tar.gz";>http://ftpmirror.gnu.org/taler/sync-0.6.0.tar.gz</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/sync-0.6.0.tar.gz.sig";>http://ftpmirror.gnu.org/taler/sync-0.6.0.tar.gz.sig</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-mdb-0.6.0.tar.gz";>http://ftpmirror.gnu.org/taler/taler-mdb-0.6.0.tar.gz</a></li>
+<li><a
href="http://ftpmirror.gnu.org/taler/taler-mdb-0.6.0.tar.gz.sig";>http://ftpmirror.gnu.org/taler/taler-mdb-0.6.0.tar.gz.sig</a></li>
+</ul>
+You must use GNUnet 0.6.1 or a recent Git version to use Taler 0.6.0.
+
+
+
+{% endblock body_content %}
diff --git a/template/cashier.html.j2 b/template/cashier.html.j2
new file mode 100644
index 0000000..c7509e9
--- /dev/null
+++ b/template/cashier.html.j2
@@ -0,0 +1,29 @@
+{% extends "common/base.j2" %}
+
+{% block body_content %}
+<!-- Jumbotron -->
+<div class="jumbotron">
+ <div class="text-center">
+ <h1 lang="en">{{ _("Taler Cashier") }}</h1>
+ </div>
+</div>
+
+<div class="container">
+
+ <div class="row">
+ <div class="col-lg-12">
+ <p>
+ {% trans %}
+ The Taler Cashier is an Android app
+ that enables you to take cash and give out electronic cash.
+ {% endtrans %}
+ </p>
+ <h2>{{ _("Download") }}</h2>
+ <p>
+ Coming soon!
+ </p>
+ </div> <!-- /col-lg-12 -->
+ </div> <!-- /row -->
+
+</div> <!-- /container -->
+{% endblock body_content %}
diff --git a/template/contact.html.j2 b/template/contact.html.j2
index b6c64cf..09427c3 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -9,7 +9,7 @@
<div class="container">
<div class="row">
- <div class="col-lg-4">
+ <div class="col-lg-6">
<h2>{{ _("The mailing list") }}</h2>
<p>
{% trans %}
@@ -25,7 +25,7 @@
</p>
</div>
- <div class="col-lg-4">
+ <div class="col-lg-6">
<h2>{{ _("Contacting individuals") }}</h2>
<p>
{% trans %}
@@ -36,12 +36,12 @@
</p>
</div>
- <div class="col-lg-4">
- <h2>{{ _("General inquiries") }}</h2>
+ <div class="col-lg-6">
+ <h2>{{ _("Chat") }}</h2>
<p>
{% trans %}
- You can reach a group of team members handling
- general inquiries at <tt>contact AT taler.net</tt>.
+ You can find some team members in the IRC channel
+ <tt>#taler</tt> on <tt>irc.freenode.net</tt>.
{% endtrans %}
</p>
</div>
@@ -61,6 +61,16 @@
</p>
</div>
+ <div class="col-lg-6">
+ <h2>{{ _("General inquiries") }}</h2>
+ <p>
+ {% trans %}
+ You can reach a group of team members handling
+ general inquiries at <tt>contact AT taler.net</tt>.
+ {% endtrans %}
+ </p>
+ </div>
+
<div class="col-lg-6">
<h2>{{ _("Executive team") }}</h2>
<p>
diff --git a/template/developers.html.j2 b/template/developers.html.j2
deleted file mode 100644
index 0a52128..0000000
--- a/template/developers.html.j2
+++ /dev/null
@@ -1,300 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
- <div class="jumbotron">
- <div class="text-center">
- <h1>{{ _("Taler for developers") }}</h1>
- </div>
- </div>
-
- <div class="container">
- <div class="row">
- <div class="col-lg-6">
- <h3>{{ _("Free") }}</h3>
-
- <p>
- {% trans %}
- GNU Taler is free software implementing an open
- protocol. Anybody is welcome to integrate our reference
- implementation into their applications. Different
- components of Taler are being made available under
- different licenses. The Affero GPLv3+ is used for the
- exchange, the LGPLv3+ is used for reference code
- demonstrating integration with merchant platforms, and
- licenses like GPLv3+ are used for
- wallets and related customer-facing software. We are
- open for constructive suggestions for maximizing the
- adoption of this payment platform.
- {% endtrans %}
- </p>
-
- </div>
- <div class="col-lg-6">
- <h3>{{ _("RESTful") }}</h3>
-
- <p>
- {% trans %}
- Taler is designed to work on the Internet. To
- ensure that Taler payments can work with
- restrictive network setups, Taler uses a RESTful
- protocol over HTTP or HTTPS. Taler's security does
- not depend upon the use of HTTPS, but obviously
- merchants may choose to offer HTTPS for consistency
- and because it generally is better for privacy
- compared to HTTP. Taler uses JSON to encode
- structure data, making it easy to integrate Taler
- with existing Web applications. Taler's protocol
- is documented in detail at
- {% endtrans %}
- <a href="https://docs.taler.net/";>docs.taler.net</a>.
- </p>
- </div>
- </div>
- </div>
-
- <div class="container-fluid c_acronym">
- <div class="container">
- <div class="row">
- <div class="col-lg-4">
- <h3>{{ _("Code") }}</h3>
-
- <p>
- {% trans %}
- Taler is currently primarily developed by a
- research team at
- {% endtrans %}
- <a href="http://www.inria.fr/";>Inria</a>
- {% trans %}
- and
- {% endtrans %}
- <a href="https://gnunet.org/";>GNUnet</a>.
- {% trans %}
- However, contributions from anyone are welcome. Our Git
- repositories can be cloned using the Git and HTTP access methods
- against <tt>git.taler.net</tt> with the name of the respective
- repository. A list of repositories can be found in our
- {% endtrans %}
- <a href="https://git.taler.net/";>GitWeb</a>.
- </p>
- </div>
- <div class="col-lg-4">
- <h3>{{ _("Documentation") }}</h3>
-
- <p>
- {% trans %}
- In addition to this website, the
- {% endtrans %}
- <a href="https://git.taler.net/";>{{ _("documented code")}}</a>
- {% trans %}
- and the
- {% endtrans %}
- <a href="https://docs.taler.net/";>{{ _("API documentation")}}</a>.
- {% trans %}
- Technical papers can be found in our
- {% endtrans %}
- <a href="{{ url_localized('bibliography.html') }}">{{
_("bibliography")}}</a>.
- </p>
- </div>
- <div class="col-lg-4">
- <h3>{{ _("Discussion") }}</h3>
-
- <p>
- {% trans %}
- We have a mailing list for developer discussions.
- You can subscribe to or read the list archive at
- {% endtrans %}
- <a
href="http://lists.gnu.org/mailman/listinfo/taler";>http://lists.gnu.org/mailman/listinfo/taler</a>.
- </p>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h3>{{ _("Regression Testing") }}</h3>
-
- <p>
- {% trans %}
- We have
- {% endtrans %}
- <a href="https://buildbot.net/";>Buildbot</a>
- {% trans %}
- automation tests to detect regressions and check for
- portability at
- {% endtrans %}
- <a href="https://buildbot.taler.net/";>buildbot.taler.net</a>.
- </p>
- </div>
- <div class="col-lg-4" note="not yet operational">
- <h3>{{ _("Code Coverage Analysis") }}</h3>
-
- <p>
- {% trans %}
- We use
- {% endtrans %}
- <a href="http://ltp.sourceforge.net/coverage/lcov.php";>LCOV</a>
- {% trans %}
- to analyze the code coverage of our tests, the
- results are available at
- {% endtrans %}
- <a href="https://lcov.taler.net/";>lcov.taler.net</a>.
- </p>
- </div>
- </div>
- </div>
- </div>
-
- <div class="container-fluid">
- <div class="container">
- <h2>{{ _("Technical Presentation") }}</h2>
- <div class="row">
- <div class="col-lg-4">
- <a href="{{ url('presentations/tech.pdf') }}"><img border=0
class="center-block" width=64 height=64 alt="PDF" src="{{
url_static('images/pdf.svg') }}"><br><p align="center">{{ _("Download")
}}</p></a>
- </div>
- <div class="col-lg-4" id="canvas-left" style="display:none">
- <canvas id="the-canvas-left"></canvas>
- </div>
- <div class="col-lg-4" id="canvas-right" style="display:none">
- <canvas id="the-canvas-right"></canvas>
- </div>
- <script type="text/javascript" src="{{ url_dist('js/pdf.min.js')
}}"></script>
- <script type="text/javascript" src="{{ url_dist('js/pdf-view-tech.js')
}}"></script>
- </div>
- </div>
- </div>
-
- <div class="container">
- <div class="col-lg-12">
- <h3 id="overview">{{ _("Taler system overview") }}</h3>
-
- <p>
- {% trans %}
- The Taler system consists of protocols executed among
- a number of actors as illustrated in the illustration on the right.
- Typical transactions involve the following steps:
- {% endtrans %}
- </p>
-
- <img src="{{ url_static('images/taler-arch-full.svg') }}"
alt="{{_("system overview")}}" style="float: right; margin: 50px 5px 5px 5px;"
width="50%">
- <ol>
- <li>
- {% trans %}
- A customer instructs his <b>bank</b> to
- transfer funds from his account to the Taler
- exchange (top left). In the subject of the
- transaction, he includes an authentication
- token from his electronic <b>wallet</b>. In
- Taler terminology, the customer creates a
- reserve at the exchange.
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- Once the exchange has received the wire
- transfer, it allows the customer's electronic
- wallet to <b>withdraw</b> electronic coins.
- The electronic coins are digital
- representations of the original currency from
- the transfer. It is important to note that the
- exchange does not learn the "serial
- numbers" of the coins created in this
- process, so it cannot tell later which customer
- purchased what at which merchant. The use of
- Taler does not change the currency or the total
- value of the funds (except for fees which the
- exchange may charge for the service).
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- Once the customer has the digital coins in his
- wallet, the wallet can be used to <b>spend</b>
- the coins with merchant portals that support
- the Taler payment system and accept the
- respective exchange as a business partner
- (bottom arrow). This creates a digital contract
- signed by the customer's coins and the
- merchant. If necessary, the customer can later
- use this digitally signed contract in a court
- of law to prove the exact terms of the contract
- and that he paid the respective amount. The
- customer does not learn the banking details of
- the merchant, and Taler does not require the
- merchant to learn the identity of the
- customer. Naturally, the customer can spend any
- fraction of his digital coins (the system takes
- care of customers getting change).
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- Merchants receiving digital
- coins <b>deposit</b> the respective claims
- that resulted from the contract signing with
- the customer at the exchange to redeem the
- coins. The deposit step does not reveal the
- details of the contract between the customer
- and the merchant or the identity of the
- customer to the exchange in any way. However,
- the exchange does learn the identity of the
- merchant via the provided bank routing
- information. The merchant can, for example
- when compelled by the state for taxation,
- provide information linking the individual
- deposit to the respective contract signed by
- the customer. Thus, the exchange's database
- allows the state to enforce that merchants pay
- applicable taxes (and do not engage in illegal
- contracts).
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- Finally, the exchange transfers funds
- corresponding to the digital coins redeemed by
- the merchants to the merchant's <b>bank</b>
- account. The exchange may combine multiple
- small transactions into one larger bank
- transfer. The merchant can query the exchange
- about the relationship between the bank
- transfers and the individual claims that were
- deposited.
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- Most importantly, the exchange keeps
- cryptographic proofs that allow it to
- demonstrate that it is operating correctly to
- third parties. The system requires an
- external <b>auditor</b>, such as a
- government-appointed financial regulatory body,
- to frequently verify the exchange's databases
- and check that its bank balance matches the
- total value of the remaining coins in
- circulation.
- {% endtrans %}
- </li>
-
- <li>
- {% trans %}
- Without the auditor, the exchange operators
- could embezzle funds they are holding in
- reserve. Customers and merchants cannot cheat
- each other or the exchange. If any party's
- computers are compromised, the financial damage
- is limited to the respective party and
- proportional to the funds they have in
- circulation during the period of the
- compromise.
- {% endtrans %}
- </li>
- </ol>
- <div class="col">
- <img class="img-fluid" src="{{
url_static('images/diagram-complex.png') }}">
- </div>
- </div>
- </div> <!-- /container -->
-{% endblock body_content %}
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index c6b5554..a756279 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -86,6 +86,18 @@
<div class="row">
+ <div class="col-3">
+ <a href="https://{{ siteconfitem['docshost'] }}/taler-wallet.html">
+ <img src="{{ url('icons/icon-wallet.svg') }}" height=60>
+ <h3>{{ _("Wallet") }}</h3>
+ </a>
+ {% trans %}
+ 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>.
+ {% endtrans %}
+ </div>
+
<div class="col-3">
<a href="https://{{ siteconfitem['docshost']
}}/taler-backoffice-manual.html">
<img src="{{ url('icons/icon-backoffice.svg') }}" height=60>
@@ -97,6 +109,28 @@
{% endtrans %}
<a href="https://{{ siteconfitem['docshost']
}}/pdf/taler-backoffice-manual.pdf">PDF</a>.
</div>
+
+ <div class="col-3">
+ <a href="https://{{ siteconfitem['docshost']
}}/taler-merchant-pos-terminal.html">
+ <img src="{{ url('icons/icon-market.svg') }}" height=60>
+ <h3>{{ _("Merchant POS Terminal") }}</h3>
+ </a>
+ {% trans %}
+ Manual for configuring and using the point of sale app.
+ Also available as
+ {% endtrans %}
+ <a href="https://{{ siteconfitem['docshost']
}}/pdf/taler-merchant-pos-terminal.pdf">PDF</a>.
+ </div>
+
+ <div class="col-3">
+ <a href="{{ url_localized('cashier.html') }}">
+ <img src="{{ url('icons/icon-cashier.svg') }}" height=60>
+ <h3>{{ _("Cashier") }}</h3>
+ </a>
+ {% trans %}
+ An app for taking in cash and handing out electronic cash.
+ {% endtrans %}
+ </div>
</div>
<div class="row mt-5">
@@ -196,6 +230,22 @@
{{ _("Git repositories for all of GNU Taler.") }}
</div>
+ <div class="col-3">
+ <a href="https://lcov.taler.net";>
+ <img src="{{ url('icons/icon-lcov.svg') }}" height=60>
+ <h3>{{ _("lcov results") }}</h3>
+ </a>
+ {{ _("Shows results of the code coverage analysis for our test suite.")
}}
+ </div>
+
+ <div class="col-3">
+ <a href="https://buildbot.taler.net";>
+ <img src="{{ url('icons/buildbot.svg') }}" height=60>
+ <h3>{{ _("Continuous integration") }}</h3>
+ </a>
+ {{ _("Continuous integration and deployment is managed by our
Buildbot.") }}
+ </div>
+
</div>
</div>
diff --git a/template/glossary.html.j2 b/template/glossary.html.j2
deleted file mode 100644
index 81b593f..0000000
--- a/template/glossary.html.j2
+++ /dev/null
@@ -1,258 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-<div class="container">
-
- <dl>
- <dt>{{ _("auditor") }}</dt>
- <dd>
- {% trans %}
- trusted third party that verifies that the `exchange` is operating
correctly
- {% endtrans %}
- </dd>
- <dt>{{ _("bank") }}</dt>
- <dd>
- {% trans %}
- traditional financial service provider who offers wire `transfers`
between accounts
- {% endtrans %}
- </dd>
- <dt>{{ _("coin") }}</dt>
- <dd>
- {% trans %}
- coins are individual token representing a certain amount of value,
also known as the `denomination` of the coin
- {% endtrans %}
- </dd>
- <dt>{{ _("contract") }}</dt>
- <dd>
- {% trans %}
- the proposal signed by the wallet.
- {% endtrans %}
- </dd>
- <dt>{{ _("denomination") }}</dt>
- <dd>
- {% trans %}
- unit of currency, specifies both the currency and the face value of a
- `coin`
- {% endtrans %}
- </dd>
- <dt>{{ _("denomination key") }}</dt>
- <dd>
- {% trans %}
- RSA key used by the exchange to certify that a given `coin` is valid
and
- of a particular `denomination`
- {% endtrans %}
- </dd>
- <dt>{{ _("deposit") }}</dt>
- <dd>
- {% trans %}
- operation by which a merchant passes coins to an exchange, expecting
the
- exchange to credit his `bank` account in the future using a wire
- `transfer`
- {% endtrans %}
- </dd>
- <dt>{{ _("dirty") }}</dt>
- <dd>
- {% trans %}
- a `coin` is dirty if its public key may be known to an entity other
than
- the customer, thereby creating the danger of some entity being able to
- link multiple transactions of coin's owner if the coin is not
refreshed
- first
- {% endtrans %}
- </dd>
- <dt>{{ _("exchange") }}</dt>
- <dd>
- {% trans %}
- Taler's payment service provider. Issues electronic `coins` during
- `withdrawal` and redeems them when they are `deposited` by merchants.
- {% endtrans %}
- </dd>
- <dt>{{ _("expired") }}</dt>
- <dd>
- {% trans %}
- Various operations come with time limits. In particular, `denomination
keys`
- come with strict time limits for the various operations involving the
- `coin` issued under the `denomination`. The most important limit is the
- `deposit` expiration, which specifies until when wallets are allowed to
- use the coin in `deposit` or `refreshing` operations. There is also a
"legal"
- expiration, which specifies how long the exchange keeps records beyond
the
- `deposit` expiration time. This latter expiration matters for legal
disputes
- in courts and also creates an upper limit for `refreshing` operations
on
- special `zombie coin`.
- {% endtrans %}
- </dd>
- <dt>{{ _("extension") }}</dt>
- <dd>
- {% trans %}
- implementation of a `wallet` for browsers
- {% endtrans %}
- </dd>
- <dt>{{ _("fresh coin") }}</dt>
- <dd>
- {% trans %}
- a `coin` is fresh if its public key is only known to the customer
- {% endtrans %}
- </dd>
- <dt>{{ _("master key") }}</dt>
- <dd>
- {% trans %}
- offline key used by the exchange to certify denomination keys and
- message signing keys
- {% endtrans %}
- </dd>
- <dt>{{ _("message signing key") }}</dt>
- <dd>
- {% trans %}
- key used by the exchange to sign online messages, other than coins
- {% endtrans %}
- </dd>
- <dt>{{ _("offer") }}</dt>
- <dd>
- {% trans %}
- specification of the details of a transaction, specifies the payment
obligations
- for the customer (i.e. the amount), the deliverables of the merchant
and other
- related information, such as deadlines or locations; However, it lacks
some
- information that the backend is supposed to provide.
- In other words, after the backend adds the missing information to the
offer and
- signs it, it becomes a proposal.
- {% endtrans %}
- </dd>
- <dt>{{ _("owner") }}</dt>
- <dd>
- {% trans %}
- a `coin` is owned by the entity that knows the private key of the coin
- {% endtrans %}
- </dd>
- <dt>{{ _("payback") }}</dt>
- <dd>
- {% trans %}
- operation by which an exchange returns the value of coins affected
- by a `revocation` to their `owner`, either by allowing the owner to
- withdraw new coins or wiring funds back to the bank account of the
`owner`
- {% endtrans %}
- </dd>
- <dt>{{ _("proof") }}</dt>
- <dd>
- {% trans %}
- message that cryptographically demonstrates that a particular claim is
correct
- {% endtrans %}
- </dd>
- <dt>{{ _("proposal") }}</dt>
- <dd>
- {% trans %}
- a sketch that has been completed and signed by the merchant backend.
- {% endtrans %}
- </dd>
- <dt>{{ _("reserve") }}</dt>
- <dd>
- {% trans %}
- funds set aside for future use; either the balance of a customer at the
- exchange ready for `withdrawal`, or the funds kept in the
exchange's bank
- account to cover obligations from coins in circulation
- {% endtrans %}
- </dd>
- <dt>{{ _("refreshing") }}</dt>
- <dd>
- {% trans %}
- operation by which a `dirty` `coin` is converted into one or more
- `fresh` coins
- {% endtrans %}
- </dd>
- <dt>{{ _("refund") }}</dt>
- <dd>
- {% trans %}
- operation by which a merchant steps back from the right to funds that
he
- obtained from a `deposit` operation, giving the right to the funds back
- to the customer
- {% endtrans %}
- </dd>
- <dt>{{ _("revocation") }}</dt>
- <dd>
- {% trans %}
- exceptional operation by which an exchange withdraws a denomination
from
- circulation, either because the signing key was compromised or because
- the exchange is going out of operation; unspent coins of a revoked
- denomination are subjected to payback.
- {% endtrans %}
- </dd>
- <dt>{{ _("sharing") }}</dt>
- <dd>
- {% trans %}
- users can share ownership of a `coin` by sharing access to the
coin's
- private key, thereby allowing all co-owners to spend the coin at any
- time.
- {% endtrans %}
- </dd>
- <dt>{{ _("signing key") }}</dt>
- <dd>
- {% trans %}
- see message signing key.
- {% endtrans %}
- </dd>
- <dt>{{ _("spending") }}</dt>
- <dd>
- {% trans %}
- operation by which a customer gives a merchant the right to `deposit`
- coins in return for merchandise
- {% endtrans %}
- </dd>
- <dt>{{ _("transfer") }}</dt>
- <dd>
- {% trans %}
- method of sending funds between `bank` accounts
- {% endtrans %}
- </dd>
- <dt>{{ _("transaction") }}</dt>
- <dd>
- {% trans %}
- method by which ownership is exclusively transferred from one entity
- to another
- {% endtrans %}
- </dd>
- <dt>{{ _("transaction id") }}</dt>
- <dd>
- {% trans %}
- unique number by which a merchant identifies a `transaction`
- {% endtrans %}
- </dd>
- <dt>{{ _("wallet") }}</dt>
- <dd>
- {% trans %}
- software running on a customer's computer; withdraws, stores and
- spends coins
- {% endtrans %}
- </dd>
- <dt>{{ _("wire transfer") }}</dt>
- <dd>
- {% trans %}
- see `transfer`
- {% endtrans %}
- </dd>
- <dt>{{ _("wire transfer identifier") }}</dt>
- <dd>
- {% trans %}
- subject of a wire `transfer`; usually a random string to uniquely
- identify the `transfer`
- {% endtrans %}
- </dd>
- <dt>{{ _("withdrawal") }}</dt>
- <dd>
- {% trans %}
- operation by which a `wallet` can convert funds from a reserve to
- fresh coins
- {% endtrans %}
- </dd>
- <dt>{{ _("zombie coin") }}</dt>
- <dd>
- {% trans %}
- a `coin` is a zombie coin if the coin was (1) used as the `dirty` coin
- in `refreshing`, (2) the `denomination` of the `fresh` coins created
during the
- `refreshing` was subject to `revocation`, resulting in the `fresh` coin
- from the refresh operation being subjected to `payback`; as a result,
- the formerly `dirty` coin is eligible for
- `refreshing`, even if the dirty coin's denomination is `expired` for
- `deposit` operations (but not if it is expired past the legal
- data retention requirement).
- {% endtrans %}
- </dd>
-</dt>
-</div>
-{% endblock body_content %}
diff --git a/www.yml b/www.yml
index ff589c5..4e48793 100644
--- a/www.yml
+++ b/www.yml
@@ -26,6 +26,11 @@ staticfiles:
- robots.txt
meetingnotes:
newsposts:
+ - page: 2019-12.html
+ date: 2019-12-27
+ title: GNU Taler v0.6.0 released
+ abstract:
+ content:
- page: 2018-04.html
date: 2018-04-01
title: GNU Taler v0.5.0 released
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch stable updated (d6b7ef0 -> 343c400),
gnunet <=