Merge branch 'stable' of ssh://git.gnunet.org/www into stable

23 files changed, 2350 insertions, 2224 deletions

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 33c5e107..8384a6ca 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -64,7 +64,11 @@
           <li><a class="dropdown-item" href="architecture.html">{{ _("System Architecture") }}</a></li>
           <li><a class="dropdown-item" href="https://bugs.gnunet.org" target="_blank">{{ _("Bug Tracker") }}</a></li>
           <li><a class="dropdown-item" href="https://git.gnunet.org" target="_blank">{{ _("Source Code") }}</a></li>
+          <!-- 
+          /* Until there is no functional CI we don't show this */
           <li><a class="dropdown-item" href="https://gitlab.gnunet.org/" target="_blank">{{ _("Continuous Integration") }}</a></li>
+          -->
+          <li><a class="dropdown-item" target="_blank" href="https://tutorial.gnunet.org/">{{ _("Development Tutorial") }}</a></li>
           <li><a class="dropdown-item" href="gnurl.html">libgnurl</a></li>
         </ul>
       </li>
@@ -84,9 +88,8 @@
           <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") }}</a></li>
           <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org">{{ _("Handbook") }}</a></li>
     <li><a class="dropdown-item" target="_blank" href="https://rest.gnunet.org">{{ _("REST API") }}</a></li>
-          <li><a class="dropdown-item" target="_blank" href="https://tutorial.gnunet.org/">{{ _("C-Tutorial") }}</a></li>
           <li><a class="dropdown-item" href="faq.html">{{ _("FAQ") }}</a></li>
-          <li><a class="dropdown-item" href="https://bib.gnunet.org/" target="_blank">{{ _("Bibliography") }}</a></li>
+          <li><a class="dropdown-item" href="https://bib.gnunet.org/date.html" target="_blank">{{ _("Bibliography") }}</a></li>
         </ul>
       </li>
     </ul>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 72590d9c..1e18398b 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-01 15:53+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+0200\n"
 "PO-Revision-Date: 2018-02-24 17:42\n"
 "Last-Translator: Torsten Grothoff <torsten@grothoff.org>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -55,11 +55,11 @@ msgstr "IRC Archive"
 msgid "Copyright Assignment"
 msgstr "Copyright Übertragung"
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
 msgid "Continuous Integration"
 msgstr "Kontinuierliche Integration"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografie"
@@ -119,44 +119,46 @@ msgstr "Entwicklung"
 msgid "System Architecture"
 msgstr "Systemarchitektur"
 
-#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:126
 msgid "Source Code"
 msgstr "Quellkode"
 
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+#, fuzzy
+#| msgid "Development"
+msgid "Development Tutorial"
+msgstr "Entwicklung"
+
+#: common/navigation.j2.inc:82
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Installieren"
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
 msgid "Use"
 msgstr "Nutzen"
 
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
 msgid "Videos"
 msgstr "Videos"
 
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glossar"
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
 msgid "Handbook"
 msgstr "Handbuch"
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
 msgid "REST API"
 msgstr "REST API"
 
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr "C-Anleitung"
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -301,8 +303,8 @@ msgstr ""
 #: template/about.html.j2:100
 msgid ""
 "Please be aware that this project is (despite of it's age) still in an early "
-"alpha stage when it comes to software – its not an easy task to rewrite the "
-"whole Internet!"
+"alpha stage when it comes to software &#8211; its not an easy task to "
+"rewrite the whole Internet!"
 msgstr ""
 
 #: template/about.html.j2:105
@@ -535,7 +537,7 @@ msgid ""
 "org/gauger/\">https://old.gnunet.org/gauger/</a>."
 msgstr ""
 
-#: template/download.html.j2:7 template/gnurl.html.j2:138
+#: template/download.html.j2:7 template/gnurl.html.j2:140
 msgid "Downloads"
 msgstr "Herunterladen"
 
@@ -576,7 +578,13 @@ msgstr ""
 msgid "Verein zur F&ouml;rderung von GNUnet e.V."
 msgstr "Verein zur Förderung von GNUnet e.V."
 
-#: template/ev.html.j2:12
+#: template/ev.html.j2:11
+#, fuzzy
+#| msgid "About GNUnet"
+msgid "About GNUnet e.V."
+msgstr "Über GNUnet"
+
+#: template/ev.html.j2:13
 msgid ""
 "On December 27th 2013 a group of GNUnet hackers met at 30c3 to create the "
 "\"Verein zur F&ouml;rderung von GNUnet e.V.\", an association under German "
@@ -584,18 +592,35 @@ msgid ""
 "the association on the 7th of March under VR 205287."
 msgstr ""
 
-#: template/ev.html.j2:21
+#: template/ev.html.j2:22
 msgid ""
 "The association is officially dedicated to supporting research, development "
 "and education in the area of secure decentralized networking in general, and "
 "GNUnet specifically. This is the official website for the association."
 msgstr ""
 
+#: template/ev.html.j2:31
+msgid "Becoming a Member of GNUnet e.V."
+msgstr "Ein Mitglied von GNUnet e.V. werden"
+
 #: template/ev.html.j2:33
+msgid ""
+"GNUnet developers with git (write) access can become members to participate "
+"in the decision process and formally support GNUnet e.V. For this, all you "
+"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
+"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
+"membership dues; however, members are required to support GNUnet e.V. and in "
+"particularly contribute to the technical development within their means. For "
+"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
+"git/\">Satzung</a> (currently only available in German, translations "
+"welcome)."
+msgstr ""
+
+#: template/ev.html.j2:52
 msgid "Governance"
 msgstr "Führung"
 
-#: template/ev.html.j2:35
+#: template/ev.html.j2:54
 msgid ""
 "You can find our \"Satzung\", and the list of members under <a href="
 "\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet."
@@ -606,28 +631,19 @@ msgid ""
 "dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:52
-msgid "Becoming a Member of GNUnet e.V."
-msgstr "Ein Mitglied von GNUnet e.V. werden"
+#: template/ev.html.j2:71
+msgid "Official Meeting Notes"
+msgstr "Offizielle Protokolle"
 
-#: template/ev.html.j2:54
-msgid ""
-"GNUnet developers with git (write) access can become members to participate "
-"in the decision process and formally support GNUnet e.V. For this, all you "
-"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
-"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
-"membership dues; however, members are required to support GNUnet e.V. and in "
-"particularly contribute to the technical development within their means. For "
-"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
-"git/\">Satzung</a> (currently only available in German, translations "
-"welcome)."
-msgstr ""
+#: template/ev.html.j2:74
+msgid "2013-12 (constitutional meeting)"
+msgstr "2013-12 (Gründungstreffen)"
 
-#: template/ev.html.j2:73
+#: template/ev.html.j2:99
 msgid "Support Us!"
 msgstr "Unterstützung anbieten!"
 
-#: template/ev.html.j2:75
+#: template/ev.html.j2:101
 msgid ""
 "Everybody is welcome to support us via donations. For financial "
 "contributions, Europeans are able to donate via SEPA. We hope to setup "
@@ -640,14 +656,6 @@ msgid ""
 "<dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:94
-msgid "Official Meeting Notes"
-msgstr "Offizielle Protokolle"
-
-#: template/ev.html.j2:97
-msgid "2013-12 (constitutional meeting)"
-msgstr "2013-12 (Gründungstreffen)"
-
 #: template/faq.html.j2:12
 msgid ""
 "I receive many &quot;WARNING Calculated flow delay for X at Y for Z&quot;. "
@@ -758,7 +766,7 @@ msgid ""
 "with egos."
 msgstr ""
 
-#: template/gnurl.html.j2:7
+#: template/gnurl.html.j2:11
 msgid ""
 "libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
 "HTTP and HTTPS (and only HTTP 1.x) with a single crypto backend (GnuTLS) to "
@@ -770,11 +778,11 @@ msgid ""
 "to get a proper build of libgnurl."
 msgstr ""
 
-#: template/gnurl.html.j2:22
+#: template/gnurl.html.j2:26
 msgid "Motivation"
 msgstr "Motivation"
 
-#: template/gnurl.html.j2:24
+#: template/gnurl.html.j2:28
 msgid ""
 "cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
 "other variants are used by some distributions. Supporting other crypto "
@@ -786,7 +794,7 @@ msgid ""
 "the bugs that arise might be rather subtle."
 msgstr ""
 
-#: template/gnurl.html.j2:37
+#: template/gnurl.html.j2:41
 msgid ""
 "For GNUnet, we also need a particularly modern version of GnuTLS. Thus, it "
 "would anyway be necessary to recompile cURL for GNUnet. But what happens if "
@@ -808,7 +816,7 @@ msgid ""
 "that code."
 msgstr ""
 
-#: template/gnurl.html.j2:61
+#: template/gnurl.html.j2:65
 msgid ""
 "So to use a modern version of GnuTLS, a sane approach is to disable all of "
 "the \"optional\" features of cURL that drag in system libraries that link "
@@ -822,11 +830,11 @@ msgid ""
 "this can really be trivially fixed by the cURL developers."
 msgstr ""
 
-#: template/gnurl.html.j2:75
+#: template/gnurl.html.j2:79
 msgid "Rename to fix"
 msgstr "Umbenenung als Lösung"
 
-#: template/gnurl.html.j2:77
+#: template/gnurl.html.j2:81
 #, python-format
 msgid ""
 "How does forking fix it? Easy. First, we can get rid of all of the "
@@ -845,11 +853,11 @@ msgid ""
 "new release."
 msgstr ""
 
-#: template/gnurl.html.j2:95
+#: template/gnurl.html.j2:99
 msgid "Using libgnurl"
 msgstr "Benutzung von libgnurl"
 
-#: template/gnurl.html.j2:97
+#: template/gnurl.html.j2:101
 msgid ""
 "Projects that use cURL only for HTTP/HTTPS and that would work with GnuTLS "
 "should be able to switch to libgnurl by changing \"-lcurl\" to \"-lgnurl\". "
@@ -860,18 +868,18 @@ msgid ""
 "the original curl source have been written."
 msgstr ""
 
-#: template/gnurl.html.j2:109
+#: template/gnurl.html.j2:113
 msgid "Gotchas"
 msgstr "Aufgepasst!"
 
-#: template/gnurl.html.j2:111
+#: template/gnurl.html.j2:115
 msgid ""
 "libgnurl and gnurl are not intended to be used as a replacement for curl for "
 "users. Since no conflicts in filenames should occur you are not expected to "
 "remove curl to make use of gnurl and viceversa."
 msgstr ""
 
-#: template/gnurl.html.j2:126
+#: template/gnurl.html.j2:128
 msgid ""
 "You can get the Gnurl Git repository using: <!-- https://bugs.gnunet.org/"
 "view.php?id=5483 ! <code>git clone https://git.taler.net/gnurl.git</code> --"
@@ -879,7 +887,7 @@ msgid ""
 "checked in as signed git tags."
 msgstr ""
 
-#: template/gnurl.html.j2:140
+#: template/gnurl.html.j2:142
 msgid ""
 "Releases are published on <a href=\"https://ftp.gnu.org/gnu/gnunet/\">ftp."
 "gnu.org/gnu/gnunet</a>. gnURL is available from within a variety of "
@@ -892,22 +900,22 @@ msgid ""
 "\">pkgsrc</a>."
 msgstr ""
 
-#: template/gnurl.html.j2:154
+#: template/gnurl.html.j2:157
 msgid "Reporting Bugs"
 msgstr "Fehler melden"
 
-#: template/gnurl.html.j2:156
+#: template/gnurl.html.j2:159
 msgid ""
 "You can report bugs on our bug tracker: <a href=\"https://bugs.gnunet.org/"
 "\">bugs.gnunet.org</a>. Alternatively you can use our bug mailinglist, but "
 "we prefer to track bugs on the bugtracker."
 msgstr ""
 
-#: template/gnurl.html.j2:165
+#: template/gnurl.html.j2:168
 msgid "Maintainer and Cryptographic signatures"
 msgstr ""
 
-#: template/gnurl.html.j2:167
+#: template/gnurl.html.j2:170
 msgid ""
 "gnurl/libgnurl is maintained by ng0. Releases are signed with the OpenPGP "
 "Key <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>, with the key "
@@ -1005,45 +1013,45 @@ msgstr ""
 msgid "GNUnet's Google Summer of Code projects"
 msgstr ""
 
-#: template/gsoc.html.j2:11
-msgid ""
-"As a GNU project, GNUnet has participated in the Google Summer of Code "
-"(GSoC) for a number of years. This page lists all current, past, and "
-"finished projects."
-msgstr ""
-
-#: template/gsoc.html.j2:23
+#: template/gsoc.html.j2:12
 #, fuzzy
 #| msgid "GSoC Projects"
 msgid "Current projects"
 msgstr "GSoC Projekte"
 
-#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+#: template/gsoc.html.j2:13 template/gsoc.html.j2:181
 msgid "Past projects"
 msgstr ""
 
-#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+#: template/gsoc.html.j2:14 template/gsoc.html.j2:569
 msgid "Finished projects"
 msgstr ""
 
-#: template/gsoc.html.j2:30
+#: template/gsoc.html.j2:21
+msgid ""
+"As a GNU project, GNUnet has participated in the Google Summer of Code "
+"(GSoC) for a number of years. This page lists all current, past, and "
+"finished projects."
+msgstr ""
+
+#: template/gsoc.html.j2:31
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:34
+#: template/gsoc.html.j2:35
 msgid ""
 "It is time for GNUnet to run properly on Android. Note that GNUnet is "
 "written in C, and this is not about rewriting GNUnet in Java, but about "
 "getting the C code to run on Android."
 msgstr ""
 
-#: template/gsoc.html.j2:41
+#: template/gsoc.html.j2:42
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:50
+#: template/gsoc.html.j2:51
 msgid ""
 "There is a push for migrating our CI to Gitlab. The CI should eventually not "
 "just run \"make check\" on various platforms, but also perform tests with "
@@ -1054,11 +1062,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:62
+#: template/gsoc.html.j2:63
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:71
+#: template/gsoc.html.j2:72
 msgid ""
 "Python 2.7 is reaching its end-of-life, and we want to get rid of the "
 "dependency on Python. The existing gnunet-qr tool is a rather simple wrapper "
@@ -1068,7 +1076,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:87
+#: template/gsoc.html.j2:88
 msgid ""
 "reclaimID is a decentralized identity system build on top of the GNU Name "
 "System. Upon authorization, the user provides a requesting party (RP) such "
@@ -1087,7 +1095,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:118
+#: template/gsoc.html.j2:119
 msgid ""
 "re:claimID is a decentralized identity system build on top of the GNU Name "
 "System. The initial design and implementation of re:claimID includes an "
@@ -1109,7 +1117,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:153
+#: template/gsoc.html.j2:154
 msgid ""
 "One great problem of the current Internet is the lack of disintermediation. "
 "When people want to talk they need a chat service. When they want to share "
@@ -1125,18 +1133,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:175
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:184
+#: template/gsoc.html.j2:185
 msgid ""
 "There are a variety of GNUNet APIs that should be exposed in the Rust "
 "wrappers. Implementing these will require extending the port of GNUNet utils "
 "written by Andrew Cann and Kelong Cong."
 msgstr ""
 
-#: template/gsoc.html.j2:192
+#: template/gsoc.html.j2:193
 msgid ""
 "As an introduction to the code base, we suggest that the student and Jeff "
 "Burdges together update the asynchronous IO system from gjio to futures-rs "
@@ -1144,26 +1152,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:202 template/gsoc.html.j2:226
-#: template/gsoc.html.j2:280 template/gsoc.html.j2:310
-#: template/gsoc.html.j2:554
+#: template/gsoc.html.j2:203 template/gsoc.html.j2:227
+#: template/gsoc.html.j2:281 template/gsoc.html.j2:311
+#: template/gsoc.html.j2:555
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:207
+#: template/gsoc.html.j2:208
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:212
+#: template/gsoc.html.j2:213
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:220
+#: template/gsoc.html.j2:221
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:231
+#: template/gsoc.html.j2:232
 msgid ""
 "Note: There was a Special TLDs spec to allow Tor to resolve domain names "
 "using GNS over Tor too, but currently that's on hold until folks think more "
@@ -1171,17 +1179,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
-#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
+#: template/gsoc.html.j2:241 template/gsoc.html.j2:415
+#: template/gsoc.html.j2:455 template/gsoc.html.j2:485
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
-#: template/gsoc.html.j2:594
+#: template/gsoc.html.j2:246 template/gsoc.html.j2:490
+#: template/gsoc.html.j2:595
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:253
+#: template/gsoc.html.j2:254
 msgid ""
 "Design and implementation of <a href=\"http://jsonapi.org/\">REST APIs</a> "
 "that expose the <a href=\"https://gnunet.org/doxygen/modules.html\">GNUnet "
@@ -1189,11 +1197,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
+#: template/gsoc.html.j2:265 template/gsoc.html.j2:585
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:272
+#: template/gsoc.html.j2:273
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1201,42 +1209,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:288
+#: template/gsoc.html.j2:289
 msgid ""
 "Implement rudimentary Android compatibility for GNUnet, in part by porting "
 "the GNUnet utils scheduler to act as a thin wrapper over libuv."
 msgstr ""
 
-#: template/gsoc.html.j2:295
+#: template/gsoc.html.j2:296
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
+#: template/gsoc.html.j2:304 template/gsoc.html.j2:548
 msgid ""
 "Implementation of a replacement for PANDA (see Pond) with better security, "
 "and maybe integration with the GNU Name System for key exchange."
 msgstr ""
 
-#: template/gsoc.html.j2:315
+#: template/gsoc.html.j2:316
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
-#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
+#: template/gsoc.html.j2:321 template/gsoc.html.j2:378
+#: template/gsoc.html.j2:420 template/gsoc.html.j2:460
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:329
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:334
+#: template/gsoc.html.j2:335
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:338
+#: template/gsoc.html.j2:339
 msgid ""
 "<ul> <li>File: generic file with comments</li> <li>Image: display an image "
 "with comments referencing a region of the image</li> <li>Sound: play a sound "
@@ -1246,11 +1254,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:349
+#: template/gsoc.html.j2:350
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:353
+#: template/gsoc.html.j2:354
 msgid ""
 "<ul> <li>Fork existing channels, reorganize people into new chatrooms or "
 "channels.</li> <li>Share a post (edit and repost something elsewhere, on a "
@@ -1259,21 +1267,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:363
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:367
+#: template/gsoc.html.j2:368
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:372
+#: template/gsoc.html.j2:373
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:385
+#: template/gsoc.html.j2:386
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1284,17 +1292,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:403
+#: template/gsoc.html.j2:404
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:410 template/gsoc.html.j2:450
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:426
+#: template/gsoc.html.j2:427
 msgid ""
 "<ul> <li> Emulate IMAP/SMTP protocols as necessary to transform traditional "
 "mail clients into secushare user interfaces. </li> <li> Think of ways to map "
@@ -1304,7 +1312,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:467
+#: template/gsoc.html.j2:468
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1313,33 +1321,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:479
+#: template/gsoc.html.j2:480
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:497
+#: template/gsoc.html.j2:498
 msgid ""
 "Implementation of additional transports to make GNUnet communication more "
 "robust in the presence of problematic networks: GNUnet-over-SMTP, GNUnet-"
 "over-DNS"
 msgstr ""
 
-#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
+#: template/gsoc.html.j2:505 template/gsoc.html.j2:519
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:512
+#: template/gsoc.html.j2:513
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:526
+#: template/gsoc.html.j2:527
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:534
+#: template/gsoc.html.j2:535
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1347,13 +1355,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:562
+#: template/gsoc.html.j2:563
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:574
+#: template/gsoc.html.j2:575
 msgid ""
 "Implementation of a Web-based UI for GNUnet similar to GNUnet-Gtk with a yet "
 "to be determined framework such as Angular2. This includes the design and "
@@ -1362,11 +1370,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:590
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:599
+#: template/gsoc.html.j2:600
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1535,7 +1543,7 @@ msgid ""
 "html\">install GNUnet</a>, <a href=\"https://gnunet.org/en/use.html\">use "
 "it</a> and <a href=\"https://gnunet.org/en/contribute.html\">contribute</a>. "
 "<br> Be aware that this project is still in an early alpha stage when it "
-"comes to software – its not an easy task to rewrite the whole Internet!"
+"comes to software &#8211; its not an easy task to rewrite the whole Internet!"
 msgstr ""
 
 #: template/index.html.j2:242
@@ -1630,127 +1638,127 @@ msgid ""
 "cryptographic protocols to verify keys."
 msgstr ""
 
-#: template/install-on-archpi.html.j2:5
+#: template/install-on-archpi.html.j2:6
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:12 template/install-on-debian9.html.j2:28
-#: template/install-on-macos.html.j2:14 template/install-on-netbsd.html.j2:17
-#: template/install-on-ubuntu1804.html.j2:28
+#: template/install-on-archpi.html.j2:15 template/install-on-debian9.html.j2:29
+#: template/install-on-macos.html.j2:17 template/install-on-netbsd.html.j2:19
+#: template/install-on-ubuntu1804.html.j2:26
 msgid "Requirements"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:35
+#: template/install-on-archpi.html.j2:38
 msgid "Get the Source Code"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:56
+#: template/install-on-archpi.html.j2:59
 msgid "Run"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:121
+#: template/install-on-archpi.html.j2:124
 msgid "Make sure, it works!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:5
+#: template/install-on-debian9.html.j2:6
 msgid "Tutorial: GNUnet on Debian 9"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:7
+#: template/install-on-debian9.html.j2:9
 #: template/install-on-ubuntu1804.html.j2:9
 msgid "Introduction"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:44
-#: template/install-on-ubuntu1804.html.j2:44
+#: template/install-on-debian9.html.j2:45
+#: template/install-on-ubuntu1804.html.j2:41
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:58 template/install-on-macos.html.j2:144
-#: template/install-on-netbsd.html.j2:222
-#: template/install-on-ubuntu1804.html.j2:57
+#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: template/install-on-netbsd.html.j2:224
+#: template/install-on-ubuntu1804.html.j2:53
 msgid "Get the source code"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:77 template/install-on-macos.html.j2:152
-#: template/install-on-netbsd.html.j2:230
-#: template/install-on-ubuntu1804.html.j2:67
+#: template/install-on-debian9.html.j2:78 template/install-on-macos.html.j2:155
+#: template/install-on-netbsd.html.j2:232
+#: template/install-on-ubuntu1804.html.j2:61
 msgid "Compile and Install"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:102
-#: template/install-on-macos.html.j2:164 template/install-on-netbsd.html.j2:240
-#: template/install-on-ubuntu1804.html.j2:78
+#: template/install-on-debian9.html.j2:103
+#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: template/install-on-ubuntu1804.html.j2:70
 msgid "Option 1: GNUnet for production / usage"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:114
-#: template/install-on-ubuntu1804.html.j2:90
+#: template/install-on-debian9.html.j2:115
+#: template/install-on-ubuntu1804.html.j2:80
 msgid "Option 2: GNUnet for development"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:125
+#: template/install-on-debian9.html.j2:126
 msgid "Option 3: gnunet-gtk"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:141
-#: template/install-on-ubuntu1804.html.j2:102
+#: template/install-on-debian9.html.j2:142
+#: template/install-on-ubuntu1804.html.j2:92
 msgid "Install GNUnet plugin for name resolution"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:195
-#: template/install-on-ubuntu1804.html.j2:141
+#: template/install-on-debian9.html.j2:196
+#: template/install-on-ubuntu1804.html.j2:129
 msgid "Configuration"
 msgstr ""
 
 #: template/install-on-debian9.html.j2:272
-#: template/install-on-ubuntu1804.html.j2:217
+#: template/install-on-ubuntu1804.html.j2:203
 #, fuzzy
 #| msgid "GNUnet"
 msgid "Use GNUnet!"
 msgstr "GNUnet"
 
-#: template/install-on-debian9.html.j2:278
-#: template/install-on-ubuntu1804.html.j2:224
+#: template/install-on-debian9.html.j2:277
+#: template/install-on-ubuntu1804.html.j2:208
 msgid "Uninstall GNUnet and its dependencies"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:294
-#: template/install-on-ubuntu1804.html.j2:242
+#: template/install-on-debian9.html.j2:293
+#: template/install-on-ubuntu1804.html.j2:224
 msgid "Troubleshooting"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:296
-#: template/install-on-ubuntu1804.html.j2:245
+#: template/install-on-debian9.html.j2:295
+#: template/install-on-ubuntu1804.html.j2:225
 msgid "You can't reach other people's nodes"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:332
-#: template/install-on-ubuntu1804.html.j2:276
+#: template/install-on-debian9.html.j2:331
+#: template/install-on-ubuntu1804.html.j2:256
 msgid "OMG you guys broke my internet"
 msgstr ""
 
-#: template/install-on-macos.html.j2:5
+#: template/install-on-macos.html.j2:6
 msgid "Tutorial: GNUnet on macOS 10.14 (Mojave)"
 msgstr ""
 
-#: template/install-on-macos.html.j2:21 template/install-on-netbsd.html.j2:28
+#: template/install-on-macos.html.j2:24 template/install-on-netbsd.html.j2:30
 msgid "Installation"
 msgstr ""
 
-#: template/install-on-macos.html.j2:39 template/install-on-netbsd.html.j2:100
+#: template/install-on-macos.html.j2:42 template/install-on-netbsd.html.j2:102
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:119 template/install-on-netbsd.html.j2:180
+#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
 msgid "Alternative: Installation from source"
 msgstr ""
 
-#: template/install-on-macos.html.j2:197 template/install-on-netbsd.html.j2:265
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
-#: template/install-on-netbsd.html.j2:5
+#: template/install-on-netbsd.html.j2:6
 msgid "Tutorial: GNUnet on NetBSD 8.0 CURRENT"
 msgstr ""
 
@@ -1763,20 +1771,19 @@ msgid ""
 "<p>The following GNUnet installation instructions help you building from "
 "source for your distribution.</p> <p><i>Please note that the installation "
 "process will get much easier once we have proper packages again (planned for "
-"winter 2019).</i></p>"
+"winter 2019).</i></p> <p>You have already installed GNUnet and want to use "
+"it? <a href=\"https://gnunet.org/en/use\">Check this out!</a> </p>"
 msgstr ""
 
-#: template/install.html.j2:15
+#: template/install.html.j2:19
 msgid ""
-"<p>You have already installed GNUnet and want to use it? <a href=\"https://"
-"gnunet.org/en/use\">Check this out!</a> </p> <p>Please be aware that this "
-"project is still in an early alpha stage when it comes to running software – "
-"its not an easy task to rewrite the whole Internet! We are happy to get your "
-"<a href=\"engage.html\">helping hand</a> anytime!</p> <p>Further information "
-"is available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
-"GNUnet-1\">handbook</a>.</p> <p>If you have any queries about the "
-"installation or the usage, please <a href=\"engage.html\">get in touch!</a></"
-"p>"
+"<p>Please be aware that this project is still in an early alpha stage when "
+"it comes to running software &#8211; its not an easy task to rewrite the "
+"whole Internet! We are happy to get your <a href=\"engage.html\">helping "
+"hand</a> anytime!</p> <p>Further information is available in our <a href="
+"\"https://docs.gnunet.org/#toc-Using-GNUnet-1\">handbook</a>.</p> <p>If you "
+"have any queries about the installation or the usage, please <a href="
+"\"engage.html\">get in touch!</a></p>"
 msgstr ""
 
 #: template/news.html.j2.inc:11
@@ -1865,40 +1872,58 @@ msgstr ""
 msgid "How to use GNUnet - in a nutshell"
 msgstr ""
 
-#: template/use.html.j2:18
-msgid "Make sure your GNUnet installation works..."
+#: template/use.html.j2:12 template/use.html.j2:64
+msgid "Filesharing"
 msgstr ""
 
-#: template/use.html.j2:33
-msgid "... and play around with it."
+#: template/use.html.j2:13
+msgid "CADET"
 msgstr ""
 
-#: template/use.html.j2:50
-msgid "Filesharing"
+#: template/use.html.j2:14
+msgid "Minimal Groupchat"
 msgstr ""
 
-#: template/use.html.j2:91
-msgid "CADET (and Chat)"
+#: template/use.html.j2:15
+msgid "GNS with CLI"
 msgstr ""
 
-#: template/use.html.j2:125
-msgid "Chatting with a (simple) client"
+#: template/use.html.j2:16
+msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:167
-msgid "Name resolution using GNS on the command line"
+#: template/use.html.j2:17 template/use.html.j2:332
+msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:239
-msgid "Name resolution using GNS with a browser"
+#: template/use.html.j2:18 template/use.html.j2:393
+#, fuzzy
+#| msgid "Motivation"
+msgid "Conversation"
+msgstr "Motivation"
+
+#: template/use.html.j2:32
+msgid "Make sure your GNUnet installation works..."
 msgstr ""
 
-#: template/use.html.j2:316
-msgid "VPN"
+#: template/use.html.j2:47
+msgid "... and play around with it."
 msgstr ""
 
-#: template/use.html.j2:377
-msgid "Conversation"
+#: template/use.html.j2:105
+msgid "CADET (and Chat)"
+msgstr ""
+
+#: template/use.html.j2:139
+msgid "Chatting with a (simple) client"
+msgstr ""
+
+#: template/use.html.j2:183
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:255
+msgid "Name resolution using GNS with a browser"
 msgstr ""
 
 #: template/video.html.j2:6
