[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch master updated: Add Cashier and Merchant POS to compo
|
From: |
gnunet |
|
Subject: |
[taler-www] branch master updated: Add Cashier and Merchant POS to components |
|
Date: |
Fri, 21 Feb 2020 16:38:52 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new 95264a9 Add Cashier and Merchant POS to components
95264a9 is described below
commit 95264a99379ed183a8d098fbaadbca973c5baa68
Author: Torsten Grote <address@hidden>
AuthorDate: Fri Feb 21 12:38:32 2020 -0300
Add Cashier and Merchant POS to components
---
icons/icon-cashier.svg | 55 +++++
locale/de/LC_MESSAGES/messages.po | 408 +++++--------------------------------
locale/en/LC_MESSAGES/messages.po | 408 +++++--------------------------------
locale/es/LC_MESSAGES/messages.po | 408 +++++--------------------------------
locale/fr/LC_MESSAGES/messages.po | 408 +++++--------------------------------
locale/it/LC_MESSAGES/messages.po | 408 +++++--------------------------------
locale/pt/LC_MESSAGES/messages.po | 408 +++++--------------------------------
locale/ru/LC_MESSAGES/messages.po | 412 +++++---------------------------------
template/cashier.html.j2 | 29 +++
template/docs.html.j2 | 22 ++
10 files changed, 451 insertions(+), 2515 deletions(-)
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/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 65347eb..2d72833 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-25 10:37+0000\n"
+"POT-Creation-Date: 2020-02-21 12:26-0300\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <address@hidden>\n"
"Language-Team: de <address@hidden, address@hidden>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.4.0\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/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index aaacf75..4355c6c 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-25 10:37+0000\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"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\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 aa4afe5..5966f7e 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-25 10:37+0000\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"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"Generated-By: Babel 2.3.4\n"
"X-Generator: Poedit 2.0.2\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 6d0ab70..002dc9e 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-25 10:37+0000\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"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\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 bacc2a1..32f0be8 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-25 10:37+0000\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"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\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 2ef6e93..6c84ae9 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-25 10:37+0000\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"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 1.0.0-beta1\n"
"Generated-By: Babel 2.5.3\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 c9871fb..392cc92 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-25 10:37+0000\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"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"Generated-By: Babel 2.5.1\n"
#: common/base.j2:5 common/news.j2:5
@@ -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/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/docs.html.j2 b/template/docs.html.j2
index c6b5554..aeaa1f2 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -97,6 +97,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">
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch master updated: Add Cashier and Merchant POS to components,
gnunet <=