[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch stable updated (7609502 -> 4c79fe7)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-www] branch stable updated (7609502 -> 4c79fe7) |
|
Date: |
Mon, 20 Mar 2017 08:24:06 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch stable
in repository www.
from 7609502 sync version
add b781466 revising index and citizen's pages based on feedback from
Marcello and Sva
add bc1806e revising merchant's page based on feedback from Sva and
Marcello
add c4bd820 revising gov page based on feedback from Sva and Marcello
add a8fb3d8 update to bootstrap 3.3.7
add 506f422 so far all GPLv3+
add a0a4f56 sync version
add 06f1c11 i18n indentation fix
add 78a8c7a to the merchant is overly restrictive
add e3ec236 'despite' is wrong
add c167a8e add FOSSASIA talk to news
new 4c79fe7 Merge branch 'master' into stable
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 2 +-
citizens.html.j2 | 72 +-
common/footer.j2.inc | 3 +-
developers.html.j2 | 161 +-
dist/css/bootstrap.css | 949 ++++++++----
dist/css/bootstrap.css.map | 2 +-
dist/css/bootstrap.min.css | 7 +-
dist/fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes
dist/fonts/glyphicons-halflings-regular.svg | 487 +++---
dist/fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes
dist/fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes
dist/js/bootstrap.js | 551 ++++---
dist/js/bootstrap.min.js | 10 +-
faq.html.j2 | 47 +-
governments.html.j2 | 211 +--
i18nfix.py | 20 +
index.html.j2 | 46 +-
investors.html.j2 | 6 +-
locale/babel.map | 4 +-
locale/de/LC_MESSAGES/messages.po | 2140 ++++++++++++++++++--------
locale/en/LC_MESSAGES/messages.po | 2130 +++++++++++++++++--------
locale/es/LC_MESSAGES/messages.po | 2138 +++++++++++++++++--------
locale/fr/LC_MESSAGES/messages.po | 2138 +++++++++++++++++--------
locale/it/LC_MESSAGES/messages.po | 2138 +++++++++++++++++--------
merchants.html.j2 | 130 +-
news.html.j2.inc | 1 +
news/{2017-02.inc => 2017-03.inc} | 10 +-
template.py | 3 +
28 files changed, 9196 insertions(+), 4210 deletions(-)
create mode 100644 i18nfix.py
copy news/{2017-02.inc => 2017-03.inc} (56%)
diff --git a/Makefile b/Makefile
index 2f39d06..26fc16d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all: locale template
# Extract translateable strings from jinga2 templates.
locale/messages.pot: *.j2
- pybabel extract -F locale/babel.map -o locale/messages.pot .
+ env PYTHONPATH="." pybabel extract -F locale/babel.map -o
locale/messages.pot .
# Update translation (.po) files with new strings.
locale-update: locale/messages.pot
diff --git a/citizens.html.j2 b/citizens.html.j2
index 024bdc4..af3f0e6 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -22,7 +22,7 @@
<!-- Example row of columns -->
<div class="row">
<div class="col-lg-6">
- <h3>{{ _("Security") }}</h3>
+ <h3>{{ _("Secure") }}</h3>
<p>{{ _("Taler uses modern cryptography, ensuring that there
is no counterfeit. Your digital wallet is safer
@@ -34,20 +34,20 @@
</div>
<div class="col-lg-6">
- <h3>{{ _("Privacy") }}</h3>
+ <h3>{{ _("Private") }}</h3>
- <p>{{ _("Your transactions are private, neither the exchange
- nor merchant needs to learn your identity. There is
- no need to give out credit card numbers or other
- sensitive information. The merchant will only be
- able to do exactly the transaction you agreed to.")
- }}</p>
+ <p>{{ _("Your transactions are private, neither the payment
+ service provider nor merchant needs to learn your
+ identity. There is no need to give out credit card
+ numbers or other sensitive information. The merchant
+ will only be able to do exactly the transaction you
+ agreed to.") }}</p>
</div>
</div>
<div class="row">
<div class="col-lg-6">
- <h3>{{ _("Convenience") }}</h3>
+ <h3>{{ _("Convenient") }}</h3>
<p>{{ _("You will be able to withdraw money to replenish the
digital coins in your wallet using your credit card
@@ -58,7 +58,7 @@
</div>
<div class="col-lg-6">
- <h3>{{ _("Stability") }}</h3>
+ <h3>{{ _("Stable") }}</h3>
<p>{{ _("Coins in your digital wallet will be of the same
denomination as the cash in your physical wallet.
@@ -104,30 +104,40 @@
<p>{{ _("Customers interact with the Taler system using
the Taler wallet:") }}</p>
+
<ul>
- <li>{{ _("To <b>withdraw</b> electronic coins, the customer transfers
funds
- from his bank account to the Taler exchange. The wire
- transfer subject must match a code generated by the
customer's
- wallet. After the wire transfer is complete, the wallet will
- automatically withdraw the coins.") }}</li>
-
- <li>{{ _("To <b>spend</b> electronic coins, a merchant must cause the
wallet
- to display a proposal and ask for one-click confirmation.
- Payment is then instant.
- Transaction histories and digitally signed contracts can be
- preserved by the wallet.") }}</li>
+
+ <li>{{ _("To <b>withdraw</b> electronic coins, the customer
+ transfers funds from his bank account to the Taler
+ payment service provider (the exchange). The wire
+ transfer subject must match a code identifying the
+ customer's wallet. After the wire transfer is
+ complete, the wallet will automatically withdraw the
+ coins from the exchange.") }}</li>
+
+ <li>{{ _("To <b>spend</b> electronic coins, a merchant must
+ cause the wallet to display a proposal for some
+ purchase. The wallet will ask the customer for
+ one-click confirmation. Payment is then instant.
+ Transaction histories and digitally signed contracts
+ can be preserved by the wallet.") }}</li>
<li>{{ _("The customer can use the wallet to <b>review</b> his
- balance. The wallet can contain different currencies,
- and may be shared across devices. Customers can make
- backups of the wallet to secure its contents against
- hardware failures.") }}</li>
- </ul>
- </div>
- <div class="col-lg-6">
- <img src="{{ url('images/citizen.svg') }}" alt="customer perspective"
style="float: right; margin: 5px 5px 5px 5px;" width="100%">
- </div>
+ balance. The wallet can contain different
+ currencies, and may be shared across
+ devices. Customers can make backups of the wallet to
+ secure its contents against hardware failures.")
+ }}</li>
+ </ul>
+ </div>
-</div> <!-- /container -->
+ <div class="col-lg-6">
+ <img src="{{ url('images/citizen.svg') }}"
+ alt="customer perspective"
+ style="float: right; margin: 5px 5px 5px 5px;" width="100%">
+ </div>
+
+</div>
+<!-- /container -->
{% endblock body_content %}
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index a44f159..b35cf37 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -27,7 +27,8 @@
</div>
</div>
<div class="container text-center">
- <p>© <a href="https://gnunet.org/ev";>GNUnet e.V.</a> {{_("and") }}
Inria 2015, 2016, 2017</p>
+ <p>© <a href="https://gnunet.org/ev";>GNUnet e.V.</a> {{_("and") }}
+ <a href="http://inria.fr/";>Inria</a> 2015, 2016, 2017</p>
<p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free
Software</a> only.") }}</p>
</div>
</footer>
diff --git a/developers.html.j2 b/developers.html.j2
index e3725df..56e3878 100644
--- a/developers.html.j2
+++ b/developers.html.j2
@@ -13,20 +13,18 @@
<p>
{% trans %}
- Taler is free software implementing an open
- protocol. Anybody is welcome to inspect our code
- and integrate our reference implementation into
- their applications. Different components of Taler
- are being made available under different
- licenses. The Affero GPLv3+ is used for the
+ GNU Taler is free software implementing an open
+ protocol. Anybody is welcome to integrate our reference
+ implementation into their applications. Different
+ components of Taler are being made available under
+ different licenses. The Affero GPLv3+ is used for the
exchange, the LGPLv3+ is used for reference code
- demonstrating integration with merchant platforms,
- and licenses like Apache/Mozilla/GPLv3+ are used
- for wallets and related customer-facing software.
- We are open for constructive suggestions for
- maximizing the adoption of this libre payment
- platform.
- {% endtrans %}
+ demonstrating integration with merchant platforms, and
+ licenses like GPLv3+ are used for
+ wallets and related customer-facing software. We are
+ open for constructive suggestions for maximizing the
+ adoption of this payment platform.
+ {% endtrans %}
</p>
</div>
@@ -46,7 +44,7 @@
structure data, making it easy to integrate Taler
with existing Web applications. Taler's protocol
is documented in
- detail <a href="https://api.taler.net/";>here</a>.
+ detail at <a href="https://api.taler.net/";>api.taler.net</a>.
{% endtrans %}
</p>
</div>
@@ -62,13 +60,14 @@
<p>
{% trans %}
Taler is currently primarily developed by a
- research team at Inria and GNUnet e.V. However,
+ research team at <a href="http://www.inria.fr/";>Inria</a> and
+ <a href="https://gnunet.org/";>GNUnet</a>. However,
contributions from anyone are welcome. Our Git
repositories can be cloned using the Git and HTTP
access methods against <tt>git.taler.net</tt> with
the name of the respective repository. A list of
- public repositories can be found in
- our <a href='https://git.taler.net/'>GitWeb</a>.
+ repositories can be found in
+ our <a href="https://git.taler.net/";>GitWeb</a>.
{% endtrans %}
</p>
</div>
@@ -77,54 +76,64 @@
<p>
{% trans %}
- In addition to this website,
- the <a href="https://git.taler.net/";>documented
- code</a> and
+ In addition to this website, the <a
+ href="https://git.taler.net/";>documented code</a> and
the <a href="https://api.taler.net/";>API
- documentation</a>, we are in the process of
- preparing a comprehensive design document which
- will be published here soon.
+ documentation</a>. Technical papers can be found in
+ our <a href="bibliography.html">bibliography</a>.
{% endtrans %}
</p>
</div>
<div class="col-lg-4">
<h2>{{ _("Discussion") }}</h2>
- <p>{{ _("We have a mailing list for developer discussions.
- You can subscribe to it or read the list archive at
- <a
href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>.")
}}</p>
+ <p>
+ {% trans %}
+ We have a mailing list for developer discussions.
+ You can subscribe to or read the list archive at
+ <a
href="http://lists.gnu.org/mailman/listinfo/taler";>http://lists.gnu.org/mailman/listinfo/taler</a>.
+ {% endtrans %}
+ </p>
</div>
</div>
<div class="row">
<div class="col-lg-4">
<h2>{{ _("Regression Testing") }}</h2>
- <p>{{ _("We have
- <a href='https://buildbot.net/'>Buildbot</a>
- automation tests to detect regressions and check
- for portability at
- <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.
- ") }}</p>
+ <p>
+ {% trans %}
+ We have <a href="https://buildbot.net/";>Buildbot</a>
+ automation tests to detect regressions and check for
+ portability at <a
+ href="https://buildbot.taler.net/";>buildbot.taler.net</a>.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-4" note="not yet operational">
<h2>{{ _("Code Coverage Analysis") }}</h2>
- <p>{{ _("We use
- <a href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>
+ <p>
+ {% trans %}
+ We use
+ <a href="http://ltp.sourceforge.net/coverage/lcov.php";>LCOV</a>
to analyze the code coverage of our tests, the
results are available
- at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.
- ") }}</p>
+ at <a href="https://lcov.taler.net/";>lcov.taler.net</a>.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-4">
<h2>{{ _("Performance Analysis") }}</h2>
- <p>{{ _("We
- use <a href='https://gnunet.org/gauger'>Gauger</a>
+ <p>
+ {% trans %}
+ We
+ use <a href="https://gnunet.org/gauger";>Gauger</a>
for performance regression analysis of the exchange
backend
- at <a href='https://gauger.taler.net/'>gauger.taler.net</a>.
- ") }}</p>
+ at <a href="https://gauger.taler.net/";>gauger.taler.net</a>.
+ {% endtrans %}
+ </p>
</div>
</div>
</div>
@@ -135,24 +144,31 @@
<div class="col-lg-12">
<h2 id="overview">{{ _("Taler system overview") }}</h2>
- <p>{{ _("The Taler system consists of protocols executed among
- a number of actors with the help
- of <a href='https://www.fsf.org/'>Free Software</a>
- as illustrated in the illustration on the right.
- Typical transactions involve the following steps: ")
- }}</p>
+ <p>
+ {% trans %}
+ The Taler system consists of protocols executed among
+ a number of actors as illustrated in the illustration on the
right.
+ Typical transactions involve the following steps:
+ {% endtrans %}
+ </p>
<img src="{{ url('images/system.svg') }}" alt="system overview"
style="float: right; margin: 50px 5px 5px 5px;" width="50%">
<ol>
- <li>{{ _("A customer instructs his <b>bank</b> to
+ <li>
+ {% trans %}
+ A customer instructs his <b>bank</b> to
transfer funds from his account to the Taler
exchange (top left). In the subject of the
transaction, he includes an authentication
token from his electronic <b>wallet</b>. In
Taler terminology, the customer creates a
- reserve at the exchange. ") }}</li>
+ reserve at the exchange.
+ {% endtrans %}
+ </li>
- <li>{{ _("Once the exchange has received the wire
+ <li>
+ {% trans %}
+ Once the exchange has received the wire
transfer, it allows the customer's electronic
wallet to <b>withdraw</b> electronic coins.
The electronic coins are digital
@@ -164,10 +180,13 @@
purchased what at which merchant. The use of
Taler does not change the currency or the total
value of the funds (except for fees which the
- exchange may charge for the service). ")
- }}</li>
+ exchange may charge for the service).
+ {% endtrans %}
+ </li>
- <li>{{ _("Once the customer has the digital coins in his
+ <li>
+ {% trans %}
+ Once the customer has the digital coins in his
wallet, the wallet can be used to <b>spend</b>
the coins with merchant portals that support
the Taler payment system and accept the
@@ -183,10 +202,14 @@
merchant to learn the identity of the
customer. Naturally, the customer can spend any
fraction of his digital coins (the system takes
- care of customers getting change). ") }}</li>
+ care of customers getting change).
+ {% endtrans %}
+ </li>
- <li>{{ _("Merchants receiving digital
- coins <b>deposit</b> the respective receipts
+ <li>
+ {% trans %}
+ Merchants receiving digital
+ coins <b>deposit</b> the respective claims
that resulted from the contract signing with
the customer at the exchange to redeem the
coins. The deposit step does not reveal the
@@ -202,9 +225,13 @@
the customer. Thus, the exchange's database
allows the state to enforce that merchants pay
applicable taxes (and do not engage in illegal
- contracts). ") }}</li>
+ contracts).
+ {% endtrans %}
+ </li>
- <li>{{ _("Finally, the exchange transfers funds
+ <li>
+ {% trans %}
+ Finally, the exchange transfers funds
corresponding to the digital coins redeemed by
the merchants to the merchant's <b>bank</b>
account. The exchange may combine multiple
@@ -212,9 +239,13 @@
transfer. The merchant can query the exchange
about the relationship between the bank
transfers and the individual claims that were
- deposited. ") }}</li>
+ deposited.
+ {% endtrans %}
+ </li>
- <li>{{ _("Most importantly, the exchange keeps
+ <li>
+ {% trans %}
+ Most importantly, the exchange keeps
cryptographic proofs that allow it to
demonstrate that it is operating correctly to
third parties. The system requires an
@@ -223,9 +254,13 @@
to frequently verify the exchange's databases
and check that its bank balance matches the
total value of the remaining coins in
- circulation. ") }}</li>
+ circulation.
+ {% endtrans %}
+ </li>
- <li>{{ _("Without the auditor, the exchange operators
+ <li>
+ {% trans %}
+ Without the auditor, the exchange operators
could embezzle funds they are holding in
reserve. Customers and merchants cannot cheat
each other or the exchange. If any party's
@@ -233,7 +268,9 @@
is limited to the respective party and
proportional to the funds they have in
circulation during the period of the
- compromise. ") }}</li>
+ compromise.
+ {% endtrans %}
+ </li>
</ol>
<p></p>
</div>
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 4165d41..6167622 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1,10 +1,9 @@
/*!
- * Bootstrap v3.3.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
-
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
html {
font-family: sans-serif;
-webkit-text-size-adjust: 100%;
@@ -239,9 +238,6 @@ th {
h3 {
page-break-after: avoid;
}
- select {
- background: #fff !important;
- }
.navbar {
display: none;
}
@@ -268,7 +264,7 @@ th {
font-family: 'Glyphicons Halflings';
src: url('../fonts/glyphicons-halflings-regular.eot');
- src: url('../fonts/glyphicons-halflings-regular.eot?#iefix')
format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff')
format('woff'), url('../fonts/glyphicons-halflings-regular.ttf')
format('truetype'),
url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular')
format('svg');
+ src: url('../fonts/glyphicons-halflings-regular.eot?#iefix')
format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2')
format('woff2'), url('../fonts/glyphicons-halflings-regular.woff')
format('woff'), url('../fonts/glyphicons-halflings-regular.ttf')
format('truetype'),
url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular')
format('svg');
}
.glyphicon {
position: relative;
@@ -283,10 +279,10 @@ th {
-moz-osx-font-smoothing: grayscale;
}
.glyphicon-asterisk:before {
- content: "\2a";
+ content: "\002a";
}
.glyphicon-plus:before {
- content: "\2b";
+ content: "\002b";
}
.glyphicon-euro:before,
.glyphicon-eur:before {
@@ -883,6 +879,192 @@ th {
.glyphicon-tree-deciduous:before {
content: "\e200";
}
+.glyphicon-cd:before {
+ content: "\e201";
+}
+.glyphicon-save-file:before {
+ content: "\e202";
+}
+.glyphicon-open-file:before {
+ content: "\e203";
+}
+.glyphicon-level-up:before {
+ content: "\e204";
+}
+.glyphicon-copy:before {
+ content: "\e205";
+}
+.glyphicon-paste:before {
+ content: "\e206";
+}
+.glyphicon-alert:before {
+ content: "\e209";
+}
+.glyphicon-equalizer:before {
+ content: "\e210";
+}
+.glyphicon-king:before {
+ content: "\e211";
+}
+.glyphicon-queen:before {
+ content: "\e212";
+}
+.glyphicon-pawn:before {
+ content: "\e213";
+}
+.glyphicon-bishop:before {
+ content: "\e214";
+}
+.glyphicon-knight:before {
+ content: "\e215";
+}
+.glyphicon-baby-formula:before {
+ content: "\e216";
+}
+.glyphicon-tent:before {
+ content: "\26fa";
+}
+.glyphicon-blackboard:before {
+ content: "\e218";
+}
+.glyphicon-bed:before {
+ content: "\e219";
+}
+.glyphicon-apple:before {
+ content: "\f8ff";
+}
+.glyphicon-erase:before {
+ content: "\e221";
+}
+.glyphicon-hourglass:before {
+ content: "\231b";
+}
+.glyphicon-lamp:before {
+ content: "\e223";
+}
+.glyphicon-duplicate:before {
+ content: "\e224";
+}
+.glyphicon-piggy-bank:before {
+ content: "\e225";
+}
+.glyphicon-scissors:before {
+ content: "\e226";
+}
+.glyphicon-bitcoin:before {
+ content: "\e227";
+}
+.glyphicon-btc:before {
+ content: "\e227";
+}
+.glyphicon-xbt:before {
+ content: "\e227";
+}
+.glyphicon-yen:before {
+ content: "\00a5";
+}
+.glyphicon-jpy:before {
+ content: "\00a5";
+}
+.glyphicon-ruble:before {
+ content: "\20bd";
+}
+.glyphicon-rub:before {
+ content: "\20bd";
+}
+.glyphicon-scale:before {
+ content: "\e230";
+}
+.glyphicon-ice-lolly:before {
+ content: "\e231";
+}
+.glyphicon-ice-lolly-tasted:before {
+ content: "\e232";
+}
+.glyphicon-education:before {
+ content: "\e233";
+}
+.glyphicon-option-horizontal:before {
+ content: "\e234";
+}
+.glyphicon-option-vertical:before {
+ content: "\e235";
+}
+.glyphicon-menu-hamburger:before {
+ content: "\e236";
+}
+.glyphicon-modal-window:before {
+ content: "\e237";
+}
+.glyphicon-oil:before {
+ content: "\e238";
+}
+.glyphicon-grain:before {
+ content: "\e239";
+}
+.glyphicon-sunglasses:before {
+ content: "\e240";
+}
+.glyphicon-text-size:before {
+ content: "\e241";
+}
+.glyphicon-text-color:before {
+ content: "\e242";
+}
+.glyphicon-text-background:before {
+ content: "\e243";
+}
+.glyphicon-object-align-top:before {
+ content: "\e244";
+}
+.glyphicon-object-align-bottom:before {
+ content: "\e245";
+}
+.glyphicon-object-align-horizontal:before {
+ content: "\e246";
+}
+.glyphicon-object-align-left:before {
+ content: "\e247";
+}
+.glyphicon-object-align-vertical:before {
+ content: "\e248";
+}
+.glyphicon-object-align-right:before {
+ content: "\e249";
+}
+.glyphicon-triangle-right:before {
+ content: "\e250";
+}
+.glyphicon-triangle-left:before {
+ content: "\e251";
+}
+.glyphicon-triangle-bottom:before {
+ content: "\e252";
+}
+.glyphicon-triangle-top:before {
+ content: "\e253";
+}
+.glyphicon-console:before {
+ content: "\e254";
+}
+.glyphicon-superscript:before {
+ content: "\e255";
+}
+.glyphicon-subscript:before {
+ content: "\e256";
+}
+.glyphicon-menu-left:before {
+ content: "\e257";
+}
+.glyphicon-menu-right:before {
+ content: "\e258";
+}
+.glyphicon-menu-down:before {
+ content: "\e259";
+}
+.glyphicon-menu-up:before {
+ content: "\e260";
+}
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -915,16 +1097,15 @@ textarea {
line-height: inherit;
}
a {
- color: #428bca;
+ color: #337ab7;
text-decoration: none;
}
a:hover,
a:focus {
- color: #2a6496;
+ color: #23527c;
text-decoration: underline;
}
a:focus {
- outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -987,6 +1168,9 @@ hr {
overflow: visible;
clip: auto;
}
+[role="button"] {
+ cursor: pointer;
+}
h1,
h2,
h3,
@@ -1153,64 +1337,74 @@ mark,
color: #777;
}
.text-primary {
- color: #428bca;
+ color: #337ab7;
}
-a.text-primary:hover {
- color: #3071a9;
+a.text-primary:hover,
+a.text-primary:focus {
+ color: #286090;
}
.text-success {
color: #3c763d;
}
-a.text-success:hover {
+a.text-success:hover,
+a.text-success:focus {
color: #2b542c;
}
.text-info {
color: #31708f;
}
-a.text-info:hover {
+a.text-info:hover,
+a.text-info:focus {
color: #245269;
}
.text-warning {
color: #8a6d3b;
}
-a.text-warning:hover {
+a.text-warning:hover,
+a.text-warning:focus {
color: #66512c;
}
.text-danger {
color: #a94442;
}
-a.text-danger:hover {
+a.text-danger:hover,
+a.text-danger:focus {
color: #843534;
}
.bg-primary {
color: #fff;
- background-color: #428bca;
+ background-color: #337ab7;
}
-a.bg-primary:hover {
- background-color: #3071a9;
+a.bg-primary:hover,
+a.bg-primary:focus {
+ background-color: #286090;
}
.bg-success {
background-color: #dff0d8;
}
-a.bg-success:hover {
+a.bg-success:hover,
+a.bg-success:focus {
background-color: #c1e2b3;
}
.bg-info {
background-color: #d9edf7;
}
-a.bg-info:hover {
+a.bg-info:hover,
+a.bg-info:focus {
background-color: #afd9ee;
}
.bg-warning {
background-color: #fcf8e3;
}
-a.bg-warning:hover {
+a.bg-warning:hover,
+a.bg-warning:focus {
background-color: #f7ecb5;
}
.bg-danger {
background-color: #f2dede;
}
-a.bg-danger:hover {
+a.bg-danger:hover,
+a.bg-danger:focus {
background-color: #e4b9b9;
}
.page-header {
@@ -2123,7 +2317,7 @@ th {
.table-bordered > thead > tr > td {
border-bottom-width: 2px;
}
-.table-striped > tbody > tr:nth-child(odd) {
+.table-striped > tbody > tr:nth-of-type(odd) {
background-color: #f9f9f9;
}
.table-hover > tbody > tr:hover {
@@ -2342,7 +2536,6 @@ select[size] {
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
- outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -2387,69 +2580,53 @@ output {
.form-control::-webkit-input-placeholder {
color: #999;
}
+.form-control::-ms-expand {
+ background-color: transparent;
+ border: 0;
+}
.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
- cursor: not-allowed;
background-color: #eee;
opacity: 1;
}
+.form-control[disabled],
+fieldset[disabled] .form-control {
+ cursor: not-allowed;
+}
textarea.form-control {
height: auto;
}
input[type="search"] {
-webkit-appearance: none;
}
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
- line-height: 34px;
- line-height: 1.42857143 \0;
-}
-input[type="date"].input-sm,
-input[type="time"].input-sm,
-input[type="datetime-local"].input-sm,
-input[type="month"].input-sm {
- line-height: 30px;
- line-height: 1.5 \0;
-}
-input[type="date"].input-lg,
-input[type="time"].input-lg,
-input[type="datetime-local"].input-lg,
-input[type="month"].input-lg {
- line-height: 46px;
- line-height: 1.33 \0;
-}
-_:-ms-fullscreen,
-:root input[type="date"],
-_:-ms-fullscreen,
-:root input[type="time"],
-_:-ms-fullscreen,
-:root input[type="datetime-local"],
-_:-ms-fullscreen,
-:root input[type="month"] {
- line-height: 1.42857143;
-}
-_:-ms-fullscreen.input-sm,
-:root input[type="date"].input-sm,
-_:-ms-fullscreen.input-sm,
-:root input[type="time"].input-sm,
-_:-ms-fullscreen.input-sm,
-:root input[type="datetime-local"].input-sm,
-_:-ms-fullscreen.input-sm,
-:root input[type="month"].input-sm {
- line-height: 1.5;
-}
-_:-ms-fullscreen.input-lg,
-:root input[type="date"].input-lg,
-_:-ms-fullscreen.input-lg,
-:root input[type="time"].input-lg,
-_:-ms-fullscreen.input-lg,
-:root input[type="datetime-local"].input-lg,
-_:-ms-fullscreen.input-lg,
-:root input[type="month"].input-lg {
- line-height: 1.33;
address@hidden screen and (-webkit-min-device-pixel-ratio: 0) {
+ input[type="date"].form-control,
+ input[type="time"].form-control,
+ input[type="datetime-local"].form-control,
+ input[type="month"].form-control {
+ line-height: 34px;
+ }
+ input[type="date"].input-sm,
+ input[type="time"].input-sm,
+ input[type="datetime-local"].input-sm,
+ input[type="month"].input-sm,
+ .input-group-sm input[type="date"],
+ .input-group-sm input[type="time"],
+ .input-group-sm input[type="datetime-local"],
+ .input-group-sm input[type="month"] {
+ line-height: 30px;
+ }
+ input[type="date"].input-lg,
+ input[type="time"].input-lg,
+ input[type="datetime-local"].input-lg,
+ input[type="month"].input-lg,
+ .input-group-lg input[type="date"],
+ .input-group-lg input[type="time"],
+ .input-group-lg input[type="datetime-local"],
+ .input-group-lg input[type="month"] {
+ line-height: 46px;
+ }
}
.form-group {
margin-bottom: 15px;
@@ -2483,6 +2660,7 @@ _:-ms-fullscreen.input-lg,
}
.radio-inline,
.checkbox-inline {
+ position: relative;
display: inline-block;
padding-left: 20px;
margin-bottom: 0;
@@ -2516,6 +2694,7 @@ fieldset[disabled] .checkbox label {
cursor: not-allowed;
}
.form-control-static {
+ min-height: 34px;
padding-top: 7px;
padding-bottom: 7px;
margin-bottom: 0;
@@ -2525,44 +2704,80 @@ fieldset[disabled] .checkbox label {
padding-right: 0;
padding-left: 0;
}
-.input-sm,
-.form-group-sm .form-control {
+.input-sm {
height: 30px;
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
-select.input-sm,
-select.form-group-sm .form-control {
+select.input-sm {
height: 30px;
line-height: 30px;
}
textarea.input-sm,
-textarea.form-group-sm .form-control,
-select[multiple].input-sm,
-select[multiple].form-group-sm .form-control {
+select[multiple].input-sm {
height: auto;
}
-.input-lg,
-.form-group-lg .form-control {
+.form-group-sm .form-control {
+ height: 30px;
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
+.form-group-sm select.form-control {
+ height: 30px;
+ line-height: 30px;
+}
+.form-group-sm textarea.form-control,
+.form-group-sm select[multiple].form-control {
+ height: auto;
+}
+.form-group-sm .form-control-static {
+ height: 30px;
+ min-height: 32px;
+ padding: 6px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+}
+.input-lg {
height: 46px;
padding: 10px 16px;
font-size: 18px;
- line-height: 1.33;
+ line-height: 1.3333333;
border-radius: 6px;
}
-select.input-lg,
-select.form-group-lg .form-control {
+select.input-lg {
height: 46px;
line-height: 46px;
}
textarea.input-lg,
-textarea.form-group-lg .form-control,
-select[multiple].input-lg,
-select[multiple].form-group-lg .form-control {
+select[multiple].input-lg {
height: auto;
}
+.form-group-lg .form-control {
+ height: 46px;
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px;
+}
+.form-group-lg select.form-control {
+ height: 46px;
+ line-height: 46px;
+}
+.form-group-lg textarea.form-control,
+.form-group-lg select[multiple].form-control {
+ height: auto;
+}
+.form-group-lg .form-control-static {
+ height: 46px;
+ min-height: 38px;
+ padding: 11px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+}
.has-feedback {
position: relative;
}
@@ -2581,12 +2796,16 @@ select[multiple].form-group-lg .form-control {
text-align: center;
pointer-events: none;
}
-.input-lg + .form-control-feedback {
+.input-lg + .form-control-feedback,
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
width: 46px;
height: 46px;
line-height: 46px;
}
-.input-sm + .form-control-feedback {
+.input-sm + .form-control-feedback,
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
width: 30px;
height: 30px;
line-height: 30px;
@@ -2771,12 +2990,14 @@ select[multiple].form-group-lg .form-control {
}
@media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label {
- padding-top: 14.3px;
+ padding-top: 11px;
+ font-size: 18px;
}
}
@media (min-width: 768px) {
.form-horizontal .form-group-sm .control-label {
padding-top: 6px;
+ font-size: 12px;
}
}
.btn {
@@ -2806,7 +3027,6 @@ select[multiple].form-group-lg .form-control {
.btn.focus,
.btn:active.focus,
.btn.active.focus {
- outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -2826,21 +3046,32 @@ select[multiple].form-group-lg .form-control {
.btn.disabled,
.btn[disabled],
fieldset[disabled] .btn {
- pointer-events: none;
cursor: not-allowed;
filter: alpha(opacity=65);
-webkit-box-shadow: none;
box-shadow: none;
opacity: .65;
}
+a.btn.disabled,
+fieldset[disabled] a.btn {
+ pointer-events: none;
+}
.btn-default {
color: #333;
background-color: #fff;
border-color: #ccc;
}
-.btn-default:hover,
.btn-default:focus,
-.btn-default.focus,
+.btn-default.focus {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #8c8c8c;
+}
+.btn-default:hover {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #adadad;
+}
.btn-default:active,
.btn-default.active,
.open > .dropdown-toggle.btn-default {
@@ -2848,14 +3079,24 @@ fieldset[disabled] .btn {
background-color: #e6e6e6;
border-color: #adadad;
}
+.btn-default:active:hover,
+.btn-default.active:hover,
+.open > .dropdown-toggle.btn-default:hover,
+.btn-default:active:focus,
+.btn-default.active:focus,
+.open > .dropdown-toggle.btn-default:focus,
+.btn-default:active.focus,
+.btn-default.active.focus,
+.open > .dropdown-toggle.btn-default.focus {
+ color: #333;
+ background-color: #d4d4d4;
+ border-color: #8c8c8c;
+}
.btn-default:active,
.btn-default.active,
.open > .dropdown-toggle.btn-default {
background-image: none;
}
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
.btn-default.disabled:hover,
.btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover,
@@ -2864,13 +3105,7 @@ fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus,
.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
+fieldset[disabled] .btn-default.focus {
background-color: #fff;
border-color: #ccc;
}
@@ -2880,27 +3115,45 @@ fieldset[disabled] .btn-default.active {
}
.btn-primary {
color: #fff;
- background-color: #428bca;
- border-color: #357ebd;
+ background-color: #337ab7;
+ border-color: #2e6da4;
}
-.btn-primary:hover,
.btn-primary:focus,
-.btn-primary.focus,
+.btn-primary.focus {
+ color: #fff;
+ background-color: #286090;
+ border-color: #122b40;
+}
+.btn-primary:hover {
+ color: #fff;
+ background-color: #286090;
+ border-color: #204d74;
+}
.btn-primary:active,
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
color: #fff;
- background-color: #3071a9;
- border-color: #285e8e;
+ background-color: #286090;
+ border-color: #204d74;
+}
+.btn-primary:active:hover,
+.btn-primary.active:hover,
+.open > .dropdown-toggle.btn-primary:hover,
+.btn-primary:active:focus,
+.btn-primary.active:focus,
+.open > .dropdown-toggle.btn-primary:focus,
+.btn-primary:active.focus,
+.btn-primary.active.focus,
+.open > .dropdown-toggle.btn-primary.focus {
+ color: #fff;
+ background-color: #204d74;
+ border-color: #122b40;
}
.btn-primary:active,
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
background-image: none;
}
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
@@ -2909,18 +3162,12 @@ fieldset[disabled] .btn-primary:hover,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
- background-color: #428bca;
- border-color: #357ebd;
+fieldset[disabled] .btn-primary.focus {
+ background-color: #337ab7;
+ border-color: #2e6da4;
}
.btn-primary .badge {
- color: #428bca;
+ color: #337ab7;
background-color: #fff;
}
.btn-success {
@@ -2928,9 +3175,17 @@ fieldset[disabled] .btn-primary.active {
background-color: #5cb85c;
border-color: #4cae4c;
}
-.btn-success:hover,
.btn-success:focus,
-.btn-success.focus,
+.btn-success.focus {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #255625;
+}
+.btn-success:hover {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #398439;
+}
.btn-success:active,
.btn-success.active,
.open > .dropdown-toggle.btn-success {
@@ -2938,14 +3193,24 @@ fieldset[disabled] .btn-primary.active {
background-color: #449d44;
border-color: #398439;
}
+.btn-success:active:hover,
+.btn-success.active:hover,
+.open > .dropdown-toggle.btn-success:hover,
+.btn-success:active:focus,
+.btn-success.active:focus,
+.open > .dropdown-toggle.btn-success:focus,
+.btn-success:active.focus,
+.btn-success.active.focus,
+.open > .dropdown-toggle.btn-success.focus {
+ color: #fff;
+ background-color: #398439;
+ border-color: #255625;
+}
.btn-success:active,
.btn-success.active,
.open > .dropdown-toggle.btn-success {
background-image: none;
}
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
@@ -2954,13 +3219,7 @@ fieldset[disabled] .btn-success:hover,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus,
.btn-success[disabled].focus,
-fieldset[disabled] .btn-success.focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
+fieldset[disabled] .btn-success.focus {
background-color: #5cb85c;
border-color: #4cae4c;
}
@@ -2973,9 +3232,17 @@ fieldset[disabled] .btn-success.active {
background-color: #5bc0de;
border-color: #46b8da;
}
-.btn-info:hover,
.btn-info:focus,
-.btn-info.focus,
+.btn-info.focus {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #1b6d85;
+}
+.btn-info:hover {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #269abc;
+}
.btn-info:active,
.btn-info.active,
.open > .dropdown-toggle.btn-info {
@@ -2983,14 +3250,24 @@ fieldset[disabled] .btn-success.active {
background-color: #31b0d5;
border-color: #269abc;
}
+.btn-info:active:hover,
+.btn-info.active:hover,
+.open > .dropdown-toggle.btn-info:hover,
+.btn-info:active:focus,
+.btn-info.active:focus,
+.open > .dropdown-toggle.btn-info:focus,
+.btn-info:active.focus,
+.btn-info.active.focus,
+.open > .dropdown-toggle.btn-info.focus {
+ color: #fff;
+ background-color: #269abc;
+ border-color: #1b6d85;
+}
.btn-info:active,
.btn-info.active,
.open > .dropdown-toggle.btn-info {
background-image: none;
}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
@@ -2999,13 +3276,7 @@ fieldset[disabled] .btn-info:hover,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
-fieldset[disabled] .btn-info.focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
+fieldset[disabled] .btn-info.focus {
background-color: #5bc0de;
border-color: #46b8da;
}
@@ -3018,9 +3289,17 @@ fieldset[disabled] .btn-info.active {
background-color: #f0ad4e;
border-color: #eea236;
}
-.btn-warning:hover,
.btn-warning:focus,
-.btn-warning.focus,
+.btn-warning.focus {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #985f0d;
+}
+.btn-warning:hover {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #d58512;
+}
.btn-warning:active,
.btn-warning.active,
.open > .dropdown-toggle.btn-warning {
@@ -3028,14 +3307,24 @@ fieldset[disabled] .btn-info.active {
background-color: #ec971f;
border-color: #d58512;
}
+.btn-warning:active:hover,
+.btn-warning.active:hover,
+.open > .dropdown-toggle.btn-warning:hover,
+.btn-warning:active:focus,
+.btn-warning.active:focus,
+.open > .dropdown-toggle.btn-warning:focus,
+.btn-warning:active.focus,
+.btn-warning.active.focus,
+.open > .dropdown-toggle.btn-warning.focus {
+ color: #fff;
+ background-color: #d58512;
+ border-color: #985f0d;
+}
.btn-warning:active,
.btn-warning.active,
.open > .dropdown-toggle.btn-warning {
background-image: none;
}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
@@ -3044,13 +3333,7 @@ fieldset[disabled] .btn-warning:hover,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
-fieldset[disabled] .btn-warning.focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
+fieldset[disabled] .btn-warning.focus {
background-color: #f0ad4e;
border-color: #eea236;
}
@@ -3063,9 +3346,17 @@ fieldset[disabled] .btn-warning.active {
background-color: #d9534f;
border-color: #d43f3a;
}
-.btn-danger:hover,
.btn-danger:focus,
-.btn-danger.focus,
+.btn-danger.focus {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #761c19;
+}
+.btn-danger:hover {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #ac2925;
+}
.btn-danger:active,
.btn-danger.active,
.open > .dropdown-toggle.btn-danger {
@@ -3073,14 +3364,24 @@ fieldset[disabled] .btn-warning.active {
background-color: #c9302c;
border-color: #ac2925;
}
+.btn-danger:active:hover,
+.btn-danger.active:hover,
+.open > .dropdown-toggle.btn-danger:hover,
+.btn-danger:active:focus,
+.btn-danger.active:focus,
+.open > .dropdown-toggle.btn-danger:focus,
+.btn-danger:active.focus,
+.btn-danger.active.focus,
+.open > .dropdown-toggle.btn-danger.focus {
+ color: #fff;
+ background-color: #ac2925;
+ border-color: #761c19;
+}
.btn-danger:active,
.btn-danger.active,
.open > .dropdown-toggle.btn-danger {
background-image: none;
}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
@@ -3089,13 +3390,7 @@ fieldset[disabled] .btn-danger:hover,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus,
.btn-danger[disabled].focus,
-fieldset[disabled] .btn-danger.focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
+fieldset[disabled] .btn-danger.focus {
background-color: #d9534f;
border-color: #d43f3a;
}
@@ -3105,7 +3400,7 @@ fieldset[disabled] .btn-danger.active {
}
.btn-link {
font-weight: normal;
- color: #428bca;
+ color: #337ab7;
border-radius: 0;
}
.btn-link,
@@ -3125,7 +3420,7 @@ fieldset[disabled] .btn-link {
}
.btn-link:hover,
.btn-link:focus {
- color: #2a6496;
+ color: #23527c;
text-decoration: underline;
background-color: transparent;
}
@@ -3140,7 +3435,7 @@ fieldset[disabled] .btn-link:focus {
.btn-group-lg > .btn {
padding: 10px 16px;
font-size: 18px;
- line-height: 1.33;
+ line-height: 1.3333333;
border-radius: 6px;
}
.btn-sm,
@@ -3180,11 +3475,9 @@ input[type="button"].btn-block {
}
.collapse {
display: none;
- visibility: hidden;
}
.collapse.in {
display: block;
- visibility: visible;
}
tr.collapse.in {
display: table-row;
@@ -3212,10 +3505,12 @@ tbody.collapse.in {
height: 0;
margin-left: 2px;
vertical-align: middle;
- border-top: 4px solid;
+ border-top: 4px dashed;
+ border-top: 4px solid \9;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
}
+.dropup,
.dropdown {
position: relative;
}
@@ -3274,7 +3569,7 @@ tbody.collapse.in {
.dropdown-menu > .active > a:focus {
color: #fff;
text-decoration: none;
- background-color: #428bca;
+ background-color: #337ab7;
outline: 0;
}
.dropdown-menu > .disabled > a,
@@ -3328,13 +3623,14 @@ tbody.collapse.in {
.navbar-fixed-bottom .dropdown .caret {
content: "";
border-top: 0;
- border-bottom: 4px solid;
+ border-bottom: 4px dashed;
+ border-bottom: 4px solid \9;
}
.dropup .dropdown-menu,
.navbar-fixed-bottom .dropdown .dropdown-menu {
top: auto;
bottom: 100%;
- margin-bottom: 1px;
+ margin-bottom: 2px;
}
@media (min-width: 768px) {
.navbar-right .dropdown-menu {
@@ -3367,10 +3663,6 @@ tbody.collapse.in {
.btn-group-vertical > .btn.active {
z-index: 2;
}
-.btn-group > .btn:focus,
-.btn-group-vertical > .btn:focus {
- outline: 0;
-}
.btn-group .btn + .btn,
.btn-group .btn + .btn-group,
.btn-group .btn-group + .btn,
@@ -3380,6 +3672,7 @@ tbody.collapse.in {
.btn-toolbar {
margin-left: -5px;
}
+.btn-toolbar .btn,
.btn-toolbar .btn-group,
.btn-toolbar .input-group {
float: left;
@@ -3410,12 +3703,12 @@ tbody.collapse.in {
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0;
}
-.btn-group > .btn-group:first-child > .btn:last-child,
-.btn-group > .btn-group:first-child > .dropdown-toggle {
+.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
-.btn-group > .btn-group:last-child > .btn:first-child {
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
@@ -3471,6 +3764,7 @@ tbody.collapse.in {
border-radius: 0;
}
.btn-group-vertical > .btn:first-child:not(:last-child) {
+ border-top-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
@@ -3478,6 +3772,7 @@ tbody.collapse.in {
.btn-group-vertical > .btn:last-child:not(:first-child) {
border-top-left-radius: 0;
border-top-right-radius: 0;
+ border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
@@ -3535,13 +3830,16 @@ tbody.collapse.in {
width: 100%;
margin-bottom: 0;
}
+.input-group .form-control:focus {
+ z-index: 3;
+}
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 46px;
padding: 10px 16px;
font-size: 18px;
- line-height: 1.33;
+ line-height: 1.3333333;
border-radius: 6px;
}
select.input-group-lg > .form-control,
@@ -3670,6 +3968,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn
{
}
.input-group-btn:last-child > .btn,
.input-group-btn:last-child > .btn-group {
+ z-index: 2;
margin-left: -1px;
}
.nav {
@@ -3705,7 +4004,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn
{
.nav .open > a:hover,
.nav .open > a:focus {
background-color: #eee;
- border-color: #428bca;
+ border-color: #337ab7;
}
.nav .nav-divider {
height: 1px;
@@ -3798,7 +4097,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn
{
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
color: #fff;
- background-color: #428bca;
+ background-color: #337ab7;
}
.nav-stacked > li {
float: none;
@@ -3855,11 +4154,9 @@ select[multiple].input-group-sm > .input-group-btn >
.btn {
}
.tab-content > .tab-pane {
display: none;
- visibility: hidden;
}
.tab-content > .active {
display: block;
- visibility: visible;
}
.nav-tabs .dropdown-menu {
margin-top: -1px;
@@ -3906,7 +4203,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn
{
height: auto !important;
padding-bottom: 0;
overflow: visible !important;
- visibility: visible !important;
}
.navbar-collapse.in {
overflow-y: visible;
@@ -4155,6 +4451,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn
{
border-top-right-radius: 0;
}
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+ margin-bottom: 0;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
@@ -4425,7 +4724,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
padding: 6px 12px;
margin-left: -1px;
line-height: 1.42857143;
- color: #428bca;
+ color: #337ab7;
text-decoration: none;
background-color: #fff;
border: 1px solid #ddd;
@@ -4445,7 +4744,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus {
- color: #2a6496;
+ z-index: 2;
+ color: #23527c;
background-color: #eee;
border-color: #ddd;
}
@@ -4455,11 +4755,11 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:hover,
.pagination > .active > a:focus,
.pagination > .active > span:focus {
- z-index: 2;
+ z-index: 3;
color: #fff;
cursor: default;
- background-color: #428bca;
- border-color: #428bca;
+ background-color: #337ab7;
+ border-color: #337ab7;
}
.pagination > .disabled > span,
.pagination > .disabled > span:hover,
@@ -4476,6 +4776,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination-lg > li > span {
padding: 10px 16px;
font-size: 18px;
+ line-height: 1.3333333;
}
.pagination-lg > li:first-child > a,
.pagination-lg > li:first-child > span {
@@ -4491,6 +4792,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination-sm > li > span {
padding: 5px 10px;
font-size: 12px;
+ line-height: 1.5;
}
.pagination-sm > li:first-child > a,
.pagination-sm > li:first-child > span {
@@ -4573,11 +4875,11 @@ a.label:focus {
background-color: #5e5e5e;
}
.label-primary {
- background-color: #428bca;
+ background-color: #337ab7;
}
.label-primary[href]:hover,
.label-primary[href]:focus {
- background-color: #3071a9;
+ background-color: #286090;
}
.label-success {
background-color: #5cb85c;
@@ -4617,7 +4919,7 @@ a.label:focus {
color: #fff;
text-align: center;
white-space: nowrap;
- vertical-align: baseline;
+ vertical-align: middle;
background-color: #777;
border-radius: 10px;
}
@@ -4628,7 +4930,8 @@ a.label:focus {
position: relative;
top: -1px;
}
-.btn-xs .badge {
+.btn-xs .badge,
+.btn-group-xs > .btn .badge {
top: 0;
padding: 1px 5px;
}
@@ -4638,16 +4941,23 @@ a.badge:focus {
text-decoration: none;
cursor: pointer;
}
-a.list-group-item.active > .badge,
+.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
- color: #428bca;
+ color: #337ab7;
background-color: #fff;
}
+.list-group-item > .badge {
+ float: right;
+}
+.list-group-item > .badge + .badge {
+ margin-right: 5px;
+}
.nav-pills > li > a > .badge {
margin-left: 3px;
}
.jumbotron {
- padding: 30px 15px;
+ padding-top: 30px;
+ padding-bottom: 30px;
margin-bottom: 30px;
color: inherit;
background-color: #eee;
@@ -4666,6 +4976,8 @@ a.list-group-item.active > .badge,
}
.container .jumbotron,
.container-fluid .jumbotron {
+ padding-right: 15px;
+ padding-left: 15px;
border-radius: 6px;
}
.jumbotron .container {
@@ -4673,9 +4985,11 @@ a.list-group-item.active > .badge,
}
@media screen and (min-width: 768px) {
.jumbotron {
- padding: 48px 0;
+ padding-top: 48px;
+ padding-bottom: 48px;
}
- .container .jumbotron {
+ .container .jumbotron,
+ .container-fluid .jumbotron {
padding-right: 60px;
padding-left: 60px;
}
@@ -4704,7 +5018,7 @@ a.list-group-item.active > .badge,
a.thumbnail:hover,
a.thumbnail:focus,
a.thumbnail.active {
- border-color: #428bca;
+ border-color: #337ab7;
}
.thumbnail .caption {
padding: 9px;
@@ -4826,7 +5140,7 @@ a.thumbnail.active {
line-height: 20px;
color: #fff;
text-align: center;
- background-color: #428bca;
+ background-color: #337ab7;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-webkit-transition: width .6s ease;
@@ -4885,6 +5199,20 @@ a.thumbnail.active {
.media:first-child {
margin-top: 0;
}
+.media,
+.media-body {
+ overflow: hidden;
+ zoom: 1;
+}
+.media-body {
+ width: 10000px;
+}
+.media-object {
+ display: block;
+}
+.media-object.img-thumbnail {
+ max-width: none;
+}
.media-right,
.media > .pull-right {
padding-left: 10px;
@@ -4934,24 +5262,26 @@ a.thumbnail.active {
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
}
-.list-group-item > .badge {
- float: right;
-}
-.list-group-item > .badge + .badge {
- margin-right: 5px;
-}
-a.list-group-item {
+a.list-group-item,
+button.list-group-item {
color: #555;
}
-a.list-group-item .list-group-item-heading {
+a.list-group-item .list-group-item-heading,
+button.list-group-item .list-group-item-heading {
color: #333;
}
a.list-group-item:hover,
-a.list-group-item:focus {
+button.list-group-item:hover,
+a.list-group-item:focus,
+button.list-group-item:focus {
color: #555;
text-decoration: none;
background-color: #f5f5f5;
}
+button.list-group-item {
+ width: 100%;
+ text-align: left;
+}
.list-group-item.disabled,
.list-group-item.disabled:hover,
.list-group-item.disabled:focus {
@@ -4974,8 +5304,8 @@ a.list-group-item:focus {
.list-group-item.active:focus {
z-index: 2;
color: #fff;
- background-color: #428bca;
- border-color: #428bca;
+ background-color: #337ab7;
+ border-color: #337ab7;
}
.list-group-item.active .list-group-item-heading,
.list-group-item.active:hover .list-group-item-heading,
@@ -4991,26 +5321,33 @@ a.list-group-item:focus {
.list-group-item.active .list-group-item-text,
.list-group-item.active:hover .list-group-item-text,
.list-group-item.active:focus .list-group-item-text {
- color: #e1edf7;
+ color: #c7ddef;
}
.list-group-item-success {
color: #3c763d;
background-color: #dff0d8;
}
-a.list-group-item-success {
+a.list-group-item-success,
+button.list-group-item-success {
color: #3c763d;
}
-a.list-group-item-success .list-group-item-heading {
+a.list-group-item-success .list-group-item-heading,
+button.list-group-item-success .list-group-item-heading {
color: inherit;
}
a.list-group-item-success:hover,
-a.list-group-item-success:focus {
+button.list-group-item-success:hover,
+a.list-group-item-success:focus,
+button.list-group-item-success:focus {
color: #3c763d;
background-color: #d0e9c6;
}
a.list-group-item-success.active,
+button.list-group-item-success.active,
a.list-group-item-success.active:hover,
-a.list-group-item-success.active:focus {
+button.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus,
+button.list-group-item-success.active:focus {
color: #fff;
background-color: #3c763d;
border-color: #3c763d;
@@ -5019,20 +5356,27 @@ a.list-group-item-success.active:focus {
color: #31708f;
background-color: #d9edf7;
}
-a.list-group-item-info {
+a.list-group-item-info,
+button.list-group-item-info {
color: #31708f;
}
-a.list-group-item-info .list-group-item-heading {
+a.list-group-item-info .list-group-item-heading,
+button.list-group-item-info .list-group-item-heading {
color: inherit;
}
a.list-group-item-info:hover,
-a.list-group-item-info:focus {
+button.list-group-item-info:hover,
+a.list-group-item-info:focus,
+button.list-group-item-info:focus {
color: #31708f;
background-color: #c4e3f3;
}
a.list-group-item-info.active,
+button.list-group-item-info.active,
a.list-group-item-info.active:hover,
-a.list-group-item-info.active:focus {
+button.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus,
+button.list-group-item-info.active:focus {
color: #fff;
background-color: #31708f;
border-color: #31708f;
@@ -5041,20 +5385,27 @@ a.list-group-item-info.active:focus {
color: #8a6d3b;
background-color: #fcf8e3;
}
-a.list-group-item-warning {
+a.list-group-item-warning,
+button.list-group-item-warning {
color: #8a6d3b;
}
-a.list-group-item-warning .list-group-item-heading {
+a.list-group-item-warning .list-group-item-heading,
+button.list-group-item-warning .list-group-item-heading {
color: inherit;
}
a.list-group-item-warning:hover,
-a.list-group-item-warning:focus {
+button.list-group-item-warning:hover,
+a.list-group-item-warning:focus,
+button.list-group-item-warning:focus {
color: #8a6d3b;
background-color: #faf2cc;
}
a.list-group-item-warning.active,
+button.list-group-item-warning.active,
a.list-group-item-warning.active:hover,
-a.list-group-item-warning.active:focus {
+button.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus,
+button.list-group-item-warning.active:focus {
color: #fff;
background-color: #8a6d3b;
border-color: #8a6d3b;
@@ -5063,20 +5414,27 @@ a.list-group-item-warning.active:focus {
color: #a94442;
background-color: #f2dede;
}
-a.list-group-item-danger {
+a.list-group-item-danger,
+button.list-group-item-danger {
color: #a94442;
}
-a.list-group-item-danger .list-group-item-heading {
+a.list-group-item-danger .list-group-item-heading,
+button.list-group-item-danger .list-group-item-heading {
color: inherit;
}
a.list-group-item-danger:hover,
-a.list-group-item-danger:focus {
+button.list-group-item-danger:hover,
+a.list-group-item-danger:focus,
+button.list-group-item-danger:focus {
color: #a94442;
background-color: #ebcccc;
}
a.list-group-item-danger.active,
+button.list-group-item-danger.active,
a.list-group-item-danger.active:hover,
-a.list-group-item-danger.active:focus {
+button.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus,
+button.list-group-item-danger.active:focus {
color: #fff;
background-color: #a94442;
border-color: #a94442;
@@ -5115,7 +5473,11 @@ a.list-group-item-danger.active:focus {
font-size: 16px;
color: inherit;
}
-.panel-title > a {
+.panel-title > a,
+.panel-title > small,
+.panel-title > .small,
+.panel-title > small > a,
+.panel-title > .small > a {
color: inherit;
}
.panel-footer {
@@ -5146,6 +5508,10 @@ a.list-group-item-danger.active:focus {
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
}
+.panel > .panel-heading + .panel-collapse > .list-group
.list-group-item:first-child {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+}
.panel-heading + .list-group .list-group-item:first-child {
border-top-width: 0;
}
@@ -5335,22 +5701,22 @@ a.list-group-item-danger.active:focus {
border-bottom-color: #ddd;
}
.panel-primary {
- border-color: #428bca;
+ border-color: #337ab7;
}
.panel-primary > .panel-heading {
color: #fff;
- background-color: #428bca;
- border-color: #428bca;
+ background-color: #337ab7;
+ border-color: #337ab7;
}
.panel-primary > .panel-heading + .panel-collapse > .panel-body {
- border-top-color: #428bca;
+ border-top-color: #337ab7;
}
.panel-primary > .panel-heading .badge {
- color: #428bca;
+ color: #337ab7;
background-color: #fff;
}
.panel-primary > .panel-footer + .panel-collapse > .panel-body {
- border-bottom-color: #428bca;
+ border-bottom-color: #337ab7;
}
.panel-success {
border-color: #d6e9c6;
@@ -5444,10 +5810,10 @@ a.list-group-item-danger.active:focus {
height: 100%;
border: 0;
}
-.embed-responsive.embed-responsive-16by9 {
+.embed-responsive-16by9 {
padding-bottom: 56.25%;
}
-.embed-responsive.embed-responsive-4by3 {
+.embed-responsive-4by3 {
padding-bottom: 75%;
}
.well {
@@ -5506,7 +5872,7 @@ button.close {
right: 0;
bottom: 0;
left: 0;
- z-index: 1040;
+ z-index: 1050;
display: none;
overflow: hidden;
-webkit-overflow-scrolling: touch;
@@ -5554,6 +5920,7 @@ button.close {
right: 0;
bottom: 0;
left: 0;
+ z-index: 1040;
background-color: #000;
}
.modal-backdrop.fade {
@@ -5565,7 +5932,6 @@ button.close {
opacity: .5;
}
.modal-header {
- min-height: 16.42857143px;
padding: 15px;
border-bottom: 1px solid #e5e5e5;
}
@@ -5624,11 +5990,25 @@ button.close {
position: absolute;
z-index: 1070;
display: block;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px;
- line-height: 1.4;
- visibility: visible;
+ font-style: normal;
+ font-weight: normal;
+ line-height: 1.42857143;
+ text-align: left;
+ text-align: start;
+ text-decoration: none;
+ text-shadow: none;
+ text-transform: none;
+ letter-spacing: normal;
+ word-break: normal;
+ word-spacing: normal;
+ word-wrap: normal;
+ white-space: normal;
filter: alpha(opacity=0);
opacity: 0;
+
+ line-break: auto;
}
.tooltip.in {
filter: alpha(opacity=90);
@@ -5655,7 +6035,6 @@ button.close {
padding: 3px 8px;
color: #fff;
text-align: center;
- text-decoration: none;
background-color: #000;
border-radius: 4px;
}
@@ -5674,14 +6053,16 @@ button.close {
border-top-color: #000;
}
.tooltip.top-left .tooltip-arrow {
+ right: 5px;
bottom: 0;
- left: 5px;
+ margin-bottom: -5px;
border-width: 5px 5px 0;
border-top-color: #000;
}
.tooltip.top-right .tooltip-arrow {
- right: 5px;
bottom: 0;
+ left: 5px;
+ margin-bottom: -5px;
border-width: 5px 5px 0;
border-top-color: #000;
}
@@ -5708,13 +6089,15 @@ button.close {
}
.tooltip.bottom-left .tooltip-arrow {
top: 0;
- left: 5px;
+ right: 5px;
+ margin-top: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
}
.tooltip.bottom-right .tooltip-arrow {
top: 0;
- right: 5px;
+ left: 5px;
+ margin-top: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
}
@@ -5726,10 +6109,20 @@ button.close {
display: none;
max-width: 276px;
padding: 1px;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
+ font-style: normal;
font-weight: normal;
line-height: 1.42857143;
text-align: left;
+ text-align: start;
+ text-decoration: none;
+ text-shadow: none;
+ text-transform: none;
+ letter-spacing: normal;
+ word-break: normal;
+ word-spacing: normal;
+ word-wrap: normal;
white-space: normal;
background-color: #fff;
-webkit-background-clip: padding-box;
@@ -5739,6 +6132,8 @@ button.close {
border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+
+ line-break: auto;
}
.popover.top {
margin-top: -10px;
@@ -5866,8 +6261,8 @@ button.close {
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
- -webkit-perspective: 1000;
- perspective: 1000;
+ -webkit-perspective: 1000px;
+ perspective: 1000px;
}
.carousel-inner > .item.next,
.carousel-inner > .item.active.right {
@@ -5929,6 +6324,7 @@ button.close {
color: #fff;
text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+ background-color: rgba(0, 0, 0, 0);
filter: alpha(opacity=50);
opacity: .5;
}
@@ -5966,6 +6362,7 @@ button.close {
top: 50%;
z-index: 5;
display: inline-block;
+ margin-top: -10px;
}
.carousel-control .icon-prev,
.carousel-control .glyphicon-chevron-left {
@@ -5981,8 +6378,8 @@ button.close {
.carousel-control .icon-next {
width: 20px;
height: 20px;
- margin-top: -10px;
font-family: serif;
+ line-height: 1;
}
.carousel-control .icon-prev:before {
content: '\2039';
@@ -6041,16 +6438,16 @@ button.close {
.carousel-control .icon-next {
width: 30px;
height: 30px;
- margin-top: -15px;
+ margin-top: -10px;
font-size: 30px;
}
.carousel-control .glyphicon-chevron-left,
.carousel-control .icon-prev {
- margin-left: -15px;
+ margin-left: -10px;
}
.carousel-control .glyphicon-chevron-right,
.carousel-control .icon-next {
- margin-right: -15px;
+ margin-right: -10px;
}
.carousel-caption {
right: 20%;
@@ -6089,6 +6486,8 @@ button.close {
.pager:after,
.panel-body:before,
.panel-body:after,
+.modal-header:before,
+.modal-header:after,
.modal-footer:before,
.modal-footer:after {
display: table;
@@ -6108,6 +6507,7 @@ button.close {
.navbar-collapse:after,
.pager:after,
.panel-body:after,
+.modal-header:after,
.modal-footer:after {
clear: both;
}
@@ -6140,7 +6540,6 @@ button.close {
}
.hidden {
display: none !important;
- visibility: hidden !important;
}
.affix {
position: fixed;
@@ -6173,7 +6572,7 @@ button.close {
display: block !important;
}
table.visible-xs {
- display: table;
+ display: table !important;
}
tr.visible-xs {
display: table-row !important;
@@ -6203,7 +6602,7 @@ button.close {
display: block !important;
}
table.visible-sm {
- display: table;
+ display: table !important;
}
tr.visible-sm {
display: table-row !important;
@@ -6233,7 +6632,7 @@ button.close {
display: block !important;
}
table.visible-md {
- display: table;
+ display: table !important;
}
tr.visible-md {
display: table-row !important;
@@ -6263,7 +6662,7 @@ button.close {
display: block !important;
}
table.visible-lg {
- display: table;
+ display: table !important;
}
tr.visible-lg {
display: table-row !important;
@@ -6316,7 +6715,7 @@ button.close {
display: block !important;
}
table.visible-print {
- display: table;
+ display: table !important;
}
tr.visible-print {
display: table-row !important;
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
index fa5546b..f010c82 100644
--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bootstrap.css","less/normalize.less","less/print.less","less/glyphicons.less","less/scaffolding.less","less/mixins/vendor-prefixes.less","less/mixins/tab-focus.less","less/mixins/image.less","less/type.less","less/mixins/text-emphasis.less","less/mixins/background-variant.less","less/mixins/text-overflow.less","less/code.less","less/grid.less","less/mixins/grid.less","less/mixins/grid-framework.less","less/tables.less","less/mixins/table-row.less","less/forms.les
[...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","less/normalize.less","less/print.less","less/glyphicons.less","less/scaffolding.less","less/mixins/vendor-prefixes.less","less/mixins/tab-focus.less","less/mixins/image.less","less/type.less","less/mixins/text-emphasis.less","less/mixins/background-variant.less","less/mixins/text-overflow.less","less/code.less","less/grid.less","less/mixins/grid.less","less/mixins/grid-framework.less","less/tables.less","less/mixins/table-row.less","less/forms.les
[...]
\ No newline at end of file
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
index 40690c6..ed3905e 100644
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
@@ -1,5 +1,6 @@
/*!
- * Bootstrap v3.3.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.2 | MIT License | git.io/normalize
*/html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-b
[...]
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css
*/html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr
[...]
+/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/dist/fonts/glyphicons-halflings-regular.eot
b/dist/fonts/glyphicons-halflings-regular.eot
index 4a4ca86..b93a495 100644
Binary files a/dist/fonts/glyphicons-halflings-regular.eot and
b/dist/fonts/glyphicons-halflings-regular.eot differ
diff --git a/dist/fonts/glyphicons-halflings-regular.svg
b/dist/fonts/glyphicons-halflings-regular.svg
index 25691af..94fb549 100644
--- a/dist/fonts/glyphicons-halflings-regular.svg
+++ b/dist/fonts/glyphicons-halflings-regular.svg
@@ -6,224 +6,283 @@
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
<font-face units-per-em="1200" ascent="960" descent="-240" />
<missing-glyph horiz-adv-x="500" />
-<glyph />
-<glyph />
-<glyph unicode="
" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="400" />
<glyph unicode=" " />
-<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183
-183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141
-141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
-<glyph unicode="+" d="M0
400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
+<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5
-10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158
-158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1
-11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8
-7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0
-34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19
6l-106 106q-7 8 -6 19t8 18l158 15 [...]
+<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0
35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5
-35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5
14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5
14.5z" />
<glyph unicode=" " />
-<glyph unicode=" " horiz-adv-x="652" />
-<glyph unicode=" " horiz-adv-x="1304" />
-<glyph unicode=" " horiz-adv-x="652" />
-<glyph unicode=" " horiz-adv-x="1304" />
-<glyph unicode=" " horiz-adv-x="434" />
-<glyph unicode=" " horiz-adv-x="326" />
-<glyph unicode=" " horiz-adv-x="217" />
-<glyph unicode=" " horiz-adv-x="217" />
-<glyph unicode=" " horiz-adv-x="163" />
+<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6
-11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0
13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5
-7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18
14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11
18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164
164q18 18 43 18z" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="433" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="162" />
<glyph unicode=" " horiz-adv-x="260" />
<glyph unicode=" " horiz-adv-x="72" />
<glyph unicode=" " horiz-adv-x="260" />
-<glyph unicode=" " horiz-adv-x="326" />
-<glyph unicode="€" d="M100 500l100 100h113q0 47 5 100h-218l100
100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55
-25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5
-107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5
-91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172
-128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z"
/>
-<glyph unicode="−" d="M200 400h900v300h-900v-300z" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0
45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5
-20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100
-100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5
24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0
-324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20
87 51 153.5t62 103.5q117 1 [...]
+<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35
-56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17
-65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3
-14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10
0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22
6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5
17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 1 [...]
+<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0
-21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5
35.5t35.5 14.5z" />
+<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5
-14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5
-165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5
14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5
165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5
-109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5
-73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-2 [...]
<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="☁" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205
86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5
59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5
-122.5z" />
-<glyph unicode="✉" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0
300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
-<glyph unicode="✏" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614
614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13
-33 13t-33 -13z" />
-<glyph unicode="" d="M0 1200h1200l-500
-550v-550h300v-100h-800v100h300v550z" />
-<glyph unicode="" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44
90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86
-75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10
-3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
-<glyph unicode="" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0
-142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300
300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234
-97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
-<glyph unicode="" d="M100 784q0 64 28 123t73 100.5t104.5 64t119
20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71
-100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146
-174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
-<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145
-449l-384 275l-382 -275l146 447zM168 71l2 1z" />
-<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145
-449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192
140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
-<glyph unicode="" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5
125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5
-74.5v-100l400 -257v-143h-1200z" />
-<glyph unicode="" d="M0 0v1100h1200v-1100h-1200zM100
100h100v100h-100v-100zM100 300h100v100h-100v-100zM100
500h100v100h-100v-100zM100 700h100v100h-100v-100zM100
900h100v100h-100v-100zM300 100h600v400h-600v-400zM300
600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000
300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000
700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
-<glyph unicode="" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5
-14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5
35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0
-21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21
14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5
-14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5
14.5h400q21 0 35.5 -14.5 [...]
-<glyph unicode="" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5
-14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5
35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0
-21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21
14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5
-14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5
14.5h200q21 0 35.5 -14.5t1 [...]
-<glyph unicode="" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5
-14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5
35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21
-14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21
14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5
-14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5
14.5h700q21 0 35.5 -14.5t1 [...]
-<glyph unicode="" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206
207z" />
-<glyph unicode="" d="M106 318l282 282l-282 282l212 212l282 -282l282
282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
-<glyph unicode="" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0
-142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300
300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234
-97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300
600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
-<glyph unicode="" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0
-141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300
300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234
-97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300
601h400v200h-400v-200z" />
-<glyph unicode="" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165
-155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165
155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184
-123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21
14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5
14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
-<glyph unicode="" d="M100 1h200v300h-200v-300zM400
1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
-<glyph unicode="" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3
-5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74
-5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44
39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80
134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0
-74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80
-134l-3 -5q-25 -47 -38 -93l-2 -6 [...]
-<glyph unicode="" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41
29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5
-17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0
-41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300
100h100v700h-100v-700zM500 100h100v700h-100v-700zM500
1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z"
/>
-<glyph unicode="" d="M1 601l656 644l644
-644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
-<glyph unicode="" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0
-11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
-<glyph unicode="" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431
-1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
-<glyph unicode="" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290
-300h490v-400h-1100zM813 200h175v100h-175v-100z" />
-<glyph unicode="" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233
47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191
-127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121
-291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350
600h150v300h200v-300h150l-250 -300z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250
-300h-150v-300h-200v300h-150z" />
-<glyph unicode="" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7
-18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97
500h-606z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
-<glyph unicode="" d="M23 600q0 -118 45.5 -224.5t123 -184t184
-123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125
-302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146
-146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123
-184t-45.5 -224.5z" />
-<glyph unicode="" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5
45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302
-125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125
302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z"
/>
-<glyph unicode="" d="M100 0h1100v1200h-1100v-1200zM200
100v900h900v-900h-900zM300 200v100h100v-100h-100zM300
400v100h100v-100h-100zM300 600v100h100v-100h-100zM300
800v100h100v-100h-100zM500 200h500v100h-500v-100zM500
400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z"
/>
-<glyph unicode="" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82
59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5
-70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400
800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5
-35.5v-150z" />
-<glyph unicode="" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5
84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5
-115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
-<glyph unicode="" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0
127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7
-18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227
49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6
14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800
20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14
6t-6 14z" />
-<glyph unicode="" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688
459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71
-71l-141 141l-141 -141z" />
-<glyph unicode="" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700
857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93
257z" />
-<glyph unicode="" d="M0 401v400h300l300 200v-800l-300 200h-300zM702
858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93
257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178
142 405q0 230 -144 408l-6 8z" />
-<glyph unicode="" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0
600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100
800v300h300v-300h-300zM200 200v100h100v-100h-100zM200
900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100
h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600
1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800
800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100
200v100h100v-100h [...]
-<glyph unicode="" d="M0 200h100v1000h-100v-1000zM100
0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500
200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800
200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z"
/>
-<glyph unicode="" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700
-700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29
71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
-<glyph unicode="" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500
-500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71
30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
-<glyph unicode="" d="M100 0v1025l175 175h925v-1000l-100
-100v1000h-750l-100 -100h750v-1000h-900z" />
-<glyph unicode="" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5
15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
-<glyph unicode="" d="M0 100v700h200l100 -200h600l100
200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11
-10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5
7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5
7t-3.5 17z" />
-<glyph unicode="" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5
29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53
61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12
-20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172
-72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75
31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
-<glyph unicode="" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92
234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19
-33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36
-20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
-<glyph unicode="" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1
39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55
-11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5
-58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400
200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400
700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
-<glyph unicode="" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56
-10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46
-37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
-<glyph unicode="" d="M-75 200h75v800h-75l125 167l125
-167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5
30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100
50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
-<glyph unicode="" d="M33 51l167 125v-75h800v75l167 -125l-167
-125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5
15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5
-1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
-<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5
15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5
-35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21
-14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20
14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5
14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5
-15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-3 [...]
-<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5
15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5
-35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21
-14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20
14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5
14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5
-15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35. [...]
-<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5
-14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5
35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0
-20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5
35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5
-15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0
35.5 -14.5t14.5 -35.5v-100q [...]
-<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5
-14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5
35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0
-20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5
35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5
-15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0
35.5 -14.5t14.5 -35.5v-100q0 - [...]
-<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5
-14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0
350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20
-14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5
35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5
-15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0
35.5 -14.5t14.5 -35.5v-100q0 -20 -14. [...]
-<glyph unicode="" d="M-101 500v100h201v75l166 -125l-166
-125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20
0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5
-35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15
35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5
-35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5
-14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t3 [...]
-<glyph unicode="" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15
35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0
-20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21
0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35
15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1
950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35
14.5h-100q-21 0 -35.5 -14.5t-14. [...]
-<glyph unicode="" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22
-53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z"
/>
-<glyph unicode="" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5
-13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100
263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39
95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
-<glyph unicode="" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123
0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5
-189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63
262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5
182t-182.5 75t-182 -75.5t-75 -181.5z" />
-<glyph unicode="" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233
47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191
-127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177
125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
-<glyph unicode="" d="M117 406q0 94 34 186t88.5 172.5t112 159t115
177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50
-125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6
-211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6
-18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5
-156z" />
-<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6
397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5
-29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5
-117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114
113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
-<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2
-80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5
-70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5
-282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5
64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48
-8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
-<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0
127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5
-29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5
-117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137
137l-430 -431l-146 147z" />
-<glyph unicode="" d="M0 603l300 296v-198h200v200h-200l300 300l295
-300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300
300h200v200h-200v-198z" />
-<glyph unicode="" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0
35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5
-14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5
-14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0
-21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="" d="M136 550l564 550v-487l500 487v-1100l-500
488v-488z" />
-<glyph unicode="" d="M200 0l900 550l-900 550v-1100z" />
-<glyph unicode="" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0
35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5
-35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5
35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z"
/>
-<glyph unicode="" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5
15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5
-35.5v-800z" />
-<glyph unicode="" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
-<glyph unicode="" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5
35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5
-14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
-<glyph unicode="" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5
14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5
-14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
-<glyph unicode="" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0
35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5
14.5t-14.5 35.5zM100 500h1100l-550 564z" />
-<glyph unicode="" d="M185 599l592 -592l240 240l-353 353l353 353l-240
240z" />
-<glyph unicode="" d="M272 194l353 353l-353 353l241 240l572 -571l21
-22l-1 -1v-1l-592 -591z" />
-<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5
-80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5
217.5t-80 299.5zM300
500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
-<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5
-80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5
217.5t-80 299.5zM300 500h600v200h-600v-200z" />
-<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5
-80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5
217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142
141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
-<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5
-80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5
217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
-<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5
-80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5
217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5
4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1
-12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5
45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5
-12t-75 -38.5t-53.5 -74. [...]
-<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5
-80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5
217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500
800h200v100h-200v-100z" />
-<glyph unicode="" d="M0 500v200h195q31 125 98.5 199.5t206.5
100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25
-102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98
200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201
206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79
-126h209v-200h-210z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135
-135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142
-142l-346 -345z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391
245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
-<glyph unicode="" d="M0 547l600 453v-300h600v-300h-600v-301z" />
-<glyph unicode="" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z"
/>
-<glyph unicode="" d="M204 600l450 600l444
-600h-298v-600h-300v600h-296z" />
-<glyph unicode="" d="M104 600h296v600h300v-600h298l-449 -600z" />
-<glyph unicode="" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5
59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100
-135.5z" />
-<glyph unicode="" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129
-129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
-<glyph unicode="" d="M34 176l295 295l-129 129h400v-400l-129 130l-295
-295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
-<glyph unicode="" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5
45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184
-123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4
-20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32
14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
-<glyph unicode="" d="M0
800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5
17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40
-35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2
-8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36
96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12
-32.5t23 -64t25 -72t7 -28.5h-269z" />
-<glyph unicode="" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9
113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220
58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5
-1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5
76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6
19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61
-32q-369 -197 -458 -401q-48 -111 -28 [...]
-<glyph unicode="" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105
-108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13
157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5
-29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91
34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43
-129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8
-34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 [...]
-<glyph unicode="" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97
90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5
-85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97
-90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97
90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5
-75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47
66q-1 1 -28.5 37.5t-42 55t [...]
-<glyph unicode="" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97
90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37
143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282
393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226
-258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780
161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127
-140 175l39 146q67 -54 131.5 -1 [...]
-<glyph unicode="" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5
35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5
-66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100
300v100h-200v-100z" />
-<glyph unicode="" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62
44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20
-12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32
0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359
-249q-17 -12 -29 -5.5t-12 26.5z" />
-<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5
15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5
14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5
-35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100
500v100h100v-100h-100zM300 100v100h100v-100h-100zM300
300v100h100v-100h-100zM300 500v100h100v-100h-100zM500
100v100h100v-100h-100zM500 300v100h100v-100h-100zM500
500v100h100v-100h-100zM700 100v100h100v-100h-100z [...]
-<glyph unicode="" d="M0 200v200h259l600 600h241v198l300 -295l-300
-300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181
180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
-<glyph unicode="" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0
70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304
-300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
-<glyph unicode="" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102
-117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0
47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129
-65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15
104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
-<glyph unicode="" d="M-30 411l227 -227l352 353l353 -353l226 227l-578
579z" />
-<glyph unicode="" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352
353z" />
-<glyph unicode="" d="M-198 700l299 283l300 -283h-203v-400h385l215
-200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299
283h-200v600h-796z" />
-<glyph unicode="" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17
18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201
-961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5
15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21
0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5
21t-27.5 43z" />
-<glyph unicode="" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5
70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
-<glyph unicode="" d="M1 0l300 700h1200l-300 -700h-1200zM1
400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5
-70.5h500v-200h-1000z" />
-<glyph unicode="" d="M302 300h198v600h-198l298 300l298
-300h-198v-600h198l-298 -300z" />
-<glyph unicode="" d="M0 600l300 298v-198h600v198l300 -298l-300
-297v197h-600v-197z" />
-<glyph unicode="" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0
70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5
29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5
-45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z"
/>
-<glyph unicode="" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11
5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3
4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3
-17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100
200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35
-15q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63
327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18
-36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5
-35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5
-19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13
40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z"
/>
-<glyph unicode="" d="M21 445l233 -45l-78 -224l224 78l45 -233l155
179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224
-78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
-<glyph unicode="" d="M0 200h200v600h-200v-600zM300 275q0 -75 100
-75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5
84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51
-20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100
212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
-<glyph unicode="" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100
75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5
-84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5
-40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150
-212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
-<glyph unicode="" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14
35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18
-11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130
-339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100
-89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25
14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14
10 27l147 183l-86 83l-339 -236v-503z" />
-<glyph unicode="" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11
16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5
-26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130
339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131
-339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3
-3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000
201v600h200v-600h-200z" />
-<glyph unicode="" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5
-15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39
139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5
-13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5
3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25
-30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400
0v200h600v-200h-600z" />
-<glyph unicode="" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34
10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39
139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5
-14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40
-20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24
13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
-<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5
127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5
-217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402
294l-402 298v-197h-300z" />
-<glyph unicode="" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5
127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162
-80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402
-294l-2 194h300l2 201h-300v197z" />
-<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5
127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5
-217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300
600h200v-300h200v300h200l-300 400z" />
-<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5
127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5
-217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300
400h-200v300h-200v-300h-200z" />
-<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5
127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162
-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8
-33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12
108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87
-80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5
62q-14 9 -37 9.5t-36 7.5q-14 7 - [...]
-<glyph unicode="" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6
201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123
-70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
-<glyph unicode="" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5
29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5
-29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5
29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000
q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5
-29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5
29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 [...]
-<glyph unicode="" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350
-500v-300l-200 -200v500z" />
-<glyph unicode="" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5
-29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5
29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5
-70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500
1000h200v100h-200v-100z" />
-<glyph unicode="" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129
-129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729
329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129
129h400v-400l-129 129l-200 -200z" />
-<glyph unicode="" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0
-172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16
-38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22
0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5
56.5t51.5 29.5l122 126l1 1q-9 14 [...]
-<glyph unicode="" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63
0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3
96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69
-67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52
-52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44
41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51
-175.5q-7 -101 -98 -192l-252 [...]
-<glyph unicode="" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241
-129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77
-89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92
99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5
-70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5
97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51
80 -123 80q-60 0 -109.5 -49 [...]
-<glyph unicode="" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93
0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212
-212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66
-159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247
-247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66
159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
-<glyph unicode="" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162
-15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5
29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5
-30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
-<glyph unicode="" d="M0 0l303 380l207 208l-210 212h300l267 279l-35
36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14
-15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
-<glyph unicode="" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6
1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44
159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5
-84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70
-31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152
17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5
-22.5t31 -13.5t38 -10q7 -2 1 [...]
-<glyph unicode="" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5
55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34
89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5
-69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99
-113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5
-36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24
-11l-55 145l16.5 11t15.5 10t13.5 9.5t1 [...]
-<glyph unicode="" d="M2 300l298 -300l298
300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z"
/>
-<glyph unicode="" d="M2 300h198v900h200v-900h198l-298 -300zM700
0v200h100v-100h200v-100h-300zM700
400v100h300v-200h-99v-100h-100v100h99v100h-200zM700
700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
-<glyph unicode="" d="M2 300h198v900h200v-900h198l-298 -300zM700
0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700
1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
-<glyph unicode="" d="M2 300l298 -300l298
300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800
1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
-<glyph unicode="" d="M2 300l298 -300l298
300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800
800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
-<glyph unicode="" d="M2 300l298 -300l298
300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700
400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z"
/>
-<glyph unicode="" d="M2 300l298 -300l298
300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700
400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z"
/>
-<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162
0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0
-282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5
29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5
-70.5v-500z" />
-<glyph unicode="" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0
282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0
-281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5
29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5
-70.5v-500zM400 300l333 250l-333 250v-500z" />
-<glyph unicode="" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163
0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0
-282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5
29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5
-70.5v-500zM300 700l250 -333l250 333h-500z" />
-<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165
0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0
-282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5
29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5
-70.5v-500zM300 400h500l-250 333z" />
-<glyph unicode="" d="M0 400v300h300v200l400 -350l-400
-350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5
29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5
-282.5t-282.5 -117.5h-400z" />
-<glyph unicode="" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5
-21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31
17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98
-111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
-<glyph unicode="" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0
100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5
29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5
-282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
-<glyph unicode="" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0
281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5
-29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118
122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149
149h500v-500l-149 149l-342 -353z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57
-137t-57 -137t-137 -57t-137 57t-57 137z" />
-<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8
-17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900
150h100v50h-100v-50z" />
-<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8
-17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900
150h100v50h-100v-50z" />
-<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8
-17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900
150h100v50h-100v-50z" />
-<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8
-17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250
-239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
-<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8
-17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149
-149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
-<glyph unicode="" d="M23 415l1177 784v-1079l-475 272l-310
-393v416h-392zM494 210l672 938l-672 -712v-226z" />
-<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5
15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35
-14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600
1000h100v200h-100v-200z" />
-<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5
15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126
-127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353
352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
-<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5
15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298
-298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600
1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127
-128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
-<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5
15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5
14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600
1000v200h100v-200h-100z" />
-<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5
15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0
-35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600
1000v200h100v-200h-100z" />
-<glyph unicode="" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5
14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5
14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
-<glyph unicode="" d="M0 400l300 298v-198h400v-200h-400v-198zM100
800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300
-298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000
300h100v200h-100v-200z" />
-<glyph unicode="" d="M100 700v400l50 100l50 -100v-300h100v300l50
100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5
-35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5
-55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0
35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5
-51.5t-18.5 -65.5v-359z" />
-<glyph unicode="" d="M100 0h400v56q-75 0 -87.5 6t-12.5
44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30
7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5
-44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24
-15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
-<glyph unicode="" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5
29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5
-70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100
300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200
-200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
-<glyph unicode="" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104
-177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163
162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101
-268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5
22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
-<glyph unicode="" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4
1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1
-10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5
-14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202
33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5
-21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171
45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t- [...]
-<glyph unicode="" d="M100 0v100h1100v-100h-1100zM175 200h950l-125
150v250l100
100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100
-100v-250z" />
-<glyph unicode="" d="M100 0h300v400q0 41 -29.5 70.5t-70.5
29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5
29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5
29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200
300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600
300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200
300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600
300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600
300h300v100h-200v300h200v100h-300v-500z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27
107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68
-42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200
300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601
300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301
400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100
v-400h100v500h-200v-100z" />
-<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212
-88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100
200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201
300v100h100v-100h-100zM601 300v100h100v-100h-100z M700
700v100h200v-500h-100v400h-100z" />
-<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0
-171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100
100h300v-100h-300v-200h300v-100h-300z" />
-<glyph unicode="" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217
-217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0
-171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5
121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100
-100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700
400v100h100v-100h-100z" />
-<glyph unicode="" d="M-14 494q0 -80 56.5 -137t135.5
-57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90
-14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2
-37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300
-300z" />
-<glyph unicode="" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403
-403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44
97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14
-108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z"
/>
-<glyph unicode="" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270
300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
-<glyph unicode="" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0
-74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100
-30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5
155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5
-197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
+<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90
14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5
57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z"
/>
+<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136
-187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35
18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112
150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
+<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8
-8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8
-18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8
8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818
482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18
8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
+<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13
-33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614
614zM317 96l-333 -112l110 335z" />
+<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5
-35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
+<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55
-41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138
8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5
111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
+<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5
-156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5
-42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2
-1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5
104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162
-43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5
-20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5
-127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5
124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z"
/>
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129
-353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5
6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14
20.5t23 8.5h429z" />
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129
-353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5
6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14
20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192
140h-234l-78 211z" />
+<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31
-98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10
-7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15
16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212
88z" />
+<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0
-10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5
17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5
-17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5
17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000
800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000
600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t- [...]
+<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0
-21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5
35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5
-35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5
14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5
-14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650
500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 [...]
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0
-21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5
35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5
-35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5
14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5
-14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50
700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 [...]
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0
-21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5
35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5
-35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5
14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5
-14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450
700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 [...]
+<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8
-17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7
8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
+<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267
-268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268
267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267
268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5
7t18.5 -7z" />
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5
-154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7
-8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103
154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0
-165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5
120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5
-17.5v-75h75q10 0 17.5 -7.5t7.5 [...]
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5
-154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7
-8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103
154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0
-165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5
120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5
-17.5v-150q0 -10 -7.5 -17.5t-17. [...]
+<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0
-21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5
35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5
-224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5
224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57
-214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165
155z" />
+<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0
-10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5
17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5
-7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10
0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5
7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5
-17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h [...]
+<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5
-2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5
-73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104
-105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74
5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45
-38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47
61 105 105l133 -80l5 2q45 25 9 [...]
+<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5
-70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5
7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100
900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5
v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700
800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
+<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8
5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5
7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5
7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5
-29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5
35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5
35.5v250z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5
57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5
-7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5
-7.5h-250q-10 0 -17.5 7.5t-7.5 [...]
+<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431
1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5
-35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327
400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10
0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5
7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5
-17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5
57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5
-7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32
16l-223 275q-13 16 -8 27.5t26 [...]
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5
57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13
-16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5
7.5t-7.5 17.5v275h-137q-21 0 -2 [...]
+<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7
-24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13
-6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19
-7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10
11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16
7t4 18l-87 450q-2 11 -11 18t-19 7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5
57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17
-12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28
-6.5z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10
-7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5
57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224
-45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5
123t224 45.5q192 0 347 -117z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11
-7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224
45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5
-123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11
7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0
214.5 57t155.5 155.5t57 21 [...]
+<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0
-10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5
17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5
-17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325
900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5
7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5
-17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-4 [...]
+<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5
58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5
-70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41
-29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35
-14.5t15 -35.5v-150h-300z" />
+<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5
-17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16
-23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0
-57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160
-57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43
0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183
87q7 8 18 8z" />
+<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131
-192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5
17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5
-231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0
116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0
-8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14
-6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q [...]
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6
-13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10
7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7
-17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17
7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119
120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6
-13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10
7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154
-90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103
72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
+<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105
-34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111
150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321
814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46
14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46
14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3
-1q-9 0 -16 6l-29 23q-7 7 -8.5 16 [...]
+<glyph unicode="" d="M500
900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200
700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100
1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300
900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500
h-500v500h200v100h100v-100zM800
300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100
400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200
200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0 [...]
+<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300
200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900
200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400
0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100
0h-200v91h200v-91z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8
-8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5
29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5
71.5z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8
-8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8
-8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5
1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71
29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64
-64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64
-64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5
-17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18
43 18z" />
+<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5
-35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78
-301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62
108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15
-15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4
9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5
-7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5
-7.5t7.5 -17.5v-150q0 -10 7.5 -17.5 [...]
+<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25
-50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5
-29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8
6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95
0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5
162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30
73t73 30z" />
+<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5
-29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145
-92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12
25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
+<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5
-40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5
-66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5
34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5
-20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5
-30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5
39.5t-103.5 13.5h-118v-350zM400 200h216q80 [...]
+<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132
-839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5
22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
+<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22
11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25
-2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31
-2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175
1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
+<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22
11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25
-2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31
-2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167
50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
+<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0
-21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5
35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5
-35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5
14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50
200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 [...]
+<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0
-21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5
35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5
-35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5
14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50
200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -2 [...]
+<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0
35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5
14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5
-35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5
35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5
-35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0
50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 [...]
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0
-21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5
35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5
-35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5
14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50
200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 [...]
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0
-21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5
35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5
-35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5
14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350
800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 [...]
+<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0
35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5
14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5
-35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5
35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550
500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21
0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 [...]
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0
-21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5
35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5
-35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5
35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167
125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 [...]
+<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22
-53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300
300l300 300v-600z" />
+<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13
-31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247
182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39
-94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
+<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0
-115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5
67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137
96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5
-64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600
173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5
-155.5t214.5 -57z" />
+<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5
-117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5
-54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5
126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5
-70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21
-7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26
89 6 271q2 11 -6 [...]
+<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25
-9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105
-13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5
-29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5
-92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009
803l-362 -362l-161 -50l55 170l355 355z" />
+<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0
-70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5
29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5
92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8
-17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5
-7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67
24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 - [...]
+<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0
-70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5
29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0
-257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7
17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5
7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18
-7t18 7z" />
+<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5
-13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8
-17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260
-264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10
-5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5
-12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464
453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21
-14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5
35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464
453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21
-10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21
-14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5
35.5t35.5 14.5z" />
+<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464
453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14
25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
+<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814
-498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
+<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0
-21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5
35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5
-35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5
14.5z" />
+<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5
-14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0
35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15
-14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14
-25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
+<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0
-21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463
-454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5
24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5
-9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0
-21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15
-14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5
35.5t35.5 14.5z" />
+<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5
-11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0
35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5
14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552
552l552 550z" />
+<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198
198z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650
900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5
-35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5
-14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21
-14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 [...]
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850
700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21
0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5
0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9
-21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5
9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120
120q9 9 9 21.5t-9 21.5l-141 [...]
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84
85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5
-8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0
-59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35
11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0
-13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5
-16.5t20.5 -8.5h173q7 0 22 8t35 28t [...]
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675
1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0
17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5
-7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5
-17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 [...]
+<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103
-27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5
-17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5
-17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5
102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5
7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700
893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 [...]
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5
57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7
-17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5
-7t-17.5 7l-124 124l-124 -124q [...]
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5
57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7
7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106
106q7 8 17.5 8t17.5 -8l79 - [...]
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0
-214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225
65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115
-62 219z" />
+<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21
0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21
-11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
+<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522
-427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21
14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26
-11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5
35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5
-35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427
522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522
-427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5
-135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5
-8z" />
+<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0
-21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7
18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5
14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106
-106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
+<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249
-249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21
10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5
-14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18
-7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123
-184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5
123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704
900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0
37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5
-7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0
10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196
-118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0
47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5
-5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0
-17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5
7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0
4 9 52l25 128q5 25 19 45q2 3 5 [...]
+<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5
-323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120
-4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153
-153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13
61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5
36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119
-103.5t-142 -89.5l-62 -33q-56 -30 - [...]
+<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5
-96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17
39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105
-138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5
-45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5
63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65
-93t-84 -52t-93.5 -11t-95 24.5q-80 [...]
+<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5
-82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5
-95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5
95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140
59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212
-88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16
-15 -40.5t9 -42.5q22 -36 47 -7 [...]
+<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5
106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5
82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5
-192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46
173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69
-160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105
-41.5l41 154q-107 18 -178.5 1 [...]
+<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642
-1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155
200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445
723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5
-14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
+<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15
-14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100
-113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20
100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363
325v339q0 62 44 106t106 44z" />
+<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5
-35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5
14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0
21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21
0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300
600v-100h100v100h-100zM500 600v-100h100v100h-100zM700
600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100
[...]
+<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249
-230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5
35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5
-10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5
35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14
-24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5
-10z" />
+<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0
-41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5
70.5v600q0 41 29.5 70.5t70.5 29.5z" />
+<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5
-35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5
-35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15
-89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58
89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5
-30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17
30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
+<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197
199l551 551z" />
+<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353
353z" />
+<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5
-35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230
249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25
-10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0
-25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0
39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0
35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5
-14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5
14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35
14.5t-15 35.5t15 35.5t35 14.5z" />
+<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5
29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
+<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5
29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300
700h1200z" />
+<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25
-10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35
15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230
249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249
-229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5
10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5
-25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
+<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38
22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5
-29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5
70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000
100v100h100v-100h-100z" />
+<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21
-14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5
14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5
14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675
250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5
46t25 30t29 16t25.5 7z" />
+<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19
144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31
-27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104
12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14
35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5
13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63
30.5t-39 79.5z" />
+<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180
-155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78
224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
+<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28
-125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38
-40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5
57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100
-212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50
800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21
0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29
-29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30
-84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20
63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5
-14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5
35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100
-212h50v175l-50 225h450v125l-250 375 [...]
+<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5
-32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131
-339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28
28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5
25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25
5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5
-35.5t-35.5 -14.5h-100q-21 0 - [...]
+<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18
-16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5
41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15
-10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5
-4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29
-20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5
-35.5v-500q0 -21 -14.5 -35.5t-35.5 [...]
+<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21
-6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9
14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38
138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5
-6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236
-339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5
-14.5t14.5 -35.5v-100q0 -21 -14.5 [...]
+<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21
-14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5
-35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121
-84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5
13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41
-19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2
-5t1.5 -5t0.5 -6v-5.5v-6v-7v-4 [...]
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123
-184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5
123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275
223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10
7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z"
/>
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123
-184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5
123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275
-223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5
7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123
-184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5
123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223
275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10
7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123
-184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5
123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675
900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223
-275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5
17.5t-17.5 7.5z" />
+<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5
-184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184
123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15
-12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5
-26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34
5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33
-15t40.5 -15t34.5 -12q21 -9 52.5 [...]
+<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251
126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16
-36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5
201.5t135.5 154.5z" />
+<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5
-29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5
29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100
796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000
q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100
696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5
-70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70 [...]
+<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5
-35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700
500v-300l-200 -200v500l-350 500h900z" />
+<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5
-70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41
29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500
1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41
0 -70.5 29.5t-29.5 70.5v200h1200z" />
+<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199
-199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14
-24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5
-14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18
-7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364
470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25
-10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 [...]
+<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127
-190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5
127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0
-207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5
55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5
-16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5
905q22.5 0 38.5 -16t16 -38.5t-16 [...]
+<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154
94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376
-375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62
53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26
0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14
34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5
-68.5q14 -47 2 [...]
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5
-20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5
-127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5
124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5
-104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36
19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5
-51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 - [...]
+<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66
-160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389
-389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66
158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283
-283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55
75 -102l18 -17l-95 -95l247 -248l389 389z" />
+<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29
-46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0
21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0
-73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5
73.5t-73.5 30.5z" />
+<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5
-35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203
280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35
-15z" />
+<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71
-53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64
-13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244
-97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5
-126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25
126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5
-41.5t-10.5 -65q0 -29 7 -50.5 [...]
+<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47
-147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62
-35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9
-14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71
7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42
-4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23
-11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17. [...]
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14
-15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230
-249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10
24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M1000
700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230
-250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801
1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200
250h-200v100h300v-150z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14
-15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000
1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000
0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14
-15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000
700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901
400v-200h100v200h-100z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14
-15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100
700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000
0h-100v400h-100v100h200v-500z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14
-15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900
1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100
400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14
-15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200
1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000
400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
+<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0
-165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165
92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41
29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5
29.5z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5
-257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5
257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5
-70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41
-29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12
-28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0
-165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163
92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41
29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5
29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190
253q-12 16 -6.5 28t26.5 12z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5
-257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5
256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5
-70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41
-29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0
-26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
+<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5
-257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5
35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5
70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5
14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11
26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0
21 11 26t27 -9z" />
+<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78
-221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5
-162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39
110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25
16h9z" />
+<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0
-21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5
-70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938
867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21
0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z"
/>
+<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0
-21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141
141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456
900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41
0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5
-92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z"
/>
+<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125
-187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187
125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0
-212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212
56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137
-57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
+<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5
-35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379
426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0
35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900
200v-50h100v50h-100z" />
+<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26
-16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0
-25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5
-14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900
200v-50h100v50h-100z" />
+<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8
7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139
139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0
21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
+<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212
-212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2
-599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154
155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5
35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0
-21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10
24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14
35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5
35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196
796v-1096zM483 424v-230l683 953z" />
+<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5
-14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5
35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
+<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5
9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5
35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106
-106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8
17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5
16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20
14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70
-70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70
-70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5
15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70
70q15 15 35.5 15t35.5 -15 [...]
+<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5
-35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5
15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5
-14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35
-14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z"
/>
+<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35
-15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5
15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10
-25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5
35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5
-35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5
-35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100
500v-200h400v200h-400z" />
+<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248
-230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200
800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400
800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5
-25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15
35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0
-21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
+<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0
-21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24
17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5
-12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10
-11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4
4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5
12t22.5 5.5q20 0 32.5 -12.5t14 [...]
+<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24
-15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5
43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30
7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5
-6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
+<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5
-35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5
-29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5
70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400
-133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5
-35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
+<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14
-20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5
19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5
-1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119
108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
+<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5
-36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20
3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5
-20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5
39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1
-10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5
-14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212 [...]
+<glyph unicode="" d="M1100 700l-200 -200h-600l-200
200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5
-14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0
-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5
-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5
-70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5
-29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41
29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM500
700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100
-100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM500
300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100
-100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900
700h-200v-300h200v-100h-300v500h300v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5
-43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27
107t-28.5 108t-66.5 43h-130z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM500
700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900
300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900
300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700
300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124
-88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100
900v-700h900v700h-900zM500 500l-199 -200h-100v50l199
200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100
v100h100v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126
-188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5
126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0
-211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211
56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800
700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126
-188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5
126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0
-211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211
56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50
-50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500
700v-100h200v100h-200z" />
+<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90
14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5
14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0
69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0
17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32
-16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89
15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5
16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108
67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16
8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5
7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5
-19z" />
+<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300
333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5
-35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
+<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6
150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5
-126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0
21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18
4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1
13q0 116 81.5 197.5t197.5 81.5z" />
+<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5
-260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111
-150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5
-126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5
-23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5
13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5
-82.5t-82.5 -138.5q-4 -13 2 -2 [...]
+<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0
10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212
212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0
-10 -7.5 -17.5t-17.5 -7.5h-195z" />
+<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10
7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862
200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5
17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
+<glyph unicode="" d="M1162 800h-162v-200h100l100
-100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7
-57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800
400h240l-240 -400h-800l300 500h500v-100z" />
+<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5
-35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21
14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5
-70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5
29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212
-212v162h-200v100h200v162z" />
+<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5
-35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5
-14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21
14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500
h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5
29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62
0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60
-27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20
0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5
34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
+<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10
-7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5
7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5
-7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10
0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5
7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5
-17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250 [...]
+<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5
-39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55
-3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5
-14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0
-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5
-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41
28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5
-16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3
25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5
-14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5
35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5
35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128
-53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76
39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5
-14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0
-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5
-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0
-78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111
111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39
-183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5
-14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0
-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5
-35.5v-50h-1200v50q0 21 14.5 35.5t [...]
+<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50
-91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33
164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5
-35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5
14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5
-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26
73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400
800h400q54 0 100 -27t72
-73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5
-141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5
141.5t141.5 58.5z" />
+<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0
-21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5
35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5
-7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88
88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0
-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100
100h-124z" />
+<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5
-141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5
-70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5
-70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5
-70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5
-35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21
-14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h [...]
+<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131
-131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108
794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5
-35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5
14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0
-21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897
0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5
14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5
-35.5v-50z" />
+<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5
-7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200
900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5
7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
+<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5
-122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9
43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104
-43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38
-14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11
-64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128
175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35 [...]
+<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14
-15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102
-212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4
-40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106
44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0
11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5
-54.5t54.5 -22.5t54.5 22.5t22.5 [...]
+<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79
-33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15
-1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5
-76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5
-17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5
-17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5
17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h [...]
+<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18
-142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147
59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600
1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5
-30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79
42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
+<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41
-42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700
300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5
-89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189
86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100
-150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5
6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350
165v-147z" />
+<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106
-44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106
-44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106
-44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106
-44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106
-44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106
-44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10
-7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5
7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5
-7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10
0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5
7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0
-165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165
92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41
29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5
29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5
-14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400
800v-200h400v200h-400z" />
+<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5
-35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5
-14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5
-14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21
0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5
35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5
14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 3 [...]
+<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5
-155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0
-212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300
500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88
-212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5
-14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
+<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15
-26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20
-63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63
-4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16
75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298
296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51
12l-182 -193h891l-182 193l-44 -1 [...]
+<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22
11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25
-2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31
-2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500
450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5
-17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17
-7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
+<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4
11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11
-5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5
-66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21
-14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5
35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0
-21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5
35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18
-56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6
14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36
-17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5
13t-13.5 7q-17 0 -42 25q-25 27 [...]
+<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0
35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5
14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5
-35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5
35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
+<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0
-21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5
35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5
-35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5
14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
+<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5
-35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5
-35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5
14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5
14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
+<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0
35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5
14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250
500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21
0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0
-21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21
-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5
35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5
35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
+<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0
35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5
14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50
500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21
0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22
13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14
-35z" />
+<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0
-41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
+<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494
-494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
+<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5
-21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
+<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413
193v221zM1200 0h-800v200h800v-200z" />
+<glyph unicode="" d="M1200
900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4
37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50
-13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0
37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
+<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22
11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25
-1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31
-2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100
200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
+<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464
-464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10
9 23 9z" />
+<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7
-18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7
23t21 11z" />
+<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471
-471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464
464q12 12 23 7z" />
+<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11
-21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18
7t18 -7z" />
+<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88
212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60
7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11
-50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5
2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75
111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52
25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 19 [...]
+<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0
-21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13
29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400
1100v-100h300v100h-300z" />
+<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5
-84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500
525v-100l100 20v100z" />
</font>
-</defs></svg>
\ No newline at end of file
+</defs></svg>
\ No newline at end of file
diff --git a/dist/fonts/glyphicons-halflings-regular.ttf
b/dist/fonts/glyphicons-halflings-regular.ttf
index 67fa00b..1413fc6 100644
Binary files a/dist/fonts/glyphicons-halflings-regular.ttf and
b/dist/fonts/glyphicons-halflings-regular.ttf differ
diff --git a/dist/fonts/glyphicons-halflings-regular.woff
b/dist/fonts/glyphicons-halflings-regular.woff
index 8c54182..9e61285 100644
Binary files a/dist/fonts/glyphicons-halflings-regular.woff and
b/dist/fonts/glyphicons-halflings-regular.woff differ
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 8dff365..8a2e99a 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -1,7 +1,7 @@
/*!
- * Bootstrap v3.3.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under the MIT license
*/
if (typeof jQuery === 'undefined') {
@@ -9,17 +9,18 @@ if (typeof jQuery === 'undefined') {
}
+function ($) {
+ 'use strict';
var version = $.fn.jquery.split(' ')[0].split('.')
- if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] ==
9 && version[2] < 1)) {
- throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or
higher')
+ if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] ==
9 && version[2] < 1) || (version[0] > 3)) {
+ throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or
higher, but lower than version 4')
}
}(jQuery);
/* ========================================================================
- * Bootstrap: transition.js v3.3.0
+ * Bootstrap: transition.js v3.3.7
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -76,10 +77,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: alert.js v3.3.0
+ * Bootstrap: alert.js v3.3.7
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -95,7 +96,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close)
}
- Alert.VERSION = '3.3.0'
+ Alert.VERSION = '3.3.7'
Alert.TRANSITION_DURATION = 150
@@ -108,7 +109,7 @@ if (typeof jQuery === 'undefined') {
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip
for ie7
}
- var $parent = $(selector)
+ var $parent = $(selector === '#' ? [] : selector)
if (e) e.preventDefault()
@@ -171,10 +172,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: button.js v3.3.0
+ * Bootstrap: button.js v3.3.7
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -191,7 +192,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false
}
- Button.VERSION = '3.3.0'
+ Button.VERSION = '3.3.7'
Button.DEFAULTS = {
loadingText: 'loading...'
@@ -203,7 +204,7 @@ if (typeof jQuery === 'undefined') {
var val = $el.is('input') ? 'val' : 'html'
var data = $el.data()
- state = state + 'Text'
+ state += 'Text'
if (data.resetText == null) $el.data('resetText', $el[val]())
@@ -213,10 +214,10 @@ if (typeof jQuery === 'undefined') {
if (state == 'loadingText') {
this.isLoading = true
- $el.addClass(d).attr(d, d)
+ $el.addClass(d).attr(d, d).prop(d, true)
} else if (this.isLoading) {
this.isLoading = false
- $el.removeClass(d).removeAttr(d)
+ $el.removeClass(d).removeAttr(d).prop(d, false)
}
}, this), 0)
}
@@ -228,15 +229,19 @@ if (typeof jQuery === 'undefined') {
if ($parent.length) {
var $input = this.$element.find('input')
if ($input.prop('type') == 'radio') {
- if ($input.prop('checked') && this.$element.hasClass('active'))
changed = false
- else $parent.find('.active').removeClass('active')
+ if ($input.prop('checked')) changed = false
+ $parent.find('.active').removeClass('active')
+ this.$element.addClass('active')
+ } else if ($input.prop('type') == 'checkbox') {
+ if (($input.prop('checked')) !== this.$element.hasClass('active'))
changed = false
+ this.$element.toggleClass('active')
}
- if (changed) $input.prop('checked',
!this.$element.hasClass('active')).trigger('change')
+ $input.prop('checked', this.$element.hasClass('active'))
+ if (changed) $input.trigger('change')
} else {
this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
+ this.$element.toggleClass('active')
}
-
- if (changed) this.$element.toggleClass('active')
}
@@ -276,22 +281,27 @@ if (typeof jQuery === 'undefined') {
$(document)
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
- var $btn = $(e.target)
- if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+ var $btn = $(e.target).closest('.btn')
Plugin.call($btn, 'toggle')
- e.preventDefault()
+ if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) {
+ // Prevent double click on radios, and the double selections (so
cancellation) on checkboxes
+ e.preventDefault()
+ // The target component still receive the focus
+ if ($btn.is('input,button')) $btn.trigger('focus')
+ else $btn.find('input:visible,button:visible').first().trigger('focus')
+ }
})
.on('focus.bs.button.data-api blur.bs.button.data-api',
'[data-toggle^="button"]', function (e) {
- $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus')
+ $(e.target).closest('.btn').toggleClass('focus',
/^focus(in)?$/.test(e.type))
})
}(jQuery);
/* ========================================================================
- * Bootstrap: carousel.js v3.3.0
+ * Bootstrap: carousel.js v3.3.7
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -306,10 +316,10 @@ if (typeof jQuery === 'undefined') {
this.$element = $(element)
this.$indicators = this.$element.find('.carousel-indicators')
this.options = options
- this.paused =
- this.sliding =
- this.interval =
- this.$active =
+ this.paused = null
+ this.sliding = null
+ this.interval = null
+ this.$active = null
this.$items = null
this.options.keyboard && this.$element.on('keydown.bs.carousel',
$.proxy(this.keydown, this))
@@ -319,7 +329,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
- Carousel.VERSION = '3.3.0'
+ Carousel.VERSION = '3.3.7'
Carousel.TRANSITION_DURATION = 600
@@ -331,6 +341,7 @@ if (typeof jQuery === 'undefined') {
}
Carousel.prototype.keydown = function (e) {
+ if (/input|textarea/i.test(e.target.tagName)) return
switch (e.which) {
case 37: this.prev(); break
case 39: this.next(); break
@@ -358,8 +369,11 @@ if (typeof jQuery === 'undefined') {
}
Carousel.prototype.getItemForDirection = function (direction, active) {
- var delta = direction == 'prev' ? -1 : 1
var activeIndex = this.getItemIndex(active)
+ var willWrap = (direction == 'prev' && activeIndex === 0)
+ || (direction == 'next' && activeIndex == (this.$items.length
- 1))
+ if (willWrap && !this.options.wrap) return active
+ var delta = direction == 'prev' ? -1 : 1
var itemIndex = (activeIndex + delta) % this.$items.length
return this.$items.eq(itemIndex)
}
@@ -404,14 +418,8 @@ if (typeof jQuery === 'undefined') {
var $next = next || this.getItemForDirection(type, $active)
var isCycling = this.interval
var direction = type == 'next' ? 'left' : 'right'
- var fallback = type == 'next' ? 'first' : 'last'
var that = this
- if (!$next.length) {
- if (!this.options.wrap) return
- $next = this.$element.find('.item')[fallback]()
- }
-
if ($next.hasClass('active')) return (this.sliding = false)
var relatedTarget = $next[0]
@@ -528,13 +536,14 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: collapse.js v3.3.0
+ * Bootstrap: collapse.js v3.3.7
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
+/* jshint latedef: false */
+function ($) {
'use strict';
@@ -545,7 +554,8 @@ if (typeof jQuery === 'undefined') {
var Collapse = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, Collapse.DEFAULTS, options)
- this.$trigger = $(this.options.trigger).filter('[href="#' +
element.id + '"], [data-target="#' + element.id + '"]')
+ this.$trigger = $('[data-toggle="collapse"][href="#' + element.id +
'"],' +
+ '[data-toggle="collapse"][data-target="#' +
element.id + '"]')
this.transitioning = null
if (this.options.parent) {
@@ -557,13 +567,12 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle()
}
- Collapse.VERSION = '3.3.0'
+ Collapse.VERSION = '3.3.7'
Collapse.TRANSITION_DURATION = 350
Collapse.DEFAULTS = {
- toggle: true,
- trigger: '[data-toggle="collapse"]'
+ toggle: true
}
Collapse.prototype.dimension = function () {
@@ -575,7 +584,7 @@ if (typeof jQuery === 'undefined') {
if (this.transitioning || this.$element.hasClass('in')) return
var activesData
- var actives = this.$parent && this.$parent.find('> .panel').children('.in,
.collapsing')
+ var actives = this.$parent &&
this.$parent.children('.panel').children('.in, .collapsing')
if (actives && actives.length) {
activesData = actives.data('bs.collapse')
@@ -701,7 +710,7 @@ if (typeof jQuery === 'undefined') {
var data = $this.data('bs.collapse')
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof
option == 'object' && option)
- if (!data && options.toggle && option == 'show') options.toggle = false
+ if (!data && options.toggle && /show|hide/.test(option)) options.toggle
= false
if (!data) $this.data('bs.collapse', (data = new Collapse(this,
options)))
if (typeof option == 'string') data[option]()
})
@@ -732,7 +741,7 @@ if (typeof jQuery === 'undefined') {
var $target = getTargetFromTrigger($this)
var data = $target.data('bs.collapse')
- var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this
})
+ var option = data ? 'toggle' : $this.data()
Plugin.call($target, option)
})
@@ -740,10 +749,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: dropdown.js v3.3.0
+ * Bootstrap: dropdown.js v3.3.7
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -760,7 +769,41 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle)
}
- Dropdown.VERSION = '3.3.0'
+ Dropdown.VERSION = '3.3.7'
+
+ function getParent($this) {
+ var selector = $this.attr('data-target')
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && /#[A-Za-z]/.test(selector) &&
selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+ }
+
+ var $parent = selector && $(selector)
+
+ return $parent && $parent.length ? $parent : $this.parent()
+ }
+
+ function clearMenus(e) {
+ if (e && e.which === 3) return
+ $(backdrop).remove()
+ $(toggle).each(function () {
+ var $this = $(this)
+ var $parent = getParent($this)
+ var relatedTarget = { relatedTarget: this }
+
+ if (!$parent.hasClass('open')) return
+
+ if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName)
&& $.contains($parent[0], e.target)) return
+
+ $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+
+ if (e.isDefaultPrevented()) return
+
+ $this.attr('aria-expanded', 'false')
+ $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown',
relatedTarget))
+ })
+ }
Dropdown.prototype.toggle = function (e) {
var $this = $(this)
@@ -775,7 +818,10 @@ if (typeof jQuery === 'undefined') {
if (!isActive) {
if ('ontouchstart' in document.documentElement &&
!$parent.closest('.navbar-nav').length) {
// if mobile we use a backdrop because click events don't delegate
- $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click',
clearMenus)
+ $(document.createElement('div'))
+ .addClass('dropdown-backdrop')
+ .insertAfter($(this))
+ .on('click', clearMenus)
}
var relatedTarget = { relatedTarget: this }
@@ -789,14 +835,14 @@ if (typeof jQuery === 'undefined') {
$parent
.toggleClass('open')
- .trigger('shown.bs.dropdown', relatedTarget)
+ .trigger($.Event('shown.bs.dropdown', relatedTarget))
}
return false
}
Dropdown.prototype.keydown = function (e) {
- if (!/(38|40|27|32)/.test(e.which)) return
+ if (!/(38|40|27|32)/.test(e.which) ||
/input|textarea/i.test(e.target.tagName)) return
var $this = $(this)
@@ -808,57 +854,25 @@ if (typeof jQuery === 'undefined') {
var $parent = getParent($this)
var isActive = $parent.hasClass('open')
- if ((!isActive && e.which != 27) || (isActive && e.which == 27)) {
+ if (!isActive && e.which != 27 || isActive && e.which == 27) {
if (e.which == 27) $parent.find(toggle).trigger('focus')
return $this.trigger('click')
}
- var desc = ' li:not(.divider):visible a'
- var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' +
desc)
+ var desc = ' li:not(.disabled):visible a'
+ var $items = $parent.find('.dropdown-menu' + desc)
if (!$items.length) return
var index = $items.index(e.target)
- if (e.which == 38 && index > 0) index--
// up
- if (e.which == 40 && index < $items.length - 1) index++
// down
- if (!~index) index = 0
+ if (e.which == 38 && index > 0) index-- // up
+ if (e.which == 40 && index < $items.length - 1) index++ // down
+ if (!~index) index = 0
$items.eq(index).trigger('focus')
}
- function clearMenus(e) {
- if (e && e.which === 3) return
- $(backdrop).remove()
- $(toggle).each(function () {
- var $this = $(this)
- var $parent = getParent($this)
- var relatedTarget = { relatedTarget: this }
-
- if (!$parent.hasClass('open')) return
-
- $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-
- if (e.isDefaultPrevented()) return
-
- $this.attr('aria-expanded', 'false')
- $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
- })
- }
-
- function getParent($this) {
- var selector = $this.attr('data-target')
-
- if (!selector) {
- selector = $this.attr('href')
- selector = selector && /#[A-Za-z]/.test(selector) &&
selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
- }
-
- var $parent = selector && $(selector)
-
- return $parent && $parent.length ? $parent : $this.parent()
- }
-
// DROPDOWN PLUGIN DEFINITION
// ==========================
@@ -896,16 +910,15 @@ if (typeof jQuery === 'undefined') {
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) {
e.stopPropagation() })
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
- .on('keydown.bs.dropdown.data-api', '[role="menu"]',
Dropdown.prototype.keydown)
- .on('keydown.bs.dropdown.data-api', '[role="listbox"]',
Dropdown.prototype.keydown)
+ .on('keydown.bs.dropdown.data-api', '.dropdown-menu',
Dropdown.prototype.keydown)
}(jQuery);
/* ========================================================================
- * Bootstrap: modal.js v3.3.0
+ * Bootstrap: modal.js v3.3.7
* http://getbootstrap.com/javascript/#modals
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -917,12 +930,15 @@ if (typeof jQuery === 'undefined') {
// ======================
var Modal = function (element, options) {
- this.options = options
- this.$body = $(document.body)
- this.$element = $(element)
- this.$backdrop =
- this.isShown = null
- this.scrollbarWidth = 0
+ this.options = options
+ this.$body = $(document.body)
+ this.$element = $(element)
+ this.$dialog = this.$element.find('.modal-dialog')
+ this.$backdrop = null
+ this.isShown = null
+ this.originalBodyPad = null
+ this.scrollbarWidth = 0
+ this.ignoreBackdropClick = false
if (this.options.remote) {
this.$element
@@ -933,7 +949,7 @@ if (typeof jQuery === 'undefined') {
}
}
- Modal.VERSION = '3.3.0'
+ Modal.VERSION = '3.3.7'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -959,13 +975,20 @@ if (typeof jQuery === 'undefined') {
this.isShown = true
this.checkScrollbar()
+ this.setScrollbar()
this.$body.addClass('modal-open')
- this.setScrollbar()
this.escape()
+ this.resize()
this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]',
$.proxy(this.hide, this))
+ this.$dialog.on('mousedown.dismiss.bs.modal', function () {
+ that.$element.one('mouseup.dismiss.bs.modal', function (e) {
+ if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
+ })
+ })
+
this.backdrop(function () {
var transition = $.support.transition && that.$element.hasClass('fade')
@@ -977,20 +1000,20 @@ if (typeof jQuery === 'undefined') {
.show()
.scrollTop(0)
+ that.adjustDialog()
+
if (transition) {
that.$element[0].offsetWidth // force reflow
}
- that.$element
- .addClass('in')
- .attr('aria-hidden', false)
+ that.$element.addClass('in')
that.enforceFocus()
var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
transition ?
- that.$element.find('.modal-dialog') // wait for modal to slide in
+ that.$dialog // wait for modal to slide in
.one('bsTransitionEnd', function () {
that.$element.trigger('focus').trigger(e)
})
@@ -1011,13 +1034,16 @@ if (typeof jQuery === 'undefined') {
this.isShown = false
this.escape()
+ this.resize()
$(document).off('focusin.bs.modal')
this.$element
.removeClass('in')
- .attr('aria-hidden', true)
.off('click.dismiss.bs.modal')
+ .off('mouseup.dismiss.bs.modal')
+
+ this.$dialog.off('mousedown.dismiss.bs.modal')
$.support.transition && this.$element.hasClass('fade') ?
this.$element
@@ -1030,7 +1056,9 @@ if (typeof jQuery === 'undefined') {
$(document)
.off('focusin.bs.modal') // guard against infinite focus loop
.on('focusin.bs.modal', $.proxy(function (e) {
- if (this.$element[0] !== e.target &&
!this.$element.has(e.target).length) {
+ if (document !== e.target &&
+ this.$element[0] !== e.target &&
+ !this.$element.has(e.target).length) {
this.$element.trigger('focus')
}
}, this))
@@ -1046,11 +1074,20 @@ if (typeof jQuery === 'undefined') {
}
}
+ Modal.prototype.resize = function () {
+ if (this.isShown) {
+ $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
+ } else {
+ $(window).off('resize.bs.modal')
+ }
+ }
+
Modal.prototype.hideModal = function () {
var that = this
this.$element.hide()
this.backdrop(function () {
that.$body.removeClass('modal-open')
+ that.resetAdjustments()
that.resetScrollbar()
that.$element.trigger('hidden.bs.modal')
})
@@ -1068,14 +1105,20 @@ if (typeof jQuery === 'undefined') {
if (this.isShown && this.options.backdrop) {
var doAnimate = $.support.transition && animate
- this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
- .prependTo(this.$element)
- .on('click.dismiss.bs.modal', $.proxy(function (e) {
- if (e.target !== e.currentTarget) return
- this.options.backdrop == 'static'
- ? this.$element[0].focus.call(this.$element[0])
- : this.hide.call(this)
- }, this))
+ this.$backdrop = $(document.createElement('div'))
+ .addClass('modal-backdrop ' + animate)
+ .appendTo(this.$body)
+
+ this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+ if (this.ignoreBackdropClick) {
+ this.ignoreBackdropClick = false
+ return
+ }
+ if (e.target !== e.currentTarget) return
+ this.options.backdrop == 'static'
+ ? this.$element[0].focus()
+ : this.hide()
+ }, this))
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
@@ -1107,21 +1150,49 @@ if (typeof jQuery === 'undefined') {
}
}
+ // these following methods are used to handle overflowing modals
+
+ Modal.prototype.handleUpdate = function () {
+ this.adjustDialog()
+ }
+
+ Modal.prototype.adjustDialog = function () {
+ var modalIsOverflowing = this.$element[0].scrollHeight >
document.documentElement.clientHeight
+
+ this.$element.css({
+ paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ?
this.scrollbarWidth : '',
+ paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ?
this.scrollbarWidth : ''
+ })
+ }
+
+ Modal.prototype.resetAdjustments = function () {
+ this.$element.css({
+ paddingLeft: '',
+ paddingRight: ''
+ })
+ }
+
Modal.prototype.checkScrollbar = function () {
+ var fullWindowWidth = window.innerWidth
+ if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
+ var documentElementRect =
document.documentElement.getBoundingClientRect()
+ fullWindowWidth = documentElementRect.right -
Math.abs(documentElementRect.left)
+ }
+ this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
this.scrollbarWidth = this.measureScrollbar()
}
Modal.prototype.setScrollbar = function () {
var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
- if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad +
this.scrollbarWidth)
+ this.originalBodyPad = document.body.style.paddingRight || ''
+ if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad +
this.scrollbarWidth)
}
Modal.prototype.resetScrollbar = function () {
- this.$body.css('padding-right', '')
+ this.$body.css('padding-right', this.originalBodyPad)
}
Modal.prototype.measureScrollbar = function () { // thx walsh
- if (document.body.clientWidth >= window.innerWidth) return 0
var scrollDiv = document.createElement('div')
scrollDiv.className = 'modal-scrollbar-measure'
this.$body.append(scrollDiv)
@@ -1184,11 +1255,11 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: tooltip.js v3.3.0
+ * Bootstrap: tooltip.js v3.3.7
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -1200,17 +1271,18 @@ if (typeof jQuery === 'undefined') {
// ===============================
var Tooltip = function (element, options) {
- this.type =
- this.options =
- this.enabled =
- this.timeout =
- this.hoverState =
+ this.type = null
+ this.options = null
+ this.enabled = null
+ this.timeout = null
+ this.hoverState = null
this.$element = null
+ this.inState = null
this.init('tooltip', element, options)
}
- Tooltip.VERSION = '3.3.0'
+ Tooltip.VERSION = '3.3.7'
Tooltip.TRANSITION_DURATION = 150
@@ -1235,7 +1307,12 @@ if (typeof jQuery === 'undefined') {
this.type = type
this.$element = $(element)
this.options = this.getOptions(options)
- this.$viewport = this.options.viewport && $(this.options.viewport.selector
|| this.options.viewport)
+ this.$viewport = this.options.viewport &&
$($.isFunction(this.options.viewport) ? this.options.viewport.call(this,
this.$element) : (this.options.viewport.selector || this.options.viewport))
+ this.inState = { click: false, hover: false, focus: false }
+
+ if (this.$element[0] instanceof document.constructor &&
!this.options.selector) {
+ throw new Error('`selector` option must be specified when initializing '
+ this.type + ' on the window.document object!')
+ }
var triggers = this.options.trigger.split(' ')
@@ -1290,16 +1367,20 @@ if (typeof jQuery === 'undefined') {
var self = obj instanceof this.constructor ?
obj : $(obj.currentTarget).data('bs.' + this.type)
- if (self && self.$tip && self.$tip.is(':visible')) {
- self.hoverState = 'in'
- return
- }
-
if (!self) {
self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
$(obj.currentTarget).data('bs.' + this.type, self)
}
+ if (obj instanceof $.Event) {
+ self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true
+ }
+
+ if (self.tip().hasClass('in') || self.hoverState == 'in') {
+ self.hoverState = 'in'
+ return
+ }
+
clearTimeout(self.timeout)
self.hoverState = 'in'
@@ -1311,6 +1392,14 @@ if (typeof jQuery === 'undefined') {
}, self.options.delay.show)
}
+ Tooltip.prototype.isInStateTrue = function () {
+ for (var key in this.inState) {
+ if (this.inState[key]) return true
+ }
+
+ return false
+ }
+
Tooltip.prototype.leave = function (obj) {
var self = obj instanceof this.constructor ?
obj : $(obj.currentTarget).data('bs.' + this.type)
@@ -1320,6 +1409,12 @@ if (typeof jQuery === 'undefined') {
$(obj.currentTarget).data('bs.' + this.type, self)
}
+ if (obj instanceof $.Event) {
+ self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false
+ }
+
+ if (self.isInStateTrue()) return
+
clearTimeout(self.timeout)
self.hoverState = 'out'
@@ -1366,6 +1461,7 @@ if (typeof jQuery === 'undefined') {
.data('bs.' + this.type, this)
this.options.container ? $tip.appendTo(this.options.container) :
$tip.insertAfter(this.$element)
+ this.$element.trigger('inserted.bs.' + this.type)
var pos = this.getPosition()
var actualWidth = $tip[0].offsetWidth
@@ -1373,13 +1469,12 @@ if (typeof jQuery === 'undefined') {
if (autoPlace) {
var orgPlacement = placement
- var $container = this.options.container ? $(this.options.container)
: this.$element.parent()
- var containerDim = this.getPosition($container)
+ var viewportDim = this.getPosition(this.$viewport)
- placement = placement == 'bottom' && pos.bottom + actualHeight >
containerDim.bottom ? 'top' :
- placement == 'top' && pos.top - actualHeight <
containerDim.top ? 'bottom' :
- placement == 'right' && pos.right + actualWidth >
containerDim.width ? 'left' :
- placement == 'left' && pos.left - actualWidth <
containerDim.left ? 'right' :
+ placement = placement == 'bottom' && pos.bottom + actualHeight >
viewportDim.bottom ? 'top' :
+ placement == 'top' && pos.top - actualHeight <
viewportDim.top ? 'bottom' :
+ placement == 'right' && pos.right + actualWidth >
viewportDim.width ? 'left' :
+ placement == 'left' && pos.left - actualWidth <
viewportDim.left ? 'right' :
placement
$tip
@@ -1420,8 +1515,8 @@ if (typeof jQuery === 'undefined') {
if (isNaN(marginTop)) marginTop = 0
if (isNaN(marginLeft)) marginLeft = 0
- offset.top = offset.top + marginTop
- offset.left = offset.left + marginLeft
+ offset.top += marginTop
+ offset.left += marginLeft
// $.fn.offset doesn't round pixel values
// so we use setOffset directly with our own function B-0
@@ -1457,10 +1552,10 @@ if (typeof jQuery === 'undefined') {
this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
}
- Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {
+ Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
this.arrow()
- .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
- .css(isHorizontal ? 'top' : 'left', '')
+ .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
+ .css(isVertical ? 'top' : 'left', '')
}
Tooltip.prototype.setContent = function () {
@@ -1473,14 +1568,16 @@ if (typeof jQuery === 'undefined') {
Tooltip.prototype.hide = function (callback) {
var that = this
- var $tip = this.tip()
+ var $tip = $(this.$tip)
var e = $.Event('hide.bs.' + this.type)
function complete() {
if (that.hoverState != 'in') $tip.detach()
- that.$element
- .removeAttr('aria-describedby')
- .trigger('hidden.bs.' + that.type)
+ if (that.$element) { // TODO: Check whether guarding this code with this
`if` is really necessary.
+ that.$element
+ .removeAttr('aria-describedby')
+ .trigger('hidden.bs.' + that.type)
+ }
callback && callback()
}
@@ -1490,7 +1587,7 @@ if (typeof jQuery === 'undefined') {
$tip.removeClass('in')
- $.support.transition && this.$tip.hasClass('fade') ?
+ $.support.transition && $tip.hasClass('fade') ?
$tip
.one('bsTransitionEnd', complete)
.emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
@@ -1503,7 +1600,7 @@ if (typeof jQuery === 'undefined') {
Tooltip.prototype.fixTitle = function () {
var $e = this.$element
- if ($e.attr('title') || typeof ($e.attr('data-original-title')) !=
'string') {
+ if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string')
{
$e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
}
}
@@ -1523,7 +1620,10 @@ if (typeof jQuery === 'undefined') {
// width and height are missing in IE8, so compute them manually; see
https://github.com/twbs/bootstrap/issues/14093
elRect = $.extend({}, elRect, { width: elRect.right - elRect.left,
height: elRect.bottom - elRect.top })
}
- var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
+ var isSvg = window.SVGElement && el instanceof window.SVGElement
+ // Avoid using $.offset() on SVGs since it gives incorrect results in
jQuery 3.
+ // See https://github.com/twbs/bootstrap/issues/20280
+ var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null :
$element.offset())
var scroll = { scroll: isBody ? document.documentElement.scrollTop ||
document.body.scrollTop : $element.scrollTop() }
var outerDims = isBody ? { width: $(window).width(), height:
$(window).height() } : null
@@ -1531,10 +1631,10 @@ if (typeof jQuery === 'undefined') {
}
Tooltip.prototype.getCalculatedOffset = function (placement, pos,
actualWidth, actualHeight) {
- return placement == 'bottom' ? { top: pos.top + pos.height, left:
pos.left + pos.width / 2 - actualWidth / 2 } :
- placement == 'top' ? { top: pos.top - actualHeight, left:
pos.left + pos.width / 2 - actualWidth / 2 } :
+ return placement == 'bottom' ? { top: pos.top + pos.height, left:
pos.left + pos.width / 2 - actualWidth / 2 } :
+ placement == 'top' ? { top: pos.top - actualHeight, left:
pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'left' ? { top: pos.top + pos.height / 2 -
actualHeight / 2, left: pos.left - actualWidth } :
- /* placement == 'right' */ { top: pos.top + pos.height / 2 -
actualHeight / 2, left: pos.left + pos.width }
+ /* placement == 'right' */ { top: pos.top + pos.height / 2 -
actualHeight / 2, left: pos.left + pos.width }
}
@@ -1558,7 +1658,7 @@ if (typeof jQuery === 'undefined') {
var rightEdgeOffset = pos.left + viewportPadding + actualWidth
if (leftEdgeOffset < viewportDimensions.left) { // left overflow
delta.left = viewportDimensions.left - leftEdgeOffset
- } else if (rightEdgeOffset > viewportDimensions.width) { // right
overflow
+ } else if (rightEdgeOffset > viewportDimensions.right) { // right
overflow
delta.left = viewportDimensions.left + viewportDimensions.width -
rightEdgeOffset
}
}
@@ -1584,7 +1684,13 @@ if (typeof jQuery === 'undefined') {
}
Tooltip.prototype.tip = function () {
- return (this.$tip = this.$tip || $(this.options.template))
+ if (!this.$tip) {
+ this.$tip = $(this.options.template)
+ if (this.$tip.length != 1) {
+ throw new Error(this.type + ' `template` option must consist of
exactly 1 top-level element!')
+ }
+ }
+ return this.$tip
}
Tooltip.prototype.arrow = function () {
@@ -1613,7 +1719,13 @@ if (typeof jQuery === 'undefined') {
}
}
- self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+ if (e) {
+ self.inState.click = !self.inState.click
+ if (self.isInStateTrue()) self.enter(self)
+ else self.leave(self)
+ } else {
+ self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+ }
}
Tooltip.prototype.destroy = function () {
@@ -1621,6 +1733,13 @@ if (typeof jQuery === 'undefined') {
clearTimeout(this.timeout)
this.hide(function () {
that.$element.off('.' + that.type).removeData('bs.' + that.type)
+ if (that.$tip) {
+ that.$tip.detach()
+ }
+ that.$tip = null
+ that.$arrow = null
+ that.$viewport = null
+ that.$element = null
})
}
@@ -1630,18 +1749,12 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.tooltip')
- var options = typeof option == 'object' && option
- var selector = options && options.selector
-
- if (!data && option == 'destroy') return
- if (selector) {
- if (!data) $this.data('bs.tooltip', (data = {}))
- if (!data[selector]) data[selector] = new Tooltip(this, options)
- } else {
- if (!data) $this.data('bs.tooltip', (data = new Tooltip(this,
options)))
- }
+ var $this = $(this)
+ var data = $this.data('bs.tooltip')
+ var options = typeof option == 'object' && option
+
+ if (!data && /destroy|hide/.test(option)) return
+ if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
if (typeof option == 'string') data[option]()
})
}
@@ -1663,10 +1776,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: popover.js v3.3.0
+ * Bootstrap: popover.js v3.3.7
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -1683,7 +1796,7 @@ if (typeof jQuery === 'undefined') {
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
- Popover.VERSION = '3.3.0'
+ Popover.VERSION = '3.3.7'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
@@ -1739,29 +1852,18 @@ if (typeof jQuery === 'undefined') {
return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
}
- Popover.prototype.tip = function () {
- if (!this.$tip) this.$tip = $(this.options.template)
- return this.$tip
- }
-
// POPOVER PLUGIN DEFINITION
// =========================
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.popover')
- var options = typeof option == 'object' && option
- var selector = options && options.selector
-
- if (!data && option == 'destroy') return
- if (selector) {
- if (!data) $this.data('bs.popover', (data = {}))
- if (!data[selector]) data[selector] = new Popover(this, options)
- } else {
- if (!data) $this.data('bs.popover', (data = new Popover(this,
options)))
- }
+ var $this = $(this)
+ var data = $this.data('bs.popover')
+ var options = typeof option == 'object' && option
+
+ if (!data && /destroy|hide/.test(option)) return
+ if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
if (typeof option == 'string') data[option]()
})
}
@@ -1783,10 +1885,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: scrollspy.js v3.3.0
+ * Bootstrap: scrollspy.js v3.3.7
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -1798,10 +1900,8 @@ if (typeof jQuery === 'undefined') {
// ==========================
function ScrollSpy(element, options) {
- var process = $.proxy(this.process, this)
-
- this.$body = $('body')
- this.$scrollElement = $(element).is('body') ? $(window) : $(element)
+ this.$body = $(document.body)
+ this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
this.selector = (this.options.target || '') + ' .nav li > a'
this.offsets = []
@@ -1809,12 +1909,12 @@ if (typeof jQuery === 'undefined') {
this.activeTarget = null
this.scrollHeight = 0
- this.$scrollElement.on('scroll.bs.scrollspy', process)
+ this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
this.refresh()
this.process()
}
- ScrollSpy.VERSION = '3.3.0'
+ ScrollSpy.VERSION = '3.3.7'
ScrollSpy.DEFAULTS = {
offset: 10
@@ -1825,20 +1925,19 @@ if (typeof jQuery === 'undefined') {
}
ScrollSpy.prototype.refresh = function () {
- var offsetMethod = 'offset'
- var offsetBase = 0
+ var that = this
+ var offsetMethod = 'offset'
+ var offsetBase = 0
+
+ this.offsets = []
+ this.targets = []
+ this.scrollHeight = this.getScrollHeight()
if (!$.isWindow(this.$scrollElement[0])) {
offsetMethod = 'position'
offsetBase = this.$scrollElement.scrollTop()
}
- this.offsets = []
- this.targets = []
- this.scrollHeight = this.getScrollHeight()
-
- var self = this
-
this.$body
.find(this.selector)
.map(function () {
@@ -1853,8 +1952,8 @@ if (typeof jQuery === 'undefined') {
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
- self.offsets.push(this[0])
- self.targets.push(this[1])
+ that.offsets.push(this[0])
+ that.targets.push(this[1])
})
}
@@ -1883,7 +1982,7 @@ if (typeof jQuery === 'undefined') {
for (i = offsets.length; i--;) {
activeTarget != targets[i]
&& scrollTop >= offsets[i]
- && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+ && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
&& this.activate(targets[i])
}
}
@@ -1894,8 +1993,8 @@ if (typeof jQuery === 'undefined') {
this.clear()
var selector = this.selector +
- '[data-target="' + target + '"],' +
- this.selector + '[href="' + target + '"]'
+ '[data-target="' + target + '"],' +
+ this.selector + '[href="' + target + '"]'
var active = $(selector)
.parents('li')
@@ -1959,10 +2058,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: tab.js v3.3.0
+ * Bootstrap: tab.js v3.3.7
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -1974,10 +2073,12 @@ if (typeof jQuery === 'undefined') {
// ====================
var Tab = function (element) {
+ // jscs:disable requireDollarBeforejQueryAssignment
this.element = $(element)
+ // jscs:enable requireDollarBeforejQueryAssignment
}
- Tab.VERSION = '3.3.0'
+ Tab.VERSION = '3.3.7'
Tab.TRANSITION_DURATION = 150
@@ -2025,7 +2126,7 @@ if (typeof jQuery === 'undefined') {
var $active = container.find('> .active')
var transition = callback
&& $.support.transition
- && (($active.length && $active.hasClass('fade')) || !!container.find('>
.fade').length)
+ && ($active.length && $active.hasClass('fade') || !!container.find('>
.fade').length)
function next() {
$active
@@ -2048,7 +2149,7 @@ if (typeof jQuery === 'undefined') {
element.removeClass('fade')
}
- if (element.parent('.dropdown-menu')) {
+ if (element.parent('.dropdown-menu').length) {
element
.closest('li.dropdown')
.addClass('active')
@@ -2113,10 +2214,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
- * Bootstrap: affix.js v3.3.0
+ * Bootstrap: affix.js v3.3.7
* http://getbootstrap.com/javascript/#affix
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -2135,14 +2236,14 @@ if (typeof jQuery === 'undefined') {
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop,
this))
this.$element = $(element)
- this.affixed =
- this.unpin =
+ this.affixed = null
+ this.unpin = null
this.pinnedOffset = null
this.checkPosition()
}
- Affix.VERSION = '3.3.0'
+ Affix.VERSION = '3.3.7'
Affix.RESET = 'affix affix-top affix-bottom'
@@ -2167,7 +2268,7 @@ if (typeof jQuery === 'undefined') {
var colliderTop = initializing ? scrollTop : position.top
var colliderHeight = initializing ? targetHeight : height
- if (offsetTop != null && colliderTop <= offsetTop) return 'top'
+ if (offsetTop != null && scrollTop <= offsetTop) return 'top'
if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight
- offsetBottom)) return 'bottom'
return false
@@ -2192,7 +2293,7 @@ if (typeof jQuery === 'undefined') {
var offset = this.options.offset
var offsetTop = offset.top
var offsetBottom = offset.bottom
- var scrollHeight = $('body').height()
+ var scrollHeight = Math.max($(document).height(),
$(document.body).height())
if (typeof offset != 'object') offsetBottom = offsetTop = offset
if (typeof offsetTop == 'function') offsetTop =
offset.top(this.$element)
diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
index d839865..9bcd2fc 100644
--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
@@ -1,7 +1,7 @@
/*!
- * Bootstrap v3.3.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under the MIT license
*/
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires
jQuery");+function(a){var b=a.fn.jquery.split("
")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new
Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or
higher")}(jQuery),+function(a){"use strict";function b(){var
a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd
otransitionend",transition:"tran [...]
-})}}},c.prototype.activate=function(b,d,e){function
f(){g.removeClass("active").find("> .dropdown-menu >
.active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var
g=d.find("> .active" [...]
\ No newline at end of file
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires
jQuery");+function(a){"use strict";var b=a.fn.jquery.split("
")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new
Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but
lower than version 4")}(jQuery),+function(a){"use strict";function b(){var
a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"
[...]
+this.activeTarget=b,this.clear();var
c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var
d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return
[...]
\ No newline at end of file
diff --git a/faq.html.j2 b/faq.html.j2
index e6183be..edf3da6 100644
--- a/faq.html.j2
+++ b/faq.html.j2
@@ -7,43 +7,47 @@
<p>Taler does not use any Blockchain technology or Bitcoin directly.
Taler is not based on proof-of-work or any other distributed consensus
mechanism. Instead Taler is based on blind signatures.</p>
-
-<p>It would be possible, however, to withdraw Bitcoins into a Taler
-wallet (with an appropriate exchange), which would give some benefits
-over plain Bitcoin, such as instant confirmation times.</p>
+{% endtrans %}
+{% trans %}
+<p>It would be possible, however, to withdraw coins denominated in
+Bitcoin into a Taler wallet (with an appropriate exchange), which
+would give some benefits over plain Bitcoin, such as instant
+confirmation times.</p>
{% endtrans %}
<h2>{{ _("Where is the balance in my wallet stored?") }}</h2>
{% trans %}
-<p>Your wallet stores digital coins that were blindly signed by an
-exchange, and thus ultimately your computer holds your balance. The
-exchange keeps funds matching all unspent coins in an escrow bank
-account.</p>
+<p>Your wallet stores digital coins and thus ultimately your computer
+holds your balance. The exchange keeps funds matching all unspent
+coins in an escrow bank account.</p>
{% endtrans %}
-
<h2>{{ _("What if my wallet is lost?") }}</h2>
{% trans %}
<p>Since the digital coins of value in your wallet are anonymized, the
exchange can not assist you in recovering a lost or stolen wallet.
Just like with a physical wallet for cash, you are responsible for
keeping it safe.</p>
-
+{% endtrans %}
+{% trans %}
<p>The risk of losing a wallet can be mitigated by making backups or
keeping the balance reasonably low.</p>
-
-<p>In case of a compromise of one of your devices, an attacker that
-spends coins on your behalf will allow you to detect that your device
-has been compromised.</p>
{% endtrans %}
+<h2>{{ _("What if my computer is hacked?") }}</h2>
+{% trans %}
+<p>In case of a compromise of one of your devices, an attacker can
+spend coins from your wallet. Checking your balance might reveal
+to you that your device has been compromised.</p>
+{% endtrans %}
<h2>{{ _("Can I send money to my friend with Taler?") }}</h2>
{% trans %}
<p>If your friend provides goods or services for you in exchange for a
payment, they can easily set up a Taler merchant and receive the
payment in their bank account.</p>
-
+{% endtrans %}
+{% trans %}
<p>Future versions of the Taler wallet may allow exchanging coins
among friends directly as well.</p>
{% endtrans %}
@@ -53,10 +57,21 @@ among friends directly as well.</p>
{% trans %}
<p>Taler wallets can store digital coins corresponding to multiple
different currencies such as the Euro, US Dollars or Bitcoins.</p>
-
+{% endtrans %}
+{% trans %}
<p>Taler currently does not offer conversion between currencies.</p>
{% endtrans %}
+<h2>{{ _("How does Taler protect my privacy?") }}</h2>
+{% trans %}
+
+<p>Your wallet stores digital coins that are <a
+href="https://en.wikipedia.org/wiki/Blind_signature";>blindly
+signed</a> by an exchange. The use of a blind signature protects your
+privacy as it prevents the exchange from knowing which coin it signed
+for which customer.</p>
+
+{% endtrans %}
</div>
{% endblock body_content %}
diff --git a/governments.html.j2 b/governments.html.j2
index ec46cf2..be7ce52 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -4,15 +4,17 @@
<div class="jumbotron">
<div class="container text-center">
<h1>{{ _("Advantages for Governments") }}</h1>
- <p>{{ _("Taler provides accountability to ensure business
- accepting payments operate legally, while also
- respecting civil liberties of citizens spending
- digital cash. Taler is a commons, a payment system
- based on open standards and free software. Taler
- needs governments to set a financial framework and
- to act as trusted regulators. Taler contributes to
- digital sovereignty in the critical financial
- infrastructure.") }}</p>
+ <p>
+ {% trans %}
+ Taler provides accountability to ensure business operate
+ legally, while also respecting civil liberties of
+ citizens. Taler is a payment system based on
+ open standards and free software. Taler needs
+ governments as they set a financial framework and act as
+ trusted regulators. Taler contributes to digital
+ sovereignty in the critical financial infrastructure.
+ {% endtrans %}
+ </p>
</div>
</div>
@@ -22,72 +24,91 @@
<div class="col-lg-6">
<h3>{{ _("Taxable") }}</h3>
- <p>{{ _("Taler was
- built with the goal of fighting corruption and supporting
taxation.
- With Taler, the receiver of any form of payment is
- easily identified by the government, and the merchant
- can be compelled to provide the contract that was accepted
- by the customer. Governments can use this data to
- tax businesses and individuals based on their
- income, making tax evasion and black markets less
- viable.") }}</p>
-
- <p>{{ _("Thus, despite offering anonymity for citizens
- spending digital cash to buy goods and services,
- Taler also ensures that the state can observe
- incoming funds. This can be used to ensure
- businesses engage only in legal activities, and do
- not evade income tax, sales tax or value-added tax.
- However, this observational capability does not
- extend to the immediate personal domain. In
- particular, sharing access to funds within a family
- or synchronizing wallets across multiple devices is not
- subject to monitoring.") }}</p>
+ <p>
+ {% trans %}
+ Taler was built with the goal of fighting corruption and
+ supporting taxation. With Taler, the receiver of any
+ form of payment is easily identified by the government,
+ and the merchant can be compelled to provide the contract
+ that was accepted by the customer. Governments can use
+ this data to tax businesses and individuals based on
+ their income, making tax evasion and black markets less
+ viable.
+ {% endtrans %}
+ </p>
+
+ <p>
+ {% trans %}
+ Thus, despite offering anonymity for citizens spending
+ digital cash to buy goods and services, Taler also
+ ensures that the state can observe incoming funds. This
+ can be used to ensure businesses engage only in legal
+ activities, and do not evade income tax, sales tax or
+ value-added tax. However, this observational capability
+ does not extend to the immediate personal domain. In
+ particular, monitoring does not cover shared access to
+ funds with trusted friends and family, or synchronizing
+ wallets across multiple devices.
+ {% endtrans %}
+ </p>
+
+ </p>
</div>
<div class="col-lg-6">
<h3>{{ _("Secure") }}</h3>
- <p>{{ _("Taler's payments are cryptographically
- secured. Thus, customers, merchants and the
- exchange can mathematically demonstrate their
- lawful behavior in court in case of
+ <p>
+ {% trans %}
+ Taler's payments are cryptographically secured. Thus,
+ customers, merchants and the Taler payment service provider
+ (the exchange) can mathematically
+ demonstrate their lawful behavior in court in case of
disputes. Financial damages are strictly limited,
- improving economic security for individuals,
- merchants, the exchange and the state.") }}
-
- <p>{{ _("By design, the Taler payment service provider is
- subject to financial regulation. Financial
- regulation and regular audits are critical to
- establish trust. In particular, the Taler design
- mandates the existence of an independent auditor
- who checks cryptographic proofs that accumulate at
- the payment service provider to ensure that the
- escrow account is managed honestly. This ensures
- that the payment service provider does not threaten
- the economy due to fraud.") }}</p>
+ improving economic security for individuals, merchants,
+ the exchange and the state.
+ {% endtrans %}
+ </p>
+
+ <p>
+ {% trans %}
+ As a payment service provider, the Taler exchange is
+ subject to financial regulation. Financial regulation and
+ regular audits are critical to establish trust. In
+ particular, the Taler design mandates the existence of an
+ independent auditor who checks cryptographic proofs that
+ accumulate at the exchange to ensure that the escrow
+ account is managed honestly. This ensures that the
+ exchange does not threaten the economy due to fraud.
+ {% endtrans %}
+ </p>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<h3>{{ _("Libre") }}</h3>
- <p>{{ _("Taler is free software implementing an open
- protocol standard. Thus, Taler will enable
- competition and avoid the monopolization of payment
- systems that threatens global political and
- financial stability today.") }}</p>
-
+ <p>
+ {% trans %}
+ Taler is free software implementing an open protocol
+ standard. Thus, Taler will enable competition and avoid
+ the monopolization of payment systems that threatens
+ global political and financial stability today.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-6">
<h3>{{ _("Efficient") }}</h3>
- <p>{{ _("Taler has an efficient design. Unlike
- timeline-based payment systems, such as Bitcoin,
+ <p>
+ {% trans %}
+ Taler has an efficient design. Unlike
+ Blockchain-based payment systems, such as Bitcoin,
Taler will not threaten the availability of
national electric grids or (significantly)
- contribute to environmental pollution.") }}</p>
-
+ contribute to environmental pollution.
+ {% endtrans %}
+ </p>
</div>
</div>
</div>
@@ -98,14 +119,14 @@
<div class="container">
<h2 id="documentation">{{ _("Taler and regulation") }}</h2>
<dl>
- <dt>{{ _("Anti-money laundering (AML)")}}</dt>
+ <dt>{{ _("Anti money laundering (AML)")}}</dt>
<dd>{{ _("With Taler, income is visible and can be tied to the contract
signed by both parties.") }}</li>
- <dt>{{ _("Know-your-customer (KYC)")}}</dt>
+ <dt>{{ _("Know your customer (KYC)")}}</dt>
<dd>{{ _("In Taler, payer and payee are known by their bank accounts
when withdrawing or depositing coins respectively") }}</dd>
- <dt>{{ _("Privacy-by-design (GDPR)")}}</dt>
+ <dt>{{ _("General Data Protection Regulation (GDPR)")}}</dt>
<dd>{{ _("Taler cryptographically protects citizen's privacy, and by
design implements data minimization and privacy by default.") }}</dd>
- <dt>{{ _("Competitive banking (PSD2)")}}</dt>
- <dd>{{ _("Taler provides an open standard with public APIs contributing
to a level playing field.") }}</dt>
+ <dt>{{ _("Payment Services Directive (PSD2)")}}</dt>
+ <dd>{{ _("Taler provides an open standard with public APIs contributing
to a competitive banking sector.") }}</dt>
</dl>
</div>
</div>
@@ -115,36 +136,52 @@
<div class="col-lg-12">
<h2 id="overview">{{ _("Taler provides privacy and accountability") }}</h2>
- <p>{{ _("Taler assumes governments can observe traditional wire transfers
+ <p>
+ {% trans %}
+ Taler assumes governments can observe traditional wire transfers
entering and leaving the Taler payment system. Starting with the
- wire transfers, governments can obtain: ") }}</p>
- <ul>
+ wire transfers, governments can obtain:
+ {% endtrans %}
+ <ul>
- <li>{{ _("The total amount of digital currency withdrawn by a
+ <li>
+ {% trans %}
+ The total amount of digital currency withdrawn by a
customer. The government can impose limits on how much
digital cash a customer can withdraw within a
- given time frame.") }}</li>
-
- <li>{{ _("The income received by any merchant via the Taler
- system.") }}</li>
-
- <li>{{ _("The exact details of the underlying
- contract that was signed between customer and
- merchant. However, this information would
- typically not include the identity of the
- customer.") }}</li>
-
- <li>{{ _("The amounts of
- digital coins legitimately withdrawn by
- customers from the exchange, the value of
- non-redeemed digital coins in customer's
- wallets, the value and corresponding wire
- details of deposit operations performed by
- merchants with the exchange, and the income of
- the exchange from transaction fees.") }}</li>
-
+ given time frame.
+ {% endtrans %}
+ </li>
+
+ <li>
+ {% trans %}
+ The income received by any merchant via the Taler
+ system.
+ {% endtrans %}
+ </li>
+
+ <li>
+ {% trans %}
+
+ The exact details of the underlying contract that was
+ signed between customer and merchant. However, this
+ information would typically not include the identity
+ of the customer.
+ {% endtrans %}
+ </li>
+
+ <li>
+ {% trans %}
+ The amounts of digital coins legitimately withdrawn
+ by customers from the exchange, the value of
+ non-redeemed digital coins in customer's wallets, the
+ value and corresponding wire details of deposit
+ operations performed by merchants with the exchange,
+ and the income of the exchange from transaction fees.
+ {% endtrans %}
+ </li>
</ul>
- <p></p>
+ </p>
</div>
</div>
diff --git a/i18nfix.py b/i18nfix.py
new file mode 100644
index 0000000..b039550
--- /dev/null
+++ b/i18nfix.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+# This file is in the public domain.
+
+"""
+Extract translations from a Jinja2 template, stripping leading newlines.
+
address@hidden Florian Dold
+"""
+
+import jinja2.ext
+import re
+
+r = re.compile(r"\n[ \t]+")
+
+def babel_extract(fileobj, keywords, comment_tags, options):
+ res = jinja2.ext.babel_extract(fileobj, keywords, comment_tags, options)
+ for lineno, funcname, message, comments in res:
+ message = message.lstrip()
+ message = r.sub("\n", message)
+ yield lineno, funcname, message, comments
diff --git a/index.html.j2 b/index.html.j2
index aa171dc..6193a05 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -3,20 +3,23 @@
<!-- Jumbotron -->
<div class="jumbotron">
<div style="height: 40vh">
- <img alt="Taler logo" style="object-fit:contain;width:100%;height:100%"
class="center-block" src="{{ url('taler-big-accent.svg') }}" />
+ <img alt="GNU Taler logo"
style="object-fit:contain;width:100%;height:100%" class="center-block" src="{{
url('taler-big-accent.svg') }}" />
</div>
<div class="container text-center">
- <h1>{{ _("Independent One-Click Payments!") }}</h1>
+ <h1>{{ _("One-Click Cash Payments!") }}</h1>
+
<p>
{% trans %}
- Taler is an electronic payment system under
- development
- at <a href="http://www.inria.fr/";>Inria</a>. We expect to make it
operational in 2017.
- You can learn about Taler on this website, try the <a
href="https://demo.taler.net";>demo</a>
- and look at our <a href="https://docs.taler.net";>developer</a> and <a
href="https://api.taler.net";>API</a> documentation.
+ GNU Taler is an electronic payment system under development at
+ <a href="http://www.inria.fr/";>Inria</a>. We expect to make it
+ operational in 2017. You can learn about Taler on this website,
+ try the <a href="https://demo.taler.net";>demo</a> and look at
+ our <a href="https://docs.taler.net";>developer</a> and <a
+ href="https://api.taler.net";>API</a> documentation.
{% endtrans %}
</p>
+
</div>
</div>
@@ -40,24 +43,23 @@
<p>
{% trans %}
- Taler does not introduce a new currency with
- fluctuation risks, and instead uses a digital
- wallet holding coins in reserve. Taler's
- cryptographic coins correspond to existing
- currencies, such as US Dollars, Euros or even
- Bitcoins.
+ Taler does not introduce a new currency. Taler
+ uses a digital wallet storing coins and payment service
+ providers with escrow accounts in existing currencies.
+ Thus, Taler's cryptographic coins correspond to existing
+ currencies, such as US Dollars, Euros or even Bitcoins.
{% endtrans %}
</p>
</div>
<div class="col-lg-4">
- <h3>{{ _("Security-focused") }}</h3>
+ <h3>{{ _("Secure") }}</h3>
<p>
{% trans %}
By design Taler does not suffer from many classes
of security problems such as phishing or counterfeit.
- Despite its security features, Taler never rejects a legitimate
+ Thanks to its security features, Taler never rejects a legitimate
customer due to a fraud-detection false positive.
{% endtrans %}
</p>
@@ -70,7 +72,7 @@
<p>
{% trans %}
- When using Taler, merchants cannot hide their income from tax
+ When using Taler, merchant's revenue is transparent for tax
collection authorities. Unlike cash and most digital currencies,
Taler helps prevent black markets. Taler is not suitable for
illegal activities.
@@ -79,11 +81,11 @@
</div>
<div class="col-lg-4">
- <h3>{{ _("Privacy-friendly") }}</h3>
+ <h3>{{ _("Private") }}</h3>
<p>
{% trans %}
When you pay with Taler, your identity does not
- have to be revealed to the merchant. Just like
+ have to be revealed. Just like
payments in cash, nobody else can track how you
spent your electronic money. However, you obtain a
legally valid proof of payment.
@@ -118,7 +120,7 @@
on their device. Before the first payment, the wallet's balance must
be charged in the desired currency by some other means of payment.</p>
<p>Once the wallet is charged, payments on websites take only one click,
- are never falsely rejected by fraud detection and do not post any risk
+ are never falsely rejected by fraud detection and do not pose any risk
of phishing or identity theft.</p>
{% endtrans %}
</div>
@@ -126,10 +128,10 @@
<h2>{{ _("Receiving payments with Taler") }}</h2>
{% trans %}
<p>To receive Taler payments, a merchant needs a bank account
- in the desired currency. We provide
- SDKs in various languages to makes the integration painless.
+ in the desired currency. We provide supporting software
+ in various programming languages to make the integration painless.
The merchant's backend for Taler transaction processing can run
- on the merchant's premises or hosted.</p>
+ on the merchant's premises or be hosted by a third party.</p>
{% endtrans %}
</div>
</div>
diff --git a/investors.html.j2 b/investors.html.j2
index 31e0e97..551d938 100644
--- a/investors.html.j2
+++ b/investors.html.j2
@@ -35,9 +35,9 @@
<p>
{% trans %}
- We are currently supported by Inria, the French
+ We are currently supported by <a
href="http://www.inria.fr/";>Inria</a>, the French
national institute for research in informatics and
- automation, and the Renewable Freedom Foundation.
+ automation, and the <a
href="https://renewablefreedom.org/";>Renewable Freedom Foundation</a>.
{% endtrans %}
</p>
</div>
@@ -66,7 +66,7 @@
{% trans %}
The scalable business model for Taler is the operation
of the payment service provider, which converts money from
- traditional payment systems (MasterCard, SEPA,
+ traditional payment systems (MasterCard, SEPA, UPI,
Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous
electronic coins in the same currency. The customer
can then redeem the electronic coins at a merchant,
diff --git a/locale/babel.map b/locale/babel.map
index 85aebf5..f8794b1 100644
--- a/locale/babel.map
+++ b/locale/babel.map
@@ -1,5 +1,7 @@
[extractors]
-jinja2 = jinja2.ext:babel_extract
+jinja2 = i18nfix:babel_extract
[jinja2: **.j2]
encoding = utf-8
+lstrip_blocks = True
+trim_blocks = True
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 3cac8e5..b0453b0 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-08 10:25+0100\n"
+"POT-Creation-Date: 2017-03-15 11:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: de\n"
@@ -94,12 +94,6 @@ msgstr "Softwareentwickler. Arbeitet an der Android
Geldbörse"
msgid "Taler System Architecture"
msgstr ""
-#: architecture.html.j2:8
-msgid ""
-"\n"
-" "
-msgstr ""
-
#: bibliography.html.j2:4
msgid "GNU Taler Bibliography"
msgstr ""
@@ -123,69 +117,69 @@ msgstr ""
#: citizens.html.j2:9
msgid ""
-"\n"
-" Taler largely functions like digital cash. You\n"
-" withdraw money from your bank account into your\n"
-" electronic wallet, and can henceforth spend digital\n"
-" cash. The electronic wallet can carry multiple\n"
-" currencies.\n"
-" "
+"Taler largely functions like digital cash. You\n"
+"withdraw money from your bank account into your\n"
+"electronic wallet, and can henceforth spend digital\n"
+"cash. The electronic wallet can carry multiple\n"
+"currencies.\n"
msgstr ""
-#: citizens.html.j2:25
-msgid "Security"
-msgstr "Sicherheit"
+#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
+#: merchants.html.j2:41
+msgid "Secure"
+msgstr "Sicher"
#: citizens.html.j2:27
msgid ""
"Taler uses modern cryptography, ensuring that there\n"
-" is no counterfeit. Your digital wallet is safer\n"
-" than your physical wallet. At most, you can lose\n"
-" its contents because your computer or mobile is\n"
-" irreparably damaged or compromised. Unlike a\n"
-" physical wallet, you can make backups to secure\n"
-" against data loss."
+"is no counterfeit. Your digital wallet is safer\n"
+"than your physical wallet. At most, you can lose\n"
+"its contents because your computer or mobile is\n"
+"irreparably damaged or compromised. Unlike a\n"
+"physical wallet, you can make backups to secure\n"
+"against data loss."
msgstr ""
-#: citizens.html.j2:37
-msgid "Privacy"
-msgstr "Privatsphäre"
+#: citizens.html.j2:37 index.html.j2:83
+msgid "Private"
+msgstr ""
#: citizens.html.j2:39
msgid ""
-"Your transactions are private, neither the exchange\n"
-" nor merchant needs to learn your identity. There is\n"
-" no need to give out credit card numbers or other\n"
-" sensitive information. The merchant will only be\n"
-" able to do exactly the transaction you agreed to."
+"Your transactions are private, neither the payment\n"
+"service provider nor merchant needs to learn your\n"
+"identity. There is no need to give out credit card\n"
+"numbers or other sensitive information. The merchant\n"
+"will only be able to do exactly the transaction you\n"
+"agreed to."
msgstr ""
#: citizens.html.j2:50
-msgid "Convenience"
-msgstr "Bequemlichkeit"
+msgid "Convenient"
+msgstr ""
#: citizens.html.j2:52
msgid ""
"You will be able to withdraw money to replenish the\n"
-" digital coins in your wallet using your credit card\n"
-" or wire transfers. Afterwards you can pay with\n"
-" one-click using the Taler wallet, which optionally\n"
-" keeps your transaction history on your computer."
+"digital coins in your wallet using your credit card\n"
+"or wire transfers. Afterwards you can pay with\n"
+"one-click using the Taler wallet, which optionally\n"
+"keeps your transaction history on your computer."
msgstr ""
-#: citizens.html.j2:61
-msgid "Stability"
-msgstr "Stabilität"
+#: citizens.html.j2:61 index.html.j2:41
+msgid "Stable"
+msgstr ""
#: citizens.html.j2:63
msgid ""
"Coins in your digital wallet will be of the same\n"
-" denomination as the cash in your physical wallet.\n"
-" Taler is not a crypto-currency, so you do not have\n"
-" to worry about cryto-currency related value\n"
-" fluctuations. Banking with Taler is subject to the\n"
-" usual government protections for financial\n"
-" services."
+"denomination as the cash in your physical wallet.\n"
+"Taler is not a crypto-currency, so you do not have\n"
+"to worry about cryto-currency related value\n"
+"fluctuations. Banking with Taler is subject to the\n"
+"usual government protections for financial\n"
+"services."
msgstr ""
#: citizens.html.j2:79
@@ -194,12 +188,10 @@ msgstr ""
#: citizens.html.j2:81
msgid ""
-"\n"
-" We currently provide a <a href=\"wallet.html\">wallet browser "
+"We currently provide a <a href=\"wallet.html\">wallet browser "
"extension</a> for Chromium, Chrome, Firefox, Opera\n"
-" and Edge. Wallets for mobile phones and other platforms will be "
+"and Edge. Wallets for mobile phones and other platforms will be "
"available in the future.\n"
-" "
msgstr ""
#: citizens.html.j2:88
@@ -208,10 +200,8 @@ msgstr ""
#: citizens.html.j2:90
msgid ""
-"\n"
-" You can see how Taler works in practice by visiting our <a "
+"You can see how Taler works in practice by visiting our <a "
"href=\"https://demo.taler.net\";>demo page</a>.\n"
-" "
msgstr ""
#: citizens.html.j2:103
@@ -221,38 +211,37 @@ msgstr ""
#: citizens.html.j2:105
msgid ""
"Customers interact with the Taler system using\n"
-" the Taler wallet:"
+"the Taler wallet:"
msgstr ""
-#: citizens.html.j2:108
+#: citizens.html.j2:110
msgid ""
-"To <b>withdraw</b> electronic coins, the customer transfers funds\n"
-" from his bank account to the Taler exchange. The wire\n"
-" transfer subject must match a code generated by the "
-"customer's\n"
-" wallet. After the wire transfer is complete, the wallet"
-" will\n"
-" automatically withdraw the coins."
+"To <b>withdraw</b> electronic coins, the customer\n"
+"transfers funds from his bank account to the Taler\n"
+"payment service provider (the exchange). The wire\n"
+"transfer subject must match a code identifying the\n"
+"customer's wallet. After the wire transfer is\n"
+"complete, the wallet will automatically withdraw the\n"
+"coins from the exchange."
msgstr ""
-#: citizens.html.j2:114
+#: citizens.html.j2:118
msgid ""
-"To <b>spend</b> electronic coins, a merchant must cause the wallet\n"
-" to display a proposal and ask for one-click "
-"confirmation.\n"
-" Payment is then instant.\n"
-" Transaction histories and digitally signed contracts "
-"can be\n"
-" preserved by the wallet."
+"To <b>spend</b> electronic coins, a merchant must\n"
+"cause the wallet to display a proposal for some\n"
+"purchase. The wallet will ask the customer for\n"
+"one-click confirmation. Payment is then instant.\n"
+"Transaction histories and digitally signed contracts\n"
+"can be preserved by the wallet."
msgstr ""
-#: citizens.html.j2:120
+#: citizens.html.j2:125
msgid ""
"The customer can use the wallet to <b>review</b> his\n"
-" balance. The wallet can contain different currencies,\n"
-" and may be shared across devices. Customers can make\n"
-" backups of the wallet to secure its contents against\n"
-" hardware failures."
+"balance. The wallet can contain different\n"
+"currencies, and may be shared across\n"
+"devices. Customers can make backups of the wallet to\n"
+"secure its contents against hardware failures."
msgstr ""
#: contact.html.j2:6
@@ -265,14 +254,12 @@ msgstr ""
#: contact.html.j2:15
msgid ""
-"\n"
-" An archived, public mailing list for GNU Taler is\n"
-" hosted at\n"
-" <a "
+"An archived, public mailing list for GNU Taler is\n"
+"hosted at\n"
+"<a "
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
" You can send messages to the list\n"
-" at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
-" "
+"at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
msgstr ""
#: contact.html.j2:25
@@ -281,11 +268,9 @@ msgstr ""
#: contact.html.j2:27
msgid ""
-"\n"
-" Team members are generally reachable at\n"
-" <tt>address@hidden</tt>. All of us\n"
-" support receiving GnuPG encrypted e-mails.\n"
-" "
+"Team members are generally reachable at\n"
+"<tt>address@hidden</tt>. All of us\n"
+"support receiving GnuPG encrypted e-mails.\n"
msgstr ""
#: contact.html.j2:36
@@ -294,13 +279,11 @@ msgstr ""
#: contact.html.j2:38
msgid ""
-"\n"
-" We track open feature requests and bugs in our\n"
-" <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
-" which is shared with the GNUnet project.\n"
-" You can also report bugs or feature requests to the\n"
-" mailing list.\n"
-" "
+"We track open feature requests and bugs in our\n"
+"<a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+"which is shared with the GNUnet project.\n"
+"You can also report bugs or feature requests to the\n"
+"mailing list.\n"
msgstr ""
#: contact.html.j2:49
@@ -309,274 +292,254 @@ msgstr ""
#: contact.html.j2:51
msgid ""
-"\n"
-" For non-technical commercial requests, please contact\n"
-" <tt>ceo AT taler.net</tt>.\n"
-" "
+"For non-technical commercial requests, please contact\n"
+"<tt>ceo AT taler.net</tt>.\n"
msgstr ""
#: developers.html.j2:5
msgid "Taler for developers"
msgstr "Taler für Entwickler"
-#: developers.html.j2:12
+#: developers.html.j2:12 merchants.html.j2:58
msgid "Free"
msgstr "Frei"
#: developers.html.j2:15
msgid ""
-"\n"
-" Taler is free software implementing an open\n"
-" protocol. Anybody is welcome to inspect our code\n"
-" and integrate our reference implementation into\n"
-" their applications. Different components of Taler\n"
-" are being made available under different\n"
-" licenses. The Affero GPLv3+ is used for the\n"
-" exchange, the LGPLv3+ is used for reference code\n"
-" demonstrating integration with merchant platforms,\n"
-" and licenses like Apache/Mozilla/GPLv3+ are used\n"
-" for wallets and related customer-facing software.\n"
-" We are open for constructive suggestions for\n"
-" maximizing the adoption of this libre payment\n"
-" platform.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:34
+"GNU Taler is free software implementing an open\n"
+"protocol. Anybody is welcome to integrate our reference\n"
+"implementation into their applications. Different\n"
+"components of Taler are being made available under\n"
+"different licenses. The Affero GPLv3+ is used for the\n"
+"exchange, the LGPLv3+ is used for reference code\n"
+"demonstrating integration with merchant platforms, and\n"
+"licenses like GPLv3+ are used for\n"
+"wallets and related customer-facing software. We are\n"
+"open for constructive suggestions for maximizing the\n"
+"adoption of this payment platform.\n"
+msgstr ""
+
+#: developers.html.j2:32
msgid "RESTful"
msgstr "REST-basiert"
-#: developers.html.j2:37
+#: developers.html.j2:35
msgid ""
-"\n"
-" Taler is designed to work on the Internet. To\n"
-" ensure that Taler payments can work with\n"
-" restrictive network setups, Taler uses a RESTful\n"
-" protocol over HTTP or HTTPS. Taler's security does\n"
-" not depend upon the use of HTTPS, but obviously\n"
-" merchants may choose to offer HTTPS for consistency\n"
-" and because it generally is better for privacy\n"
-" compared to HTTP. Taler uses JSON to encode\n"
-" structure data, making it easy to integrate Taler\n"
-" with existing Web applications. Taler's protocol\n"
-" is documented in\n"
-" detail <a href=\"https://api.taler.net/\";>here</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:60
+"Taler is designed to work on the Internet. To\n"
+"ensure that Taler payments can work with\n"
+"restrictive network setups, Taler uses a RESTful\n"
+"protocol over HTTP or HTTPS. Taler's security does\n"
+"not depend upon the use of HTTPS, but obviously\n"
+"merchants may choose to offer HTTPS for consistency\n"
+"and because it generally is better for privacy\n"
+"compared to HTTP. Taler uses JSON to encode\n"
+"structure data, making it easy to integrate Taler\n"
+"with existing Web applications. Taler's protocol\n"
+"is documented in\n"
+"detail at <a href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+msgstr ""
+
+#: developers.html.j2:58
msgid "Code"
msgstr "Code"
-#: developers.html.j2:63
+#: developers.html.j2:61
msgid ""
-"\n"
-" Taler is currently primarily developed by a\n"
-" research team at Inria and GNUnet e.V. However,\n"
-" contributions from anyone are welcome. Our Git\n"
-" repositories can be cloned using the Git and HTTP\n"
-" access methods against <tt>git.taler.net</tt> with\n"
-" the name of the respective repository. A list of\n"
-" public repositories can be found in\n"
-" our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:76
+"Taler is currently primarily developed by a\n"
+"research team at <a href=\"http://www.inria.fr/\";>Inria</a> and\n"
+"<a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+"contributions from anyone are welcome. Our Git\n"
+"repositories can be cloned using the Git and HTTP\n"
+"access methods against <tt>git.taler.net</tt> with\n"
+"the name of the respective repository. A list of\n"
+"repositories can be found in\n"
+"our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+msgstr ""
+
+#: developers.html.j2:75
msgid "Documentation"
msgstr "Dokumentation"
-#: developers.html.j2:79
+#: developers.html.j2:78
msgid ""
-"\n"
-" In addition to this website,\n"
-" the <a href=\"https://git.taler.net/\";>documented\n"
-" code</a> and\n"
-" the <a href=\"https://api.taler.net/\";>API\n"
-" documentation</a>, we are in the process of\n"
-" preparing a comprehensive design document which\n"
-" will be published here soon.\n"
-" "
+"In addition to this website, the <a\n"
+"href=\"https://git.taler.net/\";>documented code</a> and\n"
+"the <a href=\"https://api.taler.net/\";>API\n"
+"documentation</a>. Technical papers can be found in\n"
+"our <a href=\"bibliography.html\">bibliography</a>.\n"
msgstr ""
-#: developers.html.j2:91
+#: developers.html.j2:88
msgid "Discussion"
msgstr "Diskussion"
-#: developers.html.j2:93
+#: developers.html.j2:91
msgid ""
"We have a mailing list for developer discussions.\n"
-" You can subscribe to it or read the list archive at\n"
-" <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"You can subscribe to or read the list archive at\n"
+"<a "
+"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"\n"
msgstr ""
-#: developers.html.j2:100
+#: developers.html.j2:101
msgid "Regression Testing"
msgstr "Regressionstests"
-#: developers.html.j2:102
+#: developers.html.j2:104
msgid ""
-"We have\n"
-" <a href='https://buildbot.net/'>Buildbot</a>\n"
-" automation tests to detect regressions and check\n"
-" for portability at\n"
-" <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.\n"
-" "
+"We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+"automation tests to detect regressions and check for\n"
+"portability at <a\n"
+"href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:110
+#: developers.html.j2:113
msgid "Code Coverage Analysis"
msgstr "Testabdeckungsanalyse"
-#: developers.html.j2:112
+#: developers.html.j2:116
msgid ""
"We use\n"
-" <a "
-"href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-" to analyze the code coverage of our tests, the\n"
-" results are available\n"
-" at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-" "
+"<a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+"to analyze the code coverage of our tests, the\n"
+"results are available\n"
+"at <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:120
+#: developers.html.j2:126
msgid "Performance Analysis"
msgstr "Performanzanalyse"
-#: developers.html.j2:122
+#: developers.html.j2:129
msgid ""
"We\n"
-" use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
-" for performance regression analysis of the exchange\n"
-" backend\n"
-" at <a "
-"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-" "
+"use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+"for performance regression analysis of the exchange\n"
+"backend\n"
+"at <a href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:136
+#: developers.html.j2:145
msgid "Taler system overview"
msgstr "Das Taler-System im Überblick"
-#: developers.html.j2:138
+#: developers.html.j2:148
msgid ""
"The Taler system consists of protocols executed among\n"
-" a number of actors with the help\n"
-" of <a href='https://www.fsf.org/'>Free Software</a>\n"
-" as illustrated in the illustration on the right.\n"
-" Typical transactions involve the following steps: "
+"a number of actors as illustrated in the illustration on the right.\n"
+"Typical transactions involve the following steps:\n"
msgstr ""
-#: developers.html.j2:147
+#: developers.html.j2:158
msgid ""
"A customer instructs his <b>bank</b> to\n"
-" transfer funds from his account to the Taler\n"
-" exchange (top left). In the subject of the\n"
-" transaction, he includes an authentication\n"
-" token from his electronic <b>wallet</b>. In\n"
-" Taler terminology, the customer creates a\n"
-" reserve at the exchange. "
+"transfer funds from his account to the Taler\n"
+"exchange (top left). In the subject of the\n"
+"transaction, he includes an authentication\n"
+"token from his electronic <b>wallet</b>. In\n"
+"Taler terminology, the customer creates a\n"
+"reserve at the exchange.\n"
msgstr ""
-#: developers.html.j2:155
+#: developers.html.j2:170
msgid ""
"Once the exchange has received the wire\n"
-" transfer, it allows the customer's electronic\n"
-" wallet to <b>withdraw</b> electronic coins.\n"
-" The electronic coins are digital\n"
-" representations of the original currency from\n"
-" the transfer. It is important to note that the\n"
-" exchange does not learn the "serial\n"
-" numbers" of the coins created in this\n"
-" process, so it cannot tell later which customer\n"
-" purchased what at which merchant. The use of\n"
-" Taler does not change the currency or the total\n"
-" value of the funds (except for fees which the\n"
-" exchange may charge for the service). "
+"transfer, it allows the customer's electronic\n"
+"wallet to <b>withdraw</b> electronic coins.\n"
+"The electronic coins are digital\n"
+"representations of the original currency from\n"
+"the transfer. It is important to note that the\n"
+"exchange does not learn the "serial\n"
+"numbers" of the coins created in this\n"
+"process, so it cannot tell later which customer\n"
+"purchased what at which merchant. The use of\n"
+"Taler does not change the currency or the total\n"
+"value of the funds (except for fees which the\n"
+"exchange may charge for the service).\n"
msgstr ""
-#: developers.html.j2:170
+#: developers.html.j2:188
msgid ""
"Once the customer has the digital coins in his\n"
-" wallet, the wallet can be used to <b>spend</b>\n"
-" the coins with merchant portals that support\n"
-" the Taler payment system and accept the\n"
-" respective exchange as a business partner\n"
-" (bottom arrow). This creates a digital contract\n"
-" signed by the customer's coins and the\n"
-" merchant. If necessary, the customer can later\n"
-" use this digitally signed contract in a court\n"
-" of law to prove the exact terms of the contract\n"
-" and that he paid the respective amount. The\n"
-" customer does not learn the banking details of\n"
-" the merchant, and Taler does not require the\n"
-" merchant to learn the identity of the\n"
-" customer. Naturally, the customer can spend any\n"
-" fraction of his digital coins (the system takes\n"
-" care of customers getting change). "
-msgstr ""
-
-#: developers.html.j2:188
+"wallet, the wallet can be used to <b>spend</b>\n"
+"the coins with merchant portals that support\n"
+"the Taler payment system and accept the\n"
+"respective exchange as a business partner\n"
+"(bottom arrow). This creates a digital contract\n"
+"signed by the customer's coins and the\n"
+"merchant. If necessary, the customer can later\n"
+"use this digitally signed contract in a court\n"
+"of law to prove the exact terms of the contract\n"
+"and that he paid the respective amount. The\n"
+"customer does not learn the banking details of\n"
+"the merchant, and Taler does not require the\n"
+"merchant to learn the identity of the\n"
+"customer. Naturally, the customer can spend any\n"
+"fraction of his digital coins (the system takes\n"
+"care of customers getting change).\n"
+msgstr ""
+
+#: developers.html.j2:210
msgid ""
"Merchants receiving digital\n"
-" coins <b>deposit</b> the respective receipts\n"
-" that resulted from the contract signing with\n"
-" the customer at the exchange to redeem the\n"
-" coins. The deposit step does not reveal the\n"
-" details of the contract between the customer\n"
-" and the merchant or the identity of the\n"
-" customer to the exchange in any way. However,\n"
-" the exchange does learn the identity of the\n"
-" merchant via the provided bank routing\n"
-" information. The merchant can, for example\n"
-" when compelled by the state for taxation,\n"
-" provide information linking the individual\n"
-" deposit to the respective contract signed by\n"
-" the customer. Thus, the exchange's database\n"
-" allows the state to enforce that merchants pay\n"
-" applicable taxes (and do not engage in illegal\n"
-" contracts). "
-msgstr ""
-
-#: developers.html.j2:207
+"coins <b>deposit</b> the respective claims\n"
+"that resulted from the contract signing with\n"
+"the customer at the exchange to redeem the\n"
+"coins. The deposit step does not reveal the\n"
+"details of the contract between the customer\n"
+"and the merchant or the identity of the\n"
+"customer to the exchange in any way. However,\n"
+"the exchange does learn the identity of the\n"
+"merchant via the provided bank routing\n"
+"information. The merchant can, for example\n"
+"when compelled by the state for taxation,\n"
+"provide information linking the individual\n"
+"deposit to the respective contract signed by\n"
+"the customer. Thus, the exchange's database\n"
+"allows the state to enforce that merchants pay\n"
+"applicable taxes (and do not engage in illegal\n"
+"contracts).\n"
+msgstr ""
+
+#: developers.html.j2:233
msgid ""
"Finally, the exchange transfers funds\n"
-" corresponding to the digital coins redeemed by\n"
-" the merchants to the merchant's <b>bank</b>\n"
-" account. The exchange may combine multiple\n"
-" small transactions into one larger bank\n"
-" transfer. The merchant can query the exchange\n"
-" about the relationship between the bank\n"
-" transfers and the individual claims that were\n"
-" deposited. "
+"corresponding to the digital coins redeemed by\n"
+"the merchants to the merchant's <b>bank</b>\n"
+"account. The exchange may combine multiple\n"
+"small transactions into one larger bank\n"
+"transfer. The merchant can query the exchange\n"
+"about the relationship between the bank\n"
+"transfers and the individual claims that were\n"
+"deposited.\n"
msgstr ""
-#: developers.html.j2:217
+#: developers.html.j2:247
msgid ""
"Most importantly, the exchange keeps\n"
-" cryptographic proofs that allow it to\n"
-" demonstrate that it is operating correctly to\n"
-" third parties. The system requires an\n"
-" external <b>auditor</b>, such as a\n"
-" government-appointed financial regulatory body,\n"
-" to frequently verify the exchange's databases\n"
-" and check that its bank balance matches the\n"
-" total value of the remaining coins in\n"
-" circulation. "
+"cryptographic proofs that allow it to\n"
+"demonstrate that it is operating correctly to\n"
+"third parties. The system requires an\n"
+"external <b>auditor</b>, such as a\n"
+"government-appointed financial regulatory body,\n"
+"to frequently verify the exchange's databases\n"
+"and check that its bank balance matches the\n"
+"total value of the remaining coins in\n"
+"circulation.\n"
msgstr ""
-#: developers.html.j2:228
+#: developers.html.j2:262
msgid ""
"Without the auditor, the exchange operators\n"
-" could embezzle funds they are holding in\n"
-" reserve. Customers and merchants cannot cheat\n"
-" each other or the exchange. If any party's\n"
-" computers are compromised, the financial damage\n"
-" is limited to the respective party and\n"
-" proportional to the funds they have in\n"
-" circulation during the period of the\n"
-" compromise. "
+"could embezzle funds they are holding in\n"
+"reserve. Customers and merchants cannot cheat\n"
+"each other or the exchange. If any party's\n"
+"computers are compromised, the financial damage\n"
+"is limited to the respective party and\n"
+"proportional to the funds they have in\n"
+"circulation during the period of the\n"
+"compromise.\n"
msgstr ""
#: faq.html.j2:5
@@ -585,27 +548,28 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"\n"
"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
"Taler is not based on proof-of-work or any other distributed consensus\n"
"mechanism. Instead Taler is based on blind signatures.</p>\n"
-"\n"
-"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
-"wallet (with an appropriate exchange), which would give some benefits\n"
-"over plain Bitcoin, such as instant confirmation times.</p>\n"
msgstr ""
-#: faq.html.j2:16
+#: faq.html.j2:11
+msgid ""
+"<p>It would be possible, however, to withdraw coins denominated in\n"
+"Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+"would give some benefits over plain Bitcoin, such as instant\n"
+"confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:18
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:17
+#: faq.html.j2:19
msgid ""
-"\n"
-"<p>Your wallet stores digital coins that were blindly signed by an\n"
-"exchange, and thus ultimately your computer holds your balance. The\n"
-"exchange keeps funds matching all unspent coins in an escrow bank\n"
-"account.</p>\n"
+"<p>Your wallet stores digital coins and thus ultimately your computer\n"
+"holds your balance. The exchange keeps funds matching all unspent\n"
+"coins in an escrow bank account.</p>\n"
msgstr ""
#: faq.html.j2:25
@@ -614,386 +578,356 @@ msgstr ""
#: faq.html.j2:26
msgid ""
-"\n"
"<p>Since the digital coins of value in your wallet are anonymized, the\n"
"exchange can not assist you in recovering a lost or stolen wallet.\n"
"Just like with a physical wallet for cash, you are responsible for\n"
"keeping it safe.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:32
+msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or\n"
"keeping the balance reasonably low.</p>\n"
-"\n"
-"<p>In case of a compromise of one of your devices, an attacker that\n"
-"spends coins on your behalf will allow you to detect that your device\n"
-"has been compromised.</p>\n"
msgstr ""
-#: faq.html.j2:41
+#: faq.html.j2:37
+msgid "What if my computer is hacked?"
+msgstr ""
+
+#: faq.html.j2:38
+msgid ""
+"<p>In case of a compromise of one of your devices, an attacker can\n"
+"spend coins from your wallet. Checking your balance might reveal\n"
+"to you that your device has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:44
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:42
+#: faq.html.j2:45
msgid ""
-"\n"
"<p>If your friend provides goods or services for you in exchange for a\n"
"payment, they can easily set up a Taler merchant and receive the\n"
"payment in their bank account.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:50
+msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins\n"
"among friends directly as well.</p>\n"
msgstr ""
-#: faq.html.j2:52
+#: faq.html.j2:56
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:53
+#: faq.html.j2:57
msgid ""
-"\n"
"<p>Taler wallets can store digital coins corresponding to multiple\n"
"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+msgstr ""
+
+#: faq.html.j2:61
+msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
+#: faq.html.j2:65
+msgid "How does Taler protect my privacy?"
+msgstr ""
+
+#: faq.html.j2:66
+msgid ""
+"<p>Your wallet stores digital coins that are <a\n"
+"href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+"signed</a> by an exchange. The use of a blind signature protects your\n"
+"privacy as it prevents the exchange from knowing which coin it signed\n"
+"for which customer.</p>\n"
"\n"
-"<p>Taler currently does not offer conversion between currencies.</p>\n"
msgstr ""
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
-#: governments.html.j2:7
+#: governments.html.j2:8
msgid ""
-"Taler provides accountability to ensure business\n"
-" accepting payments operate legally, while also\n"
-" respecting civil liberties of citizens spending\n"
-" digital cash. Taler is a commons, a payment system\n"
-" based on open standards and free software. Taler\n"
-" needs governments to set a financial framework and\n"
-" to act as trusted regulators. Taler contributes to\n"
-" digital sovereignty in the critical financial\n"
-" infrastructure."
+"Taler provides accountability to ensure business operate\n"
+"legally, while also respecting civil liberties of\n"
+"citizens. Taler is a payment system based on\n"
+"open standards and free software. Taler needs\n"
+"governments as they set a financial framework and act as\n"
+"trusted regulators. Taler contributes to digital\n"
+"sovereignty in the critical financial infrastructure.\n"
msgstr ""
-#: governments.html.j2:23 index.html.j2:69
+#: governments.html.j2:25 index.html.j2:70
#, fuzzy
msgid "Taxable"
msgstr "Taxierbar"
-#: governments.html.j2:25
+#: governments.html.j2:28
msgid ""
-"Taler was\n"
-" built with the goal of fighting corruption and supporting "
-"taxation.\n"
-" With Taler, the receiver of any form of payment is\n"
-" easily identified by the government, and the merchant\n"
-" can be compelled to provide the contract that was accepted\n"
-" by the customer. Governments can use this data to\n"
-" tax businesses and individuals based on their\n"
-" income, making tax evasion and black markets less\n"
-" viable."
+"Taler was built with the goal of fighting corruption and\n"
+"supporting taxation. With Taler, the receiver of any\n"
+"form of payment is easily identified by the government,\n"
+"and the merchant can be compelled to provide the contract\n"
+"that was accepted by the customer. Governments can use\n"
+"this data to tax businesses and individuals based on\n"
+"their income, making tax evasion and black markets less\n"
+"viable.\n"
msgstr ""
-#: governments.html.j2:35
+#: governments.html.j2:41
msgid ""
-"Thus, despite offering anonymity for citizens\n"
-" spending digital cash to buy goods and services,\n"
-" Taler also ensures that the state can observe\n"
-" incoming funds. This can be used to ensure\n"
-" businesses engage only in legal activities, and do\n"
-" not evade income tax, sales tax or value-added tax.\n"
-" However, this observational capability does not\n"
-" extend to the immediate personal domain. In\n"
-" particular, sharing access to funds within a family\n"
-" or synchronizing wallets across multiple devices is not\n"
-" subject to monitoring."
+"Thus, despite offering anonymity for citizens spending\n"
+"digital cash to buy goods and services, Taler also\n"
+"ensures that the state can observe incoming funds. This\n"
+"can be used to ensure businesses engage only in legal\n"
+"activities, and do not evade income tax, sales tax or\n"
+"value-added tax. However, this observational capability\n"
+"does not extend to the immediate personal domain. In\n"
+"particular, monitoring does not cover shared access to\n"
+"funds with trusted friends and family, or synchronizing\n"
+"wallets across multiple devices.\n"
msgstr ""
-#: governments.html.j2:48 merchants.html.j2:33
-msgid "Secure"
-msgstr "Sicher"
-
-#: governments.html.j2:50
+#: governments.html.j2:61
msgid ""
-"Taler's payments are cryptographically\n"
-" secured. Thus, customers, merchants and the\n"
-" exchange can mathematically demonstrate their\n"
-" lawful behavior in court in case of\n"
-" disputes. Financial damages are strictly limited,\n"
-" improving economic security for individuals,\n"
-" merchants, the exchange and the state."
+"Taler's payments are cryptographically secured. Thus,\n"
+"customers, merchants and the Taler payment service provider\n"
+"(the exchange) can mathematically\n"
+"demonstrate their lawful behavior in court in case of\n"
+"disputes. Financial damages are strictly limited,\n"
+"improving economic security for individuals, merchants,\n"
+"the exchange and the state.\n"
msgstr ""
-#: governments.html.j2:58
+#: governments.html.j2:73
msgid ""
-"By design, the Taler payment service provider is\n"
-" subject to financial regulation. Financial\n"
-" regulation and regular audits are critical to\n"
-" establish trust. In particular, the Taler design\n"
-" mandates the existence of an independent auditor\n"
-" who checks cryptographic proofs that accumulate at\n"
-" the payment service provider to ensure that the\n"
-" escrow account is managed honestly. This ensures\n"
-" that the payment service provider does not threaten\n"
-" the economy due to fraud."
+"As a payment service provider, the Taler exchange is\n"
+"subject to financial regulation. Financial regulation and\n"
+"regular audits are critical to establish trust. In\n"
+"particular, the Taler design mandates the existence of an\n"
+"independent auditor who checks cryptographic proofs that\n"
+"accumulate at the exchange to ensure that the escrow\n"
+"account is managed honestly. This ensures that the\n"
+"exchange does not threaten the economy due to fraud.\n"
msgstr ""
-#: governments.html.j2:72 index.html.j2:95
+#: governments.html.j2:88 index.html.j2:96
msgid "Libre"
msgstr "Libre"
-#: governments.html.j2:74
+#: governments.html.j2:91
msgid ""
-"Taler is free software implementing an open\n"
-" protocol standard. Thus, Taler will enable\n"
-" competition and avoid the monopolization of payment\n"
-" systems that threatens global political and\n"
-" financial stability today."
+"Taler is free software implementing an open protocol\n"
+"standard. Thus, Taler will enable competition and avoid\n"
+"the monopolization of payment systems that threatens\n"
+"global political and financial stability today.\n"
msgstr ""
-#: governments.html.j2:83
+#: governments.html.j2:101
msgid "Efficient"
msgstr "Effizient"
-#: governments.html.j2:85
+#: governments.html.j2:104
msgid ""
"Taler has an efficient design. Unlike\n"
-" timeline-based payment systems, such as Bitcoin,\n"
-" Taler will not threaten the availability of\n"
-" national electric grids or (significantly)\n"
-" contribute to environmental pollution."
+"Blockchain-based payment systems, such as Bitcoin,\n"
+"Taler will not threaten the availability of\n"
+"national electric grids or (significantly)\n"
+"contribute to environmental pollution.\n"
msgstr ""
-#: governments.html.j2:99
+#: governments.html.j2:120
msgid "Taler and regulation"
msgstr ""
-#: governments.html.j2:101
-msgid "Anti-money laundering (AML)"
+#: governments.html.j2:122
+msgid "Anti money laundering (AML)"
msgstr ""
-#: governments.html.j2:102
+#: governments.html.j2:123
msgid ""
"With Taler, income is visible and can be tied to the contract signed by "
"both parties."
msgstr ""
-#: governments.html.j2:103
-msgid "Know-your-customer (KYC)"
+#: governments.html.j2:124
+msgid "Know your customer (KYC)"
msgstr ""
-#: governments.html.j2:104
+#: governments.html.j2:125
msgid ""
"In Taler, payer and payee are known by their bank accounts when "
"withdrawing or depositing coins respectively"
msgstr ""
-#: governments.html.j2:105
-msgid "Privacy-by-design (GDPR)"
+#: governments.html.j2:126
+msgid "General Data Protection Regulation (GDPR)"
msgstr ""
-#: governments.html.j2:106
+#: governments.html.j2:127
msgid ""
"Taler cryptographically protects citizen's privacy, and by design "
"implements data minimization and privacy by default."
msgstr ""
-#: governments.html.j2:107
-msgid "Competitive banking (PSD2)"
+#: governments.html.j2:128
+msgid "Payment Services Directive (PSD2)"
msgstr ""
-#: governments.html.j2:108
+#: governments.html.j2:129
msgid ""
-"Taler provides an open standard with public APIs contributing to a level "
-"playing field."
+"Taler provides an open standard with public APIs contributing to a "
+"competitive banking sector."
msgstr ""
-#: governments.html.j2:116
+#: governments.html.j2:137
msgid "Taler provides privacy and accountability"
msgstr ""
-#: governments.html.j2:118
+#: governments.html.j2:140
msgid ""
"Taler assumes governments can observe traditional wire transfers\n"
-" entering and leaving the Taler payment system. Starting with "
-"the\n"
-" wire transfers, governments can obtain: "
+"entering and leaving the Taler payment system. Starting with the\n"
+"wire transfers, governments can obtain:\n"
msgstr ""
-#: governments.html.j2:123
+#: governments.html.j2:148
msgid ""
"The total amount of digital currency withdrawn by a\n"
-" customer. The government can impose limits on how much\n"
-" digital cash a customer can withdraw within a\n"
-" given time frame."
+"customer. The government can impose limits on how much\n"
+"digital cash a customer can withdraw within a\n"
+"given time frame.\n"
msgstr ""
-#: governments.html.j2:128
+#: governments.html.j2:157
msgid ""
"The income received by any merchant via the Taler\n"
-" system."
+"system.\n"
msgstr ""
-#: governments.html.j2:131
+#: governments.html.j2:164
msgid ""
-"The exact details of the underlying\n"
-" contract that was signed between customer and\n"
-" merchant. However, this information would\n"
-" typically not include the identity of the\n"
-" customer."
+"The exact details of the underlying contract that was\n"
+"signed between customer and merchant. However, this\n"
+"information would typically not include the identity\n"
+"of the customer.\n"
msgstr ""
-#: governments.html.j2:137
+#: governments.html.j2:174
msgid ""
-"The amounts of\n"
-" digital coins legitimately withdrawn by\n"
-" customers from the exchange, the value of\n"
-" non-redeemed digital coins in customer's\n"
-" wallets, the value and corresponding wire\n"
-" details of deposit operations performed by\n"
-" merchants with the exchange, and the income of\n"
-" the exchange from transaction fees."
+"The amounts of digital coins legitimately withdrawn\n"
+"by customers from the exchange, the value of\n"
+"non-redeemed digital coins in customer's wallets, the\n"
+"value and corresponding wire details of deposit\n"
+"operations performed by merchants with the exchange,\n"
+"and the income of the exchange from transaction fees.\n"
msgstr ""
#: index.html.j2:10
-msgid "Independent One-Click Payments!"
+msgid "One-Click Cash Payments!"
msgstr ""
-#: index.html.j2:12
+#: index.html.j2:13
msgid ""
-"\n"
-" Taler is an electronic payment system under\n"
-" development\n"
-" at <a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make "
-"it operational in 2017.\n"
-" You can learn about Taler on this website, try the <a "
-"href=\"https://demo.taler.net\";>demo</a>\n"
-" and look at our <a href=\"https://docs.taler.net\";>developer</a> "
-"and <a href=\"https://api.taler.net\";>API</a> documentation.\n"
-" "
-msgstr ""
-
-#: index.html.j2:26
-msgid "Practical"
+"GNU Taler is an electronic payment system under development at\n"
+"<a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make it\n"
+"operational in 2017. You can learn about Taler on this website,\n"
+"try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+"our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+"href=\"https://api.taler.net\";>API</a> documentation.\n"
msgstr ""
-#: index.html.j2:29
-msgid ""
-"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
-msgstr ""
-
-#: index.html.j2:39
-msgid "Stable"
+#: index.html.j2:28
+msgid "Practical"
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:31
msgid ""
-"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
-msgstr ""
-
-#: index.html.j2:54
-msgid "Security-focused"
+"Taler is easy to integrate with existing Web\n"
+"applications. Payments are cryptographically\n"
+"secured and are confirmed within milliseconds with\n"
+"extremely low transaction costs.\n"
msgstr ""
-#: index.html.j2:57
+#: index.html.j2:44
msgid ""
-"\n"
-" By design Taler does not suffer from many classes\n"
-" of security problems such as phishing or counterfeit.\n"
-" Despite its security features, Taler never rejects a legitimate\n"
-" customer due to a fraud-detection false positive.\n"
-" "
+"Taler does not introduce a new currency. Taler\n"
+"uses a digital wallet storing coins and payment service\n"
+"providers with escrow accounts in existing currencies.\n"
+"Thus, Taler's cryptographic coins correspond to existing\n"
+"currencies, such as US Dollars, Euros or even Bitcoins.\n"
msgstr ""
-#: index.html.j2:72
+#: index.html.j2:58
msgid ""
-"\n"
-" When using Taler, merchants cannot hide their income from tax\n"
-" collection authorities. Unlike cash and most digital currencies,"
-"\n"
-" Taler helps prevent black markets. Taler is not suitable for\n"
-" illegal activities.\n"
-" "
+"By design Taler does not suffer from many classes\n"
+"of security problems such as phishing or counterfeit.\n"
+"Despite its security features, Taler never rejects a legitimate\n"
+"customer due to a fraud-detection false positive.\n"
msgstr ""
-#: index.html.j2:82
-msgid "Privacy-friendly"
+#: index.html.j2:73
+msgid ""
+"When using Taler, merchant's revenue is transparent for tax\n"
+"collection authorities. Unlike cash and most digital currencies,\n"
+"Taler helps prevent black markets. Taler is not suitable for\n"
+"illegal activities.\n"
msgstr ""
-#: index.html.j2:84
+#: index.html.j2:85
msgid ""
-"\n"
-" When you pay with Taler, your identity does not\n"
-" have to be revealed to the merchant. Just like\n"
-" payments in cash, nobody else can track how you\n"
-" spent your electronic money. However, you obtain a\n"
-" legally valid proof of payment.\n"
-" "
+"When you pay with Taler, your identity does not\n"
+"have to be revealed to the merchant. Just like\n"
+"payments in cash, nobody else can track how you\n"
+"spent your electronic money. However, you obtain a\n"
+"legally valid proof of payment.\n"
msgstr ""
-#: index.html.j2:98
+#: index.html.j2:99
msgid ""
-"\n"
-" Taler provides protocols and reference implementations that in\n"
-" principle enables anybody to run their own payment "
-"infrastructure,\n"
-" be it individuals, organizations or whole countries. Since the\n"
-" reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a>\n"
-" package, it will always remain free software.\n"
-" "
+"Taler provides protocols and reference implementations that in\n"
+"principle enables anybody to run their own payment infrastructure,\n"
+"be it individuals, organizations or whole countries. Since the\n"
+"reference implementation is a <a href=\"http://www.gnu.org/\";>GNU</a>\n"
+"package, it will always remain free software.\n"
msgstr ""
-#: index.html.j2:115
+#: index.html.j2:116
msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:116
+#: index.html.j2:117
msgid ""
-"\n"
-" <p>To pay with Taler, customers install an electronic wallet\n"
-" on their device. Before the first payment, the wallet's balance must"
-"\n"
-" be charged in the desired currency by some other means of "
-"payment.</p>\n"
-" <p>Once the wallet is charged, payments on websites take only one "
-"click,\n"
-" are never falsely rejected by fraud detection and do not post any "
-"risk\n"
-" of phishing or identity theft.</p>\n"
-" "
+"<p>To pay with Taler, customers install an electronic wallet\n"
+"on their device. Before the first payment, the wallet's balance must\n"
+"be charged in the desired currency by some other means of payment.</p>\n"
+"<p>Once the wallet is charged, payments on websites take only one click,\n"
+"are never falsely rejected by fraud detection and do not pose any risk\n"
+"of phishing or identity theft.</p>\n"
msgstr ""
-#: index.html.j2:126
+#: index.html.j2:127
msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:127
+#: index.html.j2:128
msgid ""
-"\n"
-" <p>To receive Taler payments, a merchant needs a bank account\n"
-" in the desired currency. We provide\n"
-" SDKs in various languages to makes the integration painless.\n"
-" The merchant's backend for Taler transaction processing can run\n"
-" on the merchant's premises or hosted.</p>\n"
-" "
+"<p>To receive Taler payments, a merchant needs a bank account\n"
+"in the desired currency. We provide supporting software\n"
+"in various programming languages to make the integration painless.\n"
+"The merchant's backend for Taler transaction processing can run\n"
+"on the merchant's premises or be hosted by a third party.</p>\n"
msgstr ""
-#: index.html.j2:143
+#: index.html.j2:144
msgid "Taler News"
msgstr ""
-#: index.html.j2:147
+#: index.html.j2:148
msgid "Financial News"
msgstr ""
@@ -1003,12 +937,10 @@ msgstr ""
#: investors.html.j2:9
msgid ""
-"\n"
-" We have created a company, Taler Systems SA in\n"
-" Luxembourg.<br>\n"
-" Please contact <tt>address@hidden</tt>\n"
-" if you want to invest in Taler.\n"
-" "
+"We have created a company, Taler Systems SA in\n"
+"Luxembourg.<br>\n"
+"Please contact <tt>address@hidden</tt>\n"
+"if you want to invest in Taler.\n"
msgstr ""
#: investors.html.j2:24
@@ -1017,23 +949,21 @@ msgstr ""
#: investors.html.j2:27
msgid ""
-"\n"
-" Our <a href=\"about.html\">team</a> combines world-class "
-"business leaders,\n"
-" cryptographers, software engineers, civil-rights\n"
-" activists and academics. We are unified by a vision\n"
-" of how payments should work and the goal of\n"
-" imposing this vision upon the world.\n"
-" "
+"Our <a href=\"about.html\">team</a> combines world-class business "
+"leaders,\n"
+"cryptographers, software engineers, civil-rights\n"
+"activists and academics. We are unified by a vision\n"
+"of how payments should work and the goal of\n"
+"imposing this vision upon the world.\n"
msgstr ""
#: investors.html.j2:37
msgid ""
-"\n"
-" We are currently supported by Inria, the French\n"
-" national institute for research in informatics and\n"
-" automation, and the Renewable Freedom Foundation.\n"
-" "
+"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>,"
+" the French\n"
+"national institute for research in informatics and\n"
+"automation, and the <a href=\"https://renewablefreedom.org/\";>Renewable "
+"Freedom Foundation</a>.\n"
msgstr ""
#: investors.html.j2:45
@@ -1042,19 +972,17 @@ msgstr ""
#: investors.html.j2:48
msgid ""
-"\n"
-" All transactions in Taler are secured using <a "
+"All transactions in Taler are secured using <a "
"href=\"bibliography.html\">modern\n"
-" cryptography</a> and trust in all parties is\n"
-" minimized. Financial damage is bounded (for\n"
-" customers, merchants and the exchange) even in the\n"
-" case that systems are compromised and private keys\n"
-" are stolen. Databases can be audited for\n"
-" consistency, resulting in either the detection of\n"
-" compromised systems or the demonstration that\n"
-" participants were honest. Actual transaction costs\n"
-" are fractions of a cent.\n"
-" "
+"cryptography</a> and trust in all parties is\n"
+"minimized. Financial damage is bounded (for\n"
+"customers, merchants and the exchange) even in the\n"
+"case that systems are compromised and private keys\n"
+"are stolen. Databases can be audited for\n"
+"consistency, resulting in either the detection of\n"
+"compromised systems or the demonstration that\n"
+"participants were honest. Actual transaction costs\n"
+"are fractions of a cent.\n"
msgstr ""
#: investors.html.j2:63
@@ -1063,17 +991,15 @@ msgstr ""
#: investors.html.j2:66
msgid ""
-"\n"
-" The scalable business model for Taler is the operation\n"
-" of the payment service provider, which converts money from\n"
-" traditional payment systems (MasterCard, SEPA,\n"
-" Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
-" electronic coins in the same currency. The customer\n"
-" can then redeem the electronic coins at a merchant,\n"
-" who can exchange them for money represented using\n"
-" traditional payment systems at the exchange. The\n"
-" exchange charges fees to facilitate the transactions.\n"
-" "
+"The scalable business model for Taler is the operation\n"
+"of the payment service provider, which converts money from\n"
+"traditional payment systems (MasterCard, SEPA, UPI,\n"
+"Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+"electronic coins in the same currency. The customer\n"
+"can then redeem the electronic coins at a merchant,\n"
+"who can exchange them for money represented using\n"
+"traditional payment systems at the exchange. The\n"
+"exchange charges fees to facilitate the transactions.\n"
msgstr ""
#: investors.html.j2:85
@@ -1086,13 +1012,10 @@ msgstr ""
#: investors.html.j2:110
msgid ""
-"\n"
-" The payment service operator runs the <em>Taler exchange</em>.\n"
-" The exchange charges <b>transaction fees</b> to customers or "
-"merchants.\n"
-" Its operational expenses are from wire transfers with the banking\n"
-" system and the operation of the computing infrastructure.\n"
-" "
+"The payment service operator runs the <em>Taler exchange</em>.\n"
+"The exchange charges <b>transaction fees</b> to customers or merchants.\n"
+"Its operational expenses are from wire transfers with the banking\n"
+"system and the operation of the computing infrastructure.\n"
msgstr ""
#: investors.html.j2:120
@@ -1125,145 +1048,142 @@ msgstr ""
msgid "Advantages for Merchants"
msgstr ""
-#: merchants.html.j2:6
+#: merchants.html.j2:8
msgid ""
"Taler is a cost-effective electronic payment system\n"
-" which provides you with cryptographic proof that\n"
-" the payment worked correctly within milliseconds.\n"
-" Your Web customers pay with previously unknown\n"
-" levels of convenience without risk of fraud."
+"which provides you with cryptographic proof that\n"
+"the payment worked correctly within milliseconds.\n"
+"Your Web customers pay with previously unknown\n"
+"levels of convenience without risk of fraud.\n"
msgstr ""
-#: merchants.html.j2:18
+#: merchants.html.j2:22
msgid "Fast"
msgstr "Schnell"
-#: merchants.html.j2:20
+#: merchants.html.j2:25
msgid ""
"Processing transactions with Taler is fast,\n"
-" allowing you to confirm the transaction with your\n"
-" customer virtually immediately. Your customers\n"
-" will appreciate that they do not have to type in\n"
-" credit card information and play the "verified\n"
-" by" game. By making payments significantly\n"
-" more convenient for your customers, you may be able\n"
-" to use Taler for small transactions that would not\n"
-" work with credit card payments due to the mental\n"
-" overhead for customers."
+"allowing you to confirm the transaction with your\n"
+"customer virtually immediately. Your customers\n"
+"will appreciate that they do not have to type in\n"
+"credit card information and play the "verified\n"
+"by" game. By making payments significantly\n"
+"more convenient for your customers, you may be able\n"
+"to use Taler for small transactions that would not\n"
+"work with credit card payments due to the mental\n"
+"overhead for customers.\n"
msgstr ""
-#: merchants.html.j2:35
+#: merchants.html.j2:44
msgid ""
-"You will have cryptographic proof of payment from\n"
-" the Taler payment service provider. Taler does not\n"
-" require you to undergo any particular security\n"
-" audits (such as PCI DSS), processes or procedures,\n"
-" as you never handle sensitive customer account\n"
-" information. Your systems will have customer\n"
-" contracts with qualified signatures for all\n"
-" transactions which you can use in court in case of\n"
-" disputes."
+"You will have cryptographic proof of payment from the\n"
+"Taler payment service provider. With Taler you never\n"
+"handle sensitive customer account information and thus\n"
+"do not have to undergo any particular security audits\n"
+"(such as PCI DSS). Your systems will have customer\n"
+"contracts with qualified signatures for all\n"
+"transactions which you can use in court in case of\n"
+"disputes.\n"
msgstr ""
-#: merchants.html.j2:47
-msgid "Free Software"
-msgstr "Freie Software"
-
-#: merchants.html.j2:49
+#: merchants.html.j2:61
msgid ""
"Taler is free software, and you can use the\n"
-" liberally-licensed reference code as a starting\n"
-" point to integrate Taler into your services. To use\n"
-" Taler, you do not need to pay license fees, and the\n"
-" free software development model will ensure that\n"
-" you can select from many competent integrators for\n"
-" support."
+"liberally-licensed reference code as a starting\n"
+"point to integrate Taler into your services. To use\n"
+"Taler, you do not need to pay license fees, and the\n"
+"free software development model will ensure that\n"
+"you can select from many competing integrators for\n"
+"support.\n"
msgstr ""
-#: merchants.html.j2:61
-msgid "Low Fees"
-msgstr "Niedrige Gebühren"
+#: merchants.html.j2:76
+msgid "Cheap"
+msgstr ""
-#: merchants.html.j2:63
+#: merchants.html.j2:79
msgid ""
-"Taler is designed to minimize the work the exchange\n"
-" needs to perform. Combined with Taler's strong\n"
-" security which prevents fraud, payment service\n"
-" providers can operate with very low overhead and\n"
-" thus low transaction fees."
+"Taler is uses efficient cryptographic constructions with low\n"
+"bandwidth and storage requirements. Combined with Taler's strong\n"
+"security which makes fraud impossible, Taler payment service\n"
+"providers can operate with very low overhead and\n"
+"thus offer low transaction fees.\n"
msgstr ""
-#: merchants.html.j2:71
+#: merchants.html.j2:89
msgid "Flexible"
msgstr "Flexibel"
-#: merchants.html.j2:73
+#: merchants.html.j2:92
msgid ""
"Taler can be used for different currencies (such as\n"
-" Euros, US Dollars or Bitcoins) and different\n"
-" payment models limited only by what the payment\n"
-" service provider supports in its interactions."
+"Euros, US Dollars or Bitcoins) and any amount, limited\n"
+"only by applicable regulatation and what denominations\n"
+"the payment service provider supports.\n"
msgstr ""
-#: merchants.html.j2:81
+#: merchants.html.j2:101
msgid "Ethical"
msgstr "Ethisch"
-#: merchants.html.j2:83
+#: merchants.html.j2:104
msgid ""
"Taler prevents tax evasion and money laundering.\n"
-" Taler's protocols are efficient and do not waste\n"
-" energy. Taler encourages transparency by providing\n"
-" an open standard and free software reference\n"
-" implementations."
+"Taler's protocols are efficient and do not use wasteful\n"
+"proof-of-work calculations. Taler encourages\n"
+"transparency by providing an open standard and free\n"
+"software reference implementations.\n"
msgstr ""
-#: merchants.html.j2:95
+#: merchants.html.j2:119
msgid "Manuals for merchants"
msgstr "Handbücher für Händler"
-#: merchants.html.j2:98
+#: merchants.html.j2:122
msgid "The GNU Taler merchant backend operator manual"
msgstr ""
-#: merchants.html.j2:101
+#: merchants.html.j2:125
msgid "The GNU Taler Web shop integration tutorial (PHP)"
msgstr ""
-#: merchants.html.j2:104
+#: merchants.html.j2:128
msgid "The GNU Taler Web shop integration tutorial (Python)"
msgstr ""
-#: merchants.html.j2:116
+#: merchants.html.j2:140
msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:118
+#: merchants.html.j2:142
msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:122
+#: merchants.html.j2:147
msgid ""
-"The backend <b>signs</b> and <b>stores</b>\n"
-" proposals made by the merchant to customers.\n"
-" For this, the merchant's frontend needs to give the\n"
-" customer's order in a JSON format to the backend."
+"The backend <b>signs</b> and <b>stores</b> the\n"
+"complete terms of offers made by the merchant to customers.\n"
+"For this, the merchant's frontend needs to give the\n"
+"customer's order in a JSON format to the backend.\n"
msgstr ""
-#: merchants.html.j2:127
+#: merchants.html.j2:156
msgid ""
-"The backend <b>validates</b> and <b>executes</b>\n"
-" payments received from the wallet. The frontend\n"
-" must pass the payment request through to the backend\n"
-" and checks the HTTP status code that is returned."
+"The backend <b>validates</b> payments received from\n"
+"the wallet and <b>executes</b> them with the Taler\n"
+"payment service provider (the exchange). For this,\n"
+"the merchant's frontend must pass the payment\n"
+"request through to the Taler backend and check the\n"
+"HTTP status code that is returned.\n"
msgstr ""
-#: merchants.html.j2:132
+#: merchants.html.j2:167
msgid ""
"The backend can <b>list</b> completed transactions\n"
-" and <b>map</b> aggregated wire transfers to individual\n"
-" business transactions including the exact terms of\n"
-" the contract."
+"and <b>map</b> wire transfers to sets of business\n"
+"transactions, including the exact terms of each\n"
+"contract.\n"
msgstr ""
#: press.html.j2:4
@@ -1446,3 +1366,935 @@ msgstr ""
#~ msgid "The mailinglist"
#~ msgstr ""
+#~ msgid "Security"
+#~ msgstr "Sicherheit"
+
+#~ msgid "Privacy"
+#~ msgstr "Privatsphäre"
+
+#~ msgid "Convenience"
+#~ msgstr "Bequemlichkeit"
+
+#~ msgid "Stability"
+#~ msgstr "Stabilität"
+
+#~ msgid "Anti-money laundering (AML)"
+#~ msgstr ""
+
+#~ msgid "Know-your-customer (KYC)"
+#~ msgstr ""
+
+#~ msgid "Privacy-by-design (GDPR)"
+#~ msgstr ""
+
+#~ msgid "Competitive banking (PSD2)"
+#~ msgstr ""
+
+#~ msgid "Security-focused"
+#~ msgstr ""
+
+#~ msgid "Privacy-friendly"
+#~ msgstr ""
+
+#~ msgid "Free Software"
+#~ msgstr "Freie Software"
+
+#~ msgid "Low Fees"
+#~ msgstr "Niedrige Gebühren"
+
+#~ msgid ""
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler largely functions like digital cash. You\n"
+#~ " withdraw money from your bank account into your\n"
+#~ " electronic wallet, and can henceforth spend digital\n"
+#~ " cash. The electronic wallet can carry multiple\n"
+#~ " currencies.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Taler uses modern cryptography, ensuring that there\n"
+#~ " is no counterfeit. Your digital wallet is safer\n"
+#~ " than your physical wallet. At most, you can lose\n"
+#~ " its contents because your computer or mobile is\n"
+#~ " irreparably damaged or compromised. Unlike a\n"
+#~ " physical wallet, you can make backups to secure\n"
+#~ " against data loss."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Your transactions are private, neither the payment\n"
+#~ " service provider nor merchant needs to learn your\n"
+#~ " identity. There is no need to give out credit card\n"
+#~ " numbers or other sensitive information. The merchant\n"
+#~ " will only be able to do exactly the transaction you\n"
+#~ " agreed to."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will be able to withdraw money to replenish the\n"
+#~ " digital coins in your wallet using your credit card\n"
+#~ " or wire transfers. Afterwards you can pay with\n"
+#~ " one-click using the Taler wallet, which optionally\n"
+#~ " keeps your transaction history on your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Coins in your digital wallet will be of the same\n"
+#~ " denomination as the cash in your physical wallet.\n"
+#~ " Taler is not a crypto-currency, so you do not have\n"
+#~ " to worry about cryto-currency related value\n"
+#~ " fluctuations. Banking with Taler is subject to the\n"
+#~ " usual government protections for financial\n"
+#~ " services."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We currently provide a <a "
+#~ "href=\"wallet.html\">wallet browser extension</a> "
+#~ "for Chromium, Chrome, Firefox, Opera\n"
+#~ " and Edge. Wallets for mobile"
+#~ " phones and other platforms will be"
+#~ " available in the future.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You can see how Taler "
+#~ "works in practice by visiting our "
+#~ "<a href=\"https://demo.taler.net\";>demo page</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Customers interact with the Taler system using\n"
+#~ " the Taler wallet:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>withdraw</b> electronic coins, the customer\n"
+#~ " transfers funds from his bank account to the Taler\n"
+#~ " payment service provider (the exchange). The wire\n"
+#~ " transfer subject must match a code identifying the\n"
+#~ " customer's wallet. After the wire transfer is\n"
+#~ " complete, the wallet will automatically withdraw the\n"
+#~ " coins from the exchange."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>spend</b> electronic coins, a merchant must\n"
+#~ " cause the wallet to display a proposal for some\n"
+#~ " purchase. The wallet will ask the customer for\n"
+#~ " one-click confirmation. Payment is then instant.\n"
+#~ " Transaction histories and "
+#~ "digitally signed contracts\n"
+#~ " can be preserved by the wallet."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The customer can use the wallet to <b>review</b> his\n"
+#~ " balance. The wallet can contain different\n"
+#~ " currencies, and may be shared across\n"
+#~ " devices. Customers can make"
+#~ " backups of the wallet to\n"
+#~ " secure its contents against hardware failures."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " An archived, public mailing list for GNU Taler is\n"
+#~ " hosted at\n"
+#~ " <a "
+#~
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ " You can send messages to the "
+#~ "list\n"
+#~ " at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Team members are generally reachable at\n"
+#~ " <tt>address@hidden</tt>. All of us\n"
+#~ " support receiving GnuPG encrypted e-mails.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We track open feature requests and bugs in our\n"
+#~ " <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+#~ " which is shared with the GNUnet project.\n"
+#~ " You can also report bugs or feature requests to the\n"
+#~ " mailing list.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " For non-technical commercial requests, please contact\n"
+#~ " <tt>ceo AT taler.net</tt>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is free software implementing an open\n"
+#~ " protocol. Anybody is welcome"
+#~ " to integrate our reference\n"
+#~ " implementation into their applications. Different\n"
+#~ " components of Taler are being made available under\n"
+#~ " different licenses. The Affero GPLv3+ is used for the\n"
+#~ " exchange, the LGPLv3+ is used for reference code\n"
+#~ " demonstrating integration with merchant platforms, and\n"
+#~ " licenses like GPLv3+ are used for\n"
+#~ " wallets and related customer-facing software. We are\n"
+#~ " open for constructive suggestions for maximizing the\n"
+#~ " adoption of this payment platform.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is designed to work on the Internet. To\n"
+#~ " ensure that Taler payments can work with\n"
+#~ " restrictive network setups, Taler uses a RESTful\n"
+#~ " protocol over HTTP or HTTPS. Taler's security does\n"
+#~ " not depend upon the use of HTTPS, but obviously\n"
+#~ " merchants may choose to offer HTTPS for consistency\n"
+#~ " and because it generally is better for privacy\n"
+#~ " compared to HTTP. Taler uses JSON to encode\n"
+#~ " structure data, making it easy to integrate Taler\n"
+#~ " with existing Web applications. Taler's protocol\n"
+#~ " is documented in\n"
+#~ " detail at <a "
+#~ "href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is currently primarily developed by a\n"
+#~ " research team at <a "
+#~ "href=\"http://www.inria.fr/\";>Inria</a> and\n"
+#~ " <a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+#~ " contributions from anyone are welcome. Our Git\n"
+#~ " repositories can be cloned using the Git and HTTP\n"
+#~ " access methods against <tt>git.taler.net</tt> with\n"
+#~ " the name of the respective repository. A list of\n"
+#~ " repositories can be found in\n"
+#~ " our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " In addition to this website, the <a\n"
+#~ " href=\"https://git.taler.net/\";>documented "
+#~ "code</a> and\n"
+#~ " the <a href=\"https://api.taler.net/\";>API\n"
+#~ " documentation</a>. Technical papers can be found in\n"
+#~ " our <a href=\"bibliography.html\">bibliography</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have a mailing list for developer discussions.\n"
+#~ " You can subscribe to or read the list archive at\n"
+#~ " <a "
+#~
"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+#~ " automation tests to detect regressions and check for\n"
+#~ " portability at <a\n"
+#~ " "
+#~ "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We use\n"
+#~ " <a "
+#~ "href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+#~ " to analyze the code coverage of our tests, the\n"
+#~ " results are available\n"
+#~ " at <a "
+#~ "href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We\n"
+#~ " use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+#~ " for performance regression analysis of the exchange\n"
+#~ " backend\n"
+#~ " at <a "
+#~ "href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The Taler system consists of protocols executed among\n"
+#~ " a number of actors as "
+#~ "illustrated in the illustration on the"
+#~ " right.\n"
+#~ " Typical transactions involve the following steps:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " A customer instructs his <b>bank</b> to\n"
+#~ " transfer funds from his account to the Taler\n"
+#~ " exchange (top left). In the subject of the\n"
+#~ " transaction, he includes an authentication\n"
+#~ " token from his electronic <b>wallet</b>. In\n"
+#~ " Taler terminology, the customer creates a\n"
+#~ " reserve at the exchange.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the exchange has received the wire\n"
+#~ " transfer, it allows the customer's electronic\n"
+#~ " wallet to <b>withdraw</b> electronic coins.\n"
+#~ " The electronic coins are digital\n"
+#~ " representations of the original currency from\n"
+#~ " the transfer. It is important to note that the\n"
+#~ " exchange does not learn the "serial\n"
+#~ " numbers" of the coins created in this\n"
+#~ " process, so it cannot tell later which customer\n"
+#~ " purchased what at which merchant. The use of\n"
+#~ " Taler does not change the currency or the total\n"
+#~ " value of the funds (except for fees which the\n"
+#~ " exchange may charge for the service).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the customer has the digital coins in his\n"
+#~ " wallet, the wallet can be used to <b>spend</b>\n"
+#~ " the coins with merchant portals that support\n"
+#~ " the Taler payment system and accept the\n"
+#~ " respective exchange as a business partner\n"
+#~ " (bottom arrow). This creates a digital contract\n"
+#~ " signed by the customer's coins and the\n"
+#~ " merchant. If necessary, the customer can later\n"
+#~ " use this digitally signed contract in a court\n"
+#~ " of law to prove the exact terms of the contract\n"
+#~ " and that he paid the respective amount. The\n"
+#~ " customer does not learn the banking details of\n"
+#~ " the merchant, and Taler does not require the\n"
+#~ " merchant to learn the identity of the\n"
+#~ " customer. Naturally, the customer can spend any\n"
+#~ " fraction of his digital coins (the system takes\n"
+#~ " care of customers getting change).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Merchants receiving digital\n"
+#~ " coins <b>deposit</b> the respective claims\n"
+#~ " that resulted from the contract signing with\n"
+#~ " the customer at the exchange to redeem the\n"
+#~ " coins. The deposit step does not reveal the\n"
+#~ " details of the contract between the customer\n"
+#~ " and the merchant or the identity of the\n"
+#~ " customer to the exchange in any way. However,\n"
+#~ " the exchange does learn the identity of the\n"
+#~ " merchant via the provided bank routing\n"
+#~ " information. The merchant can, for example\n"
+#~ " when compelled by the state for taxation,\n"
+#~ " provide information linking the individual\n"
+#~ " deposit to the respective contract signed by\n"
+#~ " the customer. Thus, the exchange's database\n"
+#~ " allows the state to enforce that merchants pay\n"
+#~ " applicable taxes (and do not engage in illegal\n"
+#~ " contracts).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Finally, the exchange transfers funds\n"
+#~ " corresponding to the digital coins redeemed by\n"
+#~ " the merchants to the merchant's <b>bank</b>\n"
+#~ " account. The exchange may combine multiple\n"
+#~ " small transactions into one larger bank\n"
+#~ " transfer. The merchant can query the exchange\n"
+#~ " about the relationship between the bank\n"
+#~ " transfers and the individual claims that were\n"
+#~ " deposited.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Most importantly, the exchange keeps\n"
+#~ " cryptographic proofs that allow it to\n"
+#~ " demonstrate that it is operating correctly to\n"
+#~ " third parties. The system requires an\n"
+#~ " external <b>auditor</b>, such as a\n"
+#~ " government-appointed financial regulatory body,\n"
+#~ " to frequently verify the exchange's databases\n"
+#~ " and check that its bank balance matches the\n"
+#~ " total value of the remaining coins in\n"
+#~ " circulation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Without the auditor, the exchange operators\n"
+#~ " could embezzle funds they are holding in\n"
+#~ " reserve. Customers and merchants cannot cheat\n"
+#~ " each other or the exchange. If any party's\n"
+#~ " computers are compromised, the financial damage\n"
+#~ " is limited to the respective party and\n"
+#~ " proportional to the funds they have in\n"
+#~ " circulation during the period of the\n"
+#~ " compromise.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+#~ "Taler is not based on proof-of-"
+#~ "work or any other distributed consensus"
+#~ "\n"
+#~ "mechanism. Instead Taler is based on blind signatures.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>It would be possible, however, to withdraw coins denominated in\n"
+#~ "Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+#~ "would give some benefits over plain Bitcoin, such as instant\n"
+#~ "confirmation times.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Your wallet stores digital coins and thus ultimately your computer\n"
+#~ "holds your balance. The exchange keeps funds matching all unspent\n"
+#~ "coins in an escrow bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Since the digital coins of value "
+#~ "in your wallet are anonymized, the\n"
+#~ ""
+#~ "exchange can not assist you in recovering a lost or stolen wallet.\n"
+#~ "Just like with a physical wallet for cash, you are responsible for\n"
+#~ "keeping it safe.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>The risk of losing a wallet can be mitigated by making backups or\n"
+#~ "keeping the balance reasonably low.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>In case of a compromise of one of your devices, an attacker can\n"
+#~ "spend coins from your wallet. Checking your balance might reveal\n"
+#~ "to you that your device has been compromised.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>If your friend provides goods or "
+#~ "services for you in exchange for a"
+#~ "\n"
+#~ "payment, they can easily set up a Taler merchant and receive the\n"
+#~ "payment in their bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Future versions of the Taler wallet may allow exchanging coins\n"
+#~ "among friends directly as well.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler wallets can store digital coins corresponding to multiple\n"
+#~ "different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler currently does not offer conversion between currencies.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "<p>Your wallet stores digital coins that are <a\n"
+#~ "href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+#~ "signed</a> by an exchange. The use "
+#~ "of a blind signature protects your\n"
+#~ ""
+#~ "privacy as it prevents the exchange from knowing which coin it signed\n"
+#~ "for which customer.</p>\n"
+#~ "\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides accountability to ensure business operate\n"
+#~ " legally, while also respecting civil liberties of\n"
+#~ " citizens. Taler is a payment system based on\n"
+#~ " open standards and free software. Taler needs\n"
+#~ " governments as they set a financial framework and act as\n"
+#~ " trusted regulators. Taler contributes to digital\n"
+#~ " sovereignty in the critical financial infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler was built with the goal of fighting corruption and\n"
+#~ " supporting taxation. With Taler, the receiver of any\n"
+#~ " form of payment is easily identified by the government,\n"
+#~ " and the merchant can be "
+#~ "compelled to provide the contract\n"
+#~ " that was accepted by the customer. Governments can use\n"
+#~ " this data to tax businesses and individuals based on\n"
+#~ " their income, making tax evasion and black markets less\n"
+#~ " viable.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Thus, despite offering anonymity for citizens spending\n"
+#~ " digital cash to buy goods and services, Taler also\n"
+#~ " ensures that the state can observe incoming funds. This\n"
+#~ " can be used to ensure businesses engage only in legal\n"
+#~ " activities, and do not evade income tax, sales tax or\n"
+#~ " value-added tax. However, this observational capability\n"
+#~ " does not extend to the immediate personal domain. In\n"
+#~ " particular, monitoring does not cover shared access to\n"
+#~ " funds with trusted friends and family, or synchronizing\n"
+#~ " wallets across multiple devices.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler's payments are cryptographically secured. Thus,\n"
+#~ " customers, merchants and the "
+#~ "Taler payment service provider\n"
+#~ " (the exchange) can mathematically\n"
+#~ " demonstrate their lawful behavior in court in case of\n"
+#~ " disputes. Financial damages are strictly limited,\n"
+#~ " improving economic security for individuals, merchants,\n"
+#~ " the exchange and the state.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " As a payment service provider, the Taler exchange is\n"
+#~ " subject to financial regulation."
+#~ " Financial regulation and\n"
+#~ " regular audits are critical to establish trust. In\n"
+#~ " particular, the Taler design "
+#~ "mandates the existence of an\n"
+#~ " independent auditor who checks cryptographic proofs that\n"
+#~ " accumulate at the exchange to ensure that the escrow\n"
+#~ " account is managed honestly. This ensures that the\n"
+#~ " exchange does not threaten the economy due to fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software implementing an open protocol\n"
+#~ " standard. Thus, Taler will enable competition and avoid\n"
+#~ " the monopolization of payment systems that threatens\n"
+#~ " global political and financial stability today.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler has an efficient design. Unlike\n"
+#~ " Blockchain-based payment systems, such as Bitcoin,\n"
+#~ " Taler will not threaten the availability of\n"
+#~ " national electric grids or (significantly)\n"
+#~ " contribute to environmental pollution.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler assumes governments can "
+#~ "observe traditional wire transfers\n"
+#~ " entering and leaving the "
+#~ "Taler payment system. Starting with the"
+#~ "\n"
+#~ " wire transfers, governments can obtain:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The total amount of digital currency withdrawn by a\n"
+#~ " customer. The government can"
+#~ " impose limits on how much\n"
+#~ " digital cash a customer can withdraw within a\n"
+#~ " given time frame.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The income received by any merchant via the Taler\n"
+#~ " system.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ " The exact details of the underlying contract that was\n"
+#~ " signed between customer and merchant. However, this\n"
+#~ " information would typically not include the identity\n"
+#~ " of the customer.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The amounts of digital coins legitimately withdrawn\n"
+#~ " by customers from the exchange, the value of\n"
+#~ " non-redeemed digital coins"
+#~ " in customer's wallets, the\n"
+#~ " value and corresponding wire details of deposit\n"
+#~ " operations performed by merchants with the exchange,\n"
+#~ " and the income of the"
+#~ " exchange from transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is an electronic payment system under development at\n"
+#~ " <a href=\"http://www.inria.fr/\";>Inria</a>. "
+#~ "We expect to make it\n"
+#~ " operational in 2017. You can "
+#~ "learn about Taler on this website,\n"
+#~ ""
+#~ " try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+#~ " our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+#~ " href=\"https://api.taler.net\";>API</a> documentation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is easy to integrate with existing Web\n"
+#~ " applications. Payments are cryptographically\n"
+#~ " secured and are confirmed within milliseconds with\n"
+#~ " extremely low transaction costs.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler does not introduce a new currency. Taler\n"
+#~ " uses a digital wallet storing coins and payment service\n"
+#~ " providers with escrow accounts in existing currencies.\n"
+#~ " Thus, Taler's cryptographic coins correspond to existing\n"
+#~ " currencies, such as US Dollars, Euros or even Bitcoins.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " By design Taler does not suffer from many classes\n"
+#~ " of security problems such as phishing or counterfeit.\n"
+#~ " Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ " customer due to a fraud-detection false positive.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When using Taler, merchant's revenue is transparent for tax\n"
+#~ " collection authorities. Unlike cash"
+#~ " and most digital currencies,\n"
+#~ " Taler helps prevent black markets. Taler is not suitable for\n"
+#~ " illegal activities.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When you pay with Taler, your identity does not\n"
+#~ " have to be revealed to the merchant. Just like\n"
+#~ " payments in cash, nobody else can track how you\n"
+#~ " spent your electronic money. However, you obtain a\n"
+#~ " legally valid proof of payment.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides protocols and "
+#~ "reference implementations that in\n"
+#~ " principle enables anybody to run"
+#~ " their own payment infrastructure,\n"
+#~ " be it individuals, organizations "
+#~ "or whole countries. Since the\n"
+#~ " reference implementation is a <a"
+#~ " href=\"http://www.gnu.org/\";>GNU</a>\n"
+#~ " package, it will always remain free software.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To pay with Taler, customers install an electronic wallet\n"
+#~ " on their device. Before the "
+#~ "first payment, the wallet's balance must"
+#~ "\n"
+#~ " be charged in the desired "
+#~ "currency by some other means of "
+#~ "payment.</p>\n"
+#~ " <p>Once the wallet is charged, "
+#~ "payments on websites take only one "
+#~ "click,\n"
+#~ " are never falsely rejected by "
+#~ "fraud detection and do not pose "
+#~ "any risk\n"
+#~ " of phishing or identity theft.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ " in the desired currency. We provide supporting software\n"
+#~ " in various programming languages to"
+#~ " make the integration painless.\n"
+#~ " The merchant's backend for Taler transaction processing can run\n"
+#~ " on the merchant's premises or be hosted by a third party.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have created a company, Taler Systems SA in\n"
+#~ " Luxembourg.<br>\n"
+#~ " Please contact <tt>address@hidden</tt>\n"
+#~ " if you want to invest in Taler.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Our <a href=\"about.html\">team</a> "
+#~ "combines world-class business leaders,\n"
+#~ " cryptographers, software engineers, civil-rights\n"
+#~ " activists and academics. We are unified by a vision\n"
+#~ " of how payments should work and the goal of\n"
+#~ " imposing this vision upon the world.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We are currently supported "
+#~ "by <a href=\"http://www.inria.fr/\";>Inria</a>, the"
+#~ " French\n"
+#~ " national institute for research in informatics and\n"
+#~ " automation, and the <a "
+#~ "href=\"https://renewablefreedom.org/\";>Renewable Freedom "
+#~ "Foundation</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " All transactions in Taler "
+#~ "are secured using <a "
+#~ "href=\"bibliography.html\">modern\n"
+#~ " cryptography</a> and trust in all parties is\n"
+#~ " minimized. Financial damage is bounded (for\n"
+#~ " customers, merchants and the exchange) even in the\n"
+#~ " case that systems are compromised and private keys\n"
+#~ " are stolen. Databases can be audited for\n"
+#~ " consistency, resulting in either the detection of\n"
+#~ " compromised systems or the demonstration that\n"
+#~ " participants were honest. Actual transaction costs\n"
+#~ " are fractions of a cent.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The scalable business model for Taler is the operation\n"
+#~ " of the payment service "
+#~ "provider, which converts money from\n"
+#~ " traditional payment systems (MasterCard, SEPA, UPI,\n"
+#~ " Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+#~ " electronic coins in the same currency. The customer\n"
+#~ " can then redeem the electronic coins at a merchant,\n"
+#~ " who can exchange them for money represented using\n"
+#~ " traditional payment systems at the exchange. The\n"
+#~ " exchange charges fees to facilitate the transactions.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The payment service operator runs the <em>Taler exchange</em>.\n"
+#~ " The exchange charges <b>transaction "
+#~ "fees</b> to customers or merchants.\n"
+#~ " Its operational expenses are from"
+#~ " wire transfers with the banking\n"
+#~ " system and the operation of the computing infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is a cost-effective electronic payment system\n"
+#~ " which provides you with cryptographic proof that\n"
+#~ " the payment worked correctly within milliseconds.\n"
+#~ " Your Web customers pay with previously unknown\n"
+#~ " levels of convenience without risk of fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Processing transactions with Taler is fast,\n"
+#~ " allowing you to confirm the transaction with your\n"
+#~ " customer virtually immediately. Your customers\n"
+#~ " will appreciate that they do not have to type in\n"
+#~ " credit card information and play the "verified\n"
+#~ " by" game. By making payments significantly\n"
+#~ " more convenient for your customers, you may be able\n"
+#~ " to use Taler for small transactions that would not\n"
+#~ " work with credit card payments due to the mental\n"
+#~ " overhead for customers.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You will have cryptographic proof of payment from the\n"
+#~ " Taler payment service provider. With Taler you never\n"
+#~ " handle sensitive customer account information and thus\n"
+#~ " do not have to undergo any particular security audits\n"
+#~ " (such as PCI DSS). Your systems will have customer\n"
+#~ " contracts with qualified signatures for all\n"
+#~ " transactions which you can use in court in case of\n"
+#~ " disputes.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software, and you can use the\n"
+#~ " liberally-licensed reference code as a starting\n"
+#~ " point to integrate Taler into your services. To use\n"
+#~ " Taler, you do not need to pay license fees, and the\n"
+#~ " free software development model will ensure that\n"
+#~ " you can select from many competing integrators for\n"
+#~ " support.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is uses efficient "
+#~ "cryptographic constructions with low\n"
+#~ " bandwidth and storage "
+#~ "requirements. Combined with Taler's strong"
+#~ "\n"
+#~ " security which makes fraud "
+#~ "impossible, Taler payment service\n"
+#~ " providers can operate with very low overhead and\n"
+#~ " thus offer low transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler can be used for different currencies (such as\n"
+#~ " Euros, US Dollars or Bitcoins) and any amount, limited\n"
+#~ " only by applicable regulatation and what denominations\n"
+#~ " the payment service provider supports.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler prevents tax evasion and money laundering.\n"
+#~ " Taler's protocols are efficient"
+#~ " and do not use wasteful\n"
+#~ " proof-of-work calculations. Taler encourages\n"
+#~ " transparency by providing an open standard and free\n"
+#~ " software reference implementations.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>signs</b> and <b>stores</b> the\n"
+#~ " complete terms of offers "
+#~ "made by the merchant to customers.\n"
+#~ ""
+#~ " For this, the merchant's frontend needs to give the\n"
+#~ " customer's order in a JSON format to the backend.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>validates</b> payments received from\n"
+#~ " the wallet and <b>executes</b> them with the Taler\n"
+#~ " payment service provider (the exchange). For this,\n"
+#~ " the merchant's frontend must pass the payment\n"
+#~ " request through to the Taler backend and check the\n"
+#~ " HTTP status code that is returned.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend can <b>list</b> completed transactions\n"
+#~ " and <b>map</b> wire transfers to sets of business\n"
+#~ " transactions, including the exact terms of each\n"
+#~ " contract.\n"
+#~ " "
+#~ msgstr ""
+
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 68869b4..4f7add4 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-08 10:25+0100\n"
+"POT-Creation-Date: 2017-03-15 11:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: en\n"
@@ -86,12 +86,6 @@ msgstr ""
msgid "Taler System Architecture"
msgstr ""
-#: architecture.html.j2:8
-msgid ""
-"\n"
-" "
-msgstr ""
-
#: bibliography.html.j2:4
msgid "GNU Taler Bibliography"
msgstr ""
@@ -115,69 +109,69 @@ msgstr ""
#: citizens.html.j2:9
msgid ""
-"\n"
-" Taler largely functions like digital cash. You\n"
-" withdraw money from your bank account into your\n"
-" electronic wallet, and can henceforth spend digital\n"
-" cash. The electronic wallet can carry multiple\n"
-" currencies.\n"
-" "
+"Taler largely functions like digital cash. You\n"
+"withdraw money from your bank account into your\n"
+"electronic wallet, and can henceforth spend digital\n"
+"cash. The electronic wallet can carry multiple\n"
+"currencies.\n"
msgstr ""
-#: citizens.html.j2:25
-msgid "Security"
+#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
+#: merchants.html.j2:41
+msgid "Secure"
msgstr ""
#: citizens.html.j2:27
msgid ""
"Taler uses modern cryptography, ensuring that there\n"
-" is no counterfeit. Your digital wallet is safer\n"
-" than your physical wallet. At most, you can lose\n"
-" its contents because your computer or mobile is\n"
-" irreparably damaged or compromised. Unlike a\n"
-" physical wallet, you can make backups to secure\n"
-" against data loss."
+"is no counterfeit. Your digital wallet is safer\n"
+"than your physical wallet. At most, you can lose\n"
+"its contents because your computer or mobile is\n"
+"irreparably damaged or compromised. Unlike a\n"
+"physical wallet, you can make backups to secure\n"
+"against data loss."
msgstr ""
-#: citizens.html.j2:37
-msgid "Privacy"
+#: citizens.html.j2:37 index.html.j2:83
+msgid "Private"
msgstr ""
#: citizens.html.j2:39
msgid ""
-"Your transactions are private, neither the exchange\n"
-" nor merchant needs to learn your identity. There is\n"
-" no need to give out credit card numbers or other\n"
-" sensitive information. The merchant will only be\n"
-" able to do exactly the transaction you agreed to."
+"Your transactions are private, neither the payment\n"
+"service provider nor merchant needs to learn your\n"
+"identity. There is no need to give out credit card\n"
+"numbers or other sensitive information. The merchant\n"
+"will only be able to do exactly the transaction you\n"
+"agreed to."
msgstr ""
#: citizens.html.j2:50
-msgid "Convenience"
+msgid "Convenient"
msgstr ""
#: citizens.html.j2:52
msgid ""
"You will be able to withdraw money to replenish the\n"
-" digital coins in your wallet using your credit card\n"
-" or wire transfers. Afterwards you can pay with\n"
-" one-click using the Taler wallet, which optionally\n"
-" keeps your transaction history on your computer."
+"digital coins in your wallet using your credit card\n"
+"or wire transfers. Afterwards you can pay with\n"
+"one-click using the Taler wallet, which optionally\n"
+"keeps your transaction history on your computer."
msgstr ""
-#: citizens.html.j2:61
-msgid "Stability"
+#: citizens.html.j2:61 index.html.j2:41
+msgid "Stable"
msgstr ""
#: citizens.html.j2:63
msgid ""
"Coins in your digital wallet will be of the same\n"
-" denomination as the cash in your physical wallet.\n"
-" Taler is not a crypto-currency, so you do not have\n"
-" to worry about cryto-currency related value\n"
-" fluctuations. Banking with Taler is subject to the\n"
-" usual government protections for financial\n"
-" services."
+"denomination as the cash in your physical wallet.\n"
+"Taler is not a crypto-currency, so you do not have\n"
+"to worry about cryto-currency related value\n"
+"fluctuations. Banking with Taler is subject to the\n"
+"usual government protections for financial\n"
+"services."
msgstr ""
#: citizens.html.j2:79
@@ -186,12 +180,10 @@ msgstr ""
#: citizens.html.j2:81
msgid ""
-"\n"
-" We currently provide a <a href=\"wallet.html\">wallet browser "
+"We currently provide a <a href=\"wallet.html\">wallet browser "
"extension</a> for Chromium, Chrome, Firefox, Opera\n"
-" and Edge. Wallets for mobile phones and other platforms will be "
+"and Edge. Wallets for mobile phones and other platforms will be "
"available in the future.\n"
-" "
msgstr ""
#: citizens.html.j2:88
@@ -200,10 +192,8 @@ msgstr ""
#: citizens.html.j2:90
msgid ""
-"\n"
-" You can see how Taler works in practice by visiting our <a "
+"You can see how Taler works in practice by visiting our <a "
"href=\"https://demo.taler.net\";>demo page</a>.\n"
-" "
msgstr ""
#: citizens.html.j2:103
@@ -213,38 +203,37 @@ msgstr ""
#: citizens.html.j2:105
msgid ""
"Customers interact with the Taler system using\n"
-" the Taler wallet:"
+"the Taler wallet:"
msgstr ""
-#: citizens.html.j2:108
+#: citizens.html.j2:110
msgid ""
-"To <b>withdraw</b> electronic coins, the customer transfers funds\n"
-" from his bank account to the Taler exchange. The wire\n"
-" transfer subject must match a code generated by the "
-"customer's\n"
-" wallet. After the wire transfer is complete, the wallet"
-" will\n"
-" automatically withdraw the coins."
+"To <b>withdraw</b> electronic coins, the customer\n"
+"transfers funds from his bank account to the Taler\n"
+"payment service provider (the exchange). The wire\n"
+"transfer subject must match a code identifying the\n"
+"customer's wallet. After the wire transfer is\n"
+"complete, the wallet will automatically withdraw the\n"
+"coins from the exchange."
msgstr ""
-#: citizens.html.j2:114
+#: citizens.html.j2:118
msgid ""
-"To <b>spend</b> electronic coins, a merchant must cause the wallet\n"
-" to display a proposal and ask for one-click "
-"confirmation.\n"
-" Payment is then instant.\n"
-" Transaction histories and digitally signed contracts "
-"can be\n"
-" preserved by the wallet."
+"To <b>spend</b> electronic coins, a merchant must\n"
+"cause the wallet to display a proposal for some\n"
+"purchase. The wallet will ask the customer for\n"
+"one-click confirmation. Payment is then instant.\n"
+"Transaction histories and digitally signed contracts\n"
+"can be preserved by the wallet."
msgstr ""
-#: citizens.html.j2:120
+#: citizens.html.j2:125
msgid ""
"The customer can use the wallet to <b>review</b> his\n"
-" balance. The wallet can contain different currencies,\n"
-" and may be shared across devices. Customers can make\n"
-" backups of the wallet to secure its contents against\n"
-" hardware failures."
+"balance. The wallet can contain different\n"
+"currencies, and may be shared across\n"
+"devices. Customers can make backups of the wallet to\n"
+"secure its contents against hardware failures."
msgstr ""
#: contact.html.j2:6
@@ -257,14 +246,12 @@ msgstr ""
#: contact.html.j2:15
msgid ""
-"\n"
-" An archived, public mailing list for GNU Taler is\n"
-" hosted at\n"
-" <a "
+"An archived, public mailing list for GNU Taler is\n"
+"hosted at\n"
+"<a "
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
" You can send messages to the list\n"
-" at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
-" "
+"at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
msgstr ""
#: contact.html.j2:25
@@ -273,11 +260,9 @@ msgstr ""
#: contact.html.j2:27
msgid ""
-"\n"
-" Team members are generally reachable at\n"
-" <tt>address@hidden</tt>. All of us\n"
-" support receiving GnuPG encrypted e-mails.\n"
-" "
+"Team members are generally reachable at\n"
+"<tt>address@hidden</tt>. All of us\n"
+"support receiving GnuPG encrypted e-mails.\n"
msgstr ""
#: contact.html.j2:36
@@ -286,13 +271,11 @@ msgstr ""
#: contact.html.j2:38
msgid ""
-"\n"
-" We track open feature requests and bugs in our\n"
-" <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
-" which is shared with the GNUnet project.\n"
-" You can also report bugs or feature requests to the\n"
-" mailing list.\n"
-" "
+"We track open feature requests and bugs in our\n"
+"<a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+"which is shared with the GNUnet project.\n"
+"You can also report bugs or feature requests to the\n"
+"mailing list.\n"
msgstr ""
#: contact.html.j2:49
@@ -301,274 +284,254 @@ msgstr ""
#: contact.html.j2:51
msgid ""
-"\n"
-" For non-technical commercial requests, please contact\n"
-" <tt>ceo AT taler.net</tt>.\n"
-" "
+"For non-technical commercial requests, please contact\n"
+"<tt>ceo AT taler.net</tt>.\n"
msgstr ""
#: developers.html.j2:5
msgid "Taler for developers"
msgstr ""
-#: developers.html.j2:12
+#: developers.html.j2:12 merchants.html.j2:58
msgid "Free"
msgstr ""
#: developers.html.j2:15
msgid ""
-"\n"
-" Taler is free software implementing an open\n"
-" protocol. Anybody is welcome to inspect our code\n"
-" and integrate our reference implementation into\n"
-" their applications. Different components of Taler\n"
-" are being made available under different\n"
-" licenses. The Affero GPLv3+ is used for the\n"
-" exchange, the LGPLv3+ is used for reference code\n"
-" demonstrating integration with merchant platforms,\n"
-" and licenses like Apache/Mozilla/GPLv3+ are used\n"
-" for wallets and related customer-facing software.\n"
-" We are open for constructive suggestions for\n"
-" maximizing the adoption of this libre payment\n"
-" platform.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:34
+"GNU Taler is free software implementing an open\n"
+"protocol. Anybody is welcome to integrate our reference\n"
+"implementation into their applications. Different\n"
+"components of Taler are being made available under\n"
+"different licenses. The Affero GPLv3+ is used for the\n"
+"exchange, the LGPLv3+ is used for reference code\n"
+"demonstrating integration with merchant platforms, and\n"
+"licenses like GPLv3+ are used for\n"
+"wallets and related customer-facing software. We are\n"
+"open for constructive suggestions for maximizing the\n"
+"adoption of this payment platform.\n"
+msgstr ""
+
+#: developers.html.j2:32
msgid "RESTful"
msgstr ""
-#: developers.html.j2:37
+#: developers.html.j2:35
msgid ""
-"\n"
-" Taler is designed to work on the Internet. To\n"
-" ensure that Taler payments can work with\n"
-" restrictive network setups, Taler uses a RESTful\n"
-" protocol over HTTP or HTTPS. Taler's security does\n"
-" not depend upon the use of HTTPS, but obviously\n"
-" merchants may choose to offer HTTPS for consistency\n"
-" and because it generally is better for privacy\n"
-" compared to HTTP. Taler uses JSON to encode\n"
-" structure data, making it easy to integrate Taler\n"
-" with existing Web applications. Taler's protocol\n"
-" is documented in\n"
-" detail <a href=\"https://api.taler.net/\";>here</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:60
+"Taler is designed to work on the Internet. To\n"
+"ensure that Taler payments can work with\n"
+"restrictive network setups, Taler uses a RESTful\n"
+"protocol over HTTP or HTTPS. Taler's security does\n"
+"not depend upon the use of HTTPS, but obviously\n"
+"merchants may choose to offer HTTPS for consistency\n"
+"and because it generally is better for privacy\n"
+"compared to HTTP. Taler uses JSON to encode\n"
+"structure data, making it easy to integrate Taler\n"
+"with existing Web applications. Taler's protocol\n"
+"is documented in\n"
+"detail at <a href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+msgstr ""
+
+#: developers.html.j2:58
msgid "Code"
msgstr ""
-#: developers.html.j2:63
+#: developers.html.j2:61
msgid ""
-"\n"
-" Taler is currently primarily developed by a\n"
-" research team at Inria and GNUnet e.V. However,\n"
-" contributions from anyone are welcome. Our Git\n"
-" repositories can be cloned using the Git and HTTP\n"
-" access methods against <tt>git.taler.net</tt> with\n"
-" the name of the respective repository. A list of\n"
-" public repositories can be found in\n"
-" our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:76
+"Taler is currently primarily developed by a\n"
+"research team at <a href=\"http://www.inria.fr/\";>Inria</a> and\n"
+"<a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+"contributions from anyone are welcome. Our Git\n"
+"repositories can be cloned using the Git and HTTP\n"
+"access methods against <tt>git.taler.net</tt> with\n"
+"the name of the respective repository. A list of\n"
+"repositories can be found in\n"
+"our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+msgstr ""
+
+#: developers.html.j2:75
msgid "Documentation"
msgstr ""
-#: developers.html.j2:79
+#: developers.html.j2:78
msgid ""
-"\n"
-" In addition to this website,\n"
-" the <a href=\"https://git.taler.net/\";>documented\n"
-" code</a> and\n"
-" the <a href=\"https://api.taler.net/\";>API\n"
-" documentation</a>, we are in the process of\n"
-" preparing a comprehensive design document which\n"
-" will be published here soon.\n"
-" "
+"In addition to this website, the <a\n"
+"href=\"https://git.taler.net/\";>documented code</a> and\n"
+"the <a href=\"https://api.taler.net/\";>API\n"
+"documentation</a>. Technical papers can be found in\n"
+"our <a href=\"bibliography.html\">bibliography</a>.\n"
msgstr ""
-#: developers.html.j2:91
+#: developers.html.j2:88
msgid "Discussion"
msgstr ""
-#: developers.html.j2:93
+#: developers.html.j2:91
msgid ""
"We have a mailing list for developer discussions.\n"
-" You can subscribe to it or read the list archive at\n"
-" <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"You can subscribe to or read the list archive at\n"
+"<a "
+"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"\n"
msgstr ""
-#: developers.html.j2:100
+#: developers.html.j2:101
msgid "Regression Testing"
msgstr ""
-#: developers.html.j2:102
+#: developers.html.j2:104
msgid ""
-"We have\n"
-" <a href='https://buildbot.net/'>Buildbot</a>\n"
-" automation tests to detect regressions and check\n"
-" for portability at\n"
-" <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.\n"
-" "
+"We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+"automation tests to detect regressions and check for\n"
+"portability at <a\n"
+"href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:110
+#: developers.html.j2:113
msgid "Code Coverage Analysis"
msgstr ""
-#: developers.html.j2:112
+#: developers.html.j2:116
msgid ""
"We use\n"
-" <a "
-"href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-" to analyze the code coverage of our tests, the\n"
-" results are available\n"
-" at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-" "
+"<a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+"to analyze the code coverage of our tests, the\n"
+"results are available\n"
+"at <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:120
+#: developers.html.j2:126
msgid "Performance Analysis"
msgstr ""
-#: developers.html.j2:122
+#: developers.html.j2:129
msgid ""
"We\n"
-" use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
-" for performance regression analysis of the exchange\n"
-" backend\n"
-" at <a "
-"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-" "
+"use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+"for performance regression analysis of the exchange\n"
+"backend\n"
+"at <a href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:136
+#: developers.html.j2:145
msgid "Taler system overview"
msgstr ""
-#: developers.html.j2:138
+#: developers.html.j2:148
msgid ""
"The Taler system consists of protocols executed among\n"
-" a number of actors with the help\n"
-" of <a href='https://www.fsf.org/'>Free Software</a>\n"
-" as illustrated in the illustration on the right.\n"
-" Typical transactions involve the following steps: "
+"a number of actors as illustrated in the illustration on the right.\n"
+"Typical transactions involve the following steps:\n"
msgstr ""
-#: developers.html.j2:147
+#: developers.html.j2:158
msgid ""
"A customer instructs his <b>bank</b> to\n"
-" transfer funds from his account to the Taler\n"
-" exchange (top left). In the subject of the\n"
-" transaction, he includes an authentication\n"
-" token from his electronic <b>wallet</b>. In\n"
-" Taler terminology, the customer creates a\n"
-" reserve at the exchange. "
+"transfer funds from his account to the Taler\n"
+"exchange (top left). In the subject of the\n"
+"transaction, he includes an authentication\n"
+"token from his electronic <b>wallet</b>. In\n"
+"Taler terminology, the customer creates a\n"
+"reserve at the exchange.\n"
msgstr ""
-#: developers.html.j2:155
+#: developers.html.j2:170
msgid ""
"Once the exchange has received the wire\n"
-" transfer, it allows the customer's electronic\n"
-" wallet to <b>withdraw</b> electronic coins.\n"
-" The electronic coins are digital\n"
-" representations of the original currency from\n"
-" the transfer. It is important to note that the\n"
-" exchange does not learn the "serial\n"
-" numbers" of the coins created in this\n"
-" process, so it cannot tell later which customer\n"
-" purchased what at which merchant. The use of\n"
-" Taler does not change the currency or the total\n"
-" value of the funds (except for fees which the\n"
-" exchange may charge for the service). "
+"transfer, it allows the customer's electronic\n"
+"wallet to <b>withdraw</b> electronic coins.\n"
+"The electronic coins are digital\n"
+"representations of the original currency from\n"
+"the transfer. It is important to note that the\n"
+"exchange does not learn the "serial\n"
+"numbers" of the coins created in this\n"
+"process, so it cannot tell later which customer\n"
+"purchased what at which merchant. The use of\n"
+"Taler does not change the currency or the total\n"
+"value of the funds (except for fees which the\n"
+"exchange may charge for the service).\n"
msgstr ""
-#: developers.html.j2:170
+#: developers.html.j2:188
msgid ""
"Once the customer has the digital coins in his\n"
-" wallet, the wallet can be used to <b>spend</b>\n"
-" the coins with merchant portals that support\n"
-" the Taler payment system and accept the\n"
-" respective exchange as a business partner\n"
-" (bottom arrow). This creates a digital contract\n"
-" signed by the customer's coins and the\n"
-" merchant. If necessary, the customer can later\n"
-" use this digitally signed contract in a court\n"
-" of law to prove the exact terms of the contract\n"
-" and that he paid the respective amount. The\n"
-" customer does not learn the banking details of\n"
-" the merchant, and Taler does not require the\n"
-" merchant to learn the identity of the\n"
-" customer. Naturally, the customer can spend any\n"
-" fraction of his digital coins (the system takes\n"
-" care of customers getting change). "
-msgstr ""
-
-#: developers.html.j2:188
+"wallet, the wallet can be used to <b>spend</b>\n"
+"the coins with merchant portals that support\n"
+"the Taler payment system and accept the\n"
+"respective exchange as a business partner\n"
+"(bottom arrow). This creates a digital contract\n"
+"signed by the customer's coins and the\n"
+"merchant. If necessary, the customer can later\n"
+"use this digitally signed contract in a court\n"
+"of law to prove the exact terms of the contract\n"
+"and that he paid the respective amount. The\n"
+"customer does not learn the banking details of\n"
+"the merchant, and Taler does not require the\n"
+"merchant to learn the identity of the\n"
+"customer. Naturally, the customer can spend any\n"
+"fraction of his digital coins (the system takes\n"
+"care of customers getting change).\n"
+msgstr ""
+
+#: developers.html.j2:210
msgid ""
"Merchants receiving digital\n"
-" coins <b>deposit</b> the respective receipts\n"
-" that resulted from the contract signing with\n"
-" the customer at the exchange to redeem the\n"
-" coins. The deposit step does not reveal the\n"
-" details of the contract between the customer\n"
-" and the merchant or the identity of the\n"
-" customer to the exchange in any way. However,\n"
-" the exchange does learn the identity of the\n"
-" merchant via the provided bank routing\n"
-" information. The merchant can, for example\n"
-" when compelled by the state for taxation,\n"
-" provide information linking the individual\n"
-" deposit to the respective contract signed by\n"
-" the customer. Thus, the exchange's database\n"
-" allows the state to enforce that merchants pay\n"
-" applicable taxes (and do not engage in illegal\n"
-" contracts). "
-msgstr ""
-
-#: developers.html.j2:207
+"coins <b>deposit</b> the respective claims\n"
+"that resulted from the contract signing with\n"
+"the customer at the exchange to redeem the\n"
+"coins. The deposit step does not reveal the\n"
+"details of the contract between the customer\n"
+"and the merchant or the identity of the\n"
+"customer to the exchange in any way. However,\n"
+"the exchange does learn the identity of the\n"
+"merchant via the provided bank routing\n"
+"information. The merchant can, for example\n"
+"when compelled by the state for taxation,\n"
+"provide information linking the individual\n"
+"deposit to the respective contract signed by\n"
+"the customer. Thus, the exchange's database\n"
+"allows the state to enforce that merchants pay\n"
+"applicable taxes (and do not engage in illegal\n"
+"contracts).\n"
+msgstr ""
+
+#: developers.html.j2:233
msgid ""
"Finally, the exchange transfers funds\n"
-" corresponding to the digital coins redeemed by\n"
-" the merchants to the merchant's <b>bank</b>\n"
-" account. The exchange may combine multiple\n"
-" small transactions into one larger bank\n"
-" transfer. The merchant can query the exchange\n"
-" about the relationship between the bank\n"
-" transfers and the individual claims that were\n"
-" deposited. "
+"corresponding to the digital coins redeemed by\n"
+"the merchants to the merchant's <b>bank</b>\n"
+"account. The exchange may combine multiple\n"
+"small transactions into one larger bank\n"
+"transfer. The merchant can query the exchange\n"
+"about the relationship between the bank\n"
+"transfers and the individual claims that were\n"
+"deposited.\n"
msgstr ""
-#: developers.html.j2:217
+#: developers.html.j2:247
msgid ""
"Most importantly, the exchange keeps\n"
-" cryptographic proofs that allow it to\n"
-" demonstrate that it is operating correctly to\n"
-" third parties. The system requires an\n"
-" external <b>auditor</b>, such as a\n"
-" government-appointed financial regulatory body,\n"
-" to frequently verify the exchange's databases\n"
-" and check that its bank balance matches the\n"
-" total value of the remaining coins in\n"
-" circulation. "
+"cryptographic proofs that allow it to\n"
+"demonstrate that it is operating correctly to\n"
+"third parties. The system requires an\n"
+"external <b>auditor</b>, such as a\n"
+"government-appointed financial regulatory body,\n"
+"to frequently verify the exchange's databases\n"
+"and check that its bank balance matches the\n"
+"total value of the remaining coins in\n"
+"circulation.\n"
msgstr ""
-#: developers.html.j2:228
+#: developers.html.j2:262
msgid ""
"Without the auditor, the exchange operators\n"
-" could embezzle funds they are holding in\n"
-" reserve. Customers and merchants cannot cheat\n"
-" each other or the exchange. If any party's\n"
-" computers are compromised, the financial damage\n"
-" is limited to the respective party and\n"
-" proportional to the funds they have in\n"
-" circulation during the period of the\n"
-" compromise. "
+"could embezzle funds they are holding in\n"
+"reserve. Customers and merchants cannot cheat\n"
+"each other or the exchange. If any party's\n"
+"computers are compromised, the financial damage\n"
+"is limited to the respective party and\n"
+"proportional to the funds they have in\n"
+"circulation during the period of the\n"
+"compromise.\n"
msgstr ""
#: faq.html.j2:5
@@ -577,27 +540,28 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"\n"
"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
"Taler is not based on proof-of-work or any other distributed consensus\n"
"mechanism. Instead Taler is based on blind signatures.</p>\n"
-"\n"
-"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
-"wallet (with an appropriate exchange), which would give some benefits\n"
-"over plain Bitcoin, such as instant confirmation times.</p>\n"
msgstr ""
-#: faq.html.j2:16
+#: faq.html.j2:11
+msgid ""
+"<p>It would be possible, however, to withdraw coins denominated in\n"
+"Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+"would give some benefits over plain Bitcoin, such as instant\n"
+"confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:18
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:17
+#: faq.html.j2:19
msgid ""
-"\n"
-"<p>Your wallet stores digital coins that were blindly signed by an\n"
-"exchange, and thus ultimately your computer holds your balance. The\n"
-"exchange keeps funds matching all unspent coins in an escrow bank\n"
-"account.</p>\n"
+"<p>Your wallet stores digital coins and thus ultimately your computer\n"
+"holds your balance. The exchange keeps funds matching all unspent\n"
+"coins in an escrow bank account.</p>\n"
msgstr ""
#: faq.html.j2:25
@@ -606,385 +570,355 @@ msgstr ""
#: faq.html.j2:26
msgid ""
-"\n"
"<p>Since the digital coins of value in your wallet are anonymized, the\n"
"exchange can not assist you in recovering a lost or stolen wallet.\n"
"Just like with a physical wallet for cash, you are responsible for\n"
"keeping it safe.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:32
+msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or\n"
"keeping the balance reasonably low.</p>\n"
-"\n"
-"<p>In case of a compromise of one of your devices, an attacker that\n"
-"spends coins on your behalf will allow you to detect that your device\n"
-"has been compromised.</p>\n"
msgstr ""
-#: faq.html.j2:41
+#: faq.html.j2:37
+msgid "What if my computer is hacked?"
+msgstr ""
+
+#: faq.html.j2:38
+msgid ""
+"<p>In case of a compromise of one of your devices, an attacker can\n"
+"spend coins from your wallet. Checking your balance might reveal\n"
+"to you that your device has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:44
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:42
+#: faq.html.j2:45
msgid ""
-"\n"
"<p>If your friend provides goods or services for you in exchange for a\n"
"payment, they can easily set up a Taler merchant and receive the\n"
"payment in their bank account.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:50
+msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins\n"
"among friends directly as well.</p>\n"
msgstr ""
-#: faq.html.j2:52
+#: faq.html.j2:56
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:53
+#: faq.html.j2:57
msgid ""
-"\n"
"<p>Taler wallets can store digital coins corresponding to multiple\n"
"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+msgstr ""
+
+#: faq.html.j2:61
+msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
+#: faq.html.j2:65
+msgid "How does Taler protect my privacy?"
+msgstr ""
+
+#: faq.html.j2:66
+msgid ""
+"<p>Your wallet stores digital coins that are <a\n"
+"href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+"signed</a> by an exchange. The use of a blind signature protects your\n"
+"privacy as it prevents the exchange from knowing which coin it signed\n"
+"for which customer.</p>\n"
"\n"
-"<p>Taler currently does not offer conversion between currencies.</p>\n"
msgstr ""
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
-#: governments.html.j2:7
+#: governments.html.j2:8
msgid ""
-"Taler provides accountability to ensure business\n"
-" accepting payments operate legally, while also\n"
-" respecting civil liberties of citizens spending\n"
-" digital cash. Taler is a commons, a payment system\n"
-" based on open standards and free software. Taler\n"
-" needs governments to set a financial framework and\n"
-" to act as trusted regulators. Taler contributes to\n"
-" digital sovereignty in the critical financial\n"
-" infrastructure."
+"Taler provides accountability to ensure business operate\n"
+"legally, while also respecting civil liberties of\n"
+"citizens. Taler is a payment system based on\n"
+"open standards and free software. Taler needs\n"
+"governments as they set a financial framework and act as\n"
+"trusted regulators. Taler contributes to digital\n"
+"sovereignty in the critical financial infrastructure.\n"
msgstr ""
-#: governments.html.j2:23 index.html.j2:69
+#: governments.html.j2:25 index.html.j2:70
msgid "Taxable"
msgstr ""
-#: governments.html.j2:25
+#: governments.html.j2:28
msgid ""
-"Taler was\n"
-" built with the goal of fighting corruption and supporting "
-"taxation.\n"
-" With Taler, the receiver of any form of payment is\n"
-" easily identified by the government, and the merchant\n"
-" can be compelled to provide the contract that was accepted\n"
-" by the customer. Governments can use this data to\n"
-" tax businesses and individuals based on their\n"
-" income, making tax evasion and black markets less\n"
-" viable."
+"Taler was built with the goal of fighting corruption and\n"
+"supporting taxation. With Taler, the receiver of any\n"
+"form of payment is easily identified by the government,\n"
+"and the merchant can be compelled to provide the contract\n"
+"that was accepted by the customer. Governments can use\n"
+"this data to tax businesses and individuals based on\n"
+"their income, making tax evasion and black markets less\n"
+"viable.\n"
msgstr ""
-#: governments.html.j2:35
+#: governments.html.j2:41
msgid ""
-"Thus, despite offering anonymity for citizens\n"
-" spending digital cash to buy goods and services,\n"
-" Taler also ensures that the state can observe\n"
-" incoming funds. This can be used to ensure\n"
-" businesses engage only in legal activities, and do\n"
-" not evade income tax, sales tax or value-added tax.\n"
-" However, this observational capability does not\n"
-" extend to the immediate personal domain. In\n"
-" particular, sharing access to funds within a family\n"
-" or synchronizing wallets across multiple devices is not\n"
-" subject to monitoring."
-msgstr ""
-
-#: governments.html.j2:48 merchants.html.j2:33
-msgid "Secure"
+"Thus, despite offering anonymity for citizens spending\n"
+"digital cash to buy goods and services, Taler also\n"
+"ensures that the state can observe incoming funds. This\n"
+"can be used to ensure businesses engage only in legal\n"
+"activities, and do not evade income tax, sales tax or\n"
+"value-added tax. However, this observational capability\n"
+"does not extend to the immediate personal domain. In\n"
+"particular, monitoring does not cover shared access to\n"
+"funds with trusted friends and family, or synchronizing\n"
+"wallets across multiple devices.\n"
msgstr ""
-#: governments.html.j2:50
+#: governments.html.j2:61
msgid ""
-"Taler's payments are cryptographically\n"
-" secured. Thus, customers, merchants and the\n"
-" exchange can mathematically demonstrate their\n"
-" lawful behavior in court in case of\n"
-" disputes. Financial damages are strictly limited,\n"
-" improving economic security for individuals,\n"
-" merchants, the exchange and the state."
+"Taler's payments are cryptographically secured. Thus,\n"
+"customers, merchants and the Taler payment service provider\n"
+"(the exchange) can mathematically\n"
+"demonstrate their lawful behavior in court in case of\n"
+"disputes. Financial damages are strictly limited,\n"
+"improving economic security for individuals, merchants,\n"
+"the exchange and the state.\n"
msgstr ""
-#: governments.html.j2:58
+#: governments.html.j2:73
msgid ""
-"By design, the Taler payment service provider is\n"
-" subject to financial regulation. Financial\n"
-" regulation and regular audits are critical to\n"
-" establish trust. In particular, the Taler design\n"
-" mandates the existence of an independent auditor\n"
-" who checks cryptographic proofs that accumulate at\n"
-" the payment service provider to ensure that the\n"
-" escrow account is managed honestly. This ensures\n"
-" that the payment service provider does not threaten\n"
-" the economy due to fraud."
+"As a payment service provider, the Taler exchange is\n"
+"subject to financial regulation. Financial regulation and\n"
+"regular audits are critical to establish trust. In\n"
+"particular, the Taler design mandates the existence of an\n"
+"independent auditor who checks cryptographic proofs that\n"
+"accumulate at the exchange to ensure that the escrow\n"
+"account is managed honestly. This ensures that the\n"
+"exchange does not threaten the economy due to fraud.\n"
msgstr ""
-#: governments.html.j2:72 index.html.j2:95
+#: governments.html.j2:88 index.html.j2:96
msgid "Libre"
msgstr ""
-#: governments.html.j2:74
+#: governments.html.j2:91
msgid ""
-"Taler is free software implementing an open\n"
-" protocol standard. Thus, Taler will enable\n"
-" competition and avoid the monopolization of payment\n"
-" systems that threatens global political and\n"
-" financial stability today."
+"Taler is free software implementing an open protocol\n"
+"standard. Thus, Taler will enable competition and avoid\n"
+"the monopolization of payment systems that threatens\n"
+"global political and financial stability today.\n"
msgstr ""
-#: governments.html.j2:83
+#: governments.html.j2:101
msgid "Efficient"
msgstr ""
-#: governments.html.j2:85
+#: governments.html.j2:104
msgid ""
"Taler has an efficient design. Unlike\n"
-" timeline-based payment systems, such as Bitcoin,\n"
-" Taler will not threaten the availability of\n"
-" national electric grids or (significantly)\n"
-" contribute to environmental pollution."
+"Blockchain-based payment systems, such as Bitcoin,\n"
+"Taler will not threaten the availability of\n"
+"national electric grids or (significantly)\n"
+"contribute to environmental pollution.\n"
msgstr ""
-#: governments.html.j2:99
+#: governments.html.j2:120
msgid "Taler and regulation"
msgstr ""
-#: governments.html.j2:101
-msgid "Anti-money laundering (AML)"
+#: governments.html.j2:122
+msgid "Anti money laundering (AML)"
msgstr ""
-#: governments.html.j2:102
+#: governments.html.j2:123
msgid ""
"With Taler, income is visible and can be tied to the contract signed by "
"both parties."
msgstr ""
-#: governments.html.j2:103
-msgid "Know-your-customer (KYC)"
+#: governments.html.j2:124
+msgid "Know your customer (KYC)"
msgstr ""
-#: governments.html.j2:104
+#: governments.html.j2:125
msgid ""
"In Taler, payer and payee are known by their bank accounts when "
"withdrawing or depositing coins respectively"
msgstr ""
-#: governments.html.j2:105
-msgid "Privacy-by-design (GDPR)"
+#: governments.html.j2:126
+msgid "General Data Protection Regulation (GDPR)"
msgstr ""
-#: governments.html.j2:106
+#: governments.html.j2:127
msgid ""
"Taler cryptographically protects citizen's privacy, and by design "
"implements data minimization and privacy by default."
msgstr ""
-#: governments.html.j2:107
-msgid "Competitive banking (PSD2)"
+#: governments.html.j2:128
+msgid "Payment Services Directive (PSD2)"
msgstr ""
-#: governments.html.j2:108
+#: governments.html.j2:129
msgid ""
-"Taler provides an open standard with public APIs contributing to a level "
-"playing field."
+"Taler provides an open standard with public APIs contributing to a "
+"competitive banking sector."
msgstr ""
-#: governments.html.j2:116
+#: governments.html.j2:137
msgid "Taler provides privacy and accountability"
msgstr ""
-#: governments.html.j2:118
+#: governments.html.j2:140
msgid ""
"Taler assumes governments can observe traditional wire transfers\n"
-" entering and leaving the Taler payment system. Starting with "
-"the\n"
-" wire transfers, governments can obtain: "
+"entering and leaving the Taler payment system. Starting with the\n"
+"wire transfers, governments can obtain:\n"
msgstr ""
-#: governments.html.j2:123
+#: governments.html.j2:148
msgid ""
"The total amount of digital currency withdrawn by a\n"
-" customer. The government can impose limits on how much\n"
-" digital cash a customer can withdraw within a\n"
-" given time frame."
+"customer. The government can impose limits on how much\n"
+"digital cash a customer can withdraw within a\n"
+"given time frame.\n"
msgstr ""
-#: governments.html.j2:128
+#: governments.html.j2:157
msgid ""
"The income received by any merchant via the Taler\n"
-" system."
+"system.\n"
msgstr ""
-#: governments.html.j2:131
+#: governments.html.j2:164
msgid ""
-"The exact details of the underlying\n"
-" contract that was signed between customer and\n"
-" merchant. However, this information would\n"
-" typically not include the identity of the\n"
-" customer."
+"The exact details of the underlying contract that was\n"
+"signed between customer and merchant. However, this\n"
+"information would typically not include the identity\n"
+"of the customer.\n"
msgstr ""
-#: governments.html.j2:137
+#: governments.html.j2:174
msgid ""
-"The amounts of\n"
-" digital coins legitimately withdrawn by\n"
-" customers from the exchange, the value of\n"
-" non-redeemed digital coins in customer's\n"
-" wallets, the value and corresponding wire\n"
-" details of deposit operations performed by\n"
-" merchants with the exchange, and the income of\n"
-" the exchange from transaction fees."
+"The amounts of digital coins legitimately withdrawn\n"
+"by customers from the exchange, the value of\n"
+"non-redeemed digital coins in customer's wallets, the\n"
+"value and corresponding wire details of deposit\n"
+"operations performed by merchants with the exchange,\n"
+"and the income of the exchange from transaction fees.\n"
msgstr ""
#: index.html.j2:10
-msgid "Independent One-Click Payments!"
-msgstr ""
-
-#: index.html.j2:12
-msgid ""
-"\n"
-" Taler is an electronic payment system under\n"
-" development\n"
-" at <a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make "
-"it operational in 2017.\n"
-" You can learn about Taler on this website, try the <a "
-"href=\"https://demo.taler.net\";>demo</a>\n"
-" and look at our <a href=\"https://docs.taler.net\";>developer</a> "
-"and <a href=\"https://api.taler.net\";>API</a> documentation.\n"
-" "
-msgstr ""
-
-#: index.html.j2:26
-msgid "Practical"
+msgid "One-Click Cash Payments!"
msgstr ""
-#: index.html.j2:29
+#: index.html.j2:13
msgid ""
-"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
+"GNU Taler is an electronic payment system under development at\n"
+"<a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make it\n"
+"operational in 2017. You can learn about Taler on this website,\n"
+"try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+"our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+"href=\"https://api.taler.net\";>API</a> documentation.\n"
msgstr ""
-#: index.html.j2:39
-msgid "Stable"
+#: index.html.j2:28
+msgid "Practical"
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:31
msgid ""
-"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+"Taler is easy to integrate with existing Web\n"
+"applications. Payments are cryptographically\n"
+"secured and are confirmed within milliseconds with\n"
+"extremely low transaction costs.\n"
msgstr ""
-#: index.html.j2:54
-msgid "Security-focused"
-msgstr ""
-
-#: index.html.j2:57
+#: index.html.j2:44
msgid ""
-"\n"
-" By design Taler does not suffer from many classes\n"
-" of security problems such as phishing or counterfeit.\n"
-" Despite its security features, Taler never rejects a legitimate\n"
-" customer due to a fraud-detection false positive.\n"
-" "
+"Taler does not introduce a new currency. Taler\n"
+"uses a digital wallet storing coins and payment service\n"
+"providers with escrow accounts in existing currencies.\n"
+"Thus, Taler's cryptographic coins correspond to existing\n"
+"currencies, such as US Dollars, Euros or even Bitcoins.\n"
msgstr ""
-#: index.html.j2:72
+#: index.html.j2:58
msgid ""
-"\n"
-" When using Taler, merchants cannot hide their income from tax\n"
-" collection authorities. Unlike cash and most digital currencies,"
-"\n"
-" Taler helps prevent black markets. Taler is not suitable for\n"
-" illegal activities.\n"
-" "
+"By design Taler does not suffer from many classes\n"
+"of security problems such as phishing or counterfeit.\n"
+"Despite its security features, Taler never rejects a legitimate\n"
+"customer due to a fraud-detection false positive.\n"
msgstr ""
-#: index.html.j2:82
-msgid "Privacy-friendly"
+#: index.html.j2:73
+msgid ""
+"When using Taler, merchant's revenue is transparent for tax\n"
+"collection authorities. Unlike cash and most digital currencies,\n"
+"Taler helps prevent black markets. Taler is not suitable for\n"
+"illegal activities.\n"
msgstr ""
-#: index.html.j2:84
+#: index.html.j2:85
msgid ""
-"\n"
-" When you pay with Taler, your identity does not\n"
-" have to be revealed to the merchant. Just like\n"
-" payments in cash, nobody else can track how you\n"
-" spent your electronic money. However, you obtain a\n"
-" legally valid proof of payment.\n"
-" "
+"When you pay with Taler, your identity does not\n"
+"have to be revealed to the merchant. Just like\n"
+"payments in cash, nobody else can track how you\n"
+"spent your electronic money. However, you obtain a\n"
+"legally valid proof of payment.\n"
msgstr ""
-#: index.html.j2:98
+#: index.html.j2:99
msgid ""
-"\n"
-" Taler provides protocols and reference implementations that in\n"
-" principle enables anybody to run their own payment "
-"infrastructure,\n"
-" be it individuals, organizations or whole countries. Since the\n"
-" reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a>\n"
-" package, it will always remain free software.\n"
-" "
+"Taler provides protocols and reference implementations that in\n"
+"principle enables anybody to run their own payment infrastructure,\n"
+"be it individuals, organizations or whole countries. Since the\n"
+"reference implementation is a <a href=\"http://www.gnu.org/\";>GNU</a>\n"
+"package, it will always remain free software.\n"
msgstr ""
-#: index.html.j2:115
+#: index.html.j2:116
msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:116
+#: index.html.j2:117
msgid ""
-"\n"
-" <p>To pay with Taler, customers install an electronic wallet\n"
-" on their device. Before the first payment, the wallet's balance must"
-"\n"
-" be charged in the desired currency by some other means of "
-"payment.</p>\n"
-" <p>Once the wallet is charged, payments on websites take only one "
-"click,\n"
-" are never falsely rejected by fraud detection and do not post any "
-"risk\n"
-" of phishing or identity theft.</p>\n"
-" "
+"<p>To pay with Taler, customers install an electronic wallet\n"
+"on their device. Before the first payment, the wallet's balance must\n"
+"be charged in the desired currency by some other means of payment.</p>\n"
+"<p>Once the wallet is charged, payments on websites take only one click,\n"
+"are never falsely rejected by fraud detection and do not pose any risk\n"
+"of phishing or identity theft.</p>\n"
msgstr ""
-#: index.html.j2:126
+#: index.html.j2:127
msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:127
+#: index.html.j2:128
msgid ""
-"\n"
-" <p>To receive Taler payments, a merchant needs a bank account\n"
-" in the desired currency. We provide\n"
-" SDKs in various languages to makes the integration painless.\n"
-" The merchant's backend for Taler transaction processing can run\n"
-" on the merchant's premises or hosted.</p>\n"
-" "
+"<p>To receive Taler payments, a merchant needs a bank account\n"
+"in the desired currency. We provide supporting software\n"
+"in various programming languages to make the integration painless.\n"
+"The merchant's backend for Taler transaction processing can run\n"
+"on the merchant's premises or be hosted by a third party.</p>\n"
msgstr ""
-#: index.html.j2:143
+#: index.html.j2:144
msgid "Taler News"
msgstr ""
-#: index.html.j2:147
+#: index.html.j2:148
msgid "Financial News"
msgstr ""
@@ -994,12 +928,10 @@ msgstr ""
#: investors.html.j2:9
msgid ""
-"\n"
-" We have created a company, Taler Systems SA in\n"
-" Luxembourg.<br>\n"
-" Please contact <tt>address@hidden</tt>\n"
-" if you want to invest in Taler.\n"
-" "
+"We have created a company, Taler Systems SA in\n"
+"Luxembourg.<br>\n"
+"Please contact <tt>address@hidden</tt>\n"
+"if you want to invest in Taler.\n"
msgstr ""
#: investors.html.j2:24
@@ -1008,23 +940,21 @@ msgstr ""
#: investors.html.j2:27
msgid ""
-"\n"
-" Our <a href=\"about.html\">team</a> combines world-class "
-"business leaders,\n"
-" cryptographers, software engineers, civil-rights\n"
-" activists and academics. We are unified by a vision\n"
-" of how payments should work and the goal of\n"
-" imposing this vision upon the world.\n"
-" "
+"Our <a href=\"about.html\">team</a> combines world-class business "
+"leaders,\n"
+"cryptographers, software engineers, civil-rights\n"
+"activists and academics. We are unified by a vision\n"
+"of how payments should work and the goal of\n"
+"imposing this vision upon the world.\n"
msgstr ""
#: investors.html.j2:37
msgid ""
-"\n"
-" We are currently supported by Inria, the French\n"
-" national institute for research in informatics and\n"
-" automation, and the Renewable Freedom Foundation.\n"
-" "
+"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>,"
+" the French\n"
+"national institute for research in informatics and\n"
+"automation, and the <a href=\"https://renewablefreedom.org/\";>Renewable "
+"Freedom Foundation</a>.\n"
msgstr ""
#: investors.html.j2:45
@@ -1033,19 +963,17 @@ msgstr ""
#: investors.html.j2:48
msgid ""
-"\n"
-" All transactions in Taler are secured using <a "
+"All transactions in Taler are secured using <a "
"href=\"bibliography.html\">modern\n"
-" cryptography</a> and trust in all parties is\n"
-" minimized. Financial damage is bounded (for\n"
-" customers, merchants and the exchange) even in the\n"
-" case that systems are compromised and private keys\n"
-" are stolen. Databases can be audited for\n"
-" consistency, resulting in either the detection of\n"
-" compromised systems or the demonstration that\n"
-" participants were honest. Actual transaction costs\n"
-" are fractions of a cent.\n"
-" "
+"cryptography</a> and trust in all parties is\n"
+"minimized. Financial damage is bounded (for\n"
+"customers, merchants and the exchange) even in the\n"
+"case that systems are compromised and private keys\n"
+"are stolen. Databases can be audited for\n"
+"consistency, resulting in either the detection of\n"
+"compromised systems or the demonstration that\n"
+"participants were honest. Actual transaction costs\n"
+"are fractions of a cent.\n"
msgstr ""
#: investors.html.j2:63
@@ -1054,17 +982,15 @@ msgstr ""
#: investors.html.j2:66
msgid ""
-"\n"
-" The scalable business model for Taler is the operation\n"
-" of the payment service provider, which converts money from\n"
-" traditional payment systems (MasterCard, SEPA,\n"
-" Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
-" electronic coins in the same currency. The customer\n"
-" can then redeem the electronic coins at a merchant,\n"
-" who can exchange them for money represented using\n"
-" traditional payment systems at the exchange. The\n"
-" exchange charges fees to facilitate the transactions.\n"
-" "
+"The scalable business model for Taler is the operation\n"
+"of the payment service provider, which converts money from\n"
+"traditional payment systems (MasterCard, SEPA, UPI,\n"
+"Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+"electronic coins in the same currency. The customer\n"
+"can then redeem the electronic coins at a merchant,\n"
+"who can exchange them for money represented using\n"
+"traditional payment systems at the exchange. The\n"
+"exchange charges fees to facilitate the transactions.\n"
msgstr ""
#: investors.html.j2:85
@@ -1077,13 +1003,10 @@ msgstr ""
#: investors.html.j2:110
msgid ""
-"\n"
-" The payment service operator runs the <em>Taler exchange</em>.\n"
-" The exchange charges <b>transaction fees</b> to customers or "
-"merchants.\n"
-" Its operational expenses are from wire transfers with the banking\n"
-" system and the operation of the computing infrastructure.\n"
-" "
+"The payment service operator runs the <em>Taler exchange</em>.\n"
+"The exchange charges <b>transaction fees</b> to customers or merchants.\n"
+"Its operational expenses are from wire transfers with the banking\n"
+"system and the operation of the computing infrastructure.\n"
msgstr ""
#: investors.html.j2:120
@@ -1116,145 +1039,142 @@ msgstr ""
msgid "Advantages for Merchants"
msgstr ""
-#: merchants.html.j2:6
+#: merchants.html.j2:8
msgid ""
"Taler is a cost-effective electronic payment system\n"
-" which provides you with cryptographic proof that\n"
-" the payment worked correctly within milliseconds.\n"
-" Your Web customers pay with previously unknown\n"
-" levels of convenience without risk of fraud."
+"which provides you with cryptographic proof that\n"
+"the payment worked correctly within milliseconds.\n"
+"Your Web customers pay with previously unknown\n"
+"levels of convenience without risk of fraud.\n"
msgstr ""
-#: merchants.html.j2:18
+#: merchants.html.j2:22
msgid "Fast"
msgstr ""
-#: merchants.html.j2:20
+#: merchants.html.j2:25
msgid ""
"Processing transactions with Taler is fast,\n"
-" allowing you to confirm the transaction with your\n"
-" customer virtually immediately. Your customers\n"
-" will appreciate that they do not have to type in\n"
-" credit card information and play the "verified\n"
-" by" game. By making payments significantly\n"
-" more convenient for your customers, you may be able\n"
-" to use Taler for small transactions that would not\n"
-" work with credit card payments due to the mental\n"
-" overhead for customers."
+"allowing you to confirm the transaction with your\n"
+"customer virtually immediately. Your customers\n"
+"will appreciate that they do not have to type in\n"
+"credit card information and play the "verified\n"
+"by" game. By making payments significantly\n"
+"more convenient for your customers, you may be able\n"
+"to use Taler for small transactions that would not\n"
+"work with credit card payments due to the mental\n"
+"overhead for customers.\n"
msgstr ""
-#: merchants.html.j2:35
+#: merchants.html.j2:44
msgid ""
-"You will have cryptographic proof of payment from\n"
-" the Taler payment service provider. Taler does not\n"
-" require you to undergo any particular security\n"
-" audits (such as PCI DSS), processes or procedures,\n"
-" as you never handle sensitive customer account\n"
-" information. Your systems will have customer\n"
-" contracts with qualified signatures for all\n"
-" transactions which you can use in court in case of\n"
-" disputes."
-msgstr ""
-
-#: merchants.html.j2:47
-msgid "Free Software"
+"You will have cryptographic proof of payment from the\n"
+"Taler payment service provider. With Taler you never\n"
+"handle sensitive customer account information and thus\n"
+"do not have to undergo any particular security audits\n"
+"(such as PCI DSS). Your systems will have customer\n"
+"contracts with qualified signatures for all\n"
+"transactions which you can use in court in case of\n"
+"disputes.\n"
msgstr ""
-#: merchants.html.j2:49
+#: merchants.html.j2:61
msgid ""
"Taler is free software, and you can use the\n"
-" liberally-licensed reference code as a starting\n"
-" point to integrate Taler into your services. To use\n"
-" Taler, you do not need to pay license fees, and the\n"
-" free software development model will ensure that\n"
-" you can select from many competent integrators for\n"
-" support."
+"liberally-licensed reference code as a starting\n"
+"point to integrate Taler into your services. To use\n"
+"Taler, you do not need to pay license fees, and the\n"
+"free software development model will ensure that\n"
+"you can select from many competing integrators for\n"
+"support.\n"
msgstr ""
-#: merchants.html.j2:61
-msgid "Low Fees"
+#: merchants.html.j2:76
+msgid "Cheap"
msgstr ""
-#: merchants.html.j2:63
+#: merchants.html.j2:79
msgid ""
-"Taler is designed to minimize the work the exchange\n"
-" needs to perform. Combined with Taler's strong\n"
-" security which prevents fraud, payment service\n"
-" providers can operate with very low overhead and\n"
-" thus low transaction fees."
+"Taler is uses efficient cryptographic constructions with low\n"
+"bandwidth and storage requirements. Combined with Taler's strong\n"
+"security which makes fraud impossible, Taler payment service\n"
+"providers can operate with very low overhead and\n"
+"thus offer low transaction fees.\n"
msgstr ""
-#: merchants.html.j2:71
+#: merchants.html.j2:89
msgid "Flexible"
msgstr ""
-#: merchants.html.j2:73
+#: merchants.html.j2:92
msgid ""
"Taler can be used for different currencies (such as\n"
-" Euros, US Dollars or Bitcoins) and different\n"
-" payment models limited only by what the payment\n"
-" service provider supports in its interactions."
+"Euros, US Dollars or Bitcoins) and any amount, limited\n"
+"only by applicable regulatation and what denominations\n"
+"the payment service provider supports.\n"
msgstr ""
-#: merchants.html.j2:81
+#: merchants.html.j2:101
msgid "Ethical"
msgstr ""
-#: merchants.html.j2:83
+#: merchants.html.j2:104
msgid ""
"Taler prevents tax evasion and money laundering.\n"
-" Taler's protocols are efficient and do not waste\n"
-" energy. Taler encourages transparency by providing\n"
-" an open standard and free software reference\n"
-" implementations."
+"Taler's protocols are efficient and do not use wasteful\n"
+"proof-of-work calculations. Taler encourages\n"
+"transparency by providing an open standard and free\n"
+"software reference implementations.\n"
msgstr ""
-#: merchants.html.j2:95
+#: merchants.html.j2:119
msgid "Manuals for merchants"
msgstr ""
-#: merchants.html.j2:98
+#: merchants.html.j2:122
msgid "The GNU Taler merchant backend operator manual"
msgstr ""
-#: merchants.html.j2:101
+#: merchants.html.j2:125
msgid "The GNU Taler Web shop integration tutorial (PHP)"
msgstr ""
-#: merchants.html.j2:104
+#: merchants.html.j2:128
msgid "The GNU Taler Web shop integration tutorial (Python)"
msgstr ""
-#: merchants.html.j2:116
+#: merchants.html.j2:140
msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:118
+#: merchants.html.j2:142
msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:122
+#: merchants.html.j2:147
msgid ""
-"The backend <b>signs</b> and <b>stores</b>\n"
-" proposals made by the merchant to customers.\n"
-" For this, the merchant's frontend needs to give the\n"
-" customer's order in a JSON format to the backend."
+"The backend <b>signs</b> and <b>stores</b> the\n"
+"complete terms of offers made by the merchant to customers.\n"
+"For this, the merchant's frontend needs to give the\n"
+"customer's order in a JSON format to the backend.\n"
msgstr ""
-#: merchants.html.j2:127
+#: merchants.html.j2:156
msgid ""
-"The backend <b>validates</b> and <b>executes</b>\n"
-" payments received from the wallet. The frontend\n"
-" must pass the payment request through to the backend\n"
-" and checks the HTTP status code that is returned."
+"The backend <b>validates</b> payments received from\n"
+"the wallet and <b>executes</b> them with the Taler\n"
+"payment service provider (the exchange). For this,\n"
+"the merchant's frontend must pass the payment\n"
+"request through to the Taler backend and check the\n"
+"HTTP status code that is returned.\n"
msgstr ""
-#: merchants.html.j2:132
+#: merchants.html.j2:167
msgid ""
"The backend can <b>list</b> completed transactions\n"
-" and <b>map</b> aggregated wire transfers to individual\n"
-" business transactions including the exact terms of\n"
-" the contract."
+"and <b>map</b> wire transfers to sets of business\n"
+"transactions, including the exact terms of each\n"
+"contract.\n"
msgstr ""
#: press.html.j2:4
@@ -1440,3 +1360,935 @@ msgstr ""
#~ msgid "The mailinglist"
#~ msgstr ""
+#~ msgid "Security"
+#~ msgstr ""
+
+#~ msgid "Privacy"
+#~ msgstr ""
+
+#~ msgid "Convenience"
+#~ msgstr ""
+
+#~ msgid "Stability"
+#~ msgstr ""
+
+#~ msgid "Anti-money laundering (AML)"
+#~ msgstr ""
+
+#~ msgid "Know-your-customer (KYC)"
+#~ msgstr ""
+
+#~ msgid "Privacy-by-design (GDPR)"
+#~ msgstr ""
+
+#~ msgid "Competitive banking (PSD2)"
+#~ msgstr ""
+
+#~ msgid "Security-focused"
+#~ msgstr ""
+
+#~ msgid "Privacy-friendly"
+#~ msgstr ""
+
+#~ msgid "Free Software"
+#~ msgstr ""
+
+#~ msgid "Low Fees"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler largely functions like digital cash. You\n"
+#~ " withdraw money from your bank account into your\n"
+#~ " electronic wallet, and can henceforth spend digital\n"
+#~ " cash. The electronic wallet can carry multiple\n"
+#~ " currencies.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Taler uses modern cryptography, ensuring that there\n"
+#~ " is no counterfeit. Your digital wallet is safer\n"
+#~ " than your physical wallet. At most, you can lose\n"
+#~ " its contents because your computer or mobile is\n"
+#~ " irreparably damaged or compromised. Unlike a\n"
+#~ " physical wallet, you can make backups to secure\n"
+#~ " against data loss."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Your transactions are private, neither the payment\n"
+#~ " service provider nor merchant needs to learn your\n"
+#~ " identity. There is no need to give out credit card\n"
+#~ " numbers or other sensitive information. The merchant\n"
+#~ " will only be able to do exactly the transaction you\n"
+#~ " agreed to."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will be able to withdraw money to replenish the\n"
+#~ " digital coins in your wallet using your credit card\n"
+#~ " or wire transfers. Afterwards you can pay with\n"
+#~ " one-click using the Taler wallet, which optionally\n"
+#~ " keeps your transaction history on your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Coins in your digital wallet will be of the same\n"
+#~ " denomination as the cash in your physical wallet.\n"
+#~ " Taler is not a crypto-currency, so you do not have\n"
+#~ " to worry about cryto-currency related value\n"
+#~ " fluctuations. Banking with Taler is subject to the\n"
+#~ " usual government protections for financial\n"
+#~ " services."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We currently provide a <a "
+#~ "href=\"wallet.html\">wallet browser extension</a> "
+#~ "for Chromium, Chrome, Firefox, Opera\n"
+#~ " and Edge. Wallets for mobile"
+#~ " phones and other platforms will be"
+#~ " available in the future.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You can see how Taler "
+#~ "works in practice by visiting our "
+#~ "<a href=\"https://demo.taler.net\";>demo page</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Customers interact with the Taler system using\n"
+#~ " the Taler wallet:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>withdraw</b> electronic coins, the customer\n"
+#~ " transfers funds from his bank account to the Taler\n"
+#~ " payment service provider (the exchange). The wire\n"
+#~ " transfer subject must match a code identifying the\n"
+#~ " customer's wallet. After the wire transfer is\n"
+#~ " complete, the wallet will automatically withdraw the\n"
+#~ " coins from the exchange."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>spend</b> electronic coins, a merchant must\n"
+#~ " cause the wallet to display a proposal for some\n"
+#~ " purchase. The wallet will ask the customer for\n"
+#~ " one-click confirmation. Payment is then instant.\n"
+#~ " Transaction histories and "
+#~ "digitally signed contracts\n"
+#~ " can be preserved by the wallet."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The customer can use the wallet to <b>review</b> his\n"
+#~ " balance. The wallet can contain different\n"
+#~ " currencies, and may be shared across\n"
+#~ " devices. Customers can make"
+#~ " backups of the wallet to\n"
+#~ " secure its contents against hardware failures."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " An archived, public mailing list for GNU Taler is\n"
+#~ " hosted at\n"
+#~ " <a "
+#~
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ " You can send messages to the "
+#~ "list\n"
+#~ " at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Team members are generally reachable at\n"
+#~ " <tt>address@hidden</tt>. All of us\n"
+#~ " support receiving GnuPG encrypted e-mails.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We track open feature requests and bugs in our\n"
+#~ " <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+#~ " which is shared with the GNUnet project.\n"
+#~ " You can also report bugs or feature requests to the\n"
+#~ " mailing list.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " For non-technical commercial requests, please contact\n"
+#~ " <tt>ceo AT taler.net</tt>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is free software implementing an open\n"
+#~ " protocol. Anybody is welcome"
+#~ " to integrate our reference\n"
+#~ " implementation into their applications. Different\n"
+#~ " components of Taler are being made available under\n"
+#~ " different licenses. The Affero GPLv3+ is used for the\n"
+#~ " exchange, the LGPLv3+ is used for reference code\n"
+#~ " demonstrating integration with merchant platforms, and\n"
+#~ " licenses like GPLv3+ are used for\n"
+#~ " wallets and related customer-facing software. We are\n"
+#~ " open for constructive suggestions for maximizing the\n"
+#~ " adoption of this payment platform.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is designed to work on the Internet. To\n"
+#~ " ensure that Taler payments can work with\n"
+#~ " restrictive network setups, Taler uses a RESTful\n"
+#~ " protocol over HTTP or HTTPS. Taler's security does\n"
+#~ " not depend upon the use of HTTPS, but obviously\n"
+#~ " merchants may choose to offer HTTPS for consistency\n"
+#~ " and because it generally is better for privacy\n"
+#~ " compared to HTTP. Taler uses JSON to encode\n"
+#~ " structure data, making it easy to integrate Taler\n"
+#~ " with existing Web applications. Taler's protocol\n"
+#~ " is documented in\n"
+#~ " detail at <a "
+#~ "href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is currently primarily developed by a\n"
+#~ " research team at <a "
+#~ "href=\"http://www.inria.fr/\";>Inria</a> and\n"
+#~ " <a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+#~ " contributions from anyone are welcome. Our Git\n"
+#~ " repositories can be cloned using the Git and HTTP\n"
+#~ " access methods against <tt>git.taler.net</tt> with\n"
+#~ " the name of the respective repository. A list of\n"
+#~ " repositories can be found in\n"
+#~ " our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " In addition to this website, the <a\n"
+#~ " href=\"https://git.taler.net/\";>documented "
+#~ "code</a> and\n"
+#~ " the <a href=\"https://api.taler.net/\";>API\n"
+#~ " documentation</a>. Technical papers can be found in\n"
+#~ " our <a href=\"bibliography.html\">bibliography</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have a mailing list for developer discussions.\n"
+#~ " You can subscribe to or read the list archive at\n"
+#~ " <a "
+#~
"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+#~ " automation tests to detect regressions and check for\n"
+#~ " portability at <a\n"
+#~ " "
+#~ "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We use\n"
+#~ " <a "
+#~ "href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+#~ " to analyze the code coverage of our tests, the\n"
+#~ " results are available\n"
+#~ " at <a "
+#~ "href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We\n"
+#~ " use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+#~ " for performance regression analysis of the exchange\n"
+#~ " backend\n"
+#~ " at <a "
+#~ "href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The Taler system consists of protocols executed among\n"
+#~ " a number of actors as "
+#~ "illustrated in the illustration on the"
+#~ " right.\n"
+#~ " Typical transactions involve the following steps:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " A customer instructs his <b>bank</b> to\n"
+#~ " transfer funds from his account to the Taler\n"
+#~ " exchange (top left). In the subject of the\n"
+#~ " transaction, he includes an authentication\n"
+#~ " token from his electronic <b>wallet</b>. In\n"
+#~ " Taler terminology, the customer creates a\n"
+#~ " reserve at the exchange.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the exchange has received the wire\n"
+#~ " transfer, it allows the customer's electronic\n"
+#~ " wallet to <b>withdraw</b> electronic coins.\n"
+#~ " The electronic coins are digital\n"
+#~ " representations of the original currency from\n"
+#~ " the transfer. It is important to note that the\n"
+#~ " exchange does not learn the "serial\n"
+#~ " numbers" of the coins created in this\n"
+#~ " process, so it cannot tell later which customer\n"
+#~ " purchased what at which merchant. The use of\n"
+#~ " Taler does not change the currency or the total\n"
+#~ " value of the funds (except for fees which the\n"
+#~ " exchange may charge for the service).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the customer has the digital coins in his\n"
+#~ " wallet, the wallet can be used to <b>spend</b>\n"
+#~ " the coins with merchant portals that support\n"
+#~ " the Taler payment system and accept the\n"
+#~ " respective exchange as a business partner\n"
+#~ " (bottom arrow). This creates a digital contract\n"
+#~ " signed by the customer's coins and the\n"
+#~ " merchant. If necessary, the customer can later\n"
+#~ " use this digitally signed contract in a court\n"
+#~ " of law to prove the exact terms of the contract\n"
+#~ " and that he paid the respective amount. The\n"
+#~ " customer does not learn the banking details of\n"
+#~ " the merchant, and Taler does not require the\n"
+#~ " merchant to learn the identity of the\n"
+#~ " customer. Naturally, the customer can spend any\n"
+#~ " fraction of his digital coins (the system takes\n"
+#~ " care of customers getting change).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Merchants receiving digital\n"
+#~ " coins <b>deposit</b> the respective claims\n"
+#~ " that resulted from the contract signing with\n"
+#~ " the customer at the exchange to redeem the\n"
+#~ " coins. The deposit step does not reveal the\n"
+#~ " details of the contract between the customer\n"
+#~ " and the merchant or the identity of the\n"
+#~ " customer to the exchange in any way. However,\n"
+#~ " the exchange does learn the identity of the\n"
+#~ " merchant via the provided bank routing\n"
+#~ " information. The merchant can, for example\n"
+#~ " when compelled by the state for taxation,\n"
+#~ " provide information linking the individual\n"
+#~ " deposit to the respective contract signed by\n"
+#~ " the customer. Thus, the exchange's database\n"
+#~ " allows the state to enforce that merchants pay\n"
+#~ " applicable taxes (and do not engage in illegal\n"
+#~ " contracts).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Finally, the exchange transfers funds\n"
+#~ " corresponding to the digital coins redeemed by\n"
+#~ " the merchants to the merchant's <b>bank</b>\n"
+#~ " account. The exchange may combine multiple\n"
+#~ " small transactions into one larger bank\n"
+#~ " transfer. The merchant can query the exchange\n"
+#~ " about the relationship between the bank\n"
+#~ " transfers and the individual claims that were\n"
+#~ " deposited.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Most importantly, the exchange keeps\n"
+#~ " cryptographic proofs that allow it to\n"
+#~ " demonstrate that it is operating correctly to\n"
+#~ " third parties. The system requires an\n"
+#~ " external <b>auditor</b>, such as a\n"
+#~ " government-appointed financial regulatory body,\n"
+#~ " to frequently verify the exchange's databases\n"
+#~ " and check that its bank balance matches the\n"
+#~ " total value of the remaining coins in\n"
+#~ " circulation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Without the auditor, the exchange operators\n"
+#~ " could embezzle funds they are holding in\n"
+#~ " reserve. Customers and merchants cannot cheat\n"
+#~ " each other or the exchange. If any party's\n"
+#~ " computers are compromised, the financial damage\n"
+#~ " is limited to the respective party and\n"
+#~ " proportional to the funds they have in\n"
+#~ " circulation during the period of the\n"
+#~ " compromise.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+#~ "Taler is not based on proof-of-"
+#~ "work or any other distributed consensus"
+#~ "\n"
+#~ "mechanism. Instead Taler is based on blind signatures.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>It would be possible, however, to withdraw coins denominated in\n"
+#~ "Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+#~ "would give some benefits over plain Bitcoin, such as instant\n"
+#~ "confirmation times.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Your wallet stores digital coins and thus ultimately your computer\n"
+#~ "holds your balance. The exchange keeps funds matching all unspent\n"
+#~ "coins in an escrow bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Since the digital coins of value "
+#~ "in your wallet are anonymized, the\n"
+#~ ""
+#~ "exchange can not assist you in recovering a lost or stolen wallet.\n"
+#~ "Just like with a physical wallet for cash, you are responsible for\n"
+#~ "keeping it safe.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>The risk of losing a wallet can be mitigated by making backups or\n"
+#~ "keeping the balance reasonably low.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>In case of a compromise of one of your devices, an attacker can\n"
+#~ "spend coins from your wallet. Checking your balance might reveal\n"
+#~ "to you that your device has been compromised.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>If your friend provides goods or "
+#~ "services for you in exchange for a"
+#~ "\n"
+#~ "payment, they can easily set up a Taler merchant and receive the\n"
+#~ "payment in their bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Future versions of the Taler wallet may allow exchanging coins\n"
+#~ "among friends directly as well.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler wallets can store digital coins corresponding to multiple\n"
+#~ "different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler currently does not offer conversion between currencies.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "<p>Your wallet stores digital coins that are <a\n"
+#~ "href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+#~ "signed</a> by an exchange. The use "
+#~ "of a blind signature protects your\n"
+#~ ""
+#~ "privacy as it prevents the exchange from knowing which coin it signed\n"
+#~ "for which customer.</p>\n"
+#~ "\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides accountability to ensure business operate\n"
+#~ " legally, while also respecting civil liberties of\n"
+#~ " citizens. Taler is a payment system based on\n"
+#~ " open standards and free software. Taler needs\n"
+#~ " governments as they set a financial framework and act as\n"
+#~ " trusted regulators. Taler contributes to digital\n"
+#~ " sovereignty in the critical financial infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler was built with the goal of fighting corruption and\n"
+#~ " supporting taxation. With Taler, the receiver of any\n"
+#~ " form of payment is easily identified by the government,\n"
+#~ " and the merchant can be "
+#~ "compelled to provide the contract\n"
+#~ " that was accepted by the customer. Governments can use\n"
+#~ " this data to tax businesses and individuals based on\n"
+#~ " their income, making tax evasion and black markets less\n"
+#~ " viable.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Thus, despite offering anonymity for citizens spending\n"
+#~ " digital cash to buy goods and services, Taler also\n"
+#~ " ensures that the state can observe incoming funds. This\n"
+#~ " can be used to ensure businesses engage only in legal\n"
+#~ " activities, and do not evade income tax, sales tax or\n"
+#~ " value-added tax. However, this observational capability\n"
+#~ " does not extend to the immediate personal domain. In\n"
+#~ " particular, monitoring does not cover shared access to\n"
+#~ " funds with trusted friends and family, or synchronizing\n"
+#~ " wallets across multiple devices.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler's payments are cryptographically secured. Thus,\n"
+#~ " customers, merchants and the "
+#~ "Taler payment service provider\n"
+#~ " (the exchange) can mathematically\n"
+#~ " demonstrate their lawful behavior in court in case of\n"
+#~ " disputes. Financial damages are strictly limited,\n"
+#~ " improving economic security for individuals, merchants,\n"
+#~ " the exchange and the state.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " As a payment service provider, the Taler exchange is\n"
+#~ " subject to financial regulation."
+#~ " Financial regulation and\n"
+#~ " regular audits are critical to establish trust. In\n"
+#~ " particular, the Taler design "
+#~ "mandates the existence of an\n"
+#~ " independent auditor who checks cryptographic proofs that\n"
+#~ " accumulate at the exchange to ensure that the escrow\n"
+#~ " account is managed honestly. This ensures that the\n"
+#~ " exchange does not threaten the economy due to fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software implementing an open protocol\n"
+#~ " standard. Thus, Taler will enable competition and avoid\n"
+#~ " the monopolization of payment systems that threatens\n"
+#~ " global political and financial stability today.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler has an efficient design. Unlike\n"
+#~ " Blockchain-based payment systems, such as Bitcoin,\n"
+#~ " Taler will not threaten the availability of\n"
+#~ " national electric grids or (significantly)\n"
+#~ " contribute to environmental pollution.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler assumes governments can "
+#~ "observe traditional wire transfers\n"
+#~ " entering and leaving the "
+#~ "Taler payment system. Starting with the"
+#~ "\n"
+#~ " wire transfers, governments can obtain:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The total amount of digital currency withdrawn by a\n"
+#~ " customer. The government can"
+#~ " impose limits on how much\n"
+#~ " digital cash a customer can withdraw within a\n"
+#~ " given time frame.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The income received by any merchant via the Taler\n"
+#~ " system.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ " The exact details of the underlying contract that was\n"
+#~ " signed between customer and merchant. However, this\n"
+#~ " information would typically not include the identity\n"
+#~ " of the customer.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The amounts of digital coins legitimately withdrawn\n"
+#~ " by customers from the exchange, the value of\n"
+#~ " non-redeemed digital coins"
+#~ " in customer's wallets, the\n"
+#~ " value and corresponding wire details of deposit\n"
+#~ " operations performed by merchants with the exchange,\n"
+#~ " and the income of the"
+#~ " exchange from transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is an electronic payment system under development at\n"
+#~ " <a href=\"http://www.inria.fr/\";>Inria</a>. "
+#~ "We expect to make it\n"
+#~ " operational in 2017. You can "
+#~ "learn about Taler on this website,\n"
+#~ ""
+#~ " try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+#~ " our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+#~ " href=\"https://api.taler.net\";>API</a> documentation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is easy to integrate with existing Web\n"
+#~ " applications. Payments are cryptographically\n"
+#~ " secured and are confirmed within milliseconds with\n"
+#~ " extremely low transaction costs.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler does not introduce a new currency. Taler\n"
+#~ " uses a digital wallet storing coins and payment service\n"
+#~ " providers with escrow accounts in existing currencies.\n"
+#~ " Thus, Taler's cryptographic coins correspond to existing\n"
+#~ " currencies, such as US Dollars, Euros or even Bitcoins.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " By design Taler does not suffer from many classes\n"
+#~ " of security problems such as phishing or counterfeit.\n"
+#~ " Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ " customer due to a fraud-detection false positive.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When using Taler, merchant's revenue is transparent for tax\n"
+#~ " collection authorities. Unlike cash"
+#~ " and most digital currencies,\n"
+#~ " Taler helps prevent black markets. Taler is not suitable for\n"
+#~ " illegal activities.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When you pay with Taler, your identity does not\n"
+#~ " have to be revealed to the merchant. Just like\n"
+#~ " payments in cash, nobody else can track how you\n"
+#~ " spent your electronic money. However, you obtain a\n"
+#~ " legally valid proof of payment.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides protocols and "
+#~ "reference implementations that in\n"
+#~ " principle enables anybody to run"
+#~ " their own payment infrastructure,\n"
+#~ " be it individuals, organizations "
+#~ "or whole countries. Since the\n"
+#~ " reference implementation is a <a"
+#~ " href=\"http://www.gnu.org/\";>GNU</a>\n"
+#~ " package, it will always remain free software.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To pay with Taler, customers install an electronic wallet\n"
+#~ " on their device. Before the "
+#~ "first payment, the wallet's balance must"
+#~ "\n"
+#~ " be charged in the desired "
+#~ "currency by some other means of "
+#~ "payment.</p>\n"
+#~ " <p>Once the wallet is charged, "
+#~ "payments on websites take only one "
+#~ "click,\n"
+#~ " are never falsely rejected by "
+#~ "fraud detection and do not pose "
+#~ "any risk\n"
+#~ " of phishing or identity theft.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ " in the desired currency. We provide supporting software\n"
+#~ " in various programming languages to"
+#~ " make the integration painless.\n"
+#~ " The merchant's backend for Taler transaction processing can run\n"
+#~ " on the merchant's premises or be hosted by a third party.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have created a company, Taler Systems SA in\n"
+#~ " Luxembourg.<br>\n"
+#~ " Please contact <tt>address@hidden</tt>\n"
+#~ " if you want to invest in Taler.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Our <a href=\"about.html\">team</a> "
+#~ "combines world-class business leaders,\n"
+#~ " cryptographers, software engineers, civil-rights\n"
+#~ " activists and academics. We are unified by a vision\n"
+#~ " of how payments should work and the goal of\n"
+#~ " imposing this vision upon the world.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We are currently supported "
+#~ "by <a href=\"http://www.inria.fr/\";>Inria</a>, the"
+#~ " French\n"
+#~ " national institute for research in informatics and\n"
+#~ " automation, and the <a "
+#~ "href=\"https://renewablefreedom.org/\";>Renewable Freedom "
+#~ "Foundation</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " All transactions in Taler "
+#~ "are secured using <a "
+#~ "href=\"bibliography.html\">modern\n"
+#~ " cryptography</a> and trust in all parties is\n"
+#~ " minimized. Financial damage is bounded (for\n"
+#~ " customers, merchants and the exchange) even in the\n"
+#~ " case that systems are compromised and private keys\n"
+#~ " are stolen. Databases can be audited for\n"
+#~ " consistency, resulting in either the detection of\n"
+#~ " compromised systems or the demonstration that\n"
+#~ " participants were honest. Actual transaction costs\n"
+#~ " are fractions of a cent.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The scalable business model for Taler is the operation\n"
+#~ " of the payment service "
+#~ "provider, which converts money from\n"
+#~ " traditional payment systems (MasterCard, SEPA, UPI,\n"
+#~ " Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+#~ " electronic coins in the same currency. The customer\n"
+#~ " can then redeem the electronic coins at a merchant,\n"
+#~ " who can exchange them for money represented using\n"
+#~ " traditional payment systems at the exchange. The\n"
+#~ " exchange charges fees to facilitate the transactions.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The payment service operator runs the <em>Taler exchange</em>.\n"
+#~ " The exchange charges <b>transaction "
+#~ "fees</b> to customers or merchants.\n"
+#~ " Its operational expenses are from"
+#~ " wire transfers with the banking\n"
+#~ " system and the operation of the computing infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is a cost-effective electronic payment system\n"
+#~ " which provides you with cryptographic proof that\n"
+#~ " the payment worked correctly within milliseconds.\n"
+#~ " Your Web customers pay with previously unknown\n"
+#~ " levels of convenience without risk of fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Processing transactions with Taler is fast,\n"
+#~ " allowing you to confirm the transaction with your\n"
+#~ " customer virtually immediately. Your customers\n"
+#~ " will appreciate that they do not have to type in\n"
+#~ " credit card information and play the "verified\n"
+#~ " by" game. By making payments significantly\n"
+#~ " more convenient for your customers, you may be able\n"
+#~ " to use Taler for small transactions that would not\n"
+#~ " work with credit card payments due to the mental\n"
+#~ " overhead for customers.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You will have cryptographic proof of payment from the\n"
+#~ " Taler payment service provider. With Taler you never\n"
+#~ " handle sensitive customer account information and thus\n"
+#~ " do not have to undergo any particular security audits\n"
+#~ " (such as PCI DSS). Your systems will have customer\n"
+#~ " contracts with qualified signatures for all\n"
+#~ " transactions which you can use in court in case of\n"
+#~ " disputes.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software, and you can use the\n"
+#~ " liberally-licensed reference code as a starting\n"
+#~ " point to integrate Taler into your services. To use\n"
+#~ " Taler, you do not need to pay license fees, and the\n"
+#~ " free software development model will ensure that\n"
+#~ " you can select from many competing integrators for\n"
+#~ " support.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is uses efficient "
+#~ "cryptographic constructions with low\n"
+#~ " bandwidth and storage "
+#~ "requirements. Combined with Taler's strong"
+#~ "\n"
+#~ " security which makes fraud "
+#~ "impossible, Taler payment service\n"
+#~ " providers can operate with very low overhead and\n"
+#~ " thus offer low transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler can be used for different currencies (such as\n"
+#~ " Euros, US Dollars or Bitcoins) and any amount, limited\n"
+#~ " only by applicable regulatation and what denominations\n"
+#~ " the payment service provider supports.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler prevents tax evasion and money laundering.\n"
+#~ " Taler's protocols are efficient"
+#~ " and do not use wasteful\n"
+#~ " proof-of-work calculations. Taler encourages\n"
+#~ " transparency by providing an open standard and free\n"
+#~ " software reference implementations.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>signs</b> and <b>stores</b> the\n"
+#~ " complete terms of offers "
+#~ "made by the merchant to customers.\n"
+#~ ""
+#~ " For this, the merchant's frontend needs to give the\n"
+#~ " customer's order in a JSON format to the backend.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>validates</b> payments received from\n"
+#~ " the wallet and <b>executes</b> them with the Taler\n"
+#~ " payment service provider (the exchange). For this,\n"
+#~ " the merchant's frontend must pass the payment\n"
+#~ " request through to the Taler backend and check the\n"
+#~ " HTTP status code that is returned.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend can <b>list</b> completed transactions\n"
+#~ " and <b>map</b> wire transfers to sets of business\n"
+#~ " transactions, including the exact terms of each\n"
+#~ " contract.\n"
+#~ " "
+#~ msgstr ""
+
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index b2acde1..4cd5a12 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-08 10:25+0100\n"
+"POT-Creation-Date: 2017-03-15 11:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: es\n"
@@ -104,12 +104,6 @@ msgstr ""
msgid "Taler System Architecture"
msgstr ""
-#: architecture.html.j2:8
-msgid ""
-"\n"
-" "
-msgstr ""
-
#: bibliography.html.j2:4
msgid "GNU Taler Bibliography"
msgstr ""
@@ -133,69 +127,69 @@ msgstr ""
#: citizens.html.j2:9
msgid ""
-"\n"
-" Taler largely functions like digital cash. You\n"
-" withdraw money from your bank account into your\n"
-" electronic wallet, and can henceforth spend digital\n"
-" cash. The electronic wallet can carry multiple\n"
-" currencies.\n"
-" "
+"Taler largely functions like digital cash. You\n"
+"withdraw money from your bank account into your\n"
+"electronic wallet, and can henceforth spend digital\n"
+"cash. The electronic wallet can carry multiple\n"
+"currencies.\n"
msgstr ""
-#: citizens.html.j2:25
-msgid "Security"
-msgstr "Seguridad"
+#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
+#: merchants.html.j2:41
+msgid "Secure"
+msgstr "Seguro"
#: citizens.html.j2:27
msgid ""
"Taler uses modern cryptography, ensuring that there\n"
-" is no counterfeit. Your digital wallet is safer\n"
-" than your physical wallet. At most, you can lose\n"
-" its contents because your computer or mobile is\n"
-" irreparably damaged or compromised. Unlike a\n"
-" physical wallet, you can make backups to secure\n"
-" against data loss."
+"is no counterfeit. Your digital wallet is safer\n"
+"than your physical wallet. At most, you can lose\n"
+"its contents because your computer or mobile is\n"
+"irreparably damaged or compromised. Unlike a\n"
+"physical wallet, you can make backups to secure\n"
+"against data loss."
msgstr ""
-#: citizens.html.j2:37
-msgid "Privacy"
-msgstr "Privacidad"
+#: citizens.html.j2:37 index.html.j2:83
+msgid "Private"
+msgstr ""
#: citizens.html.j2:39
msgid ""
-"Your transactions are private, neither the exchange\n"
-" nor merchant needs to learn your identity. There is\n"
-" no need to give out credit card numbers or other\n"
-" sensitive information. The merchant will only be\n"
-" able to do exactly the transaction you agreed to."
+"Your transactions are private, neither the payment\n"
+"service provider nor merchant needs to learn your\n"
+"identity. There is no need to give out credit card\n"
+"numbers or other sensitive information. The merchant\n"
+"will only be able to do exactly the transaction you\n"
+"agreed to."
msgstr ""
#: citizens.html.j2:50
-msgid "Convenience"
-msgstr "Conveniencia"
+msgid "Convenient"
+msgstr ""
#: citizens.html.j2:52
msgid ""
"You will be able to withdraw money to replenish the\n"
-" digital coins in your wallet using your credit card\n"
-" or wire transfers. Afterwards you can pay with\n"
-" one-click using the Taler wallet, which optionally\n"
-" keeps your transaction history on your computer."
+"digital coins in your wallet using your credit card\n"
+"or wire transfers. Afterwards you can pay with\n"
+"one-click using the Taler wallet, which optionally\n"
+"keeps your transaction history on your computer."
msgstr ""
-#: citizens.html.j2:61
-msgid "Stability"
+#: citizens.html.j2:61 index.html.j2:41
+msgid "Stable"
msgstr ""
#: citizens.html.j2:63
msgid ""
"Coins in your digital wallet will be of the same\n"
-" denomination as the cash in your physical wallet.\n"
-" Taler is not a crypto-currency, so you do not have\n"
-" to worry about cryto-currency related value\n"
-" fluctuations. Banking with Taler is subject to the\n"
-" usual government protections for financial\n"
-" services."
+"denomination as the cash in your physical wallet.\n"
+"Taler is not a crypto-currency, so you do not have\n"
+"to worry about cryto-currency related value\n"
+"fluctuations. Banking with Taler is subject to the\n"
+"usual government protections for financial\n"
+"services."
msgstr ""
#: citizens.html.j2:79
@@ -204,12 +198,10 @@ msgstr ""
#: citizens.html.j2:81
msgid ""
-"\n"
-" We currently provide a <a href=\"wallet.html\">wallet browser "
+"We currently provide a <a href=\"wallet.html\">wallet browser "
"extension</a> for Chromium, Chrome, Firefox, Opera\n"
-" and Edge. Wallets for mobile phones and other platforms will be "
+"and Edge. Wallets for mobile phones and other platforms will be "
"available in the future.\n"
-" "
msgstr ""
#: citizens.html.j2:88
@@ -218,10 +210,8 @@ msgstr ""
#: citizens.html.j2:90
msgid ""
-"\n"
-" You can see how Taler works in practice by visiting our <a "
+"You can see how Taler works in practice by visiting our <a "
"href=\"https://demo.taler.net\";>demo page</a>.\n"
-" "
msgstr ""
#: citizens.html.j2:103
@@ -231,38 +221,37 @@ msgstr ""
#: citizens.html.j2:105
msgid ""
"Customers interact with the Taler system using\n"
-" the Taler wallet:"
+"the Taler wallet:"
msgstr ""
-#: citizens.html.j2:108
+#: citizens.html.j2:110
msgid ""
-"To <b>withdraw</b> electronic coins, the customer transfers funds\n"
-" from his bank account to the Taler exchange. The wire\n"
-" transfer subject must match a code generated by the "
-"customer's\n"
-" wallet. After the wire transfer is complete, the wallet"
-" will\n"
-" automatically withdraw the coins."
+"To <b>withdraw</b> electronic coins, the customer\n"
+"transfers funds from his bank account to the Taler\n"
+"payment service provider (the exchange). The wire\n"
+"transfer subject must match a code identifying the\n"
+"customer's wallet. After the wire transfer is\n"
+"complete, the wallet will automatically withdraw the\n"
+"coins from the exchange."
msgstr ""
-#: citizens.html.j2:114
+#: citizens.html.j2:118
msgid ""
-"To <b>spend</b> electronic coins, a merchant must cause the wallet\n"
-" to display a proposal and ask for one-click "
-"confirmation.\n"
-" Payment is then instant.\n"
-" Transaction histories and digitally signed contracts "
-"can be\n"
-" preserved by the wallet."
+"To <b>spend</b> electronic coins, a merchant must\n"
+"cause the wallet to display a proposal for some\n"
+"purchase. The wallet will ask the customer for\n"
+"one-click confirmation. Payment is then instant.\n"
+"Transaction histories and digitally signed contracts\n"
+"can be preserved by the wallet."
msgstr ""
-#: citizens.html.j2:120
+#: citizens.html.j2:125
msgid ""
"The customer can use the wallet to <b>review</b> his\n"
-" balance. The wallet can contain different currencies,\n"
-" and may be shared across devices. Customers can make\n"
-" backups of the wallet to secure its contents against\n"
-" hardware failures."
+"balance. The wallet can contain different\n"
+"currencies, and may be shared across\n"
+"devices. Customers can make backups of the wallet to\n"
+"secure its contents against hardware failures."
msgstr ""
#: contact.html.j2:6
@@ -275,14 +264,12 @@ msgstr ""
#: contact.html.j2:15
msgid ""
-"\n"
-" An archived, public mailing list for GNU Taler is\n"
-" hosted at\n"
-" <a "
+"An archived, public mailing list for GNU Taler is\n"
+"hosted at\n"
+"<a "
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
" You can send messages to the list\n"
-" at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
-" "
+"at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
msgstr ""
#: contact.html.j2:25
@@ -291,11 +278,9 @@ msgstr ""
#: contact.html.j2:27
msgid ""
-"\n"
-" Team members are generally reachable at\n"
-" <tt>address@hidden</tt>. All of us\n"
-" support receiving GnuPG encrypted e-mails.\n"
-" "
+"Team members are generally reachable at\n"
+"<tt>address@hidden</tt>. All of us\n"
+"support receiving GnuPG encrypted e-mails.\n"
msgstr ""
#: contact.html.j2:36
@@ -304,13 +289,11 @@ msgstr ""
#: contact.html.j2:38
msgid ""
-"\n"
-" We track open feature requests and bugs in our\n"
-" <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
-" which is shared with the GNUnet project.\n"
-" You can also report bugs or feature requests to the\n"
-" mailing list.\n"
-" "
+"We track open feature requests and bugs in our\n"
+"<a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+"which is shared with the GNUnet project.\n"
+"You can also report bugs or feature requests to the\n"
+"mailing list.\n"
msgstr ""
#: contact.html.j2:49
@@ -319,274 +302,254 @@ msgstr ""
#: contact.html.j2:51
msgid ""
-"\n"
-" For non-technical commercial requests, please contact\n"
-" <tt>ceo AT taler.net</tt>.\n"
-" "
+"For non-technical commercial requests, please contact\n"
+"<tt>ceo AT taler.net</tt>.\n"
msgstr ""
#: developers.html.j2:5
msgid "Taler for developers"
msgstr "Taler para programadores"
-#: developers.html.j2:12
+#: developers.html.j2:12 merchants.html.j2:58
msgid "Free"
msgstr "Libre"
#: developers.html.j2:15
msgid ""
-"\n"
-" Taler is free software implementing an open\n"
-" protocol. Anybody is welcome to inspect our code\n"
-" and integrate our reference implementation into\n"
-" their applications. Different components of Taler\n"
-" are being made available under different\n"
-" licenses. The Affero GPLv3+ is used for the\n"
-" exchange, the LGPLv3+ is used for reference code\n"
-" demonstrating integration with merchant platforms,\n"
-" and licenses like Apache/Mozilla/GPLv3+ are used\n"
-" for wallets and related customer-facing software.\n"
-" We are open for constructive suggestions for\n"
-" maximizing the adoption of this libre payment\n"
-" platform.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:34
+"GNU Taler is free software implementing an open\n"
+"protocol. Anybody is welcome to integrate our reference\n"
+"implementation into their applications. Different\n"
+"components of Taler are being made available under\n"
+"different licenses. The Affero GPLv3+ is used for the\n"
+"exchange, the LGPLv3+ is used for reference code\n"
+"demonstrating integration with merchant platforms, and\n"
+"licenses like GPLv3+ are used for\n"
+"wallets and related customer-facing software. We are\n"
+"open for constructive suggestions for maximizing the\n"
+"adoption of this payment platform.\n"
+msgstr ""
+
+#: developers.html.j2:32
msgid "RESTful"
msgstr " Basado en REST"
-#: developers.html.j2:37
+#: developers.html.j2:35
msgid ""
-"\n"
-" Taler is designed to work on the Internet. To\n"
-" ensure that Taler payments can work with\n"
-" restrictive network setups, Taler uses a RESTful\n"
-" protocol over HTTP or HTTPS. Taler's security does\n"
-" not depend upon the use of HTTPS, but obviously\n"
-" merchants may choose to offer HTTPS for consistency\n"
-" and because it generally is better for privacy\n"
-" compared to HTTP. Taler uses JSON to encode\n"
-" structure data, making it easy to integrate Taler\n"
-" with existing Web applications. Taler's protocol\n"
-" is documented in\n"
-" detail <a href=\"https://api.taler.net/\";>here</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:60
+"Taler is designed to work on the Internet. To\n"
+"ensure that Taler payments can work with\n"
+"restrictive network setups, Taler uses a RESTful\n"
+"protocol over HTTP or HTTPS. Taler's security does\n"
+"not depend upon the use of HTTPS, but obviously\n"
+"merchants may choose to offer HTTPS for consistency\n"
+"and because it generally is better for privacy\n"
+"compared to HTTP. Taler uses JSON to encode\n"
+"structure data, making it easy to integrate Taler\n"
+"with existing Web applications. Taler's protocol\n"
+"is documented in\n"
+"detail at <a href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+msgstr ""
+
+#: developers.html.j2:58
msgid "Code"
msgstr "Código"
-#: developers.html.j2:63
+#: developers.html.j2:61
msgid ""
-"\n"
-" Taler is currently primarily developed by a\n"
-" research team at Inria and GNUnet e.V. However,\n"
-" contributions from anyone are welcome. Our Git\n"
-" repositories can be cloned using the Git and HTTP\n"
-" access methods against <tt>git.taler.net</tt> with\n"
-" the name of the respective repository. A list of\n"
-" public repositories can be found in\n"
-" our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:76
+"Taler is currently primarily developed by a\n"
+"research team at <a href=\"http://www.inria.fr/\";>Inria</a> and\n"
+"<a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+"contributions from anyone are welcome. Our Git\n"
+"repositories can be cloned using the Git and HTTP\n"
+"access methods against <tt>git.taler.net</tt> with\n"
+"the name of the respective repository. A list of\n"
+"repositories can be found in\n"
+"our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+msgstr ""
+
+#: developers.html.j2:75
msgid "Documentation"
msgstr "Documentación"
-#: developers.html.j2:79
+#: developers.html.j2:78
msgid ""
-"\n"
-" In addition to this website,\n"
-" the <a href=\"https://git.taler.net/\";>documented\n"
-" code</a> and\n"
-" the <a href=\"https://api.taler.net/\";>API\n"
-" documentation</a>, we are in the process of\n"
-" preparing a comprehensive design document which\n"
-" will be published here soon.\n"
-" "
+"In addition to this website, the <a\n"
+"href=\"https://git.taler.net/\";>documented code</a> and\n"
+"the <a href=\"https://api.taler.net/\";>API\n"
+"documentation</a>. Technical papers can be found in\n"
+"our <a href=\"bibliography.html\">bibliography</a>.\n"
msgstr ""
-#: developers.html.j2:91
+#: developers.html.j2:88
msgid "Discussion"
msgstr "Debates"
-#: developers.html.j2:93
+#: developers.html.j2:91
msgid ""
"We have a mailing list for developer discussions.\n"
-" You can subscribe to it or read the list archive at\n"
-" <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"You can subscribe to or read the list archive at\n"
+"<a "
+"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"\n"
msgstr ""
-#: developers.html.j2:100
+#: developers.html.j2:101
msgid "Regression Testing"
msgstr "Pruebas de regresión"
-#: developers.html.j2:102
+#: developers.html.j2:104
msgid ""
-"We have\n"
-" <a href='https://buildbot.net/'>Buildbot</a>\n"
-" automation tests to detect regressions and check\n"
-" for portability at\n"
-" <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.\n"
-" "
+"We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+"automation tests to detect regressions and check for\n"
+"portability at <a\n"
+"href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:110
+#: developers.html.j2:113
msgid "Code Coverage Analysis"
msgstr "Análisis de cobertura de código"
-#: developers.html.j2:112
+#: developers.html.j2:116
msgid ""
"We use\n"
-" <a "
-"href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-" to analyze the code coverage of our tests, the\n"
-" results are available\n"
-" at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-" "
+"<a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+"to analyze the code coverage of our tests, the\n"
+"results are available\n"
+"at <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:120
+#: developers.html.j2:126
msgid "Performance Analysis"
msgstr "Performance"
-#: developers.html.j2:122
+#: developers.html.j2:129
msgid ""
"We\n"
-" use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
-" for performance regression analysis of the exchange\n"
-" backend\n"
-" at <a "
-"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-" "
+"use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+"for performance regression analysis of the exchange\n"
+"backend\n"
+"at <a href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:136
+#: developers.html.j2:145
msgid "Taler system overview"
msgstr "Diagrama general del sistema Taler"
-#: developers.html.j2:138
+#: developers.html.j2:148
msgid ""
"The Taler system consists of protocols executed among\n"
-" a number of actors with the help\n"
-" of <a href='https://www.fsf.org/'>Free Software</a>\n"
-" as illustrated in the illustration on the right.\n"
-" Typical transactions involve the following steps: "
+"a number of actors as illustrated in the illustration on the right.\n"
+"Typical transactions involve the following steps:\n"
msgstr ""
-#: developers.html.j2:147
+#: developers.html.j2:158
msgid ""
"A customer instructs his <b>bank</b> to\n"
-" transfer funds from his account to the Taler\n"
-" exchange (top left). In the subject of the\n"
-" transaction, he includes an authentication\n"
-" token from his electronic <b>wallet</b>. In\n"
-" Taler terminology, the customer creates a\n"
-" reserve at the exchange. "
+"transfer funds from his account to the Taler\n"
+"exchange (top left). In the subject of the\n"
+"transaction, he includes an authentication\n"
+"token from his electronic <b>wallet</b>. In\n"
+"Taler terminology, the customer creates a\n"
+"reserve at the exchange.\n"
msgstr ""
-#: developers.html.j2:155
+#: developers.html.j2:170
msgid ""
"Once the exchange has received the wire\n"
-" transfer, it allows the customer's electronic\n"
-" wallet to <b>withdraw</b> electronic coins.\n"
-" The electronic coins are digital\n"
-" representations of the original currency from\n"
-" the transfer. It is important to note that the\n"
-" exchange does not learn the "serial\n"
-" numbers" of the coins created in this\n"
-" process, so it cannot tell later which customer\n"
-" purchased what at which merchant. The use of\n"
-" Taler does not change the currency or the total\n"
-" value of the funds (except for fees which the\n"
-" exchange may charge for the service). "
+"transfer, it allows the customer's electronic\n"
+"wallet to <b>withdraw</b> electronic coins.\n"
+"The electronic coins are digital\n"
+"representations of the original currency from\n"
+"the transfer. It is important to note that the\n"
+"exchange does not learn the "serial\n"
+"numbers" of the coins created in this\n"
+"process, so it cannot tell later which customer\n"
+"purchased what at which merchant. The use of\n"
+"Taler does not change the currency or the total\n"
+"value of the funds (except for fees which the\n"
+"exchange may charge for the service).\n"
msgstr ""
-#: developers.html.j2:170
+#: developers.html.j2:188
msgid ""
"Once the customer has the digital coins in his\n"
-" wallet, the wallet can be used to <b>spend</b>\n"
-" the coins with merchant portals that support\n"
-" the Taler payment system and accept the\n"
-" respective exchange as a business partner\n"
-" (bottom arrow). This creates a digital contract\n"
-" signed by the customer's coins and the\n"
-" merchant. If necessary, the customer can later\n"
-" use this digitally signed contract in a court\n"
-" of law to prove the exact terms of the contract\n"
-" and that he paid the respective amount. The\n"
-" customer does not learn the banking details of\n"
-" the merchant, and Taler does not require the\n"
-" merchant to learn the identity of the\n"
-" customer. Naturally, the customer can spend any\n"
-" fraction of his digital coins (the system takes\n"
-" care of customers getting change). "
-msgstr ""
-
-#: developers.html.j2:188
+"wallet, the wallet can be used to <b>spend</b>\n"
+"the coins with merchant portals that support\n"
+"the Taler payment system and accept the\n"
+"respective exchange as a business partner\n"
+"(bottom arrow). This creates a digital contract\n"
+"signed by the customer's coins and the\n"
+"merchant. If necessary, the customer can later\n"
+"use this digitally signed contract in a court\n"
+"of law to prove the exact terms of the contract\n"
+"and that he paid the respective amount. The\n"
+"customer does not learn the banking details of\n"
+"the merchant, and Taler does not require the\n"
+"merchant to learn the identity of the\n"
+"customer. Naturally, the customer can spend any\n"
+"fraction of his digital coins (the system takes\n"
+"care of customers getting change).\n"
+msgstr ""
+
+#: developers.html.j2:210
msgid ""
"Merchants receiving digital\n"
-" coins <b>deposit</b> the respective receipts\n"
-" that resulted from the contract signing with\n"
-" the customer at the exchange to redeem the\n"
-" coins. The deposit step does not reveal the\n"
-" details of the contract between the customer\n"
-" and the merchant or the identity of the\n"
-" customer to the exchange in any way. However,\n"
-" the exchange does learn the identity of the\n"
-" merchant via the provided bank routing\n"
-" information. The merchant can, for example\n"
-" when compelled by the state for taxation,\n"
-" provide information linking the individual\n"
-" deposit to the respective contract signed by\n"
-" the customer. Thus, the exchange's database\n"
-" allows the state to enforce that merchants pay\n"
-" applicable taxes (and do not engage in illegal\n"
-" contracts). "
-msgstr ""
-
-#: developers.html.j2:207
+"coins <b>deposit</b> the respective claims\n"
+"that resulted from the contract signing with\n"
+"the customer at the exchange to redeem the\n"
+"coins. The deposit step does not reveal the\n"
+"details of the contract between the customer\n"
+"and the merchant or the identity of the\n"
+"customer to the exchange in any way. However,\n"
+"the exchange does learn the identity of the\n"
+"merchant via the provided bank routing\n"
+"information. The merchant can, for example\n"
+"when compelled by the state for taxation,\n"
+"provide information linking the individual\n"
+"deposit to the respective contract signed by\n"
+"the customer. Thus, the exchange's database\n"
+"allows the state to enforce that merchants pay\n"
+"applicable taxes (and do not engage in illegal\n"
+"contracts).\n"
+msgstr ""
+
+#: developers.html.j2:233
msgid ""
"Finally, the exchange transfers funds\n"
-" corresponding to the digital coins redeemed by\n"
-" the merchants to the merchant's <b>bank</b>\n"
-" account. The exchange may combine multiple\n"
-" small transactions into one larger bank\n"
-" transfer. The merchant can query the exchange\n"
-" about the relationship between the bank\n"
-" transfers and the individual claims that were\n"
-" deposited. "
+"corresponding to the digital coins redeemed by\n"
+"the merchants to the merchant's <b>bank</b>\n"
+"account. The exchange may combine multiple\n"
+"small transactions into one larger bank\n"
+"transfer. The merchant can query the exchange\n"
+"about the relationship between the bank\n"
+"transfers and the individual claims that were\n"
+"deposited.\n"
msgstr ""
-#: developers.html.j2:217
+#: developers.html.j2:247
msgid ""
"Most importantly, the exchange keeps\n"
-" cryptographic proofs that allow it to\n"
-" demonstrate that it is operating correctly to\n"
-" third parties. The system requires an\n"
-" external <b>auditor</b>, such as a\n"
-" government-appointed financial regulatory body,\n"
-" to frequently verify the exchange's databases\n"
-" and check that its bank balance matches the\n"
-" total value of the remaining coins in\n"
-" circulation. "
+"cryptographic proofs that allow it to\n"
+"demonstrate that it is operating correctly to\n"
+"third parties. The system requires an\n"
+"external <b>auditor</b>, such as a\n"
+"government-appointed financial regulatory body,\n"
+"to frequently verify the exchange's databases\n"
+"and check that its bank balance matches the\n"
+"total value of the remaining coins in\n"
+"circulation.\n"
msgstr ""
-#: developers.html.j2:228
+#: developers.html.j2:262
msgid ""
"Without the auditor, the exchange operators\n"
-" could embezzle funds they are holding in\n"
-" reserve. Customers and merchants cannot cheat\n"
-" each other or the exchange. If any party's\n"
-" computers are compromised, the financial damage\n"
-" is limited to the respective party and\n"
-" proportional to the funds they have in\n"
-" circulation during the period of the\n"
-" compromise. "
+"could embezzle funds they are holding in\n"
+"reserve. Customers and merchants cannot cheat\n"
+"each other or the exchange. If any party's\n"
+"computers are compromised, the financial damage\n"
+"is limited to the respective party and\n"
+"proportional to the funds they have in\n"
+"circulation during the period of the\n"
+"compromise.\n"
msgstr ""
#: faq.html.j2:5
@@ -595,27 +558,28 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"\n"
"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
"Taler is not based on proof-of-work or any other distributed consensus\n"
"mechanism. Instead Taler is based on blind signatures.</p>\n"
-"\n"
-"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
-"wallet (with an appropriate exchange), which would give some benefits\n"
-"over plain Bitcoin, such as instant confirmation times.</p>\n"
msgstr ""
-#: faq.html.j2:16
+#: faq.html.j2:11
+msgid ""
+"<p>It would be possible, however, to withdraw coins denominated in\n"
+"Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+"would give some benefits over plain Bitcoin, such as instant\n"
+"confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:18
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:17
+#: faq.html.j2:19
msgid ""
-"\n"
-"<p>Your wallet stores digital coins that were blindly signed by an\n"
-"exchange, and thus ultimately your computer holds your balance. The\n"
-"exchange keeps funds matching all unspent coins in an escrow bank\n"
-"account.</p>\n"
+"<p>Your wallet stores digital coins and thus ultimately your computer\n"
+"holds your balance. The exchange keeps funds matching all unspent\n"
+"coins in an escrow bank account.</p>\n"
msgstr ""
#: faq.html.j2:25
@@ -624,385 +588,355 @@ msgstr ""
#: faq.html.j2:26
msgid ""
-"\n"
"<p>Since the digital coins of value in your wallet are anonymized, the\n"
"exchange can not assist you in recovering a lost or stolen wallet.\n"
"Just like with a physical wallet for cash, you are responsible for\n"
"keeping it safe.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:32
+msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or\n"
"keeping the balance reasonably low.</p>\n"
-"\n"
-"<p>In case of a compromise of one of your devices, an attacker that\n"
-"spends coins on your behalf will allow you to detect that your device\n"
-"has been compromised.</p>\n"
msgstr ""
-#: faq.html.j2:41
+#: faq.html.j2:37
+msgid "What if my computer is hacked?"
+msgstr ""
+
+#: faq.html.j2:38
+msgid ""
+"<p>In case of a compromise of one of your devices, an attacker can\n"
+"spend coins from your wallet. Checking your balance might reveal\n"
+"to you that your device has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:44
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:42
+#: faq.html.j2:45
msgid ""
-"\n"
"<p>If your friend provides goods or services for you in exchange for a\n"
"payment, they can easily set up a Taler merchant and receive the\n"
"payment in their bank account.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:50
+msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins\n"
"among friends directly as well.</p>\n"
msgstr ""
-#: faq.html.j2:52
+#: faq.html.j2:56
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:53
+#: faq.html.j2:57
msgid ""
-"\n"
"<p>Taler wallets can store digital coins corresponding to multiple\n"
"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+msgstr ""
+
+#: faq.html.j2:61
+msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
+#: faq.html.j2:65
+msgid "How does Taler protect my privacy?"
+msgstr ""
+
+#: faq.html.j2:66
+msgid ""
+"<p>Your wallet stores digital coins that are <a\n"
+"href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+"signed</a> by an exchange. The use of a blind signature protects your\n"
+"privacy as it prevents the exchange from knowing which coin it signed\n"
+"for which customer.</p>\n"
"\n"
-"<p>Taler currently does not offer conversion between currencies.</p>\n"
msgstr ""
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
-#: governments.html.j2:7
+#: governments.html.j2:8
msgid ""
-"Taler provides accountability to ensure business\n"
-" accepting payments operate legally, while also\n"
-" respecting civil liberties of citizens spending\n"
-" digital cash. Taler is a commons, a payment system\n"
-" based on open standards and free software. Taler\n"
-" needs governments to set a financial framework and\n"
-" to act as trusted regulators. Taler contributes to\n"
-" digital sovereignty in the critical financial\n"
-" infrastructure."
+"Taler provides accountability to ensure business operate\n"
+"legally, while also respecting civil liberties of\n"
+"citizens. Taler is a payment system based on\n"
+"open standards and free software. Taler needs\n"
+"governments as they set a financial framework and act as\n"
+"trusted regulators. Taler contributes to digital\n"
+"sovereignty in the critical financial infrastructure.\n"
msgstr ""
-#: governments.html.j2:23 index.html.j2:69
+#: governments.html.j2:25 index.html.j2:70
msgid "Taxable"
msgstr "Imponible"
-#: governments.html.j2:25
+#: governments.html.j2:28
msgid ""
-"Taler was\n"
-" built with the goal of fighting corruption and supporting "
-"taxation.\n"
-" With Taler, the receiver of any form of payment is\n"
-" easily identified by the government, and the merchant\n"
-" can be compelled to provide the contract that was accepted\n"
-" by the customer. Governments can use this data to\n"
-" tax businesses and individuals based on their\n"
-" income, making tax evasion and black markets less\n"
-" viable."
+"Taler was built with the goal of fighting corruption and\n"
+"supporting taxation. With Taler, the receiver of any\n"
+"form of payment is easily identified by the government,\n"
+"and the merchant can be compelled to provide the contract\n"
+"that was accepted by the customer. Governments can use\n"
+"this data to tax businesses and individuals based on\n"
+"their income, making tax evasion and black markets less\n"
+"viable.\n"
msgstr ""
-#: governments.html.j2:35
+#: governments.html.j2:41
msgid ""
-"Thus, despite offering anonymity for citizens\n"
-" spending digital cash to buy goods and services,\n"
-" Taler also ensures that the state can observe\n"
-" incoming funds. This can be used to ensure\n"
-" businesses engage only in legal activities, and do\n"
-" not evade income tax, sales tax or value-added tax.\n"
-" However, this observational capability does not\n"
-" extend to the immediate personal domain. In\n"
-" particular, sharing access to funds within a family\n"
-" or synchronizing wallets across multiple devices is not\n"
-" subject to monitoring."
+"Thus, despite offering anonymity for citizens spending\n"
+"digital cash to buy goods and services, Taler also\n"
+"ensures that the state can observe incoming funds. This\n"
+"can be used to ensure businesses engage only in legal\n"
+"activities, and do not evade income tax, sales tax or\n"
+"value-added tax. However, this observational capability\n"
+"does not extend to the immediate personal domain. In\n"
+"particular, monitoring does not cover shared access to\n"
+"funds with trusted friends and family, or synchronizing\n"
+"wallets across multiple devices.\n"
msgstr ""
-#: governments.html.j2:48 merchants.html.j2:33
-msgid "Secure"
-msgstr "Seguro"
-
-#: governments.html.j2:50
+#: governments.html.j2:61
msgid ""
-"Taler's payments are cryptographically\n"
-" secured. Thus, customers, merchants and the\n"
-" exchange can mathematically demonstrate their\n"
-" lawful behavior in court in case of\n"
-" disputes. Financial damages are strictly limited,\n"
-" improving economic security for individuals,\n"
-" merchants, the exchange and the state."
+"Taler's payments are cryptographically secured. Thus,\n"
+"customers, merchants and the Taler payment service provider\n"
+"(the exchange) can mathematically\n"
+"demonstrate their lawful behavior in court in case of\n"
+"disputes. Financial damages are strictly limited,\n"
+"improving economic security for individuals, merchants,\n"
+"the exchange and the state.\n"
msgstr ""
-#: governments.html.j2:58
+#: governments.html.j2:73
msgid ""
-"By design, the Taler payment service provider is\n"
-" subject to financial regulation. Financial\n"
-" regulation and regular audits are critical to\n"
-" establish trust. In particular, the Taler design\n"
-" mandates the existence of an independent auditor\n"
-" who checks cryptographic proofs that accumulate at\n"
-" the payment service provider to ensure that the\n"
-" escrow account is managed honestly. This ensures\n"
-" that the payment service provider does not threaten\n"
-" the economy due to fraud."
+"As a payment service provider, the Taler exchange is\n"
+"subject to financial regulation. Financial regulation and\n"
+"regular audits are critical to establish trust. In\n"
+"particular, the Taler design mandates the existence of an\n"
+"independent auditor who checks cryptographic proofs that\n"
+"accumulate at the exchange to ensure that the escrow\n"
+"account is managed honestly. This ensures that the\n"
+"exchange does not threaten the economy due to fraud.\n"
msgstr ""
-#: governments.html.j2:72 index.html.j2:95
+#: governments.html.j2:88 index.html.j2:96
msgid "Libre"
msgstr "Libre"
-#: governments.html.j2:74
+#: governments.html.j2:91
msgid ""
-"Taler is free software implementing an open\n"
-" protocol standard. Thus, Taler will enable\n"
-" competition and avoid the monopolization of payment\n"
-" systems that threatens global political and\n"
-" financial stability today."
+"Taler is free software implementing an open protocol\n"
+"standard. Thus, Taler will enable competition and avoid\n"
+"the monopolization of payment systems that threatens\n"
+"global political and financial stability today.\n"
msgstr ""
-#: governments.html.j2:83
+#: governments.html.j2:101
msgid "Efficient"
msgstr "Eficiente"
-#: governments.html.j2:85
+#: governments.html.j2:104
msgid ""
"Taler has an efficient design. Unlike\n"
-" timeline-based payment systems, such as Bitcoin,\n"
-" Taler will not threaten the availability of\n"
-" national electric grids or (significantly)\n"
-" contribute to environmental pollution."
+"Blockchain-based payment systems, such as Bitcoin,\n"
+"Taler will not threaten the availability of\n"
+"national electric grids or (significantly)\n"
+"contribute to environmental pollution.\n"
msgstr ""
-#: governments.html.j2:99
+#: governments.html.j2:120
msgid "Taler and regulation"
msgstr ""
-#: governments.html.j2:101
-msgid "Anti-money laundering (AML)"
+#: governments.html.j2:122
+msgid "Anti money laundering (AML)"
msgstr ""
-#: governments.html.j2:102
+#: governments.html.j2:123
msgid ""
"With Taler, income is visible and can be tied to the contract signed by "
"both parties."
msgstr ""
-#: governments.html.j2:103
-msgid "Know-your-customer (KYC)"
+#: governments.html.j2:124
+msgid "Know your customer (KYC)"
msgstr ""
-#: governments.html.j2:104
+#: governments.html.j2:125
msgid ""
"In Taler, payer and payee are known by their bank accounts when "
"withdrawing or depositing coins respectively"
msgstr ""
-#: governments.html.j2:105
-msgid "Privacy-by-design (GDPR)"
+#: governments.html.j2:126
+msgid "General Data Protection Regulation (GDPR)"
msgstr ""
-#: governments.html.j2:106
+#: governments.html.j2:127
msgid ""
"Taler cryptographically protects citizen's privacy, and by design "
"implements data minimization and privacy by default."
msgstr ""
-#: governments.html.j2:107
-msgid "Competitive banking (PSD2)"
+#: governments.html.j2:128
+msgid "Payment Services Directive (PSD2)"
msgstr ""
-#: governments.html.j2:108
+#: governments.html.j2:129
msgid ""
-"Taler provides an open standard with public APIs contributing to a level "
-"playing field."
+"Taler provides an open standard with public APIs contributing to a "
+"competitive banking sector."
msgstr ""
-#: governments.html.j2:116
+#: governments.html.j2:137
msgid "Taler provides privacy and accountability"
msgstr ""
-#: governments.html.j2:118
+#: governments.html.j2:140
msgid ""
"Taler assumes governments can observe traditional wire transfers\n"
-" entering and leaving the Taler payment system. Starting with "
-"the\n"
-" wire transfers, governments can obtain: "
+"entering and leaving the Taler payment system. Starting with the\n"
+"wire transfers, governments can obtain:\n"
msgstr ""
-#: governments.html.j2:123
+#: governments.html.j2:148
msgid ""
"The total amount of digital currency withdrawn by a\n"
-" customer. The government can impose limits on how much\n"
-" digital cash a customer can withdraw within a\n"
-" given time frame."
+"customer. The government can impose limits on how much\n"
+"digital cash a customer can withdraw within a\n"
+"given time frame.\n"
msgstr ""
-#: governments.html.j2:128
+#: governments.html.j2:157
msgid ""
"The income received by any merchant via the Taler\n"
-" system."
+"system.\n"
msgstr ""
-#: governments.html.j2:131
+#: governments.html.j2:164
msgid ""
-"The exact details of the underlying\n"
-" contract that was signed between customer and\n"
-" merchant. However, this information would\n"
-" typically not include the identity of the\n"
-" customer."
+"The exact details of the underlying contract that was\n"
+"signed between customer and merchant. However, this\n"
+"information would typically not include the identity\n"
+"of the customer.\n"
msgstr ""
-#: governments.html.j2:137
+#: governments.html.j2:174
msgid ""
-"The amounts of\n"
-" digital coins legitimately withdrawn by\n"
-" customers from the exchange, the value of\n"
-" non-redeemed digital coins in customer's\n"
-" wallets, the value and corresponding wire\n"
-" details of deposit operations performed by\n"
-" merchants with the exchange, and the income of\n"
-" the exchange from transaction fees."
+"The amounts of digital coins legitimately withdrawn\n"
+"by customers from the exchange, the value of\n"
+"non-redeemed digital coins in customer's wallets, the\n"
+"value and corresponding wire details of deposit\n"
+"operations performed by merchants with the exchange,\n"
+"and the income of the exchange from transaction fees.\n"
msgstr ""
#: index.html.j2:10
-msgid "Independent One-Click Payments!"
+msgid "One-Click Cash Payments!"
msgstr ""
-#: index.html.j2:12
+#: index.html.j2:13
msgid ""
-"\n"
-" Taler is an electronic payment system under\n"
-" development\n"
-" at <a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make "
-"it operational in 2017.\n"
-" You can learn about Taler on this website, try the <a "
-"href=\"https://demo.taler.net\";>demo</a>\n"
-" and look at our <a href=\"https://docs.taler.net\";>developer</a> "
-"and <a href=\"https://api.taler.net\";>API</a> documentation.\n"
-" "
-msgstr ""
-
-#: index.html.j2:26
-msgid "Practical"
-msgstr ""
-
-#: index.html.j2:29
-msgid ""
-"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
+"GNU Taler is an electronic payment system under development at\n"
+"<a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make it\n"
+"operational in 2017. You can learn about Taler on this website,\n"
+"try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+"our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+"href=\"https://api.taler.net\";>API</a> documentation.\n"
msgstr ""
-#: index.html.j2:39
-msgid "Stable"
+#: index.html.j2:28
+msgid "Practical"
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:31
msgid ""
-"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+"Taler is easy to integrate with existing Web\n"
+"applications. Payments are cryptographically\n"
+"secured and are confirmed within milliseconds with\n"
+"extremely low transaction costs.\n"
msgstr ""
-#: index.html.j2:54
-msgid "Security-focused"
-msgstr ""
-
-#: index.html.j2:57
+#: index.html.j2:44
msgid ""
-"\n"
-" By design Taler does not suffer from many classes\n"
-" of security problems such as phishing or counterfeit.\n"
-" Despite its security features, Taler never rejects a legitimate\n"
-" customer due to a fraud-detection false positive.\n"
-" "
+"Taler does not introduce a new currency. Taler\n"
+"uses a digital wallet storing coins and payment service\n"
+"providers with escrow accounts in existing currencies.\n"
+"Thus, Taler's cryptographic coins correspond to existing\n"
+"currencies, such as US Dollars, Euros or even Bitcoins.\n"
msgstr ""
-#: index.html.j2:72
+#: index.html.j2:58
msgid ""
-"\n"
-" When using Taler, merchants cannot hide their income from tax\n"
-" collection authorities. Unlike cash and most digital currencies,"
-"\n"
-" Taler helps prevent black markets. Taler is not suitable for\n"
-" illegal activities.\n"
-" "
+"By design Taler does not suffer from many classes\n"
+"of security problems such as phishing or counterfeit.\n"
+"Despite its security features, Taler never rejects a legitimate\n"
+"customer due to a fraud-detection false positive.\n"
msgstr ""
-#: index.html.j2:82
-msgid "Privacy-friendly"
+#: index.html.j2:73
+msgid ""
+"When using Taler, merchant's revenue is transparent for tax\n"
+"collection authorities. Unlike cash and most digital currencies,\n"
+"Taler helps prevent black markets. Taler is not suitable for\n"
+"illegal activities.\n"
msgstr ""
-#: index.html.j2:84
+#: index.html.j2:85
msgid ""
-"\n"
-" When you pay with Taler, your identity does not\n"
-" have to be revealed to the merchant. Just like\n"
-" payments in cash, nobody else can track how you\n"
-" spent your electronic money. However, you obtain a\n"
-" legally valid proof of payment.\n"
-" "
+"When you pay with Taler, your identity does not\n"
+"have to be revealed to the merchant. Just like\n"
+"payments in cash, nobody else can track how you\n"
+"spent your electronic money. However, you obtain a\n"
+"legally valid proof of payment.\n"
msgstr ""
-#: index.html.j2:98
+#: index.html.j2:99
msgid ""
-"\n"
-" Taler provides protocols and reference implementations that in\n"
-" principle enables anybody to run their own payment "
-"infrastructure,\n"
-" be it individuals, organizations or whole countries. Since the\n"
-" reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a>\n"
-" package, it will always remain free software.\n"
-" "
+"Taler provides protocols and reference implementations that in\n"
+"principle enables anybody to run their own payment infrastructure,\n"
+"be it individuals, organizations or whole countries. Since the\n"
+"reference implementation is a <a href=\"http://www.gnu.org/\";>GNU</a>\n"
+"package, it will always remain free software.\n"
msgstr ""
-#: index.html.j2:115
+#: index.html.j2:116
msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:116
+#: index.html.j2:117
msgid ""
-"\n"
-" <p>To pay with Taler, customers install an electronic wallet\n"
-" on their device. Before the first payment, the wallet's balance must"
-"\n"
-" be charged in the desired currency by some other means of "
-"payment.</p>\n"
-" <p>Once the wallet is charged, payments on websites take only one "
-"click,\n"
-" are never falsely rejected by fraud detection and do not post any "
-"risk\n"
-" of phishing or identity theft.</p>\n"
-" "
+"<p>To pay with Taler, customers install an electronic wallet\n"
+"on their device. Before the first payment, the wallet's balance must\n"
+"be charged in the desired currency by some other means of payment.</p>\n"
+"<p>Once the wallet is charged, payments on websites take only one click,\n"
+"are never falsely rejected by fraud detection and do not pose any risk\n"
+"of phishing or identity theft.</p>\n"
msgstr ""
-#: index.html.j2:126
+#: index.html.j2:127
msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:127
+#: index.html.j2:128
msgid ""
-"\n"
-" <p>To receive Taler payments, a merchant needs a bank account\n"
-" in the desired currency. We provide\n"
-" SDKs in various languages to makes the integration painless.\n"
-" The merchant's backend for Taler transaction processing can run\n"
-" on the merchant's premises or hosted.</p>\n"
-" "
+"<p>To receive Taler payments, a merchant needs a bank account\n"
+"in the desired currency. We provide supporting software\n"
+"in various programming languages to make the integration painless.\n"
+"The merchant's backend for Taler transaction processing can run\n"
+"on the merchant's premises or be hosted by a third party.</p>\n"
msgstr ""
-#: index.html.j2:143
+#: index.html.j2:144
msgid "Taler News"
msgstr ""
-#: index.html.j2:147
+#: index.html.j2:148
msgid "Financial News"
msgstr ""
@@ -1012,12 +946,10 @@ msgstr ""
#: investors.html.j2:9
msgid ""
-"\n"
-" We have created a company, Taler Systems SA in\n"
-" Luxembourg.<br>\n"
-" Please contact <tt>address@hidden</tt>\n"
-" if you want to invest in Taler.\n"
-" "
+"We have created a company, Taler Systems SA in\n"
+"Luxembourg.<br>\n"
+"Please contact <tt>address@hidden</tt>\n"
+"if you want to invest in Taler.\n"
msgstr ""
#: investors.html.j2:24
@@ -1026,23 +958,21 @@ msgstr ""
#: investors.html.j2:27
msgid ""
-"\n"
-" Our <a href=\"about.html\">team</a> combines world-class "
-"business leaders,\n"
-" cryptographers, software engineers, civil-rights\n"
-" activists and academics. We are unified by a vision\n"
-" of how payments should work and the goal of\n"
-" imposing this vision upon the world.\n"
-" "
+"Our <a href=\"about.html\">team</a> combines world-class business "
+"leaders,\n"
+"cryptographers, software engineers, civil-rights\n"
+"activists and academics. We are unified by a vision\n"
+"of how payments should work and the goal of\n"
+"imposing this vision upon the world.\n"
msgstr ""
#: investors.html.j2:37
msgid ""
-"\n"
-" We are currently supported by Inria, the French\n"
-" national institute for research in informatics and\n"
-" automation, and the Renewable Freedom Foundation.\n"
-" "
+"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>,"
+" the French\n"
+"national institute for research in informatics and\n"
+"automation, and the <a href=\"https://renewablefreedom.org/\";>Renewable "
+"Freedom Foundation</a>.\n"
msgstr ""
#: investors.html.j2:45
@@ -1051,19 +981,17 @@ msgstr ""
#: investors.html.j2:48
msgid ""
-"\n"
-" All transactions in Taler are secured using <a "
+"All transactions in Taler are secured using <a "
"href=\"bibliography.html\">modern\n"
-" cryptography</a> and trust in all parties is\n"
-" minimized. Financial damage is bounded (for\n"
-" customers, merchants and the exchange) even in the\n"
-" case that systems are compromised and private keys\n"
-" are stolen. Databases can be audited for\n"
-" consistency, resulting in either the detection of\n"
-" compromised systems or the demonstration that\n"
-" participants were honest. Actual transaction costs\n"
-" are fractions of a cent.\n"
-" "
+"cryptography</a> and trust in all parties is\n"
+"minimized. Financial damage is bounded (for\n"
+"customers, merchants and the exchange) even in the\n"
+"case that systems are compromised and private keys\n"
+"are stolen. Databases can be audited for\n"
+"consistency, resulting in either the detection of\n"
+"compromised systems or the demonstration that\n"
+"participants were honest. Actual transaction costs\n"
+"are fractions of a cent.\n"
msgstr ""
#: investors.html.j2:63
@@ -1072,17 +1000,15 @@ msgstr ""
#: investors.html.j2:66
msgid ""
-"\n"
-" The scalable business model for Taler is the operation\n"
-" of the payment service provider, which converts money from\n"
-" traditional payment systems (MasterCard, SEPA,\n"
-" Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
-" electronic coins in the same currency. The customer\n"
-" can then redeem the electronic coins at a merchant,\n"
-" who can exchange them for money represented using\n"
-" traditional payment systems at the exchange. The\n"
-" exchange charges fees to facilitate the transactions.\n"
-" "
+"The scalable business model for Taler is the operation\n"
+"of the payment service provider, which converts money from\n"
+"traditional payment systems (MasterCard, SEPA, UPI,\n"
+"Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+"electronic coins in the same currency. The customer\n"
+"can then redeem the electronic coins at a merchant,\n"
+"who can exchange them for money represented using\n"
+"traditional payment systems at the exchange. The\n"
+"exchange charges fees to facilitate the transactions.\n"
msgstr ""
#: investors.html.j2:85
@@ -1095,13 +1021,10 @@ msgstr ""
#: investors.html.j2:110
msgid ""
-"\n"
-" The payment service operator runs the <em>Taler exchange</em>.\n"
-" The exchange charges <b>transaction fees</b> to customers or "
-"merchants.\n"
-" Its operational expenses are from wire transfers with the banking\n"
-" system and the operation of the computing infrastructure.\n"
-" "
+"The payment service operator runs the <em>Taler exchange</em>.\n"
+"The exchange charges <b>transaction fees</b> to customers or merchants.\n"
+"Its operational expenses are from wire transfers with the banking\n"
+"system and the operation of the computing infrastructure.\n"
msgstr ""
#: investors.html.j2:120
@@ -1134,146 +1057,143 @@ msgstr ""
msgid "Advantages for Merchants"
msgstr ""
-#: merchants.html.j2:6
+#: merchants.html.j2:8
msgid ""
"Taler is a cost-effective electronic payment system\n"
-" which provides you with cryptographic proof that\n"
-" the payment worked correctly within milliseconds.\n"
-" Your Web customers pay with previously unknown\n"
-" levels of convenience without risk of fraud."
+"which provides you with cryptographic proof that\n"
+"the payment worked correctly within milliseconds.\n"
+"Your Web customers pay with previously unknown\n"
+"levels of convenience without risk of fraud.\n"
msgstr ""
-#: merchants.html.j2:18
+#: merchants.html.j2:22
msgid "Fast"
msgstr "Rápido"
-#: merchants.html.j2:20
+#: merchants.html.j2:25
msgid ""
"Processing transactions with Taler is fast,\n"
-" allowing you to confirm the transaction with your\n"
-" customer virtually immediately. Your customers\n"
-" will appreciate that they do not have to type in\n"
-" credit card information and play the "verified\n"
-" by" game. By making payments significantly\n"
-" more convenient for your customers, you may be able\n"
-" to use Taler for small transactions that would not\n"
-" work with credit card payments due to the mental\n"
-" overhead for customers."
+"allowing you to confirm the transaction with your\n"
+"customer virtually immediately. Your customers\n"
+"will appreciate that they do not have to type in\n"
+"credit card information and play the "verified\n"
+"by" game. By making payments significantly\n"
+"more convenient for your customers, you may be able\n"
+"to use Taler for small transactions that would not\n"
+"work with credit card payments due to the mental\n"
+"overhead for customers.\n"
msgstr ""
-#: merchants.html.j2:35
+#: merchants.html.j2:44
msgid ""
-"You will have cryptographic proof of payment from\n"
-" the Taler payment service provider. Taler does not\n"
-" require you to undergo any particular security\n"
-" audits (such as PCI DSS), processes or procedures,\n"
-" as you never handle sensitive customer account\n"
-" information. Your systems will have customer\n"
-" contracts with qualified signatures for all\n"
-" transactions which you can use in court in case of\n"
-" disputes."
+"You will have cryptographic proof of payment from the\n"
+"Taler payment service provider. With Taler you never\n"
+"handle sensitive customer account information and thus\n"
+"do not have to undergo any particular security audits\n"
+"(such as PCI DSS). Your systems will have customer\n"
+"contracts with qualified signatures for all\n"
+"transactions which you can use in court in case of\n"
+"disputes.\n"
msgstr ""
-#: merchants.html.j2:47
-msgid "Free Software"
-msgstr "Software Libre"
-
-#: merchants.html.j2:49
+#: merchants.html.j2:61
msgid ""
"Taler is free software, and you can use the\n"
-" liberally-licensed reference code as a starting\n"
-" point to integrate Taler into your services. To use\n"
-" Taler, you do not need to pay license fees, and the\n"
-" free software development model will ensure that\n"
-" you can select from many competent integrators for\n"
-" support."
+"liberally-licensed reference code as a starting\n"
+"point to integrate Taler into your services. To use\n"
+"Taler, you do not need to pay license fees, and the\n"
+"free software development model will ensure that\n"
+"you can select from many competing integrators for\n"
+"support.\n"
msgstr ""
-#: merchants.html.j2:61
-msgid "Low Fees"
-msgstr "Bajo costo"
+#: merchants.html.j2:76
+msgid "Cheap"
+msgstr ""
-#: merchants.html.j2:63
+#: merchants.html.j2:79
msgid ""
-"Taler is designed to minimize the work the exchange\n"
-" needs to perform. Combined with Taler's strong\n"
-" security which prevents fraud, payment service\n"
-" providers can operate with very low overhead and\n"
-" thus low transaction fees."
+"Taler is uses efficient cryptographic constructions with low\n"
+"bandwidth and storage requirements. Combined with Taler's strong\n"
+"security which makes fraud impossible, Taler payment service\n"
+"providers can operate with very low overhead and\n"
+"thus offer low transaction fees.\n"
msgstr ""
-#: merchants.html.j2:71
+#: merchants.html.j2:89
msgid "Flexible"
msgstr "Flexible"
-#: merchants.html.j2:73
+#: merchants.html.j2:92
msgid ""
"Taler can be used for different currencies (such as\n"
-" Euros, US Dollars or Bitcoins) and different\n"
-" payment models limited only by what the payment\n"
-" service provider supports in its interactions."
+"Euros, US Dollars or Bitcoins) and any amount, limited\n"
+"only by applicable regulatation and what denominations\n"
+"the payment service provider supports.\n"
msgstr ""
-#: merchants.html.j2:81
+#: merchants.html.j2:101
msgid "Ethical"
msgstr "Ético"
-#: merchants.html.j2:83
+#: merchants.html.j2:104
msgid ""
"Taler prevents tax evasion and money laundering.\n"
-" Taler's protocols are efficient and do not waste\n"
-" energy. Taler encourages transparency by providing\n"
-" an open standard and free software reference\n"
-" implementations."
+"Taler's protocols are efficient and do not use wasteful\n"
+"proof-of-work calculations. Taler encourages\n"
+"transparency by providing an open standard and free\n"
+"software reference implementations.\n"
msgstr ""
-#: merchants.html.j2:95
+#: merchants.html.j2:119
#, fuzzy
msgid "Manuals for merchants"
msgstr "Documentation"
-#: merchants.html.j2:98
+#: merchants.html.j2:122
msgid "The GNU Taler merchant backend operator manual"
msgstr ""
-#: merchants.html.j2:101
+#: merchants.html.j2:125
msgid "The GNU Taler Web shop integration tutorial (PHP)"
msgstr ""
-#: merchants.html.j2:104
+#: merchants.html.j2:128
msgid "The GNU Taler Web shop integration tutorial (Python)"
msgstr ""
-#: merchants.html.j2:116
+#: merchants.html.j2:140
msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:118
+#: merchants.html.j2:142
msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:122
+#: merchants.html.j2:147
msgid ""
-"The backend <b>signs</b> and <b>stores</b>\n"
-" proposals made by the merchant to customers.\n"
-" For this, the merchant's frontend needs to give the\n"
-" customer's order in a JSON format to the backend."
+"The backend <b>signs</b> and <b>stores</b> the\n"
+"complete terms of offers made by the merchant to customers.\n"
+"For this, the merchant's frontend needs to give the\n"
+"customer's order in a JSON format to the backend.\n"
msgstr ""
-#: merchants.html.j2:127
+#: merchants.html.j2:156
msgid ""
-"The backend <b>validates</b> and <b>executes</b>\n"
-" payments received from the wallet. The frontend\n"
-" must pass the payment request through to the backend\n"
-" and checks the HTTP status code that is returned."
+"The backend <b>validates</b> payments received from\n"
+"the wallet and <b>executes</b> them with the Taler\n"
+"payment service provider (the exchange). For this,\n"
+"the merchant's frontend must pass the payment\n"
+"request through to the Taler backend and check the\n"
+"HTTP status code that is returned.\n"
msgstr ""
-#: merchants.html.j2:132
+#: merchants.html.j2:167
msgid ""
"The backend can <b>list</b> completed transactions\n"
-" and <b>map</b> aggregated wire transfers to individual\n"
-" business transactions including the exact terms of\n"
-" the contract."
+"and <b>map</b> wire transfers to sets of business\n"
+"transactions, including the exact terms of each\n"
+"contract.\n"
msgstr ""
#: press.html.j2:4
@@ -1459,3 +1379,935 @@ msgstr ""
#~ msgid "The mailinglist"
#~ msgstr ""
+#~ msgid "Security"
+#~ msgstr "Seguridad"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacidad"
+
+#~ msgid "Convenience"
+#~ msgstr "Conveniencia"
+
+#~ msgid "Stability"
+#~ msgstr ""
+
+#~ msgid "Anti-money laundering (AML)"
+#~ msgstr ""
+
+#~ msgid "Know-your-customer (KYC)"
+#~ msgstr ""
+
+#~ msgid "Privacy-by-design (GDPR)"
+#~ msgstr ""
+
+#~ msgid "Competitive banking (PSD2)"
+#~ msgstr ""
+
+#~ msgid "Security-focused"
+#~ msgstr ""
+
+#~ msgid "Privacy-friendly"
+#~ msgstr ""
+
+#~ msgid "Free Software"
+#~ msgstr "Software Libre"
+
+#~ msgid "Low Fees"
+#~ msgstr "Bajo costo"
+
+#~ msgid ""
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler largely functions like digital cash. You\n"
+#~ " withdraw money from your bank account into your\n"
+#~ " electronic wallet, and can henceforth spend digital\n"
+#~ " cash. The electronic wallet can carry multiple\n"
+#~ " currencies.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Taler uses modern cryptography, ensuring that there\n"
+#~ " is no counterfeit. Your digital wallet is safer\n"
+#~ " than your physical wallet. At most, you can lose\n"
+#~ " its contents because your computer or mobile is\n"
+#~ " irreparably damaged or compromised. Unlike a\n"
+#~ " physical wallet, you can make backups to secure\n"
+#~ " against data loss."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Your transactions are private, neither the payment\n"
+#~ " service provider nor merchant needs to learn your\n"
+#~ " identity. There is no need to give out credit card\n"
+#~ " numbers or other sensitive information. The merchant\n"
+#~ " will only be able to do exactly the transaction you\n"
+#~ " agreed to."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will be able to withdraw money to replenish the\n"
+#~ " digital coins in your wallet using your credit card\n"
+#~ " or wire transfers. Afterwards you can pay with\n"
+#~ " one-click using the Taler wallet, which optionally\n"
+#~ " keeps your transaction history on your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Coins in your digital wallet will be of the same\n"
+#~ " denomination as the cash in your physical wallet.\n"
+#~ " Taler is not a crypto-currency, so you do not have\n"
+#~ " to worry about cryto-currency related value\n"
+#~ " fluctuations. Banking with Taler is subject to the\n"
+#~ " usual government protections for financial\n"
+#~ " services."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We currently provide a <a "
+#~ "href=\"wallet.html\">wallet browser extension</a> "
+#~ "for Chromium, Chrome, Firefox, Opera\n"
+#~ " and Edge. Wallets for mobile"
+#~ " phones and other platforms will be"
+#~ " available in the future.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You can see how Taler "
+#~ "works in practice by visiting our "
+#~ "<a href=\"https://demo.taler.net\";>demo page</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Customers interact with the Taler system using\n"
+#~ " the Taler wallet:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>withdraw</b> electronic coins, the customer\n"
+#~ " transfers funds from his bank account to the Taler\n"
+#~ " payment service provider (the exchange). The wire\n"
+#~ " transfer subject must match a code identifying the\n"
+#~ " customer's wallet. After the wire transfer is\n"
+#~ " complete, the wallet will automatically withdraw the\n"
+#~ " coins from the exchange."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>spend</b> electronic coins, a merchant must\n"
+#~ " cause the wallet to display a proposal for some\n"
+#~ " purchase. The wallet will ask the customer for\n"
+#~ " one-click confirmation. Payment is then instant.\n"
+#~ " Transaction histories and "
+#~ "digitally signed contracts\n"
+#~ " can be preserved by the wallet."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The customer can use the wallet to <b>review</b> his\n"
+#~ " balance. The wallet can contain different\n"
+#~ " currencies, and may be shared across\n"
+#~ " devices. Customers can make"
+#~ " backups of the wallet to\n"
+#~ " secure its contents against hardware failures."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " An archived, public mailing list for GNU Taler is\n"
+#~ " hosted at\n"
+#~ " <a "
+#~
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ " You can send messages to the "
+#~ "list\n"
+#~ " at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Team members are generally reachable at\n"
+#~ " <tt>address@hidden</tt>. All of us\n"
+#~ " support receiving GnuPG encrypted e-mails.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We track open feature requests and bugs in our\n"
+#~ " <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+#~ " which is shared with the GNUnet project.\n"
+#~ " You can also report bugs or feature requests to the\n"
+#~ " mailing list.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " For non-technical commercial requests, please contact\n"
+#~ " <tt>ceo AT taler.net</tt>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is free software implementing an open\n"
+#~ " protocol. Anybody is welcome"
+#~ " to integrate our reference\n"
+#~ " implementation into their applications. Different\n"
+#~ " components of Taler are being made available under\n"
+#~ " different licenses. The Affero GPLv3+ is used for the\n"
+#~ " exchange, the LGPLv3+ is used for reference code\n"
+#~ " demonstrating integration with merchant platforms, and\n"
+#~ " licenses like GPLv3+ are used for\n"
+#~ " wallets and related customer-facing software. We are\n"
+#~ " open for constructive suggestions for maximizing the\n"
+#~ " adoption of this payment platform.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is designed to work on the Internet. To\n"
+#~ " ensure that Taler payments can work with\n"
+#~ " restrictive network setups, Taler uses a RESTful\n"
+#~ " protocol over HTTP or HTTPS. Taler's security does\n"
+#~ " not depend upon the use of HTTPS, but obviously\n"
+#~ " merchants may choose to offer HTTPS for consistency\n"
+#~ " and because it generally is better for privacy\n"
+#~ " compared to HTTP. Taler uses JSON to encode\n"
+#~ " structure data, making it easy to integrate Taler\n"
+#~ " with existing Web applications. Taler's protocol\n"
+#~ " is documented in\n"
+#~ " detail at <a "
+#~ "href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is currently primarily developed by a\n"
+#~ " research team at <a "
+#~ "href=\"http://www.inria.fr/\";>Inria</a> and\n"
+#~ " <a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+#~ " contributions from anyone are welcome. Our Git\n"
+#~ " repositories can be cloned using the Git and HTTP\n"
+#~ " access methods against <tt>git.taler.net</tt> with\n"
+#~ " the name of the respective repository. A list of\n"
+#~ " repositories can be found in\n"
+#~ " our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " In addition to this website, the <a\n"
+#~ " href=\"https://git.taler.net/\";>documented "
+#~ "code</a> and\n"
+#~ " the <a href=\"https://api.taler.net/\";>API\n"
+#~ " documentation</a>. Technical papers can be found in\n"
+#~ " our <a href=\"bibliography.html\">bibliography</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have a mailing list for developer discussions.\n"
+#~ " You can subscribe to or read the list archive at\n"
+#~ " <a "
+#~
"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+#~ " automation tests to detect regressions and check for\n"
+#~ " portability at <a\n"
+#~ " "
+#~ "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We use\n"
+#~ " <a "
+#~ "href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+#~ " to analyze the code coverage of our tests, the\n"
+#~ " results are available\n"
+#~ " at <a "
+#~ "href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We\n"
+#~ " use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+#~ " for performance regression analysis of the exchange\n"
+#~ " backend\n"
+#~ " at <a "
+#~ "href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The Taler system consists of protocols executed among\n"
+#~ " a number of actors as "
+#~ "illustrated in the illustration on the"
+#~ " right.\n"
+#~ " Typical transactions involve the following steps:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " A customer instructs his <b>bank</b> to\n"
+#~ " transfer funds from his account to the Taler\n"
+#~ " exchange (top left). In the subject of the\n"
+#~ " transaction, he includes an authentication\n"
+#~ " token from his electronic <b>wallet</b>. In\n"
+#~ " Taler terminology, the customer creates a\n"
+#~ " reserve at the exchange.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the exchange has received the wire\n"
+#~ " transfer, it allows the customer's electronic\n"
+#~ " wallet to <b>withdraw</b> electronic coins.\n"
+#~ " The electronic coins are digital\n"
+#~ " representations of the original currency from\n"
+#~ " the transfer. It is important to note that the\n"
+#~ " exchange does not learn the "serial\n"
+#~ " numbers" of the coins created in this\n"
+#~ " process, so it cannot tell later which customer\n"
+#~ " purchased what at which merchant. The use of\n"
+#~ " Taler does not change the currency or the total\n"
+#~ " value of the funds (except for fees which the\n"
+#~ " exchange may charge for the service).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the customer has the digital coins in his\n"
+#~ " wallet, the wallet can be used to <b>spend</b>\n"
+#~ " the coins with merchant portals that support\n"
+#~ " the Taler payment system and accept the\n"
+#~ " respective exchange as a business partner\n"
+#~ " (bottom arrow). This creates a digital contract\n"
+#~ " signed by the customer's coins and the\n"
+#~ " merchant. If necessary, the customer can later\n"
+#~ " use this digitally signed contract in a court\n"
+#~ " of law to prove the exact terms of the contract\n"
+#~ " and that he paid the respective amount. The\n"
+#~ " customer does not learn the banking details of\n"
+#~ " the merchant, and Taler does not require the\n"
+#~ " merchant to learn the identity of the\n"
+#~ " customer. Naturally, the customer can spend any\n"
+#~ " fraction of his digital coins (the system takes\n"
+#~ " care of customers getting change).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Merchants receiving digital\n"
+#~ " coins <b>deposit</b> the respective claims\n"
+#~ " that resulted from the contract signing with\n"
+#~ " the customer at the exchange to redeem the\n"
+#~ " coins. The deposit step does not reveal the\n"
+#~ " details of the contract between the customer\n"
+#~ " and the merchant or the identity of the\n"
+#~ " customer to the exchange in any way. However,\n"
+#~ " the exchange does learn the identity of the\n"
+#~ " merchant via the provided bank routing\n"
+#~ " information. The merchant can, for example\n"
+#~ " when compelled by the state for taxation,\n"
+#~ " provide information linking the individual\n"
+#~ " deposit to the respective contract signed by\n"
+#~ " the customer. Thus, the exchange's database\n"
+#~ " allows the state to enforce that merchants pay\n"
+#~ " applicable taxes (and do not engage in illegal\n"
+#~ " contracts).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Finally, the exchange transfers funds\n"
+#~ " corresponding to the digital coins redeemed by\n"
+#~ " the merchants to the merchant's <b>bank</b>\n"
+#~ " account. The exchange may combine multiple\n"
+#~ " small transactions into one larger bank\n"
+#~ " transfer. The merchant can query the exchange\n"
+#~ " about the relationship between the bank\n"
+#~ " transfers and the individual claims that were\n"
+#~ " deposited.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Most importantly, the exchange keeps\n"
+#~ " cryptographic proofs that allow it to\n"
+#~ " demonstrate that it is operating correctly to\n"
+#~ " third parties. The system requires an\n"
+#~ " external <b>auditor</b>, such as a\n"
+#~ " government-appointed financial regulatory body,\n"
+#~ " to frequently verify the exchange's databases\n"
+#~ " and check that its bank balance matches the\n"
+#~ " total value of the remaining coins in\n"
+#~ " circulation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Without the auditor, the exchange operators\n"
+#~ " could embezzle funds they are holding in\n"
+#~ " reserve. Customers and merchants cannot cheat\n"
+#~ " each other or the exchange. If any party's\n"
+#~ " computers are compromised, the financial damage\n"
+#~ " is limited to the respective party and\n"
+#~ " proportional to the funds they have in\n"
+#~ " circulation during the period of the\n"
+#~ " compromise.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+#~ "Taler is not based on proof-of-"
+#~ "work or any other distributed consensus"
+#~ "\n"
+#~ "mechanism. Instead Taler is based on blind signatures.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>It would be possible, however, to withdraw coins denominated in\n"
+#~ "Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+#~ "would give some benefits over plain Bitcoin, such as instant\n"
+#~ "confirmation times.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Your wallet stores digital coins and thus ultimately your computer\n"
+#~ "holds your balance. The exchange keeps funds matching all unspent\n"
+#~ "coins in an escrow bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Since the digital coins of value "
+#~ "in your wallet are anonymized, the\n"
+#~ ""
+#~ "exchange can not assist you in recovering a lost or stolen wallet.\n"
+#~ "Just like with a physical wallet for cash, you are responsible for\n"
+#~ "keeping it safe.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>The risk of losing a wallet can be mitigated by making backups or\n"
+#~ "keeping the balance reasonably low.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>In case of a compromise of one of your devices, an attacker can\n"
+#~ "spend coins from your wallet. Checking your balance might reveal\n"
+#~ "to you that your device has been compromised.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>If your friend provides goods or "
+#~ "services for you in exchange for a"
+#~ "\n"
+#~ "payment, they can easily set up a Taler merchant and receive the\n"
+#~ "payment in their bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Future versions of the Taler wallet may allow exchanging coins\n"
+#~ "among friends directly as well.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler wallets can store digital coins corresponding to multiple\n"
+#~ "different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler currently does not offer conversion between currencies.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "<p>Your wallet stores digital coins that are <a\n"
+#~ "href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+#~ "signed</a> by an exchange. The use "
+#~ "of a blind signature protects your\n"
+#~ ""
+#~ "privacy as it prevents the exchange from knowing which coin it signed\n"
+#~ "for which customer.</p>\n"
+#~ "\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides accountability to ensure business operate\n"
+#~ " legally, while also respecting civil liberties of\n"
+#~ " citizens. Taler is a payment system based on\n"
+#~ " open standards and free software. Taler needs\n"
+#~ " governments as they set a financial framework and act as\n"
+#~ " trusted regulators. Taler contributes to digital\n"
+#~ " sovereignty in the critical financial infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler was built with the goal of fighting corruption and\n"
+#~ " supporting taxation. With Taler, the receiver of any\n"
+#~ " form of payment is easily identified by the government,\n"
+#~ " and the merchant can be "
+#~ "compelled to provide the contract\n"
+#~ " that was accepted by the customer. Governments can use\n"
+#~ " this data to tax businesses and individuals based on\n"
+#~ " their income, making tax evasion and black markets less\n"
+#~ " viable.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Thus, despite offering anonymity for citizens spending\n"
+#~ " digital cash to buy goods and services, Taler also\n"
+#~ " ensures that the state can observe incoming funds. This\n"
+#~ " can be used to ensure businesses engage only in legal\n"
+#~ " activities, and do not evade income tax, sales tax or\n"
+#~ " value-added tax. However, this observational capability\n"
+#~ " does not extend to the immediate personal domain. In\n"
+#~ " particular, monitoring does not cover shared access to\n"
+#~ " funds with trusted friends and family, or synchronizing\n"
+#~ " wallets across multiple devices.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler's payments are cryptographically secured. Thus,\n"
+#~ " customers, merchants and the "
+#~ "Taler payment service provider\n"
+#~ " (the exchange) can mathematically\n"
+#~ " demonstrate their lawful behavior in court in case of\n"
+#~ " disputes. Financial damages are strictly limited,\n"
+#~ " improving economic security for individuals, merchants,\n"
+#~ " the exchange and the state.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " As a payment service provider, the Taler exchange is\n"
+#~ " subject to financial regulation."
+#~ " Financial regulation and\n"
+#~ " regular audits are critical to establish trust. In\n"
+#~ " particular, the Taler design "
+#~ "mandates the existence of an\n"
+#~ " independent auditor who checks cryptographic proofs that\n"
+#~ " accumulate at the exchange to ensure that the escrow\n"
+#~ " account is managed honestly. This ensures that the\n"
+#~ " exchange does not threaten the economy due to fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software implementing an open protocol\n"
+#~ " standard. Thus, Taler will enable competition and avoid\n"
+#~ " the monopolization of payment systems that threatens\n"
+#~ " global political and financial stability today.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler has an efficient design. Unlike\n"
+#~ " Blockchain-based payment systems, such as Bitcoin,\n"
+#~ " Taler will not threaten the availability of\n"
+#~ " national electric grids or (significantly)\n"
+#~ " contribute to environmental pollution.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler assumes governments can "
+#~ "observe traditional wire transfers\n"
+#~ " entering and leaving the "
+#~ "Taler payment system. Starting with the"
+#~ "\n"
+#~ " wire transfers, governments can obtain:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The total amount of digital currency withdrawn by a\n"
+#~ " customer. The government can"
+#~ " impose limits on how much\n"
+#~ " digital cash a customer can withdraw within a\n"
+#~ " given time frame.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The income received by any merchant via the Taler\n"
+#~ " system.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ " The exact details of the underlying contract that was\n"
+#~ " signed between customer and merchant. However, this\n"
+#~ " information would typically not include the identity\n"
+#~ " of the customer.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The amounts of digital coins legitimately withdrawn\n"
+#~ " by customers from the exchange, the value of\n"
+#~ " non-redeemed digital coins"
+#~ " in customer's wallets, the\n"
+#~ " value and corresponding wire details of deposit\n"
+#~ " operations performed by merchants with the exchange,\n"
+#~ " and the income of the"
+#~ " exchange from transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is an electronic payment system under development at\n"
+#~ " <a href=\"http://www.inria.fr/\";>Inria</a>. "
+#~ "We expect to make it\n"
+#~ " operational in 2017. You can "
+#~ "learn about Taler on this website,\n"
+#~ ""
+#~ " try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+#~ " our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+#~ " href=\"https://api.taler.net\";>API</a> documentation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is easy to integrate with existing Web\n"
+#~ " applications. Payments are cryptographically\n"
+#~ " secured and are confirmed within milliseconds with\n"
+#~ " extremely low transaction costs.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler does not introduce a new currency. Taler\n"
+#~ " uses a digital wallet storing coins and payment service\n"
+#~ " providers with escrow accounts in existing currencies.\n"
+#~ " Thus, Taler's cryptographic coins correspond to existing\n"
+#~ " currencies, such as US Dollars, Euros or even Bitcoins.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " By design Taler does not suffer from many classes\n"
+#~ " of security problems such as phishing or counterfeit.\n"
+#~ " Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ " customer due to a fraud-detection false positive.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When using Taler, merchant's revenue is transparent for tax\n"
+#~ " collection authorities. Unlike cash"
+#~ " and most digital currencies,\n"
+#~ " Taler helps prevent black markets. Taler is not suitable for\n"
+#~ " illegal activities.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When you pay with Taler, your identity does not\n"
+#~ " have to be revealed to the merchant. Just like\n"
+#~ " payments in cash, nobody else can track how you\n"
+#~ " spent your electronic money. However, you obtain a\n"
+#~ " legally valid proof of payment.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides protocols and "
+#~ "reference implementations that in\n"
+#~ " principle enables anybody to run"
+#~ " their own payment infrastructure,\n"
+#~ " be it individuals, organizations "
+#~ "or whole countries. Since the\n"
+#~ " reference implementation is a <a"
+#~ " href=\"http://www.gnu.org/\";>GNU</a>\n"
+#~ " package, it will always remain free software.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To pay with Taler, customers install an electronic wallet\n"
+#~ " on their device. Before the "
+#~ "first payment, the wallet's balance must"
+#~ "\n"
+#~ " be charged in the desired "
+#~ "currency by some other means of "
+#~ "payment.</p>\n"
+#~ " <p>Once the wallet is charged, "
+#~ "payments on websites take only one "
+#~ "click,\n"
+#~ " are never falsely rejected by "
+#~ "fraud detection and do not pose "
+#~ "any risk\n"
+#~ " of phishing or identity theft.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ " in the desired currency. We provide supporting software\n"
+#~ " in various programming languages to"
+#~ " make the integration painless.\n"
+#~ " The merchant's backend for Taler transaction processing can run\n"
+#~ " on the merchant's premises or be hosted by a third party.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have created a company, Taler Systems SA in\n"
+#~ " Luxembourg.<br>\n"
+#~ " Please contact <tt>address@hidden</tt>\n"
+#~ " if you want to invest in Taler.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Our <a href=\"about.html\">team</a> "
+#~ "combines world-class business leaders,\n"
+#~ " cryptographers, software engineers, civil-rights\n"
+#~ " activists and academics. We are unified by a vision\n"
+#~ " of how payments should work and the goal of\n"
+#~ " imposing this vision upon the world.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We are currently supported "
+#~ "by <a href=\"http://www.inria.fr/\";>Inria</a>, the"
+#~ " French\n"
+#~ " national institute for research in informatics and\n"
+#~ " automation, and the <a "
+#~ "href=\"https://renewablefreedom.org/\";>Renewable Freedom "
+#~ "Foundation</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " All transactions in Taler "
+#~ "are secured using <a "
+#~ "href=\"bibliography.html\">modern\n"
+#~ " cryptography</a> and trust in all parties is\n"
+#~ " minimized. Financial damage is bounded (for\n"
+#~ " customers, merchants and the exchange) even in the\n"
+#~ " case that systems are compromised and private keys\n"
+#~ " are stolen. Databases can be audited for\n"
+#~ " consistency, resulting in either the detection of\n"
+#~ " compromised systems or the demonstration that\n"
+#~ " participants were honest. Actual transaction costs\n"
+#~ " are fractions of a cent.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The scalable business model for Taler is the operation\n"
+#~ " of the payment service "
+#~ "provider, which converts money from\n"
+#~ " traditional payment systems (MasterCard, SEPA, UPI,\n"
+#~ " Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+#~ " electronic coins in the same currency. The customer\n"
+#~ " can then redeem the electronic coins at a merchant,\n"
+#~ " who can exchange them for money represented using\n"
+#~ " traditional payment systems at the exchange. The\n"
+#~ " exchange charges fees to facilitate the transactions.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The payment service operator runs the <em>Taler exchange</em>.\n"
+#~ " The exchange charges <b>transaction "
+#~ "fees</b> to customers or merchants.\n"
+#~ " Its operational expenses are from"
+#~ " wire transfers with the banking\n"
+#~ " system and the operation of the computing infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is a cost-effective electronic payment system\n"
+#~ " which provides you with cryptographic proof that\n"
+#~ " the payment worked correctly within milliseconds.\n"
+#~ " Your Web customers pay with previously unknown\n"
+#~ " levels of convenience without risk of fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Processing transactions with Taler is fast,\n"
+#~ " allowing you to confirm the transaction with your\n"
+#~ " customer virtually immediately. Your customers\n"
+#~ " will appreciate that they do not have to type in\n"
+#~ " credit card information and play the "verified\n"
+#~ " by" game. By making payments significantly\n"
+#~ " more convenient for your customers, you may be able\n"
+#~ " to use Taler for small transactions that would not\n"
+#~ " work with credit card payments due to the mental\n"
+#~ " overhead for customers.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You will have cryptographic proof of payment from the\n"
+#~ " Taler payment service provider. With Taler you never\n"
+#~ " handle sensitive customer account information and thus\n"
+#~ " do not have to undergo any particular security audits\n"
+#~ " (such as PCI DSS). Your systems will have customer\n"
+#~ " contracts with qualified signatures for all\n"
+#~ " transactions which you can use in court in case of\n"
+#~ " disputes.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software, and you can use the\n"
+#~ " liberally-licensed reference code as a starting\n"
+#~ " point to integrate Taler into your services. To use\n"
+#~ " Taler, you do not need to pay license fees, and the\n"
+#~ " free software development model will ensure that\n"
+#~ " you can select from many competing integrators for\n"
+#~ " support.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is uses efficient "
+#~ "cryptographic constructions with low\n"
+#~ " bandwidth and storage "
+#~ "requirements. Combined with Taler's strong"
+#~ "\n"
+#~ " security which makes fraud "
+#~ "impossible, Taler payment service\n"
+#~ " providers can operate with very low overhead and\n"
+#~ " thus offer low transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler can be used for different currencies (such as\n"
+#~ " Euros, US Dollars or Bitcoins) and any amount, limited\n"
+#~ " only by applicable regulatation and what denominations\n"
+#~ " the payment service provider supports.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler prevents tax evasion and money laundering.\n"
+#~ " Taler's protocols are efficient"
+#~ " and do not use wasteful\n"
+#~ " proof-of-work calculations. Taler encourages\n"
+#~ " transparency by providing an open standard and free\n"
+#~ " software reference implementations.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>signs</b> and <b>stores</b> the\n"
+#~ " complete terms of offers "
+#~ "made by the merchant to customers.\n"
+#~ ""
+#~ " For this, the merchant's frontend needs to give the\n"
+#~ " customer's order in a JSON format to the backend.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>validates</b> payments received from\n"
+#~ " the wallet and <b>executes</b> them with the Taler\n"
+#~ " payment service provider (the exchange). For this,\n"
+#~ " the merchant's frontend must pass the payment\n"
+#~ " request through to the Taler backend and check the\n"
+#~ " HTTP status code that is returned.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend can <b>list</b> completed transactions\n"
+#~ " and <b>map</b> wire transfers to sets of business\n"
+#~ " transactions, including the exact terms of each\n"
+#~ " contract.\n"
+#~ " "
+#~ msgstr ""
+
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 76584d5..6f24d16 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-08 10:25+0100\n"
+"POT-Creation-Date: 2017-03-15 11:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: fr\n"
@@ -102,12 +102,6 @@ msgstr ""
msgid "Taler System Architecture"
msgstr ""
-#: architecture.html.j2:8
-msgid ""
-"\n"
-" "
-msgstr ""
-
#: bibliography.html.j2:4
msgid "GNU Taler Bibliography"
msgstr ""
@@ -131,69 +125,69 @@ msgstr ""
#: citizens.html.j2:9
msgid ""
-"\n"
-" Taler largely functions like digital cash. You\n"
-" withdraw money from your bank account into your\n"
-" electronic wallet, and can henceforth spend digital\n"
-" cash. The electronic wallet can carry multiple\n"
-" currencies.\n"
-" "
+"Taler largely functions like digital cash. You\n"
+"withdraw money from your bank account into your\n"
+"electronic wallet, and can henceforth spend digital\n"
+"cash. The electronic wallet can carry multiple\n"
+"currencies.\n"
msgstr ""
-#: citizens.html.j2:25
-msgid "Security"
-msgstr "Sécurité"
+#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
+#: merchants.html.j2:41
+msgid "Secure"
+msgstr "Sûr"
#: citizens.html.j2:27
msgid ""
"Taler uses modern cryptography, ensuring that there\n"
-" is no counterfeit. Your digital wallet is safer\n"
-" than your physical wallet. At most, you can lose\n"
-" its contents because your computer or mobile is\n"
-" irreparably damaged or compromised. Unlike a\n"
-" physical wallet, you can make backups to secure\n"
-" against data loss."
+"is no counterfeit. Your digital wallet is safer\n"
+"than your physical wallet. At most, you can lose\n"
+"its contents because your computer or mobile is\n"
+"irreparably damaged or compromised. Unlike a\n"
+"physical wallet, you can make backups to secure\n"
+"against data loss."
msgstr ""
-#: citizens.html.j2:37
-msgid "Privacy"
-msgstr "Confidentialité"
+#: citizens.html.j2:37 index.html.j2:83
+msgid "Private"
+msgstr ""
#: citizens.html.j2:39
msgid ""
-"Your transactions are private, neither the exchange\n"
-" nor merchant needs to learn your identity. There is\n"
-" no need to give out credit card numbers or other\n"
-" sensitive information. The merchant will only be\n"
-" able to do exactly the transaction you agreed to."
+"Your transactions are private, neither the payment\n"
+"service provider nor merchant needs to learn your\n"
+"identity. There is no need to give out credit card\n"
+"numbers or other sensitive information. The merchant\n"
+"will only be able to do exactly the transaction you\n"
+"agreed to."
msgstr ""
#: citizens.html.j2:50
-msgid "Convenience"
-msgstr "Avantage"
+msgid "Convenient"
+msgstr ""
#: citizens.html.j2:52
msgid ""
"You will be able to withdraw money to replenish the\n"
-" digital coins in your wallet using your credit card\n"
-" or wire transfers. Afterwards you can pay with\n"
-" one-click using the Taler wallet, which optionally\n"
-" keeps your transaction history on your computer."
+"digital coins in your wallet using your credit card\n"
+"or wire transfers. Afterwards you can pay with\n"
+"one-click using the Taler wallet, which optionally\n"
+"keeps your transaction history on your computer."
msgstr ""
-#: citizens.html.j2:61
-msgid "Stability"
+#: citizens.html.j2:61 index.html.j2:41
+msgid "Stable"
msgstr ""
#: citizens.html.j2:63
msgid ""
"Coins in your digital wallet will be of the same\n"
-" denomination as the cash in your physical wallet.\n"
-" Taler is not a crypto-currency, so you do not have\n"
-" to worry about cryto-currency related value\n"
-" fluctuations. Banking with Taler is subject to the\n"
-" usual government protections for financial\n"
-" services."
+"denomination as the cash in your physical wallet.\n"
+"Taler is not a crypto-currency, so you do not have\n"
+"to worry about cryto-currency related value\n"
+"fluctuations. Banking with Taler is subject to the\n"
+"usual government protections for financial\n"
+"services."
msgstr ""
#: citizens.html.j2:79
@@ -202,12 +196,10 @@ msgstr ""
#: citizens.html.j2:81
msgid ""
-"\n"
-" We currently provide a <a href=\"wallet.html\">wallet browser "
+"We currently provide a <a href=\"wallet.html\">wallet browser "
"extension</a> for Chromium, Chrome, Firefox, Opera\n"
-" and Edge. Wallets for mobile phones and other platforms will be "
+"and Edge. Wallets for mobile phones and other platforms will be "
"available in the future.\n"
-" "
msgstr ""
#: citizens.html.j2:88
@@ -216,10 +208,8 @@ msgstr ""
#: citizens.html.j2:90
msgid ""
-"\n"
-" You can see how Taler works in practice by visiting our <a "
+"You can see how Taler works in practice by visiting our <a "
"href=\"https://demo.taler.net\";>demo page</a>.\n"
-" "
msgstr ""
#: citizens.html.j2:103
@@ -229,38 +219,37 @@ msgstr ""
#: citizens.html.j2:105
msgid ""
"Customers interact with the Taler system using\n"
-" the Taler wallet:"
+"the Taler wallet:"
msgstr ""
-#: citizens.html.j2:108
+#: citizens.html.j2:110
msgid ""
-"To <b>withdraw</b> electronic coins, the customer transfers funds\n"
-" from his bank account to the Taler exchange. The wire\n"
-" transfer subject must match a code generated by the "
-"customer's\n"
-" wallet. After the wire transfer is complete, the wallet"
-" will\n"
-" automatically withdraw the coins."
+"To <b>withdraw</b> electronic coins, the customer\n"
+"transfers funds from his bank account to the Taler\n"
+"payment service provider (the exchange). The wire\n"
+"transfer subject must match a code identifying the\n"
+"customer's wallet. After the wire transfer is\n"
+"complete, the wallet will automatically withdraw the\n"
+"coins from the exchange."
msgstr ""
-#: citizens.html.j2:114
+#: citizens.html.j2:118
msgid ""
-"To <b>spend</b> electronic coins, a merchant must cause the wallet\n"
-" to display a proposal and ask for one-click "
-"confirmation.\n"
-" Payment is then instant.\n"
-" Transaction histories and digitally signed contracts "
-"can be\n"
-" preserved by the wallet."
+"To <b>spend</b> electronic coins, a merchant must\n"
+"cause the wallet to display a proposal for some\n"
+"purchase. The wallet will ask the customer for\n"
+"one-click confirmation. Payment is then instant.\n"
+"Transaction histories and digitally signed contracts\n"
+"can be preserved by the wallet."
msgstr ""
-#: citizens.html.j2:120
+#: citizens.html.j2:125
msgid ""
"The customer can use the wallet to <b>review</b> his\n"
-" balance. The wallet can contain different currencies,\n"
-" and may be shared across devices. Customers can make\n"
-" backups of the wallet to secure its contents against\n"
-" hardware failures."
+"balance. The wallet can contain different\n"
+"currencies, and may be shared across\n"
+"devices. Customers can make backups of the wallet to\n"
+"secure its contents against hardware failures."
msgstr ""
#: contact.html.j2:6
@@ -273,14 +262,12 @@ msgstr ""
#: contact.html.j2:15
msgid ""
-"\n"
-" An archived, public mailing list for GNU Taler is\n"
-" hosted at\n"
-" <a "
+"An archived, public mailing list for GNU Taler is\n"
+"hosted at\n"
+"<a "
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
" You can send messages to the list\n"
-" at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
-" "
+"at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
msgstr ""
#: contact.html.j2:25
@@ -289,11 +276,9 @@ msgstr ""
#: contact.html.j2:27
msgid ""
-"\n"
-" Team members are generally reachable at\n"
-" <tt>address@hidden</tt>. All of us\n"
-" support receiving GnuPG encrypted e-mails.\n"
-" "
+"Team members are generally reachable at\n"
+"<tt>address@hidden</tt>. All of us\n"
+"support receiving GnuPG encrypted e-mails.\n"
msgstr ""
#: contact.html.j2:36
@@ -302,13 +287,11 @@ msgstr ""
#: contact.html.j2:38
msgid ""
-"\n"
-" We track open feature requests and bugs in our\n"
-" <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
-" which is shared with the GNUnet project.\n"
-" You can also report bugs or feature requests to the\n"
-" mailing list.\n"
-" "
+"We track open feature requests and bugs in our\n"
+"<a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+"which is shared with the GNUnet project.\n"
+"You can also report bugs or feature requests to the\n"
+"mailing list.\n"
msgstr ""
#: contact.html.j2:49
@@ -317,274 +300,254 @@ msgstr ""
#: contact.html.j2:51
msgid ""
-"\n"
-" For non-technical commercial requests, please contact\n"
-" <tt>ceo AT taler.net</tt>.\n"
-" "
+"For non-technical commercial requests, please contact\n"
+"<tt>ceo AT taler.net</tt>.\n"
msgstr ""
#: developers.html.j2:5
msgid "Taler for developers"
msgstr "Taler pour les développeurs"
-#: developers.html.j2:12
+#: developers.html.j2:12 merchants.html.j2:58
msgid "Free"
msgstr "Libre"
#: developers.html.j2:15
msgid ""
-"\n"
-" Taler is free software implementing an open\n"
-" protocol. Anybody is welcome to inspect our code\n"
-" and integrate our reference implementation into\n"
-" their applications. Different components of Taler\n"
-" are being made available under different\n"
-" licenses. The Affero GPLv3+ is used for the\n"
-" exchange, the LGPLv3+ is used for reference code\n"
-" demonstrating integration with merchant platforms,\n"
-" and licenses like Apache/Mozilla/GPLv3+ are used\n"
-" for wallets and related customer-facing software.\n"
-" We are open for constructive suggestions for\n"
-" maximizing the adoption of this libre payment\n"
-" platform.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:34
+"GNU Taler is free software implementing an open\n"
+"protocol. Anybody is welcome to integrate our reference\n"
+"implementation into their applications. Different\n"
+"components of Taler are being made available under\n"
+"different licenses. The Affero GPLv3+ is used for the\n"
+"exchange, the LGPLv3+ is used for reference code\n"
+"demonstrating integration with merchant platforms, and\n"
+"licenses like GPLv3+ are used for\n"
+"wallets and related customer-facing software. We are\n"
+"open for constructive suggestions for maximizing the\n"
+"adoption of this payment platform.\n"
+msgstr ""
+
+#: developers.html.j2:32
msgid "RESTful"
msgstr "Avec REST"
-#: developers.html.j2:37
+#: developers.html.j2:35
msgid ""
-"\n"
-" Taler is designed to work on the Internet. To\n"
-" ensure that Taler payments can work with\n"
-" restrictive network setups, Taler uses a RESTful\n"
-" protocol over HTTP or HTTPS. Taler's security does\n"
-" not depend upon the use of HTTPS, but obviously\n"
-" merchants may choose to offer HTTPS for consistency\n"
-" and because it generally is better for privacy\n"
-" compared to HTTP. Taler uses JSON to encode\n"
-" structure data, making it easy to integrate Taler\n"
-" with existing Web applications. Taler's protocol\n"
-" is documented in\n"
-" detail <a href=\"https://api.taler.net/\";>here</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:60
+"Taler is designed to work on the Internet. To\n"
+"ensure that Taler payments can work with\n"
+"restrictive network setups, Taler uses a RESTful\n"
+"protocol over HTTP or HTTPS. Taler's security does\n"
+"not depend upon the use of HTTPS, but obviously\n"
+"merchants may choose to offer HTTPS for consistency\n"
+"and because it generally is better for privacy\n"
+"compared to HTTP. Taler uses JSON to encode\n"
+"structure data, making it easy to integrate Taler\n"
+"with existing Web applications. Taler's protocol\n"
+"is documented in\n"
+"detail at <a href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+msgstr ""
+
+#: developers.html.j2:58
msgid "Code"
msgstr "Code"
-#: developers.html.j2:63
+#: developers.html.j2:61
msgid ""
-"\n"
-" Taler is currently primarily developed by a\n"
-" research team at Inria and GNUnet e.V. However,\n"
-" contributions from anyone are welcome. Our Git\n"
-" repositories can be cloned using the Git and HTTP\n"
-" access methods against <tt>git.taler.net</tt> with\n"
-" the name of the respective repository. A list of\n"
-" public repositories can be found in\n"
-" our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:76
+"Taler is currently primarily developed by a\n"
+"research team at <a href=\"http://www.inria.fr/\";>Inria</a> and\n"
+"<a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+"contributions from anyone are welcome. Our Git\n"
+"repositories can be cloned using the Git and HTTP\n"
+"access methods against <tt>git.taler.net</tt> with\n"
+"the name of the respective repository. A list of\n"
+"repositories can be found in\n"
+"our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+msgstr ""
+
+#: developers.html.j2:75
msgid "Documentation"
msgstr "Documentation"
-#: developers.html.j2:79
+#: developers.html.j2:78
msgid ""
-"\n"
-" In addition to this website,\n"
-" the <a href=\"https://git.taler.net/\";>documented\n"
-" code</a> and\n"
-" the <a href=\"https://api.taler.net/\";>API\n"
-" documentation</a>, we are in the process of\n"
-" preparing a comprehensive design document which\n"
-" will be published here soon.\n"
-" "
+"In addition to this website, the <a\n"
+"href=\"https://git.taler.net/\";>documented code</a> and\n"
+"the <a href=\"https://api.taler.net/\";>API\n"
+"documentation</a>. Technical papers can be found in\n"
+"our <a href=\"bibliography.html\">bibliography</a>.\n"
msgstr ""
-#: developers.html.j2:91
+#: developers.html.j2:88
msgid "Discussion"
msgstr "Discussion"
-#: developers.html.j2:93
+#: developers.html.j2:91
msgid ""
"We have a mailing list for developer discussions.\n"
-" You can subscribe to it or read the list archive at\n"
-" <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"You can subscribe to or read the list archive at\n"
+"<a "
+"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"\n"
msgstr ""
-#: developers.html.j2:100
+#: developers.html.j2:101
msgid "Regression Testing"
msgstr "Tests de régression"
-#: developers.html.j2:102
+#: developers.html.j2:104
msgid ""
-"We have\n"
-" <a href='https://buildbot.net/'>Buildbot</a>\n"
-" automation tests to detect regressions and check\n"
-" for portability at\n"
-" <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.\n"
-" "
+"We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+"automation tests to detect regressions and check for\n"
+"portability at <a\n"
+"href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:110
+#: developers.html.j2:113
msgid "Code Coverage Analysis"
msgstr "Mesure de couverture du code"
-#: developers.html.j2:112
+#: developers.html.j2:116
msgid ""
"We use\n"
-" <a "
-"href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-" to analyze the code coverage of our tests, the\n"
-" results are available\n"
-" at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-" "
+"<a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+"to analyze the code coverage of our tests, the\n"
+"results are available\n"
+"at <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:120
+#: developers.html.j2:126
msgid "Performance Analysis"
msgstr "Analyse de performances"
-#: developers.html.j2:122
+#: developers.html.j2:129
msgid ""
"We\n"
-" use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
-" for performance regression analysis of the exchange\n"
-" backend\n"
-" at <a "
-"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-" "
+"use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+"for performance regression analysis of the exchange\n"
+"backend\n"
+"at <a href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:136
+#: developers.html.j2:145
msgid "Taler system overview"
msgstr "Vue d'ensemble de Taler"
-#: developers.html.j2:138
+#: developers.html.j2:148
msgid ""
"The Taler system consists of protocols executed among\n"
-" a number of actors with the help\n"
-" of <a href='https://www.fsf.org/'>Free Software</a>\n"
-" as illustrated in the illustration on the right.\n"
-" Typical transactions involve the following steps: "
+"a number of actors as illustrated in the illustration on the right.\n"
+"Typical transactions involve the following steps:\n"
msgstr ""
-#: developers.html.j2:147
+#: developers.html.j2:158
msgid ""
"A customer instructs his <b>bank</b> to\n"
-" transfer funds from his account to the Taler\n"
-" exchange (top left). In the subject of the\n"
-" transaction, he includes an authentication\n"
-" token from his electronic <b>wallet</b>. In\n"
-" Taler terminology, the customer creates a\n"
-" reserve at the exchange. "
+"transfer funds from his account to the Taler\n"
+"exchange (top left). In the subject of the\n"
+"transaction, he includes an authentication\n"
+"token from his electronic <b>wallet</b>. In\n"
+"Taler terminology, the customer creates a\n"
+"reserve at the exchange.\n"
msgstr ""
-#: developers.html.j2:155
+#: developers.html.j2:170
msgid ""
"Once the exchange has received the wire\n"
-" transfer, it allows the customer's electronic\n"
-" wallet to <b>withdraw</b> electronic coins.\n"
-" The electronic coins are digital\n"
-" representations of the original currency from\n"
-" the transfer. It is important to note that the\n"
-" exchange does not learn the "serial\n"
-" numbers" of the coins created in this\n"
-" process, so it cannot tell later which customer\n"
-" purchased what at which merchant. The use of\n"
-" Taler does not change the currency or the total\n"
-" value of the funds (except for fees which the\n"
-" exchange may charge for the service). "
+"transfer, it allows the customer's electronic\n"
+"wallet to <b>withdraw</b> electronic coins.\n"
+"The electronic coins are digital\n"
+"representations of the original currency from\n"
+"the transfer. It is important to note that the\n"
+"exchange does not learn the "serial\n"
+"numbers" of the coins created in this\n"
+"process, so it cannot tell later which customer\n"
+"purchased what at which merchant. The use of\n"
+"Taler does not change the currency or the total\n"
+"value of the funds (except for fees which the\n"
+"exchange may charge for the service).\n"
msgstr ""
-#: developers.html.j2:170
+#: developers.html.j2:188
msgid ""
"Once the customer has the digital coins in his\n"
-" wallet, the wallet can be used to <b>spend</b>\n"
-" the coins with merchant portals that support\n"
-" the Taler payment system and accept the\n"
-" respective exchange as a business partner\n"
-" (bottom arrow). This creates a digital contract\n"
-" signed by the customer's coins and the\n"
-" merchant. If necessary, the customer can later\n"
-" use this digitally signed contract in a court\n"
-" of law to prove the exact terms of the contract\n"
-" and that he paid the respective amount. The\n"
-" customer does not learn the banking details of\n"
-" the merchant, and Taler does not require the\n"
-" merchant to learn the identity of the\n"
-" customer. Naturally, the customer can spend any\n"
-" fraction of his digital coins (the system takes\n"
-" care of customers getting change). "
-msgstr ""
-
-#: developers.html.j2:188
+"wallet, the wallet can be used to <b>spend</b>\n"
+"the coins with merchant portals that support\n"
+"the Taler payment system and accept the\n"
+"respective exchange as a business partner\n"
+"(bottom arrow). This creates a digital contract\n"
+"signed by the customer's coins and the\n"
+"merchant. If necessary, the customer can later\n"
+"use this digitally signed contract in a court\n"
+"of law to prove the exact terms of the contract\n"
+"and that he paid the respective amount. The\n"
+"customer does not learn the banking details of\n"
+"the merchant, and Taler does not require the\n"
+"merchant to learn the identity of the\n"
+"customer. Naturally, the customer can spend any\n"
+"fraction of his digital coins (the system takes\n"
+"care of customers getting change).\n"
+msgstr ""
+
+#: developers.html.j2:210
msgid ""
"Merchants receiving digital\n"
-" coins <b>deposit</b> the respective receipts\n"
-" that resulted from the contract signing with\n"
-" the customer at the exchange to redeem the\n"
-" coins. The deposit step does not reveal the\n"
-" details of the contract between the customer\n"
-" and the merchant or the identity of the\n"
-" customer to the exchange in any way. However,\n"
-" the exchange does learn the identity of the\n"
-" merchant via the provided bank routing\n"
-" information. The merchant can, for example\n"
-" when compelled by the state for taxation,\n"
-" provide information linking the individual\n"
-" deposit to the respective contract signed by\n"
-" the customer. Thus, the exchange's database\n"
-" allows the state to enforce that merchants pay\n"
-" applicable taxes (and do not engage in illegal\n"
-" contracts). "
-msgstr ""
-
-#: developers.html.j2:207
+"coins <b>deposit</b> the respective claims\n"
+"that resulted from the contract signing with\n"
+"the customer at the exchange to redeem the\n"
+"coins. The deposit step does not reveal the\n"
+"details of the contract between the customer\n"
+"and the merchant or the identity of the\n"
+"customer to the exchange in any way. However,\n"
+"the exchange does learn the identity of the\n"
+"merchant via the provided bank routing\n"
+"information. The merchant can, for example\n"
+"when compelled by the state for taxation,\n"
+"provide information linking the individual\n"
+"deposit to the respective contract signed by\n"
+"the customer. Thus, the exchange's database\n"
+"allows the state to enforce that merchants pay\n"
+"applicable taxes (and do not engage in illegal\n"
+"contracts).\n"
+msgstr ""
+
+#: developers.html.j2:233
msgid ""
"Finally, the exchange transfers funds\n"
-" corresponding to the digital coins redeemed by\n"
-" the merchants to the merchant's <b>bank</b>\n"
-" account. The exchange may combine multiple\n"
-" small transactions into one larger bank\n"
-" transfer. The merchant can query the exchange\n"
-" about the relationship between the bank\n"
-" transfers and the individual claims that were\n"
-" deposited. "
+"corresponding to the digital coins redeemed by\n"
+"the merchants to the merchant's <b>bank</b>\n"
+"account. The exchange may combine multiple\n"
+"small transactions into one larger bank\n"
+"transfer. The merchant can query the exchange\n"
+"about the relationship between the bank\n"
+"transfers and the individual claims that were\n"
+"deposited.\n"
msgstr ""
-#: developers.html.j2:217
+#: developers.html.j2:247
msgid ""
"Most importantly, the exchange keeps\n"
-" cryptographic proofs that allow it to\n"
-" demonstrate that it is operating correctly to\n"
-" third parties. The system requires an\n"
-" external <b>auditor</b>, such as a\n"
-" government-appointed financial regulatory body,\n"
-" to frequently verify the exchange's databases\n"
-" and check that its bank balance matches the\n"
-" total value of the remaining coins in\n"
-" circulation. "
+"cryptographic proofs that allow it to\n"
+"demonstrate that it is operating correctly to\n"
+"third parties. The system requires an\n"
+"external <b>auditor</b>, such as a\n"
+"government-appointed financial regulatory body,\n"
+"to frequently verify the exchange's databases\n"
+"and check that its bank balance matches the\n"
+"total value of the remaining coins in\n"
+"circulation.\n"
msgstr ""
-#: developers.html.j2:228
+#: developers.html.j2:262
msgid ""
"Without the auditor, the exchange operators\n"
-" could embezzle funds they are holding in\n"
-" reserve. Customers and merchants cannot cheat\n"
-" each other or the exchange. If any party's\n"
-" computers are compromised, the financial damage\n"
-" is limited to the respective party and\n"
-" proportional to the funds they have in\n"
-" circulation during the period of the\n"
-" compromise. "
+"could embezzle funds they are holding in\n"
+"reserve. Customers and merchants cannot cheat\n"
+"each other or the exchange. If any party's\n"
+"computers are compromised, the financial damage\n"
+"is limited to the respective party and\n"
+"proportional to the funds they have in\n"
+"circulation during the period of the\n"
+"compromise.\n"
msgstr ""
#: faq.html.j2:5
@@ -593,27 +556,28 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"\n"
"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
"Taler is not based on proof-of-work or any other distributed consensus\n"
"mechanism. Instead Taler is based on blind signatures.</p>\n"
-"\n"
-"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
-"wallet (with an appropriate exchange), which would give some benefits\n"
-"over plain Bitcoin, such as instant confirmation times.</p>\n"
msgstr ""
-#: faq.html.j2:16
+#: faq.html.j2:11
+msgid ""
+"<p>It would be possible, however, to withdraw coins denominated in\n"
+"Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+"would give some benefits over plain Bitcoin, such as instant\n"
+"confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:18
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:17
+#: faq.html.j2:19
msgid ""
-"\n"
-"<p>Your wallet stores digital coins that were blindly signed by an\n"
-"exchange, and thus ultimately your computer holds your balance. The\n"
-"exchange keeps funds matching all unspent coins in an escrow bank\n"
-"account.</p>\n"
+"<p>Your wallet stores digital coins and thus ultimately your computer\n"
+"holds your balance. The exchange keeps funds matching all unspent\n"
+"coins in an escrow bank account.</p>\n"
msgstr ""
#: faq.html.j2:25
@@ -622,385 +586,355 @@ msgstr ""
#: faq.html.j2:26
msgid ""
-"\n"
"<p>Since the digital coins of value in your wallet are anonymized, the\n"
"exchange can not assist you in recovering a lost or stolen wallet.\n"
"Just like with a physical wallet for cash, you are responsible for\n"
"keeping it safe.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:32
+msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or\n"
"keeping the balance reasonably low.</p>\n"
-"\n"
-"<p>In case of a compromise of one of your devices, an attacker that\n"
-"spends coins on your behalf will allow you to detect that your device\n"
-"has been compromised.</p>\n"
msgstr ""
-#: faq.html.j2:41
+#: faq.html.j2:37
+msgid "What if my computer is hacked?"
+msgstr ""
+
+#: faq.html.j2:38
+msgid ""
+"<p>In case of a compromise of one of your devices, an attacker can\n"
+"spend coins from your wallet. Checking your balance might reveal\n"
+"to you that your device has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:44
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:42
+#: faq.html.j2:45
msgid ""
-"\n"
"<p>If your friend provides goods or services for you in exchange for a\n"
"payment, they can easily set up a Taler merchant and receive the\n"
"payment in their bank account.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:50
+msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins\n"
"among friends directly as well.</p>\n"
msgstr ""
-#: faq.html.j2:52
+#: faq.html.j2:56
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:53
+#: faq.html.j2:57
msgid ""
-"\n"
"<p>Taler wallets can store digital coins corresponding to multiple\n"
"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+msgstr ""
+
+#: faq.html.j2:61
+msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
+#: faq.html.j2:65
+msgid "How does Taler protect my privacy?"
+msgstr ""
+
+#: faq.html.j2:66
+msgid ""
+"<p>Your wallet stores digital coins that are <a\n"
+"href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+"signed</a> by an exchange. The use of a blind signature protects your\n"
+"privacy as it prevents the exchange from knowing which coin it signed\n"
+"for which customer.</p>\n"
"\n"
-"<p>Taler currently does not offer conversion between currencies.</p>\n"
msgstr ""
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
-#: governments.html.j2:7
+#: governments.html.j2:8
msgid ""
-"Taler provides accountability to ensure business\n"
-" accepting payments operate legally, while also\n"
-" respecting civil liberties of citizens spending\n"
-" digital cash. Taler is a commons, a payment system\n"
-" based on open standards and free software. Taler\n"
-" needs governments to set a financial framework and\n"
-" to act as trusted regulators. Taler contributes to\n"
-" digital sovereignty in the critical financial\n"
-" infrastructure."
+"Taler provides accountability to ensure business operate\n"
+"legally, while also respecting civil liberties of\n"
+"citizens. Taler is a payment system based on\n"
+"open standards and free software. Taler needs\n"
+"governments as they set a financial framework and act as\n"
+"trusted regulators. Taler contributes to digital\n"
+"sovereignty in the critical financial infrastructure.\n"
msgstr ""
-#: governments.html.j2:23 index.html.j2:69
+#: governments.html.j2:25 index.html.j2:70
msgid "Taxable"
msgstr "Taxable"
-#: governments.html.j2:25
+#: governments.html.j2:28
msgid ""
-"Taler was\n"
-" built with the goal of fighting corruption and supporting "
-"taxation.\n"
-" With Taler, the receiver of any form of payment is\n"
-" easily identified by the government, and the merchant\n"
-" can be compelled to provide the contract that was accepted\n"
-" by the customer. Governments can use this data to\n"
-" tax businesses and individuals based on their\n"
-" income, making tax evasion and black markets less\n"
-" viable."
+"Taler was built with the goal of fighting corruption and\n"
+"supporting taxation. With Taler, the receiver of any\n"
+"form of payment is easily identified by the government,\n"
+"and the merchant can be compelled to provide the contract\n"
+"that was accepted by the customer. Governments can use\n"
+"this data to tax businesses and individuals based on\n"
+"their income, making tax evasion and black markets less\n"
+"viable.\n"
msgstr ""
-#: governments.html.j2:35
+#: governments.html.j2:41
msgid ""
-"Thus, despite offering anonymity for citizens\n"
-" spending digital cash to buy goods and services,\n"
-" Taler also ensures that the state can observe\n"
-" incoming funds. This can be used to ensure\n"
-" businesses engage only in legal activities, and do\n"
-" not evade income tax, sales tax or value-added tax.\n"
-" However, this observational capability does not\n"
-" extend to the immediate personal domain. In\n"
-" particular, sharing access to funds within a family\n"
-" or synchronizing wallets across multiple devices is not\n"
-" subject to monitoring."
+"Thus, despite offering anonymity for citizens spending\n"
+"digital cash to buy goods and services, Taler also\n"
+"ensures that the state can observe incoming funds. This\n"
+"can be used to ensure businesses engage only in legal\n"
+"activities, and do not evade income tax, sales tax or\n"
+"value-added tax. However, this observational capability\n"
+"does not extend to the immediate personal domain. In\n"
+"particular, monitoring does not cover shared access to\n"
+"funds with trusted friends and family, or synchronizing\n"
+"wallets across multiple devices.\n"
msgstr ""
-#: governments.html.j2:48 merchants.html.j2:33
-msgid "Secure"
-msgstr "Sûr"
-
-#: governments.html.j2:50
+#: governments.html.j2:61
msgid ""
-"Taler's payments are cryptographically\n"
-" secured. Thus, customers, merchants and the\n"
-" exchange can mathematically demonstrate their\n"
-" lawful behavior in court in case of\n"
-" disputes. Financial damages are strictly limited,\n"
-" improving economic security for individuals,\n"
-" merchants, the exchange and the state."
+"Taler's payments are cryptographically secured. Thus,\n"
+"customers, merchants and the Taler payment service provider\n"
+"(the exchange) can mathematically\n"
+"demonstrate their lawful behavior in court in case of\n"
+"disputes. Financial damages are strictly limited,\n"
+"improving economic security for individuals, merchants,\n"
+"the exchange and the state.\n"
msgstr ""
-#: governments.html.j2:58
+#: governments.html.j2:73
msgid ""
-"By design, the Taler payment service provider is\n"
-" subject to financial regulation. Financial\n"
-" regulation and regular audits are critical to\n"
-" establish trust. In particular, the Taler design\n"
-" mandates the existence of an independent auditor\n"
-" who checks cryptographic proofs that accumulate at\n"
-" the payment service provider to ensure that the\n"
-" escrow account is managed honestly. This ensures\n"
-" that the payment service provider does not threaten\n"
-" the economy due to fraud."
+"As a payment service provider, the Taler exchange is\n"
+"subject to financial regulation. Financial regulation and\n"
+"regular audits are critical to establish trust. In\n"
+"particular, the Taler design mandates the existence of an\n"
+"independent auditor who checks cryptographic proofs that\n"
+"accumulate at the exchange to ensure that the escrow\n"
+"account is managed honestly. This ensures that the\n"
+"exchange does not threaten the economy due to fraud.\n"
msgstr ""
-#: governments.html.j2:72 index.html.j2:95
+#: governments.html.j2:88 index.html.j2:96
msgid "Libre"
msgstr "Libre"
-#: governments.html.j2:74
+#: governments.html.j2:91
msgid ""
-"Taler is free software implementing an open\n"
-" protocol standard. Thus, Taler will enable\n"
-" competition and avoid the monopolization of payment\n"
-" systems that threatens global political and\n"
-" financial stability today."
+"Taler is free software implementing an open protocol\n"
+"standard. Thus, Taler will enable competition and avoid\n"
+"the monopolization of payment systems that threatens\n"
+"global political and financial stability today.\n"
msgstr ""
-#: governments.html.j2:83
+#: governments.html.j2:101
msgid "Efficient"
msgstr "Efficace"
-#: governments.html.j2:85
+#: governments.html.j2:104
msgid ""
"Taler has an efficient design. Unlike\n"
-" timeline-based payment systems, such as Bitcoin,\n"
-" Taler will not threaten the availability of\n"
-" national electric grids or (significantly)\n"
-" contribute to environmental pollution."
+"Blockchain-based payment systems, such as Bitcoin,\n"
+"Taler will not threaten the availability of\n"
+"national electric grids or (significantly)\n"
+"contribute to environmental pollution.\n"
msgstr ""
-#: governments.html.j2:99
+#: governments.html.j2:120
msgid "Taler and regulation"
msgstr ""
-#: governments.html.j2:101
-msgid "Anti-money laundering (AML)"
+#: governments.html.j2:122
+msgid "Anti money laundering (AML)"
msgstr ""
-#: governments.html.j2:102
+#: governments.html.j2:123
msgid ""
"With Taler, income is visible and can be tied to the contract signed by "
"both parties."
msgstr ""
-#: governments.html.j2:103
-msgid "Know-your-customer (KYC)"
+#: governments.html.j2:124
+msgid "Know your customer (KYC)"
msgstr ""
-#: governments.html.j2:104
+#: governments.html.j2:125
msgid ""
"In Taler, payer and payee are known by their bank accounts when "
"withdrawing or depositing coins respectively"
msgstr ""
-#: governments.html.j2:105
-msgid "Privacy-by-design (GDPR)"
+#: governments.html.j2:126
+msgid "General Data Protection Regulation (GDPR)"
msgstr ""
-#: governments.html.j2:106
+#: governments.html.j2:127
msgid ""
"Taler cryptographically protects citizen's privacy, and by design "
"implements data minimization and privacy by default."
msgstr ""
-#: governments.html.j2:107
-msgid "Competitive banking (PSD2)"
+#: governments.html.j2:128
+msgid "Payment Services Directive (PSD2)"
msgstr ""
-#: governments.html.j2:108
+#: governments.html.j2:129
msgid ""
-"Taler provides an open standard with public APIs contributing to a level "
-"playing field."
+"Taler provides an open standard with public APIs contributing to a "
+"competitive banking sector."
msgstr ""
-#: governments.html.j2:116
+#: governments.html.j2:137
msgid "Taler provides privacy and accountability"
msgstr ""
-#: governments.html.j2:118
+#: governments.html.j2:140
msgid ""
"Taler assumes governments can observe traditional wire transfers\n"
-" entering and leaving the Taler payment system. Starting with "
-"the\n"
-" wire transfers, governments can obtain: "
+"entering and leaving the Taler payment system. Starting with the\n"
+"wire transfers, governments can obtain:\n"
msgstr ""
-#: governments.html.j2:123
+#: governments.html.j2:148
msgid ""
"The total amount of digital currency withdrawn by a\n"
-" customer. The government can impose limits on how much\n"
-" digital cash a customer can withdraw within a\n"
-" given time frame."
+"customer. The government can impose limits on how much\n"
+"digital cash a customer can withdraw within a\n"
+"given time frame.\n"
msgstr ""
-#: governments.html.j2:128
+#: governments.html.j2:157
msgid ""
"The income received by any merchant via the Taler\n"
-" system."
+"system.\n"
msgstr ""
-#: governments.html.j2:131
+#: governments.html.j2:164
msgid ""
-"The exact details of the underlying\n"
-" contract that was signed between customer and\n"
-" merchant. However, this information would\n"
-" typically not include the identity of the\n"
-" customer."
+"The exact details of the underlying contract that was\n"
+"signed between customer and merchant. However, this\n"
+"information would typically not include the identity\n"
+"of the customer.\n"
msgstr ""
-#: governments.html.j2:137
+#: governments.html.j2:174
msgid ""
-"The amounts of\n"
-" digital coins legitimately withdrawn by\n"
-" customers from the exchange, the value of\n"
-" non-redeemed digital coins in customer's\n"
-" wallets, the value and corresponding wire\n"
-" details of deposit operations performed by\n"
-" merchants with the exchange, and the income of\n"
-" the exchange from transaction fees."
+"The amounts of digital coins legitimately withdrawn\n"
+"by customers from the exchange, the value of\n"
+"non-redeemed digital coins in customer's wallets, the\n"
+"value and corresponding wire details of deposit\n"
+"operations performed by merchants with the exchange,\n"
+"and the income of the exchange from transaction fees.\n"
msgstr ""
#: index.html.j2:10
-msgid "Independent One-Click Payments!"
+msgid "One-Click Cash Payments!"
msgstr ""
-#: index.html.j2:12
+#: index.html.j2:13
msgid ""
-"\n"
-" Taler is an electronic payment system under\n"
-" development\n"
-" at <a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make "
-"it operational in 2017.\n"
-" You can learn about Taler on this website, try the <a "
-"href=\"https://demo.taler.net\";>demo</a>\n"
-" and look at our <a href=\"https://docs.taler.net\";>developer</a> "
-"and <a href=\"https://api.taler.net\";>API</a> documentation.\n"
-" "
-msgstr ""
-
-#: index.html.j2:26
-msgid "Practical"
-msgstr ""
-
-#: index.html.j2:29
-msgid ""
-"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
+"GNU Taler is an electronic payment system under development at\n"
+"<a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make it\n"
+"operational in 2017. You can learn about Taler on this website,\n"
+"try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+"our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+"href=\"https://api.taler.net\";>API</a> documentation.\n"
msgstr ""
-#: index.html.j2:39
-msgid "Stable"
+#: index.html.j2:28
+msgid "Practical"
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:31
msgid ""
-"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+"Taler is easy to integrate with existing Web\n"
+"applications. Payments are cryptographically\n"
+"secured and are confirmed within milliseconds with\n"
+"extremely low transaction costs.\n"
msgstr ""
-#: index.html.j2:54
-msgid "Security-focused"
-msgstr ""
-
-#: index.html.j2:57
+#: index.html.j2:44
msgid ""
-"\n"
-" By design Taler does not suffer from many classes\n"
-" of security problems such as phishing or counterfeit.\n"
-" Despite its security features, Taler never rejects a legitimate\n"
-" customer due to a fraud-detection false positive.\n"
-" "
+"Taler does not introduce a new currency. Taler\n"
+"uses a digital wallet storing coins and payment service\n"
+"providers with escrow accounts in existing currencies.\n"
+"Thus, Taler's cryptographic coins correspond to existing\n"
+"currencies, such as US Dollars, Euros or even Bitcoins.\n"
msgstr ""
-#: index.html.j2:72
+#: index.html.j2:58
msgid ""
-"\n"
-" When using Taler, merchants cannot hide their income from tax\n"
-" collection authorities. Unlike cash and most digital currencies,"
-"\n"
-" Taler helps prevent black markets. Taler is not suitable for\n"
-" illegal activities.\n"
-" "
+"By design Taler does not suffer from many classes\n"
+"of security problems such as phishing or counterfeit.\n"
+"Despite its security features, Taler never rejects a legitimate\n"
+"customer due to a fraud-detection false positive.\n"
msgstr ""
-#: index.html.j2:82
-msgid "Privacy-friendly"
+#: index.html.j2:73
+msgid ""
+"When using Taler, merchant's revenue is transparent for tax\n"
+"collection authorities. Unlike cash and most digital currencies,\n"
+"Taler helps prevent black markets. Taler is not suitable for\n"
+"illegal activities.\n"
msgstr ""
-#: index.html.j2:84
+#: index.html.j2:85
msgid ""
-"\n"
-" When you pay with Taler, your identity does not\n"
-" have to be revealed to the merchant. Just like\n"
-" payments in cash, nobody else can track how you\n"
-" spent your electronic money. However, you obtain a\n"
-" legally valid proof of payment.\n"
-" "
+"When you pay with Taler, your identity does not\n"
+"have to be revealed to the merchant. Just like\n"
+"payments in cash, nobody else can track how you\n"
+"spent your electronic money. However, you obtain a\n"
+"legally valid proof of payment.\n"
msgstr ""
-#: index.html.j2:98
+#: index.html.j2:99
msgid ""
-"\n"
-" Taler provides protocols and reference implementations that in\n"
-" principle enables anybody to run their own payment "
-"infrastructure,\n"
-" be it individuals, organizations or whole countries. Since the\n"
-" reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a>\n"
-" package, it will always remain free software.\n"
-" "
+"Taler provides protocols and reference implementations that in\n"
+"principle enables anybody to run their own payment infrastructure,\n"
+"be it individuals, organizations or whole countries. Since the\n"
+"reference implementation is a <a href=\"http://www.gnu.org/\";>GNU</a>\n"
+"package, it will always remain free software.\n"
msgstr ""
-#: index.html.j2:115
+#: index.html.j2:116
msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:116
+#: index.html.j2:117
msgid ""
-"\n"
-" <p>To pay with Taler, customers install an electronic wallet\n"
-" on their device. Before the first payment, the wallet's balance must"
-"\n"
-" be charged in the desired currency by some other means of "
-"payment.</p>\n"
-" <p>Once the wallet is charged, payments on websites take only one "
-"click,\n"
-" are never falsely rejected by fraud detection and do not post any "
-"risk\n"
-" of phishing or identity theft.</p>\n"
-" "
+"<p>To pay with Taler, customers install an electronic wallet\n"
+"on their device. Before the first payment, the wallet's balance must\n"
+"be charged in the desired currency by some other means of payment.</p>\n"
+"<p>Once the wallet is charged, payments on websites take only one click,\n"
+"are never falsely rejected by fraud detection and do not pose any risk\n"
+"of phishing or identity theft.</p>\n"
msgstr ""
-#: index.html.j2:126
+#: index.html.j2:127
msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:127
+#: index.html.j2:128
msgid ""
-"\n"
-" <p>To receive Taler payments, a merchant needs a bank account\n"
-" in the desired currency. We provide\n"
-" SDKs in various languages to makes the integration painless.\n"
-" The merchant's backend for Taler transaction processing can run\n"
-" on the merchant's premises or hosted.</p>\n"
-" "
+"<p>To receive Taler payments, a merchant needs a bank account\n"
+"in the desired currency. We provide supporting software\n"
+"in various programming languages to make the integration painless.\n"
+"The merchant's backend for Taler transaction processing can run\n"
+"on the merchant's premises or be hosted by a third party.</p>\n"
msgstr ""
-#: index.html.j2:143
+#: index.html.j2:144
msgid "Taler News"
msgstr ""
-#: index.html.j2:147
+#: index.html.j2:148
msgid "Financial News"
msgstr ""
@@ -1010,12 +944,10 @@ msgstr ""
#: investors.html.j2:9
msgid ""
-"\n"
-" We have created a company, Taler Systems SA in\n"
-" Luxembourg.<br>\n"
-" Please contact <tt>address@hidden</tt>\n"
-" if you want to invest in Taler.\n"
-" "
+"We have created a company, Taler Systems SA in\n"
+"Luxembourg.<br>\n"
+"Please contact <tt>address@hidden</tt>\n"
+"if you want to invest in Taler.\n"
msgstr ""
#: investors.html.j2:24
@@ -1024,23 +956,21 @@ msgstr ""
#: investors.html.j2:27
msgid ""
-"\n"
-" Our <a href=\"about.html\">team</a> combines world-class "
-"business leaders,\n"
-" cryptographers, software engineers, civil-rights\n"
-" activists and academics. We are unified by a vision\n"
-" of how payments should work and the goal of\n"
-" imposing this vision upon the world.\n"
-" "
+"Our <a href=\"about.html\">team</a> combines world-class business "
+"leaders,\n"
+"cryptographers, software engineers, civil-rights\n"
+"activists and academics. We are unified by a vision\n"
+"of how payments should work and the goal of\n"
+"imposing this vision upon the world.\n"
msgstr ""
#: investors.html.j2:37
msgid ""
-"\n"
-" We are currently supported by Inria, the French\n"
-" national institute for research in informatics and\n"
-" automation, and the Renewable Freedom Foundation.\n"
-" "
+"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>,"
+" the French\n"
+"national institute for research in informatics and\n"
+"automation, and the <a href=\"https://renewablefreedom.org/\";>Renewable "
+"Freedom Foundation</a>.\n"
msgstr ""
#: investors.html.j2:45
@@ -1049,19 +979,17 @@ msgstr ""
#: investors.html.j2:48
msgid ""
-"\n"
-" All transactions in Taler are secured using <a "
+"All transactions in Taler are secured using <a "
"href=\"bibliography.html\">modern\n"
-" cryptography</a> and trust in all parties is\n"
-" minimized. Financial damage is bounded (for\n"
-" customers, merchants and the exchange) even in the\n"
-" case that systems are compromised and private keys\n"
-" are stolen. Databases can be audited for\n"
-" consistency, resulting in either the detection of\n"
-" compromised systems or the demonstration that\n"
-" participants were honest. Actual transaction costs\n"
-" are fractions of a cent.\n"
-" "
+"cryptography</a> and trust in all parties is\n"
+"minimized. Financial damage is bounded (for\n"
+"customers, merchants and the exchange) even in the\n"
+"case that systems are compromised and private keys\n"
+"are stolen. Databases can be audited for\n"
+"consistency, resulting in either the detection of\n"
+"compromised systems or the demonstration that\n"
+"participants were honest. Actual transaction costs\n"
+"are fractions of a cent.\n"
msgstr ""
#: investors.html.j2:63
@@ -1070,17 +998,15 @@ msgstr ""
#: investors.html.j2:66
msgid ""
-"\n"
-" The scalable business model for Taler is the operation\n"
-" of the payment service provider, which converts money from\n"
-" traditional payment systems (MasterCard, SEPA,\n"
-" Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
-" electronic coins in the same currency. The customer\n"
-" can then redeem the electronic coins at a merchant,\n"
-" who can exchange them for money represented using\n"
-" traditional payment systems at the exchange. The\n"
-" exchange charges fees to facilitate the transactions.\n"
-" "
+"The scalable business model for Taler is the operation\n"
+"of the payment service provider, which converts money from\n"
+"traditional payment systems (MasterCard, SEPA, UPI,\n"
+"Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+"electronic coins in the same currency. The customer\n"
+"can then redeem the electronic coins at a merchant,\n"
+"who can exchange them for money represented using\n"
+"traditional payment systems at the exchange. The\n"
+"exchange charges fees to facilitate the transactions.\n"
msgstr ""
#: investors.html.j2:85
@@ -1093,13 +1019,10 @@ msgstr ""
#: investors.html.j2:110
msgid ""
-"\n"
-" The payment service operator runs the <em>Taler exchange</em>.\n"
-" The exchange charges <b>transaction fees</b> to customers or "
-"merchants.\n"
-" Its operational expenses are from wire transfers with the banking\n"
-" system and the operation of the computing infrastructure.\n"
-" "
+"The payment service operator runs the <em>Taler exchange</em>.\n"
+"The exchange charges <b>transaction fees</b> to customers or merchants.\n"
+"Its operational expenses are from wire transfers with the banking\n"
+"system and the operation of the computing infrastructure.\n"
msgstr ""
#: investors.html.j2:120
@@ -1132,146 +1055,143 @@ msgstr ""
msgid "Advantages for Merchants"
msgstr ""
-#: merchants.html.j2:6
+#: merchants.html.j2:8
msgid ""
"Taler is a cost-effective electronic payment system\n"
-" which provides you with cryptographic proof that\n"
-" the payment worked correctly within milliseconds.\n"
-" Your Web customers pay with previously unknown\n"
-" levels of convenience without risk of fraud."
+"which provides you with cryptographic proof that\n"
+"the payment worked correctly within milliseconds.\n"
+"Your Web customers pay with previously unknown\n"
+"levels of convenience without risk of fraud.\n"
msgstr ""
-#: merchants.html.j2:18
+#: merchants.html.j2:22
msgid "Fast"
msgstr "Rapide"
-#: merchants.html.j2:20
+#: merchants.html.j2:25
msgid ""
"Processing transactions with Taler is fast,\n"
-" allowing you to confirm the transaction with your\n"
-" customer virtually immediately. Your customers\n"
-" will appreciate that they do not have to type in\n"
-" credit card information and play the "verified\n"
-" by" game. By making payments significantly\n"
-" more convenient for your customers, you may be able\n"
-" to use Taler for small transactions that would not\n"
-" work with credit card payments due to the mental\n"
-" overhead for customers."
+"allowing you to confirm the transaction with your\n"
+"customer virtually immediately. Your customers\n"
+"will appreciate that they do not have to type in\n"
+"credit card information and play the "verified\n"
+"by" game. By making payments significantly\n"
+"more convenient for your customers, you may be able\n"
+"to use Taler for small transactions that would not\n"
+"work with credit card payments due to the mental\n"
+"overhead for customers.\n"
msgstr ""
-#: merchants.html.j2:35
+#: merchants.html.j2:44
msgid ""
-"You will have cryptographic proof of payment from\n"
-" the Taler payment service provider. Taler does not\n"
-" require you to undergo any particular security\n"
-" audits (such as PCI DSS), processes or procedures,\n"
-" as you never handle sensitive customer account\n"
-" information. Your systems will have customer\n"
-" contracts with qualified signatures for all\n"
-" transactions which you can use in court in case of\n"
-" disputes."
+"You will have cryptographic proof of payment from the\n"
+"Taler payment service provider. With Taler you never\n"
+"handle sensitive customer account information and thus\n"
+"do not have to undergo any particular security audits\n"
+"(such as PCI DSS). Your systems will have customer\n"
+"contracts with qualified signatures for all\n"
+"transactions which you can use in court in case of\n"
+"disputes.\n"
msgstr ""
-#: merchants.html.j2:47
-msgid "Free Software"
-msgstr "Logiciel Libre"
-
-#: merchants.html.j2:49
+#: merchants.html.j2:61
msgid ""
"Taler is free software, and you can use the\n"
-" liberally-licensed reference code as a starting\n"
-" point to integrate Taler into your services. To use\n"
-" Taler, you do not need to pay license fees, and the\n"
-" free software development model will ensure that\n"
-" you can select from many competent integrators for\n"
-" support."
+"liberally-licensed reference code as a starting\n"
+"point to integrate Taler into your services. To use\n"
+"Taler, you do not need to pay license fees, and the\n"
+"free software development model will ensure that\n"
+"you can select from many competing integrators for\n"
+"support.\n"
msgstr ""
-#: merchants.html.j2:61
-msgid "Low Fees"
-msgstr "Faible Coût "
+#: merchants.html.j2:76
+msgid "Cheap"
+msgstr ""
-#: merchants.html.j2:63
+#: merchants.html.j2:79
msgid ""
-"Taler is designed to minimize the work the exchange\n"
-" needs to perform. Combined with Taler's strong\n"
-" security which prevents fraud, payment service\n"
-" providers can operate with very low overhead and\n"
-" thus low transaction fees."
+"Taler is uses efficient cryptographic constructions with low\n"
+"bandwidth and storage requirements. Combined with Taler's strong\n"
+"security which makes fraud impossible, Taler payment service\n"
+"providers can operate with very low overhead and\n"
+"thus offer low transaction fees.\n"
msgstr ""
-#: merchants.html.j2:71
+#: merchants.html.j2:89
msgid "Flexible"
msgstr "Flexible"
-#: merchants.html.j2:73
+#: merchants.html.j2:92
msgid ""
"Taler can be used for different currencies (such as\n"
-" Euros, US Dollars or Bitcoins) and different\n"
-" payment models limited only by what the payment\n"
-" service provider supports in its interactions."
+"Euros, US Dollars or Bitcoins) and any amount, limited\n"
+"only by applicable regulatation and what denominations\n"
+"the payment service provider supports.\n"
msgstr ""
-#: merchants.html.j2:81
+#: merchants.html.j2:101
msgid "Ethical"
msgstr "Ethique"
-#: merchants.html.j2:83
+#: merchants.html.j2:104
msgid ""
"Taler prevents tax evasion and money laundering.\n"
-" Taler's protocols are efficient and do not waste\n"
-" energy. Taler encourages transparency by providing\n"
-" an open standard and free software reference\n"
-" implementations."
+"Taler's protocols are efficient and do not use wasteful\n"
+"proof-of-work calculations. Taler encourages\n"
+"transparency by providing an open standard and free\n"
+"software reference implementations.\n"
msgstr ""
-#: merchants.html.j2:95
+#: merchants.html.j2:119
#, fuzzy
msgid "Manuals for merchants"
msgstr "Documentation"
-#: merchants.html.j2:98
+#: merchants.html.j2:122
msgid "The GNU Taler merchant backend operator manual"
msgstr ""
-#: merchants.html.j2:101
+#: merchants.html.j2:125
msgid "The GNU Taler Web shop integration tutorial (PHP)"
msgstr ""
-#: merchants.html.j2:104
+#: merchants.html.j2:128
msgid "The GNU Taler Web shop integration tutorial (Python)"
msgstr ""
-#: merchants.html.j2:116
+#: merchants.html.j2:140
msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:118
+#: merchants.html.j2:142
msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:122
+#: merchants.html.j2:147
msgid ""
-"The backend <b>signs</b> and <b>stores</b>\n"
-" proposals made by the merchant to customers.\n"
-" For this, the merchant's frontend needs to give the\n"
-" customer's order in a JSON format to the backend."
+"The backend <b>signs</b> and <b>stores</b> the\n"
+"complete terms of offers made by the merchant to customers.\n"
+"For this, the merchant's frontend needs to give the\n"
+"customer's order in a JSON format to the backend.\n"
msgstr ""
-#: merchants.html.j2:127
+#: merchants.html.j2:156
msgid ""
-"The backend <b>validates</b> and <b>executes</b>\n"
-" payments received from the wallet. The frontend\n"
-" must pass the payment request through to the backend\n"
-" and checks the HTTP status code that is returned."
+"The backend <b>validates</b> payments received from\n"
+"the wallet and <b>executes</b> them with the Taler\n"
+"payment service provider (the exchange). For this,\n"
+"the merchant's frontend must pass the payment\n"
+"request through to the Taler backend and check the\n"
+"HTTP status code that is returned.\n"
msgstr ""
-#: merchants.html.j2:132
+#: merchants.html.j2:167
msgid ""
"The backend can <b>list</b> completed transactions\n"
-" and <b>map</b> aggregated wire transfers to individual\n"
-" business transactions including the exact terms of\n"
-" the contract."
+"and <b>map</b> wire transfers to sets of business\n"
+"transactions, including the exact terms of each\n"
+"contract.\n"
msgstr ""
#: press.html.j2:4
@@ -1457,3 +1377,935 @@ msgstr ""
#~ msgid "The mailinglist"
#~ msgstr ""
+#~ msgid "Security"
+#~ msgstr "Sécurité"
+
+#~ msgid "Privacy"
+#~ msgstr "Confidentialité"
+
+#~ msgid "Convenience"
+#~ msgstr "Avantage"
+
+#~ msgid "Stability"
+#~ msgstr ""
+
+#~ msgid "Anti-money laundering (AML)"
+#~ msgstr ""
+
+#~ msgid "Know-your-customer (KYC)"
+#~ msgstr ""
+
+#~ msgid "Privacy-by-design (GDPR)"
+#~ msgstr ""
+
+#~ msgid "Competitive banking (PSD2)"
+#~ msgstr ""
+
+#~ msgid "Security-focused"
+#~ msgstr ""
+
+#~ msgid "Privacy-friendly"
+#~ msgstr ""
+
+#~ msgid "Free Software"
+#~ msgstr "Logiciel Libre"
+
+#~ msgid "Low Fees"
+#~ msgstr "Faible Coût "
+
+#~ msgid ""
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler largely functions like digital cash. You\n"
+#~ " withdraw money from your bank account into your\n"
+#~ " electronic wallet, and can henceforth spend digital\n"
+#~ " cash. The electronic wallet can carry multiple\n"
+#~ " currencies.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Taler uses modern cryptography, ensuring that there\n"
+#~ " is no counterfeit. Your digital wallet is safer\n"
+#~ " than your physical wallet. At most, you can lose\n"
+#~ " its contents because your computer or mobile is\n"
+#~ " irreparably damaged or compromised. Unlike a\n"
+#~ " physical wallet, you can make backups to secure\n"
+#~ " against data loss."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Your transactions are private, neither the payment\n"
+#~ " service provider nor merchant needs to learn your\n"
+#~ " identity. There is no need to give out credit card\n"
+#~ " numbers or other sensitive information. The merchant\n"
+#~ " will only be able to do exactly the transaction you\n"
+#~ " agreed to."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will be able to withdraw money to replenish the\n"
+#~ " digital coins in your wallet using your credit card\n"
+#~ " or wire transfers. Afterwards you can pay with\n"
+#~ " one-click using the Taler wallet, which optionally\n"
+#~ " keeps your transaction history on your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Coins in your digital wallet will be of the same\n"
+#~ " denomination as the cash in your physical wallet.\n"
+#~ " Taler is not a crypto-currency, so you do not have\n"
+#~ " to worry about cryto-currency related value\n"
+#~ " fluctuations. Banking with Taler is subject to the\n"
+#~ " usual government protections for financial\n"
+#~ " services."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We currently provide a <a "
+#~ "href=\"wallet.html\">wallet browser extension</a> "
+#~ "for Chromium, Chrome, Firefox, Opera\n"
+#~ " and Edge. Wallets for mobile"
+#~ " phones and other platforms will be"
+#~ " available in the future.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You can see how Taler "
+#~ "works in practice by visiting our "
+#~ "<a href=\"https://demo.taler.net\";>demo page</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Customers interact with the Taler system using\n"
+#~ " the Taler wallet:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>withdraw</b> electronic coins, the customer\n"
+#~ " transfers funds from his bank account to the Taler\n"
+#~ " payment service provider (the exchange). The wire\n"
+#~ " transfer subject must match a code identifying the\n"
+#~ " customer's wallet. After the wire transfer is\n"
+#~ " complete, the wallet will automatically withdraw the\n"
+#~ " coins from the exchange."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>spend</b> electronic coins, a merchant must\n"
+#~ " cause the wallet to display a proposal for some\n"
+#~ " purchase. The wallet will ask the customer for\n"
+#~ " one-click confirmation. Payment is then instant.\n"
+#~ " Transaction histories and "
+#~ "digitally signed contracts\n"
+#~ " can be preserved by the wallet."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The customer can use the wallet to <b>review</b> his\n"
+#~ " balance. The wallet can contain different\n"
+#~ " currencies, and may be shared across\n"
+#~ " devices. Customers can make"
+#~ " backups of the wallet to\n"
+#~ " secure its contents against hardware failures."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " An archived, public mailing list for GNU Taler is\n"
+#~ " hosted at\n"
+#~ " <a "
+#~
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ " You can send messages to the "
+#~ "list\n"
+#~ " at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Team members are generally reachable at\n"
+#~ " <tt>address@hidden</tt>. All of us\n"
+#~ " support receiving GnuPG encrypted e-mails.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We track open feature requests and bugs in our\n"
+#~ " <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+#~ " which is shared with the GNUnet project.\n"
+#~ " You can also report bugs or feature requests to the\n"
+#~ " mailing list.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " For non-technical commercial requests, please contact\n"
+#~ " <tt>ceo AT taler.net</tt>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is free software implementing an open\n"
+#~ " protocol. Anybody is welcome"
+#~ " to integrate our reference\n"
+#~ " implementation into their applications. Different\n"
+#~ " components of Taler are being made available under\n"
+#~ " different licenses. The Affero GPLv3+ is used for the\n"
+#~ " exchange, the LGPLv3+ is used for reference code\n"
+#~ " demonstrating integration with merchant platforms, and\n"
+#~ " licenses like GPLv3+ are used for\n"
+#~ " wallets and related customer-facing software. We are\n"
+#~ " open for constructive suggestions for maximizing the\n"
+#~ " adoption of this payment platform.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is designed to work on the Internet. To\n"
+#~ " ensure that Taler payments can work with\n"
+#~ " restrictive network setups, Taler uses a RESTful\n"
+#~ " protocol over HTTP or HTTPS. Taler's security does\n"
+#~ " not depend upon the use of HTTPS, but obviously\n"
+#~ " merchants may choose to offer HTTPS for consistency\n"
+#~ " and because it generally is better for privacy\n"
+#~ " compared to HTTP. Taler uses JSON to encode\n"
+#~ " structure data, making it easy to integrate Taler\n"
+#~ " with existing Web applications. Taler's protocol\n"
+#~ " is documented in\n"
+#~ " detail at <a "
+#~ "href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is currently primarily developed by a\n"
+#~ " research team at <a "
+#~ "href=\"http://www.inria.fr/\";>Inria</a> and\n"
+#~ " <a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+#~ " contributions from anyone are welcome. Our Git\n"
+#~ " repositories can be cloned using the Git and HTTP\n"
+#~ " access methods against <tt>git.taler.net</tt> with\n"
+#~ " the name of the respective repository. A list of\n"
+#~ " repositories can be found in\n"
+#~ " our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " In addition to this website, the <a\n"
+#~ " href=\"https://git.taler.net/\";>documented "
+#~ "code</a> and\n"
+#~ " the <a href=\"https://api.taler.net/\";>API\n"
+#~ " documentation</a>. Technical papers can be found in\n"
+#~ " our <a href=\"bibliography.html\">bibliography</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have a mailing list for developer discussions.\n"
+#~ " You can subscribe to or read the list archive at\n"
+#~ " <a "
+#~
"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+#~ " automation tests to detect regressions and check for\n"
+#~ " portability at <a\n"
+#~ " "
+#~ "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We use\n"
+#~ " <a "
+#~ "href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+#~ " to analyze the code coverage of our tests, the\n"
+#~ " results are available\n"
+#~ " at <a "
+#~ "href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We\n"
+#~ " use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+#~ " for performance regression analysis of the exchange\n"
+#~ " backend\n"
+#~ " at <a "
+#~ "href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The Taler system consists of protocols executed among\n"
+#~ " a number of actors as "
+#~ "illustrated in the illustration on the"
+#~ " right.\n"
+#~ " Typical transactions involve the following steps:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " A customer instructs his <b>bank</b> to\n"
+#~ " transfer funds from his account to the Taler\n"
+#~ " exchange (top left). In the subject of the\n"
+#~ " transaction, he includes an authentication\n"
+#~ " token from his electronic <b>wallet</b>. In\n"
+#~ " Taler terminology, the customer creates a\n"
+#~ " reserve at the exchange.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the exchange has received the wire\n"
+#~ " transfer, it allows the customer's electronic\n"
+#~ " wallet to <b>withdraw</b> electronic coins.\n"
+#~ " The electronic coins are digital\n"
+#~ " representations of the original currency from\n"
+#~ " the transfer. It is important to note that the\n"
+#~ " exchange does not learn the "serial\n"
+#~ " numbers" of the coins created in this\n"
+#~ " process, so it cannot tell later which customer\n"
+#~ " purchased what at which merchant. The use of\n"
+#~ " Taler does not change the currency or the total\n"
+#~ " value of the funds (except for fees which the\n"
+#~ " exchange may charge for the service).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the customer has the digital coins in his\n"
+#~ " wallet, the wallet can be used to <b>spend</b>\n"
+#~ " the coins with merchant portals that support\n"
+#~ " the Taler payment system and accept the\n"
+#~ " respective exchange as a business partner\n"
+#~ " (bottom arrow). This creates a digital contract\n"
+#~ " signed by the customer's coins and the\n"
+#~ " merchant. If necessary, the customer can later\n"
+#~ " use this digitally signed contract in a court\n"
+#~ " of law to prove the exact terms of the contract\n"
+#~ " and that he paid the respective amount. The\n"
+#~ " customer does not learn the banking details of\n"
+#~ " the merchant, and Taler does not require the\n"
+#~ " merchant to learn the identity of the\n"
+#~ " customer. Naturally, the customer can spend any\n"
+#~ " fraction of his digital coins (the system takes\n"
+#~ " care of customers getting change).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Merchants receiving digital\n"
+#~ " coins <b>deposit</b> the respective claims\n"
+#~ " that resulted from the contract signing with\n"
+#~ " the customer at the exchange to redeem the\n"
+#~ " coins. The deposit step does not reveal the\n"
+#~ " details of the contract between the customer\n"
+#~ " and the merchant or the identity of the\n"
+#~ " customer to the exchange in any way. However,\n"
+#~ " the exchange does learn the identity of the\n"
+#~ " merchant via the provided bank routing\n"
+#~ " information. The merchant can, for example\n"
+#~ " when compelled by the state for taxation,\n"
+#~ " provide information linking the individual\n"
+#~ " deposit to the respective contract signed by\n"
+#~ " the customer. Thus, the exchange's database\n"
+#~ " allows the state to enforce that merchants pay\n"
+#~ " applicable taxes (and do not engage in illegal\n"
+#~ " contracts).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Finally, the exchange transfers funds\n"
+#~ " corresponding to the digital coins redeemed by\n"
+#~ " the merchants to the merchant's <b>bank</b>\n"
+#~ " account. The exchange may combine multiple\n"
+#~ " small transactions into one larger bank\n"
+#~ " transfer. The merchant can query the exchange\n"
+#~ " about the relationship between the bank\n"
+#~ " transfers and the individual claims that were\n"
+#~ " deposited.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Most importantly, the exchange keeps\n"
+#~ " cryptographic proofs that allow it to\n"
+#~ " demonstrate that it is operating correctly to\n"
+#~ " third parties. The system requires an\n"
+#~ " external <b>auditor</b>, such as a\n"
+#~ " government-appointed financial regulatory body,\n"
+#~ " to frequently verify the exchange's databases\n"
+#~ " and check that its bank balance matches the\n"
+#~ " total value of the remaining coins in\n"
+#~ " circulation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Without the auditor, the exchange operators\n"
+#~ " could embezzle funds they are holding in\n"
+#~ " reserve. Customers and merchants cannot cheat\n"
+#~ " each other or the exchange. If any party's\n"
+#~ " computers are compromised, the financial damage\n"
+#~ " is limited to the respective party and\n"
+#~ " proportional to the funds they have in\n"
+#~ " circulation during the period of the\n"
+#~ " compromise.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+#~ "Taler is not based on proof-of-"
+#~ "work or any other distributed consensus"
+#~ "\n"
+#~ "mechanism. Instead Taler is based on blind signatures.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>It would be possible, however, to withdraw coins denominated in\n"
+#~ "Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+#~ "would give some benefits over plain Bitcoin, such as instant\n"
+#~ "confirmation times.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Your wallet stores digital coins and thus ultimately your computer\n"
+#~ "holds your balance. The exchange keeps funds matching all unspent\n"
+#~ "coins in an escrow bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Since the digital coins of value "
+#~ "in your wallet are anonymized, the\n"
+#~ ""
+#~ "exchange can not assist you in recovering a lost or stolen wallet.\n"
+#~ "Just like with a physical wallet for cash, you are responsible for\n"
+#~ "keeping it safe.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>The risk of losing a wallet can be mitigated by making backups or\n"
+#~ "keeping the balance reasonably low.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>In case of a compromise of one of your devices, an attacker can\n"
+#~ "spend coins from your wallet. Checking your balance might reveal\n"
+#~ "to you that your device has been compromised.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>If your friend provides goods or "
+#~ "services for you in exchange for a"
+#~ "\n"
+#~ "payment, they can easily set up a Taler merchant and receive the\n"
+#~ "payment in their bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Future versions of the Taler wallet may allow exchanging coins\n"
+#~ "among friends directly as well.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler wallets can store digital coins corresponding to multiple\n"
+#~ "different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler currently does not offer conversion between currencies.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "<p>Your wallet stores digital coins that are <a\n"
+#~ "href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+#~ "signed</a> by an exchange. The use "
+#~ "of a blind signature protects your\n"
+#~ ""
+#~ "privacy as it prevents the exchange from knowing which coin it signed\n"
+#~ "for which customer.</p>\n"
+#~ "\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides accountability to ensure business operate\n"
+#~ " legally, while also respecting civil liberties of\n"
+#~ " citizens. Taler is a payment system based on\n"
+#~ " open standards and free software. Taler needs\n"
+#~ " governments as they set a financial framework and act as\n"
+#~ " trusted regulators. Taler contributes to digital\n"
+#~ " sovereignty in the critical financial infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler was built with the goal of fighting corruption and\n"
+#~ " supporting taxation. With Taler, the receiver of any\n"
+#~ " form of payment is easily identified by the government,\n"
+#~ " and the merchant can be "
+#~ "compelled to provide the contract\n"
+#~ " that was accepted by the customer. Governments can use\n"
+#~ " this data to tax businesses and individuals based on\n"
+#~ " their income, making tax evasion and black markets less\n"
+#~ " viable.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Thus, despite offering anonymity for citizens spending\n"
+#~ " digital cash to buy goods and services, Taler also\n"
+#~ " ensures that the state can observe incoming funds. This\n"
+#~ " can be used to ensure businesses engage only in legal\n"
+#~ " activities, and do not evade income tax, sales tax or\n"
+#~ " value-added tax. However, this observational capability\n"
+#~ " does not extend to the immediate personal domain. In\n"
+#~ " particular, monitoring does not cover shared access to\n"
+#~ " funds with trusted friends and family, or synchronizing\n"
+#~ " wallets across multiple devices.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler's payments are cryptographically secured. Thus,\n"
+#~ " customers, merchants and the "
+#~ "Taler payment service provider\n"
+#~ " (the exchange) can mathematically\n"
+#~ " demonstrate their lawful behavior in court in case of\n"
+#~ " disputes. Financial damages are strictly limited,\n"
+#~ " improving economic security for individuals, merchants,\n"
+#~ " the exchange and the state.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " As a payment service provider, the Taler exchange is\n"
+#~ " subject to financial regulation."
+#~ " Financial regulation and\n"
+#~ " regular audits are critical to establish trust. In\n"
+#~ " particular, the Taler design "
+#~ "mandates the existence of an\n"
+#~ " independent auditor who checks cryptographic proofs that\n"
+#~ " accumulate at the exchange to ensure that the escrow\n"
+#~ " account is managed honestly. This ensures that the\n"
+#~ " exchange does not threaten the economy due to fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software implementing an open protocol\n"
+#~ " standard. Thus, Taler will enable competition and avoid\n"
+#~ " the monopolization of payment systems that threatens\n"
+#~ " global political and financial stability today.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler has an efficient design. Unlike\n"
+#~ " Blockchain-based payment systems, such as Bitcoin,\n"
+#~ " Taler will not threaten the availability of\n"
+#~ " national electric grids or (significantly)\n"
+#~ " contribute to environmental pollution.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler assumes governments can "
+#~ "observe traditional wire transfers\n"
+#~ " entering and leaving the "
+#~ "Taler payment system. Starting with the"
+#~ "\n"
+#~ " wire transfers, governments can obtain:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The total amount of digital currency withdrawn by a\n"
+#~ " customer. The government can"
+#~ " impose limits on how much\n"
+#~ " digital cash a customer can withdraw within a\n"
+#~ " given time frame.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The income received by any merchant via the Taler\n"
+#~ " system.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ " The exact details of the underlying contract that was\n"
+#~ " signed between customer and merchant. However, this\n"
+#~ " information would typically not include the identity\n"
+#~ " of the customer.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The amounts of digital coins legitimately withdrawn\n"
+#~ " by customers from the exchange, the value of\n"
+#~ " non-redeemed digital coins"
+#~ " in customer's wallets, the\n"
+#~ " value and corresponding wire details of deposit\n"
+#~ " operations performed by merchants with the exchange,\n"
+#~ " and the income of the"
+#~ " exchange from transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is an electronic payment system under development at\n"
+#~ " <a href=\"http://www.inria.fr/\";>Inria</a>. "
+#~ "We expect to make it\n"
+#~ " operational in 2017. You can "
+#~ "learn about Taler on this website,\n"
+#~ ""
+#~ " try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+#~ " our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+#~ " href=\"https://api.taler.net\";>API</a> documentation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is easy to integrate with existing Web\n"
+#~ " applications. Payments are cryptographically\n"
+#~ " secured and are confirmed within milliseconds with\n"
+#~ " extremely low transaction costs.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler does not introduce a new currency. Taler\n"
+#~ " uses a digital wallet storing coins and payment service\n"
+#~ " providers with escrow accounts in existing currencies.\n"
+#~ " Thus, Taler's cryptographic coins correspond to existing\n"
+#~ " currencies, such as US Dollars, Euros or even Bitcoins.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " By design Taler does not suffer from many classes\n"
+#~ " of security problems such as phishing or counterfeit.\n"
+#~ " Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ " customer due to a fraud-detection false positive.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When using Taler, merchant's revenue is transparent for tax\n"
+#~ " collection authorities. Unlike cash"
+#~ " and most digital currencies,\n"
+#~ " Taler helps prevent black markets. Taler is not suitable for\n"
+#~ " illegal activities.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When you pay with Taler, your identity does not\n"
+#~ " have to be revealed to the merchant. Just like\n"
+#~ " payments in cash, nobody else can track how you\n"
+#~ " spent your electronic money. However, you obtain a\n"
+#~ " legally valid proof of payment.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides protocols and "
+#~ "reference implementations that in\n"
+#~ " principle enables anybody to run"
+#~ " their own payment infrastructure,\n"
+#~ " be it individuals, organizations "
+#~ "or whole countries. Since the\n"
+#~ " reference implementation is a <a"
+#~ " href=\"http://www.gnu.org/\";>GNU</a>\n"
+#~ " package, it will always remain free software.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To pay with Taler, customers install an electronic wallet\n"
+#~ " on their device. Before the "
+#~ "first payment, the wallet's balance must"
+#~ "\n"
+#~ " be charged in the desired "
+#~ "currency by some other means of "
+#~ "payment.</p>\n"
+#~ " <p>Once the wallet is charged, "
+#~ "payments on websites take only one "
+#~ "click,\n"
+#~ " are never falsely rejected by "
+#~ "fraud detection and do not pose "
+#~ "any risk\n"
+#~ " of phishing or identity theft.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ " in the desired currency. We provide supporting software\n"
+#~ " in various programming languages to"
+#~ " make the integration painless.\n"
+#~ " The merchant's backend for Taler transaction processing can run\n"
+#~ " on the merchant's premises or be hosted by a third party.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have created a company, Taler Systems SA in\n"
+#~ " Luxembourg.<br>\n"
+#~ " Please contact <tt>address@hidden</tt>\n"
+#~ " if you want to invest in Taler.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Our <a href=\"about.html\">team</a> "
+#~ "combines world-class business leaders,\n"
+#~ " cryptographers, software engineers, civil-rights\n"
+#~ " activists and academics. We are unified by a vision\n"
+#~ " of how payments should work and the goal of\n"
+#~ " imposing this vision upon the world.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We are currently supported "
+#~ "by <a href=\"http://www.inria.fr/\";>Inria</a>, the"
+#~ " French\n"
+#~ " national institute for research in informatics and\n"
+#~ " automation, and the <a "
+#~ "href=\"https://renewablefreedom.org/\";>Renewable Freedom "
+#~ "Foundation</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " All transactions in Taler "
+#~ "are secured using <a "
+#~ "href=\"bibliography.html\">modern\n"
+#~ " cryptography</a> and trust in all parties is\n"
+#~ " minimized. Financial damage is bounded (for\n"
+#~ " customers, merchants and the exchange) even in the\n"
+#~ " case that systems are compromised and private keys\n"
+#~ " are stolen. Databases can be audited for\n"
+#~ " consistency, resulting in either the detection of\n"
+#~ " compromised systems or the demonstration that\n"
+#~ " participants were honest. Actual transaction costs\n"
+#~ " are fractions of a cent.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The scalable business model for Taler is the operation\n"
+#~ " of the payment service "
+#~ "provider, which converts money from\n"
+#~ " traditional payment systems (MasterCard, SEPA, UPI,\n"
+#~ " Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+#~ " electronic coins in the same currency. The customer\n"
+#~ " can then redeem the electronic coins at a merchant,\n"
+#~ " who can exchange them for money represented using\n"
+#~ " traditional payment systems at the exchange. The\n"
+#~ " exchange charges fees to facilitate the transactions.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The payment service operator runs the <em>Taler exchange</em>.\n"
+#~ " The exchange charges <b>transaction "
+#~ "fees</b> to customers or merchants.\n"
+#~ " Its operational expenses are from"
+#~ " wire transfers with the banking\n"
+#~ " system and the operation of the computing infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is a cost-effective electronic payment system\n"
+#~ " which provides you with cryptographic proof that\n"
+#~ " the payment worked correctly within milliseconds.\n"
+#~ " Your Web customers pay with previously unknown\n"
+#~ " levels of convenience without risk of fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Processing transactions with Taler is fast,\n"
+#~ " allowing you to confirm the transaction with your\n"
+#~ " customer virtually immediately. Your customers\n"
+#~ " will appreciate that they do not have to type in\n"
+#~ " credit card information and play the "verified\n"
+#~ " by" game. By making payments significantly\n"
+#~ " more convenient for your customers, you may be able\n"
+#~ " to use Taler for small transactions that would not\n"
+#~ " work with credit card payments due to the mental\n"
+#~ " overhead for customers.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You will have cryptographic proof of payment from the\n"
+#~ " Taler payment service provider. With Taler you never\n"
+#~ " handle sensitive customer account information and thus\n"
+#~ " do not have to undergo any particular security audits\n"
+#~ " (such as PCI DSS). Your systems will have customer\n"
+#~ " contracts with qualified signatures for all\n"
+#~ " transactions which you can use in court in case of\n"
+#~ " disputes.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software, and you can use the\n"
+#~ " liberally-licensed reference code as a starting\n"
+#~ " point to integrate Taler into your services. To use\n"
+#~ " Taler, you do not need to pay license fees, and the\n"
+#~ " free software development model will ensure that\n"
+#~ " you can select from many competing integrators for\n"
+#~ " support.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is uses efficient "
+#~ "cryptographic constructions with low\n"
+#~ " bandwidth and storage "
+#~ "requirements. Combined with Taler's strong"
+#~ "\n"
+#~ " security which makes fraud "
+#~ "impossible, Taler payment service\n"
+#~ " providers can operate with very low overhead and\n"
+#~ " thus offer low transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler can be used for different currencies (such as\n"
+#~ " Euros, US Dollars or Bitcoins) and any amount, limited\n"
+#~ " only by applicable regulatation and what denominations\n"
+#~ " the payment service provider supports.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler prevents tax evasion and money laundering.\n"
+#~ " Taler's protocols are efficient"
+#~ " and do not use wasteful\n"
+#~ " proof-of-work calculations. Taler encourages\n"
+#~ " transparency by providing an open standard and free\n"
+#~ " software reference implementations.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>signs</b> and <b>stores</b> the\n"
+#~ " complete terms of offers "
+#~ "made by the merchant to customers.\n"
+#~ ""
+#~ " For this, the merchant's frontend needs to give the\n"
+#~ " customer's order in a JSON format to the backend.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>validates</b> payments received from\n"
+#~ " the wallet and <b>executes</b> them with the Taler\n"
+#~ " payment service provider (the exchange). For this,\n"
+#~ " the merchant's frontend must pass the payment\n"
+#~ " request through to the Taler backend and check the\n"
+#~ " HTTP status code that is returned.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend can <b>list</b> completed transactions\n"
+#~ " and <b>map</b> wire transfers to sets of business\n"
+#~ " transactions, including the exact terms of each\n"
+#~ " contract.\n"
+#~ " "
+#~ msgstr ""
+
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index dac021c..8ea100d 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-03-08 10:25+0100\n"
+"POT-Creation-Date: 2017-03-15 11:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language: it\n"
@@ -103,12 +103,6 @@ msgstr ""
msgid "Taler System Architecture"
msgstr ""
-#: architecture.html.j2:8
-msgid ""
-"\n"
-" "
-msgstr ""
-
#: bibliography.html.j2:4
msgid "GNU Taler Bibliography"
msgstr ""
@@ -132,69 +126,69 @@ msgstr ""
#: citizens.html.j2:9
msgid ""
-"\n"
-" Taler largely functions like digital cash. You\n"
-" withdraw money from your bank account into your\n"
-" electronic wallet, and can henceforth spend digital\n"
-" cash. The electronic wallet can carry multiple\n"
-" currencies.\n"
-" "
+"Taler largely functions like digital cash. You\n"
+"withdraw money from your bank account into your\n"
+"electronic wallet, and can henceforth spend digital\n"
+"cash. The electronic wallet can carry multiple\n"
+"currencies.\n"
msgstr ""
-#: citizens.html.j2:25
-msgid "Security"
-msgstr "Sicurezza"
+#: citizens.html.j2:25 governments.html.j2:58 index.html.j2:55
+#: merchants.html.j2:41
+msgid "Secure"
+msgstr "Sicuro"
#: citizens.html.j2:27
msgid ""
"Taler uses modern cryptography, ensuring that there\n"
-" is no counterfeit. Your digital wallet is safer\n"
-" than your physical wallet. At most, you can lose\n"
-" its contents because your computer or mobile is\n"
-" irreparably damaged or compromised. Unlike a\n"
-" physical wallet, you can make backups to secure\n"
-" against data loss."
+"is no counterfeit. Your digital wallet is safer\n"
+"than your physical wallet. At most, you can lose\n"
+"its contents because your computer or mobile is\n"
+"irreparably damaged or compromised. Unlike a\n"
+"physical wallet, you can make backups to secure\n"
+"against data loss."
msgstr ""
-#: citizens.html.j2:37
-msgid "Privacy"
-msgstr "Privacy"
+#: citizens.html.j2:37 index.html.j2:83
+msgid "Private"
+msgstr ""
#: citizens.html.j2:39
msgid ""
-"Your transactions are private, neither the exchange\n"
-" nor merchant needs to learn your identity. There is\n"
-" no need to give out credit card numbers or other\n"
-" sensitive information. The merchant will only be\n"
-" able to do exactly the transaction you agreed to."
+"Your transactions are private, neither the payment\n"
+"service provider nor merchant needs to learn your\n"
+"identity. There is no need to give out credit card\n"
+"numbers or other sensitive information. The merchant\n"
+"will only be able to do exactly the transaction you\n"
+"agreed to."
msgstr ""
#: citizens.html.j2:50
-msgid "Convenience"
-msgstr "Convenienza"
+msgid "Convenient"
+msgstr ""
#: citizens.html.j2:52
msgid ""
"You will be able to withdraw money to replenish the\n"
-" digital coins in your wallet using your credit card\n"
-" or wire transfers. Afterwards you can pay with\n"
-" one-click using the Taler wallet, which optionally\n"
-" keeps your transaction history on your computer."
+"digital coins in your wallet using your credit card\n"
+"or wire transfers. Afterwards you can pay with\n"
+"one-click using the Taler wallet, which optionally\n"
+"keeps your transaction history on your computer."
msgstr ""
-#: citizens.html.j2:61
-msgid "Stability"
+#: citizens.html.j2:61 index.html.j2:41
+msgid "Stable"
msgstr ""
#: citizens.html.j2:63
msgid ""
"Coins in your digital wallet will be of the same\n"
-" denomination as the cash in your physical wallet.\n"
-" Taler is not a crypto-currency, so you do not have\n"
-" to worry about cryto-currency related value\n"
-" fluctuations. Banking with Taler is subject to the\n"
-" usual government protections for financial\n"
-" services."
+"denomination as the cash in your physical wallet.\n"
+"Taler is not a crypto-currency, so you do not have\n"
+"to worry about cryto-currency related value\n"
+"fluctuations. Banking with Taler is subject to the\n"
+"usual government protections for financial\n"
+"services."
msgstr ""
#: citizens.html.j2:79
@@ -203,12 +197,10 @@ msgstr ""
#: citizens.html.j2:81
msgid ""
-"\n"
-" We currently provide a <a href=\"wallet.html\">wallet browser "
+"We currently provide a <a href=\"wallet.html\">wallet browser "
"extension</a> for Chromium, Chrome, Firefox, Opera\n"
-" and Edge. Wallets for mobile phones and other platforms will be "
+"and Edge. Wallets for mobile phones and other platforms will be "
"available in the future.\n"
-" "
msgstr ""
#: citizens.html.j2:88
@@ -217,10 +209,8 @@ msgstr ""
#: citizens.html.j2:90
msgid ""
-"\n"
-" You can see how Taler works in practice by visiting our <a "
+"You can see how Taler works in practice by visiting our <a "
"href=\"https://demo.taler.net\";>demo page</a>.\n"
-" "
msgstr ""
#: citizens.html.j2:103
@@ -230,38 +220,37 @@ msgstr ""
#: citizens.html.j2:105
msgid ""
"Customers interact with the Taler system using\n"
-" the Taler wallet:"
+"the Taler wallet:"
msgstr ""
-#: citizens.html.j2:108
+#: citizens.html.j2:110
msgid ""
-"To <b>withdraw</b> electronic coins, the customer transfers funds\n"
-" from his bank account to the Taler exchange. The wire\n"
-" transfer subject must match a code generated by the "
-"customer's\n"
-" wallet. After the wire transfer is complete, the wallet"
-" will\n"
-" automatically withdraw the coins."
+"To <b>withdraw</b> electronic coins, the customer\n"
+"transfers funds from his bank account to the Taler\n"
+"payment service provider (the exchange). The wire\n"
+"transfer subject must match a code identifying the\n"
+"customer's wallet. After the wire transfer is\n"
+"complete, the wallet will automatically withdraw the\n"
+"coins from the exchange."
msgstr ""
-#: citizens.html.j2:114
+#: citizens.html.j2:118
msgid ""
-"To <b>spend</b> electronic coins, a merchant must cause the wallet\n"
-" to display a proposal and ask for one-click "
-"confirmation.\n"
-" Payment is then instant.\n"
-" Transaction histories and digitally signed contracts "
-"can be\n"
-" preserved by the wallet."
+"To <b>spend</b> electronic coins, a merchant must\n"
+"cause the wallet to display a proposal for some\n"
+"purchase. The wallet will ask the customer for\n"
+"one-click confirmation. Payment is then instant.\n"
+"Transaction histories and digitally signed contracts\n"
+"can be preserved by the wallet."
msgstr ""
-#: citizens.html.j2:120
+#: citizens.html.j2:125
msgid ""
"The customer can use the wallet to <b>review</b> his\n"
-" balance. The wallet can contain different currencies,\n"
-" and may be shared across devices. Customers can make\n"
-" backups of the wallet to secure its contents against\n"
-" hardware failures."
+"balance. The wallet can contain different\n"
+"currencies, and may be shared across\n"
+"devices. Customers can make backups of the wallet to\n"
+"secure its contents against hardware failures."
msgstr ""
#: contact.html.j2:6
@@ -274,14 +263,12 @@ msgstr ""
#: contact.html.j2:15
msgid ""
-"\n"
-" An archived, public mailing list for GNU Taler is\n"
-" hosted at\n"
-" <a "
+"An archived, public mailing list for GNU Taler is\n"
+"hosted at\n"
+"<a "
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
" You can send messages to the list\n"
-" at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
-" "
+"at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
msgstr ""
#: contact.html.j2:25
@@ -290,11 +277,9 @@ msgstr ""
#: contact.html.j2:27
msgid ""
-"\n"
-" Team members are generally reachable at\n"
-" <tt>address@hidden</tt>. All of us\n"
-" support receiving GnuPG encrypted e-mails.\n"
-" "
+"Team members are generally reachable at\n"
+"<tt>address@hidden</tt>. All of us\n"
+"support receiving GnuPG encrypted e-mails.\n"
msgstr ""
#: contact.html.j2:36
@@ -303,13 +288,11 @@ msgstr ""
#: contact.html.j2:38
msgid ""
-"\n"
-" We track open feature requests and bugs in our\n"
-" <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
-" which is shared with the GNUnet project.\n"
-" You can also report bugs or feature requests to the\n"
-" mailing list.\n"
-" "
+"We track open feature requests and bugs in our\n"
+"<a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+"which is shared with the GNUnet project.\n"
+"You can also report bugs or feature requests to the\n"
+"mailing list.\n"
msgstr ""
#: contact.html.j2:49
@@ -318,274 +301,254 @@ msgstr ""
#: contact.html.j2:51
msgid ""
-"\n"
-" For non-technical commercial requests, please contact\n"
-" <tt>ceo AT taler.net</tt>.\n"
-" "
+"For non-technical commercial requests, please contact\n"
+"<tt>ceo AT taler.net</tt>.\n"
msgstr ""
#: developers.html.j2:5
msgid "Taler for developers"
msgstr "Taler per programmatori"
-#: developers.html.j2:12
+#: developers.html.j2:12 merchants.html.j2:58
msgid "Free"
msgstr "Free"
#: developers.html.j2:15
msgid ""
-"\n"
-" Taler is free software implementing an open\n"
-" protocol. Anybody is welcome to inspect our code\n"
-" and integrate our reference implementation into\n"
-" their applications. Different components of Taler\n"
-" are being made available under different\n"
-" licenses. The Affero GPLv3+ is used for the\n"
-" exchange, the LGPLv3+ is used for reference code\n"
-" demonstrating integration with merchant platforms,\n"
-" and licenses like Apache/Mozilla/GPLv3+ are used\n"
-" for wallets and related customer-facing software.\n"
-" We are open for constructive suggestions for\n"
-" maximizing the adoption of this libre payment\n"
-" platform.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:34
+"GNU Taler is free software implementing an open\n"
+"protocol. Anybody is welcome to integrate our reference\n"
+"implementation into their applications. Different\n"
+"components of Taler are being made available under\n"
+"different licenses. The Affero GPLv3+ is used for the\n"
+"exchange, the LGPLv3+ is used for reference code\n"
+"demonstrating integration with merchant platforms, and\n"
+"licenses like GPLv3+ are used for\n"
+"wallets and related customer-facing software. We are\n"
+"open for constructive suggestions for maximizing the\n"
+"adoption of this payment platform.\n"
+msgstr ""
+
+#: developers.html.j2:32
msgid "RESTful"
msgstr "RESTful"
-#: developers.html.j2:37
+#: developers.html.j2:35
msgid ""
-"\n"
-" Taler is designed to work on the Internet. To\n"
-" ensure that Taler payments can work with\n"
-" restrictive network setups, Taler uses a RESTful\n"
-" protocol over HTTP or HTTPS. Taler's security does\n"
-" not depend upon the use of HTTPS, but obviously\n"
-" merchants may choose to offer HTTPS for consistency\n"
-" and because it generally is better for privacy\n"
-" compared to HTTP. Taler uses JSON to encode\n"
-" structure data, making it easy to integrate Taler\n"
-" with existing Web applications. Taler's protocol\n"
-" is documented in\n"
-" detail <a href=\"https://api.taler.net/\";>here</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:60
+"Taler is designed to work on the Internet. To\n"
+"ensure that Taler payments can work with\n"
+"restrictive network setups, Taler uses a RESTful\n"
+"protocol over HTTP or HTTPS. Taler's security does\n"
+"not depend upon the use of HTTPS, but obviously\n"
+"merchants may choose to offer HTTPS for consistency\n"
+"and because it generally is better for privacy\n"
+"compared to HTTP. Taler uses JSON to encode\n"
+"structure data, making it easy to integrate Taler\n"
+"with existing Web applications. Taler's protocol\n"
+"is documented in\n"
+"detail at <a href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+msgstr ""
+
+#: developers.html.j2:58
msgid "Code"
msgstr "Codice"
-#: developers.html.j2:63
+#: developers.html.j2:61
msgid ""
-"\n"
-" Taler is currently primarily developed by a\n"
-" research team at Inria and GNUnet e.V. However,\n"
-" contributions from anyone are welcome. Our Git\n"
-" repositories can be cloned using the Git and HTTP\n"
-" access methods against <tt>git.taler.net</tt> with\n"
-" the name of the respective repository. A list of\n"
-" public repositories can be found in\n"
-" our <a href='https://git.taler.net/'>GitWeb</a>.\n"
-" "
-msgstr ""
-
-#: developers.html.j2:76
+"Taler is currently primarily developed by a\n"
+"research team at <a href=\"http://www.inria.fr/\";>Inria</a> and\n"
+"<a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+"contributions from anyone are welcome. Our Git\n"
+"repositories can be cloned using the Git and HTTP\n"
+"access methods against <tt>git.taler.net</tt> with\n"
+"the name of the respective repository. A list of\n"
+"repositories can be found in\n"
+"our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+msgstr ""
+
+#: developers.html.j2:75
msgid "Documentation"
msgstr "Documentazione"
-#: developers.html.j2:79
+#: developers.html.j2:78
msgid ""
-"\n"
-" In addition to this website,\n"
-" the <a href=\"https://git.taler.net/\";>documented\n"
-" code</a> and\n"
-" the <a href=\"https://api.taler.net/\";>API\n"
-" documentation</a>, we are in the process of\n"
-" preparing a comprehensive design document which\n"
-" will be published here soon.\n"
-" "
+"In addition to this website, the <a\n"
+"href=\"https://git.taler.net/\";>documented code</a> and\n"
+"the <a href=\"https://api.taler.net/\";>API\n"
+"documentation</a>. Technical papers can be found in\n"
+"our <a href=\"bibliography.html\">bibliography</a>.\n"
msgstr ""
-#: developers.html.j2:91
+#: developers.html.j2:88
msgid "Discussion"
msgstr "Discussione"
-#: developers.html.j2:93
+#: developers.html.j2:91
msgid ""
"We have a mailing list for developer discussions.\n"
-" You can subscribe to it or read the list archive at\n"
-" <a "
-"href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"You can subscribe to or read the list archive at\n"
+"<a "
+"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+"\n"
msgstr ""
-#: developers.html.j2:100
+#: developers.html.j2:101
msgid "Regression Testing"
msgstr "Test delle regressioni"
-#: developers.html.j2:102
+#: developers.html.j2:104
msgid ""
-"We have\n"
-" <a href='https://buildbot.net/'>Buildbot</a>\n"
-" automation tests to detect regressions and check\n"
-" for portability at\n"
-" <a href='https://buildbot.taler.net/'>buildbot.taler.net</a>.\n"
-" "
+"We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+"automation tests to detect regressions and check for\n"
+"portability at <a\n"
+"href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:110
+#: developers.html.j2:113
msgid "Code Coverage Analysis"
msgstr "Analisi della copertura del codice"
-#: developers.html.j2:112
+#: developers.html.j2:116
msgid ""
"We use\n"
-" <a "
-"href='http://ltp.sourceforge.net/coverage/lcov.php'>LCOV</a>\n"
-" to analyze the code coverage of our tests, the\n"
-" results are available\n"
-" at <a href='https://lcov.taler.net/'>lcov.taler.net</a>.\n"
-" "
+"<a href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+"to analyze the code coverage of our tests, the\n"
+"results are available\n"
+"at <a href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:120
+#: developers.html.j2:126
msgid "Performance Analysis"
msgstr "Analisi delle prestazioni"
-#: developers.html.j2:122
+#: developers.html.j2:129
msgid ""
"We\n"
-" use <a href='https://gnunet.org/gauger'>Gauger</a>\n"
-" for performance regression analysis of the exchange\n"
-" backend\n"
-" at <a "
-"href='https://gauger.taler.net/'>gauger.taler.net</a>.\n"
-" "
+"use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+"for performance regression analysis of the exchange\n"
+"backend\n"
+"at <a href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
msgstr ""
-#: developers.html.j2:136
+#: developers.html.j2:145
msgid "Taler system overview"
msgstr "Schema generale del sistema Taler"
-#: developers.html.j2:138
+#: developers.html.j2:148
msgid ""
"The Taler system consists of protocols executed among\n"
-" a number of actors with the help\n"
-" of <a href='https://www.fsf.org/'>Free Software</a>\n"
-" as illustrated in the illustration on the right.\n"
-" Typical transactions involve the following steps: "
+"a number of actors as illustrated in the illustration on the right.\n"
+"Typical transactions involve the following steps:\n"
msgstr ""
-#: developers.html.j2:147
+#: developers.html.j2:158
msgid ""
"A customer instructs his <b>bank</b> to\n"
-" transfer funds from his account to the Taler\n"
-" exchange (top left). In the subject of the\n"
-" transaction, he includes an authentication\n"
-" token from his electronic <b>wallet</b>. In\n"
-" Taler terminology, the customer creates a\n"
-" reserve at the exchange. "
+"transfer funds from his account to the Taler\n"
+"exchange (top left). In the subject of the\n"
+"transaction, he includes an authentication\n"
+"token from his electronic <b>wallet</b>. In\n"
+"Taler terminology, the customer creates a\n"
+"reserve at the exchange.\n"
msgstr ""
-#: developers.html.j2:155
+#: developers.html.j2:170
msgid ""
"Once the exchange has received the wire\n"
-" transfer, it allows the customer's electronic\n"
-" wallet to <b>withdraw</b> electronic coins.\n"
-" The electronic coins are digital\n"
-" representations of the original currency from\n"
-" the transfer. It is important to note that the\n"
-" exchange does not learn the "serial\n"
-" numbers" of the coins created in this\n"
-" process, so it cannot tell later which customer\n"
-" purchased what at which merchant. The use of\n"
-" Taler does not change the currency or the total\n"
-" value of the funds (except for fees which the\n"
-" exchange may charge for the service). "
+"transfer, it allows the customer's electronic\n"
+"wallet to <b>withdraw</b> electronic coins.\n"
+"The electronic coins are digital\n"
+"representations of the original currency from\n"
+"the transfer. It is important to note that the\n"
+"exchange does not learn the "serial\n"
+"numbers" of the coins created in this\n"
+"process, so it cannot tell later which customer\n"
+"purchased what at which merchant. The use of\n"
+"Taler does not change the currency or the total\n"
+"value of the funds (except for fees which the\n"
+"exchange may charge for the service).\n"
msgstr ""
-#: developers.html.j2:170
+#: developers.html.j2:188
msgid ""
"Once the customer has the digital coins in his\n"
-" wallet, the wallet can be used to <b>spend</b>\n"
-" the coins with merchant portals that support\n"
-" the Taler payment system and accept the\n"
-" respective exchange as a business partner\n"
-" (bottom arrow). This creates a digital contract\n"
-" signed by the customer's coins and the\n"
-" merchant. If necessary, the customer can later\n"
-" use this digitally signed contract in a court\n"
-" of law to prove the exact terms of the contract\n"
-" and that he paid the respective amount. The\n"
-" customer does not learn the banking details of\n"
-" the merchant, and Taler does not require the\n"
-" merchant to learn the identity of the\n"
-" customer. Naturally, the customer can spend any\n"
-" fraction of his digital coins (the system takes\n"
-" care of customers getting change). "
-msgstr ""
-
-#: developers.html.j2:188
+"wallet, the wallet can be used to <b>spend</b>\n"
+"the coins with merchant portals that support\n"
+"the Taler payment system and accept the\n"
+"respective exchange as a business partner\n"
+"(bottom arrow). This creates a digital contract\n"
+"signed by the customer's coins and the\n"
+"merchant. If necessary, the customer can later\n"
+"use this digitally signed contract in a court\n"
+"of law to prove the exact terms of the contract\n"
+"and that he paid the respective amount. The\n"
+"customer does not learn the banking details of\n"
+"the merchant, and Taler does not require the\n"
+"merchant to learn the identity of the\n"
+"customer. Naturally, the customer can spend any\n"
+"fraction of his digital coins (the system takes\n"
+"care of customers getting change).\n"
+msgstr ""
+
+#: developers.html.j2:210
msgid ""
"Merchants receiving digital\n"
-" coins <b>deposit</b> the respective receipts\n"
-" that resulted from the contract signing with\n"
-" the customer at the exchange to redeem the\n"
-" coins. The deposit step does not reveal the\n"
-" details of the contract between the customer\n"
-" and the merchant or the identity of the\n"
-" customer to the exchange in any way. However,\n"
-" the exchange does learn the identity of the\n"
-" merchant via the provided bank routing\n"
-" information. The merchant can, for example\n"
-" when compelled by the state for taxation,\n"
-" provide information linking the individual\n"
-" deposit to the respective contract signed by\n"
-" the customer. Thus, the exchange's database\n"
-" allows the state to enforce that merchants pay\n"
-" applicable taxes (and do not engage in illegal\n"
-" contracts). "
-msgstr ""
-
-#: developers.html.j2:207
+"coins <b>deposit</b> the respective claims\n"
+"that resulted from the contract signing with\n"
+"the customer at the exchange to redeem the\n"
+"coins. The deposit step does not reveal the\n"
+"details of the contract between the customer\n"
+"and the merchant or the identity of the\n"
+"customer to the exchange in any way. However,\n"
+"the exchange does learn the identity of the\n"
+"merchant via the provided bank routing\n"
+"information. The merchant can, for example\n"
+"when compelled by the state for taxation,\n"
+"provide information linking the individual\n"
+"deposit to the respective contract signed by\n"
+"the customer. Thus, the exchange's database\n"
+"allows the state to enforce that merchants pay\n"
+"applicable taxes (and do not engage in illegal\n"
+"contracts).\n"
+msgstr ""
+
+#: developers.html.j2:233
msgid ""
"Finally, the exchange transfers funds\n"
-" corresponding to the digital coins redeemed by\n"
-" the merchants to the merchant's <b>bank</b>\n"
-" account. The exchange may combine multiple\n"
-" small transactions into one larger bank\n"
-" transfer. The merchant can query the exchange\n"
-" about the relationship between the bank\n"
-" transfers and the individual claims that were\n"
-" deposited. "
+"corresponding to the digital coins redeemed by\n"
+"the merchants to the merchant's <b>bank</b>\n"
+"account. The exchange may combine multiple\n"
+"small transactions into one larger bank\n"
+"transfer. The merchant can query the exchange\n"
+"about the relationship between the bank\n"
+"transfers and the individual claims that were\n"
+"deposited.\n"
msgstr ""
-#: developers.html.j2:217
+#: developers.html.j2:247
msgid ""
"Most importantly, the exchange keeps\n"
-" cryptographic proofs that allow it to\n"
-" demonstrate that it is operating correctly to\n"
-" third parties. The system requires an\n"
-" external <b>auditor</b>, such as a\n"
-" government-appointed financial regulatory body,\n"
-" to frequently verify the exchange's databases\n"
-" and check that its bank balance matches the\n"
-" total value of the remaining coins in\n"
-" circulation. "
+"cryptographic proofs that allow it to\n"
+"demonstrate that it is operating correctly to\n"
+"third parties. The system requires an\n"
+"external <b>auditor</b>, such as a\n"
+"government-appointed financial regulatory body,\n"
+"to frequently verify the exchange's databases\n"
+"and check that its bank balance matches the\n"
+"total value of the remaining coins in\n"
+"circulation.\n"
msgstr ""
-#: developers.html.j2:228
+#: developers.html.j2:262
msgid ""
"Without the auditor, the exchange operators\n"
-" could embezzle funds they are holding in\n"
-" reserve. Customers and merchants cannot cheat\n"
-" each other or the exchange. If any party's\n"
-" computers are compromised, the financial damage\n"
-" is limited to the respective party and\n"
-" proportional to the funds they have in\n"
-" circulation during the period of the\n"
-" compromise. "
+"could embezzle funds they are holding in\n"
+"reserve. Customers and merchants cannot cheat\n"
+"each other or the exchange. If any party's\n"
+"computers are compromised, the financial damage\n"
+"is limited to the respective party and\n"
+"proportional to the funds they have in\n"
+"circulation during the period of the\n"
+"compromise.\n"
msgstr ""
#: faq.html.j2:5
@@ -594,27 +557,28 @@ msgstr ""
#: faq.html.j2:6
msgid ""
-"\n"
"<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
"Taler is not based on proof-of-work or any other distributed consensus\n"
"mechanism. Instead Taler is based on blind signatures.</p>\n"
-"\n"
-"<p>It would be possible, however, to withdraw Bitcoins into a Taler\n"
-"wallet (with an appropriate exchange), which would give some benefits\n"
-"over plain Bitcoin, such as instant confirmation times.</p>\n"
msgstr ""
-#: faq.html.j2:16
+#: faq.html.j2:11
+msgid ""
+"<p>It would be possible, however, to withdraw coins denominated in\n"
+"Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+"would give some benefits over plain Bitcoin, such as instant\n"
+"confirmation times.</p>\n"
+msgstr ""
+
+#: faq.html.j2:18
msgid "Where is the balance in my wallet stored?"
msgstr ""
-#: faq.html.j2:17
+#: faq.html.j2:19
msgid ""
-"\n"
-"<p>Your wallet stores digital coins that were blindly signed by an\n"
-"exchange, and thus ultimately your computer holds your balance. The\n"
-"exchange keeps funds matching all unspent coins in an escrow bank\n"
-"account.</p>\n"
+"<p>Your wallet stores digital coins and thus ultimately your computer\n"
+"holds your balance. The exchange keeps funds matching all unspent\n"
+"coins in an escrow bank account.</p>\n"
msgstr ""
#: faq.html.j2:25
@@ -623,386 +587,356 @@ msgstr ""
#: faq.html.j2:26
msgid ""
-"\n"
"<p>Since the digital coins of value in your wallet are anonymized, the\n"
"exchange can not assist you in recovering a lost or stolen wallet.\n"
"Just like with a physical wallet for cash, you are responsible for\n"
"keeping it safe.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:32
+msgid ""
"<p>The risk of losing a wallet can be mitigated by making backups or\n"
"keeping the balance reasonably low.</p>\n"
-"\n"
-"<p>In case of a compromise of one of your devices, an attacker that\n"
-"spends coins on your behalf will allow you to detect that your device\n"
-"has been compromised.</p>\n"
msgstr ""
-#: faq.html.j2:41
+#: faq.html.j2:37
+msgid "What if my computer is hacked?"
+msgstr ""
+
+#: faq.html.j2:38
+msgid ""
+"<p>In case of a compromise of one of your devices, an attacker can\n"
+"spend coins from your wallet. Checking your balance might reveal\n"
+"to you that your device has been compromised.</p>\n"
+msgstr ""
+
+#: faq.html.j2:44
msgid "Can I send money to my friend with Taler?"
msgstr ""
-#: faq.html.j2:42
+#: faq.html.j2:45
msgid ""
-"\n"
"<p>If your friend provides goods or services for you in exchange for a\n"
"payment, they can easily set up a Taler merchant and receive the\n"
"payment in their bank account.</p>\n"
-"\n"
+msgstr ""
+
+#: faq.html.j2:50
+msgid ""
"<p>Future versions of the Taler wallet may allow exchanging coins\n"
"among friends directly as well.</p>\n"
msgstr ""
-#: faq.html.j2:52
+#: faq.html.j2:56
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: faq.html.j2:53
+#: faq.html.j2:57
msgid ""
-"\n"
"<p>Taler wallets can store digital coins corresponding to multiple\n"
"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+msgstr ""
+
+#: faq.html.j2:61
+msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgstr ""
+
+#: faq.html.j2:65
+msgid "How does Taler protect my privacy?"
+msgstr ""
+
+#: faq.html.j2:66
+msgid ""
+"<p>Your wallet stores digital coins that are <a\n"
+"href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+"signed</a> by an exchange. The use of a blind signature protects your\n"
+"privacy as it prevents the exchange from knowing which coin it signed\n"
+"for which customer.</p>\n"
"\n"
-"<p>Taler currently does not offer conversion between currencies.</p>\n"
msgstr ""
#: governments.html.j2:6
msgid "Advantages for Governments"
msgstr ""
-#: governments.html.j2:7
+#: governments.html.j2:8
msgid ""
-"Taler provides accountability to ensure business\n"
-" accepting payments operate legally, while also\n"
-" respecting civil liberties of citizens spending\n"
-" digital cash. Taler is a commons, a payment system\n"
-" based on open standards and free software. Taler\n"
-" needs governments to set a financial framework and\n"
-" to act as trusted regulators. Taler contributes to\n"
-" digital sovereignty in the critical financial\n"
-" infrastructure."
+"Taler provides accountability to ensure business operate\n"
+"legally, while also respecting civil liberties of\n"
+"citizens. Taler is a payment system based on\n"
+"open standards and free software. Taler needs\n"
+"governments as they set a financial framework and act as\n"
+"trusted regulators. Taler contributes to digital\n"
+"sovereignty in the critical financial infrastructure.\n"
msgstr ""
-#: governments.html.j2:23 index.html.j2:69
+#: governments.html.j2:25 index.html.j2:70
msgid "Taxable"
msgstr "Tassabile"
-#: governments.html.j2:25
+#: governments.html.j2:28
msgid ""
-"Taler was\n"
-" built with the goal of fighting corruption and supporting "
-"taxation.\n"
-" With Taler, the receiver of any form of payment is\n"
-" easily identified by the government, and the merchant\n"
-" can be compelled to provide the contract that was accepted\n"
-" by the customer. Governments can use this data to\n"
-" tax businesses and individuals based on their\n"
-" income, making tax evasion and black markets less\n"
-" viable."
+"Taler was built with the goal of fighting corruption and\n"
+"supporting taxation. With Taler, the receiver of any\n"
+"form of payment is easily identified by the government,\n"
+"and the merchant can be compelled to provide the contract\n"
+"that was accepted by the customer. Governments can use\n"
+"this data to tax businesses and individuals based on\n"
+"their income, making tax evasion and black markets less\n"
+"viable.\n"
msgstr ""
-#: governments.html.j2:35
+#: governments.html.j2:41
msgid ""
-"Thus, despite offering anonymity for citizens\n"
-" spending digital cash to buy goods and services,\n"
-" Taler also ensures that the state can observe\n"
-" incoming funds. This can be used to ensure\n"
-" businesses engage only in legal activities, and do\n"
-" not evade income tax, sales tax or value-added tax.\n"
-" However, this observational capability does not\n"
-" extend to the immediate personal domain. In\n"
-" particular, sharing access to funds within a family\n"
-" or synchronizing wallets across multiple devices is not\n"
-" subject to monitoring."
+"Thus, despite offering anonymity for citizens spending\n"
+"digital cash to buy goods and services, Taler also\n"
+"ensures that the state can observe incoming funds. This\n"
+"can be used to ensure businesses engage only in legal\n"
+"activities, and do not evade income tax, sales tax or\n"
+"value-added tax. However, this observational capability\n"
+"does not extend to the immediate personal domain. In\n"
+"particular, monitoring does not cover shared access to\n"
+"funds with trusted friends and family, or synchronizing\n"
+"wallets across multiple devices.\n"
msgstr ""
-#: governments.html.j2:48 merchants.html.j2:33
-msgid "Secure"
-msgstr "Sicuro"
-
-#: governments.html.j2:50
+#: governments.html.j2:61
msgid ""
-"Taler's payments are cryptographically\n"
-" secured. Thus, customers, merchants and the\n"
-" exchange can mathematically demonstrate their\n"
-" lawful behavior in court in case of\n"
-" disputes. Financial damages are strictly limited,\n"
-" improving economic security for individuals,\n"
-" merchants, the exchange and the state."
+"Taler's payments are cryptographically secured. Thus,\n"
+"customers, merchants and the Taler payment service provider\n"
+"(the exchange) can mathematically\n"
+"demonstrate their lawful behavior in court in case of\n"
+"disputes. Financial damages are strictly limited,\n"
+"improving economic security for individuals, merchants,\n"
+"the exchange and the state.\n"
msgstr ""
-#: governments.html.j2:58
+#: governments.html.j2:73
msgid ""
-"By design, the Taler payment service provider is\n"
-" subject to financial regulation. Financial\n"
-" regulation and regular audits are critical to\n"
-" establish trust. In particular, the Taler design\n"
-" mandates the existence of an independent auditor\n"
-" who checks cryptographic proofs that accumulate at\n"
-" the payment service provider to ensure that the\n"
-" escrow account is managed honestly. This ensures\n"
-" that the payment service provider does not threaten\n"
-" the economy due to fraud."
+"As a payment service provider, the Taler exchange is\n"
+"subject to financial regulation. Financial regulation and\n"
+"regular audits are critical to establish trust. In\n"
+"particular, the Taler design mandates the existence of an\n"
+"independent auditor who checks cryptographic proofs that\n"
+"accumulate at the exchange to ensure that the escrow\n"
+"account is managed honestly. This ensures that the\n"
+"exchange does not threaten the economy due to fraud.\n"
msgstr ""
-#: governments.html.j2:72 index.html.j2:95
+#: governments.html.j2:88 index.html.j2:96
#, fuzzy
msgid "Libre"
msgstr "Libero"
-#: governments.html.j2:74
+#: governments.html.j2:91
msgid ""
-"Taler is free software implementing an open\n"
-" protocol standard. Thus, Taler will enable\n"
-" competition and avoid the monopolization of payment\n"
-" systems that threatens global political and\n"
-" financial stability today."
+"Taler is free software implementing an open protocol\n"
+"standard. Thus, Taler will enable competition and avoid\n"
+"the monopolization of payment systems that threatens\n"
+"global political and financial stability today.\n"
msgstr ""
-#: governments.html.j2:83
+#: governments.html.j2:101
msgid "Efficient"
msgstr "Efficiente"
-#: governments.html.j2:85
+#: governments.html.j2:104
msgid ""
"Taler has an efficient design. Unlike\n"
-" timeline-based payment systems, such as Bitcoin,\n"
-" Taler will not threaten the availability of\n"
-" national electric grids or (significantly)\n"
-" contribute to environmental pollution."
+"Blockchain-based payment systems, such as Bitcoin,\n"
+"Taler will not threaten the availability of\n"
+"national electric grids or (significantly)\n"
+"contribute to environmental pollution.\n"
msgstr ""
-#: governments.html.j2:99
+#: governments.html.j2:120
msgid "Taler and regulation"
msgstr ""
-#: governments.html.j2:101
-msgid "Anti-money laundering (AML)"
+#: governments.html.j2:122
+msgid "Anti money laundering (AML)"
msgstr ""
-#: governments.html.j2:102
+#: governments.html.j2:123
msgid ""
"With Taler, income is visible and can be tied to the contract signed by "
"both parties."
msgstr ""
-#: governments.html.j2:103
-msgid "Know-your-customer (KYC)"
+#: governments.html.j2:124
+msgid "Know your customer (KYC)"
msgstr ""
-#: governments.html.j2:104
+#: governments.html.j2:125
msgid ""
"In Taler, payer and payee are known by their bank accounts when "
"withdrawing or depositing coins respectively"
msgstr ""
-#: governments.html.j2:105
-msgid "Privacy-by-design (GDPR)"
+#: governments.html.j2:126
+msgid "General Data Protection Regulation (GDPR)"
msgstr ""
-#: governments.html.j2:106
+#: governments.html.j2:127
msgid ""
"Taler cryptographically protects citizen's privacy, and by design "
"implements data minimization and privacy by default."
msgstr ""
-#: governments.html.j2:107
-msgid "Competitive banking (PSD2)"
+#: governments.html.j2:128
+msgid "Payment Services Directive (PSD2)"
msgstr ""
-#: governments.html.j2:108
+#: governments.html.j2:129
msgid ""
-"Taler provides an open standard with public APIs contributing to a level "
-"playing field."
+"Taler provides an open standard with public APIs contributing to a "
+"competitive banking sector."
msgstr ""
-#: governments.html.j2:116
+#: governments.html.j2:137
msgid "Taler provides privacy and accountability"
msgstr ""
-#: governments.html.j2:118
+#: governments.html.j2:140
msgid ""
"Taler assumes governments can observe traditional wire transfers\n"
-" entering and leaving the Taler payment system. Starting with "
-"the\n"
-" wire transfers, governments can obtain: "
+"entering and leaving the Taler payment system. Starting with the\n"
+"wire transfers, governments can obtain:\n"
msgstr ""
-#: governments.html.j2:123
+#: governments.html.j2:148
msgid ""
"The total amount of digital currency withdrawn by a\n"
-" customer. The government can impose limits on how much\n"
-" digital cash a customer can withdraw within a\n"
-" given time frame."
+"customer. The government can impose limits on how much\n"
+"digital cash a customer can withdraw within a\n"
+"given time frame.\n"
msgstr ""
-#: governments.html.j2:128
+#: governments.html.j2:157
msgid ""
"The income received by any merchant via the Taler\n"
-" system."
+"system.\n"
msgstr ""
-#: governments.html.j2:131
+#: governments.html.j2:164
msgid ""
-"The exact details of the underlying\n"
-" contract that was signed between customer and\n"
-" merchant. However, this information would\n"
-" typically not include the identity of the\n"
-" customer."
+"The exact details of the underlying contract that was\n"
+"signed between customer and merchant. However, this\n"
+"information would typically not include the identity\n"
+"of the customer.\n"
msgstr ""
-#: governments.html.j2:137
+#: governments.html.j2:174
msgid ""
-"The amounts of\n"
-" digital coins legitimately withdrawn by\n"
-" customers from the exchange, the value of\n"
-" non-redeemed digital coins in customer's\n"
-" wallets, the value and corresponding wire\n"
-" details of deposit operations performed by\n"
-" merchants with the exchange, and the income of\n"
-" the exchange from transaction fees."
+"The amounts of digital coins legitimately withdrawn\n"
+"by customers from the exchange, the value of\n"
+"non-redeemed digital coins in customer's wallets, the\n"
+"value and corresponding wire details of deposit\n"
+"operations performed by merchants with the exchange,\n"
+"and the income of the exchange from transaction fees.\n"
msgstr ""
#: index.html.j2:10
-msgid "Independent One-Click Payments!"
+msgid "One-Click Cash Payments!"
msgstr ""
-#: index.html.j2:12
+#: index.html.j2:13
msgid ""
-"\n"
-" Taler is an electronic payment system under\n"
-" development\n"
-" at <a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make "
-"it operational in 2017.\n"
-" You can learn about Taler on this website, try the <a "
-"href=\"https://demo.taler.net\";>demo</a>\n"
-" and look at our <a href=\"https://docs.taler.net\";>developer</a> "
-"and <a href=\"https://api.taler.net\";>API</a> documentation.\n"
-" "
-msgstr ""
-
-#: index.html.j2:26
-msgid "Practical"
-msgstr ""
-
-#: index.html.j2:29
-msgid ""
-"\n"
-" Taler is easy to integrate with existing Web\n"
-" applications. Payments are cryptographically\n"
-" secured and are confirmed within milliseconds with\n"
-" extremely low transaction costs.\n"
-" "
+"GNU Taler is an electronic payment system under development at\n"
+"<a href=\"http://www.inria.fr/\";>Inria</a>. We expect to make it\n"
+"operational in 2017. You can learn about Taler on this website,\n"
+"try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+"our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+"href=\"https://api.taler.net\";>API</a> documentation.\n"
msgstr ""
-#: index.html.j2:39
-msgid "Stable"
+#: index.html.j2:28
+msgid "Practical"
msgstr ""
-#: index.html.j2:42
+#: index.html.j2:31
msgid ""
-"\n"
-" Taler does not introduce a new currency with\n"
-" fluctuation risks, and instead uses a digital\n"
-" wallet holding coins in reserve. Taler's\n"
-" cryptographic coins correspond to existing\n"
-" currencies, such as US Dollars, Euros or even\n"
-" Bitcoins.\n"
-" "
+"Taler is easy to integrate with existing Web\n"
+"applications. Payments are cryptographically\n"
+"secured and are confirmed within milliseconds with\n"
+"extremely low transaction costs.\n"
msgstr ""
-#: index.html.j2:54
-msgid "Security-focused"
-msgstr ""
-
-#: index.html.j2:57
+#: index.html.j2:44
msgid ""
-"\n"
-" By design Taler does not suffer from many classes\n"
-" of security problems such as phishing or counterfeit.\n"
-" Despite its security features, Taler never rejects a legitimate\n"
-" customer due to a fraud-detection false positive.\n"
-" "
+"Taler does not introduce a new currency. Taler\n"
+"uses a digital wallet storing coins and payment service\n"
+"providers with escrow accounts in existing currencies.\n"
+"Thus, Taler's cryptographic coins correspond to existing\n"
+"currencies, such as US Dollars, Euros or even Bitcoins.\n"
msgstr ""
-#: index.html.j2:72
+#: index.html.j2:58
msgid ""
-"\n"
-" When using Taler, merchants cannot hide their income from tax\n"
-" collection authorities. Unlike cash and most digital currencies,"
-"\n"
-" Taler helps prevent black markets. Taler is not suitable for\n"
-" illegal activities.\n"
-" "
+"By design Taler does not suffer from many classes\n"
+"of security problems such as phishing or counterfeit.\n"
+"Despite its security features, Taler never rejects a legitimate\n"
+"customer due to a fraud-detection false positive.\n"
msgstr ""
-#: index.html.j2:82
-msgid "Privacy-friendly"
+#: index.html.j2:73
+msgid ""
+"When using Taler, merchant's revenue is transparent for tax\n"
+"collection authorities. Unlike cash and most digital currencies,\n"
+"Taler helps prevent black markets. Taler is not suitable for\n"
+"illegal activities.\n"
msgstr ""
-#: index.html.j2:84
+#: index.html.j2:85
msgid ""
-"\n"
-" When you pay with Taler, your identity does not\n"
-" have to be revealed to the merchant. Just like\n"
-" payments in cash, nobody else can track how you\n"
-" spent your electronic money. However, you obtain a\n"
-" legally valid proof of payment.\n"
-" "
+"When you pay with Taler, your identity does not\n"
+"have to be revealed to the merchant. Just like\n"
+"payments in cash, nobody else can track how you\n"
+"spent your electronic money. However, you obtain a\n"
+"legally valid proof of payment.\n"
msgstr ""
-#: index.html.j2:98
+#: index.html.j2:99
msgid ""
-"\n"
-" Taler provides protocols and reference implementations that in\n"
-" principle enables anybody to run their own payment "
-"infrastructure,\n"
-" be it individuals, organizations or whole countries. Since the\n"
-" reference implementation is a <a "
-"href=\"http://www.gnu.org/\";>GNU</a>\n"
-" package, it will always remain free software.\n"
-" "
+"Taler provides protocols and reference implementations that in\n"
+"principle enables anybody to run their own payment infrastructure,\n"
+"be it individuals, organizations or whole countries. Since the\n"
+"reference implementation is a <a href=\"http://www.gnu.org/\";>GNU</a>\n"
+"package, it will always remain free software.\n"
msgstr ""
-#: index.html.j2:115
+#: index.html.j2:116
msgid "Paying with Taler"
msgstr ""
-#: index.html.j2:116
+#: index.html.j2:117
msgid ""
-"\n"
-" <p>To pay with Taler, customers install an electronic wallet\n"
-" on their device. Before the first payment, the wallet's balance must"
-"\n"
-" be charged in the desired currency by some other means of "
-"payment.</p>\n"
-" <p>Once the wallet is charged, payments on websites take only one "
-"click,\n"
-" are never falsely rejected by fraud detection and do not post any "
-"risk\n"
-" of phishing or identity theft.</p>\n"
-" "
+"<p>To pay with Taler, customers install an electronic wallet\n"
+"on their device. Before the first payment, the wallet's balance must\n"
+"be charged in the desired currency by some other means of payment.</p>\n"
+"<p>Once the wallet is charged, payments on websites take only one click,\n"
+"are never falsely rejected by fraud detection and do not pose any risk\n"
+"of phishing or identity theft.</p>\n"
msgstr ""
-#: index.html.j2:126
+#: index.html.j2:127
msgid "Receiving payments with Taler"
msgstr ""
-#: index.html.j2:127
+#: index.html.j2:128
msgid ""
-"\n"
-" <p>To receive Taler payments, a merchant needs a bank account\n"
-" in the desired currency. We provide\n"
-" SDKs in various languages to makes the integration painless.\n"
-" The merchant's backend for Taler transaction processing can run\n"
-" on the merchant's premises or hosted.</p>\n"
-" "
+"<p>To receive Taler payments, a merchant needs a bank account\n"
+"in the desired currency. We provide supporting software\n"
+"in various programming languages to make the integration painless.\n"
+"The merchant's backend for Taler transaction processing can run\n"
+"on the merchant's premises or be hosted by a third party.</p>\n"
msgstr ""
-#: index.html.j2:143
+#: index.html.j2:144
msgid "Taler News"
msgstr ""
-#: index.html.j2:147
+#: index.html.j2:148
msgid "Financial News"
msgstr ""
@@ -1012,12 +946,10 @@ msgstr ""
#: investors.html.j2:9
msgid ""
-"\n"
-" We have created a company, Taler Systems SA in\n"
-" Luxembourg.<br>\n"
-" Please contact <tt>address@hidden</tt>\n"
-" if you want to invest in Taler.\n"
-" "
+"We have created a company, Taler Systems SA in\n"
+"Luxembourg.<br>\n"
+"Please contact <tt>address@hidden</tt>\n"
+"if you want to invest in Taler.\n"
msgstr ""
#: investors.html.j2:24
@@ -1026,23 +958,21 @@ msgstr ""
#: investors.html.j2:27
msgid ""
-"\n"
-" Our <a href=\"about.html\">team</a> combines world-class "
-"business leaders,\n"
-" cryptographers, software engineers, civil-rights\n"
-" activists and academics. We are unified by a vision\n"
-" of how payments should work and the goal of\n"
-" imposing this vision upon the world.\n"
-" "
+"Our <a href=\"about.html\">team</a> combines world-class business "
+"leaders,\n"
+"cryptographers, software engineers, civil-rights\n"
+"activists and academics. We are unified by a vision\n"
+"of how payments should work and the goal of\n"
+"imposing this vision upon the world.\n"
msgstr ""
#: investors.html.j2:37
msgid ""
-"\n"
-" We are currently supported by Inria, the French\n"
-" national institute for research in informatics and\n"
-" automation, and the Renewable Freedom Foundation.\n"
-" "
+"We are currently supported by <a href=\"http://www.inria.fr/\";>Inria</a>,"
+" the French\n"
+"national institute for research in informatics and\n"
+"automation, and the <a href=\"https://renewablefreedom.org/\";>Renewable "
+"Freedom Foundation</a>.\n"
msgstr ""
#: investors.html.j2:45
@@ -1051,19 +981,17 @@ msgstr ""
#: investors.html.j2:48
msgid ""
-"\n"
-" All transactions in Taler are secured using <a "
+"All transactions in Taler are secured using <a "
"href=\"bibliography.html\">modern\n"
-" cryptography</a> and trust in all parties is\n"
-" minimized. Financial damage is bounded (for\n"
-" customers, merchants and the exchange) even in the\n"
-" case that systems are compromised and private keys\n"
-" are stolen. Databases can be audited for\n"
-" consistency, resulting in either the detection of\n"
-" compromised systems or the demonstration that\n"
-" participants were honest. Actual transaction costs\n"
-" are fractions of a cent.\n"
-" "
+"cryptography</a> and trust in all parties is\n"
+"minimized. Financial damage is bounded (for\n"
+"customers, merchants and the exchange) even in the\n"
+"case that systems are compromised and private keys\n"
+"are stolen. Databases can be audited for\n"
+"consistency, resulting in either the detection of\n"
+"compromised systems or the demonstration that\n"
+"participants were honest. Actual transaction costs\n"
+"are fractions of a cent.\n"
msgstr ""
#: investors.html.j2:63
@@ -1072,17 +1000,15 @@ msgstr ""
#: investors.html.j2:66
msgid ""
-"\n"
-" The scalable business model for Taler is the operation\n"
-" of the payment service provider, which converts money from\n"
-" traditional payment systems (MasterCard, SEPA,\n"
-" Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
-" electronic coins in the same currency. The customer\n"
-" can then redeem the electronic coins at a merchant,\n"
-" who can exchange them for money represented using\n"
-" traditional payment systems at the exchange. The\n"
-" exchange charges fees to facilitate the transactions.\n"
-" "
+"The scalable business model for Taler is the operation\n"
+"of the payment service provider, which converts money from\n"
+"traditional payment systems (MasterCard, SEPA, UPI,\n"
+"Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+"electronic coins in the same currency. The customer\n"
+"can then redeem the electronic coins at a merchant,\n"
+"who can exchange them for money represented using\n"
+"traditional payment systems at the exchange. The\n"
+"exchange charges fees to facilitate the transactions.\n"
msgstr ""
#: investors.html.j2:85
@@ -1095,13 +1021,10 @@ msgstr ""
#: investors.html.j2:110
msgid ""
-"\n"
-" The payment service operator runs the <em>Taler exchange</em>.\n"
-" The exchange charges <b>transaction fees</b> to customers or "
-"merchants.\n"
-" Its operational expenses are from wire transfers with the banking\n"
-" system and the operation of the computing infrastructure.\n"
-" "
+"The payment service operator runs the <em>Taler exchange</em>.\n"
+"The exchange charges <b>transaction fees</b> to customers or merchants.\n"
+"Its operational expenses are from wire transfers with the banking\n"
+"system and the operation of the computing infrastructure.\n"
msgstr ""
#: investors.html.j2:120
@@ -1134,146 +1057,143 @@ msgstr ""
msgid "Advantages for Merchants"
msgstr ""
-#: merchants.html.j2:6
+#: merchants.html.j2:8
msgid ""
"Taler is a cost-effective electronic payment system\n"
-" which provides you with cryptographic proof that\n"
-" the payment worked correctly within milliseconds.\n"
-" Your Web customers pay with previously unknown\n"
-" levels of convenience without risk of fraud."
+"which provides you with cryptographic proof that\n"
+"the payment worked correctly within milliseconds.\n"
+"Your Web customers pay with previously unknown\n"
+"levels of convenience without risk of fraud.\n"
msgstr ""
-#: merchants.html.j2:18
+#: merchants.html.j2:22
msgid "Fast"
msgstr "Veloce"
-#: merchants.html.j2:20
+#: merchants.html.j2:25
msgid ""
"Processing transactions with Taler is fast,\n"
-" allowing you to confirm the transaction with your\n"
-" customer virtually immediately. Your customers\n"
-" will appreciate that they do not have to type in\n"
-" credit card information and play the "verified\n"
-" by" game. By making payments significantly\n"
-" more convenient for your customers, you may be able\n"
-" to use Taler for small transactions that would not\n"
-" work with credit card payments due to the mental\n"
-" overhead for customers."
+"allowing you to confirm the transaction with your\n"
+"customer virtually immediately. Your customers\n"
+"will appreciate that they do not have to type in\n"
+"credit card information and play the "verified\n"
+"by" game. By making payments significantly\n"
+"more convenient for your customers, you may be able\n"
+"to use Taler for small transactions that would not\n"
+"work with credit card payments due to the mental\n"
+"overhead for customers.\n"
msgstr ""
-#: merchants.html.j2:35
+#: merchants.html.j2:44
msgid ""
-"You will have cryptographic proof of payment from\n"
-" the Taler payment service provider. Taler does not\n"
-" require you to undergo any particular security\n"
-" audits (such as PCI DSS), processes or procedures,\n"
-" as you never handle sensitive customer account\n"
-" information. Your systems will have customer\n"
-" contracts with qualified signatures for all\n"
-" transactions which you can use in court in case of\n"
-" disputes."
+"You will have cryptographic proof of payment from the\n"
+"Taler payment service provider. With Taler you never\n"
+"handle sensitive customer account information and thus\n"
+"do not have to undergo any particular security audits\n"
+"(such as PCI DSS). Your systems will have customer\n"
+"contracts with qualified signatures for all\n"
+"transactions which you can use in court in case of\n"
+"disputes.\n"
msgstr ""
-#: merchants.html.j2:47
-msgid "Free Software"
-msgstr "Free Software"
-
-#: merchants.html.j2:49
+#: merchants.html.j2:61
msgid ""
"Taler is free software, and you can use the\n"
-" liberally-licensed reference code as a starting\n"
-" point to integrate Taler into your services. To use\n"
-" Taler, you do not need to pay license fees, and the\n"
-" free software development model will ensure that\n"
-" you can select from many competent integrators for\n"
-" support."
+"liberally-licensed reference code as a starting\n"
+"point to integrate Taler into your services. To use\n"
+"Taler, you do not need to pay license fees, and the\n"
+"free software development model will ensure that\n"
+"you can select from many competing integrators for\n"
+"support.\n"
msgstr ""
-#: merchants.html.j2:61
-msgid "Low Fees"
-msgstr "Prezzi bassi"
+#: merchants.html.j2:76
+msgid "Cheap"
+msgstr ""
-#: merchants.html.j2:63
+#: merchants.html.j2:79
msgid ""
-"Taler is designed to minimize the work the exchange\n"
-" needs to perform. Combined with Taler's strong\n"
-" security which prevents fraud, payment service\n"
-" providers can operate with very low overhead and\n"
-" thus low transaction fees."
+"Taler is uses efficient cryptographic constructions with low\n"
+"bandwidth and storage requirements. Combined with Taler's strong\n"
+"security which makes fraud impossible, Taler payment service\n"
+"providers can operate with very low overhead and\n"
+"thus offer low transaction fees.\n"
msgstr ""
-#: merchants.html.j2:71
+#: merchants.html.j2:89
msgid "Flexible"
msgstr "Flessibile"
-#: merchants.html.j2:73
+#: merchants.html.j2:92
msgid ""
"Taler can be used for different currencies (such as\n"
-" Euros, US Dollars or Bitcoins) and different\n"
-" payment models limited only by what the payment\n"
-" service provider supports in its interactions."
+"Euros, US Dollars or Bitcoins) and any amount, limited\n"
+"only by applicable regulatation and what denominations\n"
+"the payment service provider supports.\n"
msgstr ""
-#: merchants.html.j2:81
+#: merchants.html.j2:101
msgid "Ethical"
msgstr "Etico"
-#: merchants.html.j2:83
+#: merchants.html.j2:104
msgid ""
"Taler prevents tax evasion and money laundering.\n"
-" Taler's protocols are efficient and do not waste\n"
-" energy. Taler encourages transparency by providing\n"
-" an open standard and free software reference\n"
-" implementations."
+"Taler's protocols are efficient and do not use wasteful\n"
+"proof-of-work calculations. Taler encourages\n"
+"transparency by providing an open standard and free\n"
+"software reference implementations.\n"
msgstr ""
-#: merchants.html.j2:95
+#: merchants.html.j2:119
#, fuzzy
msgid "Manuals for merchants"
msgstr "Documentation"
-#: merchants.html.j2:98
+#: merchants.html.j2:122
msgid "The GNU Taler merchant backend operator manual"
msgstr ""
-#: merchants.html.j2:101
+#: merchants.html.j2:125
msgid "The GNU Taler Web shop integration tutorial (PHP)"
msgstr ""
-#: merchants.html.j2:104
+#: merchants.html.j2:128
msgid "The GNU Taler Web shop integration tutorial (Python)"
msgstr ""
-#: merchants.html.j2:116
+#: merchants.html.j2:140
msgid "The GNU Taler Merchant Backend"
msgstr ""
-#: merchants.html.j2:118
+#: merchants.html.j2:142
msgid "Merchants process payments using the Taler backend:"
msgstr ""
-#: merchants.html.j2:122
+#: merchants.html.j2:147
msgid ""
-"The backend <b>signs</b> and <b>stores</b>\n"
-" proposals made by the merchant to customers.\n"
-" For this, the merchant's frontend needs to give the\n"
-" customer's order in a JSON format to the backend."
+"The backend <b>signs</b> and <b>stores</b> the\n"
+"complete terms of offers made by the merchant to customers.\n"
+"For this, the merchant's frontend needs to give the\n"
+"customer's order in a JSON format to the backend.\n"
msgstr ""
-#: merchants.html.j2:127
+#: merchants.html.j2:156
msgid ""
-"The backend <b>validates</b> and <b>executes</b>\n"
-" payments received from the wallet. The frontend\n"
-" must pass the payment request through to the backend\n"
-" and checks the HTTP status code that is returned."
+"The backend <b>validates</b> payments received from\n"
+"the wallet and <b>executes</b> them with the Taler\n"
+"payment service provider (the exchange). For this,\n"
+"the merchant's frontend must pass the payment\n"
+"request through to the Taler backend and check the\n"
+"HTTP status code that is returned.\n"
msgstr ""
-#: merchants.html.j2:132
+#: merchants.html.j2:167
msgid ""
"The backend can <b>list</b> completed transactions\n"
-" and <b>map</b> aggregated wire transfers to individual\n"
-" business transactions including the exact terms of\n"
-" the contract."
+"and <b>map</b> wire transfers to sets of business\n"
+"transactions, including the exact terms of each\n"
+"contract.\n"
msgstr ""
#: press.html.j2:4
@@ -1459,3 +1379,935 @@ msgstr ""
#~ msgid "The mailinglist"
#~ msgstr ""
+#~ msgid "Security"
+#~ msgstr "Sicurezza"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacy"
+
+#~ msgid "Convenience"
+#~ msgstr "Convenienza"
+
+#~ msgid "Stability"
+#~ msgstr ""
+
+#~ msgid "Anti-money laundering (AML)"
+#~ msgstr ""
+
+#~ msgid "Know-your-customer (KYC)"
+#~ msgstr ""
+
+#~ msgid "Privacy-by-design (GDPR)"
+#~ msgstr ""
+
+#~ msgid "Competitive banking (PSD2)"
+#~ msgstr ""
+
+#~ msgid "Security-focused"
+#~ msgstr ""
+
+#~ msgid "Privacy-friendly"
+#~ msgstr ""
+
+#~ msgid "Free Software"
+#~ msgstr "Free Software"
+
+#~ msgid "Low Fees"
+#~ msgstr "Prezzi bassi"
+
+#~ msgid ""
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler largely functions like digital cash. You\n"
+#~ " withdraw money from your bank account into your\n"
+#~ " electronic wallet, and can henceforth spend digital\n"
+#~ " cash. The electronic wallet can carry multiple\n"
+#~ " currencies.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Taler uses modern cryptography, ensuring that there\n"
+#~ " is no counterfeit. Your digital wallet is safer\n"
+#~ " than your physical wallet. At most, you can lose\n"
+#~ " its contents because your computer or mobile is\n"
+#~ " irreparably damaged or compromised. Unlike a\n"
+#~ " physical wallet, you can make backups to secure\n"
+#~ " against data loss."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Your transactions are private, neither the payment\n"
+#~ " service provider nor merchant needs to learn your\n"
+#~ " identity. There is no need to give out credit card\n"
+#~ " numbers or other sensitive information. The merchant\n"
+#~ " will only be able to do exactly the transaction you\n"
+#~ " agreed to."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You will be able to withdraw money to replenish the\n"
+#~ " digital coins in your wallet using your credit card\n"
+#~ " or wire transfers. Afterwards you can pay with\n"
+#~ " one-click using the Taler wallet, which optionally\n"
+#~ " keeps your transaction history on your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Coins in your digital wallet will be of the same\n"
+#~ " denomination as the cash in your physical wallet.\n"
+#~ " Taler is not a crypto-currency, so you do not have\n"
+#~ " to worry about cryto-currency related value\n"
+#~ " fluctuations. Banking with Taler is subject to the\n"
+#~ " usual government protections for financial\n"
+#~ " services."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We currently provide a <a "
+#~ "href=\"wallet.html\">wallet browser extension</a> "
+#~ "for Chromium, Chrome, Firefox, Opera\n"
+#~ " and Edge. Wallets for mobile"
+#~ " phones and other platforms will be"
+#~ " available in the future.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You can see how Taler "
+#~ "works in practice by visiting our "
+#~ "<a href=\"https://demo.taler.net\";>demo page</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Customers interact with the Taler system using\n"
+#~ " the Taler wallet:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>withdraw</b> electronic coins, the customer\n"
+#~ " transfers funds from his bank account to the Taler\n"
+#~ " payment service provider (the exchange). The wire\n"
+#~ " transfer subject must match a code identifying the\n"
+#~ " customer's wallet. After the wire transfer is\n"
+#~ " complete, the wallet will automatically withdraw the\n"
+#~ " coins from the exchange."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To <b>spend</b> electronic coins, a merchant must\n"
+#~ " cause the wallet to display a proposal for some\n"
+#~ " purchase. The wallet will ask the customer for\n"
+#~ " one-click confirmation. Payment is then instant.\n"
+#~ " Transaction histories and "
+#~ "digitally signed contracts\n"
+#~ " can be preserved by the wallet."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The customer can use the wallet to <b>review</b> his\n"
+#~ " balance. The wallet can contain different\n"
+#~ " currencies, and may be shared across\n"
+#~ " devices. Customers can make"
+#~ " backups of the wallet to\n"
+#~ " secure its contents against hardware failures."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " An archived, public mailing list for GNU Taler is\n"
+#~ " hosted at\n"
+#~ " <a "
+#~
"href=\"https://lists.gnu.org/mailman/listinfo/taler\";>https://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ " You can send messages to the "
+#~ "list\n"
+#~ " at <a href=\"mailto:address@hidden";>address@hidden</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Team members are generally reachable at\n"
+#~ " <tt>address@hidden</tt>. All of us\n"
+#~ " support receiving GnuPG encrypted e-mails.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We track open feature requests and bugs in our\n"
+#~ " <a href=\"https://gnunet.org/bugs/\";>Bug tracker</a>,\n"
+#~ " which is shared with the GNUnet project.\n"
+#~ " You can also report bugs or feature requests to the\n"
+#~ " mailing list.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " For non-technical commercial requests, please contact\n"
+#~ " <tt>ceo AT taler.net</tt>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is free software implementing an open\n"
+#~ " protocol. Anybody is welcome"
+#~ " to integrate our reference\n"
+#~ " implementation into their applications. Different\n"
+#~ " components of Taler are being made available under\n"
+#~ " different licenses. The Affero GPLv3+ is used for the\n"
+#~ " exchange, the LGPLv3+ is used for reference code\n"
+#~ " demonstrating integration with merchant platforms, and\n"
+#~ " licenses like GPLv3+ are used for\n"
+#~ " wallets and related customer-facing software. We are\n"
+#~ " open for constructive suggestions for maximizing the\n"
+#~ " adoption of this payment platform.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is designed to work on the Internet. To\n"
+#~ " ensure that Taler payments can work with\n"
+#~ " restrictive network setups, Taler uses a RESTful\n"
+#~ " protocol over HTTP or HTTPS. Taler's security does\n"
+#~ " not depend upon the use of HTTPS, but obviously\n"
+#~ " merchants may choose to offer HTTPS for consistency\n"
+#~ " and because it generally is better for privacy\n"
+#~ " compared to HTTP. Taler uses JSON to encode\n"
+#~ " structure data, making it easy to integrate Taler\n"
+#~ " with existing Web applications. Taler's protocol\n"
+#~ " is documented in\n"
+#~ " detail at <a "
+#~ "href=\"https://api.taler.net/\";>api.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is currently primarily developed by a\n"
+#~ " research team at <a "
+#~ "href=\"http://www.inria.fr/\";>Inria</a> and\n"
+#~ " <a href=\"https://gnunet.org/\";>GNUnet</a>. However,\n"
+#~ " contributions from anyone are welcome. Our Git\n"
+#~ " repositories can be cloned using the Git and HTTP\n"
+#~ " access methods against <tt>git.taler.net</tt> with\n"
+#~ " the name of the respective repository. A list of\n"
+#~ " repositories can be found in\n"
+#~ " our <a href=\"https://git.taler.net/\";>GitWeb</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " In addition to this website, the <a\n"
+#~ " href=\"https://git.taler.net/\";>documented "
+#~ "code</a> and\n"
+#~ " the <a href=\"https://api.taler.net/\";>API\n"
+#~ " documentation</a>. Technical papers can be found in\n"
+#~ " our <a href=\"bibliography.html\">bibliography</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have a mailing list for developer discussions.\n"
+#~ " You can subscribe to or read the list archive at\n"
+#~ " <a "
+#~
"href=\"http://lists.gnu.org/mailman/listinfo/taler\";>http://lists.gnu.org/mailman/listinfo/taler</a>."
+#~ "\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have <a href=\"https://buildbot.net/\";>Buildbot</a>\n"
+#~ " automation tests to detect regressions and check for\n"
+#~ " portability at <a\n"
+#~ " "
+#~ "href=\"https://buildbot.taler.net/\";>buildbot.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We use\n"
+#~ " <a "
+#~ "href=\"http://ltp.sourceforge.net/coverage/lcov.php\";>LCOV</a>\n"
+#~ " to analyze the code coverage of our tests, the\n"
+#~ " results are available\n"
+#~ " at <a "
+#~ "href=\"https://lcov.taler.net/\";>lcov.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We\n"
+#~ " use <a href=\"https://gnunet.org/gauger\";>Gauger</a>\n"
+#~ " for performance regression analysis of the exchange\n"
+#~ " backend\n"
+#~ " at <a "
+#~ "href=\"https://gauger.taler.net/\";>gauger.taler.net</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The Taler system consists of protocols executed among\n"
+#~ " a number of actors as "
+#~ "illustrated in the illustration on the"
+#~ " right.\n"
+#~ " Typical transactions involve the following steps:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " A customer instructs his <b>bank</b> to\n"
+#~ " transfer funds from his account to the Taler\n"
+#~ " exchange (top left). In the subject of the\n"
+#~ " transaction, he includes an authentication\n"
+#~ " token from his electronic <b>wallet</b>. In\n"
+#~ " Taler terminology, the customer creates a\n"
+#~ " reserve at the exchange.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the exchange has received the wire\n"
+#~ " transfer, it allows the customer's electronic\n"
+#~ " wallet to <b>withdraw</b> electronic coins.\n"
+#~ " The electronic coins are digital\n"
+#~ " representations of the original currency from\n"
+#~ " the transfer. It is important to note that the\n"
+#~ " exchange does not learn the "serial\n"
+#~ " numbers" of the coins created in this\n"
+#~ " process, so it cannot tell later which customer\n"
+#~ " purchased what at which merchant. The use of\n"
+#~ " Taler does not change the currency or the total\n"
+#~ " value of the funds (except for fees which the\n"
+#~ " exchange may charge for the service).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Once the customer has the digital coins in his\n"
+#~ " wallet, the wallet can be used to <b>spend</b>\n"
+#~ " the coins with merchant portals that support\n"
+#~ " the Taler payment system and accept the\n"
+#~ " respective exchange as a business partner\n"
+#~ " (bottom arrow). This creates a digital contract\n"
+#~ " signed by the customer's coins and the\n"
+#~ " merchant. If necessary, the customer can later\n"
+#~ " use this digitally signed contract in a court\n"
+#~ " of law to prove the exact terms of the contract\n"
+#~ " and that he paid the respective amount. The\n"
+#~ " customer does not learn the banking details of\n"
+#~ " the merchant, and Taler does not require the\n"
+#~ " merchant to learn the identity of the\n"
+#~ " customer. Naturally, the customer can spend any\n"
+#~ " fraction of his digital coins (the system takes\n"
+#~ " care of customers getting change).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Merchants receiving digital\n"
+#~ " coins <b>deposit</b> the respective claims\n"
+#~ " that resulted from the contract signing with\n"
+#~ " the customer at the exchange to redeem the\n"
+#~ " coins. The deposit step does not reveal the\n"
+#~ " details of the contract between the customer\n"
+#~ " and the merchant or the identity of the\n"
+#~ " customer to the exchange in any way. However,\n"
+#~ " the exchange does learn the identity of the\n"
+#~ " merchant via the provided bank routing\n"
+#~ " information. The merchant can, for example\n"
+#~ " when compelled by the state for taxation,\n"
+#~ " provide information linking the individual\n"
+#~ " deposit to the respective contract signed by\n"
+#~ " the customer. Thus, the exchange's database\n"
+#~ " allows the state to enforce that merchants pay\n"
+#~ " applicable taxes (and do not engage in illegal\n"
+#~ " contracts).\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Finally, the exchange transfers funds\n"
+#~ " corresponding to the digital coins redeemed by\n"
+#~ " the merchants to the merchant's <b>bank</b>\n"
+#~ " account. The exchange may combine multiple\n"
+#~ " small transactions into one larger bank\n"
+#~ " transfer. The merchant can query the exchange\n"
+#~ " about the relationship between the bank\n"
+#~ " transfers and the individual claims that were\n"
+#~ " deposited.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Most importantly, the exchange keeps\n"
+#~ " cryptographic proofs that allow it to\n"
+#~ " demonstrate that it is operating correctly to\n"
+#~ " third parties. The system requires an\n"
+#~ " external <b>auditor</b>, such as a\n"
+#~ " government-appointed financial regulatory body,\n"
+#~ " to frequently verify the exchange's databases\n"
+#~ " and check that its bank balance matches the\n"
+#~ " total value of the remaining coins in\n"
+#~ " circulation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Without the auditor, the exchange operators\n"
+#~ " could embezzle funds they are holding in\n"
+#~ " reserve. Customers and merchants cannot cheat\n"
+#~ " each other or the exchange. If any party's\n"
+#~ " computers are compromised, the financial damage\n"
+#~ " is limited to the respective party and\n"
+#~ " proportional to the funds they have in\n"
+#~ " circulation during the period of the\n"
+#~ " compromise.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler does not use any Blockchain technology or Bitcoin directly.\n"
+#~ "Taler is not based on proof-of-"
+#~ "work or any other distributed consensus"
+#~ "\n"
+#~ "mechanism. Instead Taler is based on blind signatures.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>It would be possible, however, to withdraw coins denominated in\n"
+#~ "Bitcoin into a Taler wallet (with an appropriate exchange), which\n"
+#~ "would give some benefits over plain Bitcoin, such as instant\n"
+#~ "confirmation times.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Your wallet stores digital coins and thus ultimately your computer\n"
+#~ "holds your balance. The exchange keeps funds matching all unspent\n"
+#~ "coins in an escrow bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Since the digital coins of value "
+#~ "in your wallet are anonymized, the\n"
+#~ ""
+#~ "exchange can not assist you in recovering a lost or stolen wallet.\n"
+#~ "Just like with a physical wallet for cash, you are responsible for\n"
+#~ "keeping it safe.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>The risk of losing a wallet can be mitigated by making backups or\n"
+#~ "keeping the balance reasonably low.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>In case of a compromise of one of your devices, an attacker can\n"
+#~ "spend coins from your wallet. Checking your balance might reveal\n"
+#~ "to you that your device has been compromised.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>If your friend provides goods or "
+#~ "services for you in exchange for a"
+#~ "\n"
+#~ "payment, they can easily set up a Taler merchant and receive the\n"
+#~ "payment in their bank account.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Future versions of the Taler wallet may allow exchanging coins\n"
+#~ "among friends directly as well.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler wallets can store digital coins corresponding to multiple\n"
+#~ "different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>Taler currently does not offer conversion between currencies.</p>\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "<p>Your wallet stores digital coins that are <a\n"
+#~ "href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly\n"
+#~ "signed</a> by an exchange. The use "
+#~ "of a blind signature protects your\n"
+#~ ""
+#~ "privacy as it prevents the exchange from knowing which coin it signed\n"
+#~ "for which customer.</p>\n"
+#~ "\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides accountability to ensure business operate\n"
+#~ " legally, while also respecting civil liberties of\n"
+#~ " citizens. Taler is a payment system based on\n"
+#~ " open standards and free software. Taler needs\n"
+#~ " governments as they set a financial framework and act as\n"
+#~ " trusted regulators. Taler contributes to digital\n"
+#~ " sovereignty in the critical financial infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler was built with the goal of fighting corruption and\n"
+#~ " supporting taxation. With Taler, the receiver of any\n"
+#~ " form of payment is easily identified by the government,\n"
+#~ " and the merchant can be "
+#~ "compelled to provide the contract\n"
+#~ " that was accepted by the customer. Governments can use\n"
+#~ " this data to tax businesses and individuals based on\n"
+#~ " their income, making tax evasion and black markets less\n"
+#~ " viable.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Thus, despite offering anonymity for citizens spending\n"
+#~ " digital cash to buy goods and services, Taler also\n"
+#~ " ensures that the state can observe incoming funds. This\n"
+#~ " can be used to ensure businesses engage only in legal\n"
+#~ " activities, and do not evade income tax, sales tax or\n"
+#~ " value-added tax. However, this observational capability\n"
+#~ " does not extend to the immediate personal domain. In\n"
+#~ " particular, monitoring does not cover shared access to\n"
+#~ " funds with trusted friends and family, or synchronizing\n"
+#~ " wallets across multiple devices.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler's payments are cryptographically secured. Thus,\n"
+#~ " customers, merchants and the "
+#~ "Taler payment service provider\n"
+#~ " (the exchange) can mathematically\n"
+#~ " demonstrate their lawful behavior in court in case of\n"
+#~ " disputes. Financial damages are strictly limited,\n"
+#~ " improving economic security for individuals, merchants,\n"
+#~ " the exchange and the state.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " As a payment service provider, the Taler exchange is\n"
+#~ " subject to financial regulation."
+#~ " Financial regulation and\n"
+#~ " regular audits are critical to establish trust. In\n"
+#~ " particular, the Taler design "
+#~ "mandates the existence of an\n"
+#~ " independent auditor who checks cryptographic proofs that\n"
+#~ " accumulate at the exchange to ensure that the escrow\n"
+#~ " account is managed honestly. This ensures that the\n"
+#~ " exchange does not threaten the economy due to fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software implementing an open protocol\n"
+#~ " standard. Thus, Taler will enable competition and avoid\n"
+#~ " the monopolization of payment systems that threatens\n"
+#~ " global political and financial stability today.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler has an efficient design. Unlike\n"
+#~ " Blockchain-based payment systems, such as Bitcoin,\n"
+#~ " Taler will not threaten the availability of\n"
+#~ " national electric grids or (significantly)\n"
+#~ " contribute to environmental pollution.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler assumes governments can "
+#~ "observe traditional wire transfers\n"
+#~ " entering and leaving the "
+#~ "Taler payment system. Starting with the"
+#~ "\n"
+#~ " wire transfers, governments can obtain:\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The total amount of digital currency withdrawn by a\n"
+#~ " customer. The government can"
+#~ " impose limits on how much\n"
+#~ " digital cash a customer can withdraw within a\n"
+#~ " given time frame.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The income received by any merchant via the Taler\n"
+#~ " system.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ " The exact details of the underlying contract that was\n"
+#~ " signed between customer and merchant. However, this\n"
+#~ " information would typically not include the identity\n"
+#~ " of the customer.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The amounts of digital coins legitimately withdrawn\n"
+#~ " by customers from the exchange, the value of\n"
+#~ " non-redeemed digital coins"
+#~ " in customer's wallets, the\n"
+#~ " value and corresponding wire details of deposit\n"
+#~ " operations performed by merchants with the exchange,\n"
+#~ " and the income of the"
+#~ " exchange from transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " GNU Taler is an electronic payment system under development at\n"
+#~ " <a href=\"http://www.inria.fr/\";>Inria</a>. "
+#~ "We expect to make it\n"
+#~ " operational in 2017. You can "
+#~ "learn about Taler on this website,\n"
+#~ ""
+#~ " try the <a href=\"https://demo.taler.net\";>demo</a> and look at\n"
+#~ " our <a href=\"https://docs.taler.net\";>developer</a> and <a\n"
+#~ " href=\"https://api.taler.net\";>API</a> documentation.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is easy to integrate with existing Web\n"
+#~ " applications. Payments are cryptographically\n"
+#~ " secured and are confirmed within milliseconds with\n"
+#~ " extremely low transaction costs.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler does not introduce a new currency. Taler\n"
+#~ " uses a digital wallet storing coins and payment service\n"
+#~ " providers with escrow accounts in existing currencies.\n"
+#~ " Thus, Taler's cryptographic coins correspond to existing\n"
+#~ " currencies, such as US Dollars, Euros or even Bitcoins.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " By design Taler does not suffer from many classes\n"
+#~ " of security problems such as phishing or counterfeit.\n"
+#~ " Despite its security features, "
+#~ "Taler never rejects a legitimate\n"
+#~ " customer due to a fraud-detection false positive.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When using Taler, merchant's revenue is transparent for tax\n"
+#~ " collection authorities. Unlike cash"
+#~ " and most digital currencies,\n"
+#~ " Taler helps prevent black markets. Taler is not suitable for\n"
+#~ " illegal activities.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " When you pay with Taler, your identity does not\n"
+#~ " have to be revealed to the merchant. Just like\n"
+#~ " payments in cash, nobody else can track how you\n"
+#~ " spent your electronic money. However, you obtain a\n"
+#~ " legally valid proof of payment.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler provides protocols and "
+#~ "reference implementations that in\n"
+#~ " principle enables anybody to run"
+#~ " their own payment infrastructure,\n"
+#~ " be it individuals, organizations "
+#~ "or whole countries. Since the\n"
+#~ " reference implementation is a <a"
+#~ " href=\"http://www.gnu.org/\";>GNU</a>\n"
+#~ " package, it will always remain free software.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To pay with Taler, customers install an electronic wallet\n"
+#~ " on their device. Before the "
+#~ "first payment, the wallet's balance must"
+#~ "\n"
+#~ " be charged in the desired "
+#~ "currency by some other means of "
+#~ "payment.</p>\n"
+#~ " <p>Once the wallet is charged, "
+#~ "payments on websites take only one "
+#~ "click,\n"
+#~ " are never falsely rejected by "
+#~ "fraud detection and do not pose "
+#~ "any risk\n"
+#~ " of phishing or identity theft.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " <p>To receive Taler payments, a merchant needs a bank account\n"
+#~ " in the desired currency. We provide supporting software\n"
+#~ " in various programming languages to"
+#~ " make the integration painless.\n"
+#~ " The merchant's backend for Taler transaction processing can run\n"
+#~ " on the merchant's premises or be hosted by a third party.</p>\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We have created a company, Taler Systems SA in\n"
+#~ " Luxembourg.<br>\n"
+#~ " Please contact <tt>address@hidden</tt>\n"
+#~ " if you want to invest in Taler.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Our <a href=\"about.html\">team</a> "
+#~ "combines world-class business leaders,\n"
+#~ " cryptographers, software engineers, civil-rights\n"
+#~ " activists and academics. We are unified by a vision\n"
+#~ " of how payments should work and the goal of\n"
+#~ " imposing this vision upon the world.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " We are currently supported "
+#~ "by <a href=\"http://www.inria.fr/\";>Inria</a>, the"
+#~ " French\n"
+#~ " national institute for research in informatics and\n"
+#~ " automation, and the <a "
+#~ "href=\"https://renewablefreedom.org/\";>Renewable Freedom "
+#~ "Foundation</a>.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " All transactions in Taler "
+#~ "are secured using <a "
+#~ "href=\"bibliography.html\">modern\n"
+#~ " cryptography</a> and trust in all parties is\n"
+#~ " minimized. Financial damage is bounded (for\n"
+#~ " customers, merchants and the exchange) even in the\n"
+#~ " case that systems are compromised and private keys\n"
+#~ " are stolen. Databases can be audited for\n"
+#~ " consistency, resulting in either the detection of\n"
+#~ " compromised systems or the demonstration that\n"
+#~ " participants were honest. Actual transaction costs\n"
+#~ " are fractions of a cent.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The scalable business model for Taler is the operation\n"
+#~ " of the payment service "
+#~ "provider, which converts money from\n"
+#~ " traditional payment systems (MasterCard, SEPA, UPI,\n"
+#~ " Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous\n"
+#~ " electronic coins in the same currency. The customer\n"
+#~ " can then redeem the electronic coins at a merchant,\n"
+#~ " who can exchange them for money represented using\n"
+#~ " traditional payment systems at the exchange. The\n"
+#~ " exchange charges fees to facilitate the transactions.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The payment service operator runs the <em>Taler exchange</em>.\n"
+#~ " The exchange charges <b>transaction "
+#~ "fees</b> to customers or merchants.\n"
+#~ " Its operational expenses are from"
+#~ " wire transfers with the banking\n"
+#~ " system and the operation of the computing infrastructure.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is a cost-effective electronic payment system\n"
+#~ " which provides you with cryptographic proof that\n"
+#~ " the payment worked correctly within milliseconds.\n"
+#~ " Your Web customers pay with previously unknown\n"
+#~ " levels of convenience without risk of fraud.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Processing transactions with Taler is fast,\n"
+#~ " allowing you to confirm the transaction with your\n"
+#~ " customer virtually immediately. Your customers\n"
+#~ " will appreciate that they do not have to type in\n"
+#~ " credit card information and play the "verified\n"
+#~ " by" game. By making payments significantly\n"
+#~ " more convenient for your customers, you may be able\n"
+#~ " to use Taler for small transactions that would not\n"
+#~ " work with credit card payments due to the mental\n"
+#~ " overhead for customers.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " You will have cryptographic proof of payment from the\n"
+#~ " Taler payment service provider. With Taler you never\n"
+#~ " handle sensitive customer account information and thus\n"
+#~ " do not have to undergo any particular security audits\n"
+#~ " (such as PCI DSS). Your systems will have customer\n"
+#~ " contracts with qualified signatures for all\n"
+#~ " transactions which you can use in court in case of\n"
+#~ " disputes.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is free software, and you can use the\n"
+#~ " liberally-licensed reference code as a starting\n"
+#~ " point to integrate Taler into your services. To use\n"
+#~ " Taler, you do not need to pay license fees, and the\n"
+#~ " free software development model will ensure that\n"
+#~ " you can select from many competing integrators for\n"
+#~ " support.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler is uses efficient "
+#~ "cryptographic constructions with low\n"
+#~ " bandwidth and storage "
+#~ "requirements. Combined with Taler's strong"
+#~ "\n"
+#~ " security which makes fraud "
+#~ "impossible, Taler payment service\n"
+#~ " providers can operate with very low overhead and\n"
+#~ " thus offer low transaction fees.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler can be used for different currencies (such as\n"
+#~ " Euros, US Dollars or Bitcoins) and any amount, limited\n"
+#~ " only by applicable regulatation and what denominations\n"
+#~ " the payment service provider supports.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " Taler prevents tax evasion and money laundering.\n"
+#~ " Taler's protocols are efficient"
+#~ " and do not use wasteful\n"
+#~ " proof-of-work calculations. Taler encourages\n"
+#~ " transparency by providing an open standard and free\n"
+#~ " software reference implementations.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>signs</b> and <b>stores</b> the\n"
+#~ " complete terms of offers "
+#~ "made by the merchant to customers.\n"
+#~ ""
+#~ " For this, the merchant's frontend needs to give the\n"
+#~ " customer's order in a JSON format to the backend.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend <b>validates</b> payments received from\n"
+#~ " the wallet and <b>executes</b> them with the Taler\n"
+#~ " payment service provider (the exchange). For this,\n"
+#~ " the merchant's frontend must pass the payment\n"
+#~ " request through to the Taler backend and check the\n"
+#~ " HTTP status code that is returned.\n"
+#~ " "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ " The backend can <b>list</b> completed transactions\n"
+#~ " and <b>map</b> wire transfers to sets of business\n"
+#~ " transactions, including the exact terms of each\n"
+#~ " contract.\n"
+#~ " "
+#~ msgstr ""
+
diff --git a/merchants.html.j2 b/merchants.html.j2
index f5c9b42..56425d4 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -3,12 +3,16 @@
<div class="jumbotron">
<div class="container text-center">
<h1>{{ _("Advantages for Merchants") }}</h1>
- <p>{{ _("Taler is a cost-effective electronic payment system
+
+ <p>
+ {% trans %}
+ Taler is a cost-effective electronic payment system
which provides you with cryptographic proof that
the payment worked correctly within milliseconds.
Your Web customers pay with previously unknown
- levels of convenience without risk of fraud.")
- }}</p>
+ levels of convenience without risk of fraud.
+ {% endtrans %}
+ </p>
</div>
</div>
@@ -17,7 +21,9 @@
<div class="col-lg-4">
<h3>{{ _("Fast") }}</h3>
- <p>{{ _("Processing transactions with Taler is fast,
+ <p>
+ {% trans %}
+ Processing transactions with Taler is fast,
allowing you to confirm the transaction with your
customer virtually immediately. Your customers
will appreciate that they do not have to type in
@@ -26,65 +32,83 @@
more convenient for your customers, you may be able
to use Taler for small transactions that would not
work with credit card payments due to the mental
- overhead for customers.") }}</p>
+ overhead for customers.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-4">
<h3>{{ _("Secure") }}</h3>
- <p>{{ _("You will have cryptographic proof of payment from
- the Taler payment service provider. Taler does not
- require you to undergo any particular security
- audits (such as PCI DSS), processes or procedures,
- as you never handle sensitive customer account
- information. Your systems will have customer
+ <p>
+ {% trans %}
+ You will have cryptographic proof of payment from the
+ Taler payment service provider. With Taler you never
+ handle sensitive customer account information and thus
+ do not have to undergo any particular security audits
+ (such as PCI DSS). Your systems will have customer
contracts with qualified signatures for all
transactions which you can use in court in case of
- disputes.") }}</p>
+ disputes.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-4">
- <h3>{{ _("Free Software") }}</h3>
+ <h3>{{ _("Free") }}</h3>
- <p>{{ _("Taler is free software, and you can use the
+ <p>
+ {% trans %}
+ Taler is free software, and you can use the
liberally-licensed reference code as a starting
point to integrate Taler into your services. To use
Taler, you do not need to pay license fees, and the
free software development model will ensure that
- you can select from many competent integrators for
- support.") }}</p>
+ you can select from many competing integrators for
+ support.
+ {% endtrans %}
+ </p>
</div>
</div>
<div class="row">
<div class="col-lg-4">
- <h3>{{ _("Low Fees") }}</h3>
+ <h3>{{ _("Cheap") }}</h3>
- <p>{{ _("Taler is designed to minimize the work the exchange
- needs to perform. Combined with Taler's strong
- security which prevents fraud, payment service
+ <p>
+ {% trans %}
+ Taler is uses efficient cryptographic constructions with low
+ bandwidth and storage requirements. Combined with Taler's
strong
+ security which makes fraud impossible, Taler payment service
providers can operate with very low overhead and
- thus low transaction fees.") }}</p>
-
+ thus offer low transaction fees.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-4">
<h3>{{ _("Flexible") }}</h3>
- <p>{{ _("Taler can be used for different currencies (such as
- Euros, US Dollars or Bitcoins) and different
- payment models limited only by what the payment
- service provider supports in its interactions.")
- }}</p>
-
+ <p>
+ {% trans %}
+ Taler can be used for different currencies (such as
+ Euros, US Dollars or Bitcoins) and any amount, limited
+ only by applicable regulatation and what denominations
+ the payment service provider supports.
+ {% endtrans %}
+ </p>
</div>
<div class="col-lg-4">
<h3>{{ _("Ethical") }}</h3>
- <p>{{ _("Taler prevents tax evasion and money laundering.
- Taler's protocols are efficient and do not waste
- energy. Taler encourages transparency by providing
- an open standard and free software reference
- implementations.") }}</p>
+ <p>
+ {% trans %}
+ Taler prevents tax evasion and money laundering.
+ Taler's protocols are efficient and do not use wasteful
+ proof-of-work calculations. Taler encourages
+ transparency by providing an open standard and free
+ software reference implementations.
+ {% endtrans %}
+ </p>
</div>
</div>
@@ -119,20 +143,34 @@
<p>
<ul>
- <li>{{ _("The backend <b>signs</b> and <b>stores</b>
- proposals made by the merchant to customers.
+ <li>
+ {% trans %}
+ The backend <b>signs</b> and <b>stores</b> the
+ complete terms of offers made by the merchant to customers.
For this, the merchant's frontend needs to give the
- customer's order in a JSON format to the backend.") }}</li>
-
- <li>{{ _("The backend <b>validates</b> and <b>executes</b>
- payments received from the wallet. The frontend
- must pass the payment request through to the backend
- and checks the HTTP status code that is returned.") }}</li>
-
- <li>{{ _("The backend can <b>list</b> completed transactions
- and <b>map</b> aggregated wire transfers to individual
- business transactions including the exact terms of
- the contract.") }} </li>
+ customer's order in a JSON format to the backend.
+ {% endtrans %}
+ </li>
+
+ <li>
+ {% trans %}
+ The backend <b>validates</b> payments received from
+ the wallet and <b>executes</b> them with the Taler
+ payment service provider (the exchange). For this,
+ the merchant's frontend must pass the payment
+ request through to the Taler backend and check the
+ HTTP status code that is returned.
+ {% endtrans %}
+ </li>
+
+ <li>
+ {% trans %}
+ The backend can <b>list</b> completed transactions
+ and <b>map</b> wire transfers to sets of business
+ transactions, including the exact terms of each
+ contract.
+ {% endtrans %}
+ </li>
</ul>
</p>
diff --git a/news.html.j2.inc b/news.html.j2.inc
index 0412f4e..fa3cc7e 100644
--- a/news.html.j2.inc
+++ b/news.html.j2.inc
@@ -1,3 +1,4 @@
+{% include "news/2017-03.inc" %}
{% include "news/2017-02.inc" %}
{% include "news/2017-01.inc" %}
{% include "news/2016-12.inc" %}
diff --git a/news/2017-02.inc b/news/2017-03.inc
similarity index 56%
copy from news/2017-02.inc
copy to news/2017-03.inc
index d776e36..1e75caf 100644
--- a/news/2017-02.inc
+++ b/news/2017-03.inc
@@ -1,8 +1,8 @@
- <h3>02-2016: Florian Dold explains Taler at 50p in Bangalore</h3>
+ <h3>03-2016: Sva explains GNU Taler at FOSSASIA in Singapore</h3>
<p>
- <video id="video" poster="/videos/dold50p.png" autobuffer=""
height="180" width="320" controls="controls">
- <source src="/videos/dold50p.webm" type="video/webm">
- <source src="/videos/dold50p.ogv" type="video/ogv">
+ <video id="video" poster="/videos/taler2017fossasia.png"
autobuffer="" height="180" width="320" controls="controls">
+ <source src="/videos/taler2017fossasia.webm" type="video/webm">
+ <source src="/videos/taler2017fossasia.ogv" type="video/ogv">
</video>
- <a rel="license"
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";><img
alt="Creative Commons License" style="border-width:0"
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/";
property="dct:title">Taler</span>" by <span
xmlns:cc="http://creativecommons.org/ns#"; property="cc:attributionName">Florian
Dold, produced by 50p</span> is licensed under a <a rel="license"
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";>Creative C
[...]
+ <a rel="license"
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";><img
alt="Creative Commons License" style="border-width:0"
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/";
property="dct:title">Taler</span>" by <span
xmlns:cc="http://creativecommons.org/ns#"; property="cc:attributionName">Sva,
produced by Engineers.SG</span> is licensed under a <a rel="license"
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US";>Creative C
[...]
</p>
diff --git a/template.py b/template.py
index 78a801f..c0c42ea 100755
--- a/template.py
+++ b/template.py
@@ -19,6 +19,9 @@ import os
env =
jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(__file__)),
extensions=["jinja2.ext.i18n"],
+ lstrip_blocks=True,
+ trim_blocks=True,
+ undefined=jinja2.StrictUndefined,
autoescape=False)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-www] branch stable updated (7609502 -> 4c79fe7),
gnunet <=