@@ -1941,6 +1966,9 @@ msgstr ""
 msgid "2010"
 msgstr ""
 
+#~ msgid "C-Tutorial"
+#~ msgstr "C-Anleitung"
+
 #~ msgid "We currently do not have any grants. All work is done by volunteers."
 #~ msgstr ""
 #~ "Wir haben im moment keine Zuwendung. Die ganze Arbeit wird von "
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 7035c2d4..52af3aae 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -34,11 +34,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -88,44 +88,44 @@ msgstr ""
 msgid "System Architecture"
 msgstr ""
 
-#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:126
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+msgid "Development Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:82
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr ""
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
 msgid "FAQ"
 msgstr ""
 
@@ -268,8 +268,8 @@ msgstr ""
 #: template/about.html.j2:100
 msgid ""
 "Please be aware that this project is (despite of it's age) still in an early "
-"alpha stage when it comes to software  its not an easy task to rewrite the "
-"whole Internet!"
+"alpha stage when it comes to software &#8211; its not an easy task to "
+"rewrite the whole Internet!"
 msgstr ""
 
 #: template/about.html.j2:105
@@ -486,7 +486,7 @@ msgid ""
 "org/gauger/\">https://old.gnunet.org/gauger/</a>."
 msgstr ""
 
-#: template/download.html.j2:7 template/gnurl.html.j2:138
+#: template/download.html.j2:7 template/gnurl.html.j2:140
 msgid "Downloads"
 msgstr ""
 
@@ -527,7 +527,11 @@ msgstr ""
 msgid "Verein zur F&ouml;rderung von GNUnet e.V."
 msgstr ""
 
-#: template/ev.html.j2:12
+#: template/ev.html.j2:11
+msgid "About GNUnet e.V."
+msgstr ""
+
+#: template/ev.html.j2:13
 msgid ""
 "On December 27th 2013 a group of GNUnet hackers met at 30c3 to create the "
 "\"Verein zur F&ouml;rderung von GNUnet e.V.\", an association under German "
@@ -535,18 +539,35 @@ msgid ""
 "the association on the 7th of March under VR 205287."
 msgstr ""
 
-#: template/ev.html.j2:21
+#: template/ev.html.j2:22
 msgid ""
 "The association is officially dedicated to supporting research, development "
 "and education in the area of secure decentralized networking in general, and "
 "GNUnet specifically. This is the official website for the association."
 msgstr ""
 
+#: template/ev.html.j2:31
+msgid "Becoming a Member of GNUnet e.V."
+msgstr ""
+
 #: template/ev.html.j2:33
+msgid ""
+"GNUnet developers with git (write) access can become members to participate "
+"in the decision process and formally support GNUnet e.V. For this, all you "
+"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
+"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
+"membership dues; however, members are required to support GNUnet e.V. and in "
+"particularly contribute to the technical development within their means. For "
+"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
+"git/\">Satzung</a> (currently only available in German, translations "
+"welcome)."
+msgstr ""
+
+#: template/ev.html.j2:52
 msgid "Governance"
 msgstr ""
 
-#: template/ev.html.j2:35
+#: template/ev.html.j2:54
 msgid ""
 "You can find our \"Satzung\", and the list of members under <a href="
 "\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet."
@@ -557,28 +578,19 @@ msgid ""
 "dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:52
-msgid "Becoming a Member of GNUnet e.V."
+#: template/ev.html.j2:71
+msgid "Official Meeting Notes"
 msgstr ""
 
-#: template/ev.html.j2:54
-msgid ""
-"GNUnet developers with git (write) access can become members to participate "
-"in the decision process and formally support GNUnet e.V. For this, all you "
-"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
-"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
-"membership dues; however, members are required to support GNUnet e.V. and in "
-"particularly contribute to the technical development within their means. For "
-"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
-"git/\">Satzung</a> (currently only available in German, translations "
-"welcome)."
+#: template/ev.html.j2:74
+msgid "2013-12 (constitutional meeting)"
 msgstr ""
 
-#: template/ev.html.j2:73
+#: template/ev.html.j2:99
 msgid "Support Us!"
 msgstr ""
 
-#: template/ev.html.j2:75
+#: template/ev.html.j2:101
 msgid ""
 "Everybody is welcome to support us via donations. For financial "
 "contributions, Europeans are able to donate via SEPA. We hope to setup "
@@ -591,14 +603,6 @@ msgid ""
 "<dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:94
-msgid "Official Meeting Notes"
-msgstr ""
-
-#: template/ev.html.j2:97
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
 #: template/faq.html.j2:12
 msgid ""
 "I receive many &quot;WARNING Calculated flow delay for X at Y for Z&quot;. "
@@ -709,7 +713,7 @@ msgid ""
 "with egos."
 msgstr ""
 
-#: template/gnurl.html.j2:7
+#: template/gnurl.html.j2:11
 msgid ""
 "libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
 "HTTP and HTTPS (and only HTTP 1.x) with a single crypto backend (GnuTLS) to "
@@ -721,11 +725,11 @@ msgid ""
 "to get a proper build of libgnurl."
 msgstr ""
 
-#: template/gnurl.html.j2:22
+#: template/gnurl.html.j2:26
 msgid "Motivation"
 msgstr ""
 
-#: template/gnurl.html.j2:24
+#: template/gnurl.html.j2:28
 msgid ""
 "cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
 "other variants are used by some distributions. Supporting other crypto "
@@ -737,7 +741,7 @@ msgid ""
 "the bugs that arise might be rather subtle."
 msgstr ""
 
-#: template/gnurl.html.j2:37
+#: template/gnurl.html.j2:41
 msgid ""
 "For GNUnet, we also need a particularly modern version of GnuTLS. Thus, it "
 "would anyway be necessary to recompile cURL for GNUnet. But what happens if "
@@ -759,7 +763,7 @@ msgid ""
 "that code."
 msgstr ""
 
-#: template/gnurl.html.j2:61
+#: template/gnurl.html.j2:65
 msgid ""
 "So to use a modern version of GnuTLS, a sane approach is to disable all of "
 "the \"optional\" features of cURL that drag in system libraries that link "
@@ -773,11 +777,11 @@ msgid ""
 "this can really be trivially fixed by the cURL developers."
 msgstr ""
 
-#: template/gnurl.html.j2:75
+#: template/gnurl.html.j2:79
 msgid "Rename to fix"
 msgstr ""
 
-#: template/gnurl.html.j2:77
+#: template/gnurl.html.j2:81
 #, python-format
 msgid ""
 "How does forking fix it? Easy. First, we can get rid of all of the "
@@ -796,11 +800,11 @@ msgid ""
 "new release."
 msgstr ""
 
-#: template/gnurl.html.j2:95
+#: template/gnurl.html.j2:99
 msgid "Using libgnurl"
 msgstr ""
 
-#: template/gnurl.html.j2:97
+#: template/gnurl.html.j2:101
 msgid ""
 "Projects that use cURL only for HTTP/HTTPS and that would work with GnuTLS "
 "should be able to switch to libgnurl by changing \"-lcurl\" to \"-lgnurl\". "
@@ -811,18 +815,18 @@ msgid ""
 "the original curl source have been written."
 msgstr ""
 
-#: template/gnurl.html.j2:109
+#: template/gnurl.html.j2:113
 msgid "Gotchas"
 msgstr ""
 
-#: template/gnurl.html.j2:111
+#: template/gnurl.html.j2:115
 msgid ""
 "libgnurl and gnurl are not intended to be used as a replacement for curl for "
 "users. Since no conflicts in filenames should occur you are not expected to "
 "remove curl to make use of gnurl and viceversa."
 msgstr ""
 
-#: template/gnurl.html.j2:126
+#: template/gnurl.html.j2:128
 msgid ""
 "You can get the Gnurl Git repository using: <!-- https://bugs.gnunet.org/"
 "view.php?id=5483 ! <code>git clone https://git.taler.net/gnurl.git</code> --"
@@ -830,7 +834,7 @@ msgid ""
 "checked in as signed git tags."
 msgstr ""
 
-#: template/gnurl.html.j2:140
+#: template/gnurl.html.j2:142
 msgid ""
 "Releases are published on <a href=\"https://ftp.gnu.org/gnu/gnunet/\">ftp."
 "gnu.org/gnu/gnunet</a>. gnURL is available from within a variety of "
@@ -843,22 +847,22 @@ msgid ""
 "\">pkgsrc</a>."
 msgstr ""
 
-#: template/gnurl.html.j2:154
+#: template/gnurl.html.j2:157
 msgid "Reporting Bugs"
 msgstr ""
 
-#: template/gnurl.html.j2:156
+#: template/gnurl.html.j2:159
 msgid ""
 "You can report bugs on our bug tracker: <a href=\"https://bugs.gnunet.org/"
 "\">bugs.gnunet.org</a>. Alternatively you can use our bug mailinglist, but "
 "we prefer to track bugs on the bugtracker."
 msgstr ""
 
-#: template/gnurl.html.j2:165
+#: template/gnurl.html.j2:168
 msgid "Maintainer and Cryptographic signatures"
 msgstr ""
 
-#: template/gnurl.html.j2:167
+#: template/gnurl.html.j2:170
 msgid ""
 "gnurl/libgnurl is maintained by ng0. Releases are signed with the OpenPGP "
 "Key <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>, with the key "
@@ -956,43 +960,43 @@ msgstr ""
 msgid "GNUnet's Google Summer of Code projects"
 msgstr ""
 
-#: template/gsoc.html.j2:11
-msgid ""
-"As a GNU project, GNUnet has participated in the Google Summer of Code "
-"(GSoC) for a number of years. This page lists all current, past, and "
-"finished projects."
-msgstr ""
-
-#: template/gsoc.html.j2:23
+#: template/gsoc.html.j2:12
 msgid "Current projects"
 msgstr ""
 
-#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+#: template/gsoc.html.j2:13 template/gsoc.html.j2:181
 msgid "Past projects"
 msgstr ""
 
-#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+#: template/gsoc.html.j2:14 template/gsoc.html.j2:569
 msgid "Finished projects"
 msgstr ""
 
-#: template/gsoc.html.j2:30
+#: template/gsoc.html.j2:21
+msgid ""
+"As a GNU project, GNUnet has participated in the Google Summer of Code "
+"(GSoC) for a number of years. This page lists all current, past, and "
+"finished projects."
+msgstr ""
+
+#: template/gsoc.html.j2:31
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:34
+#: template/gsoc.html.j2:35
 msgid ""
 "It is time for GNUnet to run properly on Android. Note that GNUnet is "
 "written in C, and this is not about rewriting GNUnet in Java, but about "
 "getting the C code to run on Android."
 msgstr ""
 
-#: template/gsoc.html.j2:41
+#: template/gsoc.html.j2:42
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:50
+#: template/gsoc.html.j2:51
 msgid ""
 "There is a push for migrating our CI to Gitlab. The CI should eventually not "
 "just run \"make check\" on various platforms, but also perform tests with "
@@ -1003,11 +1007,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:62
+#: template/gsoc.html.j2:63
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:71
+#: template/gsoc.html.j2:72
 msgid ""
 "Python 2.7 is reaching its end-of-life, and we want to get rid of the "
 "dependency on Python. The existing gnunet-qr tool is a rather simple wrapper "
@@ -1017,7 +1021,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:87
+#: template/gsoc.html.j2:88
 msgid ""
 "reclaimID is a decentralized identity system build on top of the GNU Name "
 "System. Upon authorization, the user provides a requesting party (RP) such "
@@ -1036,7 +1040,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:118
+#: template/gsoc.html.j2:119
 msgid ""
 "re:claimID is a decentralized identity system build on top of the GNU Name "
 "System. The initial design and implementation of re:claimID includes an "
@@ -1058,7 +1062,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:153
+#: template/gsoc.html.j2:154
 msgid ""
 "One great problem of the current Internet is the lack of disintermediation. "
 "When people want to talk they need a chat service. When they want to share "
@@ -1074,18 +1078,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:175
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:184
+#: template/gsoc.html.j2:185
 msgid ""
 "There are a variety of GNUNet APIs that should be exposed in the Rust "
 "wrappers. Implementing these will require extending the port of GNUNet utils "
 "written by Andrew Cann and Kelong Cong."
 msgstr ""
 
-#: template/gsoc.html.j2:192
+#: template/gsoc.html.j2:193
 msgid ""
 "As an introduction to the code base, we suggest that the student and Jeff "
 "Burdges together update the asynchronous IO system from gjio to futures-rs "
@@ -1093,26 +1097,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:202 template/gsoc.html.j2:226
-#: template/gsoc.html.j2:280 template/gsoc.html.j2:310
-#: template/gsoc.html.j2:554
+#: template/gsoc.html.j2:203 template/gsoc.html.j2:227
+#: template/gsoc.html.j2:281 template/gsoc.html.j2:311
+#: template/gsoc.html.j2:555
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:207
+#: template/gsoc.html.j2:208
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:212
+#: template/gsoc.html.j2:213
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:220
+#: template/gsoc.html.j2:221
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:231
+#: template/gsoc.html.j2:232
 msgid ""
 "Note: There was a Special TLDs spec to allow Tor to resolve domain names "
 "using GNS over Tor too, but currently that's on hold until folks think more "
@@ -1120,17 +1124,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
-#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
+#: template/gsoc.html.j2:241 template/gsoc.html.j2:415
+#: template/gsoc.html.j2:455 template/gsoc.html.j2:485
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
-#: template/gsoc.html.j2:594
+#: template/gsoc.html.j2:246 template/gsoc.html.j2:490
+#: template/gsoc.html.j2:595
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:253
+#: template/gsoc.html.j2:254
 msgid ""
 "Design and implementation of <a href=\"http://jsonapi.org/\">REST APIs</a> "
 "that expose the <a href=\"https://gnunet.org/doxygen/modules.html\">GNUnet "
@@ -1138,11 +1142,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
+#: template/gsoc.html.j2:265 template/gsoc.html.j2:585
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:272
+#: template/gsoc.html.j2:273
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1150,42 +1154,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:288
+#: template/gsoc.html.j2:289
 msgid ""
 "Implement rudimentary Android compatibility for GNUnet, in part by porting "
 "the GNUnet utils scheduler to act as a thin wrapper over libuv."
 msgstr ""
 
-#: template/gsoc.html.j2:295
+#: template/gsoc.html.j2:296
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
+#: template/gsoc.html.j2:304 template/gsoc.html.j2:548
 msgid ""
 "Implementation of a replacement for PANDA (see Pond) with better security, "
 "and maybe integration with the GNU Name System for key exchange."
 msgstr ""
 
-#: template/gsoc.html.j2:315
+#: template/gsoc.html.j2:316
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
-#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
+#: template/gsoc.html.j2:321 template/gsoc.html.j2:378
+#: template/gsoc.html.j2:420 template/gsoc.html.j2:460
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:329
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:334
+#: template/gsoc.html.j2:335
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:338
+#: template/gsoc.html.j2:339
 msgid ""
 "<ul> <li>File: generic file with comments</li> <li>Image: display an image "
 "with comments referencing a region of the image</li> <li>Sound: play a sound "
@@ -1195,11 +1199,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:349
+#: template/gsoc.html.j2:350
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:353
+#: template/gsoc.html.j2:354
 msgid ""
 "<ul> <li>Fork existing channels, reorganize people into new chatrooms or "
 "channels.</li> <li>Share a post (edit and repost something elsewhere, on a "
@@ -1208,21 +1212,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:363
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:367
+#: template/gsoc.html.j2:368
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:372
+#: template/gsoc.html.j2:373
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:385
+#: template/gsoc.html.j2:386
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1233,17 +1237,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:403
+#: template/gsoc.html.j2:404
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:410 template/gsoc.html.j2:450
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:426
+#: template/gsoc.html.j2:427
 msgid ""
 "<ul> <li> Emulate IMAP/SMTP protocols as necessary to transform traditional "
 "mail clients into secushare user interfaces. </li> <li> Think of ways to map "
@@ -1253,7 +1257,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:467
+#: template/gsoc.html.j2:468
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1262,33 +1266,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:479
+#: template/gsoc.html.j2:480
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:497
+#: template/gsoc.html.j2:498
 msgid ""
 "Implementation of additional transports to make GNUnet communication more "
 "robust in the presence of problematic networks: GNUnet-over-SMTP, GNUnet-"
 "over-DNS"
 msgstr ""
 
-#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
+#: template/gsoc.html.j2:505 template/gsoc.html.j2:519
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:512
+#: template/gsoc.html.j2:513
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:526
+#: template/gsoc.html.j2:527
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:534
+#: template/gsoc.html.j2:535
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1296,13 +1300,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:562
+#: template/gsoc.html.j2:563
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:574
+#: template/gsoc.html.j2:575
 msgid ""
 "Implementation of a Web-based UI for GNUnet similar to GNUnet-Gtk with a yet "
 "to be determined framework such as Angular2. This includes the design and "
@@ -1311,11 +1315,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:590
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:599
+#: template/gsoc.html.j2:600
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1482,7 +1486,7 @@ msgid ""
 "html\">install GNUnet</a>, <a href=\"https://gnunet.org/en/use.html\">use "
 "it</a> and <a href=\"https://gnunet.org/en/contribute.html\">contribute</a>. "
 "<br> Be aware that this project is still in an early alpha stage when it "
-"comes to software  its not an easy task to rewrite the whole Internet!"
+"comes to software &#8211; its not an easy task to rewrite the whole Internet!"
 msgstr ""
 
 #: template/index.html.j2:242
@@ -1577,125 +1581,125 @@ msgid ""
 "cryptographic protocols to verify keys."
 msgstr ""
 
-#: template/install-on-archpi.html.j2:5
+#: template/install-on-archpi.html.j2:6
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:12 template/install-on-debian9.html.j2:28
-#: template/install-on-macos.html.j2:14 template/install-on-netbsd.html.j2:17
-#: template/install-on-ubuntu1804.html.j2:28
+#: template/install-on-archpi.html.j2:15 template/install-on-debian9.html.j2:29
+#: template/install-on-macos.html.j2:17 template/install-on-netbsd.html.j2:19
+#: template/install-on-ubuntu1804.html.j2:26
 msgid "Requirements"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:35
+#: template/install-on-archpi.html.j2:38
 msgid "Get the Source Code"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:56
+#: template/install-on-archpi.html.j2:59
 msgid "Run"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:121
+#: template/install-on-archpi.html.j2:124
 msgid "Make sure, it works!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:5
+#: template/install-on-debian9.html.j2:6
 msgid "Tutorial: GNUnet on Debian 9"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:7
+#: template/install-on-debian9.html.j2:9
 #: template/install-on-ubuntu1804.html.j2:9
 msgid "Introduction"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:44
-#: template/install-on-ubuntu1804.html.j2:44
+#: template/install-on-debian9.html.j2:45
+#: template/install-on-ubuntu1804.html.j2:41
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:58 template/install-on-macos.html.j2:144
-#: template/install-on-netbsd.html.j2:222
-#: template/install-on-ubuntu1804.html.j2:57
+#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: template/install-on-netbsd.html.j2:224
+#: template/install-on-ubuntu1804.html.j2:53
 msgid "Get the source code"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:77 template/install-on-macos.html.j2:152
-#: template/install-on-netbsd.html.j2:230
-#: template/install-on-ubuntu1804.html.j2:67
+#: template/install-on-debian9.html.j2:78 template/install-on-macos.html.j2:155
+#: template/install-on-netbsd.html.j2:232
+#: template/install-on-ubuntu1804.html.j2:61
 msgid "Compile and Install"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:102
-#: template/install-on-macos.html.j2:164 template/install-on-netbsd.html.j2:240
-#: template/install-on-ubuntu1804.html.j2:78
+#: template/install-on-debian9.html.j2:103
+#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: template/install-on-ubuntu1804.html.j2:70
 msgid "Option 1: GNUnet for production / usage"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:114
-#: template/install-on-ubuntu1804.html.j2:90
+#: template/install-on-debian9.html.j2:115
+#: template/install-on-ubuntu1804.html.j2:80
 msgid "Option 2: GNUnet for development"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:125
+#: template/install-on-debian9.html.j2:126
 msgid "Option 3: gnunet-gtk"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:141
-#: template/install-on-ubuntu1804.html.j2:102
+#: template/install-on-debian9.html.j2:142
+#: template/install-on-ubuntu1804.html.j2:92
 msgid "Install GNUnet plugin for name resolution"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:195
-#: template/install-on-ubuntu1804.html.j2:141
+#: template/install-on-debian9.html.j2:196
+#: template/install-on-ubuntu1804.html.j2:129
 msgid "Configuration"
 msgstr ""
 
 #: template/install-on-debian9.html.j2:272
-#: template/install-on-ubuntu1804.html.j2:217
+#: template/install-on-ubuntu1804.html.j2:203
 msgid "Use GNUnet!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:278
-#: template/install-on-ubuntu1804.html.j2:224
+#: template/install-on-debian9.html.j2:277
+#: template/install-on-ubuntu1804.html.j2:208
 msgid "Uninstall GNUnet and its dependencies"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:294
-#: template/install-on-ubuntu1804.html.j2:242
+#: template/install-on-debian9.html.j2:293
+#: template/install-on-ubuntu1804.html.j2:224
 msgid "Troubleshooting"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:296
-#: template/install-on-ubuntu1804.html.j2:245
+#: template/install-on-debian9.html.j2:295
+#: template/install-on-ubuntu1804.html.j2:225
 msgid "You can't reach other people's nodes"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:332
-#: template/install-on-ubuntu1804.html.j2:276
+#: template/install-on-debian9.html.j2:331
+#: template/install-on-ubuntu1804.html.j2:256
 msgid "OMG you guys broke my internet"
 msgstr ""
 
-#: template/install-on-macos.html.j2:5
+#: template/install-on-macos.html.j2:6
 msgid "Tutorial: GNUnet on macOS 10.14 (Mojave)"
 msgstr ""
 
-#: template/install-on-macos.html.j2:21 template/install-on-netbsd.html.j2:28
+#: template/install-on-macos.html.j2:24 template/install-on-netbsd.html.j2:30
 msgid "Installation"
 msgstr ""
 
-#: template/install-on-macos.html.j2:39 template/install-on-netbsd.html.j2:100
+#: template/install-on-macos.html.j2:42 template/install-on-netbsd.html.j2:102
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:119 template/install-on-netbsd.html.j2:180
+#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
 msgid "Alternative: Installation from source"
 msgstr ""
 
-#: template/install-on-macos.html.j2:197 template/install-on-netbsd.html.j2:265
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
-#: template/install-on-netbsd.html.j2:5
+#: template/install-on-netbsd.html.j2:6
 msgid "Tutorial: GNUnet on NetBSD 8.0 CURRENT"
 msgstr ""
 
@@ -1708,20 +1712,19 @@ msgid ""
 "<p>The following GNUnet installation instructions help you building from "
 "source for your distribution.</p> <p><i>Please note that the installation "
 "process will get much easier once we have proper packages again (planned for "
-"winter 2019).</i></p>"
+"winter 2019).</i></p> <p>You have already installed GNUnet and want to use "
+"it? <a href=\"https://gnunet.org/en/use\">Check this out!</a> </p>"
 msgstr ""
 
-#: template/install.html.j2:15
+#: template/install.html.j2:19
 msgid ""
-"<p>You have already installed GNUnet and want to use it? <a href=\"https://"
-"gnunet.org/en/use\">Check this out!</a> </p> <p>Please be aware that this "
-"project is still in an early alpha stage when it comes to running software  "
-"its not an easy task to rewrite the whole Internet! We are happy to get your "
-"<a href=\"engage.html\">helping hand</a> anytime!</p> <p>Further information "
-"is available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
-"GNUnet-1\">handbook</a>.</p> <p>If you have any queries about the "
-"installation or the usage, please <a href=\"engage.html\">get in touch!</a></"
-"p>"
+"<p>Please be aware that this project is still in an early alpha stage when "
+"it comes to running software &#8211; its not an easy task to rewrite the "
+"whole Internet! We are happy to get your <a href=\"engage.html\">helping "
+"hand</a> anytime!</p> <p>Further information is available in our <a href="
+"\"https://docs.gnunet.org/#toc-Using-GNUnet-1\">handbook</a>.</p> <p>If you "
+"have any queries about the installation or the usage, please <a href="
+"\"engage.html\">get in touch!</a></p>"
 msgstr ""
 
 #: template/news.html.j2.inc:11
@@ -1810,40 +1813,56 @@ msgstr ""
 msgid "How to use GNUnet - in a nutshell"
 msgstr ""
 
-#: template/use.html.j2:18
-msgid "Make sure your GNUnet installation works..."
+#: template/use.html.j2:12 template/use.html.j2:64
+msgid "Filesharing"
 msgstr ""
 
-#: template/use.html.j2:33
-msgid "... and play around with it."
+#: template/use.html.j2:13
+msgid "CADET"
 msgstr ""
 
-#: template/use.html.j2:50
-msgid "Filesharing"
+#: template/use.html.j2:14
+msgid "Minimal Groupchat"
 msgstr ""
 
-#: template/use.html.j2:91
-msgid "CADET (and Chat)"
+#: template/use.html.j2:15
+msgid "GNS with CLI"
 msgstr ""
 
-#: template/use.html.j2:125
-msgid "Chatting with a (simple) client"
+#: template/use.html.j2:16
+msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:167
-msgid "Name resolution using GNS on the command line"
+#: template/use.html.j2:17 template/use.html.j2:332
+msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:239
-msgid "Name resolution using GNS with a browser"
+#: template/use.html.j2:18 template/use.html.j2:393
+msgid "Conversation"
 msgstr ""
 
-#: template/use.html.j2:316
-msgid "VPN"
+#: template/use.html.j2:32
+msgid "Make sure your GNUnet installation works..."
 msgstr ""
 
-#: template/use.html.j2:377
-msgid "Conversation"
+#: template/use.html.j2:47
+msgid "... and play around with it."
+msgstr ""
+
+#: template/use.html.j2:105
+msgid "CADET (and Chat)"
+msgstr ""
+
+#: template/use.html.j2:139
+msgid "Chatting with a (simple) client"
+msgstr ""
+
+#: template/use.html.j2:183
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:255
+msgid "Name resolution using GNS with a browser"
 msgstr ""
 
 #: template/video.html.j2:6
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 41da637d..0e214e84 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-01 15:53+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,11 +54,11 @@ msgstr "Archivo IRC"
 msgid "Copyright Assignment"
 msgstr "Transmisión de derechos de autor"
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
 msgid "Continuous Integration"
 msgstr "Integración continua"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografía"
@@ -108,44 +108,46 @@ msgstr "Desarrollo"
 msgid "System Architecture"
 msgstr "Architectura del sistema"
 
-#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:126
 msgid "Source Code"
 msgstr "Códico fuente"
 
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+#, fuzzy
+#| msgid "Development"
+msgid "Development Tutorial"
+msgstr "Desarrollo"
+
+#: common/navigation.j2.inc:82
 msgid "Documentation"
 msgstr "Documentación"
 
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Instala"
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
 msgid "Use"
 msgstr "Usa"
 
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
 msgid "Videos"
 msgstr "Videos"
 
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glosario"
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
 msgid "Handbook"
 msgstr "Manual"
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
 msgid "REST API"
 msgstr "REST API"
 
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr "Tutorial de C"
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -288,8 +290,8 @@ msgstr ""
 #: template/about.html.j2:100
 msgid ""
 "Please be aware that this project is (despite of it's age) still in an early "
-"alpha stage when it comes to software – its not an easy task to rewrite the "
-"whole Internet!"
+"alpha stage when it comes to software &#8211; its not an easy task to "
+"rewrite the whole Internet!"
 msgstr ""
 
 #: template/about.html.j2:105
@@ -506,7 +508,7 @@ msgid ""
 "org/gauger/\">https://old.gnunet.org/gauger/</a>."
 msgstr ""
 
-#: template/download.html.j2:7 template/gnurl.html.j2:138
+#: template/download.html.j2:7 template/gnurl.html.j2:140
 msgid "Downloads"
 msgstr ""
 
@@ -547,7 +549,13 @@ msgstr ""
 msgid "Verein zur F&ouml;rderung von GNUnet e.V."
 msgstr ""
 
-#: template/ev.html.j2:12
+#: template/ev.html.j2:11
+#, fuzzy
+#| msgid "About GNUnet"
+msgid "About GNUnet e.V."
+msgstr "Sobre GNUnet"
+
+#: template/ev.html.j2:13
 msgid ""
 "On December 27th 2013 a group of GNUnet hackers met at 30c3 to create the "
 "\"Verein zur F&ouml;rderung von GNUnet e.V.\", an association under German "
@@ -555,18 +563,35 @@ msgid ""
 "the association on the 7th of March under VR 205287."
 msgstr ""
 
-#: template/ev.html.j2:21
+#: template/ev.html.j2:22
 msgid ""
 "The association is officially dedicated to supporting research, development "
 "and education in the area of secure decentralized networking in general, and "
 "GNUnet specifically. This is the official website for the association."
 msgstr ""
 
+#: template/ev.html.j2:31
+msgid "Becoming a Member of GNUnet e.V."
+msgstr ""
+
 #: template/ev.html.j2:33
+msgid ""
+"GNUnet developers with git (write) access can become members to participate "
+"in the decision process and formally support GNUnet e.V. For this, all you "
+"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
+"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
+"membership dues; however, members are required to support GNUnet e.V. and in "
+"particularly contribute to the technical development within their means. For "
+"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
+"git/\">Satzung</a> (currently only available in German, translations "
+"welcome)."
+msgstr ""
+
+#: template/ev.html.j2:52
 msgid "Governance"
 msgstr ""
 
