20 files changed, 274 insertions, 414 deletions
diff --git a/images/logo-2014-medium.png b/images/logo-2014-medium.png
deleted file mode 100644
index cd802a0..0000000
--- a/images/logo-2014-medium.png
+++ /dev/null
diff --git a/images/logo-2014.png b/images/logo-2014.png
deleted file mode 100644
index bdffc3c..0000000
--- a/images/logo-2014.png
+++ /dev/null
diff --git a/images/logo-2015-medium.png b/images/logo-2015-medium.png
deleted file mode 100644
index 0ab5e51..0000000
--- a/images/logo-2015-medium.png
+++ /dev/null
diff --git a/images/logo-2015.png b/images/logo-2015.png
deleted file mode 100644
index 28c9cc9..0000000
--- a/images/logo-2015.png
+++ /dev/null
diff --git a/images/logo-2016-small.svg b/images/logo-2016-small.svg
deleted file mode 100644
index 093bf74..0000000
--- a/images/logo-2016-small.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-50 -50 100 100">
-  <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7" fill="none" />
-  <text x="0" y="10" text-anchor="middle" alignment-baseline="middle" font-family="sans-serif" font-size="72">T</text>
-</svg> 
diff --git a/images/logo-2016.svg b/images/logo-2016.svg
deleted file mode 100644
index 93f91ad..0000000
--- a/images/logo-2016.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-50 -50 100 100"
-     xmlns:xlink="http://www.w3.org/1999/xlink">
-  <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7.5" fill="none" />
-  <circle cx="0" cy="0" r="45" stroke="black" stroke-width="1" fill="none" />
-  <rect x="-20" y="-17" width="40" height="4"/>
-  <rect x="-20" y="-12" width="40" height="1"/>
-  <rect x="-4" y="-17" width="8" height="54"/>
-
-
-  <text font-family="Verdana" font-weight="bold" font-size="8" color="red" x="0" y="-20" text-anchor="middle" letter-spacing="0.25em">
-    Taler
-  </text>
-
-
-  <defs>
-    <path id="MyPath1"
-          d="M -38 0 A 38 38 1 0 1 38 0" />
-  </defs>
-
-  <defs>
-    <path id="MyPath2"
-          d="M 0 42 A 42 42 1 0 0 0 -42" />
-  </defs>
-
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath1">
-      Taxable Anonymous Libre
-    </textPath>
-  </text>
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath2">
-      Electronic Reserves
-    </textPath>
-  </text>
-</svg> 
diff --git a/images/logo-2017.es.svg b/images/logo-2017.es.svg
index 56327de..1bc307c 100644
--- a/images/logo-2017.es.svg
+++ b/images/logo-2017.es.svg
@@ -1,42 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-50 -50 100 100"
-     xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg">
+
   <style>
     .ts1 { fill: #aa3939; letter-spacing:0; }
     .ts2 { letter-spacing:0; }
   </style>
 
-  <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7.5" fill="none" />
-  <circle cx="0" cy="0" r="45" stroke="black" stroke-width="1" fill="none" />
-  <!-- big horizontal T stroke -->
-  <rect x="-30" y="-14" width="60" height="4"/>
-  <rect x="-30" y="-9" width="60" height="1"/>
-  <rect x="-4" y="-14" width="8" height="54"/>
-
-  <text font-family="'Lucida Console', Monaco, monospace" font-weight="bold" font-size="9" color="red" x="0" y="-18" text-anchor="middle" letter-spacing="0.20em">
-    <tspan class="ts1">&#10092;</tspan>Tale<tspan class="ts2">r<tspan class="ts1">&#10093;</tspan></tspan>
-  </text>
-
-
-  <defs>
-    <path id="MyPath1"
-          d="M -38 0 A 38 38 1 0 1 38 0" />
-  </defs>
-
-  <defs>
-    <path id="MyPath2"
-          d="M 0 42 A 42 42 1 0 0 0 -42" />
-  </defs>
-
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath1">
-      Imponibles Anónimas Libres
-    </textPath>
-  </text>
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath2">
-      Reservas Electrónicas
-    </textPath>
+  <text x="0" y="35" font-family="Verdana" font-size="35">
+    <tspan><tspan class="ts1">WARNING:</tspan>  gnutaler.org is a scam site.</tspan>
+    <tspan x="0" dy="1.5em">Please go to https://taler.net/ instead.</tspan>
   </text>
 </svg>
diff --git a/images/logo-2017.fr.svg b/images/logo-2017.fr.svg
index bee6899..1bc307c 100644
--- a/images/logo-2017.fr.svg
+++ b/images/logo-2017.fr.svg
@@ -1,44 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-50 -50 100 100"
-     xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg">
+
   <style>
     .ts1 { fill: #aa3939; letter-spacing:0; }
     .ts2 { letter-spacing:0; }
   </style>
 
-  <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7.5" fill="none" />
-  <circle cx="0" cy="0" r="45" stroke="black" stroke-width="1" fill="none" />
-  <!-- big horizontal T stroke -->
-  <rect x="-30" y="-14" width="60" height="4"/>
-  <rect x="-30" y="-9" width="60" height="1"/>
-  <rect x="-4" y="-14" width="8" height="54"/>
-
-
-
-  <text font-family="'Lucida Console', Monaco, monospace" font-weight="bold" font-size="9" color="red" x="0" y="-18" text-anchor="middle" letter-spacing="0.20em">
-    <tspan class="ts1">&#10092;</tspan>Tale<tspan class="ts2">r<tspan class="ts1">&#10093;</tspan></tspan>
-  </text>
-
-
-  <defs>
-    <path id="MyPath1"
-          d="M -38 0 A 38 38 1 0 1 38 0" />
-  </defs>
-
-  <defs>
-    <path id="MyPath2"
-          d="M 0 42 A 42 42 1 0 0 0 -42" />
-  </defs>
-
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath1">
-      Taxable Anonyme Libre
-    </textPath>
-  </text>
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath2">
-      Électronique Réserve
-    </textPath>
+  <text x="0" y="35" font-family="Verdana" font-size="35">
+    <tspan><tspan class="ts1">WARNING:</tspan>  gnutaler.org is a scam site.</tspan>
+    <tspan x="0" dy="1.5em">Please go to https://taler.net/ instead.</tspan>
   </text>
 </svg>
diff --git a/images/logo-2017.svg b/images/logo-2017.svg
index 8dd2cf5..1bc307c 100644
--- a/images/logo-2017.svg
+++ b/images/logo-2017.svg
@@ -1,44 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-50 -50 100 100"
-     xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg">
+
   <style>
     .ts1 { fill: #aa3939; letter-spacing:0; }
     .ts2 { letter-spacing:0; }
   </style>
 
-  <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7.5" fill="none" />
-  <circle cx="0" cy="0" r="45" stroke="black" stroke-width="1" fill="none" />
-  <!-- big horizontal T stroke -->
-  <rect x="-30" y="-14" width="60" height="4"/>
-  <rect x="-30" y="-9" width="60" height="1"/>
-  <rect x="-4" y="-14" width="8" height="54"/>
-
-
-
-  <text font-family="'Lucida Console', Monaco, monospace" font-weight="bold" font-size="9" color="red" x="0" y="-18" text-anchor="middle" letter-spacing="0.20em">
-    <tspan class="ts1">&#10092;</tspan>Tale<tspan class="ts2">r<tspan class="ts1">&#10093;</tspan></tspan>
-  </text>
-
-
-  <defs>
-    <path id="MyPath1"
-          d="M -38 0 A 38 38 1 0 1 38 0" />
-  </defs>
-
-  <defs>
-    <path id="MyPath2"
-          d="M 0 42 A 42 42 1 0 0 0 -42" />
-  </defs>
-
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath1">
-      Taxable Anonymous Libre
-    </textPath>
-  </text>
-
-  <text font-family="Verdana" font-size="6" color="red" fill="white">
-    <textPath xlink:href="#MyPath2">
-      Electronic Reserves
-    </textPath>
+  <text x="0" y="35" font-family="Verdana" font-size="35">
+    <tspan><tspan class="ts1">WARNING:</tspan>  gnutaler.org is a scam site.</tspan>
+    <tspan x="0" dy="1.5em">Please go to https://taler.net/ instead.</tspan>
   </text>
-</svg> 
+</svg>
diff --git a/images/logo-2018-dold.svg b/images/logo-2018-dold.svg
new file mode 100644
index 0000000..8c01d57
--- /dev/null
+++ b/images/logo-2018-dold.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 180 32">
+  <style>
+    .ts1 { fill: #aa3939; letter-spacing:0; }
+    .ts2 { letter-spacing:0; }
+    tspan {
+      alignment-baseline: hanging;
+    }
+  </style>
+
+  <text font-family="'Lucida Console', Monaco, monospace" font-weight="bold" font-size="36" color="red" text-anchor="left" x="0" y="0" letter-spacing="0.20em">
+    <tspan class="ts1">&#10092;</tspan><tspan>Tale</tspan><tspan class="ts2">r<tspan class="ts1">&#10093;</tspan></tspan>
+  </text>
+
+</svg>
diff --git a/images/logo-2018.svg b/images/logo-2018.svg
deleted file mode 100644
index af9a2a0..0000000
--- a/images/logo-2018.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40.382511 40.144131" version="1.1">
-  <g transform="matrix(0.1364274,0,0,0.1364274,1.9099836,1.9099836)" >
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2d6896;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;enable-background:accumulate"
-       d="m 134,-14 c -81.572321,0 -148,66.427679 -148,148 0,65.40079 42.553301,121.10169 101.611328,140.58008 a 14.0014,14.0014 0 1 0 8.769531,-26.5918 C 48.576266,232.22147 14,187.26841 14,134 14,67.560001 67.560001,14 134,14 c 66.44004,0 120,53.559996 120,120 0,57.50236 -40.26853,105.32697 -94.02148,117.18359 -3.18253,0.70204 -6.98018,1.44049 -11.6504,0.94141 -0.13431,-0.94802 -0.28143,-1.88229 -0.34179,-3.26172 -1.88475,-43.07717 -1.96906,-86.60986 -0.43164,-130.55273 H 217.875 a 14.0014,14.0014 0 0 0 0,-28.000003 H 134 51.824219 a 14.0014,14.0014 0 1 0 0,28.000003 h 67.718751 c -1.52594,44.33008 -1.43273,88.27114 0.4707,131.77539 0.24409,5.57849 0.82761,10.46406 2.88281,15.49609 2.05521,5.03203 6.98172,11.00177 13.81836,12.80859 13.29859,3.51464 24.63382,1.16297 29.29493,0.13477 C 232.39221,263.88301 282,204.59904 282,134 282,52.427684 215.57236,-14 134,-14 Z"
-       />
-  </g>
-</svg>
diff --git a/index.html.j2 b/index.html.j2
index 9e40d08..eadb43e 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -3,7 +3,7 @@
 <!-- Jumbotron -->
 <div class="jumbotron">
   <div style="height: 40vh">
-    <img alt="{{ _("GNU Taler logo")}}" style="object-fit:contain;width:100%;height:100%" class="center-block" src="{{ svg_localized('images/logo-2017') }}" />
+    <img alt="{{ _("GNU Taler logo")}}" style="width:100%;height:100%" class="center-block" src="{{ svg_localized('images/logo-2018-dold') }}" />
   </div>
 
   <div class="container text-center">
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 8b07c71..078db12 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-12-28 20:16+0100\n"
+"POT-Creation-Date: 2018-05-09 12:10+0200\n"
 "PO-Revision-Date: 2017-06-02 09:46+0100\n"
 "Last-Translator: Stefan Kügel <skuegel@web.de>\n"
 "Language-Team: de <LL@li.org, de@taler.net>\n"
@@ -48,7 +48,7 @@ msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
 msgid "PhD Student, Inria.."
 msgstr "Doktorand, Inria."
 
-#: about.html.j2:47 about.html.j2:62
+#: about.html.j2:47
 msgid "Software engineer."
 msgstr "Software-Ingenieur."
 
@@ -60,33 +60,33 @@ msgstr "Nachhaltige Unternehmensentwicklung."
 msgid "Software engineer. Works on libebics."
 msgstr "Software-Ingenieur. Arbeitet an libebics."
 
-#: about.html.j2:68 about.html.j2:72 about.html.j2:76
+#: about.html.j2:64 about.html.j2:68 about.html.j2:72
 msgid "Translator (Spanish)"
 msgstr "Übersetzer (Spanisch)."
 
-#: about.html.j2:82 about.html.j2:86 about.html.j2:90
+#: about.html.j2:78 about.html.j2:82 about.html.j2:86
 msgid "Translator (Italian)"
 msgstr "Übersetzer (Italienisch)."
 
-#: about.html.j2:94
+#: about.html.j2:90
 #, fuzzy
 #| msgid "Translator (Spanish)"
 msgid "Translator (German)"
 msgstr "Übersetzer (Deutsch)."
 
-#: about.html.j2:100
+#: about.html.j2:96
 msgid "Hardware security module"
 msgstr "Hardware-Sicherheitsmodul"
 
-#: about.html.j2:104
+#: about.html.j2:100
 msgid "Risk management"
 msgstr "Risikomanagement"
 
-#: about.html.j2:108
+#: about.html.j2:104
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
 
-#: about.html.j2:114
+#: about.html.j2:110
 msgid "Software engineer. Works on Android wallet."
 msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
 
@@ -229,8 +229,8 @@ msgstr "Stabil"
 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."
+"worry about crypto-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 "
@@ -646,32 +646,11 @@ msgstr ""
 "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
-#, 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>."
-
-#: developers.html.j2:145
+#: developers.html.j2:132
 msgid "Taler system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:148
+#: developers.html.j2:135
 #, fuzzy
 #| msgid ""
 #| "The Taler system consists of protocols executed among\n"
@@ -685,13 +664,13 @@ msgstr ""
 "Das Taler-Bezahlsystem verwendet Protokolle für den Geldfluss zwischen den "
 "Beteiligten. Die grundlegenden Transaktionen sind in der Grafik dargestellt:"
 
-#: developers.html.j2:155
+#: developers.html.j2:142
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Das Taler-System im Überblick"
 
-#: developers.html.j2:158
+#: developers.html.j2:145
 #, fuzzy
 #| msgid ""
 #| "A customer instructs his <b>bank</b> to\n"
@@ -713,7 +692,7 @@ msgstr ""
 "Überweisung nennen sie eine Transaktionsnummer ihrer Taler-Geldbörse. Damit "
 "bilden sie eine Münzen-Reserve bei der Taler-Wechselstube."
 
-#: developers.html.j2:170
+#: developers.html.j2:157
 #, fuzzy
 #| msgid ""
 #| "Once the exchange has received the wire\n"
@@ -749,7 +728,7 @@ msgstr ""
 "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
+#: developers.html.j2:175
 #, fuzzy
 #| msgid ""
 #| "Once the customer has the digital coins in his\n"
@@ -795,7 +774,7 @@ msgstr ""
 "beliebige Teilbetrag von Münzen aus der Taler-Geldbörse verwendet werden, "
 "das System sorgt für das korrekte Wechselgeld."
 
-#: developers.html.j2:210
+#: developers.html.j2:197
 #, fuzzy
 #| msgid ""
 #| "Merchants receiving digital\n"
@@ -838,7 +817,7 @@ msgstr ""
 "auf diese Weise den Staat, ausnahmslos alle Verkäufer zu ihren "
 "Steuerzahlungen zu verpflichten und von illegalen Geschäften abzuhalten."
 
-#: developers.html.j2:233
+#: developers.html.j2:220
 #, fuzzy
 #| msgid ""
 #| "Finally, the exchange transfers funds\n"
@@ -865,7 +844,7 @@ msgstr ""
 "Möglichkeit, ihre angemeldeten Forderungen und deren Überweisung an die "
 "Geschäftsbank bei der Taler-Wechselstube abzufragen."
 
-#: developers.html.j2:247
+#: developers.html.j2:234
 #, fuzzy
 #| msgid ""
 #| "Most importantly, the exchange keeps\n"
@@ -895,7 +874,7 @@ msgstr ""
 "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
+#: developers.html.j2:249
 #, fuzzy
 #| msgid ""
 #| "Without the auditor, the exchange operators\n"
@@ -1208,7 +1187,7 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider. Issues eletronic `coins` during "
+"Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
@@ -2285,7 +2264,7 @@ msgstr "Flexibel"
 #| "the payment service provider supports.\n"
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
-"Bitcoins) and any amount, limited only by applicable regulatation and what "
+"Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 "Taler kann man einsetzen für verschiedene Währungen (wie Euro, US-Dollar "
@@ -2488,6 +2467,25 @@ msgstr ""
 msgid "Copyright for Contributors"
 msgstr ""
 
+#~ msgid "Performance Analysis"
+#~ msgstr "Performanceanalyse"
+
+#, 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>."
+
 #~ msgid "Demo"
 #~ msgstr "Demo"
 
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 9e0020d..5740730 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-12-28 20:16+0100\n"
+"POT-Creation-Date: 2018-05-09 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:47 about.html.j2:62
+#: about.html.j2:47
 msgid "Software engineer."
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Software engineer. Works on libebics."
 msgstr ""
 
-#: about.html.j2:68 about.html.j2:72 about.html.j2:76
+#: about.html.j2:64 about.html.j2:68 about.html.j2:72
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: about.html.j2:82 about.html.j2:86 about.html.j2:90
+#: about.html.j2:78 about.html.j2:82 about.html.j2:86
 msgid "Translator (Italian)"
 msgstr ""
 
-#: about.html.j2:94
+#: about.html.j2:90
 msgid "Translator (German)"
 msgstr ""
 
-#: about.html.j2:100
+#: about.html.j2:96
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:104
+#: about.html.j2:100
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:108
+#: about.html.j2:104
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:114
+#: about.html.j2:110
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
@@ -164,8 +164,8 @@ msgstr ""
 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."
+"worry about crypto-currency related value fluctuations. Banking with Taler "
+"is subject to the usual government protections for financial services."
 msgstr ""
 
 #: citizens.html.j2:79
@@ -399,33 +399,22 @@ msgid ""
 "\"https://lcov.taler.net/\">lcov.taler.net</a>."
 msgstr ""
 
-#: developers.html.j2:126
-msgid "Performance Analysis"
-msgstr ""
-
-#: developers.html.j2:129
-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 ""
-
-#: developers.html.j2:145
+#: developers.html.j2:132
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:148
+#: developers.html.j2:135
 msgid ""
 "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:155
+#: developers.html.j2:142
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:158
+#: developers.html.j2:145
 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 "
@@ -433,7 +422,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:170
+#: developers.html.j2:157
 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 "
@@ -445,7 +434,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:188
+#: developers.html.j2:175
 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 "
@@ -460,7 +449,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:210
+#: developers.html.j2:197
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -474,7 +463,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:233
+#: developers.html.j2:220
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -483,7 +472,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:247
+#: developers.html.j2:234
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -493,7 +482,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:262
+#: developers.html.j2:249
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -695,7 +684,7 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider. Issues eletronic `coins` during "
+"Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
@@ -1331,7 +1320,7 @@ msgstr ""
 #: merchants.html.j2:92
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
-"Bitcoins) and any amount, limited only by applicable regulatation and what "
+"Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index edf8348..3767318 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-12-28 20:16+0100\n"
+"POT-Creation-Date: 2018-05-09 12:10+0200\n"
 "PO-Revision-Date: 2017-08-10 06:24+0200\n"
 "Last-Translator: \n"
 "Language-Team: es <LL@li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
 msgid "PhD Student, Inria.."
 msgstr "Estudiante de doctorado, INRIA."
 
-#: about.html.j2:47 about.html.j2:62
+#: about.html.j2:47
 msgid "Software engineer."
 msgstr "Ingeniero de Software."
 
@@ -62,31 +62,31 @@ msgstr "Desarrollo de negocios sostenibles."
 msgid "Software engineer. Works on libebics."
 msgstr "Ingeniero de Software. Trabaja en libebics."
 
-#: about.html.j2:68 about.html.j2:72 about.html.j2:76
+#: about.html.j2:64 about.html.j2:68 about.html.j2:72
 msgid "Translator (Spanish)"
 msgstr "Traductor (español)"
 
-#: about.html.j2:82 about.html.j2:86 about.html.j2:90
+#: about.html.j2:78 about.html.j2:82 about.html.j2:86
 msgid "Translator (Italian)"
 msgstr "Traductora (italiano)"
 
-#: about.html.j2:94
+#: about.html.j2:90
 msgid "Translator (German)"
 msgstr "Traductor (alemán)"
 
-#: about.html.j2:100
+#: about.html.j2:96
 msgid "Hardware security module"
 msgstr "Módulo de seguridad de hardware"
 
-#: about.html.j2:104
+#: about.html.j2:100
 msgid "Risk management"
 msgstr "Gestión de riesgos"
 
-#: about.html.j2:108
+#: about.html.j2:104
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudiante de doctorado, TU Múnich. Actualmente es profesor."
 
-#: about.html.j2:114
+#: about.html.j2:110
 msgid "Software engineer. Works on Android wallet."
 msgstr "Ingeniero de Software. Trabaja en la Android Wallet."
 
@@ -184,11 +184,18 @@ msgid "Stable"
 msgstr "Estable"
 
 #: citizens.html.j2:63
+#, fuzzy
+#| 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."
 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."
+"worry about crypto-currency related value fluctuations. Banking with Taler "
+"is subject to the usual government protections for financial services."
 msgstr ""
 "Las monedas en su billetera electrónica serán de la misma denominación que "
 "el efectivo en su billetera física. Taler no es una moneda criptográfica, "
@@ -519,25 +526,11 @@ msgstr ""
 "para el análisis de cobertura de código de nuestros tests, los resultados "
 "están disponibles en <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
 
-#: developers.html.j2:126
-msgid "Performance Analysis"
-msgstr "Performance"
-
-#: developers.html.j2:129
-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 ""
-"Usamos <a href=\"https://gnunet.org/gauger\">Gauger</a> para el análisis "
-"regresivo de rendimiento de backend de la plataforma de intercambio en <a "
-"href=\"https://gauger.taler.net/\">gauger.taler.net</a>."
-
-#: developers.html.j2:145
+#: developers.html.j2:132
 msgid "Taler system overview"
 msgstr "Diagrama general del sistema Taler"
 
-#: developers.html.j2:148
+#: developers.html.j2:135
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -547,11 +540,11 @@ msgstr ""
 "tal como se ilustra en la imagen en la derecha. Las transacciones típicas "
 "involucran los siguientes pasos:"
 
-#: developers.html.j2:155
+#: developers.html.j2:142
 msgid "system overview"
 msgstr "Diagrama general del sistema"
 
-#: developers.html.j2:158
+#: developers.html.j2:145
 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 "
@@ -564,7 +557,7 @@ msgstr ""
 "<b>billetera</b> electrónica. En la termonología de Taler, el cliente crea "
 "una reserva en la plataforma de intercambio."
 
-#: developers.html.j2:170
+#: developers.html.j2:157
 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 "
@@ -585,7 +578,7 @@ msgstr ""
 "Taler no modifica el valor total de la moneda o de los fondos (excepto por "
 "los cargos que la plataforma de intercambio pueda cobrar por el servicio)."
 
-#: developers.html.j2:188
+#: developers.html.j2:175
 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 "
@@ -612,7 +605,7 @@ msgstr ""
 "gastar cualquier fracción de sus monedas electrónicas (el sistema se encarga "
 "de que los clientes obtengan su cambio)."
 
-#: developers.html.j2:210
+#: developers.html.j2:197
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -639,7 +632,7 @@ msgstr ""
 "comerciantes el pago de los impuestos aplicables (y que éstos no se incurran "
 "en contratos ilegales)."
 
-#: developers.html.j2:233
+#: developers.html.j2:220
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -656,7 +649,7 @@ msgstr ""
 "bancarias y las monedas (y derechos a cobrar) individuales que fueron "
 "depositadas."
 
-#: developers.html.j2:247
+#: developers.html.j2:234
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -673,7 +666,7 @@ msgstr ""
 "que su saldo bancario coincida con el valor total de las monedas que "
 "permanecen en circulación."
 
-#: developers.html.j2:262
+#: developers.html.j2:249
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -931,8 +924,12 @@ msgid "exchange"
 msgstr "Plataforma de intercambio"
 
 #: glossary.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "Taler's payment service provider. Issues eletronic `coins` during "
+#| "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgid ""
-"Taler's payment service provider. Issues eletronic `coins` during "
+"Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 "Proveedor de servicios de pago basado en Taler. Emite `monedas` electrónicas "
@@ -1792,9 +1789,14 @@ msgid "Flexible"
 msgstr "Flexible"
 
 #: merchants.html.j2:92
+#, fuzzy
+#| msgid ""
+#| "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."
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
-"Bitcoins) and any amount, limited only by applicable regulatation and what "
+"Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 "Taler se puede utilizar en diferentes monedas (como euros, dólares "
@@ -1965,3 +1967,15 @@ msgstr "Introducción para desarrolladores"
 #: common/navigation.j2.inc:15
 msgid "Copyright for Contributors"
 msgstr "Copyright para contribuidores"
+
+#~ msgid "Performance Analysis"
+#~ msgstr "Performance"
+
+#~ 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 ""
+#~ "Usamos <a href=\"https://gnunet.org/gauger\">Gauger</a> para el análisis "
+#~ "regresivo de rendimiento de backend de la plataforma de intercambio en <a "
+#~ "href=\"https://gauger.taler.net/\">gauger.taler.net</a>."
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index f3968a4..0009425 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-12-28 20:16+0100\n"
+"POT-Creation-Date: 2018-05-09 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fr <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Principalement inoffensif"
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:47 about.html.j2:62
+#: about.html.j2:47
 msgid "Software engineer."
 msgstr ""
 
@@ -65,35 +65,35 @@ msgstr "Basse fréquence"
 msgid "Software engineer. Works on libebics."
 msgstr "EBICS."
 
-#: about.html.j2:68 about.html.j2:72 about.html.j2:76
+#: about.html.j2:64 about.html.j2:68 about.html.j2:72
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traductrice"
 
-#: about.html.j2:82 about.html.j2:86 about.html.j2:90
+#: about.html.j2:78 about.html.j2:82 about.html.j2:86
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traductrice"
 
-#: about.html.j2:94
+#: about.html.j2:90
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traductrice"
 
-#: about.html.j2:100
+#: about.html.j2:96
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:104
+#: about.html.j2:100
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:108
+#: about.html.j2:104
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Linux, FreeBSD, sites Web et en état profond de détente."
 
-#: about.html.j2:114
+#: about.html.j2:110
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
@@ -176,8 +176,8 @@ msgstr ""
 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."
+"worry about crypto-currency related value fluctuations. Banking with Taler "
+"is subject to the usual government protections for financial services."
 msgstr ""
 
 #: citizens.html.j2:79
@@ -411,35 +411,24 @@ msgid ""
 "\"https://lcov.taler.net/\">lcov.taler.net</a>."
 msgstr ""
 
-#: developers.html.j2:126
-msgid "Performance Analysis"
-msgstr "Analyse de performances"
-
-#: developers.html.j2:129
-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 ""
-
-#: developers.html.j2:145
+#: developers.html.j2:132
 msgid "Taler system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:148
+#: developers.html.j2:135
 msgid ""
 "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:155
+#: developers.html.j2:142
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Vue d'ensemble de Taler"
 
-#: developers.html.j2:158
+#: developers.html.j2:145
 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 "
@@ -447,7 +436,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:170
+#: developers.html.j2:157
 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 "
@@ -459,7 +448,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:188
+#: developers.html.j2:175
 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 "
@@ -474,7 +463,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:210
+#: developers.html.j2:197
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -488,7 +477,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:233
+#: developers.html.j2:220
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -497,7 +486,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:247
+#: developers.html.j2:234
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -507,7 +496,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:262
+#: developers.html.j2:249
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -709,7 +698,7 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider. Issues eletronic `coins` during "
+"Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
@@ -1345,7 +1334,7 @@ msgstr "Flexible"
 #: merchants.html.j2:92
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
-"Bitcoins) and any amount, limited only by applicable regulatation and what "
+"Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 
@@ -1495,5 +1484,8 @@ msgstr ""
 msgid "Copyright for Contributors"
 msgstr ""
 
+#~ msgid "Performance Analysis"
+#~ msgstr "Analyse de performances"
+
 #~ msgid "Translator (Deutsch)"
 #~ msgstr "Traducteur"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 7fbd840..ca94402 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-12-28 20:16+0100\n"
+"POT-Creation-Date: 2018-05-09 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: it <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgid "PhD Student, Inria.."
 msgstr ""
 "Dottorando a Inria Rennes.. Programmatore e architetto del protocollo Taler."
 
-#: about.html.j2:47 about.html.j2:62
+#: about.html.j2:47
 msgid "Software engineer."
 msgstr "Programmatore."
 
@@ -68,37 +68,37 @@ msgstr "Sviluppo di business sostenibile."
 msgid "Software engineer. Works on libebics."
 msgstr "Programmatore. Attualmente coinvolto in libebics."
 
-#: about.html.j2:68 about.html.j2:72 about.html.j2:76
+#: about.html.j2:64 about.html.j2:68 about.html.j2:72
 #, fuzzy
 msgid "Translator (Spanish)"
 msgstr "Traduttore per lo spagnolo."
 
-#: about.html.j2:82 about.html.j2:86 about.html.j2:90
+#: about.html.j2:78 about.html.j2:82 about.html.j2:86
 #, fuzzy
 msgid "Translator (Italian)"
 msgstr "Traduttrice per l'italiano."
 
-#: about.html.j2:94
+#: about.html.j2:90
 #, fuzzy
 msgid "Translator (German)"
 msgstr "Traduttore per lo spagnolo."
 
-#: about.html.j2:100
+#: about.html.j2:96
 msgid "Hardware security module"
 msgstr "Sicurezza hardware."
 
-#: about.html.j2:104
+#: about.html.j2:100
 msgid "Risk management"
 msgstr "Gestione del rischio."
 
-#: about.html.j2:108
+#: about.html.j2:104
 #, fuzzy
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 "Dottorando alla TU di Monaco di Baviera. Linux, FreeBSD, siti web e il deep "
 "state nel tempo libero."
 
-#: about.html.j2:114
+#: about.html.j2:110
 msgid "Software engineer. Works on Android wallet."
 msgstr "Programmatore. Attualmente dedicato al portafoglio Android."
 
@@ -198,11 +198,18 @@ msgid "Stable"
 msgstr "Stabile"
 
 #: citizens.html.j2:63
+#, fuzzy
+#| 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."
 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."
+"worry about crypto-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 portafoglio fisico. Taler non è una nuova valuta, "
@@ -532,25 +539,11 @@ msgstr ""
 "disponibili al seguente link <a href=\"https://lcov.taler.net/\">lcov.taler."
 "net</a>."
 
-#: developers.html.j2:126
-msgid "Performance Analysis"
-msgstr "Analisi delle prestazioni"
-
-#: developers.html.j2:129
-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 ""
-"Ci serviamo di <a href=\"https://gnunet.org/gauger\">Gauger</a> per "
-"l'analisi dalla regressione delle prestazioni del backend di scambio al "
-"seguente link <a href=\"https://gauger.taler.net/\"gauger.taler.net</a>."
-
-#: developers.html.j2:145
+#: developers.html.j2:132
 msgid "Taler system overview"
 msgstr "Panoramica del sistema Taler"
 
-#: developers.html.j2:148
+#: developers.html.j2:135
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -560,13 +553,13 @@ msgstr ""
 "mostrato nell'illustrazione a destra. Le transazioni tipiche comportano le "
 "seguenti operazioni:"
 
-#: developers.html.j2:155
+#: developers.html.j2:142
 #, fuzzy
 #| msgid "Taler system overview"
 msgid "system overview"
 msgstr "Panoramica del sistema"
 
-#: developers.html.j2:158
+#: developers.html.j2:145
 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 "
@@ -578,7 +571,7 @@ msgstr ""
 "include un token di autenticazione dal suo <b>portafoglio</b> elettronico. "
 "Nella terminologia di Taler, il cliente crea una riserva al cambio."
 
-#: developers.html.j2:170
+#: developers.html.j2:157
 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 "
@@ -599,7 +592,7 @@ msgstr ""
 "valore totale dei fondi (ad eccezione delle commissioni che il cambio può "
 "addebitare per il servizio)."
 
-#: developers.html.j2:188
+#: developers.html.j2:175
 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 "
@@ -626,7 +619,7 @@ msgstr ""
 "piccola parte delle sue monete digitali (il sistema pensa ai clienti che "
 "ricevono del resto)."
 
-#: developers.html.j2:210
+#: developers.html.j2:197
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -651,7 +644,7 @@ msgstr ""
 "database del cambio consente allo Stato di far rispettare ai commercianti di "
 "pagare le imposte vigenti (e di non impegnarsi in contratti illegali)."
 
-#: developers.html.j2:233
+#: developers.html.j2:220
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -666,7 +659,7 @@ msgstr ""
 "relazione tra i trasferimenti bancari e le singole richieste di risarcimento "
 "che erano state depositate."
 
-#: developers.html.j2:247
+#: developers.html.j2:234
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -682,7 +675,7 @@ msgstr ""
 "frequentemente i database del cambio e controllare che il suo saldo bancario "
 "corrisponda al valore totale delle monete restanti in circolazione."
 
-#: developers.html.j2:262
+#: developers.html.j2:249
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -937,8 +930,12 @@ msgid "exchange"
 msgstr "cambio"
 
 #: glossary.html.j2:56
+#, fuzzy
+#| msgid ""
+#| "Taler's payment service provider. Issues eletronic `coins` during "
+#| "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgid ""
-"Taler's payment service provider. Issues eletronic `coins` during "
+"Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 "il fornitore dei servizi di pagamento di Taler. Emette le 'monete' "
@@ -1813,7 +1810,7 @@ msgstr "Flessibile"
 #| "denominations the payment service provider supports."
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
-"Bitcoins) and any amount, limited only by applicable regulatation and what "
+"Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 "Taler può essere utilizzato per diverse valute (come Euro, Dollari USA o "
@@ -1986,3 +1983,15 @@ msgstr "Introduzione per i programmatori"
 #: common/navigation.j2.inc:15
 msgid "Copyright for Contributors"
 msgstr "Diritti d'autore per i collaboratori"
+
+#~ msgid "Performance Analysis"
+#~ msgstr "Analisi delle prestazioni"
+
+#~ 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 ""
+#~ "Ci serviamo di <a href=\"https://gnunet.org/gauger\">Gauger</a> per "
+#~ "l'analisi dalla regressione delle prestazioni del backend di scambio al "
+#~ "seguente link <a href=\"https://gauger.taler.net/\"gauger.taler.net</a>."
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 44f2918..a30622a 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU taler master\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-01-28 15:33-0200\n"
+"POT-Creation-Date: 2018-05-09 12:10+0200\n"
 "PO-Revision-Date: 2018-01-28 15:27-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "PhD Student, Inria.."
 msgstr "Estudante de PhD, Inria."
 
-#: about.html.j2:47 about.html.j2:62
+#: about.html.j2:47
 msgid "Software engineer."
 msgstr "Engenheiro de software."
 
@@ -67,31 +67,31 @@ msgstr "Desenvolvimento empresarial sustentável."
 msgid "Software engineer. Works on libebics."
 msgstr "Engenheiro de software. Funciona em libebics."
 
-#: about.html.j2:68 about.html.j2:72 about.html.j2:76
+#: about.html.j2:64 about.html.j2:68 about.html.j2:72
 msgid "Translator (Spanish)"
 msgstr "Tradutor (Espanhol)"
 
-#: about.html.j2:82 about.html.j2:86 about.html.j2:90
+#: about.html.j2:78 about.html.j2:82 about.html.j2:86
 msgid "Translator (Italian)"
 msgstr "Tradutor (Italiano)"
 
-#: about.html.j2:94
+#: about.html.j2:90
 msgid "Translator (German)"
 msgstr "Tradutor (Alemão)"
 
-#: about.html.j2:100
+#: about.html.j2:96
 msgid "Hardware security module"
 msgstr "Módulo de segurança de hardware"
 
-#: about.html.j2:104
+#: about.html.j2:100
 msgid "Risk management"
 msgstr "Gerenciamento de risco"
 
-#: about.html.j2:108
+#: about.html.j2:104
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr "Estudante PhD, Universidade Técnica de Munique. Atualmente lecionando."
 
-#: about.html.j2:114
+#: about.html.j2:110
 msgid "Software engineer. Works on Android wallet."
 msgstr "Engenheiro de software. Funciona em carteira (wallet) do Android."
 
@@ -515,25 +515,11 @@ msgstr ""
 "para analisar a cobertura do código de nossos testes, os resultados estão "
 "disponíveis em <a href=\"https://lcov.taler.net/\">lcov.taler.net</a>."
 
-#: developers.html.j2:126
-msgid "Performance Analysis"
-msgstr "Análise de desempenho"
-
-#: developers.html.j2:129
-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 ""
-"Usamos <a href=\"https://gnunet.org/gauger\">Gauger</a> para análise de "
-"regressão de desempenho do backend do câmbio em <a href=\"https://gauger."
-"taler.net/\">gauger.taler.net</a>."
-
-#: developers.html.j2:145
+#: developers.html.j2:132
 msgid "Taler system overview"
 msgstr "Visão geral do sistema Taler"
 
-#: developers.html.j2:148
+#: developers.html.j2:135
 msgid ""
 "The Taler system consists of protocols executed among a number of actors as "
 "illustrated in the illustration on the right. Typical transactions involve "
@@ -543,11 +529,11 @@ msgstr ""
 "ilustrado na ilustração à direita. As transações típicas envolvem as "
 "seguintes etapas:"
 
-#: developers.html.j2:155
+#: developers.html.j2:142
 msgid "system overview"
 msgstr "visão geral do sistema"
 
-#: developers.html.j2:158
+#: developers.html.j2:145
 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 "
@@ -559,7 +545,7 @@ msgstr ""
 "inclui um token de autenticação de sua <b>carteira</b> eletrônica. Na "
 "terminologia do Taler, o cliente cria uma reserva no câmbio."
 
-#: developers.html.j2:170
+#: developers.html.j2:157
 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 "
@@ -579,7 +565,7 @@ msgstr ""
 "moeda ou o valor total dos fundos (exceto as taxas que a bolsa pode cobrar "
 "pelo serviço)."
 
-#: developers.html.j2:188
+#: developers.html.j2:175
 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 "
@@ -605,7 +591,7 @@ msgstr ""
 "gastar qualquer fração de suas moedas digitais (o sistema cuida dos clientes "
 "obtendo troco)."
 
-#: developers.html.j2:210
+#: developers.html.j2:197
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -630,7 +616,7 @@ msgstr ""
 "que o Estado imponha que os comerciantes paguem tributos aplicáveis (e não "
 "se envolvam em contratos ilegais)."
 
-#: developers.html.j2:233
+#: developers.html.j2:220
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -645,7 +631,7 @@ msgstr ""
 "entre as transferências bancárias e as reivindicações individuais que foram "
 "depositadas."
 
-#: developers.html.j2:247
+#: developers.html.j2:234
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -661,7 +647,7 @@ msgstr ""
 "câmbio e verificar se o saldo bancário corresponde ao valor total das moedas "
 "restantes em circulação."
 
-#: developers.html.j2:262
+#: developers.html.j2:249
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -1926,3 +1912,15 @@ msgstr "Introdução para desenvolvedores"
 #: common/navigation.j2.inc:15
 msgid "Copyright for Contributors"
 msgstr "Direitos autorais para contribuidores"
+
+#~ msgid "Performance Analysis"
+#~ msgstr "Análise de desempenho"
+
+#~ 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 ""
+#~ "Usamos <a href=\"https://gnunet.org/gauger\">Gauger</a> para análise de "
+#~ "regressão de desempenho do backend do câmbio em <a href=\"https://gauger."
+#~ "taler.net/\">gauger.taler.net</a>."
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index fec7692..3008273 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-12-28 20:16+0100\n"
+"POT-Creation-Date: 2018-05-09 12:10+0200\n"
 "PO-Revision-Date: 2017-12-29 11:14+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ru <LL@li.org>\n"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "PhD Student, Inria.."
 msgstr ""
 
-#: about.html.j2:47 about.html.j2:62
+#: about.html.j2:47
 msgid "Software engineer."
 msgstr ""
 
@@ -63,31 +63,31 @@ msgstr ""
 msgid "Software engineer. Works on libebics."
 msgstr ""
 
-#: about.html.j2:68 about.html.j2:72 about.html.j2:76
+#: about.html.j2:64 about.html.j2:68 about.html.j2:72
 msgid "Translator (Spanish)"
 msgstr ""
 
-#: about.html.j2:82 about.html.j2:86 about.html.j2:90
+#: about.html.j2:78 about.html.j2:82 about.html.j2:86
 msgid "Translator (Italian)"
 msgstr ""
 
-#: about.html.j2:94
+#: about.html.j2:90
 msgid "Translator (German)"
 msgstr ""
 
-#: about.html.j2:100
+#: about.html.j2:96
 msgid "Hardware security module"
 msgstr ""
 
-#: about.html.j2:104
+#: about.html.j2:100
 msgid "Risk management"
 msgstr ""
 
-#: about.html.j2:108
+#: about.html.j2:104
 msgid "PhD student, TU Munich. Currently teaching."
 msgstr ""
 
-#: about.html.j2:114
+#: about.html.j2:110
 msgid "Software engineer. Works on Android wallet."
 msgstr ""
 
@@ -170,8 +170,8 @@ msgstr ""
 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."
+"worry about crypto-currency related value fluctuations. Banking with Taler "
+"is subject to the usual government protections for financial services."
 msgstr ""
 
 #: citizens.html.j2:79
@@ -405,33 +405,22 @@ msgid ""
 "\"https://lcov.taler.net/\">lcov.taler.net</a>."
 msgstr ""
 
-#: developers.html.j2:126
-msgid "Performance Analysis"
-msgstr ""
-
-#: developers.html.j2:129
-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 ""
-
-#: developers.html.j2:145
+#: developers.html.j2:132
 msgid "Taler system overview"
 msgstr ""
 
-#: developers.html.j2:148
+#: developers.html.j2:135
 msgid ""
 "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:155
+#: developers.html.j2:142
 msgid "system overview"
 msgstr ""
 
-#: developers.html.j2:158
+#: developers.html.j2:145
 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 "
@@ -439,7 +428,7 @@ msgid ""
 "terminology, the customer creates a reserve at the exchange."
 msgstr ""
 
-#: developers.html.j2:170
+#: developers.html.j2:157
 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 "
@@ -451,7 +440,7 @@ msgid ""
 "the exchange may charge for the service)."
 msgstr ""
 
-#: developers.html.j2:188
+#: developers.html.j2:175
 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 "
@@ -466,7 +455,7 @@ msgid ""
 "change)."
 msgstr ""
 
-#: developers.html.j2:210
+#: developers.html.j2:197
 msgid ""
 "Merchants receiving digital coins <b>deposit</b> the respective claims that "
 "resulted from the contract signing with the customer at the exchange to "
@@ -480,7 +469,7 @@ msgid ""
 "that merchants pay applicable taxes (and do not engage in illegal contracts)."
 msgstr ""
 
-#: developers.html.j2:233
+#: developers.html.j2:220
 msgid ""
 "Finally, the exchange transfers funds corresponding to the digital coins "
 "redeemed by the merchants to the merchant's <b>bank</b> account. The "
@@ -489,7 +478,7 @@ msgid ""
 "the bank transfers and the individual claims that were deposited."
 msgstr ""
 
-#: developers.html.j2:247
+#: developers.html.j2:234
 msgid ""
 "Most importantly, the exchange keeps cryptographic proofs that allow it to "
 "demonstrate that it is operating correctly to third parties. The system "
@@ -499,7 +488,7 @@ msgid ""
 "in circulation."
 msgstr ""
 
-#: developers.html.j2:262
+#: developers.html.j2:249
 msgid ""
 "Without the auditor, the exchange operators could embezzle funds they are "
 "holding in reserve. Customers and merchants cannot cheat each other or the "
@@ -701,7 +690,7 @@ msgstr ""
 
 #: glossary.html.j2:56
 msgid ""
-"Taler's payment service provider. Issues eletronic `coins` during "
+"Taler's payment service provider. Issues electronic `coins` during "
 "`withdrawal` and redeems them when they are `deposited` by merchants."
 msgstr ""
 
@@ -1075,7 +1064,7 @@ msgstr ""
 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://"
+"2018. 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"
 "\">documentation</a>."
 msgstr ""
@@ -1337,7 +1326,7 @@ msgstr ""
 #: merchants.html.j2:92
 msgid ""
 "Taler can be used for different currencies (such as Euros, US Dollars or "
-"Bitcoins) and any amount, limited only by applicable regulatation and what "
+"Bitcoins) and any amount, limited only by applicable regulation and what "
 "denominations the payment service provider supports."
 msgstr ""
 
diff --git a/web-common b/web-common
-Subproject caf5a98114402d057ba08b14279eb8e46481a02
+Subproject 357a9df65bf5afbf2eb621ac3afc84495021a1b