resolving merge conflicts

author: Christian Grothoff <christian@grothoff.org> 2017-07-29 21:54:57 +0200
committer: Christian Grothoff <christian@grothoff.org> 2017-07-29 21:54:57 +0200
commit: 83d6043ba3fb3eb25f489f5a10db7778055ae617 (patch)
tree: 855c818d3ca9f00d03516f8cfb8b11f9f0ee447a
parent: e773fff8a353488d54b394f6926721ccd8f6ae18 (diff)
parent: bdc1672325bcd3649c02f9936d2681230a389b7c (diff)
13 files changed, 3279 insertions, 5077 deletions
diff --git a/.gitignore b/.gitignore
index 1f4aab86..04bdd4b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ de/
 fr/
 it/
 es/
+
+__pycache__
+*.pyc
diff --git a/Makefile b/Makefile
index 7ca561cc..904cf2cf 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ locale/messages.pot: *.j2 common/*.j2 common/*.j2.inc
 
 # Update translation (.po) files with new strings.
 locale-update: locale/messages.pot
-	pybabel update -i locale/messages.pot -d locale -l en --previous
-	pybabel update -i locale/messages.pot -d locale -l de --previous
-	pybabel update -i locale/messages.pot -d locale -l fr --previous
-	pybabel update -i locale/messages.pot -d locale -l it --previous
-	pybabel update -i locale/messages.pot -d locale -l es --previous
+	msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot 
+	msgmerge -U -m --previous locale/de/LC_MESSAGES/messages.po locale/messages.pot
+	msgmerge -U -m --previous locale/fr/LC_MESSAGES/messages.po locale/messages.pot
+	msgmerge -U -m --previous locale/es/LC_MESSAGES/messages.po locale/messages.pot
+	msgmerge -U -m --previous locale/it/LC_MESSAGES/messages.po locale/messages.pot
 
 	if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
 
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index fb1a08dc..8678b25a 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -2,42 +2,42 @@
   <div class="container-fluid">
     <ul class="nav navbar-nav">
       <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="taler_home" href="index.html">Taler</a></li>
-      <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }}</a></li>
-      <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }}</a></li>
+      <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }} </a></li>
+      <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }} </a></li>
       <li class="{{ 'active' if filename == 'governments.html' else '' }}"><a href="governments.html">{{ _("Governments") }}</a></li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") }} <span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="architecture.html">{{ _("System Architecture") }} </a></li>
+          <li><a href="architecture.html">{{ _("System Architecture") }}</a></li>
           <li><a href="faq.html">{{ _("FAQ") }}</a></li>
           <li><a href="glossary.html">{{ _("Glossary") }}</a></li>
-          <li><a href="developers.html">{{ _("Developer Introduction") }}</a></li>
-          <li><a href="copyright.html">{{ _("Copyright for Contributors") }}</a></li>
+          <li><a href="developers.html">{{ _("Developer Introduction") }} </a></li>
+          <li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li>
           <li><a href="bibliography.html">{{ _("Bibliography") }}</a></li>
         </ul>
       </li>
     </ul>
-    <ul class="nav navbar-right navbar-form">
+    <ul class="nav navbar-right">
       <li>
         <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-          <img src="{{ url('images/'+lang+'.png') }}" alt="{{lang}}" />
+          <img  src="{{ url('images/languageicon.svg') }}" height="35" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}]
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
           <li>
-           <a href="{{ self_localized('en') }}"><img src="{{ url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
+           <a href="{{ self_localized('en') }}">English [en]</a>
           </li>
           <li>
-           <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
+           <a href="{{ self_localized('de') }}">Deutsch [de]</a>
           </li>
           <li>
-           <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
+           <a href="{{ self_localized('fr') }}">Français [fr]</a>
           </li>
           <li>
-           <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
+           <a href="{{ self_localized('it') }}">Italiano [it]</a>
           </li>
           <li>
-           <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
+           <a href="{{ self_localized('es') }}">Español [es]</a>
           </li>
         </ul>
       </li>
diff --git a/i18nfix.py b/i18nfix.py
index b0395507..331706af 100644
--- a/i18nfix.py
+++ b/i18nfix.py
@@ -10,11 +10,24 @@ Extract translations from a Jinja2 template, stripping leading newlines.
 import jinja2.ext
 import re
 
-r = re.compile(r"\n[ \t]+")
+def normalize(message):
+    message = message.strip()
+    # collapse whitespaces (including newlines) into one space.
+    message = re.sub("\s+", " ", message)
+    return message
+
 
 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)
+        message = normalize(message)
         yield lineno, funcname, message, comments
+
+def wrap_gettext(f):
+    """
+    Call gettext with whitespace normalized.
+    """
+    def wrapper(message):
+        message = normalize(message)
+        return f(message)
+    return wrapper
diff --git a/images/languageicon.svg b/images/languageicon.svg
new file mode 100644
index 00000000..22d58da6
--- /dev/null
+++ b/images/languageicon.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2411.2 2794" style="enable-background:new 0 0 2411.2 2794;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+</style>
+<g id="Layer_2">
+</g>
+<g id="Layer_x5F_1_x5F_1">
+	<g>
+		<polygon points="1204.6,359.2 271.8,30 271.8,2060.1 1204.6,1758.3 		"/>
+		<polygon class="st0" points="1182.2,358.1 2150.6,29 2150.6,2059 1182.2,1757.3 		"/>
+		<polygon class="st0" points="30,2415.4 1182.2,2031.4 1182.2,357.9 30,742 		"/>
+		<polygon points="1707.2,2440.7 1870.5,2709.4 1956.6,2459.8 		"/>
+		<g>
+			<path d="M421.7,934.8c-6.1-6,8,49.1,27.6,68.9c34.8,35.1,61.9,39.6,76.4,40.2c32,1.3,71.5-8,94.9-17.8
+				c22.7-9.7,62.4-30,77.5-59.6c3.2-6.3,11.9-17,6.4-43.2c-4.2-20.2-17-27.3-32.7-26.2c-15.7,1.1-63.2,13.7-86.1,20.8
+				c-23,7-70.3,21.4-90.9,25.8C474.3,948.2,429,941.7,421.7,934.8z"/>
+			<path d="M1003.1,1593.7c-9.1-3.3-196.9-81.1-223.6-93.9c-21.8-10.5-75.2-33.1-100.4-43.3c70.8-109.2,115.5-191.6,121.5-204.1
+				c11-23,86-169.6,87.7-178.7c1.7-9.1,3.8-42.9,2.2-51c-1.7-8.2-29.1,7.6-66.4,20.2c-37.4,12.6-108.4,58.8-135.8,64.6
+				c-27.5,5.7-115.5,39.1-160.5,54c-45,14.9-130.2,40.9-165.2,50.4c-35.1,9.5-65.7,10.2-85.3,16.2c0,0,2.6,27.5,7.8,35.7
+				c5.2,8.2,23.7,28.4,45.3,34.1c21.6,5.7,57.3,3.4,73.6-0.3c16.3-3.8,44.4-17.5,48.2-23.6c3.8-6.1-2-24.9,4.5-30.6
+				c6.5-5.6,92.2-25.7,124.6-35.4c32.4-10,156.3-52.6,173.1-50.5c-5.3,17.7-105,215.1-137.1,274c-32.1,58.9-218.6,318-258.3,363.6
+				c-30.1,34.7-103.2,123.5-128.5,143.6c6.4,1.8,51.6-2.1,59.9-7.2c51.3-31.6,136.9-138.1,164.4-170.5
+				c81.9-96,153.8-196.8,210.8-283.4h0.1c11.1,4.6,100.9,77.8,124.4,94c23.4,16.2,115.9,67.8,136,76.4c20,8.7,97.1,44.2,100.3,32.2
+				C1029.4,1668,1012.2,1597.1,1003.1,1593.7z"/>
+		</g>
+		<path class="st1" d="M569,2572c18,11,35,20,54,29c38,19,81,39,122,54c56,21,112,38,168,51c31,7,65,13,98,18c3,0,92,11,110,11h90
+			c35-3,68-5,103-10c28-4,59-9,89-16c22-5,45-10,67-17c21-6,45-14,68-22c15-5,31-12,47-18c13-6,29-13,44-19c18-8,39-19,59-29
+			c16-8,34-18,51-28c13-7,43-30,59-30c18,0,30,16,30,30c0,29-39,38-57,51c-19,13-42,23-62,34c-40,21-81,39-120,54
+			c-51,19-107,37-157,49c-19,4-38,9-57,12c-10,2-114,18-143,18h-132c-35-3-72-7-107-12c-31-5-64-11-95-18c-24-5-50-12-73-19
+			c-40-11-79-25-117-40c-69-26-141-60-209-105c-12-8-13-16-13-25c0-15,11-29,29-29C531,2546,563,2569,569,2572z"/>
+		<path class="st1" d="M1151,2009L61,2372V764l1090-363V2009z M1212,354v1680c-1,5-3,10-7,15c-2,3-6,7-9,8c-25,10-1151,388-1166,388
+			c-12,0-23-8-29-21c0-1-1-2-1-4V739c2-5,3-12,7-16c8-11,22-13,31-16c17-6,1126-378,1142-378C1190,329,1212,336,1212,354z"/>
+		<path class="st1" d="M2120,2017l-907-282V380l907-308V2017z M2181,32v2023c-1,23-17,33-32,33c-13,0-107-32-123-37
+			c-126-39-253-78-378-117c-28-9-57-18-84-27c-24-7-50-15-74-23c-107-33-216-66-323-102c-4-1-14-15-14-18V351c2-5,4-11,9-15
+			c8-9,351-123,486-168c36-13,487-168,501-168C2167,0,2181,13,2181,32z"/>
+		<polygon points="2411.2,2440.7 1199.5,2054.5 1204.6,373.2 2411.2,757.2 		"/>
+		<g>
+			<path class="st2" d="M1800.3,1124.6L1681.4,1412l218.6,66.3L1800.3,1124.6z M1729,853.2l156.1,47.3l284.4,1025l-160.3-48.7
+				l-57.6-210.4L1620.2,1566l-71.3,171.4l-160.4-48.7L1729,853.2z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 73b8b8b1..1a66f8a0 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1,29 +1,29 @@
-
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-07-29 20:32+0200\n"
+"POT-Creation-Date: 2017-07-29 21:52+0200\n"
 "PO-Revision-Date: 2017-06-02 09:46+0100\n"
 "Last-Translator: Stefan Kügel <skuegel@web.de>\n"
-"Language: en\n"
 "Language-Team: de <LL@li.org, de@taler.net>\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: about.html.j2:8
 msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
-msgstr "GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
+msgstr ""
+"GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
 
 #: about.html.j2:13
 msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
-" industries, …."
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
 msgstr ""
 "Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
 "verschiedenen Branchen..."
@@ -110,17 +110,22 @@ msgid "Advantages for Citizens"
 msgstr "Vorteile für Taler-Nutzer"
 
 #: citizens.html.j2:9
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler largely functions like digital cash. You withdraw money from your bank "
+"account into your electronic wallet, and can henceforth spend digital cash. "
+"The electronic wallet can carry multiple currencies."
 msgstr ""
 "Taler funktioniert generell ähnlich wie jede virtuelle Währung. Man "
-"überweist Geld vom konventionellen Bankkonto in die Taler-Geldbörse, um "
-"aus ihrem Guthaben Einkäufe zu bezahlen. Die elektronische Geldbörse kann"
-" dabei mehrere digitale Währungen enthalten."
+"überweist Geld vom konventionellen Bankkonto in die Taler-Geldbörse, um aus "
+"ihrem Guthaben Einkäufe zu bezahlen. Die elektronische Geldbörse kann dabei "
+"mehrere digitale Währungen enthalten."
 
 #: citizens.html.j2:25 governments.html.j2:58 index.html.j2:56
 #: merchants.html.j2:41
@@ -128,102 +133,136 @@ 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"
+#, fuzzy
+#| 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."
+msgid ""
+"Taler uses modern cryptography, ensuring that there is no counterfeit. Your "
+"digital wallet is safer than your physical wallet. At most, you can lose its "
+"contents because your computer or mobile is irreparably damaged or "
+"compromised. Unlike a physical wallet, you can make backups to secure "
 "against data loss."
 msgstr ""
 "Taler verwendet aktuellste kryptografische Mittel, die jeden Betrug "
-"systematisch unterbinden. Die elektronische Geldbörse ist sogar sicherer "
-"als echtes Geld. Ein Schaden entsteht erst, wenn das Speichermedium, das "
-"die Daten der Geldbörse enthält, zerstört oder entwendet wurde. Dies kann"
-" man jedoch verhindern durch regelmäßige Datensicherungen und Backups des"
-" Speichermediums."
+"systematisch unterbinden. Die elektronische Geldbörse ist sogar sicherer als "
+"echtes Geld. Ein Schaden entsteht erst, wenn das Speichermedium, das die "
+"Daten der Geldbörse enthält, zerstört oder entwendet wurde. Dies kann man "
+"jedoch verhindern durch regelmäßige Datensicherungen und Backups des "
+"Speichermediums."
 
 #: citizens.html.j2:37 index.html.j2:84
 msgid "Private"
 msgstr "Anonym"
 
 #: citizens.html.j2:39
-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 ""
-"Die Überweisungen der Käufer sind anonym. Weder das Taler-Bezahlsystem "
-"noch die Verkäufer können die Identität der Käufer feststellen. Es "
-"besteht auch keine Notwendigkeit, sensible Daten wie Kreditkartennummern "
-"anzugeben. Die Verkäufer können zudem nur Überweisungen ausführen lassen,"
-" die die Käufer genehmigt haben."
+#, fuzzy
+#| 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."
+msgid ""
+"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."
+msgstr ""
+"Die Überweisungen der Käufer sind anonym. Weder das Taler-Bezahlsystem noch "
+"die Verkäufer können die Identität der Käufer feststellen. Es besteht auch "
+"keine Notwendigkeit, sensible Daten wie Kreditkartennummern anzugeben. Die "
+"Verkäufer können zudem nur Überweisungen ausführen lassen, die die Käufer "
+"genehmigt haben."
 
 #: citizens.html.j2:50
 msgid "Convenient"
 msgstr "Bequem"
 
 #: 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."
+#, fuzzy
+#| 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."
+msgid ""
+"You will be able to withdraw money to replenish the digital coins in your "
+"wallet using your credit card or wire transfers. Afterwards you can pay with "
+"one-click using the Taler wallet, which optionally keeps your transaction "
+"history on your computer."
 msgstr ""
 "Die Aufladung der Taler-Geldbörse erfolgt durch eine gewöhnliche "
-"Banküberweisung oder mit einer Kreditkarte. Die Zahlung mit der Geldbörse"
-" funktioniert so einfach wie ein Mausklick. Im Gegensatz zu Bargeld "
-"entfällt das lästige Zählen von Banknoten und Münzen. Alle Transaktionen "
-"können optional auf dem Computer gespeichert werden."
+"Banküberweisung oder mit einer Kreditkarte. Die Zahlung mit der Geldbörse "
+"funktioniert so einfach wie ein Mausklick. Im Gegensatz zu Bargeld entfällt "
+"das lästige Zählen von Banknoten und Münzen. Alle Transaktionen können "
+"optional auf dem Computer gespeichert werden."
 
 #: citizens.html.j2:61 index.html.j2:42
 msgid "Stable"
 msgstr "Stabil"
 
 #: 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."
-msgstr ""
-"Münzen in der Taler-Geldbörse haben die gleiche Wertigkeit wie physisches"
-" Geld in der normalen Brieftasche. Taler ist keine Kryptowährung, "
-"nominale Wertänderungen der Zahlungsmittel sind ausgeschlossen. Das "
-"Bezahlsystem Taler unterliegt der gewöhnlichen Bankenaufsicht und "
-"staatlichen Währungskontrolle."
+#, fuzzy
+#| 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."
+msgid ""
+"Coins in your digital wallet will be of the same denomination as the cash in "
+"your physical wallet. Taler is not a crypto-currency, so you do not have to "
+"worry about cryto-currency related value fluctuations. Banking with Taler is "
+"subject to the usual government protections for financial services."
+msgstr ""
+"Münzen in der Taler-Geldbörse haben die gleiche Wertigkeit wie physisches "
+"Geld in der normalen Brieftasche. Taler ist keine Kryptowährung, nominale "
+"Wertänderungen der Zahlungsmittel sind ausgeschlossen. Das Bezahlsystem "
+"Taler unterliegt der gewöhnlichen Bankenaufsicht und staatlichen "
+"Währungskontrolle."
 
 #: citizens.html.j2:79
 msgid "Wallet Browser Extension"
 msgstr "Die Taler-Geldbörse als Browser-Erweiterung"
 
 #: citizens.html.j2:81
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"We currently provide a <a href=\"wallet.html\">wallet browser extension</a> "
+"for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile phones and "
+"other platforms will be available in the future."
 msgstr ""
 "Zurzeit gibt es Erweiterungen für die Browser Chromium, Chrome, Firefox, "
-"Opera und Edge. Für Mobilfunktelefone und andere Plattformen entwickeln "
-"wir ebenfalss Taler-Geldbörsen."
+"Opera und Edge. Für Mobilfunktelefone und andere Plattformen entwickeln wir "
+"ebenfalss Taler-Geldbörsen."
 
 #: citizens.html.j2:88
 msgid "Taler Demo"
 msgstr "Demoversion von Taler"
 
 #: citizens.html.j2:90
+#, fuzzy
+#| msgid ""
+#| "You can see how Taler works in practice by visiting our <a href=\"https://"
+#| "demo.taler.net\">demo page</a>.\n"
 msgid ""
-"You can see how Taler works in practice by visiting our <a "
-"href=\"https://demo.taler.net\">demo page</a>.\n"
+"You can see how Taler works in practice by visiting our <a href=\"https://"
+"demo.taler.net\">demo page</a>."
 msgstr ""
 "Auf der <a href=\"https://demo.taler.net\">Demo-Seite</a> kann man die "
 "Funktionsweise von Taler kennenlernen."
@@ -233,19 +272,28 @@ msgid "The Taler Wallet for customers"
 msgstr "Die Taler-Geldbörse für Käufer"
 
 #: citizens.html.j2:105
-msgid ""
-"Customers interact with the Taler system using\n"
-"the Taler wallet:"
+#, fuzzy
+#| msgid ""
+#| "Customers interact with the Taler system using\n"
+#| "the Taler wallet:"
+msgid "Customers interact with the Taler system using the Taler wallet:"
 msgstr "So verwendet man die Taler-Geldbörse:"
 
 #: citizens.html.j2:110
-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"
+#, fuzzy
+#| 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."
+msgid ""
+"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."
 msgstr ""
 "Um digitale Münzen in die Taler-Geldbörse zu laden, müssen Taler-Nutzer "
@@ -255,34 +303,46 @@ msgstr ""
 "Wechselstube an die Taler-Geldbörse erfolgt automatisch."
 
 #: citizens.html.j2:118
-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 ""
-"Die Abbuchung von der privaten Taler-Geldbörse erfolgt nur, wenn sich die"
-" Verkäufer den jeweiligen Rechnungsbetrag von der Taler-Geldbörse "
-"anzeigen lassen und die Käufer mit einem Klick die Zahlung dieses "
-"Rechnungsbetrags bestätigen. Die Zahlung geschieht dann im selben "
-"Augenblick. Alle Zahlungen und digital signierte Kaufverträge können in "
-"der Geldbörse gespeichert werden."
+#, fuzzy
+#| 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."
+msgid ""
+"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."
+msgstr ""
+"Die Abbuchung von der privaten Taler-Geldbörse erfolgt nur, wenn sich die "
+"Verkäufer den jeweiligen Rechnungsbetrag von der Taler-Geldbörse anzeigen "
+"lassen und die Käufer mit einem Klick die Zahlung dieses Rechnungsbetrags "
+"bestätigen. Die Zahlung geschieht dann im selben Augenblick. Alle Zahlungen "
+"und digital signierte Kaufverträge können in der Geldbörse gespeichert "
+"werden."
 
 #: citizens.html.j2:125
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"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."
 msgstr ""
 "Taler-Nutzer können in der Geldbörse alle Buchungen überprüfen. Die "
-"Geldbörse kann verschiedene Währungen enthalten und auf unterschiedlichen"
-" Endgeräten angezeigt werden. Es ist möglich, mehrere Kopien der Taler-"
-"Geldbörse zu speichern, um sie auch bei einem Geräteausfall oder Verlust "
-"der Hardware stets gesichert zu haben."
+"Geldbörse kann verschiedene Währungen enthalten und auf unterschiedlichen "
+"Endgeräten angezeigt werden. Es ist möglich, mehrere Kopien der Taler-"
+"Geldbörse zu speichern, um sie auch bei einem Geräteausfall oder Verlust der "
+"Hardware stets gesichert zu haben."
 
 #: contact.html.j2:6
 msgid "Contact information"
@@ -293,28 +353,37 @@ msgid "The mailing list"
 msgstr "Die Mailing-Liste"
 
 #: contact.html.j2:15
-msgid ""
-"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:taler@gnu.org\">taler@gnu.org</a>.\n"
-msgstr ""
-"Eine öffentliche Mailing-Liste wird archiviert bereitgestellt auf <a "
-"href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/mailman/listinfo/taler</a>."
-" Nachrichten an die Liste sendet man an <a "
-"href=\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
+#, fuzzy
+#| msgid ""
+#| "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:taler@gnu.org\">taler@gnu.org</a>.\n"
+msgid ""
+"An archived, public mailing list for GNU Taler is hosted at <a href="
+"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
+msgstr ""
+"Eine öffentliche Mailing-Liste wird archiviert bereitgestellt auf <a href="
+"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+"mailman/listinfo/taler</a>. Nachrichten an die Liste sendet man an <a href="
+"\"mailto:taler@gnu.org\">taler@gnu.org</a>.\n"
 
 #: contact.html.j2:25
 msgid "Contacting individuals"
 msgstr "Mitglieder kontaktieren"
 
 #: contact.html.j2:27
+#, fuzzy
+#| msgid ""
+#| "Team members are generally reachable at\n"
+#| "<tt>LASTNAME@taler.net</tt>.  All of us\n"
+#| "support receiving GnuPG encrypted e-mails.\n"
 msgid ""
-"Team members are generally reachable at\n"
-"<tt>LASTNAME@taler.net</tt>.  All of us\n"
-"support receiving GnuPG encrypted e-mails.\n"
+"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
+"us support receiving GnuPG encrypted e-mails."
 msgstr ""
 "Die Mitglieder des Taler-Teams sind erreichbar mit einer E-Mail an "
 "<tt>LASTNAME@taler.net</tt>, die GnuPG-verschlüsselt empfangen wird. "
@@ -324,16 +393,20 @@ msgid "Reporting bugs"
 msgstr "Funktionserweiterungen, Fehler und Bugs melden"
 
 #: contact.html.j2:38
-msgid ""
-"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 ""
-"Wir verfolgen Bugs und Anfragen zu erweiterten Funktionalitäten zusammen "
-"mit dem GNU-Project auf <a href=\"https://gnunet.org/bugs/\">Bug "
-"tracker</a>.\n"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"We track open feature requests and bugs in our <a href=\"https://gnunet.org/"
+"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
+"also report bugs or feature requests to the mailing list."
+msgstr ""
+"Wir verfolgen Bugs und Anfragen zu erweiterten Funktionalitäten zusammen mit "
+"dem GNU-Project auf <a href=\"https://gnunet.org/bugs/\">Bug tracker</a>.\n"
 " Bugs oder Funktionsanfragen können auch an die Mailing-Liste gesendet "
 "werden."
 
@@ -342,9 +415,13 @@ msgid "Executive team"
 msgstr "Leitungsteam"
 
 #: contact.html.j2:51
+#, fuzzy
+#| msgid ""
+#| "For non-technical commercial requests, please contact\n"
+#| "<tt>ceo AT taler.net</tt>.\n"
 msgid ""
-"For non-technical commercial requests, please contact\n"
-"<tt>ceo AT taler.net</tt>.\n"
+"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
+"tt>."
 msgstr ""
 "Für alle nicht-technischen Anfragen bitten wir <tt>ceo AT taler.net</tt> "
 "anzumailen.\n"
@@ -355,32 +432,28 @@ msgstr ""
 
 #: copyright.html.j2:8
 msgid ""
-"<p>Contributors to GNU Taler with Git access must sign the\n"
-"<a href=\"/pdf/copyright.pdf\">copyright assignment</a> to\n"
-"ensure that the <a href=\"https://gnunet.org/git/gnunet-"
-"ev.git/tree/gnunet_taler_agreement.tex\">GNUnet e.V. --- Taler Systems SA"
-" agreement\n"
-"on licensing and collaborative development</a> of the GNUnet and\n"
-"GNU Taler projects is satisfied.</p>\n"
+"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
 msgstr ""
 
 #: copyright.html.j2:17
 msgid ""
-"<p>The agreements ensure that the code will continue to be made\n"
-"available under free software licenses, but gives developers\n"
-"the freedom to move code between GNUnet and GNU Taler without\n"
-"worrying about licenses and the company the ability to\n"
-"dual-license (for example, so that we can distribute via\n"
-"App-stores that are hostile to free software).</p>\n"
+"<p>The agreements ensure that the code will continue to be made available "
+"under free software licenses, but gives developers the freedom to move code "
+"between GNUnet and GNU Taler without worrying about licenses and the company "
+"the ability to dual-license (for example, so that we can distribute via App-"
+"stores that are hostile to free software).</p>"
 msgstr ""
 
 #: copyright.html.j2:25
 msgid ""
-"<p>Minor contributions (basically, anyone without Git access) do\n"
-"not require copyright assignment. Pseudonymous contributions are\n"
-"accepted, in this case simply sign the agreement with your\n"
-"pseudonym. Scanned copies are sufficient, but snail mail is\n"
-"preferred.</p>\n"
+"<p>Minor contributions (basically, anyone without Git access) do not require "
+"copyright assignment. Pseudonymous contributions are accepted, in this case "
+"simply sign the agreement with your pseudonym. Scanned copies are "
+"sufficient, but snail mail is preferred.</p>"
 msgstr ""
 
 #: developers.html.j2:5
@@ -392,324 +465,431 @@ msgid "Free"
 msgstr "Frei"
 
 #: developers.html.j2:15
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"GNU Taler is free software implementing an open protocol. Anybody is welcome "
+"to integrate our reference implementation into their applications. Different "
+"components of Taler are being made available under different licenses. The "
+"Affero GPLv3+ is used for the exchange, the LGPLv3+ is used for reference "
+"code demonstrating integration with merchant platforms, and licenses like "
+"GPLv3+ are used for wallets and related customer-facing software. We are "
+"open for constructive suggestions for maximizing the adoption of this "
+"payment platform."
 msgstr ""
 "Taler ist freie Software mit einem offenen Protokoll. Alle Programmierer "
-"sind dazu eingeladen, unseren Referenzcode in ihre Anwendungen "
-"aufzunehmen. Verschiedene Taler-Komponenten sind unter verschiedenen "
-"Lizenzformen verfügbar. Für die Taler-Wechselstube (den \"Exchange\") "
-"dient Affero GPLv3+, LGPLv3+ für den Referenzcode der Integration in "
-"Handelsplattformen, GPLv3+-Lizenzen gelten für Geldbörsen (\"Wallets\") "
-"und Kundeninteraktions-Software. Wir heißen alle konstruktiven Vorschläge"
-" willkommen, die Taler-Komponenten in eigene Anwendungen zu integrieren."
+"sind dazu eingeladen, unseren Referenzcode in ihre Anwendungen aufzunehmen. "
+"Verschiedene Taler-Komponenten sind unter verschiedenen Lizenzformen "
+"verfügbar. Für die Taler-Wechselstube (den \"Exchange\") dient Affero "
+"GPLv3+, LGPLv3+ für den Referenzcode der Integration in Handelsplattformen, "
+"GPLv3+-Lizenzen gelten für Geldbörsen (\"Wallets\") und Kundeninteraktions-"
+"Software. Wir heißen alle konstruktiven Vorschläge willkommen, die Taler-"
+"Komponenten in eigene Anwendungen zu integrieren."
 
 #: developers.html.j2:32
 msgid "RESTful"
 msgstr "RESTful-basiert"
 
 #: developers.html.j2:35
-msgid ""
-"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 ""
-"Taler als Bezahlsystem benutzt ein RESTful-Protokoll über HTTP oder "
-"HTTPS-Verbindungen, um auch in eingeschränkten Netzwerkumgebungen sichere"
-" Buchungen über das Internet auszuführen. Das Sicherheitskonzept von "
-"Taler hängt nicht vom Gebrauch der HTTPS-Verbindungen ab, doch werden "
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler is designed to work on the Internet. To ensure that Taler payments can "
+"work with restrictive network setups, Taler uses a RESTful protocol over "
+"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
+"obviously merchants may choose to offer HTTPS for consistency and because it "
+"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
+"structure data, making it easy to integrate Taler with existing Web "
+"applications. Taler's protocol is documented in detail at <a href=\"https://"
+"api.taler.net/\">api.taler.net</a>."
+msgstr ""
+"Taler als Bezahlsystem benutzt ein RESTful-Protokoll über HTTP oder HTTPS-"
+"Verbindungen, um auch in eingeschränkten Netzwerkumgebungen sichere "
+"Buchungen über das Internet auszuführen. Das Sicherheitskonzept von Taler "
+"hängt nicht vom Gebrauch der HTTPS-Verbindungen ab, doch werden "
 "Handelsunternehmen aus Gründen der Konsistenz mit ihren Webshops HTTPS "
 "vorziehen, das auch gerade wegen seiner Verschlüsselung eine noch höhere "
-"Sicherheit als eine HTTP-Verbindung bietet. Taler nutzt das JSON-Format, "
-"um strukturierte Daten zu verschlüsseln. Dies erleichtert die Integration"
-" von Taler in bestehende Webseiten und Anwendungen. Eine ausführliche "
-"Dokumentation des Taler-Protokolls befindet sich auf <a "
-"href=\"https://api.taler.net/\">api.taler.net</a>."
+"Sicherheit als eine HTTP-Verbindung bietet. Taler nutzt das JSON-Format, um "
+"strukturierte Daten zu verschlüsseln. Dies erleichtert die Integration von "
+"Taler in bestehende Webseiten und Anwendungen. Eine ausführliche "
+"Dokumentation des Taler-Protokolls befindet sich auf <a href=\"https://api."
+"taler.net/\">api.taler.net</a>."
 
 #: developers.html.j2:58
 msgid "Code"
 msgstr "Code"
 
 #: developers.html.j2:61
-msgid ""
-"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 ""
-"Taler wird hauptsächlich entwickelt von einem Forscherteam bei <a "
-"href=\"http://www.inria.fr/\">Inria</a> und <a "
-"href=\"https://gnunet.org/\">GNUnet</a>. Unterstützung von externen "
-"Beitragenden ist immer willkommen. Unsere Git-Repositories können mit Git"
-" und HTTP-basiertem Zugriff auf <tt>git.taler.net</tt> geklont werden. "
-"Eine Liste der Repositories befindet sich auf unserem <a "
-"href=\"https://git.taler.net/\">GitWeb</a>."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler is currently primarily developed by a 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 "
+"repositories can be found in our <a href=\"https://git.taler.net/\">GitWeb</"
+"a>."
+msgstr ""
+"Taler wird hauptsächlich entwickelt von einem Forscherteam bei <a href="
+"\"http://www.inria.fr/\">Inria</a> und <a href=\"https://gnunet.org/"
+"\">GNUnet</a>. Unterstützung von externen Beitragenden ist immer willkommen. "
+"Unsere Git-Repositories können mit Git und HTTP-basiertem Zugriff auf "
+"<tt>git.taler.net</tt> geklont werden. Eine Liste der Repositories befindet "
+"sich auf unserem <a href=\"https://git.taler.net/\">GitWeb</a>."
 
 #: developers.html.j2:75
 msgid "Documentation"
 msgstr "Dokumentation"
 
 #: developers.html.j2:78
-msgid ""
-"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 ""
-"Neben dieser Webseite bestehen die <a href=\"https://git.taler.net"
-"/\">Code-Dokumentation</a>, die <a "
-"href=\"https://docs.taler.net\">Entwicklerdokumentation</a> und die <a "
-"href=\"https://api.taler.net/\">API-Schnittstellendokumentation</a>. "
-"Wissenschaftliche Literatur findet man in der <a "
-"href=\"bibliography.html\">Bibliographie</a>."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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>. Technical papers can be found in our <a href="
+"\"bibliography.html\">bibliography</a>."
+msgstr ""
+"Neben dieser Webseite bestehen die <a href=\"https://git.taler.net/\">Code-"
+"Dokumentation</a>, die <a href=\"https://docs.taler.net"
+"\">Entwicklerdokumentation</a> und die <a href=\"https://api.taler.net/"
+"\">API-Schnittstellendokumentation</a>. Wissenschaftliche Literatur findet "
+"man in der <a href=\"bibliography.html\">Bibliographie</a>."
 
 #: developers.html.j2:88
 msgid "Discussion"
 msgstr "Diskussion"
 
 #: developers.html.j2:91
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"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>."
 msgstr ""
 "Zum Austausch unter Entwicklern haben wir eine Mailingliste. Um sich "
-"einzutragen oder das Listenarchiv zu lesen besuche man <a "
-"href=\"http://lists.gnu.org/mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/taler</a>."
+"einzutragen oder das Listenarchiv zu lesen besuche man <a href=\"http://"
+"lists.gnu.org/mailman/listinfo/taler\">http://lists.gnu.org/mailman/listinfo/"
+"taler</a>."
 
 #: developers.html.j2:101
 msgid "Regression Testing"
 msgstr "Regressiontests mit Buildbot"
 
 #: developers.html.j2:104
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"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>."
 msgstr ""
 "Unter <a href=\"https://buildbot.taler.net/\">buildbot.taler.net</a> "
-"befinden sich Ergebnisse der Testumgebung <a "
-"href=\"https://buildbot.net/\">Buildbot</a>, um Fehler nach "
-"Modifikationen aufzeigen zu können und die Portabilität des Codes zu "
-"gewährleisten."
+"befinden sich Ergebnisse der Testumgebung <a href=\"https://buildbot.net/"
+"\">Buildbot</a>, um Fehler nach Modifikationen aufzeigen zu können und die "
+"Portabilität des Codes zu gewährleisten."
 
 #: developers.html.j2:113
 msgid "Code Coverage Analysis"
 msgstr "Testabdeckung"
 
 #: 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"
-msgstr ""
-"Wir verwenden <a "
-"href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a>, um die "
-"Testabdeckung unserer Funktionstests zu analysieren, die Ergebnisse sind "
-"auf <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
+#, fuzzy
+#| 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"
+msgid ""
+"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>."
+msgstr ""
+"Wir verwenden <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</"
+"a>, um die Testabdeckung unserer Funktionstests zu analysieren, die "
+"Ergebnisse sind auf <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
 
 #: developers.html.j2:126
 msgid "Performance Analysis"
 msgstr "Performanceanalyse"
 
 #: 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"
+#, fuzzy
+#| 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"
+msgid ""
+"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>."
 msgstr ""
 "Wir verwenden <a href=\"https://gnunet.org/gauger\">Gauger</a>, um die "
-"Performance zu messen. Ergebnisse sind auf <a "
-"href=\"https://gauger.taler.net/\">gauger.taler.net</a>."
+"Performance zu messen. Ergebnisse sind auf <a href=\"https://gauger.taler."
+"net/\">gauger.taler.net</a>."
 
 #: developers.html.j2:145
 msgid "Taler system overview"
 msgstr "Das Taler-System im Überblick"
 
 #: developers.html.j2:148
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"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:"
 msgstr ""
-"Das Taler-Bezahlsystem verwendet Protokolle für den Geldfluss zwischen "
-"den Beteiligten. Die grundlegenden Transaktionen sind in der Grafik "
-"dargestellt:"
+"Das Taler-Bezahlsystem verwendet Protokolle für den Geldfluss zwischen den "
+"Beteiligten. Die grundlegenden Transaktionen sind in der Grafik dargestellt:"
 
 #: 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.\n"
-msgstr ""
-"Zuerst überweisen Taler-Nutzer Geld von ihren herkömmlichen Girokonten in"
-" den Währungen der Geschäftsbanken (in der Grafik oben links) an die "
-"Taler-Wechselstube (der sog. \"Exchange\" in der Mitte der Grafik). Im "
-"Betreff der Überweisung nennen sie eine Transaktionsnummer ihrer Taler-"
-"Geldbörse. Damit bilden sie eine Münzen-Reserve bei der Taler-"
-"Wechselstube."
+#, fuzzy
+#| 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.\n"
+msgid ""
+"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."
+msgstr ""
+"Zuerst überweisen Taler-Nutzer Geld von ihren herkömmlichen Girokonten in "
+"den Währungen der Geschäftsbanken (in der Grafik oben links) an die Taler-"
+"Wechselstube (der sog. \"Exchange\" in der Mitte der Grafik). Im Betreff der "
+"Überweisung nennen sie eine Transaktionsnummer ihrer Taler-Geldbörse. Damit "
+"bilden sie eine Münzen-Reserve bei der Taler-Wechselstube."
 
 #: 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 &quot;serial\n"
-"numbers&quot; 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"
+#, fuzzy
+#| 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 &quot;serial\n"
+#| "numbers&quot; 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"
+msgid ""
+"Once the exchange has received the wire transfer, it allows the customer's "
+"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
+"are digital representations of the original currency from the transfer. It "
+"is important to note that the exchange does not learn the &quot;serial "
+"numbers&quot; of the coins created in this process, so it cannot tell later "
+"which customer purchased what at which merchant. The use of Taler does not "
+"change the currency or the total value of the funds (except for fees which "
+"the exchange may charge for the service)."
 msgstr ""
 "Sobald die Taler-Wechselstube die Überweisung von der Bank erhalten hat, "
-"erlaubt sie die Verwendung der digitalen Münzen in der Taler-Geldbörse. "
-"Die Ursprungswährungen werden dabei zu gleichnamigen Währungen in der "
-"Taler-Geldbörse und behalten ihren ursprünglichen nominellen Wert "
-"abzüglich einer gegebenenfalls von der Wechselstube geforderten "
-"Tauschgebühr. Wichtig zu wissen ist, dass die Taler-Wechselstube keine "
-"Kenntnis der \"Seriennummern\" der erzeugten digitalen Münzen erlangt. "
-"Dies hat zur Folge, dass später nicht mehr nachvollzogen werden kann, "
-"welcher Käufer von welchem Verkäufer welche Güter erwarb. Auch die Güter "
-"selbst bleiben unbekannt."
+"erlaubt sie die Verwendung der digitalen Münzen in der Taler-Geldbörse. Die "
+"Ursprungswährungen werden dabei zu gleichnamigen Währungen in der Taler-"
+"Geldbörse und behalten ihren ursprünglichen nominellen Wert abzüglich einer "
+"gegebenenfalls von der Wechselstube geforderten Tauschgebühr. Wichtig zu "
+"wissen ist, dass die Taler-Wechselstube keine Kenntnis der \"Seriennummern\" "
+"der erzeugten digitalen Münzen erlangt. Dies hat zur Folge, dass später "
+"nicht mehr nachvollzogen werden kann, welcher Käufer von welchem Verkäufer "
+"welche Güter erwarb. Auch die Güter selbst bleiben unbekannt."
 
 #: 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).\n"
-msgstr ""
-"Die digitalen Münzen der Geldbörse kann man ausgeben bei allen "
-"Verkäufern, die das Taler-Bezahlsystem unterstützen und eine Taler-"
-"Wechselstube als Geschäftspartner akzeptieren (in der Grafik unten "
-"rechts). Dieser Vorgang erzeugt einen digitalen Vertrag, der sowohl von "
-"den Verkäufern als auch von den Käufern mit einer Signatur versehen wird "
-"(in der Grafik unten als Pfeil dargestellt). Dieser elektronisch "
-"\"unterschriebene\" Vertrag enthält die genauen Vertragsbedingungen und "
-"ist für eventuelle Streitfälle auch vor Gericht verwendbar als "
-"Eigentumsnachweis eines gekauften Gutes zum gegebenen Kaufpreis. Dazu "
-"müssen weder Käufer noch Verkäufer über die Identität oder Bankdaten "
-"ihrer Geschäftspartner Bescheid wissen. Natürlich kann jeder beliebige "
-"Teilbetrag von Münzen aus der Taler-Geldbörse verwendet werden, das "
-"System sorgt für das korrekte Wechselgeld."
+#, fuzzy
+#| 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).\n"
+msgid ""
+"Once the customer has the digital coins in his wallet, the wallet can be "
+"used to <b>spend</b> the coins with merchant portals that support the Taler "
+"payment system and accept the respective exchange as a business partner "
+"(bottom arrow). This creates a digital contract signed by the customer's "
+"coins and the merchant. If necessary, the customer can later use this "
+"digitally signed contract in a court of law to prove the exact terms of the "
+"contract and that he paid the respective amount. The customer does not learn "
+"the banking details of the merchant, and Taler does not require the merchant "
+"to learn the identity of the customer. Naturally, the customer can spend any "
+"fraction of his digital coins (the system takes care of customers getting "
+"change)."
+msgstr ""
+"Die digitalen Münzen der Geldbörse kann man ausgeben bei allen Verkäufern, "
+"die das Taler-Bezahlsystem unterstützen und eine Taler-Wechselstube als "
+"Geschäftspartner akzeptieren (in der Grafik unten rechts). Dieser Vorgang "
+"erzeugt einen digitalen Vertrag, der sowohl von den Verkäufern als auch von "
+"den Käufern mit einer Signatur versehen wird (in der Grafik unten als Pfeil "
+"dargestellt). Dieser elektronisch \"unterschriebene\" Vertrag enthält die "
+"genauen Vertragsbedingungen und ist für eventuelle Streitfälle auch vor "
+"Gericht verwendbar als Eigentumsnachweis eines gekauften Gutes zum gegebenen "
+"Kaufpreis. Dazu müssen weder Käufer noch Verkäufer über die Identität oder "
+"Bankdaten ihrer Geschäftspartner Bescheid wissen. Natürlich kann jeder "
+"beliebige Teilbetrag von Münzen aus der Taler-Geldbörse verwendet werden, "
+"das System sorgt für das korrekte Wechselgeld."
 
 #: developers.html.j2:210
-msgid ""
-"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 ""
-"Nach dem Vertragsabschluss übertragen die Käufer ihre digitalen Münzen an"
-" die Verkäufer, die sich die entsprechenden Forderungen von der Taler-"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Merchants receiving digital coins <b>deposit</b> the respective claims that "
+"resulted from the contract signing with the customer at the exchange to "
+"redeem the coins. The deposit step does not reveal the details of the "
+"contract between the customer and the merchant or the identity of the "
+"customer to the exchange in any way. However, the exchange does learn the "
+"identity of the merchant via the provided bank routing information. The "
+"merchant can, for example when compelled by the state for taxation, provide "
+"information linking the individual deposit to the respective contract signed "
+"by the customer. Thus, the exchange's database allows the state to enforce "
+"that merchants pay applicable taxes (and do not engage in illegal contracts)."
+msgstr ""
+"Nach dem Vertragsabschluss übertragen die Käufer ihre digitalen Münzen an "
+"die Verkäufer, die sich die entsprechenden Forderungen von der Taler-"
 "Wechselstube auf ihre Girokonten erstatten lassen. Die Wechselstube "
-"veröffentlicht dabei weder Vertragsdetails noch Käuferdaten und kennt nur"
-" die Identität der Verkäufer durch ihre Bankverbindungen. Die Verkäufer "
+"veröffentlicht dabei weder Vertragsdetails noch Käuferdaten und kennt nur "
+"die Identität der Verkäufer durch ihre Bankverbindungen. Die Verkäufer "
 "können daher gegenüber staatlichen Steuerbehörden einen Nachweis ihrer "
-"rechtmäßigen Geschäfte erbringen. Die Datenbank der Wechselstube "
-"unterstützt auf diese Weise den Staat, ausnahmslos alle Verkäufer zu "
-"ihren Steuerzahlungen zu verpflichten und von illegalen Geschäften "
-"abzuhalten."
+"rechtmäßigen Geschäfte erbringen. Die Datenbank der Wechselstube unterstützt "
+"auf diese Weise den Staat, ausnahmslos alle Verkäufer zu ihren "
+"Steuerzahlungen zu verpflichten und von illegalen Geschäften abzuhalten."
 
 #: 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.\n"
+#, fuzzy
+#| 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.\n"
+msgid ""
+"Finally, the exchange transfers funds corresponding to the digital coins "
+"redeemed by the merchants to the merchant's <b>bank</b> account. The "
+"exchange may combine multiple small transactions into one larger bank "
+"transfer. The merchant can query the exchange about the relationship between "
+"the bank transfers and the individual claims that were deposited."
 msgstr ""
 "Als letzten Schritt überweist die Taler-Wechselstube die Forderungen der "
 "Verkäufer an deren Geschäftsbanken (in der Grafik oben rechts). Die "
 "Geldbeträge entsprechen den Werten der digitalen Münzen. Die Taler-"
 "Wechselstube kann mehrere kleinere Beträge zu einem Gesamtbetrag "
-"zusammenfassen und an die Geschäftsbank überweisen. Die Verkäufer haben "
-"die Möglichkeit, ihre angemeldeten Forderungen und deren Überweisung an "
-"die Geschäftsbank bei der Taler-Wechselstube abzufragen."
+"zusammenfassen und an die Geschäftsbank überweisen. Die Verkäufer haben die "
+"Möglichkeit, ihre angemeldeten Forderungen und deren Überweisung an die "
+"Geschäftsbank bei der Taler-Wechselstube abzufragen."
 
 #: 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.\n"
+#, fuzzy
+#| 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.\n"
+msgid ""
+"Most importantly, the exchange keeps cryptographic proofs that allow it to "
+"demonstrate that it is operating correctly to third parties. The system "
+"requires an external <b>auditor</b>, such as a government-appointed "
+"financial regulatory body, to frequently verify the exchange's databases and "
+"check that its bank balance matches the total value of the remaining coins "
+"in circulation."
 msgstr ""
 "Eine bedeutende Eigenschaft der Wechselstube besteht darin, dass sie "
 "kryptografisch verschlüsselte Prüfdaten bereitstellt, um ihre korrekte "
@@ -717,21 +897,27 @@ msgstr ""
 "unabhängigen Parteien wie z.B. von Regierungen ernannten "
 "Finanzaufsichtsbehörden oder Auditoren zur Verfügung gestellt, die "
 "regelmäßig die Wechselstube-Datenbanken auf Funktionalität überprüfen "
-"können. Dabei vergleichen sie die Übereinstimmung der im Umlauf "
-"befindlichen Summe von digitalen Münzen mit den Überweisungen an "
-"Geschäftsbanken."
+"können. Dabei vergleichen sie die Übereinstimmung der im Umlauf befindlichen "
+"Summe von digitalen Münzen mit den Überweisungen an Geschäftsbanken."
 
 #: 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.\n"
+#, fuzzy
+#| 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.\n"
+msgid ""
+"Without the auditor, the exchange operators could embezzle funds they are "
+"holding in reserve. Customers and merchants cannot cheat each other or the "
+"exchange. If any party's computers are compromised, the financial damage is "
+"limited to the respective party and proportional to the funds they have in "
+"circulation during the period of the compromise."
 msgstr ""
 "Die Rolle des Auditors sorgt dafür, dass die Taler-Wechselstube keine "
 "Forderungen oder Überweisungen unterschlagen kann. Ebenso wenig können "
@@ -746,81 +932,110 @@ msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr "In welchem Zusammenhang steht Taler mit Bitcoin oder Blockchains?"
 
 #: faq.html.j2:6
+#, fuzzy
+#| msgid ""
+#| "<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"
 msgid ""
-"<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"
+"<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>"
 msgstr ""
-"Taler verwendet keine Blockchain-Technologie oder Bitcoin selbst. Auch "
-"auf elektronisches gegenseitiges Beglaubigen in einem Web-of-trust- oder "
-"proof-of-work-Verfahren verzichtet Taler. Stattdessen setzt Taler auf "
-"Verfahren mit blinden Signaturen."
+"Taler verwendet keine Blockchain-Technologie oder Bitcoin selbst. Auch auf "
+"elektronisches gegenseitiges Beglaubigen in einem Web-of-trust- oder proof-"
+"of-work-Verfahren verzichtet Taler. Stattdessen setzt Taler auf Verfahren "
+"mit blinden Signaturen."
 
 #: faq.html.j2:11
+#, fuzzy
+#| 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"
 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"
+"<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>"
 msgstr ""
-"Es ist jedoch möglich, Bitcoin als Münzen in eine Taler-Geldbörse mittels"
-" einer dafür geeigneten Wechselstube zu überweisen. Dies brächte "
-"gegenüber Bitcoin sogar den Vorteil von sofortigen Zahlungsbestätigungen."
+"Es ist jedoch möglich, Bitcoin als Münzen in eine Taler-Geldbörse mittels "
+"einer dafür geeigneten Wechselstube zu überweisen. Dies brächte gegenüber "
+"Bitcoin sogar den Vorteil von sofortigen Zahlungsbestätigungen."
 
 #: faq.html.j2:18
 msgid "Where is the balance in my wallet stored?"
 msgstr "Wo ist der Münzbestand in meiner Taler-Geldbörse gespeichert?"
 
 #: faq.html.j2:19
+#, fuzzy
+#| msgid ""
+#| "<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"
 msgid ""
-"<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"
+"<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>"
 msgstr ""
-"Die Taler-Geldbörse speichert digitale Münzen nur auf deinem Computer. "
-"Das heißt, nur dieser kennt den Bestand deiner Münzen. Die Taler-"
-"Wechselstube speichert dagegen auf einem Konto, das sie treuhänderisch "
-"verwaltet, die Forderungen von noch nicht gebuchten Münzen."
+"Die Taler-Geldbörse speichert digitale Münzen nur auf deinem Computer. Das "
+"heißt, nur dieser kennt den Bestand deiner Münzen. Die Taler-Wechselstube "
+"speichert dagegen auf einem Konto, das sie treuhänderisch verwaltet, die "
+"Forderungen von noch nicht gebuchten Münzen."
 
 #: faq.html.j2:25
 msgid "What if my wallet is lost?"
 msgstr "Was passiert bei Verlust der Taler-Geldbörse?"
 
 #: faq.html.j2:26
-msgid ""
-"<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 ""
-"Weil die digitalen Münzen in der Geldbörse anonymisiert gespeichert "
-"werden, kann sie die Wechselstube bei einem Verlust oder Diebstahl nicht "
-"wiederherstellen. Wie bei echten Geldbörsen mit Banknoten und Münzen sind"
-" ihre Eigentümer allein verantwortlich für deren Sicherung."
+#, fuzzy
+#| msgid ""
+#| "<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"
+msgid ""
+"<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>"
+msgstr ""
+"Weil die digitalen Münzen in der Geldbörse anonymisiert gespeichert werden, "
+"kann sie die Wechselstube bei einem Verlust oder Diebstahl nicht "
+"wiederherstellen. Wie bei echten Geldbörsen mit Banknoten und Münzen sind "
+"ihre Eigentümer allein verantwortlich für deren Sicherung."
 
 #: faq.html.j2:32
+#, fuzzy
+#| msgid ""
+#| "<p>The risk of losing a wallet can be mitigated by making backups or\n"
+#| "keeping the balance reasonably low.</p>\n"
 msgid ""
-"<p>The risk of losing a wallet can be mitigated by making backups or\n"
-"keeping the balance reasonably low.</p>\n"
+"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low.</p>"
 msgstr ""
-"Das Risiko eines Verlusts der Taler-Geldbörsen kann vermieden werden, "
-"indem man Backups von ihnen anfertigt oder ihren Bestand an digitalen "
-"Münzen niedrig hält."
+"Das Risiko eines Verlusts der Taler-Geldbörsen kann vermieden werden, indem "
+"man Backups von ihnen anfertigt oder ihren Bestand an digitalen Münzen "
+"niedrig hält."
 
 #: faq.html.j2:37
 msgid "What if my computer is hacked?"
 msgstr "Was ist, wenn mein Computer gehackt wurde?"
 
 #: faq.html.j2:38
+#, fuzzy
+#| 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"
 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"
+"<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>"
 msgstr ""
-"Im Fall eines Einbruchs in die Geräte können tatsächlich digitale Münzen "
-"aus dem Bestand in der Taler-Geldbörse ausgegeben werden. Es bietet sich "
-"daher an, den Bestand regelmäßig zu kontrollieren, um einen solchen "
-"Einbruch festzustellen."
+"Im Fall eines Einbruchs in die Geräte können tatsächlich digitale Münzen aus "
+"dem Bestand in der Taler-Geldbörse ausgegeben werden. Es bietet sich daher "
+"an, den Bestand regelmäßig zu kontrollieren, um einen solchen Einbruch "
+"festzustellen."
 
 #: faq.html.j2:44
 msgid "Can I send money to my friend with Taler?"
@@ -829,20 +1044,29 @@ msgstr ""
 "senden?"
 
 #: faq.html.j2:45
+#, fuzzy
+#| msgid ""
+#| "<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"
 msgid ""
-"<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"
+"<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>"
 msgstr ""
-"Falls andere Personen Waren oder Dienstleistungen verkaufen wollen, "
-"können sie die Rolle eines Verkäufers einnehmen und diese schnell und "
-"einfach einrichten, um deine Zahlung von der Taler-Geldbörse auf dem "
-"Girokonto ihrer Geschäftsbank zu erhalten."
+"Falls andere Personen Waren oder Dienstleistungen verkaufen wollen, können "
+"sie die Rolle eines Verkäufers einnehmen und diese schnell und einfach "
+"einrichten, um deine Zahlung von der Taler-Geldbörse auf dem Girokonto ihrer "
+"Geschäftsbank zu erhalten."
 
 #: faq.html.j2:50
+#, fuzzy
+#| msgid ""
+#| "<p>Future versions of the Taler wallet may allow exchanging coins\n"
+#| "among friends directly as well.</p>\n"
 msgid ""
-"<p>Future versions of the Taler wallet may allow exchanging coins\n"
-"among friends directly as well.</p>\n"
+"<p>Future versions of the Taler wallet may allow exchanging coins among "
+"friends directly as well.</p>"
 msgstr ""
 "Zukünftige Versionen der Taler-Geldbörse sehen vor, unter Freunden auch "
 "direkt digitale Münzen auszutauschen."
@@ -852,16 +1076,23 @@ msgid "How does Taler handle payments in different currencies?"
 msgstr "Wie geht Taler um mit digitalen Münzen anderer Währungen?"
 
 #: faq.html.j2:57
+#, fuzzy
+#| msgid ""
+#| "<p>Taler wallets can store digital coins corresponding to multiple\n"
+#| "different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple\n"
-"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"<p>Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgstr ""
-"Taler-Geldbörsen können gleichzeitig verschiedene digitale Münzen "
-"speichern, die in unterschiedlichen Währungen wie Euro, US-Dollar oder "
-"Bitcoin notiert sind."
+"Taler-Geldbörsen können gleichzeitig verschiedene digitale Münzen speichern, "
+"die in unterschiedlichen Währungen wie Euro, US-Dollar oder Bitcoin notiert "
+"sind."
 
 #: faq.html.j2:61
-msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+#, fuzzy
+#| msgid ""
+#| "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgid "<p>Taler currently does not offer conversion between currencies.</p>"
 msgstr "Taler bietet jedoch derzeitig keinen Umtausch zwischen Währungen."
 
 #: faq.html.j2:65
@@ -869,20 +1100,25 @@ msgid "How does Taler protect my privacy?"
 msgstr "Wie schützt Taler meine privaten Daten?"
 
 #: 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"
+#, fuzzy
+#| 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"
+msgid ""
+"<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>"
 msgstr ""
 "Deine Geldbörse speichert digitale \"Münzen\", die von der Wechselstube "
-"blind signiert sind (siehe <a "
-"href=\"https://de.wikipedia.org/wiki/Digitale_Signatur\">Digitale "
-"Signatur</a>). Dieses Verfahren schützt die privaten Daten, weil die "
-"Taler-Wechselstube dadurch keine Kenntnis davon erlangt, welche der "
-"Münzen von welchen Käufern sie signiert."
+"blind signiert sind (siehe <a href=\"https://de.wikipedia.org/wiki/"
+"Digitale_Signatur\">Digitale Signatur</a>). Dieses Verfahren schützt die "
+"privaten Daten, weil die Taler-Wechselstube dadurch keine Kenntnis davon "
+"erlangt, welche der Münzen von welchen Käufern sie signiert."
 
 #: glossary.html.j2:6
 msgid "auditor"
@@ -890,8 +1126,7 @@ msgstr ""
 
 #: glossary.html.j2:8
 msgid ""
-"trusted third party that verifies that the `exchange` is operating "
-"correctly\n"
+"trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
 #: glossary.html.j2:12
@@ -900,8 +1135,8 @@ msgstr ""
 
 #: glossary.html.j2:14
 msgid ""
-"traditional financial service provider who offers wire `transfers` "
-"between accounts\n"
+"traditional financial service provider who offers wire `transfers` between "
+"accounts"
 msgstr ""
 
 #: glossary.html.j2:18
@@ -911,7 +1146,7 @@ msgstr ""
 #: glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin\n"
+"known as the `denomination` of the coin"
 msgstr ""
 
 #: glossary.html.j2:24
@@ -919,7 +1154,7 @@ msgid "contract"
 msgstr ""
 
 #: glossary.html.j2:26
-msgid "the proposal signed by the wallet.\n"
+msgid "the proposal signed by the wallet."
 msgstr ""
 
 #: glossary.html.j2:30
@@ -928,8 +1163,7 @@ msgstr ""
 
 #: glossary.html.j2:32
 msgid ""
-"unit of currency, specifies both the currency and the face value of a "
-"`coin`\n"
+"unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
 #: glossary.html.j2:36
@@ -938,8 +1172,8 @@ msgstr ""
 
 #: glossary.html.j2:38
 msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and "
-"of a particular `denomination`\n"
+"RSA key used by the exchange to certify that a given `coin` is valid and of "
+"a particular `denomination`"
 msgstr ""
 
 #: glossary.html.j2:42
@@ -949,8 +1183,7 @@ msgstr ""
 #: glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire "
-"`transfer`\n"
+"exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
 #: glossary.html.j2:48
@@ -959,10 +1192,9 @@ msgstr ""
 
 #: glossary.html.j2:50
 msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than "
-"the customer, thereby creating the danger of some entity being able to "
-"link multiple transactions of coin's owner if the coin is not refreshed "
-"first\n"
+"a `coin` is dirty if its public key may be known to an entity other than the "
+"customer, thereby creating the danger of some entity being able to link "
+"multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
 #: glossary.html.j2:54
@@ -971,8 +1203,8 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider.  Issues eletronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants.\n"
+"Taler's payment service provider. Issues eletronic `coins` during "
+"`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
 #: glossary.html.j2:60
@@ -980,7 +1212,7 @@ msgid "extension"
 msgstr ""
 
 #: glossary.html.j2:62
-msgid "implementation of a `wallet` for browsers\n"
+msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
 #: glossary.html.j2:66
@@ -988,7 +1220,7 @@ msgid "fresh coin"
 msgstr ""
 
 #: glossary.html.j2:68
-msgid "a `coin` is fresh if its public key is only known to the customer\n"
+msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
 #: glossary.html.j2:72
@@ -997,8 +1229,8 @@ msgstr ""
 
 #: glossary.html.j2:74
 msgid ""
-"offline key used by the exchange to certify denomination keys and message"
-" signing keys\n"
+"offline key used by the exchange to certify denomination keys and message "
+"signing keys"
 msgstr ""
 
 #: glossary.html.j2:78
@@ -1006,7 +1238,7 @@ msgid "message signing key"
 msgstr ""
 
 #: glossary.html.j2:80
-msgid "key used by the exchange to sign online messages, other than coins\n"
+msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
 #: glossary.html.j2:84
@@ -1016,15 +1248,11 @@ msgstr ""
 #: glossary.html.j2:86
 msgid ""
 "specification of the details of a transaction, specifies the payment "
-"obligations\n"
-"for the customer (i.e. the amount), the deliverables of the merchant and "
-"other\n"
-"related information, such as deadlines or locations; However, it lacks "
-"some\n"
-"information that the backend is supposed to provide.\n"
-"In other words, after the backend adds the missing information to the "
-"offer and\n"
-"signs it, it becomes a proposal.\n"
+"obligations for the customer (i.e. the amount), the deliverables of the "
+"merchant and other related information, such as deadlines or locations; "
+"However, it lacks some information that the backend is supposed to provide. "
+"In other words, after the backend adds the missing information to the offer "
+"and signs it, it becomes a proposal."
 msgstr ""
 
 #: glossary.html.j2:95
@@ -1032,7 +1260,7 @@ msgid "owner"
 msgstr ""
 
 #: glossary.html.j2:97
-msgid "a `coin` is owned by the entity that knows the private key of the coin\n"
+msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
 #: glossary.html.j2:101
@@ -1042,7 +1270,7 @@ msgstr ""
 #: glossary.html.j2:103
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
-"correct\n"
+"correct"
 msgstr ""
 
 #: glossary.html.j2:107
@@ -1050,7 +1278,7 @@ msgid "proposal"
 msgstr ""
 
 #: glossary.html.j2:109
-msgid "a sketch that has been completed and signed by the merchant backend.\n"
+msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
 #: glossary.html.j2:113
@@ -1060,8 +1288,8 @@ msgstr ""
 #: glossary.html.j2:115
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank"
-" account to cover obligations from coins in circulation\n"
+"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+"account to cover obligations from coins in circulation"
 msgstr ""
 
 #: glossary.html.j2:119
@@ -1070,8 +1298,8 @@ msgstr ""
 
 #: glossary.html.j2:121
 msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh`"
-" coins\n"
+"operation by which a `dirty` `coin` is converted into one or more `fresh` "
+"coins"
 msgstr ""
 
 #: glossary.html.j2:125
@@ -1081,8 +1309,8 @@ msgstr ""
 #: glossary.html.j2:127
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back "
-"to the customer\n"
+"obtained from a `deposit` operation, giving the right to the funds back to "
+"the customer"
 msgstr ""
 
 #: glossary.html.j2:131
@@ -1092,8 +1320,7 @@ msgstr ""
 #: glossary.html.j2:133
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any "
-"time.\n"
+"private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
 #: glossary.html.j2:137
@@ -1101,7 +1328,7 @@ msgid "signing key"
 msgstr ""
 
 #: glossary.html.j2:139
-msgid "see message signing key.\n"
+msgid "see message signing key."
 msgstr ""
 
 #: glossary.html.j2:143
@@ -1110,8 +1337,8 @@ msgstr ""
 
 #: glossary.html.j2:145
 msgid ""
-"operation by which a customer gives a merchant the right to `deposit` "
-"coins in return for merchandise\n"
+"operation by which a customer gives a merchant the right to `deposit` coins "
+"in return for merchandise"
 msgstr ""
 
 #: glossary.html.j2:149
@@ -1119,7 +1346,7 @@ msgid "transfer"
 msgstr ""
 
 #: glossary.html.j2:151
-msgid "method of sending funds between `bank` accounts\n"
+msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
 #: glossary.html.j2:155
@@ -1129,7 +1356,7 @@ msgstr ""
 #: glossary.html.j2:157
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
-"another\n"
+"another"
 msgstr ""
 
 #: glossary.html.j2:161
@@ -1137,7 +1364,7 @@ msgid "transaction id"
 msgstr ""
 
 #: glossary.html.j2:163
-msgid "unique number by which a merchant identifies a `transaction`\n"
+msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
 #: glossary.html.j2:167
@@ -1146,8 +1373,7 @@ msgstr ""
 
 #: glossary.html.j2:169
 msgid ""
-"software running on a customer's computer; withdraws, stores and spends "
-"coins\n"
+"software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
 #: glossary.html.j2:173
@@ -1155,7 +1381,7 @@ msgid "wire transfer"
 msgstr ""
 
 #: glossary.html.j2:175
-msgid "see `transfer`\n"
+msgid "see `transfer`"
 msgstr ""
 
 #: glossary.html.j2:179
@@ -1164,8 +1390,8 @@ msgstr ""
 
 #: glossary.html.j2:181
 msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely "
-"identify the `transfer`\n"
+"subject of a wire `transfer`; usually a random string to uniquely identify "
+"the `transfer`"
 msgstr ""
 
 #: glossary.html.j2:185
@@ -1174,8 +1400,7 @@ msgstr ""
 
 #: glossary.html.j2:187
 msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh "
-"coins\n"
+"operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
 #: governments.html.j2:6
@@ -1183,147 +1408,194 @@ msgid "Advantages for Governments"
 msgstr "Vorteile für Staatsregierungen"
 
 #: governments.html.j2:8
-msgid ""
-"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 ""
-"Taler fordert von den Wirtschaftsunternehmen Rechenschaft darüber, dass "
-"sie legale Geschäfte betreiben und gleichzeitig die Persönlichkeitsrechte"
-" und Privatsphäre der Menschen respektieren. Taler ist ein Bezahlsystem, "
-"das auf einem offenen Standard und freier Software basiert. Taler braucht"
-" Staatregierungen, die finanzrechtliche Rahmenbedingungen schaffen und "
-"als zuverlässige Kontrollorgane auftreten. Damit trägt dieses "
-"Bezahlsystem auch zur digitalen Selbstbestimmung von Einzelpersonen im "
-"Finanzsektor bei."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler provides accountability to ensure business operate legally, while also "
+"respecting civil liberties of citizens. Taler is a payment system based on "
+"open standards and free software. Taler needs governments as they set a "
+"financial framework and act as trusted regulators. Taler contributes to "
+"digital sovereignty in the critical financial infrastructure."
+msgstr ""
+"Taler fordert von den Wirtschaftsunternehmen Rechenschaft darüber, dass sie "
+"legale Geschäfte betreiben und gleichzeitig die Persönlichkeitsrechte und "
+"Privatsphäre der Menschen respektieren. Taler ist ein Bezahlsystem, das auf "
+"einem offenen Standard und freier Software basiert. Taler braucht "
+"Staatregierungen, die finanzrechtliche Rahmenbedingungen schaffen und als "
+"zuverlässige Kontrollorgane auftreten. Damit trägt dieses Bezahlsystem auch "
+"zur digitalen Selbstbestimmung von Einzelpersonen im Finanzsektor bei."
 
 #: governments.html.j2:25 index.html.j2:71
 msgid "Taxable"
 msgstr "Besteuerbar"
 
 #: governments.html.j2:28
-msgid ""
-"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 ""
-"Taler wurde mit dem Ziel entwickelt, Korruption zu unterbinden und "
-"sichere Besteuerungsgrundlagen bereitzustellen. Jeder Empfänger von "
-"Zahlungen aus Taler-Geldbörsen wird gegenüber der staatlichen "
-"fiskalischen Autorität eindeutig identifizierbar und ist demnach "
-"gezwungen, sich steuerlich zu veranlagen. Den Nachweis des Umsatzes "
-"können Verkäufer erbringen mithilfe des digital signierten Kaufvertrags, "
-"den ihre Kunden mit ihnen geschlossen haben. Staatsregierungen haben "
-"dadurch die Möglichkeit, die digitalen Kaufverträge von "
-"Handelsunternehmen bzw. die Einkommen von einzelnen privaten Verkäufern "
-"als Grundlage der Besteuerung heranzuziehen. Auf diese Weise haben "
-"Steuerflucht und Schwarzmarktgeschäfte nur noch eine minimale "
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler was built with the goal of fighting corruption and supporting "
+"taxation. With Taler, the receiver of any form of payment is easily "
+"identified by the government, and the merchant can be compelled to provide "
+"the contract that was accepted by the customer. Governments can use this "
+"data to tax businesses and individuals based on their income, making tax "
+"evasion and black markets less viable."
+msgstr ""
+"Taler wurde mit dem Ziel entwickelt, Korruption zu unterbinden und sichere "
+"Besteuerungsgrundlagen bereitzustellen. Jeder Empfänger von Zahlungen aus "
+"Taler-Geldbörsen wird gegenüber der staatlichen fiskalischen Autorität "
+"eindeutig identifizierbar und ist demnach gezwungen, sich steuerlich zu "
+"veranlagen. Den Nachweis des Umsatzes können Verkäufer erbringen mithilfe "
+"des digital signierten Kaufvertrags, den ihre Kunden mit ihnen geschlossen "
+"haben. Staatsregierungen haben dadurch die Möglichkeit, die digitalen "
+"Kaufverträge von Handelsunternehmen bzw. die Einkommen von einzelnen "
+"privaten Verkäufern als Grundlage der Besteuerung heranzuziehen. Auf diese "
+"Weise haben Steuerflucht und Schwarzmarktgeschäfte nur noch eine minimale "
 "Wahrscheinlichkeit."
 
 #: governments.html.j2:41
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Thus, despite offering anonymity for citizens spending digital cash to buy "
+"goods and services, Taler also ensures that the state can observe incoming "
+"funds. This can be used to ensure businesses engage only in legal "
+"activities, and do not evade income tax, sales tax or value-added tax. "
+"However, this observational capability does not extend to the immediate "
+"personal domain. In particular, monitoring does not cover shared access to "
+"funds with trusted friends and family, or synchronizing wallets across "
+"multiple devices."
 msgstr ""
 "Auf der einen Seite versichert Taler als digitales Bezahlsystem die "
-"vollständige Anonymität der Käufer, die Waren und Dienstleistungen kaufen"
-" und bezahlen, auf der anderen Seite liefert Taler den Staatsregierungen "
-"eine sichere Besteuerungsgrundlage, mit der sie ihre öffentlichen Güter "
+"vollständige Anonymität der Käufer, die Waren und Dienstleistungen kaufen "
+"und bezahlen, auf der anderen Seite liefert Taler den Staatsregierungen eine "
+"sichere Besteuerungsgrundlage, mit der sie ihre öffentlichen Güter "
 "finanzieren können. Dieses Verfahren stellt gleichzeitig sicher, dass "
 "Handelsunternehmen nur legale Geschäfte abschließen und keine Steuern "
-"hinterziehen oder Mehrwertsteuern unterschlagen. Diese "
-"Überwachungsfunktion bezieht sich jedoch keinesfalls auf die Privatsphäre"
-" von Personen und erfasst ebenso wenig den geduldeten gemeinsamen Zugriff"
-" auf die Taler-Geldbörse durch Berechtigte wie Freunde oder "
-"Familienmitglieder sowie miteinander synchronisierte Geldbörsen auf "
-"verschiedenen Endgeräten."
+"hinterziehen oder Mehrwertsteuern unterschlagen. Diese Überwachungsfunktion "
+"bezieht sich jedoch keinesfalls auf die Privatsphäre von Personen und "
+"erfasst ebenso wenig den geduldeten gemeinsamen Zugriff auf die Taler-"
+"Geldbörse durch Berechtigte wie Freunde oder Familienmitglieder sowie "
+"miteinander synchronisierte Geldbörsen auf verschiedenen Endgeräten."
 
 #: governments.html.j2:61
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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."
 msgstr ""
 "Zahlungen in Taler sind kryptographisch verschlüsselt. Sowohl Käufer als "
-"auch Verkäufer und das Taler-Bezahlsystem selbst (die Taler-Wechselstube)"
-" können die Rechtschaffenheit ihrer Geschäfte mit ihren digitalen "
+"auch Verkäufer und das Taler-Bezahlsystem selbst (die Taler-Wechselstube) "
+"können die Rechtschaffenheit ihrer Geschäfte mit ihren digitalen "
 "Kaufverträgen sogar vor Gericht beweisen, falls es zu einem Rechtsstreit "
-"kommen sollte. Ebenso sind die finanziellen Risiken äußerst beschränkt, "
-"was die Sicherheit des gemeinsamen Handelns für Einzelpersonen, Händler, "
-"die Taler-Wechselstube und den Staat enorm verbessert."
+"kommen sollte. Ebenso sind die finanziellen Risiken äußerst beschränkt, was "
+"die Sicherheit des gemeinsamen Handelns für Einzelpersonen, Händler, die "
+"Taler-Wechselstube und den Staat enorm verbessert."
 
 #: governments.html.j2:73
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"As a payment service provider, the Taler exchange is subject to financial "
+"regulation. Financial regulation and regular audits are critical to "
+"establish trust. In particular, the Taler design mandates the existence of "
+"an independent auditor who checks cryptographic proofs that accumulate at "
+"the exchange to ensure that the escrow account is managed honestly. This "
+"ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 "Als Finanzdienstleister sind Taler-Wechselstuben der Finanzaufsicht "
 "unterstellt. Die Einhaltung von Gesetzen und regelmäßige Audits sind "
-"unerlässlich zur Bildung einer Vertrauensgrundlage. Zusätzlich fordert "
-"das Konzept des Taler-Bezahlsystems aber ganz bewusst einen unabhängigen "
+"unerlässlich zur Bildung einer Vertrauensgrundlage. Zusätzlich fordert das "
+"Konzept des Taler-Bezahlsystems aber ganz bewusst einen unabhängigen "
 "Auditor. Der Auditor hat zu bestätigen, dass die von den Wechselstuben "
-"treuhänderisch verwalteten Konten stets korrekt gebucht werden. Dies "
-"sorgt dafür, dass keine einzige Wechselstube betrügerisch handelt."
+"treuhänderisch verwalteten Konten stets korrekt gebucht werden. Dies sorgt "
+"dafür, dass keine einzige Wechselstube betrügerisch handelt."
 
 #: governments.html.j2:88 index.html.j2:97
 msgid "Libre"
 msgstr "Frei"
 
 #: governments.html.j2:91
-msgid ""
-"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 ""
-"Taler ist eine freie Software, die ein offenes Protokoll verwendet. "
-"Dadurch fördert Taler den Wettbewerb von freien Lösungen und verhindert "
-"gleichzeitig Bezahlsysteme, deren gegenwärtige Monopolstellungen die "
-"politische und finanzielle Stabilität weltweit akut bedrohen."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler is free software implementing an open protocol standard. Thus, Taler "
+"will enable competition and avoid the monopolization of payment systems that "
+"threatens global political and financial stability today."
+msgstr ""
+"Taler ist eine freie Software, die ein offenes Protokoll verwendet. Dadurch "
+"fördert Taler den Wettbewerb von freien Lösungen und verhindert gleichzeitig "
+"Bezahlsysteme, deren gegenwärtige Monopolstellungen die politische und "
+"finanzielle Stabilität weltweit akut bedrohen."
 
 #: governments.html.j2:101
 msgid "Efficient"
 msgstr "Effizient"
 
 #: governments.html.j2:104
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler has an efficient design. Unlike Blockchain-based payment systems, such "
+"as Bitcoin, Taler will not threaten the availability of national electric "
+"grids or (significantly) contribute to environmental pollution."
 msgstr ""
 "Taler arbeitet effizient und ressourcenschonend. Im Gegensatz zu "
-"Bezahlsystemen, die das Blockchain-Prinzip verwenden, verbraucht Taler "
-"keine Unmengen von Energie und überlastet kein Stromnetz. Damit bringt "
-"Taler auch einen erheblichen Vorteil in Sachen Umweltschutz."
+"Bezahlsystemen, die das Blockchain-Prinzip verwenden, verbraucht Taler keine "
+"Unmengen von Energie und überlastet kein Stromnetz. Damit bringt Taler auch "
+"einen erheblichen Vorteil in Sachen Umweltschutz."
 
 #: governments.html.j2:120
 msgid "Taler and regulation"
@@ -1335,11 +1607,11 @@ msgstr "Gesetz gegen Geldwäsche"
 
 #: governments.html.j2:123
 msgid ""
-"With Taler, income is visible and can be tied to the contract signed by "
-"both parties."
+"With Taler, income is visible and can be tied to the contract signed by both "
+"parties."
 msgstr ""
-"Im Taler-Bezahlsystem sind nur Verkäufe und Einkommen öffentlich "
-"sichtbar, die in einem signierten Kaufvertrag vereinbart wurden."
+"Im Taler-Bezahlsystem sind nur Verkäufe und Einkommen öffentlich sichtbar, "
+"die in einem signierten Kaufvertrag vereinbart wurden."
 
 #: governments.html.j2:124
 msgid "Know your customer (KYC)"
@@ -1347,11 +1619,11 @@ msgstr "Kenne deine Kunden"
 
 #: governments.html.j2:125
 msgid ""
-"In Taler, payer and payee are known by their bank accounts when "
-"withdrawing or depositing coins respectively"
+"In Taler, payer and payee are known by their bank accounts when withdrawing "
+"or depositing coins respectively"
 msgstr ""
-"Käufer und Verkäufer werden anhand ihrer Bankverbindungen erkannt, wenn "
-"sie Münzen abheben oder erstatten lassen."
+"Käufer und Verkäufer werden anhand ihrer Bankverbindungen erkannt, wenn sie "
+"Münzen abheben oder erstatten lassen."
 
 #: governments.html.j2:126
 msgid "General Data Protection Regulation (GDPR)"
@@ -1359,12 +1631,12 @@ msgstr "General Data Protection Regulation (GDPR)"
 
 #: governments.html.j2:127
 msgid ""
-"Taler cryptographically protects citizen's privacy, and by design "
-"implements data minimization and privacy by default."
+"Taler cryptographically protects citizen's privacy, and by design implements "
+"data minimization and privacy by default."
 msgstr ""
 "Taler schützt die Privatsphäre der Bürger durch kryptographische "
-"Verschlüsselung. Das Konzept des Bezahlsystems ist zudem so angelegt, "
-"dass es nur die absolut notwendigen Daten verwendet."
+"Verschlüsselung. Das Konzept des Bezahlsystems ist zudem so angelegt, dass "
+"es nur die absolut notwendigen Daten verwendet."
 
 #: governments.html.j2:128
 msgid "Payment Services Directive (PSD2)"
@@ -1376,205 +1648,288 @@ msgid ""
 "competitive banking sector."
 msgstr ""
 "Taler verwendet einen quelloffenen Code mit nicht-proprietären "
-"Programmierschnittstellen und trägt auf diese Weise zu einer Vielfalt von"
-" Angeboten in der Bankenbranche bei."
+"Programmierschnittstellen und trägt auf diese Weise zu einer Vielfalt von "
+"Angeboten in der Bankenbranche bei."
 
 #: governments.html.j2:137
 msgid "Taler provides privacy and accountability"
 msgstr "Taler bietet Privatsphäre und Verantwortung in der Geldwirtschaft"
 
 #: governments.html.j2:140
+#, fuzzy
+#| 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:\n"
 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:\n"
+"Taler assumes governments can observe traditional wire transfers entering "
+"and leaving the Taler payment system. Starting with the wire transfers, "
+"governments can obtain:"
 msgstr ""
 "Taler beruht auf der Annahme, dass Staatsregierungen die herkömmlichen "
-"Bankverbindungen nachverfolgen können, wenn Überweisungen zwischen dem "
-"Taler-Bezahlsystem und den Geschäftsbanken stattfinden (Aufladungen der "
-"Taler-Geldbörse und Erstattung von Ansprüchen aus Geschäften). "
-"Regierungen besitzen damit die Informationen über"
+"Bankverbindungen nachverfolgen können, wenn Überweisungen zwischen dem Taler-"
+"Bezahlsystem und den Geschäftsbanken stattfinden (Aufladungen der Taler-"
+"Geldbörse und Erstattung von Ansprüchen aus Geschäften). Regierungen "
+"besitzen damit die Informationen über"
 
 #: governments.html.j2:148
+#, fuzzy
+#| 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.\n"
 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.\n"
+"The total amount of digital currency withdrawn by a customer. The government "
+"can impose limits on how much digital cash a customer can withdraw within a "
+"given time frame."
 msgstr ""
-"den Gesamtbetrag digitaler Münzen, die Käufer an die Geldbörse überweisen"
-" - die Regierung kann dabei Höchstbeträge pro Zeitperiode festlegen"
+"den Gesamtbetrag digitaler Münzen, die Käufer an die Geldbörse überweisen - "
+"die Regierung kann dabei Höchstbeträge pro Zeitperiode festlegen"
 
 #: governments.html.j2:157
-msgid ""
-"The income received by any merchant via the Taler\n"
-"system.\n"
+#, fuzzy
+#| msgid ""
+#| "The income received by any merchant via the Taler\n"
+#| "system.\n"
+msgid "The income received by any merchant via the Taler system."
 msgstr "das Einkommen, das Verkäufer im Taler-Bezahlsystem erhalten"
 
 #: governments.html.j2:164
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"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."
 msgstr ""
-"die genauen Inhalte der zugrunde liegenden digitalen Kaufverträge "
-"zwischen Käufern und Verkäufern - ausgenommen jedoch private Daten der "
-"Käufer"
+"die genauen Inhalte der zugrunde liegenden digitalen Kaufverträge zwischen "
+"Käufern und Verkäufern - ausgenommen jedoch private Daten der Käufer"
 
 #: governments.html.j2:174
-msgid ""
-"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 ""
-"die Beträge digitaler Münzen, die Käufer von Taler-Wechselstuben "
-"abbuchten, die verfügbaren Werte der Münzen in Geldbörsen, die Werte der "
-"Forderungen von Verkäufern und deren Rückerstattung durch Banküberweisung"
-" von den Wechselstuben an Geschäftsbanken sowie die Einkünfte der "
-"Wechselstuben aus Transaktionsgebühren"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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."
+msgstr ""
+"die Beträge digitaler Münzen, die Käufer von Taler-Wechselstuben abbuchten, "
+"die verfügbaren Werte der Münzen in Geldbörsen, die Werte der Forderungen "
+"von Verkäufern und deren Rückerstattung durch Banküberweisung von den "
+"Wechselstuben an Geschäftsbanken sowie die Einkünfte der Wechselstuben aus "
+"Transaktionsgebühren"
 
 #: index.html.j2:10
 msgid "One-Click Cash Payments!"
 msgstr "Bezahlen mit einem Klick!"
 
 #: index.html.j2:13
-msgid ""
-"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 ""
-"Taler ist ein elektronisches Bezahlsystem, das bei <a "
-"href=\"http://www.inria.fr/\">Inria</a> entwickelt wird. Wir rechnen mit "
-"seiner Einführung im Jahr 2017. Auf der <a href=\"https://demo.taler.net"
-"\">Demo-Seite</a> kann man die Funktionsweise von Taler kennenlernen. "
-"Neben dieser Webseite bestehen die <a href=\"https://git.taler.net"
-"/\">Code-Dokumentation</a>, die <a "
-"href=\"https://docs.taler.net\">Entwicklerdokumentation</a> und die <a "
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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."
+msgstr ""
+"Taler ist ein elektronisches Bezahlsystem, das bei <a href=\"http://www."
+"inria.fr/\">Inria</a> entwickelt wird. Wir rechnen mit seiner Einführung im "
+"Jahr 2017. Auf der <a href=\"https://demo.taler.net\">Demo-Seite</a> kann "
+"man die Funktionsweise von Taler kennenlernen. Neben dieser Webseite "
+"bestehen die <a href=\"https://git.taler.net/\">Code-Dokumentation</a>, die "
+"<a href=\"https://docs.taler.net\">Entwicklerdokumentation</a> und die <a "
 "href=\"https://api.taler.net/\">API-Schnittstellendokumentation</a>. "
-"Wissenschaftliche Literatur findet man in der <a "
-"href=\"bibliography.html\">Bibliographie</a>."
+"Wissenschaftliche Literatur findet man in der <a href=\"bibliography.html"
+"\">Bibliographie</a>."
 
 #: index.html.j2:29
 msgid "Practical"
 msgstr "Praktisch"
 
 #: index.html.j2:32
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"Taler is easy to integrate with existing Web applications. Payments are "
+"cryptographically secured and are confirmed within milliseconds with "
+"extremely low transaction costs."
 msgstr ""
-"Taler integriert sich einfach und leicht in bestehende Webanwendungen. "
-"Die Zahlungen sind kryptographisch verschlüsselt, innerhalb von "
-"Millisekunden bestätigt und extrem kostengünstig."
+"Taler integriert sich einfach und leicht in bestehende Webanwendungen. Die "
+"Zahlungen sind kryptographisch verschlüsselt, innerhalb von Millisekunden "
+"bestätigt und extrem kostengünstig."
 
 #: index.html.j2:45
-msgid ""
-"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 ""
-"Als Bezahlsystem stellt Taler noch keine neue Währung dar. Taler "
-"verbindet elektronische Geldbörsen, die digitale Münzen enthalten, und "
-"Anbieter für die Zahlungsabwicklung in bestehenden Währungen auf "
-"Treuhandkonten. Man kann also sagen, dass die kryptografischen "
-"Taler-Münzen herkömmlichen Währungen wie US-Dollar, Euro oder sogar "
-"Bitcoin entsprechen."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler does not introduce a new currency. Taler uses a digital wallet storing "
+"coins and payment service providers with escrow accounts in existing "
+"currencies. Thus, Taler's cryptographic coins correspond to existing "
+"currencies, such as US Dollars, Euros or even Bitcoins."
+msgstr ""
+"Als Bezahlsystem stellt Taler noch keine neue Währung dar. Taler verbindet "
+"elektronische Geldbörsen, die digitale Münzen enthalten, und Anbieter für "
+"die Zahlungsabwicklung in bestehenden Währungen auf Treuhandkonten. Man kann "
+"also sagen, dass die kryptografischen Taler-Münzen herkömmlichen Währungen "
+"wie US-Dollar, Euro oder sogar Bitcoin entsprechen."
 
 #: index.html.j2:59
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"By design Taler does not suffer from many classes\n"
-"of security problems such as phishing or counterfeit.\n"
-"Thanks to its security features, Taler never rejects a legitimate\n"
-"customer due to a fraud-detection false positive.\n"
+"By design Taler does not suffer from many classes of security problems such "
+"as phishing or counterfeit. Thanks to its security features, Taler never "
+"rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
+"Schon vom Konzept her verhindert Taler Falschgeld oder Sicherheitslücken wie "
+"Phishing und wird gleichzeitig jedoch niemals Käufern betrügerische "
+"Absichten unterstellen können."
 
 #: index.html.j2:74
+#, fuzzy
+#| 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"
 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"
+"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."
 msgstr ""
 "Taler macht das Einkommen von Verkäufern (Einzelpersonen und "
-"Handelsunternehmen) den Steuerbehörden einsehbar. Im Gegensatz zu Bargeld"
-" und den meisten virtuellen Währungen unterbindet Taler somit jede Art "
-"von Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für "
-"illegale Geschäfte."
+"Handelsunternehmen) den Steuerbehörden einsehbar. Im Gegensatz zu Bargeld "
+"und den meisten virtuellen Währungen unterbindet Taler somit jede Art von "
+"Schwarzmarkt. Dieses Bezahlsystem eignet sich aus Prinzip nicht für illegale "
+"Geschäfte."
 
 #: index.html.j2:86
-msgid ""
-"When you pay with Taler, your identity does not\n"
-"have to be revealed. 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 ""
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"When you pay with Taler, your identity does not have to be revealed. Just "
+"like payments in cash, nobody else can track how you spent your electronic "
+"money. However, you obtain a legally valid proof of payment."
+msgstr ""
+"Taler hält die Identität der Käufer geheim, auch gegenüber den Verkäufern. "
+"Genauso wie beim Kauf mit Bargeld kann niemand Auskunft darüber erlangen, "
+"was mit dem Taler-Bezahlsystem gekauft wurde. Die Käufer erhalten jedoch "
+"garantiert einen Nachweis über ihre Zahlung und den erfolgten "
+"Eigentumsübergang."
 
 #: index.html.j2:100
-msgid ""
-"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 ""
-"Taler bietet Protokolle und Referenzanwendungen, die prinzipiell für alle"
-" möglichen Bezahlsysteme von Einzelpersonen, Organisationen und sogar "
-"ganzen Staaten geeignet sind. Die Referenzanwendung als <a "
-"href=\"http://www.gnu.org/\">GNU-Package</a> wird immer freie Software "
-"sein und bleiben."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Taler provides protocols and reference implementations that in principle "
+"enables anybody to run their own payment infrastructure, be it individuals, "
+"organizations or whole countries. Since the reference implementation is a <a "
+"href=\"http://www.gnu.org/\">GNU</a> package, it will always remain free "
+"software."
+msgstr ""
+"Taler bietet Protokolle und Referenzanwendungen, die prinzipiell für alle "
+"möglichen Bezahlsysteme von Einzelpersonen, Organisationen und sogar ganzen "
+"Staaten geeignet sind. Die Referenzanwendung als <a href=\"http://www.gnu."
+"org/\">GNU-Package</a> wird immer freie Software sein und bleiben."
 
 #: index.html.j2:117
 msgid "Paying with Taler"
 msgstr "Bezahlen mit Taler"
 
 #: index.html.j2:118
-msgid ""
-"<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"
+#, fuzzy
+#| msgid ""
+#| "<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"
+msgid ""
+"<p>To pay with Taler, customers install an electronic wallet 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 pose any risk of phishing or identity "
+"theft.</p>"
 msgstr ""
 "Um mit dem Taler-Bezahlsystem einkaufen zu können, muss man eine "
 "elektronische Geldbörse auf einem Endgerät installieren. Vor der ersten "
 "Bezahlung ist es nötig, einen Wert in der gewünschten Währung an die "
 "Geldbörse zu überweisen. Dies erfolgt durch herkömmliche Banküberweisung "
-"oder durch Kreditkarten. Der aufgeladene Wert der Geldbörse kann dann mit"
-" nur einem Klick zum Bezahlen auf Webseiten verwendet werden. Die "
-"Verkäufer müssen diese Bezahlung als berechtigt annehmen. Ein "
-"Datendiebstahl (Phishing) ist dabei technisch ausgeschlossen, es werden "
-"keine persönlichen Daten übermittelt."
+"oder durch Kreditkarten. Der aufgeladene Wert der Geldbörse kann dann mit "
+"nur einem Klick zum Bezahlen auf Webseiten verwendet werden. Die Verkäufer "
+"müssen diese Bezahlung als berechtigt annehmen. Ein Datendiebstahl "
+"(Phishing) ist dabei technisch ausgeschlossen, es werden keine persönlichen "
+"Daten übermittelt."
 
 #: index.html.j2:128
 msgid "Receiving payments with Taler"
 msgstr "Verkaufen mit Taler"
 
 #: index.html.j2:129
-msgid ""
-"<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"
+#, fuzzy
+#| msgid ""
+#| "<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"
+msgid ""
+"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"currency. We provide supporting software in various programming languages to "
+"make the integration painless. The merchant's backend for Taler transaction "
+"processing can run on the merchant's premises or be hosted by a third party."
+"</p>"
 msgstr ""
 "Um Zahlungen erhalten zu können, brauchen Verkäufer ein Girokonto in der "
 "gewünschten Währung bei einer Geschäftsbank. Das Taler-Bezahlsystem "
 "unterstützt die Software verschiedener Verkaufsplattformen in mehreren "
-"Programmiersprachen, um die Integration so einfach wie möglich zu machen."
-" Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
+"Programmiersprachen, um die Integration so einfach wie möglich zu machen. "
+"Das Backend der Händlerplattform kann dabei auf dem eigenen Rechner des "
 "Verkäufers oder gehostet laufen, um die Taler-Buchungen durchzuführen."
 
 #: index.html.j2:145
@@ -1590,99 +1945,132 @@ msgid "Invest in Taler!"
 msgstr "In Taler investieren!"
 
 #: investors.html.j2:9
+#, fuzzy
+#| msgid ""
+#| "We have created a company, Taler Systems SA in\n"
+#| "Luxembourg.<br>\n"
+#| "Please contact <tt>invest@taler.net</tt>\n"
+#| "if you want to invest in Taler.\n"
 msgid ""
-"We have created a company, Taler Systems SA in\n"
-"Luxembourg.<br>\n"
-"Please contact <tt>invest@taler.net</tt>\n"
-"if you want to invest in Taler.\n"
+"We have created a company, Taler Systems SA in Luxembourg.<br> Please "
+"contact <tt>invest@taler.net</tt> if you want to invest in Taler."
 msgstr ""
-"Taler Systems SA in Luxemburg ist die Gesellschaft, die Investitionen in "
-"das Taler-Bezahlsystem ermöglicht. Bitte kontaktieren Sie dafür "
-"<tt>invest@taler.net</tt>."
+"Taler Systems SA in Luxemburg ist die Gesellschaft, die Investitionen in das "
+"Taler-Bezahlsystem ermöglicht. Bitte kontaktieren Sie dafür <tt>invest@taler."
+"net</tt>."
 
 #: investors.html.j2:24
 msgid "The Team"
 msgstr "Das Taler-Team"
 
 #: investors.html.j2:27
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Our <a href=\"about.html\">team</a> combines world-class business leaders, "
+"cryptographers, software engineers, civil-rights activists and academics. We "
+"are unified by a vision of how payments should work and the goal of imposing "
+"this vision upon the world."
 msgstr ""
 "Unser <a href=\"about.html\">team</a> vereint Unternehmensleiter, "
-"Kryptographen, Softwareingenieure, Aktivisten und Akademiker. Uns "
-"verbindet die Vision eines einwandfreien Bezahlsystems und die "
-"Zielsetzung, diese Vision in die Welt zu bringen."
+"Kryptographen, Softwareingenieure, Aktivisten und Akademiker. Uns verbindet "
+"die Vision eines einwandfreien Bezahlsystems und die Zielsetzung, diese "
+"Vision in die Welt zu bringen."
 
 #: investors.html.j2:37
-msgid ""
-"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 ""
-"Gegenwärtig unterstützen uns <a href=\"http://www.inria.fr/\">Inria</a>, "
-"das Nationale Forschungsinstitut für Informatik und Automatisierung, "
-"sowie die <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
+"the French national institute for research in informatics and automation, "
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
 "Foundation</a>."
+msgstr ""
+"Gegenwärtig unterstützen uns <a href=\"http://www.inria.fr/\">Inria</a>, das "
+"Nationale Forschungsinstitut für Informatik und Automatisierung, sowie die "
+"<a href=\"https://renewablefreedom.org/\">Renewable Freedom Foundation</a>."
 
 #: investors.html.j2:45
 msgid "The Technology"
 msgstr "Die Technologie"
 
 #: investors.html.j2:48
-msgid ""
-"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 ""
-"Alle Buchungen im Taler-Bezahlsystem sind mit aktuellen Methoden der <a "
-"href=\"bibliography.html\">Kryptographie</a> geschützt. Selbst im Fall "
-"eines Verlusts oder Diebstahls privater Schlüssel ist ein eventueller "
-"Schaden für Käufer, Verkäufer und Wechselstuben begrenzt. Die Datenbanken"
-" unterstehen einem unabhängigen Auditing, das die Konsistenz ihrer Daten "
-"und Verfahren überprüft. Kompromittierte Endgeräte können so schnell "
-"erkannt werden. Das Auditing stellt zudem die Beweisgrundlage für die "
-"Rechtschaffenheit aller Beteiligten dar. Die Buchungskosten betragen "
-"übrigens nur Bruchteile eines Cent pro Buchung."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"All transactions in Taler are secured using <a href=\"bibliography.html"
+"\">modern cryptography</a> and trust in all parties is minimized. Financial "
+"damage is bounded (for customers, merchants and the exchange) even in the "
+"case that systems are compromised and private keys are stolen. Databases can "
+"be audited for consistency, resulting in either the detection of compromised "
+"systems or the demonstration that participants were honest. Actual "
+"transaction costs are fractions of a cent."
+msgstr ""
+"Alle Buchungen im Taler-Bezahlsystem sind mit aktuellen Methoden der <a href="
+"\"bibliography.html\">Kryptographie</a> geschützt. Selbst im Fall eines "
+"Verlusts oder Diebstahls privater Schlüssel ist ein eventueller Schaden für "
+"Käufer, Verkäufer und Wechselstuben begrenzt. Die Datenbanken unterstehen "
+"einem unabhängigen Auditing, das die Konsistenz ihrer Daten und Verfahren "
+"überprüft. Kompromittierte Endgeräte können so schnell erkannt werden. Das "
+"Auditing stellt zudem die Beweisgrundlage für die Rechtschaffenheit aller "
+"Beteiligten dar. Die Buchungskosten betragen übrigens nur Bruchteile eines "
+"Cent pro Buchung."
 
 #: investors.html.j2:63
 msgid "The Business"
 msgstr "Das Geschäftsmodell des Taler-Bezahlsystems"
 
 #: investors.html.j2:66
-msgid ""
-"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 ""
-"Das Geschäftsmodell von Taler liegt im Betrieb des Bezahlsystems, das "
-"Geld aus herkömmlichen Bezahlsystemen (wie z.B. MasterCard, SEPA, UPI, "
-"Visa, Bitcoin, ACH, SWIFT usw.) in anonymisierte digitale Münzen des "
-"selben nominalen Werts in der gegebenen Währung umtauscht. Die Käufer "
-"können diese digitalen Münzen bei einem Verkäufer ausgeben, der sie "
-"wiederum bei einer Taler-Wechselstube in Geld eintauscht, das er auf sein"
-" Girokonto gutgeschrieben bekommt. Die Wechselstube erhebt für die "
-"Überweisungen geringe Gebühren."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"The scalable business model for Taler is the operation of the payment "
+"service provider, which converts money from traditional payment systems "
+"(MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
+"electronic coins in the same currency. The customer can then redeem the "
+"electronic coins at a merchant, who can exchange them for money represented "
+"using traditional payment systems at the exchange. The exchange charges fees "
+"to facilitate the transactions."
+msgstr ""
+"Das Geschäftsmodell von Taler liegt im Betrieb des Bezahlsystems, das Geld "
+"aus herkömmlichen Bezahlsystemen (wie z.B. MasterCard, SEPA, UPI, Visa, "
+"Bitcoin, ACH, SWIFT usw.) in anonymisierte digitale Münzen des selben "
+"nominalen Werts in der gegebenen Währung umtauscht. Die Käufer können diese "
+"digitalen Münzen bei einem Verkäufer ausgeben, der sie wiederum bei einer "
+"Taler-Wechselstube in Geld eintauscht, das er auf sein Girokonto "
+"gutgeschrieben bekommt. Die Wechselstube erhebt für die Überweisungen "
+"geringe Gebühren."
 
 #: investors.html.j2:85
 msgid "The Business Case"
@@ -1693,17 +2081,23 @@ msgid "Running a Taler payment service operator"
 msgstr "Ein Taler-Bezahlsystem als Serviceanbieter betreiben"
 
 #: investors.html.j2:110
-msgid ""
-"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 ""
-"Der Serviceanbieter betreibt ein Bezahlsystem mit einer Taler-"
-"Wechselstube. Die Wechselstube erhebt Gebühren für die Überweisungen von "
-"Käufern oder Verkäufern. Die Gebühren enthalten die notwendigen Kosten "
-"für die Banküberweisungen von und zu Geschäftsbanken und für den Betrieb "
-"der IT-Infrastruktur."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"The payment service operator runs the <em>Taler exchange</em>. The exchange "
+"charges <b>transaction fees</b> to customers or merchants. Its operational "
+"expenses are from wire transfers with the banking system and the operation "
+"of the computing infrastructure."
+msgstr ""
+"Der Serviceanbieter betreibt ein Bezahlsystem mit einer Taler-Wechselstube. "
+"Die Wechselstube erhebt Gebühren für die Überweisungen von Käufern oder "
+"Verkäufern. Die Gebühren enthalten die notwendigen Kosten für die "
+"Banküberweisungen von und zu Geschäftsbanken und für den Betrieb der IT-"
+"Infrastruktur."
 
 #: investors.html.j2:120
 msgid ""
@@ -1715,22 +2109,22 @@ msgstr ""
 
 #: investors.html.j2:122
 msgid ""
-"Multiple Taler transactions can be aggregated into larger wire transfers "
-"to merchants to minimize wire transfer costs."
+"Multiple Taler transactions can be aggregated into larger wire transfers to "
+"merchants to minimize wire transfer costs."
 msgstr ""
-"Um die Transaktionskosten des Taler-Bezahlsystems noch weiter zu "
-"reduzieren, können mehrere kleine Überweisungen auf das Girokonto der "
-"Verkäufer in einer Transaktion zusammengefasst und übertragen werden."
+"Um die Transaktionskosten des Taler-Bezahlsystems noch weiter zu reduzieren, "
+"können mehrere kleine Überweisungen auf das Girokonto der Verkäufer in einer "
+"Transaktion zusammengefasst und übertragen werden."
 
 #: investors.html.j2:124
 msgid ""
 "Protocol allows the exchange to charge fees for any expensive operation "
 "(withdraw, deposit, refresh, refund or aggregated wire transfers)."
 msgstr ""
-" Die Wechselstube kann protokollbasiert verschieden hohe Gebühren "
-"verlangen z.B. bei teureren Transaktionen wie Überweisungen von "
-"Geschäftsbanken an die Geldbörse, Deponieren von Münzen, Refresh-"
-"Funktion, Erstattungen und aggregierte Überweisungen an Geschäftsbanken."
+" Die Wechselstube kann protokollbasiert verschieden hohe Gebühren verlangen "
+"z.B. bei teureren Transaktionen wie Überweisungen von Geschäftsbanken an die "
+"Geldbörse, Deponieren von Münzen, Refresh-Funktion, Erstattungen und "
+"aggregierte Überweisungen an Geschäftsbanken."
 
 #: investors.html.j2:126
 msgid "Partnership with banks establishes consumer trust."
@@ -1747,130 +2141,172 @@ msgid "Advantages for Merchants"
 msgstr "Vorteile für Händler"
 
 #: 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.\n"
+#, fuzzy
+#| 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.\n"
+msgid ""
+"Taler is a cost-effective electronic payment system which provides you with "
+"cryptographic proof that the payment worked correctly within milliseconds. "
+"Your Web customers pay with previously unknown levels of convenience without "
+"risk of fraud."
 msgstr ""
 "Taler ist ein kostengünstiges elektronisches Bezahlsystem, das eine "
 "fehlerfrei abgewickelte Bezahlung innerhalb von Millisekunden "
-"kryptographisch bestätigt. Die Kunden Ihrer Webshops zahlen mit einem "
-"bisher noch nie dagewesenen Komfort und werden keine Betrugsgefahren mehr"
-" fürchten müssen."
+"kryptographisch bestätigt. Die Kunden Ihrer Webshops zahlen mit einem bisher "
+"noch nie dagewesenen Komfort und werden keine Betrugsgefahren mehr fürchten "
+"müssen."
 
 #: merchants.html.j2:22
 msgid "Fast"
 msgstr "Schnell"
 
 #: 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 &quot;verified\n"
-"by&quot; 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"
+#, fuzzy
+#| 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 &quot;verified\n"
+#| "by&quot; 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"
+msgid ""
+"Processing transactions with Taler is fast, allowing you to confirm the "
+"transaction with your customer virtually immediately. Your customers will "
+"appreciate that they do not have to type in credit card information and play "
+"the &quot;verified by&quot; game. By making payments significantly more "
+"convenient for your customers, you may be able to use Taler for small "
+"transactions that would not work with credit card payments due to the mental "
+"overhead for customers."
 msgstr ""
 "Die Verarbeitung von Transaktionen im Taler-Bezahlsystem erfolgt "
-"blitzschnell und bestätigt Käufern und Verkäufern im gleichen Augenblick "
-"die erfolgte Bezahlung. Ihre Kunden müssen keine "
-"Kreditkarteninformationen preisgeben. Mit Taler werden vor allem kleinere"
-" Zahlbeträge wesentlich effizienter und bequemer verbucht als in anderen,"
-" teureren und komplizierteren Verfahren. "
+"blitzschnell und bestätigt Käufern und Verkäufern im gleichen Augenblick die "
+"erfolgte Bezahlung. Ihre Kunden müssen keine Kreditkarteninformationen "
+"preisgeben. Mit Taler werden vor allem kleinere Zahlbeträge wesentlich "
+"effizienter und bequemer verbucht als in anderen, teureren und "
+"komplizierteren Verfahren. "
 
 #: merchants.html.j2:44
-msgid ""
-"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 ""
-"Verkäufer erhalten eine kryptographisch verschlüsselte "
-"Zahlungsbestätigung vom Betreiber des Taler-Bezahlsystems. Taler "
-"verarbeitet nie sensible Bankdaten der Kunden, daher müssen sich die "
-"Verkäufer auch keinen Sicherheitsaudits (wie PCI DSS) unterziehen. Die "
-"Verkäufer bekommen stattdessen digital signierte Kaufverträge, die sie "
-"mit den Käufern abgeschlossen haben, mit denen sie sogar bei "
-"Gerichtsprozessen Transaktionsnachweise erbringen können."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"You will have cryptographic proof of payment from the Taler payment service "
+"provider. With Taler you never handle sensitive customer account information "
+"and thus do not have to undergo any particular security audits (such as PCI "
+"DSS). Your systems will have customer contracts with qualified signatures "
+"for all transactions which you can use in court in case of disputes."
+msgstr ""
+"Verkäufer erhalten eine kryptographisch verschlüsselte Zahlungsbestätigung "
+"vom Betreiber des Taler-Bezahlsystems. Taler verarbeitet nie sensible "
+"Bankdaten der Kunden, daher müssen sich die Verkäufer auch keinen "
+"Sicherheitsaudits (wie PCI DSS) unterziehen. Die Verkäufer bekommen "
+"stattdessen digital signierte Kaufverträge, die sie mit den Käufern "
+"abgeschlossen haben, mit denen sie sogar bei Gerichtsprozessen "
+"Transaktionsnachweise erbringen können."
 
 #: 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 competing integrators for\n"
-"support.\n"
-msgstr ""
-"Taler ist freie Software. Der Referenzcode darf aufgrund seiner "
-"öffentlichen Lizenz in die bestehenden Bezahlsysteme und "
-"Handelsplattformen integriert werden und für seine Verwendung fallen auch"
-" keine Lizenzgebühren an. Das Entwicklungsprinzip freier Software stellt "
-"zudem sicher, dass man immer aus einer Vielzahl von Anbietern für "
-"Integration und Support wählen kann."
+#, fuzzy
+#| 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 competing integrators for\n"
+#| "support.\n"
+msgid ""
+"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 competing "
+"integrators for support."
+msgstr ""
+"Taler ist freie Software. Der Referenzcode darf aufgrund seiner öffentlichen "
+"Lizenz in die bestehenden Bezahlsysteme und Handelsplattformen integriert "
+"werden und für seine Verwendung fallen auch keine Lizenzgebühren an. Das "
+"Entwicklungsprinzip freier Software stellt zudem sicher, dass man immer aus "
+"einer Vielzahl von Anbietern für Integration und Support wählen kann."
 
 #: merchants.html.j2:76
 msgid "Cheap"
 msgstr "Günstig"
 
 #: merchants.html.j2:79
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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 offer low transaction fees."
 msgstr ""
 "Taler verwendet effiziente kryptographische Algorithmen mit nur geringem "
-"Bedarf an Bandbreite und Speicherplatz. Betreiber von Taler-"
-"Bezahlsystemen müssen von ihren Kunden nur minimale Gebühren verlangen, "
-"weil sie einen hohen Sicherheitsstand bieten, der Verluste durch Betrug "
-"von vornherein ausschließt, und ihre Anlagen gleichzeitig sehr geringe "
-"Fixkosten erfordern."
+"Bedarf an Bandbreite und Speicherplatz. Betreiber von Taler-Bezahlsystemen "
+"müssen von ihren Kunden nur minimale Gebühren verlangen, weil sie einen "
+"hohen Sicherheitsstand bieten, der Verluste durch Betrug von vornherein "
+"ausschließt, und ihre Anlagen gleichzeitig sehr geringe Fixkosten erfordern."
 
 #: merchants.html.j2:89
 msgid "Flexible"
 msgstr "Flexibel"
 
 #: merchants.html.j2:92
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"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."
 msgstr ""
 "Taler kann man einsetzen für verschiedene Währungen (wie Euro, US-Dollar "
 "oder Bitcoin) und für jeden Betrag bis zu den Grenzen, die allein "
-"gesetzliche Regulierungen bzw. die Betreiber von Bezahlsystemen "
-"festlegen."
+"gesetzliche Regulierungen bzw. die Betreiber von Bezahlsystemen festlegen."
 
 #: merchants.html.j2:101
 msgid "Ethical"
 msgstr "Ethisch"
 
 #: merchants.html.j2:104
-msgid ""
-"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"
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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."
 msgstr ""
 "Taler verhindert Steuerhinterziehung und Geldwäsche. Die Protokolle von "
 "Taler sind effizient und benötigen kein stromfressendes Mining. Taler "
-"unterstützt die Transparenz mit einem offenen Standard und freier "
-"Software."
+"unterstützt die Transparenz mit einem offenen Standard und freier Software."
 
 #: merchants.html.j2:119
 msgid "Manuals for merchants"
@@ -1897,42 +2333,56 @@ msgid "Merchants process payments using the Taler backend:"
 msgstr "Händler verwenden das Taler-Backend zur Zahlungsabwicklung:"
 
 #: merchants.html.j2:147
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"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."
 msgstr ""
-"Das Backend signiert und speichert sämtliche Bedingungen der Verträge, "
-"die Käufer und Verkäufer vorher vereinbart hatten. Das Händlerfrontend "
-"liefert dafür die vom Käufer bestellten Artikelnummern im JSON-Format an "
-"das Backend."
+"Das Backend signiert und speichert sämtliche Bedingungen der Verträge, die "
+"Käufer und Verkäufer vorher vereinbart hatten. Das Händlerfrontend liefert "
+"dafür die vom Käufer bestellten Artikelnummern im JSON-Format an das Backend."
 
 #: merchants.html.j2:156
-msgid ""
-"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 ""
-"Das Backend validiert die Signaturen aus den Taler-Geldbörsen und sendet "
-"sie der Taler-Wechselstube zur Ausführung. Das Händlerfrontend muss dann "
-"die Zahlungsaufforderung an das Taler-Backend senden und den "
-"zurückgemeldeten HTTP-Statuscode gegenprüfen."
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"The backend <b>validates</b> payments received from the wallet and "
+"<b>executes</b> them with the Taler payment service provider (the exchange). "
+"For this, the merchant's frontend must pass the payment request through to "
+"the Taler backend and check the HTTP status code that is returned."
+msgstr ""
+"Das Backend validiert die Signaturen aus den Taler-Geldbörsen und sendet sie "
+"der Taler-Wechselstube zur Ausführung. Das Händlerfrontend muss dann die "
+"Zahlungsaufforderung an das Taler-Backend senden und den zurückgemeldeten "
+"HTTP-Statuscode gegenprüfen."
 
 #: merchants.html.j2:167
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"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"
+"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."
 msgstr ""
-"Das Backend kann die erfolgreich abgewickelten Transaktionen auflisten "
-"und die Überweisungen an Girokonten der Geschäftsbanken mit den genauen "
-"Bedingungen jedes Kaufvertrags und nach Geschäftsvorfällen geordnet "
-"anzeigen."
+"Das Backend kann die erfolgreich abgewickelten Transaktionen auflisten und "
+"die Überweisungen an Girokonten der Geschäftsbanken mit den genauen "
+"Bedingungen jedes Kaufvertrags und nach Geschäftsvorfällen geordnet anzeigen."
 
 #: press.html.j2:4
 msgid "GNU Taler in the Press"
@@ -1946,12 +2396,6 @@ msgstr "Das Taler-Bezahlsystem"
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
 
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "Home"
-#~ msgstr ""
-
 #~ msgid "Demo"
 #~ msgstr "Demo"
 
@@ -1961,102 +2405,15 @@ msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
 #~ msgid "About&nbsp;us"
 #~ msgstr "Über&nbsp;uns"
 
-#~ msgid "Stability "
-#~ msgstr ""
-
 #~ msgid "News"
 #~ msgstr "Nachrichten"
 
-#~ msgid "Taler Web payments paper published."
-#~ msgstr ""
-
-#~ msgid "More news »"
-#~ msgstr ""
-
-#~ msgid "Taler technology: About taxability, change and privacy"
-#~ msgstr ""
-
-#~ msgid "1-2017: Taler Documentation pages updated"
-#~ msgstr ""
-
-#~ msgid "Operate a Taler exchange!"
-#~ msgstr ""
-
-#~ msgid "Electronic payments for a liberal society!"
-#~ msgstr ""
-
-#~ msgid "Anonymous"
-#~ msgstr ""
-
-#~ msgid "Electronic"
-#~ msgstr ""
-
-#~ msgid "Reserves"
-#~ msgstr ""
-
-#~ msgid "Advantages for citizens"
-#~ msgstr ""
-
-#~ msgid "Independent One-Click Payment!"
-#~ msgstr ""
-
-#~ msgid "Advantages for merchants"
-#~ msgstr ""
-
-#~ msgid "Advantages for governments"
-#~ msgstr ""
-
-#~ msgid "Invest in GNU Taler!"
-#~ msgstr ""
-
-#~ msgid "Business model"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by the exchange operator"
-#~ msgstr ""
-
-#~ msgid "Taxable Anonymous Libre Electronic Reserves"
-#~ msgstr ""
-
-#~ msgid "Independent One-Click Payments!"
-#~ msgstr ""
-
-#~ msgid "<b>T</b>axable"
-#~ msgstr ""
-
-#~ msgid "<b>A</b>nonymous"
-#~ msgstr ""
-
-#~ msgid "<b>L</b>ibre"
-#~ msgstr ""
-
-#~ msgid "<b>E</b>lectronic"
-#~ msgstr ""
-
-#~ msgid "<b>R</b>eserves"
-#~ msgstr ""
-
 #~ msgid "Latest Videos"
 #~ msgstr "Neuste Videos"
 
-#~ msgid "Florian Dold talks about Taler at 50p!"
-#~ msgstr ""
-
-#~ msgid "Taler News"
-#~ msgstr "Taler Nachrichten"
-
-#~ msgid "Financial News"
-#~ msgstr "Nachrichten aus der Finanzwelt"
-
-#~ msgid "en"
-#~ msgstr ""
-
 #~ msgid "About us"
 #~ msgstr "Über uns"
 
-#~ msgid "CFO"
-#~ msgstr ""
-
 #~ msgid "Developers"
 #~ msgstr "Entwickler"
 
@@ -2069,1011 +2426,8 @@ msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
 #~ msgid "Merchants"
 #~ msgstr "Händler"
 
-#~ msgid "The GNU Taler merchant backend operator tutorial"
-#~ msgstr ""
-
 #~ msgid "Wallet"
 #~ msgstr "Geldbörse"
 
-#~ msgid "Taler as seen by customers"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by merchants"
-#~ msgstr ""
-
-#~ msgid "Tax-friendly"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
-#~ msgstr ""
-
-#~ msgid "Taler complies with regulation"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2)"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by governments"
-#~ msgstr ""
-
-#~ msgid "Previous"
-#~ msgstr ""
-
-#~ msgid "Next"
-#~ msgstr ""
-
-#~ msgid "Accept and validate deposits from merchants."
-#~ msgstr ""
-
-#~ msgid "Taler as seen by the payment service operator"
-#~ msgstr ""
-
-#~ msgid "Financial risk is bounded even if keys are compromised."
-#~ 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:taler@gnu.org\">taler@gnu.org</a>.\n"
-#~ "        "
-#~ msgstr ""
-
-#~ msgid ""
-#~ "\n"
-#~ "             Team members are generally reachable at\n"
-#~ "             <tt>LASTNAME@taler.net</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 &quot;serial\n"
-#~ "                   numbers&quot; 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>invest@taler.net</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 &quot;verified\n"
-#~ "               by&quot; 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 ""
-
-#~ msgid ""
-#~ "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 ""
-#~ "Schon vom Konzept her verhindert Taler"
-#~ " Falschgeld oder Sicherheitslücken wie "
-#~ "Phishing und wird gleichzeitig jedoch "
-#~ "niemals Käufern betrügerische Absichten "
-#~ "unterstellen können."
-
-#~ msgid ""
-#~ "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 ""
-#~ "Taler hält die Identität der Käufer "
-#~ "geheim, auch gegenüber den Verkäufern. "
-#~ "Genauso wie beim Kauf mit Bargeld "
-#~ "kann niemand Auskunft darüber erlangen, "
-#~ "was mit dem Taler-Bezahlsystem gekauft"
-#~ " wurde. Die Käufer erhalten jedoch "
-#~ "garantiert einen Nachweis über ihre "
-#~ "Zahlung und den erfolgten Eigentumsübergang."
-
 #~ msgid "Citizens"
 #~ msgstr "Bürger"
-
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 8e3d522d..2ed8c798 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -1,17 +1,16 @@
-
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-23 10:32+0200\n"
+"POT-Creation-Date: 2017-06-05 16:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: en\n"
 "Language-Team: en <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
@@ -22,8 +21,8 @@ msgstr ""
 
 #: about.html.j2:13
 msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
-" industries, …."
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
 msgstr ""
 
 #: about.html.j2:20
@@ -109,11 +108,9 @@ msgstr ""
 
 #: citizens.html.j2:9
 msgid ""
-"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 withdraw money from your bank "
+"account into your electronic wallet, and can henceforth spend digital cash. "
+"The electronic wallet can carry multiple currencies."
 msgstr ""
 
 #: citizens.html.j2:25 governments.html.j2:58 index.html.j2:56
@@ -123,12 +120,10 @@ 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"
+"Taler uses modern cryptography, ensuring that there is no counterfeit. Your "
+"digital wallet is safer than your physical wallet. At most, you can lose its "
+"contents because your computer or mobile is irreparably damaged or "
+"compromised. Unlike a physical wallet, you can make backups to secure "
 "against data loss."
 msgstr ""
 
@@ -138,12 +133,10 @@ msgstr ""
 
 #: citizens.html.j2:39
 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."
+"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."
 msgstr ""
 
 #: citizens.html.j2:50
@@ -152,11 +145,10 @@ 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."
+"You will be able to withdraw money to replenish the digital coins in your "
+"wallet using your credit card or wire transfers. Afterwards you can pay with "
+"one-click using the Taler wallet, which optionally keeps your transaction "
+"history on your computer."
 msgstr ""
 
 #: citizens.html.j2:61 index.html.j2:42
@@ -165,13 +157,10 @@ 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."
+"Coins in your digital wallet will be of the same denomination as the cash in "
+"your physical wallet. Taler is not a crypto-currency, so you do not have to "
+"worry about cryto-currency related value fluctuations. Banking with Taler is "
+"subject to the usual government protections for financial services."
 msgstr ""
 
 #: citizens.html.j2:79
@@ -180,10 +169,9 @@ msgstr ""
 
 #: citizens.html.j2:81
 msgid ""
-"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"
+"We currently provide a <a href=\"wallet.html\">wallet browser extension</a> "
+"for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile phones and "
+"other platforms will be available in the future."
 msgstr ""
 
 #: citizens.html.j2:88
@@ -192,8 +180,8 @@ msgstr ""
 
 #: citizens.html.j2:90
 msgid ""
-"You can see how Taler works in practice by visiting our <a "
-"href=\"https://demo.taler.net\">demo page</a>.\n"
+"You can see how Taler works in practice by visiting our <a href=\"https://"
+"demo.taler.net\">demo page</a>."
 msgstr ""
 
 #: citizens.html.j2:103
@@ -201,39 +189,32 @@ msgid "The Taler Wallet for customers"
 msgstr ""
 
 #: citizens.html.j2:105
-msgid ""
-"Customers interact with the Taler system using\n"
-"the Taler wallet:"
+msgid "Customers interact with the Taler system using the Taler wallet:"
 msgstr ""
 
 #: citizens.html.j2:110
 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"
+"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."
 msgstr ""
 
 #: citizens.html.j2:118
 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."
+"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."
 msgstr ""
 
 #: citizens.html.j2:125
 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."
+"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."
 msgstr ""
 
 #: contact.html.j2:6
@@ -246,12 +227,10 @@ msgstr ""
 
 #: contact.html.j2:15
 msgid ""
-"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:taler@gnu.org\">taler@gnu.org</a>.\n"
+"An archived, public mailing list for GNU Taler is hosted at <a href="
+"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
 msgstr ""
 
 #: contact.html.j2:25
@@ -260,9 +239,8 @@ msgstr ""
 
 #: contact.html.j2:27
 msgid ""
-"Team members are generally reachable at\n"
-"<tt>LASTNAME@taler.net</tt>.  All of us\n"
-"support receiving GnuPG encrypted e-mails.\n"
+"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
+"us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
 #: contact.html.j2:36
@@ -271,11 +249,9 @@ msgstr ""
 
 #: contact.html.j2:38
 msgid ""
-"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 <a href=\"https://gnunet.org/"
+"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
+"also report bugs or feature requests to the mailing list."
 msgstr ""
 
 #: contact.html.j2:49
@@ -284,8 +260,38 @@ msgstr ""
 
 #: contact.html.j2:51
 msgid ""
-"For non-technical commercial requests, please contact\n"
-"<tt>ceo AT taler.net</tt>.\n"
+"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
+"tt>."
+msgstr ""
+
+#: copyright.html.j2:6
+msgid "Copyright Assignment"
+msgstr ""
+
+#: copyright.html.j2:8
+msgid ""
+"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+msgstr ""
+
+#: copyright.html.j2:17
+msgid ""
+"<p>The agreements ensure that the code will continue to be made available "
+"under free software licenses, but gives developers the freedom to move code "
+"between GNUnet and GNU Taler without worrying about licenses and the company "
+"the ability to dual-license (for example, so that we can distribute via App-"
+"stores that are hostile to free software).</p>"
+msgstr ""
+
+#: copyright.html.j2:25
+msgid ""
+"<p>Minor contributions (basically, anyone without Git access) do not require "
+"copyright assignment. Pseudonymous contributions are accepted, in this case "
+"simply sign the agreement with your pseudonym. Scanned copies are "
+"sufficient, but snail mail is preferred.</p>"
 msgstr ""
 
 #: developers.html.j2:5
@@ -298,17 +304,14 @@ msgstr ""
 
 #: developers.html.j2:15
 msgid ""
-"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"
+"GNU Taler is free software implementing an open protocol. Anybody is welcome "
+"to integrate our reference implementation into their applications. Different "
+"components of Taler are being made available under different licenses. The "
+"Affero GPLv3+ is used for the exchange, the LGPLv3+ is used for reference "
+"code demonstrating integration with merchant platforms, and licenses like "
+"GPLv3+ are used for wallets and related customer-facing software. We are "
+"open for constructive suggestions for maximizing the adoption of this "
+"payment platform."
 msgstr ""
 
 #: developers.html.j2:32
@@ -317,18 +320,14 @@ msgstr ""
 
 #: developers.html.j2:35
 msgid ""
-"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"
+"Taler is designed to work on the Internet. To ensure that Taler payments can "
+"work with restrictive network setups, Taler uses a RESTful protocol over "
+"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
+"obviously merchants may choose to offer HTTPS for consistency and because it "
+"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
+"structure data, making it easy to integrate Taler with existing Web "
+"applications. Taler's protocol is documented in detail at <a href=\"https://"
+"api.taler.net/\">api.taler.net</a>."
 msgstr ""
 
 #: developers.html.j2:58
@@ -337,15 +336,13 @@ msgstr ""
 
 #: developers.html.j2:61
 msgid ""
-"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"
+"Taler is currently primarily developed by a 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 "
+"repositories can be found in our <a href=\"https://git.taler.net/\">GitWeb</"
+"a>."
 msgstr ""
 
 #: developers.html.j2:75
@@ -354,11 +351,10 @@ msgstr ""
 
 #: developers.html.j2:78
 msgid ""
-"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"
+"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>. Technical papers can be found in our <a href="
+"\"bibliography.html\">bibliography</a>."
 msgstr ""
 
 #: developers.html.j2:88
@@ -367,11 +363,9 @@ msgstr ""
 
 #: developers.html.j2:91
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:101
@@ -380,10 +374,9 @@ msgstr ""
 
 #: developers.html.j2:104
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:113
@@ -392,11 +385,9 @@ msgstr ""
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:126
@@ -405,11 +396,9 @@ msgstr ""
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:145
@@ -418,120 +407,86 @@ msgstr ""
 
 #: developers.html.j2:148
 msgid ""
-"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"
+"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:"
 msgstr ""
 
 #: 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.\n"
+"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."
 msgstr ""
 
 #: 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 &quot;serial\n"
-"numbers&quot; 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"
+"Once the exchange has received the wire transfer, it allows the customer's "
+"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
+"are digital representations of the original currency from the transfer. It "
+"is important to note that the exchange does not learn the &quot;serial "
+"numbers&quot; of the coins created in this process, so it cannot tell later "
+"which customer purchased what at which merchant. The use of Taler does not "
+"change the currency or the total value of the funds (except for fees which "
+"the exchange may charge for the service)."
 msgstr ""
 
 #: 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).\n"
+"Once the customer has the digital coins in his wallet, the wallet can be "
+"used to <b>spend</b> the coins with merchant portals that support the Taler "
+"payment system and accept the respective exchange as a business partner "
+"(bottom arrow). This creates a digital contract signed by the customer's "
+"coins and the merchant. If necessary, the customer can later use this "
+"digitally signed contract in a court of law to prove the exact terms of the "
+"contract and that he paid the respective amount. The customer does not learn "
+"the banking details of the merchant, and Taler does not require the merchant "
+"to learn the identity of the customer. Naturally, the customer can spend any "
+"fraction of his digital coins (the system takes care of customers getting "
+"change)."
 msgstr ""
 
 #: developers.html.j2:210
 msgid ""
-"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"
+"Merchants receiving digital coins <b>deposit</b> the respective claims that "
+"resulted from the contract signing with the customer at the exchange to "
+"redeem the coins. The deposit step does not reveal the details of the "
+"contract between the customer and the merchant or the identity of the "
+"customer to the exchange in any way. However, the exchange does learn the "
+"identity of the merchant via the provided bank routing information. The "
+"merchant can, for example when compelled by the state for taxation, provide "
+"information linking the individual deposit to the respective contract signed "
+"by the customer. Thus, the exchange's database allows the state to enforce "
+"that merchants pay applicable taxes (and do not engage in illegal contracts)."
 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.\n"
+"Finally, the exchange transfers funds corresponding to the digital coins "
+"redeemed by the merchants to the merchant's <b>bank</b> account. The "
+"exchange may combine multiple small transactions into one larger bank "
+"transfer. The merchant can query the exchange about the relationship between "
+"the bank transfers and the individual claims that were deposited."
 msgstr ""
 
 #: 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.\n"
+"Most importantly, the exchange keeps cryptographic proofs that allow it to "
+"demonstrate that it is operating correctly to third parties. The system "
+"requires an external <b>auditor</b>, such as a government-appointed "
+"financial regulatory body, to frequently verify the exchange's databases and "
+"check that its bank balance matches the total value of the remaining coins "
+"in circulation."
 msgstr ""
 
 #: 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.\n"
+"Without the auditor, the exchange operators could embezzle funds they are "
+"holding in reserve. Customers and merchants cannot cheat each other or the "
+"exchange. If any party's computers are compromised, the financial damage is "
+"limited to the respective party and proportional to the funds they have in "
+"circulation during the period of the compromise."
 msgstr ""
 
 #: faq.html.j2:5
@@ -540,17 +495,16 @@ msgstr ""
 
 #: faq.html.j2:6
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:18
@@ -559,9 +513,9 @@ msgstr ""
 
 #: faq.html.j2:19
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:25
@@ -570,16 +524,15 @@ msgstr ""
 
 #: faq.html.j2:26
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low.</p>"
 msgstr ""
 
 #: faq.html.j2:37
@@ -588,9 +541,9 @@ 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:44
@@ -599,15 +552,15 @@ msgstr ""
 
 #: faq.html.j2:45
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>Future versions of the Taler wallet may allow exchanging coins among "
+"friends directly as well.</p>"
 msgstr ""
 
 #: faq.html.j2:56
@@ -616,12 +569,12 @@ msgstr ""
 
 #: faq.html.j2:57
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple\n"
-"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"<p>Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgstr ""
 
 #: faq.html.j2:61
-msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgid "<p>Taler currently does not offer conversion between currencies.</p>"
 msgstr ""
 
 #: faq.html.j2:65
@@ -630,12 +583,10 @@ 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>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>"
 msgstr ""
 
 #: glossary.html.j2:6
@@ -644,8 +595,7 @@ msgstr ""
 
 #: glossary.html.j2:8
 msgid ""
-"trusted third party that verifies that the `exchange` is operating "
-"correctly\n"
+"trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
 #: glossary.html.j2:12
@@ -654,8 +604,8 @@ msgstr ""
 
 #: glossary.html.j2:14
 msgid ""
-"traditional financial service provider who offers wire `transfers` "
-"between accounts\n"
+"traditional financial service provider who offers wire `transfers` between "
+"accounts"
 msgstr ""
 
 #: glossary.html.j2:18
@@ -665,7 +615,7 @@ msgstr ""
 #: glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin\n"
+"known as the `denomination` of the coin"
 msgstr ""
 
 #: glossary.html.j2:24
@@ -673,7 +623,7 @@ msgid "contract"
 msgstr ""
 
 #: glossary.html.j2:26
-msgid "the proposal signed by the wallet.\n"
+msgid "the proposal signed by the wallet."
 msgstr ""
 
 #: glossary.html.j2:30
@@ -682,8 +632,7 @@ msgstr ""
 
 #: glossary.html.j2:32
 msgid ""
-"unit of currency, specifies both the currency and the face value of a "
-"`coin`\n"
+"unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
 #: glossary.html.j2:36
@@ -692,8 +641,8 @@ msgstr ""
 
 #: glossary.html.j2:38
 msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and "
-"of a particular `denomination`\n"
+"RSA key used by the exchange to certify that a given `coin` is valid and of "
+"a particular `denomination`"
 msgstr ""
 
 #: glossary.html.j2:42
@@ -703,8 +652,7 @@ msgstr ""
 #: glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire "
-"`transfer`\n"
+"exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
 #: glossary.html.j2:48
@@ -713,10 +661,9 @@ msgstr ""
 
 #: glossary.html.j2:50
 msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than "
-"the customer, thereby creating the danger of some entity being able to "
-"link multiple transactions of coin's owner if the coin is not refreshed "
-"first\n"
+"a `coin` is dirty if its public key may be known to an entity other than the "
+"customer, thereby creating the danger of some entity being able to link "
+"multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
 #: glossary.html.j2:54
@@ -725,8 +672,8 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider.  Issues eletronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants.\n"
+"Taler's payment service provider. Issues eletronic `coins` during "
+"`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
 #: glossary.html.j2:60
@@ -734,7 +681,7 @@ msgid "extension"
 msgstr ""
 
 #: glossary.html.j2:62
-msgid "implementation of a `wallet` for browsers\n"
+msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
 #: glossary.html.j2:66
@@ -742,7 +689,7 @@ msgid "fresh coin"
 msgstr ""
 
 #: glossary.html.j2:68
-msgid "a `coin` is fresh if its public key is only known to the customer\n"
+msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
 #: glossary.html.j2:72
@@ -751,8 +698,8 @@ msgstr ""
 
 #: glossary.html.j2:74
 msgid ""
-"offline key used by the exchange to certify denomination keys and message"
-" signing keys\n"
+"offline key used by the exchange to certify denomination keys and message "
+"signing keys"
 msgstr ""
 
 #: glossary.html.j2:78
@@ -760,7 +707,7 @@ msgid "message signing key"
 msgstr ""
 
 #: glossary.html.j2:80
-msgid "key used by the exchange to sign online messages, other than coins\n"
+msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
 #: glossary.html.j2:84
@@ -770,15 +717,11 @@ msgstr ""
 #: glossary.html.j2:86
 msgid ""
 "specification of the details of a transaction, specifies the payment "
-"obligations\n"
-"for the customer (i.e. the amount), the deliverables of the merchant and "
-"other\n"
-"related information, such as deadlines or locations; However, it lacks "
-"some\n"
-"information that the backend is supposed to provide.\n"
-"In other words, after the backend adds the missing information to the "
-"offer and\n"
-"signs it, it becomes a proposal.\n"
+"obligations for the customer (i.e. the amount), the deliverables of the "
+"merchant and other related information, such as deadlines or locations; "
+"However, it lacks some information that the backend is supposed to provide. "
+"In other words, after the backend adds the missing information to the offer "
+"and signs it, it becomes a proposal."
 msgstr ""
 
 #: glossary.html.j2:95
@@ -786,7 +729,7 @@ msgid "owner"
 msgstr ""
 
 #: glossary.html.j2:97
-msgid "a `coin` is owned by the entity that knows the private key of the coin\n"
+msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
 #: glossary.html.j2:101
@@ -796,7 +739,7 @@ msgstr ""
 #: glossary.html.j2:103
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
-"correct\n"
+"correct"
 msgstr ""
 
 #: glossary.html.j2:107
@@ -804,7 +747,7 @@ msgid "proposal"
 msgstr ""
 
 #: glossary.html.j2:109
-msgid "a sketch that has been completed and signed by the merchant backend.\n"
+msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
 #: glossary.html.j2:113
@@ -814,8 +757,8 @@ msgstr ""
 #: glossary.html.j2:115
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank"
-" account to cover obligations from coins in circulation\n"
+"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+"account to cover obligations from coins in circulation"
 msgstr ""
 
 #: glossary.html.j2:119
@@ -824,8 +767,8 @@ msgstr ""
 
 #: glossary.html.j2:121
 msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh`"
-" coins\n"
+"operation by which a `dirty` `coin` is converted into one or more `fresh` "
+"coins"
 msgstr ""
 
 #: glossary.html.j2:125
@@ -835,8 +778,8 @@ msgstr ""
 #: glossary.html.j2:127
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back "
-"to the customer\n"
+"obtained from a `deposit` operation, giving the right to the funds back to "
+"the customer"
 msgstr ""
 
 #: glossary.html.j2:131
@@ -846,8 +789,7 @@ msgstr ""
 #: glossary.html.j2:133
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any "
-"time.\n"
+"private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
 #: glossary.html.j2:137
@@ -855,7 +797,7 @@ msgid "signing key"
 msgstr ""
 
 #: glossary.html.j2:139
-msgid "see message signing key.\n"
+msgid "see message signing key."
 msgstr ""
 
 #: glossary.html.j2:143
@@ -864,8 +806,8 @@ msgstr ""
 
 #: glossary.html.j2:145
 msgid ""
-"operation by which a customer gives a merchant the right to `deposit` "
-"coins in return for merchandise\n"
+"operation by which a customer gives a merchant the right to `deposit` coins "
+"in return for merchandise"
 msgstr ""
 
 #: glossary.html.j2:149
@@ -873,7 +815,7 @@ msgid "transfer"
 msgstr ""
 
 #: glossary.html.j2:151
-msgid "method of sending funds between `bank` accounts\n"
+msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
 #: glossary.html.j2:155
@@ -883,7 +825,7 @@ msgstr ""
 #: glossary.html.j2:157
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
-"another\n"
+"another"
 msgstr ""
 
 #: glossary.html.j2:161
@@ -891,7 +833,7 @@ msgid "transaction id"
 msgstr ""
 
 #: glossary.html.j2:163
-msgid "unique number by which a merchant identifies a `transaction`\n"
+msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
 #: glossary.html.j2:167
@@ -900,8 +842,7 @@ msgstr ""
 
 #: glossary.html.j2:169
 msgid ""
-"software running on a customer's computer; withdraws, stores and spends "
-"coins\n"
+"software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
 #: glossary.html.j2:173
@@ -909,7 +850,7 @@ msgid "wire transfer"
 msgstr ""
 
 #: glossary.html.j2:175
-msgid "see `transfer`\n"
+msgid "see `transfer`"
 msgstr ""
 
 #: glossary.html.j2:179
@@ -918,8 +859,8 @@ msgstr ""
 
 #: glossary.html.j2:181
 msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely "
-"identify the `transfer`\n"
+"subject of a wire `transfer`; usually a random string to uniquely identify "
+"the `transfer`"
 msgstr ""
 
 #: glossary.html.j2:185
@@ -928,8 +869,7 @@ msgstr ""
 
 #: glossary.html.j2:187
 msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh "
-"coins\n"
+"operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
 #: governments.html.j2:6
@@ -938,13 +878,11 @@ msgstr ""
 
 #: governments.html.j2:8
 msgid ""
-"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"
+"Taler provides accountability to ensure business operate legally, while also "
+"respecting civil liberties of citizens. Taler is a payment system based on "
+"open standards and free software. Taler needs governments as they set a "
+"financial framework and act as trusted regulators. Taler contributes to "
+"digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
 #: governments.html.j2:25 index.html.j2:71
@@ -953,51 +891,43 @@ msgstr ""
 
 #: governments.html.j2:28
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:41
 msgid ""
-"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"
+"Thus, despite offering anonymity for citizens spending digital cash to buy "
+"goods and services, Taler also ensures that the state can observe incoming "
+"funds. This can be used to ensure businesses engage only in legal "
+"activities, and do not evade income tax, sales tax or value-added tax. "
+"However, this observational capability does not extend to the immediate "
+"personal domain. In particular, monitoring does not cover shared access to "
+"funds with trusted friends and family, or synchronizing wallets across "
+"multiple devices."
 msgstr ""
 
 #: governments.html.j2:61
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:73
 msgid ""
-"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"
+"As a payment service provider, the Taler exchange is subject to financial "
+"regulation. Financial regulation and regular audits are critical to "
+"establish trust. In particular, the Taler design mandates the existence of "
+"an independent auditor who checks cryptographic proofs that accumulate at "
+"the exchange to ensure that the escrow account is managed honestly. This "
+"ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
 #: governments.html.j2:88 index.html.j2:97
@@ -1006,10 +936,9 @@ msgstr ""
 
 #: governments.html.j2:91
 msgid ""
-"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"
+"Taler is free software implementing an open protocol standard. Thus, Taler "
+"will enable competition and avoid the monopolization of payment systems that "
+"threatens global political and financial stability today."
 msgstr ""
 
 #: governments.html.j2:101
@@ -1018,11 +947,9 @@ msgstr ""
 
 #: governments.html.j2:104
 msgid ""
-"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"
+"Taler has an efficient design. Unlike Blockchain-based payment systems, such "
+"as Bitcoin, Taler will not threaten the availability of national electric "
+"grids or (significantly) contribute to environmental pollution."
 msgstr ""
 
 #: governments.html.j2:120
@@ -1035,8 +962,8 @@ msgstr ""
 
 #: governments.html.j2:123
 msgid ""
-"With Taler, income is visible and can be tied to the contract signed by "
-"both parties."
+"With Taler, income is visible and can be tied to the contract signed by both "
+"parties."
 msgstr ""
 
 #: governments.html.j2:124
@@ -1045,8 +972,8 @@ msgstr ""
 
 #: governments.html.j2:125
 msgid ""
-"In Taler, payer and payee are known by their bank accounts when "
-"withdrawing or depositing coins respectively"
+"In Taler, payer and payee are known by their bank accounts when withdrawing "
+"or depositing coins respectively"
 msgstr ""
 
 #: governments.html.j2:126
@@ -1055,8 +982,8 @@ msgstr ""
 
 #: governments.html.j2:127
 msgid ""
-"Taler cryptographically protects citizen's privacy, and by design "
-"implements data minimization and privacy by default."
+"Taler cryptographically protects citizen's privacy, and by design implements "
+"data minimization and privacy by default."
 msgstr ""
 
 #: governments.html.j2:128
@@ -1075,41 +1002,36 @@ msgstr ""
 
 #: 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:\n"
+"Taler assumes governments can observe traditional wire transfers entering "
+"and leaving the Taler payment system. Starting with the wire transfers, "
+"governments can obtain:"
 msgstr ""
 
 #: 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.\n"
+"The total amount of digital currency withdrawn by a customer. The government "
+"can impose limits on how much digital cash a customer can withdraw within a "
+"given time frame."
 msgstr ""
 
 #: governments.html.j2:157
-msgid ""
-"The income received by any merchant via the Taler\n"
-"system.\n"
+msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
 #: governments.html.j2:164
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:174
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:10
@@ -1118,12 +1040,11 @@ msgstr ""
 
 #: index.html.j2:13
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:29
@@ -1132,53 +1053,47 @@ msgstr ""
 
 #: index.html.j2:32
 msgid ""
-"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"
+"Taler is easy to integrate with existing Web applications. Payments are "
+"cryptographically secured and are confirmed within milliseconds with "
+"extremely low transaction costs."
 msgstr ""
 
 #: index.html.j2:45
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:59
 msgid ""
-"By design Taler does not suffer from many classes\n"
-"of security problems such as phishing or counterfeit.\n"
-"Thanks to its security features, Taler never rejects a legitimate\n"
-"customer due to a fraud-detection false positive.\n"
+"By design Taler does not suffer from many classes of security problems such "
+"as phishing or counterfeit. Thanks to its security features, Taler never "
+"rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
 #: index.html.j2:74
 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"
+"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."
 msgstr ""
 
 #: index.html.j2:86
 msgid ""
-"When you pay with Taler, your identity does not\n"
-"have to be revealed. 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 have to be revealed. Just "
+"like payments in cash, nobody else can track how you spent your electronic "
+"money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
 #: index.html.j2:100
 msgid ""
-"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 principle "
+"enables anybody to run their own payment infrastructure, be it individuals, "
+"organizations or whole countries. Since the reference implementation is a <a "
+"href=\"http://www.gnu.org/\">GNU</a> package, it will always remain free "
+"software."
 msgstr ""
 
 #: index.html.j2:117
@@ -1187,12 +1102,12 @@ msgstr ""
 
 #: index.html.j2:118
 msgid ""
-"<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"
+"<p>To pay with Taler, customers install an electronic wallet 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 pose any risk of phishing or identity "
+"theft.</p>"
 msgstr ""
 
 #: index.html.j2:128
@@ -1201,11 +1116,11 @@ msgstr ""
 
 #: index.html.j2:129
 msgid ""
-"<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"
+"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"currency. We provide supporting software in various programming languages to "
+"make the integration painless. The merchant's backend for Taler transaction "
+"processing can run on the merchant's premises or be hosted by a third party."
+"</p>"
 msgstr ""
 
 #: index.html.j2:145
@@ -1222,10 +1137,8 @@ msgstr ""
 
 #: investors.html.j2:9
 msgid ""
-"We have created a company, Taler Systems SA in\n"
-"Luxembourg.<br>\n"
-"Please contact <tt>invest@taler.net</tt>\n"
-"if you want to invest in Taler.\n"
+"We have created a company, Taler Systems SA in Luxembourg.<br> Please "
+"contact <tt>invest@taler.net</tt> if you want to invest in Taler."
 msgstr ""
 
 #: investors.html.j2:24
@@ -1234,21 +1147,18 @@ msgstr ""
 
 #: investors.html.j2:27
 msgid ""
-"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, "
+"cryptographers, software engineers, civil-rights activists and academics. We "
+"are unified by a vision of how payments should work and the goal of imposing "
+"this vision upon the world."
 msgstr ""
 
 #: investors.html.j2:37
 msgid ""
-"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"
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
+"the French national institute for research in informatics and automation, "
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
 msgstr ""
 
 #: investors.html.j2:45
@@ -1257,17 +1167,13 @@ msgstr ""
 
 #: investors.html.j2:48
 msgid ""
-"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"
+"All transactions in Taler are secured using <a href=\"bibliography.html"
+"\">modern cryptography</a> and trust in all parties is minimized. Financial "
+"damage is bounded (for customers, merchants and the exchange) even in the "
+"case that systems are compromised and private keys are stolen. Databases can "
+"be audited for consistency, resulting in either the detection of compromised "
+"systems or the demonstration that participants were honest. Actual "
+"transaction costs are fractions of a cent."
 msgstr ""
 
 #: investors.html.j2:63
@@ -1276,15 +1182,13 @@ msgstr ""
 
 #: investors.html.j2:66
 msgid ""
-"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"
+"The scalable business model for Taler is the operation of the payment "
+"service provider, which converts money from traditional payment systems "
+"(MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
+"electronic coins in the same currency. The customer can then redeem the "
+"electronic coins at a merchant, who can exchange them for money represented "
+"using traditional payment systems at the exchange. The exchange charges fees "
+"to facilitate the transactions."
 msgstr ""
 
 #: investors.html.j2:85
@@ -1297,10 +1201,10 @@ msgstr ""
 
 #: investors.html.j2:110
 msgid ""
-"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>. The exchange "
+"charges <b>transaction fees</b> to customers or merchants. Its operational "
+"expenses are from wire transfers with the banking system and the operation "
+"of the computing infrastructure."
 msgstr ""
 
 #: investors.html.j2:120
@@ -1311,8 +1215,8 @@ msgstr ""
 
 #: investors.html.j2:122
 msgid ""
-"Multiple Taler transactions can be aggregated into larger wire transfers "
-"to merchants to minimize wire transfer costs."
+"Multiple Taler transactions can be aggregated into larger wire transfers to "
+"merchants to minimize wire transfer costs."
 msgstr ""
 
 #: investors.html.j2:124
@@ -1335,11 +1239,10 @@ msgstr ""
 
 #: 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.\n"
+"Taler is a cost-effective electronic payment system which provides you with "
+"cryptographic proof that the payment worked correctly within milliseconds. "
+"Your Web customers pay with previously unknown levels of convenience without "
+"risk of fraud."
 msgstr ""
 
 #: merchants.html.j2:22
@@ -1348,39 +1251,31 @@ msgstr ""
 
 #: 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 &quot;verified\n"
-"by&quot; 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"
+"Processing transactions with Taler is fast, allowing you to confirm the "
+"transaction with your customer virtually immediately. Your customers will "
+"appreciate that they do not have to type in credit card information and play "
+"the &quot;verified by&quot; game. By making payments significantly more "
+"convenient for your customers, you may be able to use Taler for small "
+"transactions that would not work with credit card payments due to the mental "
+"overhead for customers."
 msgstr ""
 
 #: merchants.html.j2:44
 msgid ""
-"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"
+"You will have cryptographic proof of payment from the Taler payment service "
+"provider. With Taler you never handle sensitive customer account information "
+"and thus do not have to undergo any particular security audits (such as PCI "
+"DSS). Your systems will have customer contracts with qualified signatures "
+"for all transactions which you can use in court in case of disputes."
 msgstr ""
 
 #: 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 competing integrators for\n"
-"support.\n"
+"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 competing "
+"integrators for support."
 msgstr ""
 
 #: merchants.html.j2:76
@@ -1389,11 +1284,10 @@ msgstr ""
 
 #: merchants.html.j2:79
 msgid ""
-"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"
+"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 offer low transaction fees."
 msgstr ""
 
 #: merchants.html.j2:89
@@ -1402,10 +1296,9 @@ msgstr ""
 
 #: merchants.html.j2:92
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:101
@@ -1414,11 +1307,10 @@ msgstr ""
 
 #: merchants.html.j2:104
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:119
@@ -1447,28 +1339,24 @@ msgstr ""
 
 #: merchants.html.j2:147
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:156
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:167
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: press.html.j2:4
@@ -1482,211 +1370,3 @@ msgstr ""
 #: common/base.j2:6
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "Home"
-#~ msgstr ""
-
-#~ msgid "Demo"
-#~ msgstr ""
-
-#~ msgid "Operators"
-#~ msgstr ""
-
-#~ msgid "About&nbsp;us"
-#~ msgstr ""
-
-#~ msgid "Stability "
-#~ msgstr ""
-
-#~ msgid "News"
-#~ msgstr ""
-
-#~ msgid "Taler Web payments paper published."
-#~ msgstr ""
-
-#~ msgid "More news »"
-#~ msgstr ""
-
-#~ msgid "Taler technology: About taxability, change and privacy"
-#~ msgstr ""
-
-#~ msgid "1-2017: Taler Documentation pages updated"
-#~ msgstr ""
-
-#~ msgid "Operate a Taler exchange!"
-#~ msgstr ""
-
-#~ msgid "Electronic payments for a liberal society!"
-#~ msgstr ""
-
-#~ msgid "Anonymous"
-#~ msgstr ""
-
-#~ msgid "Electronic"
-#~ msgstr ""
-
-#~ msgid "Reserves"
-#~ msgstr ""
-
-#~ msgid "Advantages for citizens"
-#~ msgstr ""
-
-#~ msgid "Independent One-Click Payment!"
-#~ msgstr ""
-
-#~ msgid "Advantages for merchants"
-#~ msgstr ""
-
-#~ msgid "Advantages for governments"
-#~ msgstr ""
-
-#~ msgid "Invest in GNU Taler!"
-#~ msgstr ""
-
-#~ msgid "Business model"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by the exchange operator"
-#~ msgstr ""
-
-#~ msgid "Taxable Anonymous Libre Electronic Reserves"
-#~ msgstr ""
-
-#~ msgid "Independent One-Click Payments!"
-#~ msgstr ""
-
-#~ msgid "<b>T</b>axable"
-#~ msgstr ""
-
-#~ msgid "<b>A</b>nonymous"
-#~ msgstr ""
-
-#~ msgid "<b>L</b>ibre"
-#~ msgstr ""
-
-#~ msgid "<b>E</b>lectronic"
-#~ msgstr ""
-
-#~ msgid "<b>R</b>eserves"
-#~ msgstr ""
-
-#~ msgid "Latest Videos"
-#~ msgstr ""
-
-#~ msgid "Florian Dold talks about Taler at 50p!"
-#~ msgstr ""
-
-#~ msgid "Taler News"
-#~ msgstr ""
-
-#~ msgid "Financial News"
-#~ msgstr ""
-
-#~ msgid "en"
-#~ msgstr ""
-
-#~ msgid "About us"
-#~ msgstr ""
-
-#~ msgid "CFO"
-#~ msgstr ""
-
-#~ msgid "Citizens"
-#~ msgstr ""
-
-#~ msgid "Developers"
-#~ msgstr ""
-
-#~ msgid "Governments"
-#~ msgstr ""
-
-#~ msgid "Investors"
-#~ msgstr ""
-
-#~ msgid "Merchants"
-#~ msgstr ""
-
-#~ msgid "The GNU Taler merchant backend operator tutorial"
-#~ msgstr ""
-
-#~ msgid "Wallet"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by customers"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by merchants"
-#~ msgstr ""
-
-#~ msgid "Tax-friendly"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
-#~ msgstr ""
-
-#~ msgid "Taler complies with regulation"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2)"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by governments"
-#~ msgstr ""
-
-#~ msgid "Previous"
-#~ msgstr ""
-
-#~ msgid "Next"
-#~ msgstr ""
-
-#~ msgid "Accept and validate deposits from merchants."
-#~ msgstr ""
-
-#~ msgid "Taler as seen by the payment service operator"
-#~ msgstr ""
-
-#~ msgid "Financial risk is bounded even if keys are compromised."
-#~ 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 ""
-
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index cb6a6c43..277fc5f1 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,18 +1,18 @@
-
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-23 10:32+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: es\n"
+"POT-Creation-Date: 2017-06-05 16:54+0200\n"
+"PO-Revision-Date: 2017-06-03 14:51+0200\n"
+"Last-Translator: \n"
 "Language-Team: es <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Generated-By: Babel 2.3.4\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: about.html.j2:8
 #, fuzzy
@@ -20,14 +20,13 @@ msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
-"Megalómano local. Es decir, ¿quién querría crear un nuevo sistema de "
-"pagos y un nuevo Internet?"
+"Megalómano local. Es decir, ¿quién querría crear un nuevo sistema de pagos y "
+"un nuevo Internet?"
 
 #: about.html.j2:13
-#, fuzzy
 msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
-" industries, …."
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
 msgstr ""
 
 #: about.html.j2:20
@@ -50,12 +49,10 @@ msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Mayormente inofensivo"
 
 #: about.html.j2:42
-#, fuzzy
 msgid "PhD Student, Inria.."
 msgstr ""
 
 #: about.html.j2:47 about.html.j2:62
-#, fuzzy
 msgid "Software engineer."
 msgstr ""
 
@@ -79,12 +76,10 @@ msgid "Translator (Italian)"
 msgstr "Traductoras"
 
 #: about.html.j2:82
-#, fuzzy
 msgid "Hardware security module"
 msgstr ""
 
 #: about.html.j2:86
-#, fuzzy
 msgid "Risk management"
 msgstr ""
 
@@ -92,11 +87,9 @@ msgstr ""
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
-"Linux, FreeBSD, sitios web y el gobierno en las sombras, en su tiempo "
-"libre."
+"Linux, FreeBSD, sitios web y el gobierno en las sombras, en su tiempo libre."
 
 #: about.html.j2:96
-#, fuzzy
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
@@ -127,11 +120,9 @@ msgstr ""
 
 #: citizens.html.j2:9
 msgid ""
-"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 withdraw money from your bank "
+"account into your electronic wallet, and can henceforth spend digital cash. "
+"The electronic wallet can carry multiple currencies."
 msgstr ""
 
 #: citizens.html.j2:25 governments.html.j2:58 index.html.j2:56
@@ -141,12 +132,10 @@ 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"
+"Taler uses modern cryptography, ensuring that there is no counterfeit. Your "
+"digital wallet is safer than your physical wallet. At most, you can lose its "
+"contents because your computer or mobile is irreparably damaged or "
+"compromised. Unlike a physical wallet, you can make backups to secure "
 "against data loss."
 msgstr ""
 
@@ -156,12 +145,10 @@ msgstr ""
 
 #: citizens.html.j2:39
 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."
+"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."
 msgstr ""
 
 #: citizens.html.j2:50
@@ -170,11 +157,10 @@ 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."
+"You will be able to withdraw money to replenish the digital coins in your "
+"wallet using your credit card or wire transfers. Afterwards you can pay with "
+"one-click using the Taler wallet, which optionally keeps your transaction "
+"history on your computer."
 msgstr ""
 
 #: citizens.html.j2:61 index.html.j2:42
@@ -183,13 +169,10 @@ 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."
+"Coins in your digital wallet will be of the same denomination as the cash in "
+"your physical wallet. Taler is not a crypto-currency, so you do not have to "
+"worry about cryto-currency related value fluctuations. Banking with Taler is "
+"subject to the usual government protections for financial services."
 msgstr ""
 
 #: citizens.html.j2:79
@@ -198,10 +181,9 @@ msgstr ""
 
 #: citizens.html.j2:81
 msgid ""
-"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"
+"We currently provide a <a href=\"wallet.html\">wallet browser extension</a> "
+"for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile phones and "
+"other platforms will be available in the future."
 msgstr ""
 
 #: citizens.html.j2:88
@@ -210,8 +192,8 @@ msgstr ""
 
 #: citizens.html.j2:90
 msgid ""
-"You can see how Taler works in practice by visiting our <a "
-"href=\"https://demo.taler.net\">demo page</a>.\n"
+"You can see how Taler works in practice by visiting our <a href=\"https://"
+"demo.taler.net\">demo page</a>."
 msgstr ""
 
 #: citizens.html.j2:103
@@ -219,39 +201,32 @@ msgid "The Taler Wallet for customers"
 msgstr ""
 
 #: citizens.html.j2:105
-msgid ""
-"Customers interact with the Taler system using\n"
-"the Taler wallet:"
+msgid "Customers interact with the Taler system using the Taler wallet:"
 msgstr ""
 
 #: citizens.html.j2:110
 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"
+"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."
 msgstr ""
 
 #: citizens.html.j2:118
 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."
+"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."
 msgstr ""
 
 #: citizens.html.j2:125
 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."
+"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."
 msgstr ""
 
 #: contact.html.j2:6
@@ -264,12 +239,10 @@ msgstr ""
 
 #: contact.html.j2:15
 msgid ""
-"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:taler@gnu.org\">taler@gnu.org</a>.\n"
+"An archived, public mailing list for GNU Taler is hosted at <a href="
+"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
 msgstr ""
 
 #: contact.html.j2:25
@@ -278,9 +251,8 @@ msgstr ""
 
 #: contact.html.j2:27
 msgid ""
-"Team members are generally reachable at\n"
-"<tt>LASTNAME@taler.net</tt>.  All of us\n"
-"support receiving GnuPG encrypted e-mails.\n"
+"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
+"us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
 #: contact.html.j2:36
@@ -289,11 +261,9 @@ msgstr ""
 
 #: contact.html.j2:38
 msgid ""
-"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 <a href=\"https://gnunet.org/"
+"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
+"also report bugs or feature requests to the mailing list."
 msgstr ""
 
 #: contact.html.j2:49
@@ -302,8 +272,38 @@ msgstr ""
 
 #: contact.html.j2:51
 msgid ""
-"For non-technical commercial requests, please contact\n"
-"<tt>ceo AT taler.net</tt>.\n"
+"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
+"tt>."
+msgstr ""
+
+#: copyright.html.j2:6
+msgid "Copyright Assignment"
+msgstr ""
+
+#: copyright.html.j2:8
+msgid ""
+"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+msgstr ""
+
+#: copyright.html.j2:17
+msgid ""
+"<p>The agreements ensure that the code will continue to be made available "
+"under free software licenses, but gives developers the freedom to move code "
+"between GNUnet and GNU Taler without worrying about licenses and the company "
+"the ability to dual-license (for example, so that we can distribute via App-"
+"stores that are hostile to free software).</p>"
+msgstr ""
+
+#: copyright.html.j2:25
+msgid ""
+"<p>Minor contributions (basically, anyone without Git access) do not require "
+"copyright assignment. Pseudonymous contributions are accepted, in this case "
+"simply sign the agreement with your pseudonym. Scanned copies are "
+"sufficient, but snail mail is preferred.</p>"
 msgstr ""
 
 #: developers.html.j2:5
@@ -316,17 +316,14 @@ msgstr "Libre"
 
 #: developers.html.j2:15
 msgid ""
-"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"
+"GNU Taler is free software implementing an open protocol. Anybody is welcome "
+"to integrate our reference implementation into their applications. Different "
+"components of Taler are being made available under different licenses. The "
+"Affero GPLv3+ is used for the exchange, the LGPLv3+ is used for reference "
+"code demonstrating integration with merchant platforms, and licenses like "
+"GPLv3+ are used for wallets and related customer-facing software. We are "
+"open for constructive suggestions for maximizing the adoption of this "
+"payment platform."
 msgstr ""
 
 #: developers.html.j2:32
@@ -335,18 +332,14 @@ msgstr " Basado en REST"
 
 #: developers.html.j2:35
 msgid ""
-"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"
+"Taler is designed to work on the Internet. To ensure that Taler payments can "
+"work with restrictive network setups, Taler uses a RESTful protocol over "
+"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
+"obviously merchants may choose to offer HTTPS for consistency and because it "
+"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
+"structure data, making it easy to integrate Taler with existing Web "
+"applications. Taler's protocol is documented in detail at <a href=\"https://"
+"api.taler.net/\">api.taler.net</a>."
 msgstr ""
 
 #: developers.html.j2:58
@@ -355,15 +348,13 @@ msgstr "Código"
 
 #: developers.html.j2:61
 msgid ""
-"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"
+"Taler is currently primarily developed by a 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 "
+"repositories can be found in our <a href=\"https://git.taler.net/\">GitWeb</"
+"a>."
 msgstr ""
 
 #: developers.html.j2:75
@@ -372,11 +363,10 @@ msgstr "Documentación"
 
 #: developers.html.j2:78
 msgid ""
-"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"
+"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>. Technical papers can be found in our <a href="
+"\"bibliography.html\">bibliography</a>."
 msgstr ""
 
 #: developers.html.j2:88
@@ -385,11 +375,9 @@ msgstr "Debates"
 
 #: developers.html.j2:91
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:101
@@ -398,10 +386,9 @@ msgstr "Pruebas de regresión"
 
 #: developers.html.j2:104
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:113
@@ -410,11 +397,9 @@ msgstr "Análisis de cobertura de código"
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:126
@@ -423,11 +408,9 @@ msgstr "Performance"
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:145
@@ -436,120 +419,86 @@ msgstr "Diagrama general del sistema Taler"
 
 #: developers.html.j2:148
 msgid ""
-"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"
+"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:"
 msgstr ""
 
 #: 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.\n"
+"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."
 msgstr ""
 
 #: 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 &quot;serial\n"
-"numbers&quot; 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"
+"Once the exchange has received the wire transfer, it allows the customer's "
+"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
+"are digital representations of the original currency from the transfer. It "
+"is important to note that the exchange does not learn the &quot;serial "
+"numbers&quot; of the coins created in this process, so it cannot tell later "
+"which customer purchased what at which merchant. The use of Taler does not "
+"change the currency or the total value of the funds (except for fees which "
+"the exchange may charge for the service)."
 msgstr ""
 
 #: 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).\n"
+"Once the customer has the digital coins in his wallet, the wallet can be "
+"used to <b>spend</b> the coins with merchant portals that support the Taler "
+"payment system and accept the respective exchange as a business partner "
+"(bottom arrow). This creates a digital contract signed by the customer's "
+"coins and the merchant. If necessary, the customer can later use this "
+"digitally signed contract in a court of law to prove the exact terms of the "
+"contract and that he paid the respective amount. The customer does not learn "
+"the banking details of the merchant, and Taler does not require the merchant "
+"to learn the identity of the customer. Naturally, the customer can spend any "
+"fraction of his digital coins (the system takes care of customers getting "
+"change)."
 msgstr ""
 
 #: developers.html.j2:210
 msgid ""
-"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"
+"Merchants receiving digital coins <b>deposit</b> the respective claims that "
+"resulted from the contract signing with the customer at the exchange to "
+"redeem the coins. The deposit step does not reveal the details of the "
+"contract between the customer and the merchant or the identity of the "
+"customer to the exchange in any way. However, the exchange does learn the "
+"identity of the merchant via the provided bank routing information. The "
+"merchant can, for example when compelled by the state for taxation, provide "
+"information linking the individual deposit to the respective contract signed "
+"by the customer. Thus, the exchange's database allows the state to enforce "
+"that merchants pay applicable taxes (and do not engage in illegal contracts)."
 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.\n"
+"Finally, the exchange transfers funds corresponding to the digital coins "
+"redeemed by the merchants to the merchant's <b>bank</b> account. The "
+"exchange may combine multiple small transactions into one larger bank "
+"transfer. The merchant can query the exchange about the relationship between "
+"the bank transfers and the individual claims that were deposited."
 msgstr ""
 
 #: 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.\n"
+"Most importantly, the exchange keeps cryptographic proofs that allow it to "
+"demonstrate that it is operating correctly to third parties. The system "
+"requires an external <b>auditor</b>, such as a government-appointed "
+"financial regulatory body, to frequently verify the exchange's databases and "
+"check that its bank balance matches the total value of the remaining coins "
+"in circulation."
 msgstr ""
 
 #: 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.\n"
+"Without the auditor, the exchange operators could embezzle funds they are "
+"holding in reserve. Customers and merchants cannot cheat each other or the "
+"exchange. If any party's computers are compromised, the financial damage is "
+"limited to the respective party and proportional to the funds they have in "
+"circulation during the period of the compromise."
 msgstr ""
 
 #: faq.html.j2:5
@@ -558,17 +507,16 @@ msgstr ""
 
 #: faq.html.j2:6
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:18
@@ -577,9 +525,9 @@ msgstr ""
 
 #: faq.html.j2:19
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:25
@@ -588,16 +536,15 @@ msgstr ""
 
 #: faq.html.j2:26
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low.</p>"
 msgstr ""
 
 #: faq.html.j2:37
@@ -606,9 +553,9 @@ 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:44
@@ -617,15 +564,15 @@ msgstr ""
 
 #: faq.html.j2:45
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>Future versions of the Taler wallet may allow exchanging coins among "
+"friends directly as well.</p>"
 msgstr ""
 
 #: faq.html.j2:56
@@ -634,12 +581,12 @@ msgstr ""
 
 #: faq.html.j2:57
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple\n"
-"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"<p>Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgstr ""
 
 #: faq.html.j2:61
-msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgid "<p>Taler currently does not offer conversion between currencies.</p>"
 msgstr ""
 
 #: faq.html.j2:65
@@ -648,12 +595,10 @@ 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>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>"
 msgstr ""
 
 #: glossary.html.j2:6
@@ -662,8 +607,7 @@ msgstr ""
 
 #: glossary.html.j2:8
 msgid ""
-"trusted third party that verifies that the `exchange` is operating "
-"correctly\n"
+"trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
 #: glossary.html.j2:12
@@ -672,8 +616,8 @@ msgstr ""
 
 #: glossary.html.j2:14
 msgid ""
-"traditional financial service provider who offers wire `transfers` "
-"between accounts\n"
+"traditional financial service provider who offers wire `transfers` between "
+"accounts"
 msgstr ""
 
 #: glossary.html.j2:18
@@ -683,7 +627,7 @@ msgstr ""
 #: glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin\n"
+"known as the `denomination` of the coin"
 msgstr ""
 
 #: glossary.html.j2:24
@@ -691,7 +635,7 @@ msgid "contract"
 msgstr ""
 
 #: glossary.html.j2:26
-msgid "the proposal signed by the wallet.\n"
+msgid "the proposal signed by the wallet."
 msgstr ""
 
 #: glossary.html.j2:30
@@ -700,8 +644,7 @@ msgstr ""
 
 #: glossary.html.j2:32
 msgid ""
-"unit of currency, specifies both the currency and the face value of a "
-"`coin`\n"
+"unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
 #: glossary.html.j2:36
@@ -710,8 +653,8 @@ msgstr ""
 
 #: glossary.html.j2:38
 msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and "
-"of a particular `denomination`\n"
+"RSA key used by the exchange to certify that a given `coin` is valid and of "
+"a particular `denomination`"
 msgstr ""
 
 #: glossary.html.j2:42
@@ -721,8 +664,7 @@ msgstr ""
 #: glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire "
-"`transfer`\n"
+"exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
 #: glossary.html.j2:48
@@ -731,10 +673,9 @@ msgstr ""
 
 #: glossary.html.j2:50
 msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than "
-"the customer, thereby creating the danger of some entity being able to "
-"link multiple transactions of coin's owner if the coin is not refreshed "
-"first\n"
+"a `coin` is dirty if its public key may be known to an entity other than the "
+"customer, thereby creating the danger of some entity being able to link "
+"multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
 #: glossary.html.j2:54
@@ -743,8 +684,8 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider.  Issues eletronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants.\n"
+"Taler's payment service provider. Issues eletronic `coins` during "
+"`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
 #: glossary.html.j2:60
@@ -752,7 +693,7 @@ msgid "extension"
 msgstr ""
 
 #: glossary.html.j2:62
-msgid "implementation of a `wallet` for browsers\n"
+msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
 #: glossary.html.j2:66
@@ -760,7 +701,7 @@ msgid "fresh coin"
 msgstr ""
 
 #: glossary.html.j2:68
-msgid "a `coin` is fresh if its public key is only known to the customer\n"
+msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
 #: glossary.html.j2:72
@@ -769,8 +710,8 @@ msgstr ""
 
 #: glossary.html.j2:74
 msgid ""
-"offline key used by the exchange to certify denomination keys and message"
-" signing keys\n"
+"offline key used by the exchange to certify denomination keys and message "
+"signing keys"
 msgstr ""
 
 #: glossary.html.j2:78
@@ -778,7 +719,7 @@ msgid "message signing key"
 msgstr ""
 
 #: glossary.html.j2:80
-msgid "key used by the exchange to sign online messages, other than coins\n"
+msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
 #: glossary.html.j2:84
@@ -788,15 +729,11 @@ msgstr ""
 #: glossary.html.j2:86
 msgid ""
 "specification of the details of a transaction, specifies the payment "
-"obligations\n"
-"for the customer (i.e. the amount), the deliverables of the merchant and "
-"other\n"
-"related information, such as deadlines or locations; However, it lacks "
-"some\n"
-"information that the backend is supposed to provide.\n"
-"In other words, after the backend adds the missing information to the "
-"offer and\n"
-"signs it, it becomes a proposal.\n"
+"obligations for the customer (i.e. the amount), the deliverables of the "
+"merchant and other related information, such as deadlines or locations; "
+"However, it lacks some information that the backend is supposed to provide. "
+"In other words, after the backend adds the missing information to the offer "
+"and signs it, it becomes a proposal."
 msgstr ""
 
 #: glossary.html.j2:95
@@ -804,7 +741,7 @@ msgid "owner"
 msgstr ""
 
 #: glossary.html.j2:97
-msgid "a `coin` is owned by the entity that knows the private key of the coin\n"
+msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
 #: glossary.html.j2:101
@@ -814,7 +751,7 @@ msgstr ""
 #: glossary.html.j2:103
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
-"correct\n"
+"correct"
 msgstr ""
 
 #: glossary.html.j2:107
@@ -822,7 +759,7 @@ msgid "proposal"
 msgstr ""
 
 #: glossary.html.j2:109
-msgid "a sketch that has been completed and signed by the merchant backend.\n"
+msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
 #: glossary.html.j2:113
@@ -832,8 +769,8 @@ msgstr ""
 #: glossary.html.j2:115
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank"
-" account to cover obligations from coins in circulation\n"
+"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+"account to cover obligations from coins in circulation"
 msgstr ""
 
 #: glossary.html.j2:119
@@ -842,8 +779,8 @@ msgstr ""
 
 #: glossary.html.j2:121
 msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh`"
-" coins\n"
+"operation by which a `dirty` `coin` is converted into one or more `fresh` "
+"coins"
 msgstr ""
 
 #: glossary.html.j2:125
@@ -853,8 +790,8 @@ msgstr ""
 #: glossary.html.j2:127
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back "
-"to the customer\n"
+"obtained from a `deposit` operation, giving the right to the funds back to "
+"the customer"
 msgstr ""
 
 #: glossary.html.j2:131
@@ -864,8 +801,7 @@ msgstr ""
 #: glossary.html.j2:133
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any "
-"time.\n"
+"private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
 #: glossary.html.j2:137
@@ -873,7 +809,7 @@ msgid "signing key"
 msgstr ""
 
 #: glossary.html.j2:139
-msgid "see message signing key.\n"
+msgid "see message signing key."
 msgstr ""
 
 #: glossary.html.j2:143
@@ -882,8 +818,8 @@ msgstr ""
 
 #: glossary.html.j2:145
 msgid ""
-"operation by which a customer gives a merchant the right to `deposit` "
-"coins in return for merchandise\n"
+"operation by which a customer gives a merchant the right to `deposit` coins "
+"in return for merchandise"
 msgstr ""
 
 #: glossary.html.j2:149
@@ -891,7 +827,7 @@ msgid "transfer"
 msgstr ""
 
 #: glossary.html.j2:151
-msgid "method of sending funds between `bank` accounts\n"
+msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
 #: glossary.html.j2:155
@@ -901,7 +837,7 @@ msgstr ""
 #: glossary.html.j2:157
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
-"another\n"
+"another"
 msgstr ""
 
 #: glossary.html.j2:161
@@ -909,7 +845,7 @@ msgid "transaction id"
 msgstr ""
 
 #: glossary.html.j2:163
-msgid "unique number by which a merchant identifies a `transaction`\n"
+msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
 #: glossary.html.j2:167
@@ -918,8 +854,7 @@ msgstr ""
 
 #: glossary.html.j2:169
 msgid ""
-"software running on a customer's computer; withdraws, stores and spends "
-"coins\n"
+"software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
 #: glossary.html.j2:173
@@ -927,7 +862,7 @@ msgid "wire transfer"
 msgstr ""
 
 #: glossary.html.j2:175
-msgid "see `transfer`\n"
+msgid "see `transfer`"
 msgstr ""
 
 #: glossary.html.j2:179
@@ -936,8 +871,8 @@ msgstr ""
 
 #: glossary.html.j2:181
 msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely "
-"identify the `transfer`\n"
+"subject of a wire `transfer`; usually a random string to uniquely identify "
+"the `transfer`"
 msgstr ""
 
 #: glossary.html.j2:185
@@ -946,8 +881,7 @@ msgstr ""
 
 #: glossary.html.j2:187
 msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh "
-"coins\n"
+"operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
 #: governments.html.j2:6
@@ -956,13 +890,11 @@ msgstr ""
 
 #: governments.html.j2:8
 msgid ""
-"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"
+"Taler provides accountability to ensure business operate legally, while also "
+"respecting civil liberties of citizens. Taler is a payment system based on "
+"open standards and free software. Taler needs governments as they set a "
+"financial framework and act as trusted regulators. Taler contributes to "
+"digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
 #: governments.html.j2:25 index.html.j2:71
@@ -971,51 +903,43 @@ msgstr "Imponible"
 
 #: governments.html.j2:28
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:41
 msgid ""
-"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"
+"Thus, despite offering anonymity for citizens spending digital cash to buy "
+"goods and services, Taler also ensures that the state can observe incoming "
+"funds. This can be used to ensure businesses engage only in legal "
+"activities, and do not evade income tax, sales tax or value-added tax. "
+"However, this observational capability does not extend to the immediate "
+"personal domain. In particular, monitoring does not cover shared access to "
+"funds with trusted friends and family, or synchronizing wallets across "
+"multiple devices."
 msgstr ""
 
 #: governments.html.j2:61
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:73
 msgid ""
-"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"
+"As a payment service provider, the Taler exchange is subject to financial "
+"regulation. Financial regulation and regular audits are critical to "
+"establish trust. In particular, the Taler design mandates the existence of "
+"an independent auditor who checks cryptographic proofs that accumulate at "
+"the exchange to ensure that the escrow account is managed honestly. This "
+"ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
 #: governments.html.j2:88 index.html.j2:97
@@ -1024,10 +948,9 @@ msgstr "Libre"
 
 #: governments.html.j2:91
 msgid ""
-"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"
+"Taler is free software implementing an open protocol standard. Thus, Taler "
+"will enable competition and avoid the monopolization of payment systems that "
+"threatens global political and financial stability today."
 msgstr ""
 
 #: governments.html.j2:101
@@ -1036,11 +959,9 @@ msgstr "Eficiente"
 
 #: governments.html.j2:104
 msgid ""
-"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"
+"Taler has an efficient design. Unlike Blockchain-based payment systems, such "
+"as Bitcoin, Taler will not threaten the availability of national electric "
+"grids or (significantly) contribute to environmental pollution."
 msgstr ""
 
 #: governments.html.j2:120
@@ -1053,8 +974,8 @@ msgstr ""
 
 #: governments.html.j2:123
 msgid ""
-"With Taler, income is visible and can be tied to the contract signed by "
-"both parties."
+"With Taler, income is visible and can be tied to the contract signed by both "
+"parties."
 msgstr ""
 
 #: governments.html.j2:124
@@ -1063,8 +984,8 @@ msgstr ""
 
 #: governments.html.j2:125
 msgid ""
-"In Taler, payer and payee are known by their bank accounts when "
-"withdrawing or depositing coins respectively"
+"In Taler, payer and payee are known by their bank accounts when withdrawing "
+"or depositing coins respectively"
 msgstr ""
 
 #: governments.html.j2:126
@@ -1073,8 +994,8 @@ msgstr ""
 
 #: governments.html.j2:127
 msgid ""
-"Taler cryptographically protects citizen's privacy, and by design "
-"implements data minimization and privacy by default."
+"Taler cryptographically protects citizen's privacy, and by design implements "
+"data minimization and privacy by default."
 msgstr ""
 
 #: governments.html.j2:128
@@ -1093,41 +1014,36 @@ msgstr ""
 
 #: 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:\n"
+"Taler assumes governments can observe traditional wire transfers entering "
+"and leaving the Taler payment system. Starting with the wire transfers, "
+"governments can obtain:"
 msgstr ""
 
 #: 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.\n"
+"The total amount of digital currency withdrawn by a customer. The government "
+"can impose limits on how much digital cash a customer can withdraw within a "
+"given time frame."
 msgstr ""
 
 #: governments.html.j2:157
-msgid ""
-"The income received by any merchant via the Taler\n"
-"system.\n"
+msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
 #: governments.html.j2:164
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:174
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:10
@@ -1136,12 +1052,11 @@ msgstr ""
 
 #: index.html.j2:13
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:29
@@ -1150,53 +1065,47 @@ msgstr ""
 
 #: index.html.j2:32
 msgid ""
-"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"
+"Taler is easy to integrate with existing Web applications. Payments are "
+"cryptographically secured and are confirmed within milliseconds with "
+"extremely low transaction costs."
 msgstr ""
 
 #: index.html.j2:45
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:59
 msgid ""
-"By design Taler does not suffer from many classes\n"
-"of security problems such as phishing or counterfeit.\n"
-"Thanks to its security features, Taler never rejects a legitimate\n"
-"customer due to a fraud-detection false positive.\n"
+"By design Taler does not suffer from many classes of security problems such "
+"as phishing or counterfeit. Thanks to its security features, Taler never "
+"rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
 #: index.html.j2:74
 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"
+"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."
 msgstr ""
 
 #: index.html.j2:86
 msgid ""
-"When you pay with Taler, your identity does not\n"
-"have to be revealed. 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 have to be revealed. Just "
+"like payments in cash, nobody else can track how you spent your electronic "
+"money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
 #: index.html.j2:100
 msgid ""
-"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 principle "
+"enables anybody to run their own payment infrastructure, be it individuals, "
+"organizations or whole countries. Since the reference implementation is a <a "
+"href=\"http://www.gnu.org/\">GNU</a> package, it will always remain free "
+"software."
 msgstr ""
 
 #: index.html.j2:117
@@ -1205,12 +1114,12 @@ msgstr ""
 
 #: index.html.j2:118
 msgid ""
-"<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"
+"<p>To pay with Taler, customers install an electronic wallet 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 pose any risk of phishing or identity "
+"theft.</p>"
 msgstr ""
 
 #: index.html.j2:128
@@ -1219,11 +1128,11 @@ msgstr ""
 
 #: index.html.j2:129
 msgid ""
-"<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"
+"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"currency. We provide supporting software in various programming languages to "
+"make the integration painless. The merchant's backend for Taler transaction "
+"processing can run on the merchant's premises or be hosted by a third party."
+"</p>"
 msgstr ""
 
 #: index.html.j2:145
@@ -1240,10 +1149,8 @@ msgstr ""
 
 #: investors.html.j2:9
 msgid ""
-"We have created a company, Taler Systems SA in\n"
-"Luxembourg.<br>\n"
-"Please contact <tt>invest@taler.net</tt>\n"
-"if you want to invest in Taler.\n"
+"We have created a company, Taler Systems SA in Luxembourg.<br> Please "
+"contact <tt>invest@taler.net</tt> if you want to invest in Taler."
 msgstr ""
 
 #: investors.html.j2:24
@@ -1252,21 +1159,18 @@ msgstr ""
 
 #: investors.html.j2:27
 msgid ""
-"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, "
+"cryptographers, software engineers, civil-rights activists and academics. We "
+"are unified by a vision of how payments should work and the goal of imposing "
+"this vision upon the world."
 msgstr ""
 
 #: investors.html.j2:37
 msgid ""
-"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"
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
+"the French national institute for research in informatics and automation, "
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
 msgstr ""
 
 #: investors.html.j2:45
@@ -1275,17 +1179,13 @@ msgstr ""
 
 #: investors.html.j2:48
 msgid ""
-"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"
+"All transactions in Taler are secured using <a href=\"bibliography.html"
+"\">modern cryptography</a> and trust in all parties is minimized. Financial "
+"damage is bounded (for customers, merchants and the exchange) even in the "
+"case that systems are compromised and private keys are stolen. Databases can "
+"be audited for consistency, resulting in either the detection of compromised "
+"systems or the demonstration that participants were honest. Actual "
+"transaction costs are fractions of a cent."
 msgstr ""
 
 #: investors.html.j2:63
@@ -1294,15 +1194,13 @@ msgstr ""
 
 #: investors.html.j2:66
 msgid ""
-"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"
+"The scalable business model for Taler is the operation of the payment "
+"service provider, which converts money from traditional payment systems "
+"(MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
+"electronic coins in the same currency. The customer can then redeem the "
+"electronic coins at a merchant, who can exchange them for money represented "
+"using traditional payment systems at the exchange. The exchange charges fees "
+"to facilitate the transactions."
 msgstr ""
 
 #: investors.html.j2:85
@@ -1315,10 +1213,10 @@ msgstr ""
 
 #: investors.html.j2:110
 msgid ""
-"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>. The exchange "
+"charges <b>transaction fees</b> to customers or merchants. Its operational "
+"expenses are from wire transfers with the banking system and the operation "
+"of the computing infrastructure."
 msgstr ""
 
 #: investors.html.j2:120
@@ -1329,8 +1227,8 @@ msgstr ""
 
 #: investors.html.j2:122
 msgid ""
-"Multiple Taler transactions can be aggregated into larger wire transfers "
-"to merchants to minimize wire transfer costs."
+"Multiple Taler transactions can be aggregated into larger wire transfers to "
+"merchants to minimize wire transfer costs."
 msgstr ""
 
 #: investors.html.j2:124
@@ -1353,11 +1251,10 @@ msgstr ""
 
 #: 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.\n"
+"Taler is a cost-effective electronic payment system which provides you with "
+"cryptographic proof that the payment worked correctly within milliseconds. "
+"Your Web customers pay with previously unknown levels of convenience without "
+"risk of fraud."
 msgstr ""
 
 #: merchants.html.j2:22
@@ -1366,39 +1263,31 @@ msgstr "Rápido"
 
 #: 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 &quot;verified\n"
-"by&quot; 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"
+"Processing transactions with Taler is fast, allowing you to confirm the "
+"transaction with your customer virtually immediately. Your customers will "
+"appreciate that they do not have to type in credit card information and play "
+"the &quot;verified by&quot; game. By making payments significantly more "
+"convenient for your customers, you may be able to use Taler for small "
+"transactions that would not work with credit card payments due to the mental "
+"overhead for customers."
 msgstr ""
 
 #: merchants.html.j2:44
 msgid ""
-"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"
+"You will have cryptographic proof of payment from the Taler payment service "
+"provider. With Taler you never handle sensitive customer account information "
+"and thus do not have to undergo any particular security audits (such as PCI "
+"DSS). Your systems will have customer contracts with qualified signatures "
+"for all transactions which you can use in court in case of disputes."
 msgstr ""
 
 #: 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 competing integrators for\n"
-"support.\n"
+"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 competing "
+"integrators for support."
 msgstr ""
 
 #: merchants.html.j2:76
@@ -1407,11 +1296,10 @@ msgstr ""
 
 #: merchants.html.j2:79
 msgid ""
-"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"
+"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 offer low transaction fees."
 msgstr ""
 
 #: merchants.html.j2:89
@@ -1420,10 +1308,9 @@ msgstr "Flexible"
 
 #: merchants.html.j2:92
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:101
@@ -1432,11 +1319,10 @@ msgstr "Ético"
 
 #: merchants.html.j2:104
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:119
@@ -1466,28 +1352,24 @@ msgstr ""
 
 #: merchants.html.j2:147
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:156
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:167
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: press.html.j2:4
@@ -1501,211 +1383,3 @@ msgstr ""
 #: common/base.j2:6
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "Home"
-#~ msgstr "Inicio"
-
-#~ msgid "Demo"
-#~ msgstr "Demo"
-
-#~ msgid "Operators"
-#~ msgstr "Inversores"
-
-#~ msgid "About&nbsp;us"
-#~ msgstr "Quiénes somos"
-
-#~ msgid "Stability "
-#~ msgstr "Estabilidad"
-
-#~ msgid "News"
-#~ msgstr ""
-
-#~ msgid "Taler Web payments paper published."
-#~ msgstr "Taler 0.0.0."
-
-#~ msgid "More news »"
-#~ msgstr "Ver más »"
-
-#~ msgid "Taler technology: About taxability, change and privacy"
-#~ msgstr "La tecnología Taler: soporte impositivo, dar cambio y privacidad"
-
-#~ msgid "1-2017: Taler Documentation pages updated"
-#~ msgstr ""
-
-#~ msgid "Operate a Taler exchange!"
-#~ msgstr "¡Opere una Casa de Cambio Taler!"
-
-#~ msgid "Electronic payments for a liberal society!"
-#~ msgstr "¡Pagos electrónicos para una sociedad libre!"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anónimo"
-
-#~ msgid "Electronic"
-#~ msgstr "Electrónico"
-
-#~ msgid "Reserves"
-#~ msgstr "Reservas"
-
-#~ msgid "Advantages for citizens"
-#~ msgstr "Ventajas para los ciudadanos"
-
-#~ msgid "Independent One-Click Payment!"
-#~ msgstr ""
-
-#~ msgid "Advantages for merchants"
-#~ msgstr "Ventajas para comerciantes"
-
-#~ msgid "Advantages for governments"
-#~ msgstr "Ventajas para los gobiernos"
-
-#~ msgid "Invest in GNU Taler!"
-#~ msgstr ""
-
-#~ msgid "Business model"
-#~ msgstr "Modelo de negocios"
-
-#~ msgid "Taler as seen by the exchange operator"
-#~ msgstr "Taler desde el punto de vista del operador de casa de cambio"
-
-#~ msgid "Taxable Anonymous Libre Electronic Reserves"
-#~ msgstr ""
-
-#~ msgid "Independent One-Click Payments!"
-#~ msgstr ""
-
-#~ msgid "<b>T</b>axable"
-#~ msgstr ""
-
-#~ msgid "<b>A</b>nonymous"
-#~ msgstr ""
-
-#~ msgid "<b>L</b>ibre"
-#~ msgstr ""
-
-#~ msgid "<b>E</b>lectronic"
-#~ msgstr ""
-
-#~ msgid "<b>R</b>eserves"
-#~ msgstr ""
-
-#~ msgid "Latest Videos"
-#~ msgstr ""
-
-#~ msgid "Florian Dold talks about Taler at 50p!"
-#~ msgstr ""
-
-#~ msgid "Taler News"
-#~ msgstr ""
-
-#~ msgid "Financial News"
-#~ msgstr ""
-
-#~ msgid "en"
-#~ msgstr "es"
-
-#~ msgid "About us"
-#~ msgstr "Quiénes somos"
-
-#~ msgid "CFO"
-#~ msgstr "CFO"
-
-#~ msgid "Citizens"
-#~ msgstr "Ciudadanos"
-
-#~ msgid "Developers"
-#~ msgstr "Programadores"
-
-#~ msgid "Governments"
-#~ msgstr "Gobiernos"
-
-#~ msgid "Investors"
-#~ msgstr ""
-
-#~ msgid "Merchants"
-#~ msgstr "Comerciantes"
-
-#~ msgid "The GNU Taler merchant backend operator tutorial"
-#~ msgstr ""
-
-#~ msgid "Wallet"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by customers"
-#~ msgstr "Taler visto por sus clientes"
-
-#~ msgid "Taler as seen by merchants"
-#~ msgstr "Taler desde el punto de vista del comerciante"
-
-#~ msgid "Tax-friendly"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
-#~ msgstr ""
-
-#~ msgid "Taler complies with regulation"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2)"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by governments"
-#~ msgstr "Taler desde el punto de vista del gobierno"
-
-#~ msgid "Previous"
-#~ msgstr ""
-
-#~ msgid "Next"
-#~ msgstr ""
-
-#~ msgid "Accept and validate deposits from merchants."
-#~ msgstr "Aceptar y validar depósitos de los comerciantes."
-
-#~ msgid "Taler as seen by the payment service operator"
-#~ msgstr ""
-
-#~ msgid "Financial risk is bounded even if keys are compromised."
-#~ 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"
-
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 4acbfc0c..e4c26bf4 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,17 +1,16 @@
-
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-23 10:32+0200\n"
+"POT-Creation-Date: 2017-06-05 16:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: fr\n"
 "Language-Team: fr <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
@@ -24,10 +23,9 @@ msgstr ""
 "paiement et un nouvel Internet ?"
 
 #: about.html.j2:13
-#, fuzzy
 msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
-" industries, …."
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
 msgstr ""
 
 #: about.html.j2:20
@@ -51,7 +49,6 @@ msgid "PhD Student, TU Munich. Currently teaching."
 msgstr "Principalement inoffensif"
 
 #: about.html.j2:42
-#, fuzzy
 msgid "PhD Student, Inria.."
 msgstr ""
 
@@ -79,12 +76,10 @@ msgid "Translator (Italian)"
 msgstr "Traductrice"
 
 #: about.html.j2:82
-#, fuzzy
 msgid "Hardware security module"
 msgstr ""
 
 #: about.html.j2:86
-#, fuzzy
 msgid "Risk management"
 msgstr ""
 
@@ -94,7 +89,6 @@ msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
 
 #: about.html.j2:96
-#, fuzzy
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
@@ -125,11 +119,9 @@ msgstr ""
 
 #: citizens.html.j2:9
 msgid ""
-"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 withdraw money from your bank "
+"account into your electronic wallet, and can henceforth spend digital cash. "
+"The electronic wallet can carry multiple currencies."
 msgstr ""
 
 #: citizens.html.j2:25 governments.html.j2:58 index.html.j2:56
@@ -139,12 +131,10 @@ 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"
+"Taler uses modern cryptography, ensuring that there is no counterfeit. Your "
+"digital wallet is safer than your physical wallet. At most, you can lose its "
+"contents because your computer or mobile is irreparably damaged or "
+"compromised. Unlike a physical wallet, you can make backups to secure "
 "against data loss."
 msgstr ""
 
@@ -154,12 +144,10 @@ msgstr ""
 
 #: citizens.html.j2:39
 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."
+"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."
 msgstr ""
 
 #: citizens.html.j2:50
@@ -168,11 +156,10 @@ 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."
+"You will be able to withdraw money to replenish the digital coins in your "
+"wallet using your credit card or wire transfers. Afterwards you can pay with "
+"one-click using the Taler wallet, which optionally keeps your transaction "
+"history on your computer."
 msgstr ""
 
 #: citizens.html.j2:61 index.html.j2:42
@@ -181,13 +168,10 @@ 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."
+"Coins in your digital wallet will be of the same denomination as the cash in "
+"your physical wallet. Taler is not a crypto-currency, so you do not have to "
+"worry about cryto-currency related value fluctuations. Banking with Taler is "
+"subject to the usual government protections for financial services."
 msgstr ""
 
 #: citizens.html.j2:79
@@ -196,10 +180,9 @@ msgstr ""
 
 #: citizens.html.j2:81
 msgid ""
-"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"
+"We currently provide a <a href=\"wallet.html\">wallet browser extension</a> "
+"for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile phones and "
+"other platforms will be available in the future."
 msgstr ""
 
 #: citizens.html.j2:88
@@ -208,8 +191,8 @@ msgstr ""
 
 #: citizens.html.j2:90
 msgid ""
-"You can see how Taler works in practice by visiting our <a "
-"href=\"https://demo.taler.net\">demo page</a>.\n"
+"You can see how Taler works in practice by visiting our <a href=\"https://"
+"demo.taler.net\">demo page</a>."
 msgstr ""
 
 #: citizens.html.j2:103
@@ -217,39 +200,32 @@ msgid "The Taler Wallet for customers"
 msgstr ""
 
 #: citizens.html.j2:105
-msgid ""
-"Customers interact with the Taler system using\n"
-"the Taler wallet:"
+msgid "Customers interact with the Taler system using the Taler wallet:"
 msgstr ""
 
 #: citizens.html.j2:110
 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"
+"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."
 msgstr ""
 
 #: citizens.html.j2:118
 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."
+"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."
 msgstr ""
 
 #: citizens.html.j2:125
 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."
+"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."
 msgstr ""
 
 #: contact.html.j2:6
@@ -262,12 +238,10 @@ msgstr ""
 
 #: contact.html.j2:15
 msgid ""
-"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:taler@gnu.org\">taler@gnu.org</a>.\n"
+"An archived, public mailing list for GNU Taler is hosted at <a href="
+"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
 msgstr ""
 
 #: contact.html.j2:25
@@ -276,9 +250,8 @@ msgstr ""
 
 #: contact.html.j2:27
 msgid ""
-"Team members are generally reachable at\n"
-"<tt>LASTNAME@taler.net</tt>.  All of us\n"
-"support receiving GnuPG encrypted e-mails.\n"
+"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
+"us support receiving GnuPG encrypted e-mails."
 msgstr ""
 
 #: contact.html.j2:36
@@ -287,11 +260,9 @@ msgstr ""
 
 #: contact.html.j2:38
 msgid ""
-"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 <a href=\"https://gnunet.org/"
+"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
+"also report bugs or feature requests to the mailing list."
 msgstr ""
 
 #: contact.html.j2:49
@@ -300,8 +271,38 @@ msgstr ""
 
 #: contact.html.j2:51
 msgid ""
-"For non-technical commercial requests, please contact\n"
-"<tt>ceo AT taler.net</tt>.\n"
+"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
+"tt>."
+msgstr ""
+
+#: copyright.html.j2:6
+msgid "Copyright Assignment"
+msgstr ""
+
+#: copyright.html.j2:8
+msgid ""
+"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+msgstr ""
+
+#: copyright.html.j2:17
+msgid ""
+"<p>The agreements ensure that the code will continue to be made available "
+"under free software licenses, but gives developers the freedom to move code "
+"between GNUnet and GNU Taler without worrying about licenses and the company "
+"the ability to dual-license (for example, so that we can distribute via App-"
+"stores that are hostile to free software).</p>"
+msgstr ""
+
+#: copyright.html.j2:25
+msgid ""
+"<p>Minor contributions (basically, anyone without Git access) do not require "
+"copyright assignment. Pseudonymous contributions are accepted, in this case "
+"simply sign the agreement with your pseudonym. Scanned copies are "
+"sufficient, but snail mail is preferred.</p>"
 msgstr ""
 
 #: developers.html.j2:5
@@ -314,17 +315,14 @@ msgstr "Libre"
 
 #: developers.html.j2:15
 msgid ""
-"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"
+"GNU Taler is free software implementing an open protocol. Anybody is welcome "
+"to integrate our reference implementation into their applications. Different "
+"components of Taler are being made available under different licenses. The "
+"Affero GPLv3+ is used for the exchange, the LGPLv3+ is used for reference "
+"code demonstrating integration with merchant platforms, and licenses like "
+"GPLv3+ are used for wallets and related customer-facing software. We are "
+"open for constructive suggestions for maximizing the adoption of this "
+"payment platform."
 msgstr ""
 
 #: developers.html.j2:32
@@ -333,18 +331,14 @@ msgstr "Avec REST"
 
 #: developers.html.j2:35
 msgid ""
-"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"
+"Taler is designed to work on the Internet. To ensure that Taler payments can "
+"work with restrictive network setups, Taler uses a RESTful protocol over "
+"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
+"obviously merchants may choose to offer HTTPS for consistency and because it "
+"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
+"structure data, making it easy to integrate Taler with existing Web "
+"applications. Taler's protocol is documented in detail at <a href=\"https://"
+"api.taler.net/\">api.taler.net</a>."
 msgstr ""
 
 #: developers.html.j2:58
@@ -353,15 +347,13 @@ msgstr "Code"
 
 #: developers.html.j2:61
 msgid ""
-"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"
+"Taler is currently primarily developed by a 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 "
+"repositories can be found in our <a href=\"https://git.taler.net/\">GitWeb</"
+"a>."
 msgstr ""
 
 #: developers.html.j2:75
@@ -370,11 +362,10 @@ msgstr "Documentation"
 
 #: developers.html.j2:78
 msgid ""
-"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"
+"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>. Technical papers can be found in our <a href="
+"\"bibliography.html\">bibliography</a>."
 msgstr ""
 
 #: developers.html.j2:88
@@ -383,11 +374,9 @@ msgstr "Discussion"
 
 #: developers.html.j2:91
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:101
@@ -396,10 +385,9 @@ msgstr "Tests de régression"
 
 #: developers.html.j2:104
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:113
@@ -408,11 +396,9 @@ msgstr "Mesure de couverture du code"
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:126
@@ -421,11 +407,9 @@ msgstr "Analyse de performances"
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:145
@@ -434,120 +418,86 @@ msgstr "Vue d'ensemble de Taler"
 
 #: developers.html.j2:148
 msgid ""
-"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"
+"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:"
 msgstr ""
 
 #: 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.\n"
+"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."
 msgstr ""
 
 #: 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 &quot;serial\n"
-"numbers&quot; 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"
+"Once the exchange has received the wire transfer, it allows the customer's "
+"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
+"are digital representations of the original currency from the transfer. It "
+"is important to note that the exchange does not learn the &quot;serial "
+"numbers&quot; of the coins created in this process, so it cannot tell later "
+"which customer purchased what at which merchant. The use of Taler does not "
+"change the currency or the total value of the funds (except for fees which "
+"the exchange may charge for the service)."
 msgstr ""
 
 #: 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).\n"
+"Once the customer has the digital coins in his wallet, the wallet can be "
+"used to <b>spend</b> the coins with merchant portals that support the Taler "
+"payment system and accept the respective exchange as a business partner "
+"(bottom arrow). This creates a digital contract signed by the customer's "
+"coins and the merchant. If necessary, the customer can later use this "
+"digitally signed contract in a court of law to prove the exact terms of the "
+"contract and that he paid the respective amount. The customer does not learn "
+"the banking details of the merchant, and Taler does not require the merchant "
+"to learn the identity of the customer. Naturally, the customer can spend any "
+"fraction of his digital coins (the system takes care of customers getting "
+"change)."
 msgstr ""
 
 #: developers.html.j2:210
 msgid ""
-"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"
+"Merchants receiving digital coins <b>deposit</b> the respective claims that "
+"resulted from the contract signing with the customer at the exchange to "
+"redeem the coins. The deposit step does not reveal the details of the "
+"contract between the customer and the merchant or the identity of the "
+"customer to the exchange in any way. However, the exchange does learn the "
+"identity of the merchant via the provided bank routing information. The "
+"merchant can, for example when compelled by the state for taxation, provide "
+"information linking the individual deposit to the respective contract signed "
+"by the customer. Thus, the exchange's database allows the state to enforce "
+"that merchants pay applicable taxes (and do not engage in illegal contracts)."
 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.\n"
+"Finally, the exchange transfers funds corresponding to the digital coins "
+"redeemed by the merchants to the merchant's <b>bank</b> account. The "
+"exchange may combine multiple small transactions into one larger bank "
+"transfer. The merchant can query the exchange about the relationship between "
+"the bank transfers and the individual claims that were deposited."
 msgstr ""
 
 #: 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.\n"
+"Most importantly, the exchange keeps cryptographic proofs that allow it to "
+"demonstrate that it is operating correctly to third parties. The system "
+"requires an external <b>auditor</b>, such as a government-appointed "
+"financial regulatory body, to frequently verify the exchange's databases and "
+"check that its bank balance matches the total value of the remaining coins "
+"in circulation."
 msgstr ""
 
 #: 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.\n"
+"Without the auditor, the exchange operators could embezzle funds they are "
+"holding in reserve. Customers and merchants cannot cheat each other or the "
+"exchange. If any party's computers are compromised, the financial damage is "
+"limited to the respective party and proportional to the funds they have in "
+"circulation during the period of the compromise."
 msgstr ""
 
 #: faq.html.j2:5
@@ -556,17 +506,16 @@ msgstr ""
 
 #: faq.html.j2:6
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:18
@@ -575,9 +524,9 @@ msgstr ""
 
 #: faq.html.j2:19
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:25
@@ -586,16 +535,15 @@ msgstr ""
 
 #: faq.html.j2:26
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low.</p>"
 msgstr ""
 
 #: faq.html.j2:37
@@ -604,9 +552,9 @@ 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:44
@@ -615,15 +563,15 @@ msgstr ""
 
 #: faq.html.j2:45
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>Future versions of the Taler wallet may allow exchanging coins among "
+"friends directly as well.</p>"
 msgstr ""
 
 #: faq.html.j2:56
@@ -632,12 +580,12 @@ msgstr ""
 
 #: faq.html.j2:57
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple\n"
-"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"<p>Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgstr ""
 
 #: faq.html.j2:61
-msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgid "<p>Taler currently does not offer conversion between currencies.</p>"
 msgstr ""
 
 #: faq.html.j2:65
@@ -646,12 +594,10 @@ 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>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>"
 msgstr ""
 
 #: glossary.html.j2:6
@@ -660,8 +606,7 @@ msgstr ""
 
 #: glossary.html.j2:8
 msgid ""
-"trusted third party that verifies that the `exchange` is operating "
-"correctly\n"
+"trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
 #: glossary.html.j2:12
@@ -670,8 +615,8 @@ msgstr ""
 
 #: glossary.html.j2:14
 msgid ""
-"traditional financial service provider who offers wire `transfers` "
-"between accounts\n"
+"traditional financial service provider who offers wire `transfers` between "
+"accounts"
 msgstr ""
 
 #: glossary.html.j2:18
@@ -681,7 +626,7 @@ msgstr ""
 #: glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin\n"
+"known as the `denomination` of the coin"
 msgstr ""
 
 #: glossary.html.j2:24
@@ -689,7 +634,7 @@ msgid "contract"
 msgstr ""
 
 #: glossary.html.j2:26
-msgid "the proposal signed by the wallet.\n"
+msgid "the proposal signed by the wallet."
 msgstr ""
 
 #: glossary.html.j2:30
@@ -698,8 +643,7 @@ msgstr ""
 
 #: glossary.html.j2:32
 msgid ""
-"unit of currency, specifies both the currency and the face value of a "
-"`coin`\n"
+"unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
 #: glossary.html.j2:36
@@ -708,8 +652,8 @@ msgstr ""
 
 #: glossary.html.j2:38
 msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and "
-"of a particular `denomination`\n"
+"RSA key used by the exchange to certify that a given `coin` is valid and of "
+"a particular `denomination`"
 msgstr ""
 
 #: glossary.html.j2:42
@@ -719,8 +663,7 @@ msgstr ""
 #: glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire "
-"`transfer`\n"
+"exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
 #: glossary.html.j2:48
@@ -729,10 +672,9 @@ msgstr ""
 
 #: glossary.html.j2:50
 msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than "
-"the customer, thereby creating the danger of some entity being able to "
-"link multiple transactions of coin's owner if the coin is not refreshed "
-"first\n"
+"a `coin` is dirty if its public key may be known to an entity other than the "
+"customer, thereby creating the danger of some entity being able to link "
+"multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
 #: glossary.html.j2:54
@@ -741,8 +683,8 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider.  Issues eletronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants.\n"
+"Taler's payment service provider. Issues eletronic `coins` during "
+"`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
 #: glossary.html.j2:60
@@ -750,7 +692,7 @@ msgid "extension"
 msgstr ""
 
 #: glossary.html.j2:62
-msgid "implementation of a `wallet` for browsers\n"
+msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
 #: glossary.html.j2:66
@@ -758,7 +700,7 @@ msgid "fresh coin"
 msgstr ""
 
 #: glossary.html.j2:68
-msgid "a `coin` is fresh if its public key is only known to the customer\n"
+msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
 #: glossary.html.j2:72
@@ -767,8 +709,8 @@ msgstr ""
 
 #: glossary.html.j2:74
 msgid ""
-"offline key used by the exchange to certify denomination keys and message"
-" signing keys\n"
+"offline key used by the exchange to certify denomination keys and message "
+"signing keys"
 msgstr ""
 
 #: glossary.html.j2:78
@@ -776,7 +718,7 @@ msgid "message signing key"
 msgstr ""
 
 #: glossary.html.j2:80
-msgid "key used by the exchange to sign online messages, other than coins\n"
+msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
 #: glossary.html.j2:84
@@ -786,15 +728,11 @@ msgstr ""
 #: glossary.html.j2:86
 msgid ""
 "specification of the details of a transaction, specifies the payment "
-"obligations\n"
-"for the customer (i.e. the amount), the deliverables of the merchant and "
-"other\n"
-"related information, such as deadlines or locations; However, it lacks "
-"some\n"
-"information that the backend is supposed to provide.\n"
-"In other words, after the backend adds the missing information to the "
-"offer and\n"
-"signs it, it becomes a proposal.\n"
+"obligations for the customer (i.e. the amount), the deliverables of the "
+"merchant and other related information, such as deadlines or locations; "
+"However, it lacks some information that the backend is supposed to provide. "
+"In other words, after the backend adds the missing information to the offer "
+"and signs it, it becomes a proposal."
 msgstr ""
 
 #: glossary.html.j2:95
@@ -802,7 +740,7 @@ msgid "owner"
 msgstr ""
 
 #: glossary.html.j2:97
-msgid "a `coin` is owned by the entity that knows the private key of the coin\n"
+msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
 #: glossary.html.j2:101
@@ -812,7 +750,7 @@ msgstr ""
 #: glossary.html.j2:103
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
-"correct\n"
+"correct"
 msgstr ""
 
 #: glossary.html.j2:107
@@ -820,7 +758,7 @@ msgid "proposal"
 msgstr ""
 
 #: glossary.html.j2:109
-msgid "a sketch that has been completed and signed by the merchant backend.\n"
+msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
 #: glossary.html.j2:113
@@ -830,8 +768,8 @@ msgstr ""
 #: glossary.html.j2:115
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank"
-" account to cover obligations from coins in circulation\n"
+"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+"account to cover obligations from coins in circulation"
 msgstr ""
 
 #: glossary.html.j2:119
@@ -840,8 +778,8 @@ msgstr ""
 
 #: glossary.html.j2:121
 msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh`"
-" coins\n"
+"operation by which a `dirty` `coin` is converted into one or more `fresh` "
+"coins"
 msgstr ""
 
 #: glossary.html.j2:125
@@ -851,8 +789,8 @@ msgstr ""
 #: glossary.html.j2:127
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back "
-"to the customer\n"
+"obtained from a `deposit` operation, giving the right to the funds back to "
+"the customer"
 msgstr ""
 
 #: glossary.html.j2:131
@@ -862,8 +800,7 @@ msgstr ""
 #: glossary.html.j2:133
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any "
-"time.\n"
+"private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
 #: glossary.html.j2:137
@@ -871,7 +808,7 @@ msgid "signing key"
 msgstr ""
 
 #: glossary.html.j2:139
-msgid "see message signing key.\n"
+msgid "see message signing key."
 msgstr ""
 
 #: glossary.html.j2:143
@@ -880,8 +817,8 @@ msgstr ""
 
 #: glossary.html.j2:145
 msgid ""
-"operation by which a customer gives a merchant the right to `deposit` "
-"coins in return for merchandise\n"
+"operation by which a customer gives a merchant the right to `deposit` coins "
+"in return for merchandise"
 msgstr ""
 
 #: glossary.html.j2:149
@@ -889,7 +826,7 @@ msgid "transfer"
 msgstr ""
 
 #: glossary.html.j2:151
-msgid "method of sending funds between `bank` accounts\n"
+msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
 #: glossary.html.j2:155
@@ -899,7 +836,7 @@ msgstr ""
 #: glossary.html.j2:157
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
-"another\n"
+"another"
 msgstr ""
 
 #: glossary.html.j2:161
@@ -907,7 +844,7 @@ msgid "transaction id"
 msgstr ""
 
 #: glossary.html.j2:163
-msgid "unique number by which a merchant identifies a `transaction`\n"
+msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
 #: glossary.html.j2:167
@@ -916,8 +853,7 @@ msgstr ""
 
 #: glossary.html.j2:169
 msgid ""
-"software running on a customer's computer; withdraws, stores and spends "
-"coins\n"
+"software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
 #: glossary.html.j2:173
@@ -925,7 +861,7 @@ msgid "wire transfer"
 msgstr ""
 
 #: glossary.html.j2:175
-msgid "see `transfer`\n"
+msgid "see `transfer`"
 msgstr ""
 
 #: glossary.html.j2:179
@@ -934,8 +870,8 @@ msgstr ""
 
 #: glossary.html.j2:181
 msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely "
-"identify the `transfer`\n"
+"subject of a wire `transfer`; usually a random string to uniquely identify "
+"the `transfer`"
 msgstr ""
 
 #: glossary.html.j2:185
@@ -944,8 +880,7 @@ msgstr ""
 
 #: glossary.html.j2:187
 msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh "
-"coins\n"
+"operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
 #: governments.html.j2:6
@@ -954,13 +889,11 @@ msgstr ""
 
 #: governments.html.j2:8
 msgid ""
-"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"
+"Taler provides accountability to ensure business operate legally, while also "
+"respecting civil liberties of citizens. Taler is a payment system based on "
+"open standards and free software. Taler needs governments as they set a "
+"financial framework and act as trusted regulators. Taler contributes to "
+"digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
 #: governments.html.j2:25 index.html.j2:71
@@ -969,51 +902,43 @@ msgstr "Taxable"
 
 #: governments.html.j2:28
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:41
 msgid ""
-"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"
+"Thus, despite offering anonymity for citizens spending digital cash to buy "
+"goods and services, Taler also ensures that the state can observe incoming "
+"funds. This can be used to ensure businesses engage only in legal "
+"activities, and do not evade income tax, sales tax or value-added tax. "
+"However, this observational capability does not extend to the immediate "
+"personal domain. In particular, monitoring does not cover shared access to "
+"funds with trusted friends and family, or synchronizing wallets across "
+"multiple devices."
 msgstr ""
 
 #: governments.html.j2:61
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:73
 msgid ""
-"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"
+"As a payment service provider, the Taler exchange is subject to financial "
+"regulation. Financial regulation and regular audits are critical to "
+"establish trust. In particular, the Taler design mandates the existence of "
+"an independent auditor who checks cryptographic proofs that accumulate at "
+"the exchange to ensure that the escrow account is managed honestly. This "
+"ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
 #: governments.html.j2:88 index.html.j2:97
@@ -1022,10 +947,9 @@ msgstr "Libre"
 
 #: governments.html.j2:91
 msgid ""
-"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"
+"Taler is free software implementing an open protocol standard. Thus, Taler "
+"will enable competition and avoid the monopolization of payment systems that "
+"threatens global political and financial stability today."
 msgstr ""
 
 #: governments.html.j2:101
@@ -1034,11 +958,9 @@ msgstr "Efficace"
 
 #: governments.html.j2:104
 msgid ""
-"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"
+"Taler has an efficient design. Unlike Blockchain-based payment systems, such "
+"as Bitcoin, Taler will not threaten the availability of national electric "
+"grids or (significantly) contribute to environmental pollution."
 msgstr ""
 
 #: governments.html.j2:120
@@ -1051,8 +973,8 @@ msgstr ""
 
 #: governments.html.j2:123
 msgid ""
-"With Taler, income is visible and can be tied to the contract signed by "
-"both parties."
+"With Taler, income is visible and can be tied to the contract signed by both "
+"parties."
 msgstr ""
 
 #: governments.html.j2:124
@@ -1061,8 +983,8 @@ msgstr ""
 
 #: governments.html.j2:125
 msgid ""
-"In Taler, payer and payee are known by their bank accounts when "
-"withdrawing or depositing coins respectively"
+"In Taler, payer and payee are known by their bank accounts when withdrawing "
+"or depositing coins respectively"
 msgstr ""
 
 #: governments.html.j2:126
@@ -1071,8 +993,8 @@ msgstr ""
 
 #: governments.html.j2:127
 msgid ""
-"Taler cryptographically protects citizen's privacy, and by design "
-"implements data minimization and privacy by default."
+"Taler cryptographically protects citizen's privacy, and by design implements "
+"data minimization and privacy by default."
 msgstr ""
 
 #: governments.html.j2:128
@@ -1091,41 +1013,36 @@ msgstr ""
 
 #: 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:\n"
+"Taler assumes governments can observe traditional wire transfers entering "
+"and leaving the Taler payment system. Starting with the wire transfers, "
+"governments can obtain:"
 msgstr ""
 
 #: 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.\n"
+"The total amount of digital currency withdrawn by a customer. The government "
+"can impose limits on how much digital cash a customer can withdraw within a "
+"given time frame."
 msgstr ""
 
 #: governments.html.j2:157
-msgid ""
-"The income received by any merchant via the Taler\n"
-"system.\n"
+msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
 #: governments.html.j2:164
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:174
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:10
@@ -1134,12 +1051,11 @@ msgstr ""
 
 #: index.html.j2:13
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:29
@@ -1148,53 +1064,47 @@ msgstr ""
 
 #: index.html.j2:32
 msgid ""
-"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"
+"Taler is easy to integrate with existing Web applications. Payments are "
+"cryptographically secured and are confirmed within milliseconds with "
+"extremely low transaction costs."
 msgstr ""
 
 #: index.html.j2:45
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:59
 msgid ""
-"By design Taler does not suffer from many classes\n"
-"of security problems such as phishing or counterfeit.\n"
-"Thanks to its security features, Taler never rejects a legitimate\n"
-"customer due to a fraud-detection false positive.\n"
+"By design Taler does not suffer from many classes of security problems such "
+"as phishing or counterfeit. Thanks to its security features, Taler never "
+"rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
 #: index.html.j2:74
 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"
+"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."
 msgstr ""
 
 #: index.html.j2:86
 msgid ""
-"When you pay with Taler, your identity does not\n"
-"have to be revealed. 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 have to be revealed. Just "
+"like payments in cash, nobody else can track how you spent your electronic "
+"money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
 #: index.html.j2:100
 msgid ""
-"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 principle "
+"enables anybody to run their own payment infrastructure, be it individuals, "
+"organizations or whole countries. Since the reference implementation is a <a "
+"href=\"http://www.gnu.org/\">GNU</a> package, it will always remain free "
+"software."
 msgstr ""
 
 #: index.html.j2:117
@@ -1203,12 +1113,12 @@ msgstr ""
 
 #: index.html.j2:118
 msgid ""
-"<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"
+"<p>To pay with Taler, customers install an electronic wallet 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 pose any risk of phishing or identity "
+"theft.</p>"
 msgstr ""
 
 #: index.html.j2:128
@@ -1217,11 +1127,11 @@ msgstr ""
 
 #: index.html.j2:129
 msgid ""
-"<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"
+"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"currency. We provide supporting software in various programming languages to "
+"make the integration painless. The merchant's backend for Taler transaction "
+"processing can run on the merchant's premises or be hosted by a third party."
+"</p>"
 msgstr ""
 
 #: index.html.j2:145
@@ -1238,10 +1148,8 @@ msgstr ""
 
 #: investors.html.j2:9
 msgid ""
-"We have created a company, Taler Systems SA in\n"
-"Luxembourg.<br>\n"
-"Please contact <tt>invest@taler.net</tt>\n"
-"if you want to invest in Taler.\n"
+"We have created a company, Taler Systems SA in Luxembourg.<br> Please "
+"contact <tt>invest@taler.net</tt> if you want to invest in Taler."
 msgstr ""
 
 #: investors.html.j2:24
@@ -1250,21 +1158,18 @@ msgstr ""
 
 #: investors.html.j2:27
 msgid ""
-"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, "
+"cryptographers, software engineers, civil-rights activists and academics. We "
+"are unified by a vision of how payments should work and the goal of imposing "
+"this vision upon the world."
 msgstr ""
 
 #: investors.html.j2:37
 msgid ""
-"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"
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
+"the French national institute for research in informatics and automation, "
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
 msgstr ""
 
 #: investors.html.j2:45
@@ -1273,17 +1178,13 @@ msgstr ""
 
 #: investors.html.j2:48
 msgid ""
-"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"
+"All transactions in Taler are secured using <a href=\"bibliography.html"
+"\">modern cryptography</a> and trust in all parties is minimized. Financial "
+"damage is bounded (for customers, merchants and the exchange) even in the "
+"case that systems are compromised and private keys are stolen. Databases can "
+"be audited for consistency, resulting in either the detection of compromised "
+"systems or the demonstration that participants were honest. Actual "
+"transaction costs are fractions of a cent."
 msgstr ""
 
 #: investors.html.j2:63
@@ -1292,15 +1193,13 @@ msgstr ""
 
 #: investors.html.j2:66
 msgid ""
-"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"
+"The scalable business model for Taler is the operation of the payment "
+"service provider, which converts money from traditional payment systems "
+"(MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
+"electronic coins in the same currency. The customer can then redeem the "
+"electronic coins at a merchant, who can exchange them for money represented "
+"using traditional payment systems at the exchange. The exchange charges fees "
+"to facilitate the transactions."
 msgstr ""
 
 #: investors.html.j2:85
@@ -1313,10 +1212,10 @@ msgstr ""
 
 #: investors.html.j2:110
 msgid ""
-"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>. The exchange "
+"charges <b>transaction fees</b> to customers or merchants. Its operational "
+"expenses are from wire transfers with the banking system and the operation "
+"of the computing infrastructure."
 msgstr ""
 
 #: investors.html.j2:120
@@ -1327,8 +1226,8 @@ msgstr ""
 
 #: investors.html.j2:122
 msgid ""
-"Multiple Taler transactions can be aggregated into larger wire transfers "
-"to merchants to minimize wire transfer costs."
+"Multiple Taler transactions can be aggregated into larger wire transfers to "
+"merchants to minimize wire transfer costs."
 msgstr ""
 
 #: investors.html.j2:124
@@ -1351,11 +1250,10 @@ msgstr ""
 
 #: 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.\n"
+"Taler is a cost-effective electronic payment system which provides you with "
+"cryptographic proof that the payment worked correctly within milliseconds. "
+"Your Web customers pay with previously unknown levels of convenience without "
+"risk of fraud."
 msgstr ""
 
 #: merchants.html.j2:22
@@ -1364,39 +1262,31 @@ msgstr "Rapide"
 
 #: 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 &quot;verified\n"
-"by&quot; 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"
+"Processing transactions with Taler is fast, allowing you to confirm the "
+"transaction with your customer virtually immediately. Your customers will "
+"appreciate that they do not have to type in credit card information and play "
+"the &quot;verified by&quot; game. By making payments significantly more "
+"convenient for your customers, you may be able to use Taler for small "
+"transactions that would not work with credit card payments due to the mental "
+"overhead for customers."
 msgstr ""
 
 #: merchants.html.j2:44
 msgid ""
-"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"
+"You will have cryptographic proof of payment from the Taler payment service "
+"provider. With Taler you never handle sensitive customer account information "
+"and thus do not have to undergo any particular security audits (such as PCI "
+"DSS). Your systems will have customer contracts with qualified signatures "
+"for all transactions which you can use in court in case of disputes."
 msgstr ""
 
 #: 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 competing integrators for\n"
-"support.\n"
+"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 competing "
+"integrators for support."
 msgstr ""
 
 #: merchants.html.j2:76
@@ -1405,11 +1295,10 @@ msgstr ""
 
 #: merchants.html.j2:79
 msgid ""
-"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"
+"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 offer low transaction fees."
 msgstr ""
 
 #: merchants.html.j2:89
@@ -1418,10 +1307,9 @@ msgstr "Flexible"
 
 #: merchants.html.j2:92
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:101
@@ -1430,11 +1318,10 @@ msgstr "Ethique"
 
 #: merchants.html.j2:104
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:119
@@ -1464,28 +1351,24 @@ msgstr ""
 
 #: merchants.html.j2:147
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:156
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:167
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: press.html.j2:4
@@ -1499,211 +1382,3 @@ msgstr ""
 #: common/base.j2:6
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "Home"
-#~ msgstr "Accueil"
-
-#~ msgid "Demo"
-#~ msgstr "Démo"
-
-#~ msgid "Operators"
-#~ msgstr "Investisseurs"
-
-#~ msgid "About&nbsp;us"
-#~ msgstr "À&nbsp;propos"
-
-#~ msgid "Stability "
-#~ msgstr "Stabilité"
-
-#~ msgid "News"
-#~ msgstr ""
-
-#~ msgid "Taler Web payments paper published."
-#~ msgstr "Taler 0.0.0."
-
-#~ msgid "More news »"
-#~ msgstr "En savoir plus »"
-
-#~ msgid "Taler technology: About taxability, change and privacy"
-#~ msgstr "La technologie de Taler: Taxabilité, rendu de monnaie et vie privée"
-
-#~ msgid "1-2017: Taler Documentation pages updated"
-#~ msgstr ""
-
-#~ msgid "Operate a Taler exchange!"
-#~ msgstr "Investissez dans Taler !"
-
-#~ msgid "Electronic payments for a liberal society!"
-#~ msgstr "Paiements électroniques pour une société libre!"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonyme"
-
-#~ msgid "Electronic"
-#~ msgstr "Électronique"
-
-#~ msgid "Reserves"
-#~ msgstr "Réserve"
-
-#~ msgid "Advantages for citizens"
-#~ msgstr "Avantages pour les citoyens"
-
-#~ msgid "Independent One-Click Payment!"
-#~ msgstr ""
-
-#~ msgid "Advantages for merchants"
-#~ msgstr "Avantages pour les marchandes"
-
-#~ msgid "Advantages for governments"
-#~ msgstr "Avantage pour les gouvernements"
-
-#~ msgid "Invest in GNU Taler!"
-#~ msgstr ""
-
-#~ msgid "Business model"
-#~ msgstr "Business model"
-
-#~ msgid "Taler as seen by the exchange operator"
-#~ msgstr "Taler du point de vu de l'exploitant"
-
-#~ msgid "Taxable Anonymous Libre Electronic Reserves"
-#~ msgstr ""
-
-#~ msgid "Independent One-Click Payments!"
-#~ msgstr ""
-
-#~ msgid "<b>T</b>axable"
-#~ msgstr ""
-
-#~ msgid "<b>A</b>nonymous"
-#~ msgstr ""
-
-#~ msgid "<b>L</b>ibre"
-#~ msgstr ""
-
-#~ msgid "<b>E</b>lectronic"
-#~ msgstr ""
-
-#~ msgid "<b>R</b>eserves"
-#~ msgstr ""
-
-#~ msgid "Latest Videos"
-#~ msgstr ""
-
-#~ msgid "Florian Dold talks about Taler at 50p!"
-#~ msgstr ""
-
-#~ msgid "Taler News"
-#~ msgstr ""
-
-#~ msgid "Financial News"
-#~ msgstr ""
-
-#~ msgid "en"
-#~ msgstr "fr"
-
-#~ msgid "About us"
-#~ msgstr "À&nbsp;propos"
-
-#~ msgid "CFO"
-#~ msgstr "CFO"
-
-#~ msgid "Citizens"
-#~ msgstr "Citoyens"
-
-#~ msgid "Developers"
-#~ msgstr "Développeurs"
-
-#~ msgid "Governments"
-#~ msgstr "Gouvernements"
-
-#~ msgid "Investors"
-#~ msgstr ""
-
-#~ msgid "Merchants"
-#~ msgstr "Commerçants"
-
-#~ msgid "The GNU Taler merchant backend operator tutorial"
-#~ msgstr ""
-
-#~ msgid "Wallet"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by customers"
-#~ msgstr "Taler du point de vu des clients"
-
-#~ msgid "Taler as seen by merchants"
-#~ msgstr "Taler du poit de vu des marchants"
-
-#~ msgid "Tax-friendly"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
-#~ msgstr ""
-
-#~ msgid "Taler complies with regulation"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2)"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by governments"
-#~ msgstr "Taler, du point de vu des gouvernements"
-
-#~ msgid "Previous"
-#~ msgstr ""
-
-#~ msgid "Next"
-#~ msgstr ""
-
-#~ msgid "Accept and validate deposits from merchants."
-#~ msgstr "Accepter et valider les dépos de marchands."
-
-#~ msgid "Taler as seen by the payment service operator"
-#~ msgstr ""
-
-#~ msgid "Financial risk is bounded even if keys are compromised."
-#~ 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 "
-
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 7f0cd641..2db2bd18 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -1,17 +1,16 @@
-
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-23 10:32+0200\n"
+"POT-Creation-Date: 2017-07-26 13:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: it\n"
 "Language-Team: it <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.3.4\n"
 
 #: about.html.j2:8
@@ -20,101 +19,100 @@ msgid ""
 "GNU maintainer. Network security &amp; privacy researcher. Software "
 "architect."
 msgstr ""
-"Megalomane locale. Intendo, chi creerebbe un nuovo sistema di pagamento e"
-" una nuova Internet?"
+"Ricercatore in reti e sicurezza, ingegnere del software; autore di software "
+"GNU"
 
 #: about.html.j2:13
-#, fuzzy
 msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different"
-" industries, …."
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
 msgstr ""
+"Imprenditore, Investitore, Fortune 100 CIO. Direttore di aziende IT in "
+"diversi settori"
 
 #: about.html.j2:20
 #, fuzzy
 msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Matematico"
+msgstr "Matematico e crittografo. Attivo nel W3C &amp; Tor"
 
 #: about.html.j2:25
 #, fuzzy
 msgid "Theoretical foundations."
-msgstr "Teoricamente mortale"
+msgstr "Teorica della sicurezza dei protocolli"
 
 #: about.html.j2:30
 #, fuzzy
 msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Entusiasta di etica"
+msgstr "Fondatore del progetto GNU. Guida etica e esperto di licenze."
 
 #: about.html.j2:37
 #, fuzzy
 msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Principalmente inoffensivo"
+msgstr "Dottorando alla TU di Monaco di Baviera. Programmatore."
 
 #: about.html.j2:42
-#, fuzzy
 msgid "PhD Student, Inria.."
 msgstr ""
+"Dottorando a Inria Rennes.. Programmatore e architetto del protocollo Taler."
 
 #: about.html.j2:47 about.html.j2:62
-#, fuzzy
 msgid "Software engineer."
-msgstr ""
+msgstr "Programmatore."
 
 #: about.html.j2:54
 msgid "Sustainable business development."
-msgstr "Realizzando pensieri profondi"
+msgstr "Sviluppo di business sostenibile."
 
 #: about.html.j2:58
 #, fuzzy
 msgid "Software engineer. Works on libebics."
-msgstr "EBICS."
+msgstr "Programmatore. Attualmente coinvolto in libebics."
 
 #: about.html.j2:68
 #, fuzzy
 msgid "Translator (Spanish)"
-msgstr "Traduttrici"
+msgstr "Traduttore per lo spagnolo."
 
 #: about.html.j2:72 about.html.j2:76
 #, fuzzy
 msgid "Translator (Italian)"
-msgstr "Traduttrici"
+msgstr "Traduttrice per l'italiano."
 
 #: about.html.j2:82
-#, fuzzy
 msgid "Hardware security module"
-msgstr ""
+msgstr "Sicurezza hardware."
 
 #: about.html.j2:86
-#, fuzzy
 msgid "Risk management"
-msgstr ""
+msgstr "Gestione del rischio."
 
 #: about.html.j2:90
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
-msgstr "Linux, FreeBSD, siti web e il deep state nel tempo libero."
+msgstr ""
+"Dottorando alla TU di Monaco di Baviera. Linux, FreeBSD, siti web e il deep "
+"state nel tempo libero."
 
 #: about.html.j2:96
-#, fuzzy
 msgid "Software engineer. Works on Android wallet."
-msgstr ""
+msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
 
 #: architecture.html.j2:6
 msgid "Taler System Architecture"
-msgstr ""
+msgstr "Architettura Taler"
 
 #: bibliography.html.j2:4
 msgid "GNU Taler Bibliography"
-msgstr ""
+msgstr "Bibliografia GNU Taler"
 
 #: bibliography.html.j2:9 bibliography.html.j2:16 bibliography.html.j2:23
 #: bibliography.html.j2:29
 msgid "by"
-msgstr ""
+msgstr "di"
 
 #: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
 msgid "and"
-msgstr ""
+msgstr "e"
 
 #: bibliography.html.j2:30
 msgid "available upon request"
@@ -122,16 +120,18 @@ msgstr ""
 
 #: citizens.html.j2:5
 msgid "Advantages for Citizens"
-msgstr ""
+msgstr "Vantaggi per il cittadino"
 
 #: citizens.html.j2:9
 msgid ""
-"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 withdraw money from your bank "
+"account into your electronic wallet, and can henceforth spend digital cash. "
+"The electronic wallet can carry multiple currencies."
 msgstr ""
+"Taler realizza un sistema di contante digitale. Il contante va infatti "
+"ritirato dal conto in banca del cliente e tenuto nel portafoglio "
+"elettronico, da cui potrà essere speso. Il portafoglio può contenere moneta "
+"di diverse valute."
 
 #: citizens.html.j2:25 governments.html.j2:58 index.html.j2:56
 #: merchants.html.j2:41
@@ -140,169 +140,239 @@ 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"
+"Taler uses modern cryptography, ensuring that there is no counterfeit. Your "
+"digital wallet is safer than your physical wallet. At most, you can lose its "
+"contents because your computer or mobile is irreparably damaged or "
+"compromised. Unlike a physical wallet, you can make backups to secure "
 "against data loss."
 msgstr ""
+"Taler usa crittografia moderna, minimizzando il richio di contraffazione. Il "
+"portafoglio elettronico è più sicuro di quello fisico. Nel caso pessimo - si "
+"pensi alla compromissione del proprio computer, o ad un grave danno fisico "
+"-, la perdita  è limitata dalla somma presente nel portafoglio. Tuttavia, "
+"Taler permette di effettuare copie di sicurezza del portafoglio, per ovviare "
+"a tali perdite di dati."
 
 #: citizens.html.j2:37 index.html.j2:84
 msgid "Private"
-msgstr ""
+msgstr "Privato"
 
 #: citizens.html.j2:39
 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."
+"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."
 msgstr ""
+"Le transazioni Taler sono interamente private, né il venditore né il "
+"servizio di cambio apprenderanno l'identità dell'utente. Al momento di un "
+"acquisto, non è in nessun modo richiesto di fornire dati di carte di credito "
+"o altre informazioni sensibili. Il venditore non potrà in nessun modo "
+"ottenere informazioni sul cliente che non siano state fornite dal cliente "
+"stesso."
 
 #: citizens.html.j2:50
 msgid "Convenient"
-msgstr ""
+msgstr "Comodo"
 
 #: 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."
+"You will be able to withdraw money to replenish the digital coins in your "
+"wallet using your credit card or wire transfers. Afterwards you can pay with "
+"one-click using the Taler wallet, which optionally keeps your transaction "
+"history on your computer."
 msgstr ""
+"Il portafoglio potrà essere ricaricato di contante mediante carta di credito "
+"o bonifico bancario. Successivamente, sarà possibile effettuare pagamenti "
+"Taler mediante un singolo click. Il portafoglio terrà inoltre una lista di "
+"tutte le transazioni Taler che avete effettuato."
 
 #: citizens.html.j2:61 index.html.j2:42
 msgid "Stable"
-msgstr ""
+msgstr "Stabile"
 
 #: 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."
+"Coins in your digital wallet will be of the same denomination as the cash in "
+"your physical wallet. Taler is not a crypto-currency, so you do not have to "
+"worry about cryto-currency related value fluctuations. Banking with Taler is "
+"subject to the usual government protections for financial services."
 msgstr ""
+"I gettoni presenti nel vostro portafoglio Taler, avranno gli stessi tagli di "
+"quelli presenti nel vostro portafogli fisico. Taler non è una nuova valuta, "
+"dunque non risente delle fluttuazioni a cui le nuove critto-valute sono "
+"tipicamente soggette."
 
 #: citizens.html.j2:79
 msgid "Wallet Browser Extension"
-msgstr ""
+msgstr "Portafoglio: un'estensione del browser."
 
 #: citizens.html.j2:81
 msgid ""
-"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"
+"We currently provide a <a href=\"wallet.html\">wallet browser extension</a> "
+"for Chromium, Chrome, Firefox, Opera and Edge. Wallets for mobile phones and "
+"other platforms will be available in the future."
 msgstr ""
+"Il portafoglio che forniamo al momento è una <a href=\"wallet.html"
+"\">estensione per browser</a>. I browser supportati sono: Chromium, Chrome, "
+"Firefox, Opera e Edge. Portafogli per smartphones e altre piattaforme sono "
+"in via di sviluppo."
 
 #: citizens.html.j2:88
 msgid "Taler Demo"
-msgstr ""
+msgstr "Dimostrazione di Taler"
 
 #: citizens.html.j2:90
 msgid ""
-"You can see how Taler works in practice by visiting our <a "
-"href=\"https://demo.taler.net\">demo page</a>.\n"
+"You can see how Taler works in practice by visiting our <a href=\"https://"
+"demo.taler.net\">demo page</a>."
 msgstr ""
+"è possibile vedere Taler in azione visitando la nostra <a href=\"https://"
+"demo.taler.net\">pagina dimostrativa</a>."
 
 #: citizens.html.j2:103
 msgid "The Taler Wallet for customers"
-msgstr ""
+msgstr "I clienti e il portafoglio"
 
 #: citizens.html.j2:105
-msgid ""
-"Customers interact with the Taler system using\n"
-"the Taler wallet:"
-msgstr ""
+msgid "Customers interact with the Taler system using the Taler wallet:"
+msgstr "I clienti interagiscono con Taler usando il portafoglio"
 
 #: citizens.html.j2:110
 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"
+"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."
 msgstr ""
+"Per <b>ritirare</b> gettoni, il cliente trasferisce la somma desiderata dal "
+"suo conto in banca a quello dell'ufficio di cambio (chiamato anche \"exchange"
+"\"). La causale del bonifico dovrà contenere un numero che identifica il "
+"portafoglio del cliente. Una volta che il bonifico diventa effettivo, il "
+"portafoglio inizierà automaticamente a ritirare i gettoni dall'ufficio di "
+"cambio."
 
 #: citizens.html.j2:118
 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."
+"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."
 msgstr ""
+"Per <b>spendere</b> i gettoni, quando il cliente seleziona un articolo di "
+"suo interesse presso il sito del venditore, quest'ultimo piloterà il "
+"portafoglio per far visualizzare al cliente un resoconto di ciò che sta per "
+"essere acquistato. Tale resoconto - detto anche \"contratto\" - è una pagina "
+"Web gestita interamente dal portafoglio, nella quale il cliente può "
+"confermare, con un solo click, il suo acquisto. Lo storico delle transazioni "
+"e i contratti che il portafoglio firma per il cliente possono essere "
+"conservati dal portafoglio."
 
 #: citizens.html.j2:125
 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."
+"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."
 msgstr ""
+"Attraverso il portafoglio, il cliente può <b>rivedere</b> il suo bilancio. "
+"Il portafoglio può contenere diverse valute, e può essere condiviso da più "
+"dispositivi. Il cliente può fare copie di sicurezza del proprio portafoglio "
+"per proteggersi contro guasti del proprio hardware."
 
 #: contact.html.j2:6
 msgid "Contact information"
-msgstr ""
+msgstr "Contatti"
 
 #: contact.html.j2:13
 msgid "The mailing list"
-msgstr ""
+msgstr "La mailing list"
 
 #: contact.html.j2:15
 msgid ""
-"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:taler@gnu.org\">taler@gnu.org</a>.\n"
+"An archived, public mailing list for GNU Taler is hosted at <a href="
+"\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+"mailman/listinfo/taler</a>. You can send messages to the list at <a href="
+"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
 msgstr ""
+"L'archivio della mailing list di GNU Taler è disponibile all'indirizzo <a "
+"href=\"https://lists.gnu.org/mailman/listinfo/taler\">https://lists.gnu.org/"
+"mailman/listinfo/taler</a>. I messaggi per la lista vanno inviati a <a href="
+"\"mailto:taler@gnu.org\">taler@gnu.org</a>."
 
 #: contact.html.j2:25
 msgid "Contacting individuals"
-msgstr ""
+msgstr "Contattare membri del gruppo"
 
 #: contact.html.j2:27
 msgid ""
-"Team members are generally reachable at\n"
-"<tt>LASTNAME@taler.net</tt>.  All of us\n"
-"support receiving GnuPG encrypted e-mails.\n"
+"Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
+"us support receiving GnuPG encrypted e-mails."
 msgstr ""
+"Ogni membro è generalmente raggiungibile all'indirizzo <tt>LASTNAME@taler."
+"net</tt> Sono particolarmente gradite e-mail criptate via GnuPG."
 
 #: contact.html.j2:36
 msgid "Reporting bugs"
-msgstr ""
+msgstr "Riporta un bug"
 
 #: contact.html.j2:38
 msgid ""
-"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 <a href=\"https://gnunet.org/"
+"bugs/\">Bug tracker</a>, which is shared with the GNUnet project. You can "
+"also report bugs or feature requests to the mailing list."
 msgstr ""
+"Tracciamo bugs e proposte per nuove funzionalità nel nostro <a href="
+"\"https://gnunet.org/bugs/\">Bug tracker</a>, che serve anche il progetto "
+"GNUnet. Bugs e nuove funzionalità possono essere riportate anche nella "
+"mailing-list."
 
 #: contact.html.j2:49
 msgid "Executive team"
-msgstr ""
+msgstr "Dirigenza"
 
 #: contact.html.j2:51
 msgid ""
-"For non-technical commercial requests, please contact\n"
-"<tt>ceo AT taler.net</tt>.\n"
+"For non-technical commercial requests, please contact <tt>ceo AT taler.net</"
+"tt>."
+msgstr ""
+"Per richieste di natura commerciale, si prega di contattare <tt>ceo AT taler."
+"net</tt>."
+
+#: copyright.html.j2:6
+msgid "Copyright Assignment"
+msgstr "Diritti d'autore"
+
+#: copyright.html.j2:8
+msgid ""
+"<p>Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
+"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
+"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex"
+"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
+"development</a> of the GNUnet and GNU Taler projects is satisfied.</p>"
+msgstr ""
+"<p>I collaboratori di GNU Taler con accesso a Git devono firmare l'<a href=\"/ "
+"pdf/copyright.pdf\">attribuzione del diritto d'autore</a> per far sì che l'<a href="
+"\"https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex\">accordo GNUnet "
+"e.V. --- Taler Systems Sa sulle licenze e lo sviluppo collaborativo</a> "
+"dei progetti GNUnet e GNU Taler sia soddisfatto.</p>"  
+
+#: copyright.html.j2:17
+msgid ""
+"<p>The agreements ensure that the code will continue to be made available "
+"under free software licenses, but gives developers the freedom to move code "
+"between GNUnet and GNU Taler without worrying about licenses and the company "
+"the ability to dual-license (for example, so that we can distribute via App-"
+"stores that are hostile to free software).</p>"
+msgstr ""
+
+#: copyright.html.j2:25
+msgid ""
+"<p>Minor contributions (basically, anyone without Git access) do not require "
+"copyright assignment. Pseudonymous contributions are accepted, in this case "
+"simply sign the agreement with your pseudonym. Scanned copies are "
+"sufficient, but snail mail is preferred.</p>"
 msgstr ""
 
 #: developers.html.j2:5
@@ -315,17 +385,14 @@ msgstr "Free"
 
 #: developers.html.j2:15
 msgid ""
-"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"
+"GNU Taler is free software implementing an open protocol. Anybody is welcome "
+"to integrate our reference implementation into their applications. Different "
+"components of Taler are being made available under different licenses. The "
+"Affero GPLv3+ is used for the exchange, the LGPLv3+ is used for reference "
+"code demonstrating integration with merchant platforms, and licenses like "
+"GPLv3+ are used for wallets and related customer-facing software. We are "
+"open for constructive suggestions for maximizing the adoption of this "
+"payment platform."
 msgstr ""
 
 #: developers.html.j2:32
@@ -334,18 +401,14 @@ msgstr "RESTful"
 
 #: developers.html.j2:35
 msgid ""
-"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"
+"Taler is designed to work on the Internet. To ensure that Taler payments can "
+"work with restrictive network setups, Taler uses a RESTful protocol over "
+"HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but "
+"obviously merchants may choose to offer HTTPS for consistency and because it "
+"generally is better for privacy compared to HTTP. Taler uses JSON to encode "
+"structure data, making it easy to integrate Taler with existing Web "
+"applications. Taler's protocol is documented in detail at <a href=\"https://"
+"api.taler.net/\">api.taler.net</a>."
 msgstr ""
 
 #: developers.html.j2:58
@@ -354,15 +417,13 @@ msgstr "Codice"
 
 #: developers.html.j2:61
 msgid ""
-"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"
+"Taler is currently primarily developed by a 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 "
+"repositories can be found in our <a href=\"https://git.taler.net/\">GitWeb</"
+"a>."
 msgstr ""
 
 #: developers.html.j2:75
@@ -371,11 +432,10 @@ msgstr "Documentazione"
 
 #: developers.html.j2:78
 msgid ""
-"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"
+"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>. Technical papers can be found in our <a href="
+"\"bibliography.html\">bibliography</a>."
 msgstr ""
 
 #: developers.html.j2:88
@@ -384,11 +444,9 @@ msgstr "Discussione"
 
 #: developers.html.j2:91
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:101
@@ -397,10 +455,9 @@ msgstr "Test delle regressioni"
 
 #: developers.html.j2:104
 msgid ""
-"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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:113
@@ -409,11 +466,9 @@ msgstr "Analisi della copertura del codice"
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:126
@@ -422,11 +477,9 @@ msgstr "Analisi delle prestazioni"
 
 #: 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"
+"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>."
 msgstr ""
 
 #: developers.html.j2:145
@@ -435,120 +488,86 @@ msgstr "Schema generale del sistema Taler"
 
 #: developers.html.j2:148
 msgid ""
-"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"
+"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:"
 msgstr ""
 
 #: 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.\n"
+"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."
 msgstr ""
 
 #: 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 &quot;serial\n"
-"numbers&quot; 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"
+"Once the exchange has received the wire transfer, it allows the customer's "
+"electronic wallet to <b>withdraw</b> electronic coins. The electronic coins "
+"are digital representations of the original currency from the transfer. It "
+"is important to note that the exchange does not learn the &quot;serial "
+"numbers&quot; of the coins created in this process, so it cannot tell later "
+"which customer purchased what at which merchant. The use of Taler does not "
+"change the currency or the total value of the funds (except for fees which "
+"the exchange may charge for the service)."
 msgstr ""
 
 #: 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).\n"
+"Once the customer has the digital coins in his wallet, the wallet can be "
+"used to <b>spend</b> the coins with merchant portals that support the Taler "
+"payment system and accept the respective exchange as a business partner "
+"(bottom arrow). This creates a digital contract signed by the customer's "
+"coins and the merchant. If necessary, the customer can later use this "
+"digitally signed contract in a court of law to prove the exact terms of the "
+"contract and that he paid the respective amount. The customer does not learn "
+"the banking details of the merchant, and Taler does not require the merchant "
+"to learn the identity of the customer. Naturally, the customer can spend any "
+"fraction of his digital coins (the system takes care of customers getting "
+"change)."
 msgstr ""
 
 #: developers.html.j2:210
 msgid ""
-"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"
+"Merchants receiving digital coins <b>deposit</b> the respective claims that "
+"resulted from the contract signing with the customer at the exchange to "
+"redeem the coins. The deposit step does not reveal the details of the "
+"contract between the customer and the merchant or the identity of the "
+"customer to the exchange in any way. However, the exchange does learn the "
+"identity of the merchant via the provided bank routing information. The "
+"merchant can, for example when compelled by the state for taxation, provide "
+"information linking the individual deposit to the respective contract signed "
+"by the customer. Thus, the exchange's database allows the state to enforce "
+"that merchants pay applicable taxes (and do not engage in illegal contracts)."
 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.\n"
+"Finally, the exchange transfers funds corresponding to the digital coins "
+"redeemed by the merchants to the merchant's <b>bank</b> account. The "
+"exchange may combine multiple small transactions into one larger bank "
+"transfer. The merchant can query the exchange about the relationship between "
+"the bank transfers and the individual claims that were deposited."
 msgstr ""
 
 #: 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.\n"
+"Most importantly, the exchange keeps cryptographic proofs that allow it to "
+"demonstrate that it is operating correctly to third parties. The system "
+"requires an external <b>auditor</b>, such as a government-appointed "
+"financial regulatory body, to frequently verify the exchange's databases and "
+"check that its bank balance matches the total value of the remaining coins "
+"in circulation."
 msgstr ""
 
 #: 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.\n"
+"Without the auditor, the exchange operators could embezzle funds they are "
+"holding in reserve. Customers and merchants cannot cheat each other or the "
+"exchange. If any party's computers are compromised, the financial damage is "
+"limited to the respective party and proportional to the funds they have in "
+"circulation during the period of the compromise."
 msgstr ""
 
 #: faq.html.j2:5
@@ -557,17 +576,16 @@ msgstr ""
 
 #: faq.html.j2:6
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:18
@@ -576,9 +594,9 @@ msgstr ""
 
 #: faq.html.j2:19
 msgid ""
-"<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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:25
@@ -587,16 +605,15 @@ msgstr ""
 
 #: faq.html.j2:26
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>The risk of losing a wallet can be mitigated by making backups or keeping "
+"the balance reasonably low.</p>"
 msgstr ""
 
 #: faq.html.j2:37
@@ -605,9 +622,9 @@ 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"
+"<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>"
 msgstr ""
 
 #: faq.html.j2:44
@@ -616,15 +633,15 @@ msgstr ""
 
 #: faq.html.j2:45
 msgid ""
-"<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"
+"<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>"
 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"
+"<p>Future versions of the Taler wallet may allow exchanging coins among "
+"friends directly as well.</p>"
 msgstr ""
 
 #: faq.html.j2:56
@@ -633,12 +650,12 @@ msgstr ""
 
 #: faq.html.j2:57
 msgid ""
-"<p>Taler wallets can store digital coins corresponding to multiple\n"
-"different currencies such as the Euro, US Dollars or Bitcoins.</p>\n"
+"<p>Taler wallets can store digital coins corresponding to multiple different "
+"currencies such as the Euro, US Dollars or Bitcoins.</p>"
 msgstr ""
 
 #: faq.html.j2:61
-msgid "<p>Taler currently does not offer conversion between currencies.</p>\n"
+msgid "<p>Taler currently does not offer conversion between currencies.</p>"
 msgstr ""
 
 #: faq.html.j2:65
@@ -647,12 +664,10 @@ 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>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>"
 msgstr ""
 
 #: glossary.html.j2:6
@@ -661,8 +676,7 @@ msgstr ""
 
 #: glossary.html.j2:8
 msgid ""
-"trusted third party that verifies that the `exchange` is operating "
-"correctly\n"
+"trusted third party that verifies that the `exchange` is operating correctly"
 msgstr ""
 
 #: glossary.html.j2:12
@@ -671,8 +685,8 @@ msgstr ""
 
 #: glossary.html.j2:14
 msgid ""
-"traditional financial service provider who offers wire `transfers` "
-"between accounts\n"
+"traditional financial service provider who offers wire `transfers` between "
+"accounts"
 msgstr ""
 
 #: glossary.html.j2:18
@@ -682,7 +696,7 @@ msgstr ""
 #: glossary.html.j2:20
 msgid ""
 "coins are individual token representing a certain amount of value, also "
-"known as the `denomination` of the coin\n"
+"known as the `denomination` of the coin"
 msgstr ""
 
 #: glossary.html.j2:24
@@ -690,7 +704,7 @@ msgid "contract"
 msgstr ""
 
 #: glossary.html.j2:26
-msgid "the proposal signed by the wallet.\n"
+msgid "the proposal signed by the wallet."
 msgstr ""
 
 #: glossary.html.j2:30
@@ -699,8 +713,7 @@ msgstr ""
 
 #: glossary.html.j2:32
 msgid ""
-"unit of currency, specifies both the currency and the face value of a "
-"`coin`\n"
+"unit of currency, specifies both the currency and the face value of a `coin`"
 msgstr ""
 
 #: glossary.html.j2:36
@@ -709,8 +722,8 @@ msgstr ""
 
 #: glossary.html.j2:38
 msgid ""
-"RSA key used by the exchange to certify that a given `coin` is valid and "
-"of a particular `denomination`\n"
+"RSA key used by the exchange to certify that a given `coin` is valid and of "
+"a particular `denomination`"
 msgstr ""
 
 #: glossary.html.j2:42
@@ -720,8 +733,7 @@ msgstr ""
 #: glossary.html.j2:44
 msgid ""
 "operation by which a merchant passes coins to an exchange, expecting the "
-"exchange to credit his `bank` account in the future using a wire "
-"`transfer`\n"
+"exchange to credit his `bank` account in the future using a wire `transfer`"
 msgstr ""
 
 #: glossary.html.j2:48
@@ -730,10 +742,9 @@ msgstr ""
 
 #: glossary.html.j2:50
 msgid ""
-"a `coin` is dirty if its public key may be known to an entity other than "
-"the customer, thereby creating the danger of some entity being able to "
-"link multiple transactions of coin's owner if the coin is not refreshed "
-"first\n"
+"a `coin` is dirty if its public key may be known to an entity other than the "
+"customer, thereby creating the danger of some entity being able to link "
+"multiple transactions of coin's owner if the coin is not refreshed first"
 msgstr ""
 
 #: glossary.html.j2:54
@@ -742,8 +753,8 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider.  Issues eletronic `coins` during "
-"`withdrawal` and redeems them when they are `deposited` by merchants.\n"
+"Taler's payment service provider. Issues eletronic `coins` during "
+"`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
 #: glossary.html.j2:60
@@ -751,7 +762,7 @@ msgid "extension"
 msgstr ""
 
 #: glossary.html.j2:62
-msgid "implementation of a `wallet` for browsers\n"
+msgid "implementation of a `wallet` for browsers"
 msgstr ""
 
 #: glossary.html.j2:66
@@ -759,7 +770,7 @@ msgid "fresh coin"
 msgstr ""
 
 #: glossary.html.j2:68
-msgid "a `coin` is fresh if its public key is only known to the customer\n"
+msgid "a `coin` is fresh if its public key is only known to the customer"
 msgstr ""
 
 #: glossary.html.j2:72
@@ -768,8 +779,8 @@ msgstr ""
 
 #: glossary.html.j2:74
 msgid ""
-"offline key used by the exchange to certify denomination keys and message"
-" signing keys\n"
+"offline key used by the exchange to certify denomination keys and message "
+"signing keys"
 msgstr ""
 
 #: glossary.html.j2:78
@@ -777,7 +788,7 @@ msgid "message signing key"
 msgstr ""
 
 #: glossary.html.j2:80
-msgid "key used by the exchange to sign online messages, other than coins\n"
+msgid "key used by the exchange to sign online messages, other than coins"
 msgstr ""
 
 #: glossary.html.j2:84
@@ -787,15 +798,11 @@ msgstr ""
 #: glossary.html.j2:86
 msgid ""
 "specification of the details of a transaction, specifies the payment "
-"obligations\n"
-"for the customer (i.e. the amount), the deliverables of the merchant and "
-"other\n"
-"related information, such as deadlines or locations; However, it lacks "
-"some\n"
-"information that the backend is supposed to provide.\n"
-"In other words, after the backend adds the missing information to the "
-"offer and\n"
-"signs it, it becomes a proposal.\n"
+"obligations for the customer (i.e. the amount), the deliverables of the "
+"merchant and other related information, such as deadlines or locations; "
+"However, it lacks some information that the backend is supposed to provide. "
+"In other words, after the backend adds the missing information to the offer "
+"and signs it, it becomes a proposal."
 msgstr ""
 
 #: glossary.html.j2:95
@@ -803,7 +810,7 @@ msgid "owner"
 msgstr ""
 
 #: glossary.html.j2:97
-msgid "a `coin` is owned by the entity that knows the private key of the coin\n"
+msgid "a `coin` is owned by the entity that knows the private key of the coin"
 msgstr ""
 
 #: glossary.html.j2:101
@@ -813,7 +820,7 @@ msgstr ""
 #: glossary.html.j2:103
 msgid ""
 "message that cryptographically demonstrates that a particular claim is "
-"correct\n"
+"correct"
 msgstr ""
 
 #: glossary.html.j2:107
@@ -821,7 +828,7 @@ msgid "proposal"
 msgstr ""
 
 #: glossary.html.j2:109
-msgid "a sketch that has been completed and signed by the merchant backend.\n"
+msgid "a sketch that has been completed and signed by the merchant backend."
 msgstr ""
 
 #: glossary.html.j2:113
@@ -831,8 +838,8 @@ msgstr ""
 #: glossary.html.j2:115
 msgid ""
 "funds set aside for future use; either the balance of a customer at the "
-"exchange ready for `withdrawal`, or the funds kept in the exchange's bank"
-" account to cover obligations from coins in circulation\n"
+"exchange ready for `withdrawal`, or the funds kept in the exchange's bank "
+"account to cover obligations from coins in circulation"
 msgstr ""
 
 #: glossary.html.j2:119
@@ -841,8 +848,8 @@ msgstr ""
 
 #: glossary.html.j2:121
 msgid ""
-"operation by which a `dirty` `coin` is converted into one or more `fresh`"
-" coins\n"
+"operation by which a `dirty` `coin` is converted into one or more `fresh` "
+"coins"
 msgstr ""
 
 #: glossary.html.j2:125
@@ -852,8 +859,8 @@ msgstr ""
 #: glossary.html.j2:127
 msgid ""
 "operation by which a merchant steps back from the right to funds that he "
-"obtained from a `deposit` operation, giving the right to the funds back "
-"to the customer\n"
+"obtained from a `deposit` operation, giving the right to the funds back to "
+"the customer"
 msgstr ""
 
 #: glossary.html.j2:131
@@ -863,8 +870,7 @@ msgstr ""
 #: glossary.html.j2:133
 msgid ""
 "users can share ownership of a `coin` by sharing access to the coin's "
-"private key, thereby allowing all co-owners to spend the coin at any "
-"time.\n"
+"private key, thereby allowing all co-owners to spend the coin at any time."
 msgstr ""
 
 #: glossary.html.j2:137
@@ -872,7 +878,7 @@ msgid "signing key"
 msgstr ""
 
 #: glossary.html.j2:139
-msgid "see message signing key.\n"
+msgid "see message signing key."
 msgstr ""
 
 #: glossary.html.j2:143
@@ -881,8 +887,8 @@ msgstr ""
 
 #: glossary.html.j2:145
 msgid ""
-"operation by which a customer gives a merchant the right to `deposit` "
-"coins in return for merchandise\n"
+"operation by which a customer gives a merchant the right to `deposit` coins "
+"in return for merchandise"
 msgstr ""
 
 #: glossary.html.j2:149
@@ -890,7 +896,7 @@ msgid "transfer"
 msgstr ""
 
 #: glossary.html.j2:151
-msgid "method of sending funds between `bank` accounts\n"
+msgid "method of sending funds between `bank` accounts"
 msgstr ""
 
 #: glossary.html.j2:155
@@ -900,7 +906,7 @@ msgstr ""
 #: glossary.html.j2:157
 msgid ""
 "method by which ownership is exclusively transferred from one entity to "
-"another\n"
+"another"
 msgstr ""
 
 #: glossary.html.j2:161
@@ -908,7 +914,7 @@ msgid "transaction id"
 msgstr ""
 
 #: glossary.html.j2:163
-msgid "unique number by which a merchant identifies a `transaction`\n"
+msgid "unique number by which a merchant identifies a `transaction`"
 msgstr ""
 
 #: glossary.html.j2:167
@@ -917,8 +923,7 @@ msgstr ""
 
 #: glossary.html.j2:169
 msgid ""
-"software running on a customer's computer; withdraws, stores and spends "
-"coins\n"
+"software running on a customer's computer; withdraws, stores and spends coins"
 msgstr ""
 
 #: glossary.html.j2:173
@@ -926,7 +931,7 @@ msgid "wire transfer"
 msgstr ""
 
 #: glossary.html.j2:175
-msgid "see `transfer`\n"
+msgid "see `transfer`"
 msgstr ""
 
 #: glossary.html.j2:179
@@ -935,8 +940,8 @@ msgstr ""
 
 #: glossary.html.j2:181
 msgid ""
-"subject of a wire `transfer`; usually a random string to uniquely "
-"identify the `transfer`\n"
+"subject of a wire `transfer`; usually a random string to uniquely identify "
+"the `transfer`"
 msgstr ""
 
 #: glossary.html.j2:185
@@ -945,8 +950,7 @@ msgstr ""
 
 #: glossary.html.j2:187
 msgid ""
-"operation by which a `wallet` can convert funds from a reserve to fresh "
-"coins\n"
+"operation by which a `wallet` can convert funds from a reserve to fresh coins"
 msgstr ""
 
 #: governments.html.j2:6
@@ -955,13 +959,11 @@ msgstr ""
 
 #: governments.html.j2:8
 msgid ""
-"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"
+"Taler provides accountability to ensure business operate legally, while also "
+"respecting civil liberties of citizens. Taler is a payment system based on "
+"open standards and free software. Taler needs governments as they set a "
+"financial framework and act as trusted regulators. Taler contributes to "
+"digital sovereignty in the critical financial infrastructure."
 msgstr ""
 
 #: governments.html.j2:25 index.html.j2:71
@@ -970,51 +972,43 @@ msgstr "Tassabile"
 
 #: governments.html.j2:28
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:41
 msgid ""
-"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"
+"Thus, despite offering anonymity for citizens spending digital cash to buy "
+"goods and services, Taler also ensures that the state can observe incoming "
+"funds. This can be used to ensure businesses engage only in legal "
+"activities, and do not evade income tax, sales tax or value-added tax. "
+"However, this observational capability does not extend to the immediate "
+"personal domain. In particular, monitoring does not cover shared access to "
+"funds with trusted friends and family, or synchronizing wallets across "
+"multiple devices."
 msgstr ""
 
 #: governments.html.j2:61
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:73
 msgid ""
-"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"
+"As a payment service provider, the Taler exchange is subject to financial "
+"regulation. Financial regulation and regular audits are critical to "
+"establish trust. In particular, the Taler design mandates the existence of "
+"an independent auditor who checks cryptographic proofs that accumulate at "
+"the exchange to ensure that the escrow account is managed honestly. This "
+"ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
 
 #: governments.html.j2:88 index.html.j2:97
@@ -1024,10 +1018,9 @@ msgstr "Libero"
 
 #: governments.html.j2:91
 msgid ""
-"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"
+"Taler is free software implementing an open protocol standard. Thus, Taler "
+"will enable competition and avoid the monopolization of payment systems that "
+"threatens global political and financial stability today."
 msgstr ""
 
 #: governments.html.j2:101
@@ -1036,11 +1029,9 @@ msgstr "Efficiente"
 
 #: governments.html.j2:104
 msgid ""
-"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"
+"Taler has an efficient design. Unlike Blockchain-based payment systems, such "
+"as Bitcoin, Taler will not threaten the availability of national electric "
+"grids or (significantly) contribute to environmental pollution."
 msgstr ""
 
 #: governments.html.j2:120
@@ -1053,8 +1044,8 @@ msgstr ""
 
 #: governments.html.j2:123
 msgid ""
-"With Taler, income is visible and can be tied to the contract signed by "
-"both parties."
+"With Taler, income is visible and can be tied to the contract signed by both "
+"parties."
 msgstr ""
 
 #: governments.html.j2:124
@@ -1063,8 +1054,8 @@ msgstr ""
 
 #: governments.html.j2:125
 msgid ""
-"In Taler, payer and payee are known by their bank accounts when "
-"withdrawing or depositing coins respectively"
+"In Taler, payer and payee are known by their bank accounts when withdrawing "
+"or depositing coins respectively"
 msgstr ""
 
 #: governments.html.j2:126
@@ -1073,8 +1064,8 @@ msgstr ""
 
 #: governments.html.j2:127
 msgid ""
-"Taler cryptographically protects citizen's privacy, and by design "
-"implements data minimization and privacy by default."
+"Taler cryptographically protects citizen's privacy, and by design implements "
+"data minimization and privacy by default."
 msgstr ""
 
 #: governments.html.j2:128
@@ -1093,41 +1084,36 @@ msgstr ""
 
 #: 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:\n"
+"Taler assumes governments can observe traditional wire transfers entering "
+"and leaving the Taler payment system. Starting with the wire transfers, "
+"governments can obtain:"
 msgstr ""
 
 #: 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.\n"
+"The total amount of digital currency withdrawn by a customer. The government "
+"can impose limits on how much digital cash a customer can withdraw within a "
+"given time frame."
 msgstr ""
 
 #: governments.html.j2:157
-msgid ""
-"The income received by any merchant via the Taler\n"
-"system.\n"
+msgid "The income received by any merchant via the Taler system."
 msgstr ""
 
 #: governments.html.j2:164
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: governments.html.j2:174
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:10
@@ -1136,12 +1122,11 @@ msgstr ""
 
 #: index.html.j2:13
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:29
@@ -1150,53 +1135,47 @@ msgstr ""
 
 #: index.html.j2:32
 msgid ""
-"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"
+"Taler is easy to integrate with existing Web applications. Payments are "
+"cryptographically secured and are confirmed within milliseconds with "
+"extremely low transaction costs."
 msgstr ""
 
 #: index.html.j2:45
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: index.html.j2:59
 msgid ""
-"By design Taler does not suffer from many classes\n"
-"of security problems such as phishing or counterfeit.\n"
-"Thanks to its security features, Taler never rejects a legitimate\n"
-"customer due to a fraud-detection false positive.\n"
+"By design Taler does not suffer from many classes of security problems such "
+"as phishing or counterfeit. Thanks to its security features, Taler never "
+"rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
 
 #: index.html.j2:74
 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"
+"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."
 msgstr ""
 
 #: index.html.j2:86
 msgid ""
-"When you pay with Taler, your identity does not\n"
-"have to be revealed. 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 have to be revealed. Just "
+"like payments in cash, nobody else can track how you spent your electronic "
+"money. However, you obtain a legally valid proof of payment."
 msgstr ""
 
 #: index.html.j2:100
 msgid ""
-"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 principle "
+"enables anybody to run their own payment infrastructure, be it individuals, "
+"organizations or whole countries. Since the reference implementation is a <a "
+"href=\"http://www.gnu.org/\">GNU</a> package, it will always remain free "
+"software."
 msgstr ""
 
 #: index.html.j2:117
@@ -1205,12 +1184,12 @@ msgstr ""
 
 #: index.html.j2:118
 msgid ""
-"<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"
+"<p>To pay with Taler, customers install an electronic wallet 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 pose any risk of phishing or identity "
+"theft.</p>"
 msgstr ""
 
 #: index.html.j2:128
@@ -1219,11 +1198,11 @@ msgstr ""
 
 #: index.html.j2:129
 msgid ""
-"<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"
+"<p>To receive Taler payments, a merchant needs a bank account in the desired "
+"currency. We provide supporting software in various programming languages to "
+"make the integration painless. The merchant's backend for Taler transaction "
+"processing can run on the merchant's premises or be hosted by a third party."
+"</p>"
 msgstr ""
 
 #: index.html.j2:145
@@ -1240,10 +1219,8 @@ msgstr ""
 
 #: investors.html.j2:9
 msgid ""
-"We have created a company, Taler Systems SA in\n"
-"Luxembourg.<br>\n"
-"Please contact <tt>invest@taler.net</tt>\n"
-"if you want to invest in Taler.\n"
+"We have created a company, Taler Systems SA in Luxembourg.<br> Please "
+"contact <tt>invest@taler.net</tt> if you want to invest in Taler."
 msgstr ""
 
 #: investors.html.j2:24
@@ -1252,21 +1229,18 @@ msgstr ""
 
 #: investors.html.j2:27
 msgid ""
-"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, "
+"cryptographers, software engineers, civil-rights activists and academics. We "
+"are unified by a vision of how payments should work and the goal of imposing "
+"this vision upon the world."
 msgstr ""
 
 #: investors.html.j2:37
 msgid ""
-"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"
+"We are currently supported by <a href=\"http://www.inria.fr/\">Inria</a>, "
+"the French national institute for research in informatics and automation, "
+"and the <a href=\"https://renewablefreedom.org/\">Renewable Freedom "
+"Foundation</a>."
 msgstr ""
 
 #: investors.html.j2:45
@@ -1275,17 +1249,13 @@ msgstr ""
 
 #: investors.html.j2:48
 msgid ""
-"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"
+"All transactions in Taler are secured using <a href=\"bibliography.html"
+"\">modern cryptography</a> and trust in all parties is minimized. Financial "
+"damage is bounded (for customers, merchants and the exchange) even in the "
+"case that systems are compromised and private keys are stolen. Databases can "
+"be audited for consistency, resulting in either the detection of compromised "
+"systems or the demonstration that participants were honest. Actual "
+"transaction costs are fractions of a cent."
 msgstr ""
 
 #: investors.html.j2:63
@@ -1294,15 +1264,13 @@ msgstr ""
 
 #: investors.html.j2:66
 msgid ""
-"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"
+"The scalable business model for Taler is the operation of the payment "
+"service provider, which converts money from traditional payment systems "
+"(MasterCard, SEPA, UPI, Visa, Bitcoin, ACH, SWIFT, etc.) to anonymous "
+"electronic coins in the same currency. The customer can then redeem the "
+"electronic coins at a merchant, who can exchange them for money represented "
+"using traditional payment systems at the exchange. The exchange charges fees "
+"to facilitate the transactions."
 msgstr ""
 
 #: investors.html.j2:85
@@ -1315,10 +1283,10 @@ msgstr ""
 
 #: investors.html.j2:110
 msgid ""
-"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>. The exchange "
+"charges <b>transaction fees</b> to customers or merchants. Its operational "
+"expenses are from wire transfers with the banking system and the operation "
+"of the computing infrastructure."
 msgstr ""
 
 #: investors.html.j2:120
@@ -1329,8 +1297,8 @@ msgstr ""
 
 #: investors.html.j2:122
 msgid ""
-"Multiple Taler transactions can be aggregated into larger wire transfers "
-"to merchants to minimize wire transfer costs."
+"Multiple Taler transactions can be aggregated into larger wire transfers to "
+"merchants to minimize wire transfer costs."
 msgstr ""
 
 #: investors.html.j2:124
@@ -1353,11 +1321,10 @@ msgstr ""
 
 #: 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.\n"
+"Taler is a cost-effective electronic payment system which provides you with "
+"cryptographic proof that the payment worked correctly within milliseconds. "
+"Your Web customers pay with previously unknown levels of convenience without "
+"risk of fraud."
 msgstr ""
 
 #: merchants.html.j2:22
@@ -1366,39 +1333,31 @@ msgstr "Veloce"
 
 #: 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 &quot;verified\n"
-"by&quot; 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"
+"Processing transactions with Taler is fast, allowing you to confirm the "
+"transaction with your customer virtually immediately. Your customers will "
+"appreciate that they do not have to type in credit card information and play "
+"the &quot;verified by&quot; game. By making payments significantly more "
+"convenient for your customers, you may be able to use Taler for small "
+"transactions that would not work with credit card payments due to the mental "
+"overhead for customers."
 msgstr ""
 
 #: merchants.html.j2:44
 msgid ""
-"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"
+"You will have cryptographic proof of payment from the Taler payment service "
+"provider. With Taler you never handle sensitive customer account information "
+"and thus do not have to undergo any particular security audits (such as PCI "
+"DSS). Your systems will have customer contracts with qualified signatures "
+"for all transactions which you can use in court in case of disputes."
 msgstr ""
 
 #: 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 competing integrators for\n"
-"support.\n"
+"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 competing "
+"integrators for support."
 msgstr ""
 
 #: merchants.html.j2:76
@@ -1407,11 +1366,10 @@ msgstr ""
 
 #: merchants.html.j2:79
 msgid ""
-"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"
+"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 offer low transaction fees."
 msgstr ""
 
 #: merchants.html.j2:89
@@ -1420,10 +1378,9 @@ msgstr "Flessibile"
 
 #: merchants.html.j2:92
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:101
@@ -1432,11 +1389,10 @@ msgstr "Etico"
 
 #: merchants.html.j2:104
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:119
@@ -1466,28 +1422,24 @@ msgstr ""
 
 #: merchants.html.j2:147
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:156
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: merchants.html.j2:167
 msgid ""
-"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"
+"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."
 msgstr ""
 
 #: press.html.j2:4
@@ -1501,211 +1453,3 @@ msgstr ""
 #: common/base.j2:6
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr ""
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "Home"
-#~ msgstr "Home"
-
-#~ msgid "Demo"
-#~ msgstr "Demo"
-
-#~ msgid "Operators"
-#~ msgstr "Investitori"
-
-#~ msgid "About&nbsp;us"
-#~ msgstr "Chi siamo"
-
-#~ msgid "Stability "
-#~ msgstr "Stabilità"
-
-#~ msgid "News"
-#~ msgstr ""
-
-#~ msgid "Taler Web payments paper published."
-#~ msgstr "Taler 0.0.0."
-
-#~ msgid "More news »"
-#~ msgstr "Scopri di più »"
-
-#~ msgid "Taler technology: About taxability, change and privacy"
-#~ msgstr "La tecnologia Taler: tassabilità, cambio e privacy"
-
-#~ msgid "1-2017: Taler Documentation pages updated"
-#~ msgstr ""
-
-#~ msgid "Operate a Taler exchange!"
-#~ msgstr "Investi in Taler!"
-
-#~ msgid "Electronic payments for a liberal society!"
-#~ msgstr "Pagamenti elettronici per una società libera!"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonimo"
-
-#~ msgid "Electronic"
-#~ msgstr "Elettronico"
-
-#~ msgid "Reserves"
-#~ msgstr "Riserva"
-
-#~ msgid "Advantages for citizens"
-#~ msgstr "Vantaggi per i cittadini"
-
-#~ msgid "Independent One-Click Payment!"
-#~ msgstr ""
-
-#~ msgid "Advantages for merchants"
-#~ msgstr "Vantaggi per i mercanti"
-
-#~ msgid "Advantages for governments"
-#~ msgstr "Vantaggi per i governi"
-
-#~ msgid "Invest in GNU Taler!"
-#~ msgstr ""
-
-#~ msgid "Business model"
-#~ msgstr "Modello business"
-
-#~ msgid "Taler as seen by the exchange operator"
-#~ msgstr "Come opera la ufficio cambi di Taler"
-
-#~ msgid "Taxable Anonymous Libre Electronic Reserves"
-#~ msgstr ""
-
-#~ msgid "Independent One-Click Payments!"
-#~ msgstr ""
-
-#~ msgid "<b>T</b>axable"
-#~ msgstr ""
-
-#~ msgid "<b>A</b>nonymous"
-#~ msgstr ""
-
-#~ msgid "<b>L</b>ibre"
-#~ msgstr ""
-
-#~ msgid "<b>E</b>lectronic"
-#~ msgstr ""
-
-#~ msgid "<b>R</b>eserves"
-#~ msgstr ""
-
-#~ msgid "Latest Videos"
-#~ msgstr ""
-
-#~ msgid "Florian Dold talks about Taler at 50p!"
-#~ msgstr ""
-
-#~ msgid "Taler News"
-#~ msgstr ""
-
-#~ msgid "Financial News"
-#~ msgstr ""
-
-#~ msgid "en"
-#~ msgstr "it"
-
-#~ msgid "About us"
-#~ msgstr "Chi siamo"
-
-#~ msgid "CFO"
-#~ msgstr "CFO"
-
-#~ msgid "Citizens"
-#~ msgstr "Cittadini"
-
-#~ msgid "Developers"
-#~ msgstr "Sviluppatori"
-
-#~ msgid "Governments"
-#~ msgstr "Governi"
-
-#~ msgid "Investors"
-#~ msgstr ""
-
-#~ msgid "Merchants"
-#~ msgstr "Venditori"
-
-#~ msgid "The GNU Taler merchant backend operator tutorial"
-#~ msgstr ""
-
-#~ msgid "Wallet"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by customers"
-#~ msgstr "Come i clienti vedono Taler"
-
-#~ msgid "Taler as seen by merchants"
-#~ msgstr "Come i negozianti vedono Taler"
-
-#~ msgid "Tax-friendly"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2): Taler provides an open standard with public APIs"
-#~ msgstr ""
-
-#~ msgid "Taler complies with regulation"
-#~ msgstr ""
-
-#~ msgid "Open access (PSD2)"
-#~ msgstr ""
-
-#~ msgid "Taler as seen by governments"
-#~ msgstr "Taler dal punto di vista dai governi"
-
-#~ msgid "Previous"
-#~ msgstr ""
-
-#~ msgid "Next"
-#~ msgstr ""
-
-#~ msgid "Accept and validate deposits from merchants."
-#~ msgstr ""
-
-#~ msgid "Taler as seen by the payment service operator"
-#~ msgstr ""
-
-#~ msgid "Financial risk is bounded even if keys are compromised."
-#~ 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"
-
diff --git a/press.html.j2 b/press.html.j2
index 5a3b7fc9..928f94d7 100644
--- a/press.html.j2
+++ b/press.html.j2
@@ -8,6 +8,7 @@
 <ul>
  <li><a href="http://hackerpublicradio.org/eps.php?id=2222">Hacker Public Radio</a></li>
  <li><a href="https://www.secupay.com/de/Node/932">Secupay</a></li>
+ <li><a href="https://www.developpez.com/actu/142082/Taler-le-systeme-de-paiement-electronique-anonyme-developpe-par-GNU-et-l-INRIA-passe-en-version-0-3-0/">Developpez.com</a></li>
 </ul>
 </p>
 
diff --git a/styles.css b/styles.css
index 2dd48d9b..4f2a806b 100644
--- a/styles.css
+++ b/styles.css
@@ -125,3 +125,8 @@ footer {
 .cushion-below {
   padding-bottom: 2em;
 }
+
+.invert {
+  -webkit-filter: invert(100%);
+  filter: invert(100%);
+}
diff --git a/template.py b/template.py
index c0c42ea9..450bd3db 100755
--- a/template.py
+++ b/template.py
@@ -16,6 +16,7 @@ import jinja2
 import glob
 import codecs
 import os
+import i18nfix
 
 env = jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(__file__)),
                          extensions=["jinja2.ext.i18n"],
@@ -24,6 +25,7 @@ env = jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(__file__
                          undefined=jinja2.StrictUndefined,
                          autoescape=False)
 
+langs_full = {"en": "English", "fr": "Français", "it": "Italiano", "es": "Español", "de": "Deutsch"}
 
 for in_file in glob.glob("*.j2"):
     name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups()
@@ -50,11 +52,14 @@ for in_file in glob.glob("*.j2"):
                                  localedir="locale",
                                  languages=[locale])
 
+        tr.gettext = i18nfix.wrap_gettext(tr.gettext)
+
         env.install_gettext_translations(tr, newstyle=True)
 
 
         content = tmpl.render(
                 lang=locale,
+                lang_full=langs_full[locale],
                 url=url,
                 self_localized=self_localized,
                 url_localized=url_localized,
author	Christian Grothoff <christian@grothoff.org>	2017-07-29 21:54:57 +0200
committer	Christian Grothoff <christian@grothoff.org>	2017-07-29 21:54:57 +0200
commit	83d6043ba3fb3eb25f489f5a10db7778055ae617 (patch)
tree	855c818d3ca9f00d03516f8cfb8b11f9f0ee447a
parent	e773fff8a353488d54b394f6926721ccd8f6ae18 (diff)
parent	bdc1672325bcd3649c02f9936d2681230a389b7c (diff)