-#: template/ev.html.j2:35
+#: template/ev.html.j2:54
 msgid ""
 "You can find our \"Satzung\", and the list of members under <a href="
 "\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet."
@@ -577,28 +602,19 @@ msgid ""
 "dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:52
-msgid "Becoming a Member of GNUnet e.V."
+#: template/ev.html.j2:71
+msgid "Official Meeting Notes"
 msgstr ""
 
-#: template/ev.html.j2:54
-msgid ""
-"GNUnet developers with git (write) access can become members to participate "
-"in the decision process and formally support GNUnet e.V. For this, all you "
-"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
-"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
-"membership dues; however, members are required to support GNUnet e.V. and in "
-"particularly contribute to the technical development within their means. For "
-"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
-"git/\">Satzung</a> (currently only available in German, translations "
-"welcome)."
+#: template/ev.html.j2:74
+msgid "2013-12 (constitutional meeting)"
 msgstr ""
 
-#: template/ev.html.j2:73
+#: template/ev.html.j2:99
 msgid "Support Us!"
 msgstr ""
 
-#: template/ev.html.j2:75
+#: template/ev.html.j2:101
 msgid ""
 "Everybody is welcome to support us via donations. For financial "
 "contributions, Europeans are able to donate via SEPA. We hope to setup "
@@ -611,14 +627,6 @@ msgid ""
 "<dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:94
-msgid "Official Meeting Notes"
-msgstr ""
-
-#: template/ev.html.j2:97
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
 #: template/faq.html.j2:12
 msgid ""
 "I receive many &quot;WARNING Calculated flow delay for X at Y for Z&quot;. "
@@ -729,7 +737,7 @@ msgid ""
 "with egos."
 msgstr ""
 
-#: template/gnurl.html.j2:7
+#: template/gnurl.html.j2:11
 msgid ""
 "libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
 "HTTP and HTTPS (and only HTTP 1.x) with a single crypto backend (GnuTLS) to "
@@ -741,11 +749,11 @@ msgid ""
 "to get a proper build of libgnurl."
 msgstr ""
 
-#: template/gnurl.html.j2:22
+#: template/gnurl.html.j2:26
 msgid "Motivation"
 msgstr ""
 
-#: template/gnurl.html.j2:24
+#: template/gnurl.html.j2:28
 msgid ""
 "cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
 "other variants are used by some distributions. Supporting other crypto "
@@ -757,7 +765,7 @@ msgid ""
 "the bugs that arise might be rather subtle."
 msgstr ""
 
-#: template/gnurl.html.j2:37
+#: template/gnurl.html.j2:41
 msgid ""
 "For GNUnet, we also need a particularly modern version of GnuTLS. Thus, it "
 "would anyway be necessary to recompile cURL for GNUnet. But what happens if "
@@ -779,7 +787,7 @@ msgid ""
 "that code."
 msgstr ""
 
-#: template/gnurl.html.j2:61
+#: template/gnurl.html.j2:65
 msgid ""
 "So to use a modern version of GnuTLS, a sane approach is to disable all of "
 "the \"optional\" features of cURL that drag in system libraries that link "
@@ -793,11 +801,11 @@ msgid ""
 "this can really be trivially fixed by the cURL developers."
 msgstr ""
 
-#: template/gnurl.html.j2:75
+#: template/gnurl.html.j2:79
 msgid "Rename to fix"
 msgstr ""
 
-#: template/gnurl.html.j2:77
+#: template/gnurl.html.j2:81
 #, python-format
 msgid ""
 "How does forking fix it? Easy. First, we can get rid of all of the "
@@ -816,11 +824,11 @@ msgid ""
 "new release."
 msgstr ""
 
-#: template/gnurl.html.j2:95
+#: template/gnurl.html.j2:99
 msgid "Using libgnurl"
 msgstr ""
 
-#: template/gnurl.html.j2:97
+#: template/gnurl.html.j2:101
 msgid ""
 "Projects that use cURL only for HTTP/HTTPS and that would work with GnuTLS "
 "should be able to switch to libgnurl by changing \"-lcurl\" to \"-lgnurl\". "
@@ -831,18 +839,18 @@ msgid ""
 "the original curl source have been written."
 msgstr ""
 
-#: template/gnurl.html.j2:109
+#: template/gnurl.html.j2:113
 msgid "Gotchas"
 msgstr ""
 
-#: template/gnurl.html.j2:111
+#: template/gnurl.html.j2:115
 msgid ""
 "libgnurl and gnurl are not intended to be used as a replacement for curl for "
 "users. Since no conflicts in filenames should occur you are not expected to "
 "remove curl to make use of gnurl and viceversa."
 msgstr ""
 
-#: template/gnurl.html.j2:126
+#: template/gnurl.html.j2:128
 msgid ""
 "You can get the Gnurl Git repository using: <!-- https://bugs.gnunet.org/"
 "view.php?id=5483 ! <code>git clone https://git.taler.net/gnurl.git</code> --"
@@ -850,7 +858,7 @@ msgid ""
 "checked in as signed git tags."
 msgstr ""
 
-#: template/gnurl.html.j2:140
+#: template/gnurl.html.j2:142
 msgid ""
 "Releases are published on <a href=\"https://ftp.gnu.org/gnu/gnunet/\">ftp."
 "gnu.org/gnu/gnunet</a>. gnURL is available from within a variety of "
@@ -863,22 +871,22 @@ msgid ""
 "\">pkgsrc</a>."
 msgstr ""
 
-#: template/gnurl.html.j2:154
+#: template/gnurl.html.j2:157
 msgid "Reporting Bugs"
 msgstr ""
 
-#: template/gnurl.html.j2:156
+#: template/gnurl.html.j2:159
 msgid ""
 "You can report bugs on our bug tracker: <a href=\"https://bugs.gnunet.org/"
 "\">bugs.gnunet.org</a>. Alternatively you can use our bug mailinglist, but "
 "we prefer to track bugs on the bugtracker."
 msgstr ""
 
-#: template/gnurl.html.j2:165
+#: template/gnurl.html.j2:168
 msgid "Maintainer and Cryptographic signatures"
 msgstr ""
 
-#: template/gnurl.html.j2:167
+#: template/gnurl.html.j2:170
 msgid ""
 "gnurl/libgnurl is maintained by ng0. Releases are signed with the OpenPGP "
 "Key <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>, with the key "
@@ -976,45 +984,45 @@ msgstr ""
 msgid "GNUnet's Google Summer of Code projects"
 msgstr ""
 
-#: template/gsoc.html.j2:11
-msgid ""
-"As a GNU project, GNUnet has participated in the Google Summer of Code "
-"(GSoC) for a number of years. This page lists all current, past, and "
-"finished projects."
-msgstr ""
-
-#: template/gsoc.html.j2:23
+#: template/gsoc.html.j2:12
 #, fuzzy
 #| msgid "GSoC Projects"
 msgid "Current projects"
 msgstr "Projectos de GSoC"
 
-#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+#: template/gsoc.html.j2:13 template/gsoc.html.j2:181
 msgid "Past projects"
 msgstr ""
 
-#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+#: template/gsoc.html.j2:14 template/gsoc.html.j2:569
 msgid "Finished projects"
 msgstr ""
 
-#: template/gsoc.html.j2:30
+#: template/gsoc.html.j2:21
+msgid ""
+"As a GNU project, GNUnet has participated in the Google Summer of Code "
+"(GSoC) for a number of years. This page lists all current, past, and "
+"finished projects."
+msgstr ""
+
+#: template/gsoc.html.j2:31
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:34
+#: template/gsoc.html.j2:35
 msgid ""
 "It is time for GNUnet to run properly on Android. Note that GNUnet is "
 "written in C, and this is not about rewriting GNUnet in Java, but about "
 "getting the C code to run on Android."
 msgstr ""
 
-#: template/gsoc.html.j2:41
+#: template/gsoc.html.j2:42
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:50
+#: template/gsoc.html.j2:51
 msgid ""
 "There is a push for migrating our CI to Gitlab. The CI should eventually not "
 "just run \"make check\" on various platforms, but also perform tests with "
@@ -1025,11 +1033,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:62
+#: template/gsoc.html.j2:63
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:71
+#: template/gsoc.html.j2:72
 msgid ""
 "Python 2.7 is reaching its end-of-life, and we want to get rid of the "
 "dependency on Python. The existing gnunet-qr tool is a rather simple wrapper "
@@ -1039,7 +1047,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:87
+#: template/gsoc.html.j2:88
 msgid ""
 "reclaimID is a decentralized identity system build on top of the GNU Name "
 "System. Upon authorization, the user provides a requesting party (RP) such "
@@ -1058,7 +1066,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:118
+#: template/gsoc.html.j2:119
 msgid ""
 "re:claimID is a decentralized identity system build on top of the GNU Name "
 "System. The initial design and implementation of re:claimID includes an "
@@ -1080,7 +1088,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:153
+#: template/gsoc.html.j2:154
 msgid ""
 "One great problem of the current Internet is the lack of disintermediation. "
 "When people want to talk they need a chat service. When they want to share "
@@ -1096,18 +1104,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:175
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:184
+#: template/gsoc.html.j2:185
 msgid ""
 "There are a variety of GNUNet APIs that should be exposed in the Rust "
 "wrappers. Implementing these will require extending the port of GNUNet utils "
 "written by Andrew Cann and Kelong Cong."
 msgstr ""
 
-#: template/gsoc.html.j2:192
+#: template/gsoc.html.j2:193
 msgid ""
 "As an introduction to the code base, we suggest that the student and Jeff "
 "Burdges together update the asynchronous IO system from gjio to futures-rs "
@@ -1115,26 +1123,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:202 template/gsoc.html.j2:226
-#: template/gsoc.html.j2:280 template/gsoc.html.j2:310
-#: template/gsoc.html.j2:554
+#: template/gsoc.html.j2:203 template/gsoc.html.j2:227
+#: template/gsoc.html.j2:281 template/gsoc.html.j2:311
+#: template/gsoc.html.j2:555
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:207
+#: template/gsoc.html.j2:208
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:212
+#: template/gsoc.html.j2:213
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:220
+#: template/gsoc.html.j2:221
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:231
+#: template/gsoc.html.j2:232
 msgid ""
 "Note: There was a Special TLDs spec to allow Tor to resolve domain names "
 "using GNS over Tor too, but currently that's on hold until folks think more "
@@ -1142,17 +1150,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
-#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
+#: template/gsoc.html.j2:241 template/gsoc.html.j2:415
+#: template/gsoc.html.j2:455 template/gsoc.html.j2:485
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
-#: template/gsoc.html.j2:594
+#: template/gsoc.html.j2:246 template/gsoc.html.j2:490
+#: template/gsoc.html.j2:595
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:253
+#: template/gsoc.html.j2:254
 msgid ""
 "Design and implementation of <a href=\"http://jsonapi.org/\">REST APIs</a> "
 "that expose the <a href=\"https://gnunet.org/doxygen/modules.html\">GNUnet "
@@ -1160,11 +1168,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
+#: template/gsoc.html.j2:265 template/gsoc.html.j2:585
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:272
+#: template/gsoc.html.j2:273
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1172,42 +1180,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:288
+#: template/gsoc.html.j2:289
 msgid ""
 "Implement rudimentary Android compatibility for GNUnet, in part by porting "
 "the GNUnet utils scheduler to act as a thin wrapper over libuv."
 msgstr ""
 
-#: template/gsoc.html.j2:295
+#: template/gsoc.html.j2:296
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
+#: template/gsoc.html.j2:304 template/gsoc.html.j2:548
 msgid ""
 "Implementation of a replacement for PANDA (see Pond) with better security, "
 "and maybe integration with the GNU Name System for key exchange."
 msgstr ""
 
-#: template/gsoc.html.j2:315
+#: template/gsoc.html.j2:316
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
-#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
+#: template/gsoc.html.j2:321 template/gsoc.html.j2:378
+#: template/gsoc.html.j2:420 template/gsoc.html.j2:460
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:329
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:334
+#: template/gsoc.html.j2:335
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:338
+#: template/gsoc.html.j2:339
 msgid ""
 "<ul> <li>File: generic file with comments</li> <li>Image: display an image "
 "with comments referencing a region of the image</li> <li>Sound: play a sound "
@@ -1217,11 +1225,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:349
+#: template/gsoc.html.j2:350
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:353
+#: template/gsoc.html.j2:354
 msgid ""
 "<ul> <li>Fork existing channels, reorganize people into new chatrooms or "
 "channels.</li> <li>Share a post (edit and repost something elsewhere, on a "
@@ -1230,21 +1238,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:363
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:367
+#: template/gsoc.html.j2:368
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:372
+#: template/gsoc.html.j2:373
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:385
+#: template/gsoc.html.j2:386
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1255,17 +1263,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:403
+#: template/gsoc.html.j2:404
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:410 template/gsoc.html.j2:450
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:426
+#: template/gsoc.html.j2:427
 msgid ""
 "<ul> <li> Emulate IMAP/SMTP protocols as necessary to transform traditional "
 "mail clients into secushare user interfaces. </li> <li> Think of ways to map "
@@ -1275,7 +1283,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:467
+#: template/gsoc.html.j2:468
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1284,33 +1292,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:479
+#: template/gsoc.html.j2:480
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:497
+#: template/gsoc.html.j2:498
 msgid ""
 "Implementation of additional transports to make GNUnet communication more "
 "robust in the presence of problematic networks: GNUnet-over-SMTP, GNUnet-"
 "over-DNS"
 msgstr ""
 
-#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
+#: template/gsoc.html.j2:505 template/gsoc.html.j2:519
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:512
+#: template/gsoc.html.j2:513
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:526
+#: template/gsoc.html.j2:527
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:534
+#: template/gsoc.html.j2:535
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1318,13 +1326,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:562
+#: template/gsoc.html.j2:563
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:574
+#: template/gsoc.html.j2:575
 msgid ""
 "Implementation of a Web-based UI for GNUnet similar to GNUnet-Gtk with a yet "
 "to be determined framework such as Angular2. This includes the design and "
@@ -1333,11 +1341,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:590
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:599
+#: template/gsoc.html.j2:600
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1506,7 +1514,7 @@ msgid ""
 "html\">install GNUnet</a>, <a href=\"https://gnunet.org/en/use.html\">use "
 "it</a> and <a href=\"https://gnunet.org/en/contribute.html\">contribute</a>. "
 "<br> Be aware that this project is still in an early alpha stage when it "
-"comes to software – its not an easy task to rewrite the whole Internet!"
+"comes to software &#8211; its not an easy task to rewrite the whole Internet!"
 msgstr ""
 
 #: template/index.html.j2:242
@@ -1601,125 +1609,125 @@ msgid ""
 "cryptographic protocols to verify keys."
 msgstr ""
 
-#: template/install-on-archpi.html.j2:5
+#: template/install-on-archpi.html.j2:6
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:12 template/install-on-debian9.html.j2:28
-#: template/install-on-macos.html.j2:14 template/install-on-netbsd.html.j2:17
-#: template/install-on-ubuntu1804.html.j2:28
+#: template/install-on-archpi.html.j2:15 template/install-on-debian9.html.j2:29
+#: template/install-on-macos.html.j2:17 template/install-on-netbsd.html.j2:19
+#: template/install-on-ubuntu1804.html.j2:26
 msgid "Requirements"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:35
+#: template/install-on-archpi.html.j2:38
 msgid "Get the Source Code"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:56
+#: template/install-on-archpi.html.j2:59
 msgid "Run"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:121
+#: template/install-on-archpi.html.j2:124
 msgid "Make sure, it works!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:5
+#: template/install-on-debian9.html.j2:6
 msgid "Tutorial: GNUnet on Debian 9"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:7
+#: template/install-on-debian9.html.j2:9
 #: template/install-on-ubuntu1804.html.j2:9
 msgid "Introduction"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:44
-#: template/install-on-ubuntu1804.html.j2:44
+#: template/install-on-debian9.html.j2:45
+#: template/install-on-ubuntu1804.html.j2:41
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:58 template/install-on-macos.html.j2:144
-#: template/install-on-netbsd.html.j2:222
-#: template/install-on-ubuntu1804.html.j2:57
+#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: template/install-on-netbsd.html.j2:224
+#: template/install-on-ubuntu1804.html.j2:53
 msgid "Get the source code"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:77 template/install-on-macos.html.j2:152
-#: template/install-on-netbsd.html.j2:230
-#: template/install-on-ubuntu1804.html.j2:67
+#: template/install-on-debian9.html.j2:78 template/install-on-macos.html.j2:155
+#: template/install-on-netbsd.html.j2:232
+#: template/install-on-ubuntu1804.html.j2:61
 msgid "Compile and Install"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:102
-#: template/install-on-macos.html.j2:164 template/install-on-netbsd.html.j2:240
-#: template/install-on-ubuntu1804.html.j2:78
+#: template/install-on-debian9.html.j2:103
+#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: template/install-on-ubuntu1804.html.j2:70
 msgid "Option 1: GNUnet for production / usage"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:114
-#: template/install-on-ubuntu1804.html.j2:90
+#: template/install-on-debian9.html.j2:115
+#: template/install-on-ubuntu1804.html.j2:80
 msgid "Option 2: GNUnet for development"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:125
+#: template/install-on-debian9.html.j2:126
 msgid "Option 3: gnunet-gtk"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:141
-#: template/install-on-ubuntu1804.html.j2:102
+#: template/install-on-debian9.html.j2:142
+#: template/install-on-ubuntu1804.html.j2:92
 msgid "Install GNUnet plugin for name resolution"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:195
-#: template/install-on-ubuntu1804.html.j2:141
+#: template/install-on-debian9.html.j2:196
+#: template/install-on-ubuntu1804.html.j2:129
 msgid "Configuration"
 msgstr ""
 
 #: template/install-on-debian9.html.j2:272
-#: template/install-on-ubuntu1804.html.j2:217
+#: template/install-on-ubuntu1804.html.j2:203
 msgid "Use GNUnet!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:278
-#: template/install-on-ubuntu1804.html.j2:224
+#: template/install-on-debian9.html.j2:277
+#: template/install-on-ubuntu1804.html.j2:208
 msgid "Uninstall GNUnet and its dependencies"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:294
-#: template/install-on-ubuntu1804.html.j2:242
+#: template/install-on-debian9.html.j2:293
+#: template/install-on-ubuntu1804.html.j2:224
 msgid "Troubleshooting"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:296
-#: template/install-on-ubuntu1804.html.j2:245
+#: template/install-on-debian9.html.j2:295
+#: template/install-on-ubuntu1804.html.j2:225
 msgid "You can't reach other people's nodes"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:332
-#: template/install-on-ubuntu1804.html.j2:276
+#: template/install-on-debian9.html.j2:331
+#: template/install-on-ubuntu1804.html.j2:256
 msgid "OMG you guys broke my internet"
 msgstr ""
 
-#: template/install-on-macos.html.j2:5
+#: template/install-on-macos.html.j2:6
 msgid "Tutorial: GNUnet on macOS 10.14 (Mojave)"
 msgstr ""
 
-#: template/install-on-macos.html.j2:21 template/install-on-netbsd.html.j2:28
+#: template/install-on-macos.html.j2:24 template/install-on-netbsd.html.j2:30
 msgid "Installation"
 msgstr ""
 
-#: template/install-on-macos.html.j2:39 template/install-on-netbsd.html.j2:100
+#: template/install-on-macos.html.j2:42 template/install-on-netbsd.html.j2:102
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:119 template/install-on-netbsd.html.j2:180
+#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
 msgid "Alternative: Installation from source"
 msgstr ""
 
-#: template/install-on-macos.html.j2:197 template/install-on-netbsd.html.j2:265
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
-#: template/install-on-netbsd.html.j2:5
+#: template/install-on-netbsd.html.j2:6
 msgid "Tutorial: GNUnet on NetBSD 8.0 CURRENT"
 msgstr ""
 
@@ -1732,20 +1740,19 @@ msgid ""
 "<p>The following GNUnet installation instructions help you building from "
 "source for your distribution.</p> <p><i>Please note that the installation "
 "process will get much easier once we have proper packages again (planned for "
-"winter 2019).</i></p>"
+"winter 2019).</i></p> <p>You have already installed GNUnet and want to use "
+"it? <a href=\"https://gnunet.org/en/use\">Check this out!</a> </p>"
 msgstr ""
 
-#: template/install.html.j2:15
+#: template/install.html.j2:19
 msgid ""
-"<p>You have already installed GNUnet and want to use it? <a href=\"https://"
-"gnunet.org/en/use\">Check this out!</a> </p> <p>Please be aware that this "
-"project is still in an early alpha stage when it comes to running software – "
-"its not an easy task to rewrite the whole Internet! We are happy to get your "
-"<a href=\"engage.html\">helping hand</a> anytime!</p> <p>Further information "
-"is available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
-"GNUnet-1\">handbook</a>.</p> <p>If you have any queries about the "
-"installation or the usage, please <a href=\"engage.html\">get in touch!</a></"
-"p>"
+"<p>Please be aware that this project is still in an early alpha stage when "
+"it comes to running software &#8211; its not an easy task to rewrite the "
+"whole Internet! We are happy to get your <a href=\"engage.html\">helping "
+"hand</a> anytime!</p> <p>Further information is available in our <a href="
+"\"https://docs.gnunet.org/#toc-Using-GNUnet-1\">handbook</a>.</p> <p>If you "
+"have any queries about the installation or the usage, please <a href="
+"\"engage.html\">get in touch!</a></p>"
 msgstr ""
 
 #: template/news.html.j2.inc:11
@@ -1834,40 +1841,56 @@ msgstr ""
 msgid "How to use GNUnet - in a nutshell"
 msgstr ""
 
-#: template/use.html.j2:18
-msgid "Make sure your GNUnet installation works..."
+#: template/use.html.j2:12 template/use.html.j2:64
+msgid "Filesharing"
 msgstr ""
 
-#: template/use.html.j2:33
-msgid "... and play around with it."
+#: template/use.html.j2:13
+msgid "CADET"
 msgstr ""
 
-#: template/use.html.j2:50
-msgid "Filesharing"
+#: template/use.html.j2:14
+msgid "Minimal Groupchat"
 msgstr ""
 
-#: template/use.html.j2:91
-msgid "CADET (and Chat)"
+#: template/use.html.j2:15
+msgid "GNS with CLI"
 msgstr ""
 
-#: template/use.html.j2:125
-msgid "Chatting with a (simple) client"
+#: template/use.html.j2:16
+msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:167
-msgid "Name resolution using GNS on the command line"
+#: template/use.html.j2:17 template/use.html.j2:332
+msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:239
-msgid "Name resolution using GNS with a browser"
+#: template/use.html.j2:18 template/use.html.j2:393
+msgid "Conversation"
 msgstr ""
 
-#: template/use.html.j2:316
-msgid "VPN"
+#: template/use.html.j2:32
+msgid "Make sure your GNUnet installation works..."
 msgstr ""
 
-#: template/use.html.j2:377
-msgid "Conversation"
+#: template/use.html.j2:47
+msgid "... and play around with it."
+msgstr ""
+
+#: template/use.html.j2:105
+msgid "CADET (and Chat)"
+msgstr ""
+
+#: template/use.html.j2:139
+msgid "Chatting with a (simple) client"
+msgstr ""
+
+#: template/use.html.j2:183
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:255
+msgid "Name resolution using GNS with a browser"
 msgstr ""
 
 #: template/video.html.j2:6
@@ -1909,3 +1932,6 @@ msgstr ""
 #: template/video.html.j2:77
 msgid "2010"
 msgstr ""
+
+#~ msgid "C-Tutorial"
+#~ msgstr "Tutorial de C"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 71a63c8b..c4a188ed 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-01 15:53+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,11 +54,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -108,44 +108,44 @@ msgstr ""
 msgid "System Architecture"
 msgstr ""
 
-#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:126
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+msgid "Development Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:82
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr ""
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
 msgid "FAQ"
 msgstr ""
 
@@ -288,8 +288,8 @@ msgstr ""
 #: template/about.html.j2:100
 msgid ""
 "Please be aware that this project is (despite of it's age) still in an early "
-"alpha stage when it comes to software – its not an easy task to rewrite the "
-"whole Internet!"
+"alpha stage when it comes to software &#8211; its not an easy task to "
+"rewrite the whole Internet!"
 msgstr ""
 
 #: template/about.html.j2:105
@@ -506,7 +506,7 @@ msgid ""
 "org/gauger/\">https://old.gnunet.org/gauger/</a>."
 msgstr ""
 
-#: template/download.html.j2:7 template/gnurl.html.j2:138
+#: template/download.html.j2:7 template/gnurl.html.j2:140
 msgid "Downloads"
 msgstr ""
 
@@ -547,7 +547,11 @@ msgstr ""
 msgid "Verein zur F&ouml;rderung von GNUnet e.V."
 msgstr ""
 
-#: template/ev.html.j2:12
+#: template/ev.html.j2:11
+msgid "About GNUnet e.V."
+msgstr ""
+
+#: template/ev.html.j2:13
 msgid ""
 "On December 27th 2013 a group of GNUnet hackers met at 30c3 to create the "
 "\"Verein zur F&ouml;rderung von GNUnet e.V.\", an association under German "
@@ -555,18 +559,35 @@ msgid ""
 "the association on the 7th of March under VR 205287."
 msgstr ""
 
-#: template/ev.html.j2:21
+#: template/ev.html.j2:22
 msgid ""
 "The association is officially dedicated to supporting research, development "
 "and education in the area of secure decentralized networking in general, and "
 "GNUnet specifically. This is the official website for the association."
 msgstr ""
 
+#: template/ev.html.j2:31
+msgid "Becoming a Member of GNUnet e.V."
+msgstr ""
+
 #: template/ev.html.j2:33
+msgid ""
+"GNUnet developers with git (write) access can become members to participate "
+"in the decision process and formally support GNUnet e.V. For this, all you "
+"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
+"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
+"membership dues; however, members are required to support GNUnet e.V. and in "
+"particularly contribute to the technical development within their means. For "
+"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
+"git/\">Satzung</a> (currently only available in German, translations "
+"welcome)."
+msgstr ""
+
+#: template/ev.html.j2:52
 msgid "Governance"
 msgstr ""
 
-#: template/ev.html.j2:35
+#: template/ev.html.j2:54
 msgid ""
 "You can find our \"Satzung\", and the list of members under <a href="
 "\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet."
@@ -577,28 +598,19 @@ msgid ""
 "dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:52
-msgid "Becoming a Member of GNUnet e.V."
+#: template/ev.html.j2:71
+msgid "Official Meeting Notes"
 msgstr ""
 
-#: template/ev.html.j2:54
-msgid ""
-"GNUnet developers with git (write) access can become members to participate "
-"in the decision process and formally support GNUnet e.V. For this, all you "
-"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
-"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
-"membership dues; however, members are required to support GNUnet e.V. and in "
-"particularly contribute to the technical development within their means. For "
-"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
-"git/\">Satzung</a> (currently only available in German, translations "
-"welcome)."
+#: template/ev.html.j2:74
+msgid "2013-12 (constitutional meeting)"
 msgstr ""
 
-#: template/ev.html.j2:73
+#: template/ev.html.j2:99
 msgid "Support Us!"
 msgstr ""
 
-#: template/ev.html.j2:75
+#: template/ev.html.j2:101
 msgid ""
 "Everybody is welcome to support us via donations. For financial "
 "contributions, Europeans are able to donate via SEPA. We hope to setup "
@@ -611,14 +623,6 @@ msgid ""
 "<dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:94
-msgid "Official Meeting Notes"
-msgstr ""
-
-#: template/ev.html.j2:97
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
 #: template/faq.html.j2:12
 msgid ""
 "I receive many &quot;WARNING Calculated flow delay for X at Y for Z&quot;. "
@@ -729,7 +733,7 @@ msgid ""
 "with egos."
 msgstr ""
 
-#: template/gnurl.html.j2:7
+#: template/gnurl.html.j2:11
 msgid ""
 "libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
 "HTTP and HTTPS (and only HTTP 1.x) with a single crypto backend (GnuTLS) to "
@@ -741,11 +745,11 @@ msgid ""
 "to get a proper build of libgnurl."
 msgstr ""
 
-#: template/gnurl.html.j2:22
+#: template/gnurl.html.j2:26
 msgid "Motivation"
 msgstr ""
 
-#: template/gnurl.html.j2:24
+#: template/gnurl.html.j2:28
 msgid ""
 "cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
 "other variants are used by some distributions. Supporting other crypto "
@@ -757,7 +761,7 @@ msgid ""
 "the bugs that arise might be rather subtle."
 msgstr ""
 
-#: template/gnurl.html.j2:37
+#: template/gnurl.html.j2:41
 msgid ""
 "For GNUnet, we also need a particularly modern version of GnuTLS. Thus, it "
 "would anyway be necessary to recompile cURL for GNUnet. But what happens if "
@@ -779,7 +783,7 @@ msgid ""
 "that code."
 msgstr ""
 
-#: template/gnurl.html.j2:61
+#: template/gnurl.html.j2:65
 msgid ""
 "So to use a modern version of GnuTLS, a sane approach is to disable all of "
 "the \"optional\" features of cURL that drag in system libraries that link "
@@ -793,11 +797,11 @@ msgid ""
 "this can really be trivially fixed by the cURL developers."
 msgstr ""
 
-#: template/gnurl.html.j2:75
+#: template/gnurl.html.j2:79
 msgid "Rename to fix"
 msgstr ""
 
-#: template/gnurl.html.j2:77
+#: template/gnurl.html.j2:81
 #, python-format
 msgid ""
 "How does forking fix it? Easy. First, we can get rid of all of the "
@@ -816,11 +820,11 @@ msgid ""
 "new release."
 msgstr ""
 
-#: template/gnurl.html.j2:95
+#: template/gnurl.html.j2:99
 msgid "Using libgnurl"
 msgstr ""
 
-#: template/gnurl.html.j2:97
+#: template/gnurl.html.j2:101
 msgid ""
 "Projects that use cURL only for HTTP/HTTPS and that would work with GnuTLS "
 "should be able to switch to libgnurl by changing \"-lcurl\" to \"-lgnurl\". "
@@ -831,18 +835,18 @@ msgid ""
 "the original curl source have been written."
 msgstr ""
 
-#: template/gnurl.html.j2:109
+#: template/gnurl.html.j2:113
 msgid "Gotchas"
 msgstr ""
 
-#: template/gnurl.html.j2:111
+#: template/gnurl.html.j2:115
 msgid ""
 "libgnurl and gnurl are not intended to be used as a replacement for curl for "
 "users. Since no conflicts in filenames should occur you are not expected to "
 "remove curl to make use of gnurl and viceversa."
 msgstr ""
 
-#: template/gnurl.html.j2:126
+#: template/gnurl.html.j2:128
 msgid ""
 "You can get the Gnurl Git repository using: <!-- https://bugs.gnunet.org/"
 "view.php?id=5483 ! <code>git clone https://git.taler.net/gnurl.git</code> --"
@@ -850,7 +854,7 @@ msgid ""
 "checked in as signed git tags."
 msgstr ""
 
-#: template/gnurl.html.j2:140
+#: template/gnurl.html.j2:142
 msgid ""
 "Releases are published on <a href=\"https://ftp.gnu.org/gnu/gnunet/\">ftp."
 "gnu.org/gnu/gnunet</a>. gnURL is available from within a variety of "
@@ -863,22 +867,22 @@ msgid ""
 "\">pkgsrc</a>."
 msgstr ""
 
-#: template/gnurl.html.j2:154
+#: template/gnurl.html.j2:157
 msgid "Reporting Bugs"
 msgstr ""
 
-#: template/gnurl.html.j2:156
+#: template/gnurl.html.j2:159
 msgid ""
 "You can report bugs on our bug tracker: <a href=\"https://bugs.gnunet.org/"
 "\">bugs.gnunet.org</a>. Alternatively you can use our bug mailinglist, but "
 "we prefer to track bugs on the bugtracker."
 msgstr ""
 
-#: template/gnurl.html.j2:165
+#: template/gnurl.html.j2:168
 msgid "Maintainer and Cryptographic signatures"
 msgstr ""
 
-#: template/gnurl.html.j2:167
+#: template/gnurl.html.j2:170
 msgid ""
 "gnurl/libgnurl is maintained by ng0. Releases are signed with the OpenPGP "
 "Key <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>, with the key "
@@ -976,43 +980,43 @@ msgstr ""
 msgid "GNUnet's Google Summer of Code projects"
 msgstr ""
 
-#: template/gsoc.html.j2:11
-msgid ""
-"As a GNU project, GNUnet has participated in the Google Summer of Code "
-"(GSoC) for a number of years. This page lists all current, past, and "
-"finished projects."
-msgstr ""
-
-#: template/gsoc.html.j2:23
+#: template/gsoc.html.j2:12
 msgid "Current projects"
 msgstr ""
 
-#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+#: template/gsoc.html.j2:13 template/gsoc.html.j2:181
 msgid "Past projects"
 msgstr ""
 
-#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+#: template/gsoc.html.j2:14 template/gsoc.html.j2:569
 msgid "Finished projects"
 msgstr ""
 
-#: template/gsoc.html.j2:30
+#: template/gsoc.html.j2:21
+msgid ""
+"As a GNU project, GNUnet has participated in the Google Summer of Code "
+"(GSoC) for a number of years. This page lists all current, past, and "
+"finished projects."
+msgstr ""
+
+#: template/gsoc.html.j2:31
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:34
+#: template/gsoc.html.j2:35
 msgid ""
 "It is time for GNUnet to run properly on Android. Note that GNUnet is "
 "written in C, and this is not about rewriting GNUnet in Java, but about "
 "getting the C code to run on Android."
 msgstr ""
 
-#: template/gsoc.html.j2:41
+#: template/gsoc.html.j2:42
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:50
+#: template/gsoc.html.j2:51
 msgid ""
 "There is a push for migrating our CI to Gitlab. The CI should eventually not "
 "just run \"make check\" on various platforms, but also perform tests with "
@@ -1023,11 +1027,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:62
+#: template/gsoc.html.j2:63
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:71
+#: template/gsoc.html.j2:72
 msgid ""
 "Python 2.7 is reaching its end-of-life, and we want to get rid of the "
 "dependency on Python. The existing gnunet-qr tool is a rather simple wrapper "
@@ -1037,7 +1041,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:87
+#: template/gsoc.html.j2:88
 msgid ""
 "reclaimID is a decentralized identity system build on top of the GNU Name "
 "System. Upon authorization, the user provides a requesting party (RP) such "
@@ -1056,7 +1060,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:118
+#: template/gsoc.html.j2:119
 msgid ""
 "re:claimID is a decentralized identity system build on top of the GNU Name "
 "System. The initial design and implementation of re:claimID includes an "
@@ -1078,7 +1082,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:153
+#: template/gsoc.html.j2:154
 msgid ""
 "One great problem of the current Internet is the lack of disintermediation. "
 "When people want to talk they need a chat service. When they want to share "
@@ -1094,18 +1098,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:175
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:184
+#: template/gsoc.html.j2:185
 msgid ""
 "There are a variety of GNUNet APIs that should be exposed in the Rust "
 "wrappers. Implementing these will require extending the port of GNUNet utils "
 "written by Andrew Cann and Kelong Cong."
 msgstr ""
 
-#: template/gsoc.html.j2:192
+#: template/gsoc.html.j2:193
 msgid ""
 "As an introduction to the code base, we suggest that the student and Jeff "
 "Burdges together update the asynchronous IO system from gjio to futures-rs "
@@ -1113,26 +1117,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:202 template/gsoc.html.j2:226
-#: template/gsoc.html.j2:280 template/gsoc.html.j2:310
-#: template/gsoc.html.j2:554
+#: template/gsoc.html.j2:203 template/gsoc.html.j2:227
+#: template/gsoc.html.j2:281 template/gsoc.html.j2:311
+#: template/gsoc.html.j2:555
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:207
+#: template/gsoc.html.j2:208
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:212
+#: template/gsoc.html.j2:213
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:220
+#: template/gsoc.html.j2:221
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:231
+#: template/gsoc.html.j2:232
 msgid ""
 "Note: There was a Special TLDs spec to allow Tor to resolve domain names "
 "using GNS over Tor too, but currently that's on hold until folks think more "
@@ -1140,17 +1144,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
-#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
+#: template/gsoc.html.j2:241 template/gsoc.html.j2:415
+#: template/gsoc.html.j2:455 template/gsoc.html.j2:485
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
-#: template/gsoc.html.j2:594
+#: template/gsoc.html.j2:246 template/gsoc.html.j2:490
+#: template/gsoc.html.j2:595
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:253
+#: template/gsoc.html.j2:254
 msgid ""
 "Design and implementation of <a href=\"http://jsonapi.org/\">REST APIs</a> "
 "that expose the <a href=\"https://gnunet.org/doxygen/modules.html\">GNUnet "
@@ -1158,11 +1162,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
+#: template/gsoc.html.j2:265 template/gsoc.html.j2:585
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:272
+#: template/gsoc.html.j2:273
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1170,42 +1174,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:288
+#: template/gsoc.html.j2:289
 msgid ""
 "Implement rudimentary Android compatibility for GNUnet, in part by porting "
 "the GNUnet utils scheduler to act as a thin wrapper over libuv."
 msgstr ""
 
-#: template/gsoc.html.j2:295
+#: template/gsoc.html.j2:296
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
+#: template/gsoc.html.j2:304 template/gsoc.html.j2:548
 msgid ""
 "Implementation of a replacement for PANDA (see Pond) with better security, "
 "and maybe integration with the GNU Name System for key exchange."
 msgstr ""
 
-#: template/gsoc.html.j2:315
+#: template/gsoc.html.j2:316
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
-#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
+#: template/gsoc.html.j2:321 template/gsoc.html.j2:378
+#: template/gsoc.html.j2:420 template/gsoc.html.j2:460
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:329
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:334
+#: template/gsoc.html.j2:335
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:338
+#: template/gsoc.html.j2:339
 msgid ""
 "<ul> <li>File: generic file with comments</li> <li>Image: display an image "
 "with comments referencing a region of the image</li> <li>Sound: play a sound "
@@ -1215,11 +1219,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:349
+#: template/gsoc.html.j2:350
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:353
+#: template/gsoc.html.j2:354
 msgid ""
 "<ul> <li>Fork existing channels, reorganize people into new chatrooms or "
 "channels.</li> <li>Share a post (edit and repost something elsewhere, on a "
@@ -1228,21 +1232,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:363
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:367
+#: template/gsoc.html.j2:368
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:372
+#: template/gsoc.html.j2:373
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:385
+#: template/gsoc.html.j2:386
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1253,17 +1257,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:403
+#: template/gsoc.html.j2:404
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:410 template/gsoc.html.j2:450
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:426
+#: template/gsoc.html.j2:427
 msgid ""
 "<ul> <li> Emulate IMAP/SMTP protocols as necessary to transform traditional "
 "mail clients into secushare user interfaces. </li> <li> Think of ways to map "
@@ -1273,7 +1277,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:467
+#: template/gsoc.html.j2:468
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1282,33 +1286,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:479
+#: template/gsoc.html.j2:480
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:497
+#: template/gsoc.html.j2:498
 msgid ""
 "Implementation of additional transports to make GNUnet communication more "
 "robust in the presence of problematic networks: GNUnet-over-SMTP, GNUnet-"
 "over-DNS"
 msgstr ""
 
-#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
+#: template/gsoc.html.j2:505 template/gsoc.html.j2:519
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:512
+#: template/gsoc.html.j2:513
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:526
+#: template/gsoc.html.j2:527
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:534
+#: template/gsoc.html.j2:535
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1316,13 +1320,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:562
+#: template/gsoc.html.j2:563
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:574
+#: template/gsoc.html.j2:575
 msgid ""
 "Implementation of a Web-based UI for GNUnet similar to GNUnet-Gtk with a yet "
 "to be determined framework such as Angular2. This includes the design and "
@@ -1331,11 +1335,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:590
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:599
+#: template/gsoc.html.j2:600
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1502,7 +1506,7 @@ msgid ""
 "html\">install GNUnet</a>, <a href=\"https://gnunet.org/en/use.html\">use "
 "it</a> and <a href=\"https://gnunet.org/en/contribute.html\">contribute</a>. "
 "<br> Be aware that this project is still in an early alpha stage when it "
-"comes to software – its not an easy task to rewrite the whole Internet!"
+"comes to software &#8211; its not an easy task to rewrite the whole Internet!"
 msgstr ""
 
 #: template/index.html.j2:242
@@ -1597,125 +1601,125 @@ msgid ""
 "cryptographic protocols to verify keys."
 msgstr ""
 
-#: template/install-on-archpi.html.j2:5
+#: template/install-on-archpi.html.j2:6
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:12 template/install-on-debian9.html.j2:28
-#: template/install-on-macos.html.j2:14 template/install-on-netbsd.html.j2:17
-#: template/install-on-ubuntu1804.html.j2:28
+#: template/install-on-archpi.html.j2:15 template/install-on-debian9.html.j2:29
+#: template/install-on-macos.html.j2:17 template/install-on-netbsd.html.j2:19
+#: template/install-on-ubuntu1804.html.j2:26
 msgid "Requirements"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:35
+#: template/install-on-archpi.html.j2:38
 msgid "Get the Source Code"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:56
+#: template/install-on-archpi.html.j2:59
 msgid "Run"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:121
+#: template/install-on-archpi.html.j2:124
 msgid "Make sure, it works!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:5
+#: template/install-on-debian9.html.j2:6
 msgid "Tutorial: GNUnet on Debian 9"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:7
+#: template/install-on-debian9.html.j2:9
 #: template/install-on-ubuntu1804.html.j2:9
 msgid "Introduction"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:44
-#: template/install-on-ubuntu1804.html.j2:44
+#: template/install-on-debian9.html.j2:45
+#: template/install-on-ubuntu1804.html.j2:41
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:58 template/install-on-macos.html.j2:144
-#: template/install-on-netbsd.html.j2:222
-#: template/install-on-ubuntu1804.html.j2:57
+#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: template/install-on-netbsd.html.j2:224
+#: template/install-on-ubuntu1804.html.j2:53
 msgid "Get the source code"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:77 template/install-on-macos.html.j2:152
-#: template/install-on-netbsd.html.j2:230
-#: template/install-on-ubuntu1804.html.j2:67
+#: template/install-on-debian9.html.j2:78 template/install-on-macos.html.j2:155
+#: template/install-on-netbsd.html.j2:232
+#: template/install-on-ubuntu1804.html.j2:61
 msgid "Compile and Install"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:102
-#: template/install-on-macos.html.j2:164 template/install-on-netbsd.html.j2:240
-#: template/install-on-ubuntu1804.html.j2:78
+#: template/install-on-debian9.html.j2:103
+#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: template/install-on-ubuntu1804.html.j2:70
 msgid "Option 1: GNUnet for production / usage"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:114
-#: template/install-on-ubuntu1804.html.j2:90
+#: template/install-on-debian9.html.j2:115
+#: template/install-on-ubuntu1804.html.j2:80
 msgid "Option 2: GNUnet for development"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:125
+#: template/install-on-debian9.html.j2:126
 msgid "Option 3: gnunet-gtk"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:141
-#: template/install-on-ubuntu1804.html.j2:102
+#: template/install-on-debian9.html.j2:142
+#: template/install-on-ubuntu1804.html.j2:92
 msgid "Install GNUnet plugin for name resolution"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:195
-#: template/install-on-ubuntu1804.html.j2:141
+#: template/install-on-debian9.html.j2:196
+#: template/install-on-ubuntu1804.html.j2:129
 msgid "Configuration"
 msgstr ""
 
 #: template/install-on-debian9.html.j2:272
-#: template/install-on-ubuntu1804.html.j2:217
+#: template/install-on-ubuntu1804.html.j2:203
 msgid "Use GNUnet!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:278
-#: template/install-on-ubuntu1804.html.j2:224
+#: template/install-on-debian9.html.j2:277
+#: template/install-on-ubuntu1804.html.j2:208
 msgid "Uninstall GNUnet and its dependencies"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:294
-#: template/install-on-ubuntu1804.html.j2:242
+#: template/install-on-debian9.html.j2:293
+#: template/install-on-ubuntu1804.html.j2:224
 msgid "Troubleshooting"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:296
-#: template/install-on-ubuntu1804.html.j2:245
+#: template/install-on-debian9.html.j2:295
+#: template/install-on-ubuntu1804.html.j2:225
 msgid "You can't reach other people's nodes"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:332
-#: template/install-on-ubuntu1804.html.j2:276
+#: template/install-on-debian9.html.j2:331
+#: template/install-on-ubuntu1804.html.j2:256
 msgid "OMG you guys broke my internet"
 msgstr ""
 
-#: template/install-on-macos.html.j2:5
+#: template/install-on-macos.html.j2:6
 msgid "Tutorial: GNUnet on macOS 10.14 (Mojave)"
 msgstr ""
 
-#: template/install-on-macos.html.j2:21 template/install-on-netbsd.html.j2:28
+#: template/install-on-macos.html.j2:24 template/install-on-netbsd.html.j2:30
 msgid "Installation"
 msgstr ""
 
-#: template/install-on-macos.html.j2:39 template/install-on-netbsd.html.j2:100
+#: template/install-on-macos.html.j2:42 template/install-on-netbsd.html.j2:102
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:119 template/install-on-netbsd.html.j2:180
+#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
 msgid "Alternative: Installation from source"
 msgstr ""
 
-#: template/install-on-macos.html.j2:197 template/install-on-netbsd.html.j2:265
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
-#: template/install-on-netbsd.html.j2:5
+#: template/install-on-netbsd.html.j2:6
 msgid "Tutorial: GNUnet on NetBSD 8.0 CURRENT"
 msgstr ""
 
@@ -1728,20 +1732,19 @@ msgid ""
 "<p>The following GNUnet installation instructions help you building from "
 "source for your distribution.</p> <p><i>Please note that the installation "
 "process will get much easier once we have proper packages again (planned for "
-"winter 2019).</i></p>"
+"winter 2019).</i></p> <p>You have already installed GNUnet and want to use "
+"it? <a href=\"https://gnunet.org/en/use\">Check this out!</a> </p>"
 msgstr ""
 
-#: template/install.html.j2:15
+#: template/install.html.j2:19
 msgid ""
-"<p>You have already installed GNUnet and want to use it? <a href=\"https://"
-"gnunet.org/en/use\">Check this out!</a> </p> <p>Please be aware that this "
-"project is still in an early alpha stage when it comes to running software – "
-"its not an easy task to rewrite the whole Internet! We are happy to get your "
-"<a href=\"engage.html\">helping hand</a> anytime!</p> <p>Further information "
-"is available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
-"GNUnet-1\">handbook</a>.</p> <p>If you have any queries about the "
-"installation or the usage, please <a href=\"engage.html\">get in touch!</a></"
-"p>"
+"<p>Please be aware that this project is still in an early alpha stage when "
+"it comes to running software &#8211; its not an easy task to rewrite the "
+"whole Internet! We are happy to get your <a href=\"engage.html\">helping "
+"hand</a> anytime!</p> <p>Further information is available in our <a href="
+"\"https://docs.gnunet.org/#toc-Using-GNUnet-1\">handbook</a>.</p> <p>If you "
+"have any queries about the installation or the usage, please <a href="
+"\"engage.html\">get in touch!</a></p>"
 msgstr ""
 
 #: template/news.html.j2.inc:11
@@ -1830,40 +1833,56 @@ msgstr ""
 msgid "How to use GNUnet - in a nutshell"
 msgstr ""
 
-#: template/use.html.j2:18
-msgid "Make sure your GNUnet installation works..."
+#: template/use.html.j2:12 template/use.html.j2:64
+msgid "Filesharing"
 msgstr ""
 
-#: template/use.html.j2:33
-msgid "... and play around with it."
+#: template/use.html.j2:13
+msgid "CADET"
 msgstr ""
 
-#: template/use.html.j2:50
-msgid "Filesharing"
+#: template/use.html.j2:14
+msgid "Minimal Groupchat"
 msgstr ""
 
-#: template/use.html.j2:91
-msgid "CADET (and Chat)"
+#: template/use.html.j2:15
+msgid "GNS with CLI"
 msgstr ""
 
-#: template/use.html.j2:125
-msgid "Chatting with a (simple) client"
+#: template/use.html.j2:16
+msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:167
-msgid "Name resolution using GNS on the command line"
+#: template/use.html.j2:17 template/use.html.j2:332
+msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:239
-msgid "Name resolution using GNS with a browser"
+#: template/use.html.j2:18 template/use.html.j2:393
+msgid "Conversation"
 msgstr ""
 
-#: template/use.html.j2:316
-msgid "VPN"
+#: template/use.html.j2:32
+msgid "Make sure your GNUnet installation works..."
 msgstr ""
 
-#: template/use.html.j2:377
-msgid "Conversation"
+#: template/use.html.j2:47
+msgid "... and play around with it."
+msgstr ""
+
+#: template/use.html.j2:105
+msgid "CADET (and Chat)"
+msgstr ""
+
+#: template/use.html.j2:139
+msgid "Chatting with a (simple) client"
+msgstr ""
+
+#: template/use.html.j2:183
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:255
+msgid "Name resolution using GNS with a browser"
 msgstr ""
 
 #: template/video.html.j2:6
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 9d78309b..5be199b3 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-01 15:53+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,11 +54,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -108,44 +108,44 @@ msgstr ""
 msgid "System Architecture"
 msgstr ""
 
-#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:126
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+msgid "Development Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:82
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr ""
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
 msgid "FAQ"
 msgstr ""
 
@@ -288,8 +288,8 @@ msgstr ""
 #: template/about.html.j2:100
 msgid ""
 "Please be aware that this project is (despite of it's age) still in an early "
-"alpha stage when it comes to software – its not an easy task to rewrite the "
-"whole Internet!"
+"alpha stage when it comes to software &#8211; its not an easy task to "
+"rewrite the whole Internet!"
 msgstr ""
 
 #: template/about.html.j2:105
@@ -506,7 +506,7 @@ msgid ""
 "org/gauger/\">https://old.gnunet.org/gauger/</a>."
 msgstr ""
 
-#: template/download.html.j2:7 template/gnurl.html.j2:138
+#: template/download.html.j2:7 template/gnurl.html.j2:140
 msgid "Downloads"
 msgstr ""
 
@@ -547,7 +547,11 @@ msgstr ""
 msgid "Verein zur F&ouml;rderung von GNUnet e.V."
 msgstr ""
 
-#: template/ev.html.j2:12
+#: template/ev.html.j2:11
+msgid "About GNUnet e.V."
+msgstr ""
+
+#: template/ev.html.j2:13
 msgid ""
 "On December 27th 2013 a group of GNUnet hackers met at 30c3 to create the "
 "\"Verein zur F&ouml;rderung von GNUnet e.V.\", an association under German "
@@ -555,18 +559,35 @@ msgid ""
 "the association on the 7th of March under VR 205287."
 msgstr ""
 
-#: template/ev.html.j2:21
+#: template/ev.html.j2:22
 msgid ""
 "The association is officially dedicated to supporting research, development "
 "and education in the area of secure decentralized networking in general, and "
 "GNUnet specifically. This is the official website for the association."
 msgstr ""
 
+#: template/ev.html.j2:31
+msgid "Becoming a Member of GNUnet e.V."
+msgstr ""
+
 #: template/ev.html.j2:33
+msgid ""
+"GNUnet developers with git (write) access can become members to participate "
+"in the decision process and formally support GNUnet e.V. For this, all you "
+"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
+"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
+"membership dues; however, members are required to support GNUnet e.V. and in "
+"particularly contribute to the technical development within their means. For "
+"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
+"git/\">Satzung</a> (currently only available in German, translations "
+"welcome)."
+msgstr ""
+
+#: template/ev.html.j2:52
 msgid "Governance"
 msgstr ""
 
-#: template/ev.html.j2:35
+#: template/ev.html.j2:54
 msgid ""
 "You can find our \"Satzung\", and the list of members under <a href="
 "\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet."
@@ -577,28 +598,19 @@ msgid ""
 "dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:52
-msgid "Becoming a Member of GNUnet e.V."
+#: template/ev.html.j2:71
+msgid "Official Meeting Notes"
 msgstr ""
 
-#: template/ev.html.j2:54
-msgid ""
-"GNUnet developers with git (write) access can become members to participate "
-"in the decision process and formally support GNUnet e.V. For this, all you "
-"have to do is update the <tt>members.txt</tt> file in the <a href=\"https://"
-"git.gnunet.org/gnunet-ev.git/\">gnunet-ev</a> repository. There are no "
-"membership dues; however, members are required to support GNUnet e.V. and in "
-"particularly contribute to the technical development within their means. For "
-"further details, we refer to the <a href=\"https://git.gnunet.org/gnunet-ev."
-"git/\">Satzung</a> (currently only available in German, translations "
-"welcome)."
+#: template/ev.html.j2:74
+msgid "2013-12 (constitutional meeting)"
 msgstr ""
 
-#: template/ev.html.j2:73
+#: template/ev.html.j2:99
 msgid "Support Us!"
 msgstr ""
 
-#: template/ev.html.j2:75
+#: template/ev.html.j2:101
 msgid ""
 "Everybody is welcome to support us via donations. For financial "
 "contributions, Europeans are able to donate via SEPA. We hope to setup "
@@ -611,14 +623,6 @@ msgid ""
 "<dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd> </dl>"
 msgstr ""
 
-#: template/ev.html.j2:94
-msgid "Official Meeting Notes"
-msgstr ""
-
-#: template/ev.html.j2:97
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
 #: template/faq.html.j2:12
 msgid ""
 "I receive many &quot;WARNING Calculated flow delay for X at Y for Z&quot;. "
@@ -729,7 +733,7 @@ msgid ""
 "with egos."
 msgstr ""
 
-#: template/gnurl.html.j2:7
+#: template/gnurl.html.j2:11
 msgid ""
 "libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
 "HTTP and HTTPS (and only HTTP 1.x) with a single crypto backend (GnuTLS) to "
@@ -741,11 +745,11 @@ msgid ""
 "to get a proper build of libgnurl."
 msgstr ""
 
-#: template/gnurl.html.j2:22
+#: template/gnurl.html.j2:26
 msgid "Motivation"
 msgstr ""
 
-#: template/gnurl.html.j2:24
+#: template/gnurl.html.j2:28
 msgid ""
 "cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
 "other variants are used by some distributions. Supporting other crypto "
@@ -757,7 +761,7 @@ msgid ""
 "the bugs that arise might be rather subtle."
 msgstr ""
 
-#: template/gnurl.html.j2:37
+#: template/gnurl.html.j2:41
 msgid ""
 "For GNUnet, we also need a particularly modern version of GnuTLS. Thus, it "
 "would anyway be necessary to recompile cURL for GNUnet. But what happens if "
@@ -779,7 +783,7 @@ msgid ""
 "that code."
 msgstr ""
 
-#: template/gnurl.html.j2:61
+#: template/gnurl.html.j2:65
 msgid ""
 "So to use a modern version of GnuTLS, a sane approach is to disable all of "
 "the \"optional\" features of cURL that drag in system libraries that link "
@@ -793,11 +797,11 @@ msgid ""
 "this can really be trivially fixed by the cURL developers."
 msgstr ""
 
-#: template/gnurl.html.j2:75
+#: template/gnurl.html.j2:79
 msgid "Rename to fix"
 msgstr ""
 
-#: template/gnurl.html.j2:77
+#: template/gnurl.html.j2:81
 #, python-format
 msgid ""
 "How does forking fix it? Easy. First, we can get rid of all of the "
@@ -816,11 +820,11 @@ msgid ""
 "new release."
 msgstr ""
 
-#: template/gnurl.html.j2:95
+#: template/gnurl.html.j2:99
 msgid "Using libgnurl"
 msgstr ""
 
-#: template/gnurl.html.j2:97
+#: template/gnurl.html.j2:101
 msgid ""
 "Projects that use cURL only for HTTP/HTTPS and that would work with GnuTLS "
 "should be able to switch to libgnurl by changing \"-lcurl\" to \"-lgnurl\". "
@@ -831,18 +835,18 @@ msgid ""
 "the original curl source have been written."
 msgstr ""
 
-#: template/gnurl.html.j2:109
+#: template/gnurl.html.j2:113
 msgid "Gotchas"
 msgstr ""
 
-#: template/gnurl.html.j2:111
+#: template/gnurl.html.j2:115
 msgid ""
 "libgnurl and gnurl are not intended to be used as a replacement for curl for "
 "users. Since no conflicts in filenames should occur you are not expected to "
 "remove curl to make use of gnurl and viceversa."
 msgstr ""
 
-#: template/gnurl.html.j2:126
+#: template/gnurl.html.j2:128
 msgid ""
 "You can get the Gnurl Git repository using: <!-- https://bugs.gnunet.org/"
 "view.php?id=5483 ! <code>git clone https://git.taler.net/gnurl.git</code> --"
@@ -850,7 +854,7 @@ msgid ""
 "checked in as signed git tags."
 msgstr ""
 
-#: template/gnurl.html.j2:140
+#: template/gnurl.html.j2:142
 msgid ""
 "Releases are published on <a href=\"https://ftp.gnu.org/gnu/gnunet/\">ftp."
 "gnu.org/gnu/gnunet</a>. gnURL is available from within a variety of "
@@ -863,22 +867,22 @@ msgid ""
 "\">pkgsrc</a>."
 msgstr ""
 
-#: template/gnurl.html.j2:154
+#: template/gnurl.html.j2:157
 msgid "Reporting Bugs"
 msgstr ""
 
-#: template/gnurl.html.j2:156
+#: template/gnurl.html.j2:159
 msgid ""
 "You can report bugs on our bug tracker: <a href=\"https://bugs.gnunet.org/"
 "\">bugs.gnunet.org</a>. Alternatively you can use our bug mailinglist, but "
 "we prefer to track bugs on the bugtracker."
 msgstr ""
 
-#: template/gnurl.html.j2:165
+#: template/gnurl.html.j2:168
 msgid "Maintainer and Cryptographic signatures"
 msgstr ""
 
-#: template/gnurl.html.j2:167
+#: template/gnurl.html.j2:170
 msgid ""
 "gnurl/libgnurl is maintained by ng0. Releases are signed with the OpenPGP "
 "Key <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>, with the key "
@@ -976,43 +980,43 @@ msgstr ""
 msgid "GNUnet's Google Summer of Code projects"
 msgstr ""
 
-#: template/gsoc.html.j2:11
-msgid ""
-"As a GNU project, GNUnet has participated in the Google Summer of Code "
-"(GSoC) for a number of years. This page lists all current, past, and "
-"finished projects."
-msgstr ""
-
-#: template/gsoc.html.j2:23
+#: template/gsoc.html.j2:12
 msgid "Current projects"
 msgstr ""
 
-#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+#: template/gsoc.html.j2:13 template/gsoc.html.j2:181
 msgid "Past projects"
 msgstr ""
 
-#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+#: template/gsoc.html.j2:14 template/gsoc.html.j2:569
 msgid "Finished projects"
 msgstr ""
 
-#: template/gsoc.html.j2:30
+#: template/gsoc.html.j2:21
+msgid ""
+"As a GNU project, GNUnet has participated in the Google Summer of Code "
+"(GSoC) for a number of years. This page lists all current, past, and "
+"finished projects."
+msgstr ""
+
+#: template/gsoc.html.j2:31
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:34
+#: template/gsoc.html.j2:35
 msgid ""
 "It is time for GNUnet to run properly on Android. Note that GNUnet is "
 "written in C, and this is not about rewriting GNUnet in Java, but about "
 "getting the C code to run on Android."
 msgstr ""
 
-#: template/gsoc.html.j2:41
+#: template/gsoc.html.j2:42
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:50
+#: template/gsoc.html.j2:51
 msgid ""
 "There is a push for migrating our CI to Gitlab. The CI should eventually not "
 "just run \"make check\" on various platforms, but also perform tests with "
@@ -1023,11 +1027,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:62
+#: template/gsoc.html.j2:63
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:71
+#: template/gsoc.html.j2:72
 msgid ""
 "Python 2.7 is reaching its end-of-life, and we want to get rid of the "
 "dependency on Python. The existing gnunet-qr tool is a rather simple wrapper "
@@ -1037,7 +1041,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:87
+#: template/gsoc.html.j2:88
 msgid ""
 "reclaimID is a decentralized identity system build on top of the GNU Name "
 "System. Upon authorization, the user provides a requesting party (RP) such "
@@ -1056,7 +1060,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:118
+#: template/gsoc.html.j2:119
 msgid ""
 "re:claimID is a decentralized identity system build on top of the GNU Name "
 "System. The initial design and implementation of re:claimID includes an "
@@ -1078,7 +1082,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:153
+#: template/gsoc.html.j2:154
 msgid ""
 "One great problem of the current Internet is the lack of disintermediation. "
 "When people want to talk they need a chat service. When they want to share "
@@ -1094,18 +1098,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:175
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:184
+#: template/gsoc.html.j2:185
 msgid ""
 "There are a variety of GNUNet APIs that should be exposed in the Rust "
 "wrappers. Implementing these will require extending the port of GNUNet utils "
 "written by Andrew Cann and Kelong Cong."
 msgstr ""
 
-#: template/gsoc.html.j2:192
+#: template/gsoc.html.j2:193
 msgid ""
 "As an introduction to the code base, we suggest that the student and Jeff "
 "Burdges together update the asynchronous IO system from gjio to futures-rs "
@@ -1113,26 +1117,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:202 template/gsoc.html.j2:226
-#: template/gsoc.html.j2:280 template/gsoc.html.j2:310
-#: template/gsoc.html.j2:554
+#: template/gsoc.html.j2:203 template/gsoc.html.j2:227
+#: template/gsoc.html.j2:281 template/gsoc.html.j2:311
+#: template/gsoc.html.j2:555
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:207
+#: template/gsoc.html.j2:208
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:212
+#: template/gsoc.html.j2:213
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:220
+#: template/gsoc.html.j2:221
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:231
+#: template/gsoc.html.j2:232
 msgid ""
 "Note: There was a Special TLDs spec to allow Tor to resolve domain names "
 "using GNS over Tor too, but currently that's on hold until folks think more "
@@ -1140,17 +1144,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
-#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
+#: template/gsoc.html.j2:241 template/gsoc.html.j2:415
+#: template/gsoc.html.j2:455 template/gsoc.html.j2:485
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
-#: template/gsoc.html.j2:594
+#: template/gsoc.html.j2:246 template/gsoc.html.j2:490
+#: template/gsoc.html.j2:595
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:253
+#: template/gsoc.html.j2:254
 msgid ""
 "Design and implementation of <a href=\"http://jsonapi.org/\">REST APIs</a> "
 "that expose the <a href=\"https://gnunet.org/doxygen/modules.html\">GNUnet "
@@ -1158,11 +1162,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
+#: template/gsoc.html.j2:265 template/gsoc.html.j2:585
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:272
+#: template/gsoc.html.j2:273
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1170,42 +1174,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:288
+#: template/gsoc.html.j2:289
 msgid ""
 "Implement rudimentary Android compatibility for GNUnet, in part by porting "
 "the GNUnet utils scheduler to act as a thin wrapper over libuv."
 msgstr ""
 
-#: template/gsoc.html.j2:295
+#: template/gsoc.html.j2:296
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
+#: template/gsoc.html.j2:304 template/gsoc.html.j2:548
 msgid ""
 "Implementation of a replacement for PANDA (see Pond) with better security, "
 "and maybe integration with the GNU Name System for key exchange."
 msgstr ""
 
-#: template/gsoc.html.j2:315
+#: template/gsoc.html.j2:316
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
-#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
+#: template/gsoc.html.j2:321 template/gsoc.html.j2:378
+#: template/gsoc.html.j2:420 template/gsoc.html.j2:460
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:329
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:334
+#: template/gsoc.html.j2:335
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:338
+#: template/gsoc.html.j2:339
 msgid ""
 "<ul> <li>File: generic file with comments</li> <li>Image: display an image "
 "with comments referencing a region of the image</li> <li>Sound: play a sound "
@@ -1215,11 +1219,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:349
+#: template/gsoc.html.j2:350
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:353
+#: template/gsoc.html.j2:354
 msgid ""
 "<ul> <li>Fork existing channels, reorganize people into new chatrooms or "
 "channels.</li> <li>Share a post (edit and repost something elsewhere, on a "
@@ -1228,21 +1232,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:363
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:367
+#: template/gsoc.html.j2:368
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:372
+#: template/gsoc.html.j2:373
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:385
+#: template/gsoc.html.j2:386
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1253,17 +1257,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:403
+#: template/gsoc.html.j2:404
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:410 template/gsoc.html.j2:450
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:426
+#: template/gsoc.html.j2:427
 msgid ""
 "<ul> <li> Emulate IMAP/SMTP protocols as necessary to transform traditional "
 "mail clients into secushare user interfaces. </li> <li> Think of ways to map "
@@ -1273,7 +1277,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:467
+#: template/gsoc.html.j2:468
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1282,33 +1286,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:479
+#: template/gsoc.html.j2:480
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:497
+#: template/gsoc.html.j2:498
 msgid ""
 "Implementation of additional transports to make GNUnet communication more "
 "robust in the presence of problematic networks: GNUnet-over-SMTP, GNUnet-"
 "over-DNS"
 msgstr ""
 
-#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
+#: template/gsoc.html.j2:505 template/gsoc.html.j2:519
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:512
+#: template/gsoc.html.j2:513
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:526
+#: template/gsoc.html.j2:527
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:534
+#: template/gsoc.html.j2:535
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1316,13 +1320,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:562
+#: template/gsoc.html.j2:563
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:574
+#: template/gsoc.html.j2:575
 msgid ""
 "Implementation of a Web-based UI for GNUnet similar to GNUnet-Gtk with a yet "
 "to be determined framework such as Angular2. This includes the design and "
@@ -1331,11 +1335,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:590
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:599
+#: template/gsoc.html.j2:600
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1502,7 +1506,7 @@ msgid ""
 "html\">install GNUnet</a>, <a href=\"https://gnunet.org/en/use.html\">use "
 "it</a> and <a href=\"https://gnunet.org/en/contribute.html\">contribute</a>. "
 "<br> Be aware that this project is still in an early alpha stage when it "
-"comes to software – its not an easy task to rewrite the whole Internet!"
+"comes to software &#8211; its not an easy task to rewrite the whole Internet!"
 msgstr ""
 
 #: template/index.html.j2:242
@@ -1597,125 +1601,125 @@ msgid ""
 "cryptographic protocols to verify keys."
 msgstr ""
 
-#: template/install-on-archpi.html.j2:5
+#: template/install-on-archpi.html.j2:6
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:12 template/install-on-debian9.html.j2:28
-#: template/install-on-macos.html.j2:14 template/install-on-netbsd.html.j2:17
-#: template/install-on-ubuntu1804.html.j2:28
+#: template/install-on-archpi.html.j2:15 template/install-on-debian9.html.j2:29
+#: template/install-on-macos.html.j2:17 template/install-on-netbsd.html.j2:19
+#: template/install-on-ubuntu1804.html.j2:26
 msgid "Requirements"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:35
+#: template/install-on-archpi.html.j2:38
 msgid "Get the Source Code"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:56
+#: template/install-on-archpi.html.j2:59
 msgid "Run"
 msgstr ""
 
-#: template/install-on-archpi.html.j2:121
+#: template/install-on-archpi.html.j2:124
 msgid "Make sure, it works!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:5
+#: template/install-on-debian9.html.j2:6
 msgid "Tutorial: GNUnet on Debian 9"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:7
+#: template/install-on-debian9.html.j2:9
 #: template/install-on-ubuntu1804.html.j2:9
 msgid "Introduction"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:44
-#: template/install-on-ubuntu1804.html.j2:44
+#: template/install-on-debian9.html.j2:45
+#: template/install-on-ubuntu1804.html.j2:41
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:58 template/install-on-macos.html.j2:144
-#: template/install-on-netbsd.html.j2:222
-#: template/install-on-ubuntu1804.html.j2:57
+#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: template/install-on-netbsd.html.j2:224
+#: template/install-on-ubuntu1804.html.j2:53
 msgid "Get the source code"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:77 template/install-on-macos.html.j2:152
-#: template/install-on-netbsd.html.j2:230
-#: template/install-on-ubuntu1804.html.j2:67
+#: template/install-on-debian9.html.j2:78 template/install-on-macos.html.j2:155
+#: template/install-on-netbsd.html.j2:232
+#: template/install-on-ubuntu1804.html.j2:61
 msgid "Compile and Install"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:102
-#: template/install-on-macos.html.j2:164 template/install-on-netbsd.html.j2:240
-#: template/install-on-ubuntu1804.html.j2:78
+#: template/install-on-debian9.html.j2:103
+#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: template/install-on-ubuntu1804.html.j2:70
 msgid "Option 1: GNUnet for production / usage"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:114
-#: template/install-on-ubuntu1804.html.j2:90
+#: template/install-on-debian9.html.j2:115
+#: template/install-on-ubuntu1804.html.j2:80
 msgid "Option 2: GNUnet for development"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:125
+#: template/install-on-debian9.html.j2:126
 msgid "Option 3: gnunet-gtk"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:141
-#: template/install-on-ubuntu1804.html.j2:102
+#: template/install-on-debian9.html.j2:142
+#: template/install-on-ubuntu1804.html.j2:92
 msgid "Install GNUnet plugin for name resolution"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:195
-#: template/install-on-ubuntu1804.html.j2:141
+#: template/install-on-debian9.html.j2:196
+#: template/install-on-ubuntu1804.html.j2:129
 msgid "Configuration"
 msgstr ""
 
 #: template/install-on-debian9.html.j2:272
-#: template/install-on-ubuntu1804.html.j2:217
+#: template/install-on-ubuntu1804.html.j2:203
 msgid "Use GNUnet!"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:278
-#: template/install-on-ubuntu1804.html.j2:224
+#: template/install-on-debian9.html.j2:277
+#: template/install-on-ubuntu1804.html.j2:208
 msgid "Uninstall GNUnet and its dependencies"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:294
-#: template/install-on-ubuntu1804.html.j2:242
+#: template/install-on-debian9.html.j2:293
+#: template/install-on-ubuntu1804.html.j2:224
 msgid "Troubleshooting"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:296
-#: template/install-on-ubuntu1804.html.j2:245
+#: template/install-on-debian9.html.j2:295
+#: template/install-on-ubuntu1804.html.j2:225
 msgid "You can't reach other people's nodes"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:332
-#: template/install-on-ubuntu1804.html.j2:276
+#: template/install-on-debian9.html.j2:331
+#: template/install-on-ubuntu1804.html.j2:256
 msgid "OMG you guys broke my internet"
 msgstr ""
 
-#: template/install-on-macos.html.j2:5
+#: template/install-on-macos.html.j2:6
 msgid "Tutorial: GNUnet on macOS 10.14 (Mojave)"
 msgstr ""
 
-#: template/install-on-macos.html.j2:21 template/install-on-netbsd.html.j2:28
+#: template/install-on-macos.html.j2:24 template/install-on-netbsd.html.j2:30
 msgid "Installation"
 msgstr ""
 
-#: template/install-on-macos.html.j2:39 template/install-on-netbsd.html.j2:100
+#: template/install-on-macos.html.j2:42 template/install-on-netbsd.html.j2:102
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:119 template/install-on-netbsd.html.j2:180
+#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
 msgid "Alternative: Installation from source"
 msgstr ""
 
-#: template/install-on-macos.html.j2:197 template/install-on-netbsd.html.j2:265
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
-#: template/install-on-netbsd.html.j2:5
+#: template/install-on-netbsd.html.j2:6
 msgid "Tutorial: GNUnet on NetBSD 8.0 CURRENT"
 msgstr ""
 
@@ -1728,20 +1732,19 @@ msgid ""
 "<p>The following GNUnet installation instructions help you building from "
 "source for your distribution.</p> <p><i>Please note that the installation "
 "process will get much easier once we have proper packages again (planned for "
-"winter 2019).</i></p>"
+"winter 2019).</i></p> <p>You have already installed GNUnet and want to use "
+"it? <a href=\"https://gnunet.org/en/use\">Check this out!</a> </p>"
 msgstr ""
 
-#: template/install.html.j2:15
+#: template/install.html.j2:19
 msgid ""
-"<p>You have already installed GNUnet and want to use it? <a href=\"https://"
-"gnunet.org/en/use\">Check this out!</a> </p> <p>Please be aware that this "
-"project is still in an early alpha stage when it comes to running software – "
-"its not an easy task to rewrite the whole Internet! We are happy to get your "
-"<a href=\"engage.html\">helping hand</a> anytime!</p> <p>Further information "
-"is available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
-"GNUnet-1\">handbook</a>.</p> <p>If you have any queries about the "
-"installation or the usage, please <a href=\"engage.html\">get in touch!</a></"
-"p>"
+"<p>Please be aware that this project is still in an early alpha stage when "
+"it comes to running software &#8211; its not an easy task to rewrite the "
+"whole Internet! We are happy to get your <a href=\"engage.html\">helping "
+"hand</a> anytime!</p> <p>Further information is available in our <a href="
+"\"https://docs.gnunet.org/#toc-Using-GNUnet-1\">handbook</a>.</p> <p>If you "
+"have any queries about the installation or the usage, please <a href="
+"\"engage.html\">get in touch!</a></p>"
 msgstr ""
 
 #: template/news.html.j2.inc:11
@@ -1830,40 +1833,56 @@ msgstr ""
 msgid "How to use GNUnet - in a nutshell"
 msgstr ""
 
-#: template/use.html.j2:18
-msgid "Make sure your GNUnet installation works..."
+#: template/use.html.j2:12 template/use.html.j2:64
+msgid "Filesharing"
 msgstr ""
 
-#: template/use.html.j2:33
-msgid "... and play around with it."
+#: template/use.html.j2:13
+msgid "CADET"
 msgstr ""
 
-#: template/use.html.j2:50
-msgid "Filesharing"
+#: template/use.html.j2:14
+msgid "Minimal Groupchat"
 msgstr ""
 
-#: template/use.html.j2:91
-msgid "CADET (and Chat)"
+#: template/use.html.j2:15
+msgid "GNS with CLI"
 msgstr ""
 
-#: template/use.html.j2:125
-msgid "Chatting with a (simple) client"
+#: template/use.html.j2:16
+msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:167
-msgid "Name resolution using GNS on the command line"
+#: template/use.html.j2:17 template/use.html.j2:332
+msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:239
-msgid "Name resolution using GNS with a browser"
+#: template/use.html.j2:18 template/use.html.j2:393
+msgid "Conversation"
 msgstr ""
 
-#: template/use.html.j2:316
-msgid "VPN"
+#: template/use.html.j2:32
+msgid "Make sure your GNUnet installation works..."
 msgstr ""
 
-#: template/use.html.j2:377
-msgid "Conversation"
+#: template/use.html.j2:47
+msgid "... and play around with it."
+msgstr ""
+
+#: template/use.html.j2:105
+msgid "CADET (and Chat)"
+msgstr ""
+
+#: template/use.html.j2:139
+msgid "Chatting with a (simple) client"
+msgstr ""
+
+#: template/use.html.j2:183
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:255
+msgid "Name resolution using GNS with a browser"
 msgstr ""
 
 #: template/video.html.j2:6
diff --git a/news/2019-06-DSTJ.inc b/news/2019-06-DSTJ.inc
index a7437e85..cfe3f357 100644
--- a/news/2019-06-DSTJ.inc
+++ b/news/2019-06-DSTJ.inc
@@ -1,12 +1,12 @@
 <article>
   <h3><a name="">2019-06-28: Peer DSTJ is dead, long live peer Y924</a></h3>
   <p>
-    After some issues with our infrastructure we needed to replace our bootstrapping peer. To avoid problems when connecting to GNUnet the operator of a peer needs to update its node by removing the peer ID <code>DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</code> from the system. Here are two strategies to find copies of the respective file:
+    After some issues with our infrastructure we needed to replace our bootstrapping peer. To avoid problems when connecting to GNUnet the operator of a peer needs to update its node by removing the peer ID <tt>DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt> from the system. Here are two strategies to find copies of the respective file:
   </p>
   <p>
     <ol>
-      <li><code>$ find / -name DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</code></li>
-      <li><code>$ locate DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</code></li>
+      <li><tt>$ find / -name DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt></li>
+      <li><tt>$ locate DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt></li>
     </ol>
   </p>
 </article>
diff --git a/static/styles.sass b/static/styles.sass
index 86bfc461..8309ebf7 100644
--- a/static/styles.sass
+++ b/static/styles.sass
@@ -284,8 +284,13 @@ header
   margin-top: 30px
   margin-bottom: 50px
 
+// Some docs are too long, thus there is a need for a subnav.
+// Use "subnav" class for the submenu.
+// Use "subnav-anchor" class for the a-tags right before a section title.
 .subnav
   a.nav-link
     &:link, &:visited
       color: #419edb !important
-
+a.subnav-anchor
+  position: relative
+  top: -80px
diff --git a/static/team-images/ng0.jpg b/static/team-images/ng0.jpg
index 1ca8faef..ad56aaed 100644
--- a/static/team-images/ng0.jpg
+++ b/static/team-images/ng0.jpg
diff --git a/template/about.html.j2 b/template/about.html.j2
index 2a28a5c9..16d42b44 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -98,7 +98,7 @@
         </p>
         <p>
         {% trans %}
-Please be aware that this project is (despite of it's age) still in an early alpha stage when it comes to software – its not an easy task to rewrite the whole Internet!
+Please be aware that this project is (despite of it's age) still in an early alpha stage when it comes to software &#8211; its not an easy task to rewrite the whole Internet!
         {% endtrans %}
         <br>
       </p>
diff --git a/template/architecture.html.j2 b/template/architecture.html.j2
index b46b4b52..76fc138e 100644
--- a/template/architecture.html.j2
+++ b/template/architecture.html.j2
@@ -51,7 +51,7 @@
 
   <div class="container">
     <div class="row">
-      <div class="col">
+      <div class="col-md">
         <h2>{{ _("Foundations") }}</h2>
         <p>
           {% trans %}
@@ -66,7 +66,7 @@
         </p>
 
       </div>
-      <div class="col">
+      <div class="col-md">
         <h2>{{ _("Security") }}</h2>
 
         <p>
@@ -83,13 +83,13 @@
     </div>
 
     <div class="row">
-      <div class="col">
+      <div class="col-md">
         <h2>{{ _("System architecture") }}</h2>
         <p>
         Read more about the system architecure in the respective section of our <a href="https://docs.gnunet.org/#System-Architecture" target="_blank">handbook</a>.
         </p>
       </div>
-      <div class="col">
+      <div class="col-md">
         <h2>{{ _("Subsystems") }}</h2>
         <p>
         Read more about the subsystems (or GNUnet services) in the respective section of our <a href="https://docs.gnunet.org/#Code-overview" target="_blank">handbook</a>.
@@ -98,13 +98,13 @@
     </div>
 
     <div class="row">
-      <div class="col">
+      <div class="col-md">
         <h2>{{ _("libgnunetutil") }}</h2>
         <p>
         libgnunetutil is the fundamental library that all GNUnet code builds upon. Ideally, this library should contain most of the platform dependent code (except for user interfaces and really special needs that only few applications have). Read <a href="https://docs.gnunet.org/#libgnunetutil">more</a>.
         </p>
       </div>
-      <div class="col">
+      <div class="col-md">
         <h2>{{ _("APIs") }}</h2>
         <p>
         GNUnet offers variaty of APIs for <a href="https://docs.gnunet.org/#Interprocess-communication-API-_0028IPC_0029" target="_blank">accessing services</a> (using IPC), <a href="https://docs.gnunet.org/#Service-API">running services</a>, <a href="https://docs.gnunet.org/#Message-Queue-API">message queues</a>, or <a href="https://docs.gnunet.org/#Cryptography-API" target="_blank">cryptographic operations</a>.
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 0f4fae20..ceeff7b8 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -7,7 +7,7 @@
   </header>
 
   <div class="row">
-    <div class="col">
+    <div class="col-md">
       <h2>Join the conversation!</h2>
       <p>
         There are many ways to get engaged with GNUnet. A first step is to join the conversation on the mailing lists and on our IRC channel to keep up with development, find technical help, and discuss GNUnet:
@@ -39,14 +39,14 @@
         </li>
       </p>
     </div>
-    <div class="col">
+    <div class="col-md">
       <h2>Install GNUnet!</h2>
       <p>
         Another thing you might want now is your own GNUnet installation. As we haven’t packaged the new versions yet (June 2019) we provide <a href="https://gnunet.org/en/tutorial.html">some tutorials how to install step-by-step</a>.
      </p>
      <h2>Use GNUnet!</h2>
       <p>
-      <a href="use.html">Let's gets started...</a>
+      <a href="use.html">Let's get started...</a>
       </p>
      <h2>Report bugs!</h2>
       <p>
@@ -69,13 +69,13 @@
   </div>
 
   <div class="row">
-    <div class="col">
+    <div class="col-md">
       <h2>Bibliography</h2>
       <p>If you are more the reading kind of person, please take a seat <a href="https://bib.gnunet.org/">in our libary...</a></p>
       <h2>Videos</h2>
       <p>...or if you rather want hear us talking to you, lean back and watch some <a href="video.html">videos</a> of our talks at conferences.</p>
     </div>
-    <div class="col">
+    <div class="col-md">
       <h2>Get together!</h2>
       <p>
         We meet in meatspace occasionally, mostly in Germany and Switzerland. The usual occasions are:
diff --git a/template/ev.html.j2 b/template/ev.html.j2
index d99a6500..70c2ad81 100644
--- a/template/ev.html.j2
+++ b/template/ev.html.j2
@@ -6,8 +6,9 @@
     <h1>{{ _("Verein zur F&ouml;rderung von GNUnet e.V.") }}</h1>
   </header>
 
-  <div class="row container justify-content-center">
-    <div class="col-6">
+  <div class="row">
+    <div class="col-md">
+      <h3>{{ _("About GNUnet e.V.") }}</h3>
       <p>
         {% trans %}
         On December 27th 2013 a group of GNUnet hackers met at 30c3
@@ -26,29 +27,7 @@
         {% endtrans %}
       </p>
     </div>
-  </div>
-
-  <div class="row">
-    <div class="col-lg-6">
-      <h3>{{ _("Governance") }}</h3>
-      <p>
-        {% trans %}
-          You can find our "Satzung", and the list of members under
-          <a href="https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex">https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex</a>.
-          The current board consists of:
-          <dl><dt>Vorsitz</dt>
-            <dd><a href="https://grothoff.org/christian/">Christian Grothoff</a></dd>
-            <dt>stellvertretender Vorsitz</dt>
-            <dd>xrs</dd>
-            <dt>Kassenwart</dt>
-            <dd>Florian Dold</dd>
-            <dt>Beisitzer</dt>
-            <dd>Lurchi</dd>
-          </dl>
-        {% endtrans %}
-      </p>
-    </div>
-    <div class="col-lg-6">
+    <div class="col-md">
       <h3>{{ _("Becoming a Member of GNUnet e.V.") }}</h3>
       <p>
         {% trans %}
@@ -69,28 +48,26 @@
   </div><!-- END:row -->
 
   <div class="row">
-    <div class="col-lg-6">
-      <h3>{{ _("Support Us!") }}</h3>
+    <div class="col-md">
+      <h3>{{ _("Governance") }}</h3>
       <p>
         {% trans %}
-          Everybody is welcome to support us via donations. For
-          financial contributions, Europeans are able to donate via
-          SEPA. We hope to setup accounts in other major currency areas
-          in the future.  You can also donate via Bitcoin, routing
-          details are given below.  Please note that we are unable to
-          provide receipts for your donations.  If you are planning to
-          donate a significant amount of money, please contact us first
-          as it might be better to come to a custom arrangement.
-
-          <dl><dt>BitCoin</dt>
-            <dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</dd>
-            <dt>SEPA/IBAN</dt>
-            <dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd>
+          You can find our "Satzung", and the list of members under
+          <a href="https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex">https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex</a>.
+          The current board consists of:
+          <dl><dt>Vorsitz</dt>
+            <dd><a href="https://grothoff.org/christian/">Christian Grothoff</a></dd>
+            <dt>stellvertretender Vorsitz</dt>
+            <dd>xrs</dd>
+            <dt>Kassenwart</dt>
+            <dd>Florian Dold</dd>
+            <dt>Beisitzer</dt>
+            <dd>Lurchi</dd>
           </dl>
         {% endtrans %}
       </p>
     </div>
-    <div class="col-lg-6">
+    <div class="col-md">
       <h3>{{ _("Official Meeting Notes") }}</h3>
       <p>
         <ul>
@@ -117,6 +94,32 @@
     </div>
   </div><!-- END:row -->
 
+  <div class="row">
+    <div class="col-md">
+      <h3>{{ _("Support Us!") }}</h3>
+      <p>
+        {% trans %}
+          Everybody is welcome to support us via donations. For
+          financial contributions, Europeans are able to donate via
+          SEPA. We hope to setup accounts in other major currency areas
+          in the future.  You can also donate via Bitcoin, routing
+          details are given below.  Please note that we are unable to
+          provide receipts for your donations.  If you are planning to
+          donate a significant amount of money, please contact us first
+          as it might be better to come to a custom arrangement.
+
+          <dl><dt>BitCoin</dt>
+            <dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</dd>
+            <dt>SEPA/IBAN</dt>
+            <dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd>
+          </dl>
+        {% endtrans %}
+      </p>
+    </div>
+    <div class="col">
+    </div>
+  </div><!-- END:row -->
+
 </div> <!-- /container -->
 </article>
 {% endblock body_content %}
diff --git a/template/gnurl.html.j2 b/template/gnurl.html.j2
index 8834e967..73d62c8b 100644
--- a/template/gnurl.html.j2
+++ b/template/gnurl.html.j2
@@ -1,8 +1,12 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container-fluid">
-  <article>
+<article class="container">
+
+  <header>
     <h1>gnurl (libgnurl)</h1>
+  </header>
+
+  <div class="container">
     <p>
       {% trans %}
       libgnurl is a micro fork of libcurl. The goal of libgnurl
@@ -115,12 +119,10 @@
       viceversa.
       {% endtrans %}
     </p>
-  </article>
-</div>
+  </div>
 
-<div class="container">
-  <div class="row">
-    <div class="col-lg-6">
+  <div class="row container">
+    <div class="col-md">
       <h3>{{ _("Source Code") }}</h3>
       <p>
         {% trans %}
@@ -134,7 +136,7 @@
         {% endtrans %}
       </p>
     </div>
-    <div class="col-lg-6">
+    <div class="col-md">
       <h3>{{ _("Downloads") }}</h3>
       <p>
         {% trans %}
@@ -149,8 +151,9 @@
       </p>
     </div>
   </div>
-  <div class="row">
-    <div class="col-lg-6">
+
+  <div class="row container">
+    <div class="col-md">
       <h3>{{ _("Reporting Bugs") }}</h3>
       <p>
         {% trans %}
@@ -161,7 +164,7 @@
         {% endtrans %}
       </p>
     </div>
-    <div class="col-lg-6">
+    <div class="col-md">
       <h3>{{ _("Maintainer and Cryptographic signatures") }}</h3>
       <p>
         {% trans %}
@@ -173,7 +176,6 @@
       </p>
     </div>
   </div>
-</div>
 
-</div> <!-- /container -->
+</article> <!-- /container -->
 {% endblock body_content %}
diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index 9b378f3b..5104e516 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -6,19 +6,8 @@
     <h1>{{ _("GNUnet's Google Summer of Code projects") }}</h1>
   </header>
 
-  <div class="row container justify-content-center">
-    <div class="col-6">
-    {% trans %}
-      As a GNU project, GNUnet has participated in the
-      Google Summer of Code (GSoC) for a number of years.
-      This page lists all current, past, and finished
-      projects.
-    {% endtrans %}
-    </div>
-  </div>
-
   <div class="row">
-    <div class="col-2">
+    <div class="col-2 d-none d-lg-block"><!-- for large viewports show menu for better orientation -->
       <nav class="nav subnav position-fixed flex-column border-right" style="position:fixed">
       <a class="nav-link" href="#current">{{ _("Current projects") }}</a>
       <a class="nav-link" href="#past">{{ _("Past projects") }}</a>
@@ -27,580 +16,592 @@
     </div>
     <div class="col">
 
-  <h2>{{ _("Current projects (2019)") }}<a name="current"></a></h2>
-  <section>
-    <h4>Android Port</h4>
-    <p>
-      {% trans %}
-        It is time for GNUnet to run properly on Android.  Note that
-        GNUnet is written in C, and this is not about rewriting
-        GNUnet in Java, but about getting the C code to run on Android.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> <a href="https://www.goebel-consult.de/">Hartmut Goebel</a>
-      {% endtrans %}
-    </p>
-  </section>
+      <section>
+        <p>
+        {% trans %}
+          As a GNU project, GNUnet has participated in the
+          Google Summer of Code (GSoC) for a number of years.
+          This page lists all current, past, and finished
+          projects.
+        {% endtrans %}
+        </p>
+      </section>
+
+
+      <h2><a name="current" class="subnav-anchor"></a>{{ _("Current projects (2019)") }}</h2>
+      <section>
+        <h4>Android Port</h4>
+        <p>
+          {% trans %}
+            It is time for GNUnet to run properly on Android.  Note that
+            GNUnet is written in C, and this is not about rewriting
+            GNUnet in Java, but about getting the C code to run on Android.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> <a href="https://www.goebel-consult.de/">Hartmut Goebel</a>
+          {% endtrans %}
+        </p>
+      </section>
 
-  <section>
-    <h4>Help with Continuous Integration setup</h4>
-    <p>
-      {% trans %}
-        There is a push for migrating our CI to Gitlab.  The CI should
-        eventually not just run "make check" on various platforms, but also
-        perform tests with multiple peers running in different VMs with
-        specific network topologies (i.e. NAT) between them being simulated.
-        The CI should also be integrated with Gauger for performance
-        regression analysis.  Running jobs only when dependencies have changed
-        and scripting more granular triggers or ideally automatic dependency
-        discovery (as done by the autotools) is also important.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> TBD
-      {% endtrans %}
-    </p>
-  </section>
+      <section>
+        <h4>Help with Continuous Integration setup</h4>
+        <p>
+          {% trans %}
+            There is a push for migrating our CI to Gitlab.  The CI should
+            eventually not just run "make check" on various platforms, but also
+            perform tests with multiple peers running in different VMs with
+            specific network topologies (i.e. NAT) between them being simulated.
+            The CI should also be integrated with Gauger for performance
+            regression analysis.  Running jobs only when dependencies have changed
+            and scripting more granular triggers or ideally automatic dependency
+            discovery (as done by the autotools) is also important.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> TBD
+          {% endtrans %}
+        </p>
+      </section>
 
-  <section>
-    <h4>Migrate gnunet-qr from Python 2.7 to C using libzbar</h4>
-    <p>
-      {% trans %}
-        Python 2.7 is reaching its end-of-life, and we want to get rid
-        of the dependency on Python. The existing gnunet-qr tool is a
-        rather simple wrapper around python-zbar, which itself wraps
-        libzbar. The goal of this project is to directly use libzbar
-        to scan QR codes for GNUnet / the GNU Name System (see
-        also <a href="https://bugs.gnunet.org/view.php?id=5562">#5562</a>).
-        <br>
-        <strong>Mentors:</strong> Christian Grothoff
-      {% endtrans %}
-    </p>
-  </section>
+      <section>
+        <h4>Migrate gnunet-qr from Python 2.7 to C using libzbar</h4>
+        <p>
+          {% trans %}
+            Python 2.7 is reaching its end-of-life, and we want to get rid
+            of the dependency on Python. The existing gnunet-qr tool is a
+            rather simple wrapper around python-zbar, which itself wraps
+            libzbar. The goal of this project is to directly use libzbar
+            to scan QR codes for GNUnet / the GNU Name System (see
+            also <a href="https://bugs.gnunet.org/view.php?id=5562">#5562</a>).
+            <br>
+            <strong>Mentors:</strong> Christian Grothoff
+          {% endtrans %}
+        </p>
+      </section>
 
-  <section>
-    <h4>re:claimID OpenID Connect performance improvements</h4>
-    <p>
-      {% trans %}
-        reclaimID is a decentralized identity system build on top of the GNU
-        Name System.
-        Upon authorization, the user provides a requesting party (RP) such as a website
-        with an authorization ticket (e.g. piggybacked in an OpenID authorization code).
-        The RP uses information contained in this ticket to
-        <ol>
-          <li> Retrieve the decryption key from GNS</li>
-          <li> Retrieve the user attributes from GNS</li>
-        </ol>
-        The GNS lookups ensure that the RP receives up-to-date attributes and functional
-        decryption keys. However, in particular the RP-specific encryption key
-        resolution can be slow and even fail depending on the network topology.
-        We propose that in an initial exchange, in particular OpenID authorization code
-        flows, we try to incorporate key and maybe even an attribute set in the ticket
-        exchange.
+      <section>
+        <h4>re:claimID OpenID Connect performance improvements</h4>
+        <p>
+          {% trans %}
+            reclaimID is a decentralized identity system build on top of the GNU
+            Name System.
+            Upon authorization, the user provides a requesting party (RP) such as a website
+            with an authorization ticket (e.g. piggybacked in an OpenID authorization code).
+            The RP uses information contained in this ticket to
+            <ol>
+              <li> Retrieve the decryption key from GNS</li>
+              <li> Retrieve the user attributes from GNS</li>
+            </ol>
+            The GNS lookups ensure that the RP receives up-to-date attributes and functional
+            decryption keys. However, in particular the RP-specific encryption key
+            resolution can be slow and even fail depending on the network topology.
+            We propose that in an initial exchange, in particular OpenID authorization code
+            flows, we try to incorporate key and maybe even an attribute set in the ticket
+            exchange.
 
-        In order to mitigate this issue, this project is meant to investigate and implement how...
-        <ol>
-          <li> ... decryption keys can be added to an initial exchange in OpenID.</li>
-          <li> ... initial set(s) of attributes can be piggybacked in OpenID.</li>
-        </ol>
-        <br/>
-        <strong>Mentors:</strong> Martin Schanzenbach
-      {% endtrans %}
-    </p>
-  </section>
+            In order to mitigate this issue, this project is meant to investigate and implement how...
+            <ol>
+              <li> ... decryption keys can be added to an initial exchange in OpenID.</li>
+              <li> ... initial set(s) of attributes can be piggybacked in OpenID.</li>
+            </ol>
+            <br/>
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+      </section>
 
-  <section>
-    <h4>re:claimID alternative GNS-based encryption</h4>
-    <p>
-      {% trans %}
-        re:claimID is a decentralized identity system build on top of the GNU
-        Name System.
-        The initial design and implementation of re:claimID includes an attribute-based
-        encryption module in order to prevent unauthorized access to attributes in the
-        name system.
-        Our motivation for re:claimID was for it to be name system agnostic, which
-        means the design theoretically also works for other name systems such as
-        namecoin.
-        Other name systems often do not have built-in mechanisms in order to do this.
-        Hence, we implemented an ABE access control layer. Our ABE implementation
-        requires two third party libraries: libpbc and libgabe. While we could merge
-        libgabe into the gnunet service implementation of re:claimID, libpbc is a
-        rather large, third party library which lacks packaging in distributions and
-        for platforms.
-        On the other hand, GNS supports record data encryption using symmetric keys as
-        labels.
-        If we make the access control layer of re:claimID more generic in order to
-        support both ABE and GNS encryption, we could reduce the required depenencies.
-        This would result in gnunet packages to include re:claimID by default.
+      <section>
+        <h4>re:claimID alternative GNS-based encryption</h4>
+        <p>
+          {% trans %}
+            re:claimID is a decentralized identity system build on top of the GNU
+            Name System.
+            The initial design and implementation of re:claimID includes an attribute-based
+            encryption module in order to prevent unauthorized access to attributes in the
+            name system.
+            Our motivation for re:claimID was for it to be name system agnostic, which
+            means the design theoretically also works for other name systems such as
+            namecoin.
+            Other name systems often do not have built-in mechanisms in order to do this.
+            Hence, we implemented an ABE access control layer. Our ABE implementation
+            requires two third party libraries: libpbc and libgabe. While we could merge
+            libgabe into the gnunet service implementation of re:claimID, libpbc is a
+            rather large, third party library which lacks packaging in distributions and
+            for platforms.
+            On the other hand, GNS supports record data encryption using symmetric keys as
+            labels.
+            If we make the access control layer of re:claimID more generic in order to
+            support both ABE and GNS encryption, we could reduce the required depenencies.
+            This would result in gnunet packages to include re:claimID by default.
 
-        In short, the goals are to...
-        <ol>
-          <li> ... improve performance by reducing encryption overhead.</li>
-          <li> ... reduce dependencies.</li>
-        </ol>
-        <br/>
-        <strong>Mentors:</strong> Martin Schanzenbach
-      {% endtrans %}
-    </p>
-  </section>
+            In short, the goals are to...
+            <ol>
+              <li> ... improve performance by reducing encryption overhead.</li>
+              <li> ... reduce dependencies.</li>
+            </ol>
+            <br/>
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+      </section>
 
-  <section>
-    <h4>Enable all networking applications to run over GNUnet out of the box</h4>
-    <p>
-      {% trans %}
-        One great problem of the current Internet is the lack of
-        disintermediation. When people want to talk they need a
-        chat service. When they want to share files they need a
-        file transfer service. Although GNUnet already possesses
-        quite advanced integration into Linux networking, a little
-        extra work is needed for existing applications like irc,
-        www, ftp, rsh, nntpd to run over it in a peer-to-peer way,
-        simply by using a GNS hostname like friend.gnu. Once
-        people have added a person to their GNS they can
-        immediately message, exchange files and suchlike directly,
-        with nothing but the GNUnet in the middle, using
-        applications that have been distributed with unix systems
-        ever since the 1980's. We can produce an OS distribution
-        where these things work out of the box with the nicknames
-        of people instead of cloud services. For more information
-        and context, read
-      {% endtrans %}
-        <a href="https://bugs.gnunet.org/view.php?id=4625">bug id 4625</a>.
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> lynX &amp; dvn
-      {% endtrans %}
-    </p>
-  </section>
-  <!-- Past projects: Previously proposed, but left unfinished. Inspiration for students. -->
-  <h2>{{ _("Past projects") }}<a name="past"></a></h2>
-  <section>
-    <h4>Rust APIs for GNUnet services</h4>
-    <p>
-      {% trans %}
-        There are a variety of GNUNet APIs that should be
-        exposed in the Rust wrappers.  Implementing these will
-        require extending the port of GNUNet utils written by
-        Andrew Cann and Kelong Cong.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        As an introduction to the code base, we suggest that the
-        student and Jeff Burdges together update the
-        asynchronous IO system from gjio to futures-rs or
-        another layer built upon it.  Jeff Burdges is expected
-        to concurrently be implementing a GNUNet API for his own
-        mix network work.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Jeff Burdges
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: Rust
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: low
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Tor compatibility for GNUnet</h4>
-    <p>
-      {% trans %}
-        Implement the AnycastExit spec to enable GNUnet clients
-        to connect over Tor.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Jeff Burdges
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Note: There was a Special TLDs spec to allow Tor to
-        resolve domain names using GNS over Tor too, but
-        currently that's on hold until folks think more about
-        how names should be moved around the local system. We're
-        calling this more collaborative approach NSS2 for now.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: C
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: medium
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>RESTful GNUnet</h4>
-    <p>
-      {% trans %}
-        Design and implementation
-        of <a href="http://jsonapi.org/">REST APIs</a> that expose
-        the
-        <a href="https://gnunet.org/doxygen/modules.html">GNUnet API</a>
-        so that easy, hands-on development is
-        possible. Also, browser-based UIs will be much easier to
-        create on top of REST APIs.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Martin Schanzenbach
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Rust implementation of GNUnet utils</h4>
-    <p>
-      {% trans %}
-        Improve the Rust implementation of GNUnet utils, possibly
-        including adding support for asynchronous IO using mio, or
-        perhaps a higher level asynchronous IO library built upon
-        it, such as rotor, mioco, eventual_io, or gj.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Jeff Burdges
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Android compatibility for GNUnet</h4>
-    <p>
-      {% trans %}
-        Implement rudimentary Android compatibility for GNUnet,
-        in part by porting the GNUnet utils scheduler to act as
-        a thin wrapper over libuv.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Jeff Burdges and Christian Grothoff
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Implementation of a replacement for PANDA</h4>
-    <p>
-      {% trans %}
-        Implementation of a replacement for PANDA (see Pond)
-        with better security, and maybe integration with the GNU
-        Name System for key exchange.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Jeff Burdges
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: Rust or C, crypto
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: high
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>secushare: Implement social networking features on top of pubsub channels</h4>
-    <p>
-      {% trans %}
-        Implement different place types and file sharing by
-        creating a new place for the shared content.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Place types to be implemented:
-      {% endtrans %}
-    </p>
-    {% trans %}
-    <ul>
-      <li>File: generic file with comments</li>
-      <li>Image: display an image with comments referencing a region of the image</li>
-      <li>Sound: play a sound file with comments referencing a timestamp</li>
-      <li>Directory/Album: pointers to File / Image / Sound places</li>
-      <li>Event: with RSVP</li>
-      <li>Survey: ask your social neighborhood questions in a structured form</li>
-    </ul>
-    {% endtrans %}
-    <p>
-      {% trans %}
-        Also provide the following UI functionality:
-      {% endtrans %}
-    </p>
-    {% trans %}
-    <ul>
-      <li>Fork existing channels, reorganize people into new chatrooms or channels.</li>
-      <li>Share a post (edit and repost something elsewhere, on a fan page for example).</li>
-      <li>Edit a previously published post + offer edit history to readers.</li>
-      <li>Control expiry of channel history.</li>
-    </ul>
-    {% endtrans %}
-    <p>
-      {% trans %}
-        See also <a href="http://secushare.org/features">http://secushare.org/features</a>
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> lynX
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: C/C++
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: high
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>secushare: Implement a Social Graph API for contact adoption and more</h4>
-    <p>
-      {% trans %}
-        Implement aggregation of distributed state from
-        various channels
-        in order to provide for a powerful social graph API capable of
-        producing social network profiles, dashboards,
-        a calendar out of
-        upcoming event invitations (if available),
-        social search functionality
-        and most of all to make it easy for users to
-        adopt cryptographic
-        identities of their contacts/friends simply by finding
-        them in the
-        social graph of their
-        existing contacts ("This is Linda. You have 11
-        contacts in common with her. [ADD]").
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Related to
-        <a href="http://secushare.org/rendezvous">secushare.org/rendezvous</a>
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> t3sserakt, lynX
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: C
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: high
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>secushare: Implement integration with tradition e-mail</h4>
-    {% trans %}
-      <ul>
-        <li>
-          Emulate IMAP/SMTP protocols as necessary to transform
-          traditional mail clients into secushare user
-          interfaces.
-        </li>
-        <li>
-          Think of ways to map e-mail addresses to secushare
-          identities.
-        </li>
-        <li>
-          Encode or translate various e-mail features into
-          secushare equivalents.
-        </li>
-        <li>
-          Parts of secushare are currently written in Rust,
-          therefore Rust is preferred for this task but it is
-          not an requirement.
-        </li>
-      </ul>
-    {% endtrans %}
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> t3sserakt, lynX
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: C
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: high
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>GNUnet auction</h4>
-    <p>
-      {% trans %}
-        Implementation of the GNUnet auction system described in
-        Chapter 3 of
-        <a href="https://gnunet.org/libbrand-thesis">this thesis</a>.
-        Specific tasks are adding smart
-        contract creation and round time enforcement to
-        libbrandt as well as creating the
-        GNUnet auction service, library and the three user interface
-        programs create, info and join.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> mate, cg
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: C
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: medium
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Implementation of additional transports</h4>
-    <p>
-      {% trans %}
-        Implementation of additional transports to make GNUnet communication
-        more robust in the presence of problematic networks:
-        GNUnet-over-SMTP, GNUnet-over-DNS
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Matthias Wachs
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Implementation of ALG-based NAT traversal methods</h4>
-    <p>
-      {% trans %}
-        Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole
-        punching, better STUN support)
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Matthias Wachs
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Integration of the GNU Name System with GnuPG</h4>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>libaboss improvements</h4>
-    <p>
-      {% trans %}
-        Improving libaboss to make computation on shared secrets (including
-        repeated multiplication) based
-        on <a href="https://dl.acm.org/citation.cfm?doid=62212.62213">Ben-Or
-        et al.</a> if possible.  This in particular means moving libaboss to
-        bignums (gcry_mpi).
-      {% endtrans %}
-    </p>
-    <p><strong>Mentors:</strong> Krista Grothoff, Jeff Burdges</p>
-  </section>
-  <section>
-    <h4>Implementation of a replacement for PANDA</h4>
-    <p>
-      {% trans %}
-        Implementation of a replacement for PANDA (see Pond) with better
-        security, and maybe integration with the GNU Name System for key
-        exchange.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Jeff Burdges
-      {% endtrans %}
-    </p>
-  </section>
-  <section>
-    <h4>Supporting GNU Guix's package distribution</h4>
-    <p>
-      {% trans %}
-        Please refer to the description for this project listed under
-        GNU Guix project ideas.
-      {% endtrans %}
-    </p>
-  </section>
-  <h2>{{ _("Finished projects") }}<a name="finished"></a></h2>
-  <!-- Commentary: Finished projects, descriptions and Links to write-ups about them. -->
-  <h3>2018</h3>
-  <section>
-    <h4>GNUnet Web-based User Interface</h4>
-    <p>
-      {% trans %}
-        Implementation of a Web-based UI for GNUnet similar to
-        GNUnet-Gtk with a yet to be determined framework such as
-        Angular2. This includes the design and implementation of
-        not yet existing <a href="http://jsonapi.org/">REST APIs</a>
-        that expose the
-        <a href="https://gnunet.org/doxygen/modules.html">GNUnet API</a>.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        <strong>Mentors:</strong> Martin Schanzenbach
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Required Skills: C, JavaScript, CSS
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Difficulty level: medium
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        Report: <a href="gsoc-2018-gnunet-webui.html">GSoC 2018: GNUnet WebUI</a>
-      {% endtrans %}
-    </p>
-  </section>
+      <section>
+        <h4>Enable all networking applications to run over GNUnet out of the box</h4>
+        <p>
+          {% trans %}
+            One great problem of the current Internet is the lack of
+            disintermediation. When people want to talk they need a
+            chat service. When they want to share files they need a
+            file transfer service. Although GNUnet already possesses
+            quite advanced integration into Linux networking, a little
+            extra work is needed for existing applications like irc,
+            www, ftp, rsh, nntpd to run over it in a peer-to-peer way,
+            simply by using a GNS hostname like friend.gnu. Once
+            people have added a person to their GNS they can
+            immediately message, exchange files and suchlike directly,
+            with nothing but the GNUnet in the middle, using
+            applications that have been distributed with unix systems
+            ever since the 1980's. We can produce an OS distribution
+            where these things work out of the box with the nicknames
+            of people instead of cloud services. For more information
+            and context, read
+          {% endtrans %}
+            <a href="https://bugs.gnunet.org/view.php?id=4625">bug id 4625</a>.
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> lynX &amp; dvn
+          {% endtrans %}
+        </p>
+      </section>
+      <!-- Past projects: Previously proposed, but left unfinished. Inspiration for students. -->
+      <h2><a name="past" class="subnav-anchor"></a>{{ _("Past projects") }}</h2>
+      <section>
+        <h4>Rust APIs for GNUnet services</h4>
+        <p>
+          {% trans %}
+            There are a variety of GNUNet APIs that should be
+            exposed in the Rust wrappers.  Implementing these will
+            require extending the port of GNUNet utils written by
+            Andrew Cann and Kelong Cong.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            As an introduction to the code base, we suggest that the
+            student and Jeff Burdges together update the
+            asynchronous IO system from gjio to futures-rs or
+            another layer built upon it.  Jeff Burdges is expected
+            to concurrently be implementing a GNUNet API for his own
+            mix network work.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Jeff Burdges
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: Rust
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: low
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Tor compatibility for GNUnet</h4>
+        <p>
+          {% trans %}
+            Implement the AnycastExit spec to enable GNUnet clients
+            to connect over Tor.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Jeff Burdges
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Note: There was a Special TLDs spec to allow Tor to
+            resolve domain names using GNS over Tor too, but
+            currently that's on hold until folks think more about
+            how names should be moved around the local system. We're
+            calling this more collaborative approach NSS2 for now.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: C
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: medium
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>RESTful GNUnet</h4>
+        <p>
+          {% trans %}
+            Design and implementation
+            of <a href="http://jsonapi.org/">REST APIs</a> that expose
+            the
+            <a href="https://gnunet.org/doxygen/modules.html">GNUnet API</a>
+            so that easy, hands-on development is
+            possible. Also, browser-based UIs will be much easier to
+            create on top of REST APIs.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Rust implementation of GNUnet utils</h4>
+        <p>
+          {% trans %}
+            Improve the Rust implementation of GNUnet utils, possibly
+            including adding support for asynchronous IO using mio, or
+            perhaps a higher level asynchronous IO library built upon
+            it, such as rotor, mioco, eventual_io, or gj.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Jeff Burdges
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Android compatibility for GNUnet</h4>
+        <p>
+          {% trans %}
+            Implement rudimentary Android compatibility for GNUnet,
+            in part by porting the GNUnet utils scheduler to act as
+            a thin wrapper over libuv.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Jeff Burdges and Christian Grothoff
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Implementation of a replacement for PANDA</h4>
+        <p>
+          {% trans %}
+            Implementation of a replacement for PANDA (see Pond)
+            with better security, and maybe integration with the GNU
+            Name System for key exchange.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Jeff Burdges
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: Rust or C, crypto
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: high
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>secushare: Implement social networking features on top of pubsub channels</h4>
+        <p>
+          {% trans %}
+            Implement different place types and file sharing by
+            creating a new place for the shared content.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Place types to be implemented:
+          {% endtrans %}
+        </p>
+        {% trans %}
+        <ul>
+          <li>File: generic file with comments</li>
+          <li>Image: display an image with comments referencing a region of the image</li>
+          <li>Sound: play a sound file with comments referencing a timestamp</li>
+          <li>Directory/Album: pointers to File / Image / Sound places</li>
+          <li>Event: with RSVP</li>
+          <li>Survey: ask your social neighborhood questions in a structured form</li>
+        </ul>
+        {% endtrans %}
+        <p>
+          {% trans %}
+            Also provide the following UI functionality:
+          {% endtrans %}
+        </p>
+        {% trans %}
+        <ul>
+          <li>Fork existing channels, reorganize people into new chatrooms or channels.</li>
+          <li>Share a post (edit and repost something elsewhere, on a fan page for example).</li>
+          <li>Edit a previously published post + offer edit history to readers.</li>
+          <li>Control expiry of channel history.</li>
+        </ul>
+        {% endtrans %}
+        <p>
+          {% trans %}
+            See also <a href="http://secushare.org/features">http://secushare.org/features</a>
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> lynX
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: C/C++
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: high
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>secushare: Implement a Social Graph API for contact adoption and more</h4>
+        <p>
+          {% trans %}
+            Implement aggregation of distributed state from
+            various channels
+            in order to provide for a powerful social graph API capable of
+            producing social network profiles, dashboards,
+            a calendar out of
+            upcoming event invitations (if available),
+            social search functionality
+            and most of all to make it easy for users to
+            adopt cryptographic
+            identities of their contacts/friends simply by finding
+            them in the
+            social graph of their
+            existing contacts ("This is Linda. You have 11
+            contacts in common with her. [ADD]").
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Related to
+            <a href="http://secushare.org/rendezvous">secushare.org/rendezvous</a>
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> t3sserakt, lynX
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: C
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: high
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>secushare: Implement integration with tradition e-mail</h4>
+        {% trans %}
+          <ul>
+            <li>
+              Emulate IMAP/SMTP protocols as necessary to transform
+              traditional mail clients into secushare user
+              interfaces.
+            </li>
+            <li>
+              Think of ways to map e-mail addresses to secushare
+              identities.
+            </li>
+            <li>
+              Encode or translate various e-mail features into
+              secushare equivalents.
+            </li>
+            <li>
+              Parts of secushare are currently written in Rust,
+              therefore Rust is preferred for this task but it is
+              not an requirement.
+            </li>
+          </ul>
+        {% endtrans %}
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> t3sserakt, lynX
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: C
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: high
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>GNUnet auction</h4>
+        <p>
+          {% trans %}
+            Implementation of the GNUnet auction system described in
+            Chapter 3 of
+            <a href="https://gnunet.org/libbrand-thesis">this thesis</a>.
+            Specific tasks are adding smart
+            contract creation and round time enforcement to
+            libbrandt as well as creating the
+            GNUnet auction service, library and the three user interface
+            programs create, info and join.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> mate, cg
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: C
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: medium
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Implementation of additional transports</h4>
+        <p>
+          {% trans %}
+            Implementation of additional transports to make GNUnet communication
+            more robust in the presence of problematic networks:
+            GNUnet-over-SMTP, GNUnet-over-DNS
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Matthias Wachs
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Implementation of ALG-based NAT traversal methods</h4>
+        <p>
+          {% trans %}
+            Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole
+            punching, better STUN support)
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Matthias Wachs
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Integration of the GNU Name System with GnuPG</h4>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>libaboss improvements</h4>
+        <p>
+          {% trans %}
+            Improving libaboss to make computation on shared secrets (including
+            repeated multiplication) based
+            on <a href="https://dl.acm.org/citation.cfm?doid=62212.62213">Ben-Or
+            et al.</a> if possible.  This in particular means moving libaboss to
+            bignums (gcry_mpi).
+          {% endtrans %}
+        </p>
+        <p><strong>Mentors:</strong> Krista Grothoff, Jeff Burdges</p>
+      </section>
+      <section>
+        <h4>Implementation of a replacement for PANDA</h4>
+        <p>
+          {% trans %}
+            Implementation of a replacement for PANDA (see Pond) with better
+            security, and maybe integration with the GNU Name System for key
+            exchange.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Jeff Burdges
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>Supporting GNU Guix's package distribution</h4>
+        <p>
+          {% trans %}
+            Please refer to the description for this project listed under
+            GNU Guix project ideas.
+          {% endtrans %}
+        </p>
+      </section>
+      <h2><a name="finished" class="subnav-anchor"></a>{{ _("Finished projects") }}</h2>
+      <!-- Commentary: Finished projects, descriptions and Links to write-ups about them. -->
+      <h3>2018</h3>
+      <section>
+        <h4>GNUnet Web-based User Interface</h4>
+        <p>
+          {% trans %}
+            Implementation of a Web-based UI for GNUnet similar to
+            GNUnet-Gtk with a yet to be determined framework such as
+            Angular2. This includes the design and implementation of
+            not yet existing <a href="http://jsonapi.org/">REST APIs</a>
+            that expose the
+            <a href="https://gnunet.org/doxygen/modules.html">GNUnet API</a>.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: C, JavaScript, CSS
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: medium
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Report: <a href="gsoc-2018-gnunet-webui.html">GSoC 2018: GNUnet WebUI</a>
+          {% endtrans %}
+        </p>
+      </section>
 
     </div>
   </div>
diff --git a/template/index.html.j2 b/template/index.html.j2
index 2f0030a1..110fad0e 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -69,7 +69,7 @@
   <div class="container">
     <div class="row">
       <div class="container text-center">
-        <h1><a name="about">{% trans %}The Internet of tomorrow needs GNUnet today{% endtrans %}</a></h1>
+        <h1><a name="about"></a>{% trans %}The Internet of tomorrow needs GNUnet today{% endtrans %}</h1>
       </div>
     </div>
     <div class="row">
@@ -223,7 +223,7 @@
         <a href="https://gnunet.org/en/use.html">use it</a> and 
         <a href="https://gnunet.org/en/contribute.html">contribute</a>. <br>
         Be aware that this project is still in an early alpha stage when it comes 
-        to software – its not an easy task to rewrite the whole Internet!
+        to software &#8211; its not an easy task to rewrite the whole Internet!
           {% endtrans %}
         </p>
         </section>
diff --git a/template/install-on-archpi.html.j2 b/template/install-on-archpi.html.j2
index 8d467074..fccf46e3 100644
--- a/template/install-on-archpi.html.j2
+++ b/template/install-on-archpi.html.j2
@@ -1,128 +1,130 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container">
-
-<h2>{{ _("Tutorial: GNUnet on Archlinux/Pi") }}</h2>
-
-Welcome to this GNUnet tutorial for Archlinux on a Raspberry Pi 3. If you want
-to run a GNUnet node on a separte system, permanently online, with low energy
-consumption, this might be the thing for you. This tutorial shows you how to
-install, run, and operate it. 
-
-<h3>{{ _("Requirements") }}</h3>
-
-<p>First you need the hardware. This tutorial works with a Raspberry Pi 3. The
-other Pi versions I haven't tested, but they should probably work, too. To
-install Archlinux on the Pi3, follow the instructions from <a
-href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3">archlinuxarm.org</a>.</p>
-
-<p>That was easy, right? Our goal now is to build GNUnet from source. So, let's
-install the tools for building new software.</p>
-
-<p><code>
-> sudo pacman -S base-devel
-</code></p>
-
-<p>Now we can continue to install the following Archlinux dependencies to
-compile GNUnet on our Pi.</p>
-
-<p><code>
-$ pacman -Su libmicrohttpd libgcrypt gnurl libunistring gnutls libidn
-libextractor openssl libltdl sqlite texinfo which gettext zlib
-pkg-config git miniupnpc libextractor jansson nim
-</code></p>
-
-<h3>{{ _("Get the Source Code") }}</h3>
-
-<p>We are getting closer. Download the GNUnet source code which we will build
-in the next step:<p>
-
-<p><code>
-> git clone https://gnunet.org/git/gnunet.git<br> 
-</code></p>
-
-<p>Now it's time to compile GNUnet.</p>
-
-<p><code>
-> cd gnunet<br>
-> ./bootstrap # Run this to generate the configure files.<br>
-> ./configure # Use --help to see the various flags available to you.<br>
-> make -j$(nproc || echo -n 1)<br>
-> sudo make install<br>
-</code></p>
-
-<p>Congrats! GNUnet is now installed!</p>
-
-<h3>{{ _("Run") }}</h3>
-
-<p>By default GNUnet looks in our home directory for the file
-~/.config/gnunet.conf. We can start with an empty file for now:</p>
-
-<p><code>
-> touch ~/.config/gnunet.conf
-</code></p>
- <br />
-  <p>
-    It's reccomended that you increase your bandwidth restrictions
-    from the acutely low defaults. The example below sets the WAN
-    and LAN limits to the value "unlimited".
-  </p>
- <br />
-  <code>
-    $ gnunet-config -s ats -o WAN_QUOTA_IN -V unlimited<br />
-    $ gnunet-config -s ats -o WAN_QUOTA_OUT -V unlimited<br /> 
-    $ gnunet-config -s ats -o LAN_QUOTA_IN -V unlimited<br />
-    $ gnunet-config -s ats -o LAN_QUOTA_OUT -V unlimited<br /> 
-  </code>
- <br />
-<p>Now we can start it with the commandline tool gnunet-arm (Automatic Restart
-Manager).</p>
-
-<p><code>
-> gnunet-arm -s 
-</code></p>
-
-<p>It starts the default GNUnet services. We can list them with the -I option:</p>
-
-<p><code>
-> gnunet-arm -I<br>
-Running services:<br>
-ats (gnunet-service-ats)<br>
-revocation (gnunet-service-revocation)<br>
-set (gnunet-service-set)<br>
-nat (gnunet-service-nat)<br>
-transport (gnunet-service-transport)<br>
-peerstore (gnunet-service-peerstore)<br>
-hostlist (gnunet-daemon-hostlist)<br>
-identity (gnunet-service-identity)<br>
-namecache (gnunet-service-namecache)<br>
-peerinfo (gnunet-service-peerinfo)<br>
-datastore (gnunet-service-datastore)<br>
-zonemaster (gnunet-service-zonemaster)<br>
-zonemaster-monitor (gnunet-service-zonemaster-monitor)<br>
-nse (gnunet-service-nse)<br>
-cadet (gnunet-service-cadet)<br>
-dht (gnunet-service-dht)<br>
-core (gnunet-service-core)<br>
-gns (gnunet-service-gns)<br>
-statistics (gnunet-service-statistics)<br>
-topology (gnunet-daemon-topology)<br>
-fs (gnunet-service-fs)<br>
-namestore (gnunet-service-namestore)<br>
-vpn (gnunet-service-vpn)<br>
-</code></p>
-
-<p>For stopping GNUnet again we can use the -e option.</p>
-
-<p><code>
-> gnunet-arm -e
-</code></p>
-
-<h3>{{ _("Make sure, it works!") }}</h3>
+<article class="container">
+
+  <header>
+    <h1>{{ _("Tutorial: GNUnet on Archlinux/Pi") }}</h1>
+  </header>
+
+
+  Welcome to this GNUnet tutorial for Archlinux on a Raspberry Pi 3. If you want
+  to run a GNUnet node on a separte system, permanently online, with low energy
+  consumption, this might be the thing for you. This tutorial shows you how to
+  install, run, and operate it. 
+
+  <h2>{{ _("Requirements") }}</h2>
+
+  <p>First you need the hardware. This tutorial works with a Raspberry Pi 3. The
+  other Pi versions I haven't tested, but they should probably work, too. To
+  install Archlinux on the Pi3, follow the instructions from <a
+  href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3">archlinuxarm.org</a>.</p>
+
+  <p>That was easy, right? Our goal now is to build GNUnet from source. So, let's
+  install the tools for building new software.</p>
+
+  <p><code>
+  > sudo pacman -S base-devel
+  </code></p>
+
+  <p>Now we can continue to install the following Archlinux dependencies to
+  compile GNUnet on our Pi.</p>
+
+  <p><code>
+  $ pacman -Su libmicrohttpd libgcrypt gnurl libunistring gnutls libidn
+  libextractor openssl libltdl sqlite texinfo which gettext zlib
+  pkg-config git miniupnpc libextractor jansson nim
+  </code></p>
+
+  <h2>{{ _("Get the Source Code") }}</h2>
+
+  <p>We are getting closer. Download the GNUnet source code which we will build
+  in the next step:<p>
+
+  <p><code>
+  > git clone https://gnunet.org/git/gnunet.git<br> 
+  </code></p>
+
+  <p>Now it's time to compile GNUnet.</p>
+
+  <p><code>
+  > cd gnunet<br>
+  > ./bootstrap # Run this to generate the configure files.<br>
+  > ./configure # Use --help to see the various flags available to you.<br>
+  > make -j$(nproc || echo -n 1)<br>
+  > sudo make install<br>
+  </code></p>
+
+  <p>Congrats! GNUnet is now installed!</p>
+
+  <h2>{{ _("Run") }}</h2>
+
+  <p>By default GNUnet looks in our home directory for the file
+  ~/.config/gnunet.conf. We can start with an empty file for now:</p>
+
+  <p><code>
+  > touch ~/.config/gnunet.conf
+  </code></p>
+   <br />
+    <p>
+      It's reccomended that you increase your bandwidth restrictions
+      from the acutely low defaults. The example below sets the WAN
+      and LAN limits to the value "unlimited".
+    </p>
+   <br />
+    <code>
+      $ gnunet-config -s ats -o WAN_QUOTA_IN -V unlimited<br />
+      $ gnunet-config -s ats -o WAN_QUOTA_OUT -V unlimited<br /> 
+      $ gnunet-config -s ats -o LAN_QUOTA_IN -V unlimited<br />
+      $ gnunet-config -s ats -o LAN_QUOTA_OUT -V unlimited<br /> 
+    </code>
+   <br />
+  <p>Now we can start it with the commandline tool gnunet-arm (Automatic Restart
+  Manager).</p>
+
+  <p><code>
+  > gnunet-arm -s 
+  </code></p>
+
+  <p>It starts the default GNUnet services. We can list them with the -I option:</p>
+
+  <p><code>
+  > gnunet-arm -I<br>
+  Running services:<br>
+  ats (gnunet-service-ats)<br>
+  revocation (gnunet-service-revocation)<br>
+  set (gnunet-service-set)<br>
+  nat (gnunet-service-nat)<br>
+  transport (gnunet-service-transport)<br>
+  peerstore (gnunet-service-peerstore)<br>
+  hostlist (gnunet-daemon-hostlist)<br>
+  identity (gnunet-service-identity)<br>
+  namecache (gnunet-service-namecache)<br>
+  peerinfo (gnunet-service-peerinfo)<br>
+  datastore (gnunet-service-datastore)<br>
+  zonemaster (gnunet-service-zonemaster)<br>
+  zonemaster-monitor (gnunet-service-zonemaster-monitor)<br>
+  nse (gnunet-service-nse)<br>
+  cadet (gnunet-service-cadet)<br>
+  dht (gnunet-service-dht)<br>
+  core (gnunet-service-core)<br>
+  gns (gnunet-service-gns)<br>
+  statistics (gnunet-service-statistics)<br>
+  topology (gnunet-daemon-topology)<br>
+  fs (gnunet-service-fs)<br>
+  namestore (gnunet-service-namestore)<br>
+  vpn (gnunet-service-vpn)<br>
+  </code></p>
+
+  <p>For stopping GNUnet again we can use the -e option.</p>
+
+  <p><code>
+  > gnunet-arm -e
+  </code></p>
+
+  <h2>{{ _("Make sure, it works!") }}</h2>
    <p>
-        Please head over here: <a href="https://gnunet.org/en/use.html">Use!</a>
+        Please head over here: <a href="https://gnunet.org/en/use.html">Use!</a>
    <p>
-</section>
 
-</div>
+</article>
 {% endblock body_content %}
diff --git a/template/install-on-debian9.html.j2 b/template/install-on-debian9.html.j2
index beffdcf6..9641964b 100644
--- a/template/install-on-debian9.html.j2
+++ b/template/install-on-debian9.html.j2
@@ -1,11 +1,12 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container">
+<article class="container">
 
-  <h2>{{ _("Tutorial: GNUnet on Debian 9") }}</h2>
-
-  <h3>{{ _("Introduction") }}</h3>
+  <header>
+    <h1>{{ _("Tutorial: GNUnet on Debian 9") }}</h1>
+  </header>
 
+  <h2>{{ _("Introduction") }}</h2>
   <p>
     Welcome to the hopefully painless GNUnet tutorial for Debian 9! It provides
     very concrete instructions on how to compile, install and configure a current
@@ -25,7 +26,7 @@
     Now let's start!
   </p>
 
-  <h3>{{ _("Requirements") }}</h3>
+  <h2>{{ _("Requirements") }}</h2>
 
   <p>
     First let's install the following Debian 9 packages to use GNUnet
@@ -41,7 +42,7 @@
       openssl libnss3-tools libopus-dev libpulse-dev libogg-dev
   </code>
 
-  <h3>{{ _("Make an installation directory") }}</h3>
+  <h2>{{ _("Make an installation directory") }}</h2>
 
   <p>
     Next we create a directory in our home directory where we store
@@ -55,7 +56,7 @@
     $ mkdir ~/gnunet_installation
   </code>
 
-  <h3>{{ _("Get the source code") }}</h3>
+  <h2>{{ _("Get the source code") }}</h2>
 
   <p>
     We download the GNUnet source code using git. On Debian 9 we need the
@@ -74,7 +75,7 @@
     $ git clone --depth 1 https://gnunet.org/git/libmicrohttpd.git
   </code>
 
-  <h3>{{ _("Compile and Install") }}</h3>
+  <h2>{{ _("Compile and Install") }}</h2>
 
 
   <p>
@@ -99,7 +100,7 @@
     production version.
   </p>
   
-  <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4>
+  <h3>{{ _("Option 1: GNUnet for production / usage") }}</h3>
 
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
@@ -111,7 +112,7 @@
     $ sudo make install
   </code>
 
-  <h4>{{ _("Option 2: GNUnet for development") }}</h4>
+  <h3>{{ _("Option 2: GNUnet for development") }}</h3>
 
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
@@ -122,7 +123,7 @@
     $ sudo make install
   </code>
 
-  <h4>{{ _("Option 3: gnunet-gtk") }}</h4>
+  <h3>{{ _("Option 3: gnunet-gtk") }}</h3>
   <p>
     Installing the Gtk+-based graphical user
     interface can be done on top of either the production or development installation.
@@ -138,7 +139,7 @@
   </code>
 
 <!--
-  <h4>{{ _("Install GNUnet plugin for name resolution") }}</h4>
+  <h3>{{ _("Install GNUnet plugin for name resolution") }}</h3>
       <p>
         So now it gets a bit nasty. It's not so bad. All we have to do
         is copy a file and edit another one. The file we need to copy
@@ -192,7 +193,7 @@
   <p>That's it. It wasn't that nasty, was it?</p>
 -->
 
-  <h3>{{ _("Configuration") }}</h3>
+  <h2>{{ _("Configuration") }}</h2>
 
   <p>
     Congratulations! GNUnet is now installed! Before we start it we
@@ -268,14 +269,12 @@
     $ gnunet-arm -e
   </code>
 
-<section>
-  <h3>{{ _("Use GNUnet!") }}</h3>
-   <p>
-        Please head over here: <a href="https://gnunet.org/en/use.html">Use!</a>
-   <p>
-</section>
+  <h2>{{ _("Use GNUnet!") }}</h2>
+  <p>
+      Please head over here: <a href="https://gnunet.org/en/use.html">Use!</a>
+  <p>
 
-  <h3>{{ _("Uninstall GNUnet and its dependencies") }}</h3>
+  <h2>{{ _("Uninstall GNUnet and its dependencies") }}</h2>
 
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
@@ -291,9 +290,9 @@
     $ sudo rm /lib/$(uname -m)-linux-gnu/libnss_gns.so.2
   </code>
 
-  <h3>{{ _("Troubleshooting") }}</h3>
+  <h2>{{ _("Troubleshooting") }}</h2>
 
-  <h4>{{ _("You can't reach other people's nodes") }}</h4>
+  <h3>{{ _("You can't reach other people's nodes") }}</h3>
 
   <p>
     Should our computer not have reached the open GNUnet network automatically,
@@ -329,7 +328,7 @@
 
 
 <!--
-  <h4>{{ _("OMG you guys broke my internet") }}</h4>
+  <h3>{{ _("OMG you guys broke my internet") }}</h3>
 
   <p>
     We can replace `/etc/nsswitch.conf` with the backup we made earlier
@@ -342,5 +341,5 @@
     </code>
 -->
 
-</div>
+</article>
 {% endblock body_content %}
diff --git a/template/install-on-macos.html.j2 b/template/install-on-macos.html.j2
index 22ede95f..80b1a012 100644
--- a/template/install-on-macos.html.j2
+++ b/template/install-on-macos.html.j2
@@ -1,8 +1,11 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container">
+<article class="container">
+
+  <header>
+    <h1>{{ _("Tutorial: GNUnet on macOS 10.14 (Mojave)") }}</h1>
+  </header>
 
-  <h2>{{ _("Tutorial: GNUnet on macOS 10.14 (Mojave)") }}</h2>
 
   <p>
     Welcome to the hopefully painless GNUnet tutorial for macOS Mojave! It provides
@@ -11,14 +14,14 @@
     developers, who want to get in touch with GNUnet for the first time.
   </p>
 
-  <h3>{{ _("Requirements") }}</h3>
+  <h2>{{ _("Requirements") }}</h2>
 
   <p>
     As a bare minimum, we recommend you install <a href="https://brew.sh">homebrew</a> and <a href="https://developer.apple.com/xcode/">XCode</a> before reading any further.
   </p>
 
 
-  <h3>{{ _("Installation") }}</h3>
+  <h2>{{ _("Installation") }}</h2>
   <p>
     GNUnet is available through homebrew:
   </p>
@@ -36,7 +39,7 @@
   <a href="https://gnunet.org/bugs">let us know</a>.
   </p>
 
-  <h3>{{_("First steps")}}</h3>
+  <h2>{{_("First steps")}}</h2>
   <p>
   Congratulations! GNUnet is now installed! Before starting it you
   may create a configuration file. By default GNUnet looks in
@@ -116,7 +119,7 @@ vpn (gnunet-service-vpn)
   </code>
   </p>
 
-  <h3>{{ _("Alternative: Installation from source") }}</h3>
+  <h2>{{ _("Alternative: Installation from source") }}</h2>
 
   <p>
     The following instructions are only really interesting for developers
@@ -141,7 +144,7 @@ vpn (gnunet-service-vpn)
   </code>
   </p>
 
-  <h4>{{ _("Get the source code") }}</h4>
+  <h3>{{ _("Get the source code") }}</h3>
   <p>
   <code>
     $ cd ~<br>
@@ -149,7 +152,7 @@ vpn (gnunet-service-vpn)
   </code>
   </p>
 
-  <h4>{{ _("Compile and Install") }}</h4>
+  <h3>{{ _("Compile and Install") }}</h3>
 
 
   <p>
@@ -161,7 +164,7 @@ vpn (gnunet-service-vpn)
     production version.
   </p>
   
-  <h5>{{ _("Option 1: GNUnet for production / usage") }}</h5>
+  <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4>
 
   <p>
   <code>
@@ -194,12 +197,12 @@ vpn (gnunet-service-vpn)
   </code>
   </p>
 
-  <h5>{{ _("Option 2: GNUnet experimental") }}</h5>
+  <h4>{{ _("Option 2: GNUnet experimental") }}</h4>
 
   <p>
   Perform the same steps as for Option 1, but add the configure flat '--enable-experimental'
   </p>
 
 
-</div>
+</article>
 {% endblock body_content %}
diff --git a/template/install-on-netbsd.html.j2 b/template/install-on-netbsd.html.j2
index 2d582989..aba939b3 100644
--- a/template/install-on-netbsd.html.j2
+++ b/template/install-on-netbsd.html.j2
@@ -1,8 +1,10 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container">
+<article class="container">
 
-  <h2>{{ _("Tutorial: GNUnet on NetBSD 8.0 CURRENT") }}</h2>
+  <header>
+    <h1>{{ _("Tutorial: GNUnet on NetBSD 8.0 CURRENT") }}</h1>
+  </header>
 
   <p>
     Welcome to the GNUnet tutorial for NetBSD!
@@ -14,7 +16,7 @@
     developers, who want to get in touch with GNUnet for the first time.
   </p>
 
-  <h3>{{ _("Requirements") }}</h3>
+  <h2>{{ _("Requirements") }}</h2>
 
   <p>
     As a bare minimum, we recommend you install <a href="http://pkgsrc.org">pkgsrc</a>. This tutorial assumes you have the CURRENT version checked out. Additionally you might want to install <code>devel/git-base</code> and git clone <a href="http://pkgsrc.org/wip/">pkgsrc-wip</a> into the <code>wip</code> folder in your pkgsrc folder:
@@ -25,7 +27,7 @@
       $ git clone git://wip.pkgsrc.org/pkgsrc-wip.git wip
     </code>
   </p>
-  <h3>{{ _("Installation") }}</h3>
+  <h2>{{ _("Installation") }}</h2>
   <p>
   Note: $ stands for commands run as unprivileged user, # for commands run as root user.
   </p>
@@ -97,7 +99,7 @@
   Note that the rc.d file which is installed is not yet functional.
   </p>
 
-  <h3>{{_("First steps")}}</h3>
+  <h2>{{_("First steps")}}</h2>
   <p>
   Congratulations! GNUnet is now installed! Before starting it you
   may create a configuration file. By default GNUnet looks in
@@ -177,7 +179,7 @@
   </code>
   </p>
 
-  <h3>{{ _("Alternative: Installation from source") }}</h3>
+  <h2>{{ _("Alternative: Installation from source") }}</h2>
 
   <p>
     The following instructions are only really interesting for developers
@@ -219,7 +221,7 @@
   </ul>
   </p>
 
-  <h4>{{ _("Get the source code") }}</h4>
+  <h3>{{ _("Get the source code") }}</h3>
   <p>
   <code>
     $ cd ~<br>
@@ -227,7 +229,7 @@
   </code>
   </p>
 
-  <h4>{{ _("Compile and Install") }}</h4>
+  <h3>{{ _("Compile and Install") }}</h3>
   <p>
     You have a choice between two options:
     build the *production version* or *development version*. If
@@ -277,5 +279,5 @@
   <p>
   This allows you to get more verbose logs when you export GNUNET_FORCE_LOG=";;;;DEBUG" before you run tests.
   </p>
-</div>
+</article>
 {% endblock body_content %}
diff --git a/template/install-on-ubuntu1804.html.j2 b/template/install-on-ubuntu1804.html.j2
index 687d786f..fb218110 100644
--- a/template/install-on-ubuntu1804.html.j2
+++ b/template/install-on-ubuntu1804.html.j2
@@ -1,12 +1,12 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
 <article class="container">
-<!--<article> -->
-<header>
-  <h2>{{ _("Tutorial: GNUnet on Ubuntu 18.04") }}</h2>
-</header>
-<section>
-  <h3>{{ _("Introduction") }}</h3>
+
+  <header>
+    <h1>{{ _("Tutorial: GNUnet on Ubuntu 18.04") }}</h1>
+  </header>
+
+  <h2>{{ _("Introduction") }}</h2>
   <p>
   Welcome to the hopefully painless GNUnet tutorial for Ubuntu 18.04!
   It provides very concrete instructions on how to compile, install
@@ -23,9 +23,7 @@
   <p>
   Now let's start!
   </p>
-</section>
-<section>
-  <h3>{{ _("Requirements") }}</h3>
+  <h2>{{ _("Requirements") }}</h2>
   <p>
     First let's install the following Ubuntu 18.04 packages to use
     GNUnet painlessly. Optional dependencies are listed in Appendix
@@ -39,9 +37,8 @@
       openssl libnss3-tools libmicrohttpd-dev libopus-dev libpulse-dev \<br>
       libogg-dev
   </code>
-</section>
-<section>
-  <h3>{{ _("Make an installation directory") }}</h3>
+
+  <h2>{{ _("Make an installation directory") }}</h2>
   <p>
     Next we create a directory in our home directory where we store
     the source code later. We should keep this directory after
@@ -52,9 +49,8 @@
   <code>
     $ mkdir ~/gnunet_installation
   </code>
-</section>
-<section>
-  <h3>{{ _("Get the source code") }}</h3>
+
+  <h2>{{ _("Get the source code") }}</h2>
   <p>
     We download the GNUnet source code using git.
   </p>
@@ -62,9 +58,7 @@
     $ cd ~/gnunet_installation<br>
     $ git clone --depth 1 https://gnunet.org/git/gnunet.git<br>
   </code>
-</section>
-<section>
-  <h3>{{ _("Compile and Install") }}</h3>
+  <h2>{{ _("Compile and Install") }}</h2>
   <p>
     Installing GNUnet is not hard. We have two options:
     installing a *production version* and installing a *development version*. If
@@ -73,9 +67,7 @@
     debug symbols that can be displayed with a debugger). Otherwise choose the
     production version.
   </p>
-</section>
-<section>
-  <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4>
+  <h3>{{ _("Option 1: GNUnet for production / usage") }}</h3>
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
     $ ./bootstrap<br>
@@ -85,9 +77,7 @@
     $ make -j$(nproc || echo -n 1)<br>
     $ sudo make install
   </code>
-</section>
-<section>
-  <h4>{{ _("Option 2: GNUnet for development") }}</h4>
+  <h3>{{ _("Option 2: GNUnet for development") }}</h3>
 
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
@@ -99,7 +89,7 @@
   </code>
 
   <!--
-<h4>{{ _("Install GNUnet plugin for name resolution") }}</h4>
+<h3>{{ _("Install GNUnet plugin for name resolution") }}</h3>
       So now it gets a bit nasty. It's not so bad. All we have to do is copy a file and edit another one. The file we need to copy is GNUnet's plugin for the Name Service Switch (NSS) in unix systems. Different unixes expect it in different locations and GNUnet's build system does not try to guess. On Ubuntu 18.04 we have to do
 
       <code>
@@ -136,9 +126,7 @@
 
   <p>That's it. It wasn't that nasty, was it?</p>
 -->
-</section>
-<section>
-  <h3>{{ _("Configuration") }}</h3>
+  <h2>{{ _("Configuration") }}</h2>
 
   <p>
     Congratulations! GNUnet is now installed! Before we start it we
@@ -212,16 +200,12 @@
   <code>
     $ gnunet-arm -e
   </code>
-</section>
-<section>
-  <h3>{{ _("Use GNUnet!") }}</h3>
+  <h2>{{ _("Use GNUnet!") }}</h2>
    <p>
         Please head over here: <a href="https://gnunet.org/en/use.html">Use!</a>
    <p>
-</section>
 
-<section>
-  <h3>{{ _("Uninstall GNUnet and its dependencies") }}</h3>
+  <h2>{{ _("Uninstall GNUnet and its dependencies") }}</h2>
 
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
@@ -236,13 +220,9 @@
     $ sudo mv /etc/nsswitch.conf.original /etc/nsswitch.conf<br>
     $ sudo rm /lib/$(uname -m)-linux-gnu/libnss_gns.so.2
   </code>
-</section>
 
-<section>
-  <h3>{{ _("Troubleshooting") }}</h3>
-</section>
-<section>
-  <h4>{{ _("You can't reach other people's nodes") }}</h4>
+  <h2>{{ _("Troubleshooting") }}</h2>
+  <h3>{{ _("You can't reach other people's nodes") }}</h3>
 
   <p>
     Should our computer not have reached the open GNUnet network automatically,
@@ -273,7 +253,7 @@
   <p>Now our GNUnet nodes can attempt reaching each other directly. This may
     still fail due to NAT traversal issues.</p>
 
-  <!--<h4>{{ _("OMG you guys broke my internet") }}</h4>
+  <!--<h3>{{ _("OMG you guys broke my internet") }}</h3>
 
       <p>We can replace `/etc/nsswitch.conf` with the backup we made earlier
         (`/etc/nsswitch.conf.original`). Now DNS resolution should work again without a
@@ -282,6 +262,5 @@
       <code>
         $ cp /etc/nsswitch.conf.original /etc/nsswitch.conf
       </code>-->
-</section>
 </article>
 {% endblock body_content %}
diff --git a/template/install.html.j2 b/template/install.html.j2
index ecec1363..84c581a5 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -7,18 +7,20 @@
   </header>
 
   <div class="row container justify-content-center">
-    <div class="col-6">
+    <div class="col-md">
       {% trans %}
       <p>The following GNUnet installation instructions help you building from source for your distribution.</p> 
       <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p>
+      <p>You have already installed GNUnet and want to use it? 
+      <a href="https://gnunet.org/en/use">Check this out!</a> </p>
       {% endtrans %}
+    </div>
+    <div class="col-md">
       {% trans %}
-      <p>You have already installed GNUnet and want to use it? 
-        <a href="https://gnunet.org/en/use">Check this out!</a> </p>
-        <p>Please be aware that this project is still in an early alpha 
-        stage when it comes to running software – its not an easy task 
-        to rewrite the whole Internet! We are happy to get your 
-        <a href="engage.html">helping hand</a> anytime!</p>
+      <p>Please be aware that this project is still in an early alpha 
+      stage when it comes to running software &#8211; its not an easy task 
+      to rewrite the whole Internet! We are happy to get your 
+      <a href="engage.html">helping hand</a> anytime!</p>
       <p>Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.</p>
       <p>If you have any queries about the installation or the usage, please <a href="engage.html">get in touch!</a></p>
       {% endtrans %}
@@ -26,15 +28,15 @@
   </div>
 
   <div class="row container justify-content-center text-center">
-    <div class="col-3">
+    <div class="col-md">
       <p><a href="install-on-ubuntu1804.html"><img src="{{ url('static/images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
       <h3>Ubuntu 18.04</h3>
     </div>
-    <div class="col-3">
+    <div class="col-md">
       <p><a href="install-on-debian9.html"><img src="{{ url('static/images/debian-logo.svg') }}" class="distro-logo"></a></p>
       <h3>Debian 9</h3>
     </div>
-    <div class="col-3">
+    <div class="col-md">
       <!-- Not the officially distributed file, but it's the same logo, in svg. Use this. -->
       <p><a href="install-on-netbsd.html"><img src="{{ url('static/images/NetBSD_Logo.svg') }}" class="distro-logo"></a></p>
       <h3>NetBSD</h3>
@@ -42,20 +44,16 @@
   </div>
 
   <div class="row container justify-content-center text-center">
-    <div class="col-3">
+    <div class="col-md">
       <p><a href="install-on-macos.html"><img src="{{ url('static/images/apple-logo.svg') }}" class="distro-logo"></a></p>
       <h3>macOS</h3>
     </div>
-    <div class="col-3">
+    <div class="col-md">
       <p><a href="install-on-archpi.html"><img src="{{ url('static/images/archlinux-logo.svg') }}" class="distro-logo" style="width:300px;height:auto"></a></p>
       <h3>Arch-Pi</h3>
     </div>
-    <!--
-    <div class="col-3">
-      <p><a href="https://tutorial.gnunet.org/"><img src="{{ url('static/images/gnunet-logo-dark-text.png') }}" class="distro-logo" alt="GNUnet" /></a></p>
-      <h3>C Coding Tutorial for GNUnet</h3>
+    <div class="col-md">
     </div>
-    -->
   </div>
 
 </article>
diff --git a/template/use.html.j2 b/template/use.html.j2
index 3169ae71..2a4e4c3b 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -6,378 +6,396 @@
     <h1>{{ _("How to use GNUnet - in a nutshell") }}</h1>
   </header>
 
-  <section>
-    <p>
-     This document is just a brief intro on what can be done with GNUnet. Find much more in our <a ref="https://docs.gnunet.org/">handbook / reference manual</a>, e.g. in the section <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">"using GNUnet"</a>.
+  <div class="row">
+    <div class="col-2 d-none d-lg-block"><!-- for large viewports show menu for better orientation -->
+      <nav class="nav subnav position-fixed flex-column border-right" style="position:fixed">
+      <a class="nav-link" href="#filesharing">{{ _("Filesharing") }}</a>
+      <a class="nav-link" href="#cadet">{{ _("CADET") }}</a>
+      <a class="nav-link" href="#groupchat">{{ _("Minimal Groupchat") }}</a>
+      <a class="nav-link" href="#gns_cli">{{ _("GNS with CLI") }}</a>
+      <a class="nav-link" href="#gns_browser">{{ _("GNS with Browser") }}</a>
+      <a class="nav-link" href="#vpn">{{ _("VPN") }}</a>
+      <a class="nav-link" href="#conversation">{{ _("Conversation") }}</a>
+      </nav>
+    </div>
 
-     The configuration in the handbook / reference manual is done with the UI interface gnunet-gtk.
-    </p>
-  </section>
+    <div class="col">
+      <section>
+        <p>
+         This document is just a brief intro on what can be done with GNUnet. Find much more in our <a ref="https://docs.gnunet.org/">handbook / reference manual</a>, e.g. in the section <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">"using GNUnet"</a>.
 
-  <section>
-    <h3>{{ _("Make sure your GNUnet installation works...") }}</h3>
-     <p>After installing and starting GNUnet you should make sure that your peer is connecting
-          to the P2P-network. By typing gnunet-core you should see something like this:
-    </p>
-     <p>
-          <code>
-          $ gnunet-core <br>
-          Tue Oct 30 19:58:48 2018: connection established DSTJ (timeout in 293 s)<br>
-          Tue Oct 30 19:58:48 2018: connection established A4MK (timeout in 292 s)<br>
-          Tue Oct 30 19:58:48 2018: connection established 7WRD (timeout in 299 s)<br>
-          Tue Oct 30 19:58:48 2018: connection established 5WBG (timeout in 299 s)<br>
-          </code>
-    </p>
-  </section>
-  <section>
-    <h4>{{ _("... and play around with it.") }}</h4>
-    <p>
-          So let's try out some of GNUnet's use cases. Please mind that some should be done in a particular order, one after another:
-    </p>
+         The configuration in the handbook / reference manual is done with the UI interface gnunet-gtk.
+        </p>
+      </section>
 
-    <ul>
-      <li>filesharing</li>
-      <li>A simple chat using CADET</li>
-      <li>Another simple chat using a nim client</i>
-      <li>Name resolution using GNS on the command line</li>
-      <li>Name resolution using GNS with a browser (do it on the command line first)</li>
-      <li>Serving a website using VPN (do name resolution with a browser first)</li>
-    </ul>
-  </section>
+      <section>
+        <h3>{{ _("Make sure your GNUnet installation works...") }}</h3>
+         <p>After installing and starting GNUnet you should make sure that your peer is connecting
+              to the P2P-network. By typing gnunet-core you should see something like this:
+        </p>
+         <p>
+              <code>
+              $ gnunet-core <br>
+              Tue Oct 30 19:58:48 2018: connection established DSTJ (timeout in 293 s)<br>
+              Tue Oct 30 19:58:48 2018: connection established A4MK (timeout in 292 s)<br>
+              Tue Oct 30 19:58:48 2018: connection established 7WRD (timeout in 299 s)<br>
+              Tue Oct 30 19:58:48 2018: connection established 5WBG (timeout in 299 s)<br>
+              </code>
+        </p>
+      </section>
+      <section>
+        <h3>{{ _("... and play around with it.") }}</h3>
+        <p>
+              So let's try out some of GNUnet's use cases. Please mind that some should be done in a particular order, one after another:
+        </p>
 
+        <ul>
+          <li>filesharing</li>
+          <li>A simple chat using CADET</li>
+          <li>Another simple chat using a nim client</i>
+          <li>Name resolution using GNS on the command line</li>
+          <li>Name resolution using GNS with a browser (do it on the command line first)</li>
+          <li>Serving a website using VPN (do name resolution with a browser first)</li>
+        </ul>
+      </section>
 
-  <section>
-    <h4><a name="fs"></a>{{ _("Filesharing") }}</h4>
 
-    <p>
-      Let's publish a file in the GNUnet filesharing network. We use the keywords
-      ("commons" and "state") so other people will be able to search for the file.
-    </p>
+      <section>
+        <h3><a name="filesharing" class="subnav-anchor"></a>{{ _("Filesharing") }}</h3>
 
-    <p>
-      We can choose any file and describe it with meaningful keywords (using the
-      `-k` command line option).
-    </p>
-    <p>
-    <code>
-      $ gnunet-publish -k commons -k state ostrom.pdf<br>
-      Publishing `/home/myself/ostrom.pdf' done.<br>
-      URI is `gnunet://fs/chk/M57SXDJ72EWS25CT6307KKJ8K0GCNSPTAZ649NA1NS10MJB4A1GZ9EN4Y02KST9VA5BHE8B335RPXQVBWVZ587Y83WQ7J3DHMBX30Q8.DHNGBN4CB2DBX1QRZ1R0B1Q18WTEAK4R94S9D57C9JMJJ3H7SSQDCV4D1218C4S2VP085AMQQSMG18FCP6NQMZQZJ91XR5NBX7YF0V0.42197237'.
-    </code>
-    </p>
-    <p>
-      Finding the file by keyword works with `gnunet-search`.
-    </p>
-    <p>
-    <code>
-      $ gnunet-search commons<br>
-      #1:<br>
-      gnunet-download -o "ostrom.pdf" gnunet://fs/chk/M57SXDJ72EWS25CT6307KKJ8K0GCNSPTAZ649NA1NS10MJB4A1GZ9EN4Y02KST9VA5BHE8B335RPXQVBWVZ587Y83WQ7J3DHMBX30Q8.DHNGBN4CB2DBX1QRZ1R0B1Q18WTEAK4R94S9D57C9JMJJ3H7SSQDCV4D1218C4S2VP085AMQQSMG18FCP6NQMZQZJ91XR5NBX7YF0V0.42197237
-    </code>
-    </p>
-    <p>
-      It gives us the command line call to download the file (and store it as
-      ostrom.pdf)!
-    </p>
-    <p>
-      Please also refer to the chapter on <a href="=> https://docs.gnunet.org/#File_002dsharing
-  ">filesharing in the handbook</a>.
+        <p>
+          Let's publish a file in the GNUnet filesharing network. We use the keywords
+          ("commons" and "state") so other people will be able to search for the file.
+        </p>
 
-  </section>
+        <p>
+          We can choose any file and describe it with meaningful keywords (using the
+          `-k` command line option).
+        </p>
+        <p>
+        <code>
+          $ gnunet-publish -k commons -k state ostrom.pdf<br>
+          Publishing `/home/myself/ostrom.pdf' done.<br>
+          URI is `gnunet://fs/chk/M57S...
+        </code>
+        </p>
+        <p>
+          Finding the file by keyword works with `gnunet-search`.
+        </p>
+        <p>
+        <code>
+          $ gnunet-search commons<br>
+          #1:<br>
+          gnunet-download -o "ostrom.pdf" gnunet://fs/chk/M57S...
+        </code>
+        </p>
+        <p>
+          It gives us the command line call to download the file (and store it as
+          ostrom.pdf)!
+        </p>
+        <p>
+          Please also refer to the chapter on <a href="=> https://docs.gnunet.org/#File_002dsharing
+      ">filesharing in the handbook</a>.
 
+      </section>
 
 
-  <section>
-    <h4>{{ _("CADET (and Chat)") }}</h4>
 
-    <p>
-      We can use the `gnunet-cadet` command line tool to open a port and from
-      another machine connect to this port and chat or transfer data. First we need
-      our *peer ID* of the GNUnet peer opening the port.
-    </p>
-    <p>
-    <code>
-      $ gnunet-peerinfo -s<br>
-      I am peer `P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG'.
-    </code>
-    </p>
-    <p>
-      Now we open the port (it can be any string!):
-    </p>
-    <p>
-    <code>
-      $ gnunet-cadet -o my-secret-port
-    </code>
-    </p>
-    <p>On the other machine we can connect using the peer ID and the port and start chatting!</p>
-    <p>
-    <code>
-      $ gnunet-cadet P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG my-secret-port
-    </code>
-    </p>
-    <p>
-          If you are interested into CADET in detail, please have a look in the <a href="https://docs.gnunet.org/#CADET-Subsystem">chapter "Cadet-Subsystem" in our handbook</a>.
-    </p>
+      <section>
+        <h3><a name="cadet" class="subnav-anchor"></a>{{ _("CADET (and Chat)") }}</h3>
 
-  </section>
+        <p>
+          We can use the `gnunet-cadet` command line tool to open a port and from
+          another machine connect to this port and chat or transfer data. First we need
+          our *peer ID* of the GNUnet peer opening the port.
+        </p>
+        <p>
+        <code>
+          $ gnunet-peerinfo -s<br>
+          I am peer `P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG'.
+        </code>
+        </p>
+        <p>
+          Now we open the port (it can be any string!):
+        </p>
+        <p>
+        <code>
+          $ gnunet-cadet -o my-secret-port
+        </code>
+        </p>
+        <p>On the other machine we can connect using the peer ID and the port and start chatting!</p>
+        <p>
+        <code>
+          $ gnunet-cadet P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG my-secret-port
+        </code>
+        </p>
+        <p>
+              If you are interested into CADET in detail, please have a look in the <a href="https://docs.gnunet.org/#CADET-Subsystem">chapter "Cadet-Subsystem" in our handbook</a>.
+        </p>
 
-  <section>
-    <h4>{{ _("Chatting with a (simple) client") }}</h4>
-     <p>
-          To chat a tiny bit prettier, we need to install and compile additional software.
-          If you join the chat mentioned below and no one is there, feel free to ping on
-          IRC/freenode #gnunet and ask if someone can join to test with you! (But we are
-          trying to be there as often as possible).
-     </p>
-     <p>
-     <code>
-          $ git clone https://gnunet.org/git/gnunet-nim.git<br>
-          $ cd gnunet-nim/examples<br>
-          $ nim c groupchat.nim<br>
-     </code>
-     <p>
-     <p>
-          Fine! We can now try to enter a chat server running on another GNUnet node.
-     </p>
-     <p>
-     <code>
-          $LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat --config=/path/to/gnunet.conf --server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss --nick=YOURNICK
-     </code>
-     </p>
-     <p>
-          The peer and port in this example should work in real, because that peer is almost online and running groupchat on that port.
-     <p>
-          You should now see something like this:
-     </p>
-     <p>
-     <code>
-          > 2018-10-30 19:50:10 Welcome 8Q2T! participants: @[]<br>
-          Hello GNUnet!<br>
-          2018-10-30 19:52:53 [8Q2T] Hello GNUnet!<br>
-     </code>
-     <p>
-     <p>
-          Here we have typed "Hello gnunet!" to standard in which is then written out to standard out after having been sent back from GNUnet.
-     </p>
-  </section>
+      </section>
 
+      <section>
+        <h3><a name="groupchat" class="subnav-anchor"></a>{{ _("Chatting with a (simple) client") }}</h3>
+         <p>
+              To chat a tiny bit prettier, we need to install and compile additional software.
+              If you join the chat mentioned below and no one is there, feel free to ping on
+              IRC/freenode #gnunet and ask if someone can join to test with you! (But we are
+              trying to be there as often as possible).
+         </p>
+         <p>
+         <code>
+              $ git clone https://gnunet.org/git/gnunet-nim.git<br>
+              $ cd gnunet-nim/examples<br>
+              $ nim c groupchat.nim<br>
+         </code>
+         <p>
+         <p>
+              Fine! We can now try to enter a chat server running on another GNUnet node.
+         </p>
+         <p>
+         <code>
+               $ LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat --config=/path/to/gnunet.conf --server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss --nick=YOURNICK<br>
+         </code>
+         <p>
+              (or as alternative server "YV6G9EP9K3X41BM3FJ3D29BDZR6358XNZ6KDZVV7DFW729YB0KCG" and port "welcome")
+         </p>
+         <p>
+              The peer and port in this example should work in real, because that peer is almost always online and running groupchat on that port.
+         <p>
+              You should now see something like this:
+         </p>
+         <p>
+         <code>
+              > 2018-10-30 19:50:10 Welcome 8Q2T! participants: @[]<br>
+              Hello GNUnet!<br>
+              2018-10-30 19:52:53 [8Q2T] Hello GNUnet!<br>
+         </code>
+         <p>
+         <p>
+              Here we have typed "Hello gnunet!" to standard in which is then written out to standard out after having been sent back from GNUnet.
+         </p>
+      </section>
 
 
-  <section>
-    <h4><a name="gns"></a>{{ _("Name resolution using GNS on the command line") }}</h4>
 
-    <p>GNS is the GNU name service, a fully decentralized alternatice to DNS. We'll publish an IP address in a GNS record try to resolve it on the command line. First we need an identity which is the
-      equivalent to a zone in DNS. We'll call it "myself" and create it using the
-      `gnunet-identity` command line tool. Instead of "myself" you can surely use your
-      nick or any other name. </p>
-    <p>
-    <code>
-      $ gnunet-identity -C myself
-    </code>
-    </p>
-    <p>We can check if it worked using the same tool. We expect the name of our identity and the corresponding public key to be displayed.</p>
-    <p>
-    <code>
-      $ gnunet-identity -d<br>
-      myself - HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
-    </code>
-    </p>
-    <p>
-      Now we add a public `A` record to our zone. It has the name "ccc", a value
-      of "195.54.164.39" and it expires after one day.
-    </p>
-    <p>
-    <code>
-      $ gnunet-namestore -z myself -a -e "1 d" -p -t A -n ccc -V 195.54.164.39
-    </code>
-    </p>
-    <p>Now we can query that record using the command line tool `gnunet-gns`.</p>
-    <p>
-    <code>
-      $ gnunet-gns -t A -u ccc.myself<br>
-      ccc.myself:<br>
-      Got `A' record: 195.54.164.39
-    </code>
-    </p>
-    <p>
-      So it worked! But only resolving our own records is boring. So we
-      can give our identity (the public key of it to be precise) to
-      someone else so they can try to resolve our records, too. The
-      other person (Bob) has to add it to his namestore like this:
-    </p>
-    <p>
-    <code>
-      $ gnunet-namestore -z myself -a -e never -p -t PKEY -n alice -V HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
-    </code>
-    </p>
-    <p>
-      Our identity in Bobs namestore is a public record (-p) and never
-      expires (-e never). Now Bob (let's assume he has called his
-      identity myself, too) should be able to resolve our "ccc" record,
-      too!
-    </p>
-    <p>
-    <code>
-      $ gnunet-gns -t A -u ccc.alice.myself<br>
-      ccc.alice.myself:<br>
-      Got `A' record: 195.54.164.39
-    </code>
-    </p>
-    <p>
-      It can continue like this. A friend of Bob would be able to
-      resolve our records too because Bob published our identity in a
-      public record. Bobs friend would simply use "ccc.alice.bob.myself"
-      to resolve our "ccc" record.
-    </p>
-    <p>
-  See the <a href="https://docs.gnunet.org/#First-steps-_002d-Using-the-GNU-Name-System">chapter "Using the GNU Name System" in our handbook</a> for a more detailed documentation.
-    </p>
-  </section>
+      <section>
+        <h3><a name="gns_cli" class="subnav-anchor"></a>{{ _("Name resolution using GNS on the command line") }}</h3>
 
+        <p>GNS is the GNU name service, a fully decentralized alternatice to DNS. We'll publish an IP address in a GNS record try to resolve it on the command line. First we need an identity which is the
+          equivalent to a zone in DNS. We'll call it "myself" and create it using the
+          `gnunet-identity` command line tool. Instead of "myself" you can surely use your
+          nick or any other name. </p>
+        <p>
+        <code>
+          $ gnunet-identity -C myself
+        </code>
+        </p>
+        <p>We can check if it worked using the same tool. We expect the name of our identity and the corresponding public key to be displayed.</p>
+        <p>
+        <code>
+          $ gnunet-identity -d<br>
+          myself - HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
+        </code>
+        </p>
+        <p>
+          Now we add a public `A` record to our zone. It has the name "ccc", a value
+          of "195.54.164.39" and it expires after one day.
+        </p>
+        <p>
+        <code>
+          $ gnunet-namestore -z myself -a -e "1 d" -p -t A -n ccc -V 195.54.164.39
+        </code>
+        </p>
+        <p>Now we can query that record using the command line tool `gnunet-gns`.</p>
+        <p>
+        <code>
+          $ gnunet-gns -t A -u ccc.myself<br>
+          ccc.myself:<br>
+          Got `A' record: 195.54.164.39
+        </code>
+        </p>
+        <p>
+          So it worked! But only resolving our own records is boring. So we
+          can give our identity (the public key of it to be precise) to
+          someone else so they can try to resolve our records, too. The
+          other person (Bob) has to add it to his namestore like this:
+        </p>
+        <p>
+        <code>
+          $ gnunet-namestore -z myself -a -e never -p -t PKEY -n alice -V HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
+        </code>
+        </p>
+        <p>
+          Our identity in Bobs namestore is a public record (-p) and never
+          expires (-e never). Now Bob (let's assume he has called his
+          identity myself, too) should be able to resolve our "ccc" record,
+          too!
+        </p>
+        <p>
+        <code>
+          $ gnunet-gns -t A -u ccc.alice.myself<br>
+          ccc.alice.myself:<br>
+          Got `A' record: 195.54.164.39
+        </code>
+        </p>
+        <p>
+          It can continue like this. A friend of Bob would be able to
+          resolve our records too because Bob published our identity in a
+          public record. Bobs friend would simply use "ccc.alice.bob.myself"
+          to resolve our "ccc" record.
+        </p>
+        <p>
+      See the <a href="https://docs.gnunet.org/#First-steps-_002d-Using-the-GNU-Name-System">chapter "Using the GNU Name System" in our handbook</a> for a more detailed documentation.
+        </p>
+      </section>
 
-  <section id='gns_proxy'>
-    <h4>{{ _("Name resolution using GNS with a browser") }}</h4>
 
-    <p>
-      In the previous use case "Name resolution using GNS on the command line" we got an idea
-      about what GNS is about, but now let's use it with a browser, to make it actually useful. Currently Firefox and Chromium are known to work.
-    </p>
+      <section id='gns_proxy'>
+        <h3><a name="gns_browser" class="subnav-anchor"></a>{{ _("Name resolution using GNS with a browser") }}</h3>
 
-    <p>
-      Many websites enforce HTTPS and thus provide certificates for
-      their hostnames (and not our GNS names). Browsers don't like wrong
-      hostnames in certificates and will present error messages. So GNUnet
-      has to trick them by generating own certificates for our GNS
-      names. This means we need to create our own certificate authority
-      and tell our browser about it. Luckily there's a script for it:
-    </p>
-    <p>
-    <code>
-      $ gnunet-gns-proxy-setup-ca
-    </code>
-    </p>
-    <p>After executing this script the Browser has to be restarted.</p>
+        <p>
+          In the previous use case "Name resolution using GNS on the command line" we got an idea
+          about what GNS is about, but now let's use it with a browser, to make it actually useful. Currently Firefox and Chromium are known to work.
+        </p>
 
-    <p>
-      GNUnet provides a proxy service (gnunet-gns-proxy) that the
-      browser can send DNS and HTTP traffic to. It will try to resolve
-      names with GNS first and forward the rest of the DNS traffic to
-      the system's DNS resolver. It will also take care of the HTTP
-      traffic, so the browser gets valid certificates and the web server
-      will not be confused by our GNS hostnames. Our GNS namestore
-      doesn't know about any DNS hostnames yet, so we have to store
-      them, too. For our "ccc" A record, we have to store a LEHO (legacy
-      hostname) record, too. It must contain the website's original DNS
-      hostname:
-    </p>
-    <p>
-    <code>
-      $ gnunet-namestore -z myself -a -e "1 d" -p -t LEHO -n ccc -V www.ccc.de
-    </code>
-    </p>
-    <p>Now let's start gnunet-gns-proxy.</p>
-    <p>
-    <code>
-      $ /usr/lib/gnunet/libexec/gnunet-gns-proxy
-    </code>
-    </p>
-    <p>
-      Our browser has to be configured so it uses our proxy. In Firefox
-      we have to set these options under "about:config":
-    </p>
-    <p>
-    <code>
-      network.proxy.socks:            localhost<br>
-      network.proxy.socks_port:       7777<br>
-      network.proxy.socks_remote_dns  true<br>
-      network.proxy.type:             1
-    </code>
-    </p>
-    <p>
-      To tell Chromium to use the proxy, it has to be started with the
-      "--proxy-server" command line option:
-    </p>
-    <p>
-    <code>
-      $ chromium --proxy-server="socks5://127.0.0.1:7777"
-    </code>
-    </p>
-    <p>
-      Now we should be able to resolve our GNS names in the browser! We
-      just have to type "https://ccc.myself" into the address bar. If
-      our friend Bob prepared his system, too, he can resolve our record
-      by typing "ccc.alice.myself".
-    </p>
-    <p>
-     See the <a href="https://docs.gnunet.org/#Integration-with-Browsers">chapter on Integration with Browsers in our handbook</a> for a more detailed description.
-    </p>
-  </section>
-  <section>
-    <h4>{{ _("VPN") }}</h4>
-    <p>
-          VPN can be used to share your Internet connection (yes, this may be dangerous, just as running a Tor exit node) or to provide access to services on your host (this should be less dangerous, as long as those services are secure).
-    </p>
-    <p>
-      In this tutorial we concentrate on providing access to services on your host.
-    </p>
-    <p>
-      For documentation to share your Internet connection have a look into <a href="https://docs.gnunet.org/#Configuring-the-GNUnet-VPN">chapter "Configuring the GNUnet VPN" in the handbook.</a>
-    </p>
-    <p>
-      First you have to edit your gnunet.conf and add this section.
-    </p>
-    <p>
-      <code>
-      [exit]</br>
-      START_ON_DEMAND = YES
-      </code>
-    </p>
-    <p>
-      This is necessary to start the exit daemon.
-    </p>
-    <p>
-      Furthermore you need to add a section for your service.
-    </p>
-    <p>
-      <code>
-      [http.gnunet.]</br>
-      TCP_REDIRECTS = 80:169.254.86.1:80
-      </code>
-    </p>
-    <p>
-      Here a service named 'http' is configured to be accessed on a remote and local host on port 80. The IP address is the default IP address for the exit interface. If you like to change to another private IP address range you can use can change
-    </p>
-    <p>
-      <code>
-      IPV4ADDR = 169.254.86.1
-      </code>
-    </p>
-    <p>
-      in section 'exit'.
-    </p>
-    <p>
-      Now we have to add a GNS record to the namestore.
-    </p>
-    <p>
-      <code>
-      gnunet-namestore -z myself -a -e "1 d" -p -t VPN -n www -V "1 PKEY http"
-      </code>
-    </p>
-    <p>
-      Where myself is the name of the zone we already used <a href='#gns_proxy'>above</a>, but now we are adding a record of type VPN, and the value is a string containing three values. A boolean indicating the use of TCP or UDP (TCP in the example above), the public key of your node and the identifier of the service we used <a href='#'>above</a> ([http.gnunet.].
-    </p>
-    <p>
-      After we added this record we should be able to access www.myself like we did ccc.myself via the browser <a href='#gns_proxy'>above</a>.
-    </p>
-    <p>
-      The UI version of this Tutorial can be find in Chapter <a href='https://docs.gnunet.org/#First-steps-_002d-Using-the-GNUnet-VPN'>Using the GNUnet VPN</a> in the handbook.
-    </p>
-  </section>
-  <section>
-    <h4>{{ _("Conversation") }}</h4>
-    <p>
-      TBD, see <a href="https://docs.gnunet.org/#First-steps-_002d-Using-GNUnet-Conversation">chapter "Using GNUnet Conversation" in the handbook.</a>
-    </p>
-  </section>
+        <p>
+          Many websites enforce HTTPS and thus provide certificates for
+          their hostnames (and not our GNS names). Browsers don't like wrong
+          hostnames in certificates and will present error messages. So GNUnet
+          has to trick them by generating own certificates for our GNS
+          names. This means we need to create our own certificate authority
+          and tell our browser about it. Luckily there's a script for it:
+        </p>
+        <p>
+        <code>
+          $ gnunet-gns-proxy-setup-ca
+        </code>
+        </p>
+        <p>After executing this script the Browser has to be restarted.</p>
+
+        <p>
+          GNUnet provides a proxy service (gnunet-gns-proxy) that the
+          browser can send DNS and HTTP traffic to. It will try to resolve
+          names with GNS first and forward the rest of the DNS traffic to
+          the system's DNS resolver. It will also take care of the HTTP
+          traffic, so the browser gets valid certificates and the web server
+          will not be confused by our GNS hostnames. Our GNS namestore
+          doesn't know about any DNS hostnames yet, so we have to store
+          them, too. For our "ccc" A record, we have to store a LEHO (legacy
+          hostname) record, too. It must contain the website's original DNS
+          hostname:
+        </p>
+        <p>
+        <code>
+          $ gnunet-namestore -z myself -a -e "1 d" -p -t LEHO -n ccc -V www.ccc.de
+        </code>
+        </p>
+        <p>Now let's start gnunet-gns-proxy.</p>
+        <p>
+        <code>
+          $ /usr/lib/gnunet/libexec/gnunet-gns-proxy
+        </code>
+        </p>
+        <p>
+          Our browser has to be configured so it uses our proxy. In Firefox
+          we have to set these options under "about:config":
+        </p>
+        <p>
+        <code>
+          network.proxy.socks:            localhost<br>
+          network.proxy.socks_port:       7777<br>
+          network.proxy.socks_remote_dns  true<br>
+          network.proxy.type:             1
+        </code>
+        </p>
+        <p>
+          To tell Chromium to use the proxy, it has to be started with the
+          "--proxy-server" command line option:
+        </p>
+        <p>
+        <code>
+          $ chromium --proxy-server="socks5://127.0.0.1:7777"
+        </code>
+        </p>
+        <p>
+          Now we should be able to resolve our GNS names in the browser! We
+          just have to type "https://ccc.myself" into the address bar. If
+          our friend Bob prepared his system, too, he can resolve our record
+          by typing "ccc.alice.myself".
+        </p>
+        <p>
+         See the <a href="https://docs.gnunet.org/#Integration-with-Browsers">chapter on Integration with Browsers in our handbook</a> for a more detailed description.
+        </p>
+      </section>
+      <section>
+        <h3><a name="vpn" class="subnav-anchor"></a>{{ _("VPN") }}</h3>
+        <p>
+              VPN can be used to share your Internet connection (yes, this may be dangerous, just as running a Tor exit node) or to provide access to services on your host (this should be less dangerous, as long as those services are secure).
+        </p>
+        <p>
+          In this tutorial we concentrate on providing access to services on your host.
+        </p>
+        <p>
+          For documentation to share your Internet connection have a look into <a href="https://docs.gnunet.org/#Configuring-the-GNUnet-VPN">chapter "Configuring the GNUnet VPN" in the handbook.</a>
+        </p>
+        <p>
+          First you have to edit your gnunet.conf and add this section.
+        </p>
+        <p>
+          <code>
+          [exit]</br>
+          START_ON_DEMAND = YES
+          </code>
+        </p>
+        <p>
+          This is necessary to start the exit daemon.
+        </p>
+        <p>
+          Furthermore you need to add a section for your service.
+        </p>
+        <p>
+          <code>
+          [http.gnunet.]</br>
+          TCP_REDIRECTS = 80:169.254.86.1:80
+          </code>
+        </p>
+        <p>
+          Here a service named 'http' is configured to be accessed on a remote and local host on port 80. The IP address is the default IP address for the exit interface. If you like to change to another private IP address range you can use can change
+        </p>
+        <p>
+          <code>
+          IPV4ADDR = 169.254.86.1
+          </code>
+        </p>
+        <p>
+          in section 'exit'.
+        </p>
+        <p>
+          Now we have to add a GNS record to the namestore.
+        </p>
+        <p>
+          <code>
+          gnunet-namestore -z myself -a -e "1 d" -p -t VPN -n www -V "1 PKEY http"
+          </code>
+        </p>
+        <p>
+          Where myself is the name of the zone we already used <a href='#gns_proxy'>above</a>, but now we are adding a record of type VPN, and the value is a string containing three values. A boolean indicating the use of TCP or UDP (TCP in the example above), the public key of your node and the identifier of the service we used <a href='#'>above</a> ([http.gnunet.].
+        </p>
+        <p>
+          After we added this record we should be able to access www.myself like we did ccc.myself via the browser <a href='#gns_proxy'>above</a>.
+        </p>
+        <p>
+          The UI version of this Tutorial can be find in Chapter <a href='https://docs.gnunet.org/#First-steps-_002d-Using-the-GNUnet-VPN'>Using the GNUnet VPN</a> in the handbook.
+        </p>
+      </section>
+      <section>
+        <h3><a name="conversation" class="subnav-anchor"></a>{{ _("Conversation") }}</h3>
+        <p>
+          TBD, see <a href="https://docs.gnunet.org/#First-steps-_002d-Using-GNUnet-Conversation">chapter "Using GNUnet Conversation" in the handbook.</a>
+        </p>
+      </section>
+    </div>
+  </div>
 </article>
 {% endblock body_content %}