From 42e0227553d7212da7a816e6a6969dc3cf3b6cd0 Mon Sep 17 00:00:00 2001
From: mu <mu@m.m>
Date: Sun, 30 Jun 2019 17:40:37 +0200
Subject: about, index 6th box, install-warnings --sva

---
 locale/de/LC_MESSAGES/messages.po | 132 ++++++++++++++++++++++++--------------
 locale/en/LC_MESSAGES/messages.po | 130 +++++++++++++++++++++++--------------
 locale/es/LC_MESSAGES/messages.po | 132 ++++++++++++++++++++++++--------------
 locale/fr/LC_MESSAGES/messages.po | 132 ++++++++++++++++++++++++--------------
 locale/it/LC_MESSAGES/messages.po | 132 ++++++++++++++++++++++++--------------
 template/about.html.j2            |  20 +++++-
 template/index.html.j2            |  23 ++++++-
 template/install.html.j2          |   7 +-
 8 files changed, 463 insertions(+), 245 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index a16dc953..97c579e3 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-06-30 13:20+0200\n"
+"POT-Creation-Date: 2019-06-30 16:59+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"
@@ -87,7 +87,7 @@ msgstr ""
 msgid "About"
 msgstr "Über GNUnet"
 
-#: common/navigation.j2.inc:42 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:378
 msgid "News"
 msgstr "Neues"
 
@@ -276,31 +276,47 @@ msgid ""
 "#Egos\">Egos</a></li> </ul>"
 msgstr ""
 
-#: template/about.html.j2:85
+#: template/about.html.j2:88
+msgid "More Resources"
+msgstr ""
+
+#: template/about.html.j2:90
+msgid ""
+"There are much more resources to learn about GNUnet besides the <a href="
+"\"https://docs.gnunet.org\">main handbook / reference manual</a>, such as "
+"the <a href=\"https://bib.gnunet.org/\">bibliography</a> with papers from "
+"all stages, lots of <a href=\"https://gnunet.org/en/video.html\">videos</a> "
+"or a brief <a href=\"https://gnunet.org/en/glossary.html\">glossary</a>."
+msgstr ""
+
+#: template/about.html.j2:95
+msgid ""
+"You are most welcome to <a href=\"https://gnunet.org/en/engage.html\">get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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> "
+"in various ways."
+msgstr ""
+
+#: template/about.html.j2:100
 msgid ""
-"There are much more ressources to learn about GNUnet besides the <a href="
-"\"https://docs.gnunet.org\">main handbook</a>, such as the <a href=\"https://"
-"bib.gnunet.org/\">bibliography</a>, lots of <a href=\"https://gnunet.org/en/"
-"video.html\">videos</a> or a <a href=\"https://gnunet.org/en/glossary.html"
-"\">glossary</a>. You are very welcome to <a href=\"https://gnunet.org/en/"
-"engage.html\">get engaged into the conversation</a>, <a href=\"https://"
-"gnunet.org/en/tutorial.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>."
+"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!"
 msgstr ""
 
-#: template/about.html.j2:92
+#: template/about.html.j2:105
 msgid "Current funding"
 msgstr "Aktuelle Finanzierung"
 
-#: template/about.html.j2:97
+#: template/about.html.j2:110
 msgid ""
 "We're receiving funding from NLnet's Next Generation Internet funding line "
 "to document and implement the GNU Name System protocol in a way suitable for "
 "the IETF standardization process."
 msgstr ""
 
-#: template/about.html.j2:109
+#: template/about.html.j2:123
 #, fuzzy
 #| msgid "We are grateful for past funding from the following organizations:"
 msgid ""
@@ -309,11 +325,11 @@ msgstr ""
 "Wir sind den folgenden Organisatzionen sehr dankbar für ihre frühere "
 "Unterstützung:"
 
-#: template/about.html.j2:118
+#: template/about.html.j2:132
 msgid "Past funding"
 msgstr "Frühere Finanzierung"
 
-#: template/about.html.j2:120
+#: template/about.html.j2:134
 msgid "We are grateful for past funding from the following organizations:"
 msgstr ""
 "Wir sind den folgenden Organisatzionen sehr dankbar für ihre frühere "
@@ -1499,50 +1515,67 @@ msgstr ""
 #: template/index.html.j2:207
 #, fuzzy
 #| msgid "About GNUnet"
-msgid "Learn about the GNUnet"
+msgid "Learn more about the GNUnet"
 msgstr "Über GNUnet"
 
 #: template/index.html.j2:209
 msgid ""
-"If you want to know more about the GNUnet please continue reading <a href="
-"\"about.html\">here</a>."
+"If you want to know more about the GNUnet please continue reading the <a "
+"href=\"about.html\">about page</a>. There are much more ressources, such as "
+"the <a href=\"https://docs.gnunet.org\">main handbook / reference manual</"
+"a>, a <a href=\"https://bib.gnunet.org/\">bibliography</a> and <a href="
+"\"https://gnunet.org/en/video.html\">videos</a>."
+msgstr ""
+
+#: template/index.html.j2:218
+msgid ""
+"You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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>."
+msgstr ""
+
+#: template/index.html.j2:227
+msgid ""
+"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!"
 msgstr ""
 
-#: template/index.html.j2:226
+#: template/index.html.j2:245
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:235
+#: template/index.html.j2:254
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:237
+#: template/index.html.j2:256
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:249
+#: template/index.html.j2:268
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:252
+#: template/index.html.j2:271
 msgid ""
-"The GNU Name System (GNS) is a fully decentralized replacement for the "
-"Domain Name System (DNS). Instead of using a hierarchy, GNS uses a directed "
-"graph. Naming conventions are similar to DNS, but queries and replies are "
-"private even with respect to peers providing the answers. The integrity of "
-"records and privacy of look-ups is cryptographically secured. <!-- Too "
-"technical: GNS integrates a robust, efficient and instant key revocation "
-"mechanism. -->"
+"The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
+"decentralized replacement for the Domain Name System (DNS). Instead of using "
+"a hierarchy, GNS uses a directed graph. Naming conventions are similar to "
+"DNS, but queries and replies are private even with respect to peers "
+"providing the answers. The integrity of records and privacy of look-ups is "
+"cryptographically secured. <!-- Too technical: GNS integrates a robust, "
+"efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:267
+#: template/index.html.j2:287
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:269
+#: template/index.html.j2:289
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1550,37 +1583,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:282
+#: template/index.html.j2:302
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:284
+#: template/index.html.j2:304
 msgid ""
-"GNUnet filesharing is an application that aims to provide censorship-"
-"resistant, anonymous filesharing. The publisher is empowered to make a "
-"gradual choice between performance and anonymity."
+"GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
+"to provide censorship-resistant, anonymous filesharing. The publisher is "
+"empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:294
+#: template/index.html.j2:315
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:296
+#: template/index.html.j2:317
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:313
+#: template/index.html.j2:334
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:322
+#: template/index.html.j2:343
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:324
+#: template/index.html.j2:345
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1588,11 +1621,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:336
+#: template/index.html.j2:357
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:338
+#: template/index.html.j2:359
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
@@ -1739,8 +1772,11 @@ msgstr ""
 #: template/install.html.j2:15
 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>Further information is "
-"available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
+"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>"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 94abcc78..2bf4207f 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -56,7 +56,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:378
 msgid "News"
 msgstr ""
 
@@ -243,40 +243,56 @@ msgid ""
 "#Egos\">Egos</a></li> </ul>"
 msgstr ""
 
-#: template/about.html.j2:85
+#: template/about.html.j2:88
+msgid "More Resources"
+msgstr ""
+
+#: template/about.html.j2:90
+msgid ""
+"There are much more resources to learn about GNUnet besides the <a href="
+"\"https://docs.gnunet.org\">main handbook / reference manual</a>, such as "
+"the <a href=\"https://bib.gnunet.org/\">bibliography</a> with papers from "
+"all stages, lots of <a href=\"https://gnunet.org/en/video.html\">videos</a> "
+"or a brief <a href=\"https://gnunet.org/en/glossary.html\">glossary</a>."
+msgstr ""
+
+#: template/about.html.j2:95
+msgid ""
+"You are most welcome to <a href=\"https://gnunet.org/en/engage.html\">get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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> "
+"in various ways."
+msgstr ""
+
+#: template/about.html.j2:100
 msgid ""
-"There are much more ressources to learn about GNUnet besides the <a href="
-"\"https://docs.gnunet.org\">main handbook</a>, such as the <a href=\"https://"
-"bib.gnunet.org/\">bibliography</a>, lots of <a href=\"https://gnunet.org/en/"
-"video.html\">videos</a> or a <a href=\"https://gnunet.org/en/glossary.html"
-"\">glossary</a>. You are very welcome to <a href=\"https://gnunet.org/en/"
-"engage.html\">get engaged into the conversation</a>, <a href=\"https://"
-"gnunet.org/en/tutorial.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>."
+"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!"
 msgstr ""
 
-#: template/about.html.j2:92
+#: template/about.html.j2:105
 msgid "Current funding"
 msgstr ""
 
-#: template/about.html.j2:97
+#: template/about.html.j2:110
 msgid ""
 "We're receiving funding from NLnet's Next Generation Internet funding line "
 "to document and implement the GNU Name System protocol in a way suitable for "
 "the IETF standardization process."
 msgstr ""
 
-#: template/about.html.j2:109
+#: template/about.html.j2:123
 msgid ""
 "We are grateful for free hosting offered by the following organizations:"
 msgstr ""
 
-#: template/about.html.j2:118
+#: template/about.html.j2:132
 msgid "Past funding"
 msgstr ""
 
-#: template/about.html.j2:120
+#: template/about.html.j2:134
 msgid "We are grateful for past funding from the following organizations:"
 msgstr ""
 
@@ -1446,50 +1462,67 @@ msgid ""
 msgstr ""
 
 #: template/index.html.j2:207
-msgid "Learn about the GNUnet"
+msgid "Learn more about the GNUnet"
 msgstr ""
 
 #: template/index.html.j2:209
 msgid ""
-"If you want to know more about the GNUnet please continue reading <a href="
-"\"about.html\">here</a>."
+"If you want to know more about the GNUnet please continue reading the <a "
+"href=\"about.html\">about page</a>. There are much more ressources, such as "
+"the <a href=\"https://docs.gnunet.org\">main handbook / reference manual</"
+"a>, a <a href=\"https://bib.gnunet.org/\">bibliography</a> and <a href="
+"\"https://gnunet.org/en/video.html\">videos</a>."
+msgstr ""
+
+#: template/index.html.j2:218
+msgid ""
+"You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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>."
+msgstr ""
+
+#: template/index.html.j2:227
+msgid ""
+"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!"
 msgstr ""
 
-#: template/index.html.j2:226
+#: template/index.html.j2:245
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:235
+#: template/index.html.j2:254
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:237
+#: template/index.html.j2:256
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:249
+#: template/index.html.j2:268
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:252
+#: template/index.html.j2:271
 msgid ""
-"The GNU Name System (GNS) is a fully decentralized replacement for the "
-"Domain Name System (DNS). Instead of using a hierarchy, GNS uses a directed "
-"graph. Naming conventions are similar to DNS, but queries and replies are "
-"private even with respect to peers providing the answers. The integrity of "
-"records and privacy of look-ups is cryptographically secured. <!-- Too "
-"technical: GNS integrates a robust, efficient and instant key revocation "
-"mechanism. -->"
+"The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
+"decentralized replacement for the Domain Name System (DNS). Instead of using "
+"a hierarchy, GNS uses a directed graph. Naming conventions are similar to "
+"DNS, but queries and replies are private even with respect to peers "
+"providing the answers. The integrity of records and privacy of look-ups is "
+"cryptographically secured. <!-- Too technical: GNS integrates a robust, "
+"efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:267
+#: template/index.html.j2:287
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:269
+#: template/index.html.j2:289
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1497,37 +1530,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:282
+#: template/index.html.j2:302
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:284
+#: template/index.html.j2:304
 msgid ""
-"GNUnet filesharing is an application that aims to provide censorship-"
-"resistant, anonymous filesharing. The publisher is empowered to make a "
-"gradual choice between performance and anonymity."
+"GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
+"to provide censorship-resistant, anonymous filesharing. The publisher is "
+"empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:294
+#: template/index.html.j2:315
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:296
+#: template/index.html.j2:317
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:313
+#: template/index.html.j2:334
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:322
+#: template/index.html.j2:343
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:324
+#: template/index.html.j2:345
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1535,11 +1568,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:336
+#: template/index.html.j2:357
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:338
+#: template/index.html.j2:359
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
@@ -1684,8 +1717,11 @@ msgstr ""
 #: template/install.html.j2:15
 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>Further information is "
-"available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
+"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>"
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index c33d745e..e6b3a926 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-06-30 13:20+0200\n"
+"POT-Creation-Date: 2019-06-30 16:59+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"
@@ -76,7 +76,7 @@ msgstr ""
 msgid "About"
 msgstr "Sobre"
 
-#: common/navigation.j2.inc:42 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:378
 msgid "News"
 msgstr "Nuevo"
 
@@ -263,40 +263,56 @@ msgid ""
 "#Egos\">Egos</a></li> </ul>"
 msgstr ""
 
-#: template/about.html.j2:85
+#: template/about.html.j2:88
+msgid "More Resources"
+msgstr ""
+
+#: template/about.html.j2:90
+msgid ""
+"There are much more resources to learn about GNUnet besides the <a href="
+"\"https://docs.gnunet.org\">main handbook / reference manual</a>, such as "
+"the <a href=\"https://bib.gnunet.org/\">bibliography</a> with papers from "
+"all stages, lots of <a href=\"https://gnunet.org/en/video.html\">videos</a> "
+"or a brief <a href=\"https://gnunet.org/en/glossary.html\">glossary</a>."
+msgstr ""
+
+#: template/about.html.j2:95
+msgid ""
+"You are most welcome to <a href=\"https://gnunet.org/en/engage.html\">get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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> "
+"in various ways."
+msgstr ""
+
+#: template/about.html.j2:100
 msgid ""
-"There are much more ressources to learn about GNUnet besides the <a href="
-"\"https://docs.gnunet.org\">main handbook</a>, such as the <a href=\"https://"
-"bib.gnunet.org/\">bibliography</a>, lots of <a href=\"https://gnunet.org/en/"
-"video.html\">videos</a> or a <a href=\"https://gnunet.org/en/glossary.html"
-"\">glossary</a>. You are very welcome to <a href=\"https://gnunet.org/en/"
-"engage.html\">get engaged into the conversation</a>, <a href=\"https://"
-"gnunet.org/en/tutorial.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>."
+"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!"
 msgstr ""
 
-#: template/about.html.j2:92
+#: template/about.html.j2:105
 msgid "Current funding"
 msgstr ""
 
-#: template/about.html.j2:97
+#: template/about.html.j2:110
 msgid ""
 "We're receiving funding from NLnet's Next Generation Internet funding line "
 "to document and implement the GNU Name System protocol in a way suitable for "
 "the IETF standardization process."
 msgstr ""
 
-#: template/about.html.j2:109
+#: template/about.html.j2:123
 msgid ""
 "We are grateful for free hosting offered by the following organizations:"
 msgstr ""
 
-#: template/about.html.j2:118
+#: template/about.html.j2:132
 msgid "Past funding"
 msgstr ""
 
-#: template/about.html.j2:120
+#: template/about.html.j2:134
 msgid "We are grateful for past funding from the following organizations:"
 msgstr ""
 
@@ -1468,50 +1484,67 @@ msgid ""
 msgstr ""
 
 #: template/index.html.j2:207
-msgid "Learn about the GNUnet"
+msgid "Learn more about the GNUnet"
 msgstr ""
 
 #: template/index.html.j2:209
 msgid ""
-"If you want to know more about the GNUnet please continue reading <a href="
-"\"about.html\">here</a>."
+"If you want to know more about the GNUnet please continue reading the <a "
+"href=\"about.html\">about page</a>. There are much more ressources, such as "
+"the <a href=\"https://docs.gnunet.org\">main handbook / reference manual</"
+"a>, a <a href=\"https://bib.gnunet.org/\">bibliography</a> and <a href="
+"\"https://gnunet.org/en/video.html\">videos</a>."
+msgstr ""
+
+#: template/index.html.j2:218
+msgid ""
+"You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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>."
+msgstr ""
+
+#: template/index.html.j2:227
+msgid ""
+"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!"
 msgstr ""
 
-#: template/index.html.j2:226
+#: template/index.html.j2:245
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:235
+#: template/index.html.j2:254
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:237
+#: template/index.html.j2:256
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:249
+#: template/index.html.j2:268
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:252
+#: template/index.html.j2:271
 msgid ""
-"The GNU Name System (GNS) is a fully decentralized replacement for the "
-"Domain Name System (DNS). Instead of using a hierarchy, GNS uses a directed "
-"graph. Naming conventions are similar to DNS, but queries and replies are "
-"private even with respect to peers providing the answers. The integrity of "
-"records and privacy of look-ups is cryptographically secured. <!-- Too "
-"technical: GNS integrates a robust, efficient and instant key revocation "
-"mechanism. -->"
+"The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
+"decentralized replacement for the Domain Name System (DNS). Instead of using "
+"a hierarchy, GNS uses a directed graph. Naming conventions are similar to "
+"DNS, but queries and replies are private even with respect to peers "
+"providing the answers. The integrity of records and privacy of look-ups is "
+"cryptographically secured. <!-- Too technical: GNS integrates a robust, "
+"efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:267
+#: template/index.html.j2:287
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:269
+#: template/index.html.j2:289
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1519,37 +1552,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:282
+#: template/index.html.j2:302
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:284
+#: template/index.html.j2:304
 msgid ""
-"GNUnet filesharing is an application that aims to provide censorship-"
-"resistant, anonymous filesharing. The publisher is empowered to make a "
-"gradual choice between performance and anonymity."
+"GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
+"to provide censorship-resistant, anonymous filesharing. The publisher is "
+"empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:294
+#: template/index.html.j2:315
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:296
+#: template/index.html.j2:317
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:313
+#: template/index.html.j2:334
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:322
+#: template/index.html.j2:343
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:324
+#: template/index.html.j2:345
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1557,11 +1590,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:336
+#: template/index.html.j2:357
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:338
+#: template/index.html.j2:359
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
@@ -1706,8 +1739,11 @@ msgstr ""
 #: template/install.html.j2:15
 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>Further information is "
-"available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
+"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>"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 4b7fc8b5..c61e66ef 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-06-30 13:20+0200\n"
+"POT-Creation-Date: 2019-06-30 16:59+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"
@@ -76,7 +76,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:378
 msgid "News"
 msgstr ""
 
@@ -263,40 +263,56 @@ msgid ""
 "#Egos\">Egos</a></li> </ul>"
 msgstr ""
 
-#: template/about.html.j2:85
+#: template/about.html.j2:88
+msgid "More Resources"
+msgstr ""
+
+#: template/about.html.j2:90
+msgid ""
+"There are much more resources to learn about GNUnet besides the <a href="
+"\"https://docs.gnunet.org\">main handbook / reference manual</a>, such as "
+"the <a href=\"https://bib.gnunet.org/\">bibliography</a> with papers from "
+"all stages, lots of <a href=\"https://gnunet.org/en/video.html\">videos</a> "
+"or a brief <a href=\"https://gnunet.org/en/glossary.html\">glossary</a>."
+msgstr ""
+
+#: template/about.html.j2:95
+msgid ""
+"You are most welcome to <a href=\"https://gnunet.org/en/engage.html\">get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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> "
+"in various ways."
+msgstr ""
+
+#: template/about.html.j2:100
 msgid ""
-"There are much more ressources to learn about GNUnet besides the <a href="
-"\"https://docs.gnunet.org\">main handbook</a>, such as the <a href=\"https://"
-"bib.gnunet.org/\">bibliography</a>, lots of <a href=\"https://gnunet.org/en/"
-"video.html\">videos</a> or a <a href=\"https://gnunet.org/en/glossary.html"
-"\">glossary</a>. You are very welcome to <a href=\"https://gnunet.org/en/"
-"engage.html\">get engaged into the conversation</a>, <a href=\"https://"
-"gnunet.org/en/tutorial.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>."
+"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!"
 msgstr ""
 
-#: template/about.html.j2:92
+#: template/about.html.j2:105
 msgid "Current funding"
 msgstr ""
 
-#: template/about.html.j2:97
+#: template/about.html.j2:110
 msgid ""
 "We're receiving funding from NLnet's Next Generation Internet funding line "
 "to document and implement the GNU Name System protocol in a way suitable for "
 "the IETF standardization process."
 msgstr ""
 
-#: template/about.html.j2:109
+#: template/about.html.j2:123
 msgid ""
 "We are grateful for free hosting offered by the following organizations:"
 msgstr ""
 
-#: template/about.html.j2:118
+#: template/about.html.j2:132
 msgid "Past funding"
 msgstr ""
 
-#: template/about.html.j2:120
+#: template/about.html.j2:134
 msgid "We are grateful for past funding from the following organizations:"
 msgstr ""
 
@@ -1466,50 +1482,67 @@ msgid ""
 msgstr ""
 
 #: template/index.html.j2:207
-msgid "Learn about the GNUnet"
+msgid "Learn more about the GNUnet"
 msgstr ""
 
 #: template/index.html.j2:209
 msgid ""
-"If you want to know more about the GNUnet please continue reading <a href="
-"\"about.html\">here</a>."
+"If you want to know more about the GNUnet please continue reading the <a "
+"href=\"about.html\">about page</a>. There are much more ressources, such as "
+"the <a href=\"https://docs.gnunet.org\">main handbook / reference manual</"
+"a>, a <a href=\"https://bib.gnunet.org/\">bibliography</a> and <a href="
+"\"https://gnunet.org/en/video.html\">videos</a>."
+msgstr ""
+
+#: template/index.html.j2:218
+msgid ""
+"You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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>."
+msgstr ""
+
+#: template/index.html.j2:227
+msgid ""
+"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!"
 msgstr ""
 
-#: template/index.html.j2:226
+#: template/index.html.j2:245
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:235
+#: template/index.html.j2:254
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:237
+#: template/index.html.j2:256
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:249
+#: template/index.html.j2:268
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:252
+#: template/index.html.j2:271
 msgid ""
-"The GNU Name System (GNS) is a fully decentralized replacement for the "
-"Domain Name System (DNS). Instead of using a hierarchy, GNS uses a directed "
-"graph. Naming conventions are similar to DNS, but queries and replies are "
-"private even with respect to peers providing the answers. The integrity of "
-"records and privacy of look-ups is cryptographically secured. <!-- Too "
-"technical: GNS integrates a robust, efficient and instant key revocation "
-"mechanism. -->"
+"The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
+"decentralized replacement for the Domain Name System (DNS). Instead of using "
+"a hierarchy, GNS uses a directed graph. Naming conventions are similar to "
+"DNS, but queries and replies are private even with respect to peers "
+"providing the answers. The integrity of records and privacy of look-ups is "
+"cryptographically secured. <!-- Too technical: GNS integrates a robust, "
+"efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:267
+#: template/index.html.j2:287
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:269
+#: template/index.html.j2:289
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1517,37 +1550,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:282
+#: template/index.html.j2:302
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:284
+#: template/index.html.j2:304
 msgid ""
-"GNUnet filesharing is an application that aims to provide censorship-"
-"resistant, anonymous filesharing. The publisher is empowered to make a "
-"gradual choice between performance and anonymity."
+"GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
+"to provide censorship-resistant, anonymous filesharing. The publisher is "
+"empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:294
+#: template/index.html.j2:315
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:296
+#: template/index.html.j2:317
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:313
+#: template/index.html.j2:334
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:322
+#: template/index.html.j2:343
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:324
+#: template/index.html.j2:345
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1555,11 +1588,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:336
+#: template/index.html.j2:357
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:338
+#: template/index.html.j2:359
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
@@ -1704,8 +1737,11 @@ msgstr ""
 #: template/install.html.j2:15
 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>Further information is "
-"available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
+"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>"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index f33e9f94..a0243c17 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-06-30 13:20+0200\n"
+"POT-Creation-Date: 2019-06-30 16:59+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"
@@ -76,7 +76,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:378
 msgid "News"
 msgstr ""
 
@@ -263,40 +263,56 @@ msgid ""
 "#Egos\">Egos</a></li> </ul>"
 msgstr ""
 
-#: template/about.html.j2:85
+#: template/about.html.j2:88
+msgid "More Resources"
+msgstr ""
+
+#: template/about.html.j2:90
+msgid ""
+"There are much more resources to learn about GNUnet besides the <a href="
+"\"https://docs.gnunet.org\">main handbook / reference manual</a>, such as "
+"the <a href=\"https://bib.gnunet.org/\">bibliography</a> with papers from "
+"all stages, lots of <a href=\"https://gnunet.org/en/video.html\">videos</a> "
+"or a brief <a href=\"https://gnunet.org/en/glossary.html\">glossary</a>."
+msgstr ""
+
+#: template/about.html.j2:95
+msgid ""
+"You are most welcome to <a href=\"https://gnunet.org/en/engage.html\">get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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> "
+"in various ways."
+msgstr ""
+
+#: template/about.html.j2:100
 msgid ""
-"There are much more ressources to learn about GNUnet besides the <a href="
-"\"https://docs.gnunet.org\">main handbook</a>, such as the <a href=\"https://"
-"bib.gnunet.org/\">bibliography</a>, lots of <a href=\"https://gnunet.org/en/"
-"video.html\">videos</a> or a <a href=\"https://gnunet.org/en/glossary.html"
-"\">glossary</a>. You are very welcome to <a href=\"https://gnunet.org/en/"
-"engage.html\">get engaged into the conversation</a>, <a href=\"https://"
-"gnunet.org/en/tutorial.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>."
+"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!"
 msgstr ""
 
-#: template/about.html.j2:92
+#: template/about.html.j2:105
 msgid "Current funding"
 msgstr ""
 
-#: template/about.html.j2:97
+#: template/about.html.j2:110
 msgid ""
 "We're receiving funding from NLnet's Next Generation Internet funding line "
 "to document and implement the GNU Name System protocol in a way suitable for "
 "the IETF standardization process."
 msgstr ""
 
-#: template/about.html.j2:109
+#: template/about.html.j2:123
 msgid ""
 "We are grateful for free hosting offered by the following organizations:"
 msgstr ""
 
-#: template/about.html.j2:118
+#: template/about.html.j2:132
 msgid "Past funding"
 msgstr ""
 
-#: template/about.html.j2:120
+#: template/about.html.j2:134
 msgid "We are grateful for past funding from the following organizations:"
 msgstr ""
 
@@ -1466,50 +1482,67 @@ msgid ""
 msgstr ""
 
 #: template/index.html.j2:207
-msgid "Learn about the GNUnet"
+msgid "Learn more about the GNUnet"
 msgstr ""
 
 #: template/index.html.j2:209
 msgid ""
-"If you want to know more about the GNUnet please continue reading <a href="
-"\"about.html\">here</a>."
+"If you want to know more about the GNUnet please continue reading the <a "
+"href=\"about.html\">about page</a>. There are much more ressources, such as "
+"the <a href=\"https://docs.gnunet.org\">main handbook / reference manual</"
+"a>, a <a href=\"https://bib.gnunet.org/\">bibliography</a> and <a href="
+"\"https://gnunet.org/en/video.html\">videos</a>."
+msgstr ""
+
+#: template/index.html.j2:218
+msgid ""
+"You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
+"engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
+"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>."
+msgstr ""
+
+#: template/index.html.j2:227
+msgid ""
+"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!"
 msgstr ""
 
-#: template/index.html.j2:226
+#: template/index.html.j2:245
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:235
+#: template/index.html.j2:254
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:237
+#: template/index.html.j2:256
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:249
+#: template/index.html.j2:268
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:252
+#: template/index.html.j2:271
 msgid ""
-"The GNU Name System (GNS) is a fully decentralized replacement for the "
-"Domain Name System (DNS). Instead of using a hierarchy, GNS uses a directed "
-"graph. Naming conventions are similar to DNS, but queries and replies are "
-"private even with respect to peers providing the answers. The integrity of "
-"records and privacy of look-ups is cryptographically secured. <!-- Too "
-"technical: GNS integrates a robust, efficient and instant key revocation "
-"mechanism. -->"
+"The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
+"decentralized replacement for the Domain Name System (DNS). Instead of using "
+"a hierarchy, GNS uses a directed graph. Naming conventions are similar to "
+"DNS, but queries and replies are private even with respect to peers "
+"providing the answers. The integrity of records and privacy of look-ups is "
+"cryptographically secured. <!-- Too technical: GNS integrates a robust, "
+"efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:267
+#: template/index.html.j2:287
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:269
+#: template/index.html.j2:289
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1517,37 +1550,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:282
+#: template/index.html.j2:302
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:284
+#: template/index.html.j2:304
 msgid ""
-"GNUnet filesharing is an application that aims to provide censorship-"
-"resistant, anonymous filesharing. The publisher is empowered to make a "
-"gradual choice between performance and anonymity."
+"GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
+"to provide censorship-resistant, anonymous filesharing. The publisher is "
+"empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:294
+#: template/index.html.j2:315
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:296
+#: template/index.html.j2:317
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:313
+#: template/index.html.j2:334
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:322
+#: template/index.html.j2:343
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:324
+#: template/index.html.j2:345
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1555,11 +1588,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:336
+#: template/index.html.j2:357
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:338
+#: template/index.html.j2:359
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
@@ -1704,8 +1737,11 @@ msgstr ""
 #: template/install.html.j2:15
 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>Further information is "
-"available in our <a href=\"https://docs.gnunet.org/#toc-Using-"
+"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>"
diff --git a/template/about.html.j2 b/template/about.html.j2
index 82d39aa2..2a28a5c9 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -82,13 +82,26 @@
 	<li><a href="https://docs.gnunet.org/#Egos">Egos</a></li>
         </ul>
 	{% endtrans %}
+	</p>
+    </div>
+    <div class="col">
+      <h3>{{ _("More Resources") }}</h3>
+	<p>
+	{% trans %}
+	There are much more resources to learn about GNUnet besides the <a href="https://docs.gnunet.org">main handbook / reference manual</a>, such as the <a href="https://bib.gnunet.org/">bibliography</a> with papers from all stages, lots of <a href="https://gnunet.org/en/video.html">videos</a> or a brief <a href="https://gnunet.org/en/glossary.html">glossary</a>.
+	{% endtrans %}
+	</p>
+	<p>
 	{% trans %}
-	There are much more ressources to learn about GNUnet besides the <a href="https://docs.gnunet.org">main handbook</a>, such as the <a href="https://bib.gnunet.org/">bibliography</a>, lots of <a href="https://gnunet.org/en/video.html">videos</a> or a <a href="https://gnunet.org/en/glossary.html">glossary</a>. You are very welcome to <a href="https://gnunet.org/en/engage.html">get engaged into the conversation</a>, <a href="https://gnunet.org/en/tutorial.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>.
+ You are most welcome to <a href="https://gnunet.org/en/engage.html">get engaged into the conversation</a>, <a href="https://gnunet.org/en/install.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> in various ways. 
+	{% endtrans %}
+	</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!
 	{% endtrans %}
 	<br>
       </p>
-    </div>
-    <div class="col">
       <h3>{{ _("Current funding") }}</h3>
       <p>
         <ul>
@@ -124,6 +137,7 @@
         <ul>
           <li>
             <p>
+            <a href="https://renewablefreedom.org/">Renewable Freedom Foundation / Stiftung Erneuerbare Freiheit</a><br>
             <img src="{{ url('static/images/rff_logo.png') }}" alt="RFF logo">
             </p>
           </li>
diff --git a/template/index.html.j2 b/template/index.html.j2
index f0146ca0..c6f23c8d 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -204,10 +204,29 @@
       </div>
       <div class="col-lg-4">
         <section>
-        <h3>{{ _("Learn about the GNUnet") }}</h3>
+        <h3>{{ _("Learn more about the GNUnet") }}</h3>
         <p>
           {% trans %}
-          If you want to know more about the GNUnet please continue reading <a href="about.html">here</a>.
+          If you want to know more about the GNUnet please continue reading 
+	the <a href="about.html">about page</a>. There are much more ressources, 
+	such as the <a href="https://docs.gnunet.org">main handbook / 
+	reference manual</a>, a <a href="https://bib.gnunet.org/">bibliography</a> 
+	and <a href="https://gnunet.org/en/video.html">videos</a>. 
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+	You are very welcome to <a href="https://gnunet.org/en/engage.html">
+	get engaged into the conversation</a>, 
+	<a href="https://gnunet.org/en/install.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>. 
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+	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!
           {% endtrans %}
         </p>
         </section>
diff --git a/template/install.html.j2 b/template/install.html.j2
index 1e53df4e..ecec1363 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -13,7 +13,12 @@
       <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p>
       {% endtrans %}
       {% 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>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>
       {% endtrans %}
-- 
cgit v1.2.3


From f512655bfc16ea2c9ae197b31cad2c3634fc5c7e Mon Sep 17 00:00:00 2001
From: mu <mu@m.m>
Date: Sun, 30 Jun 2019 18:22:50 +0200
Subject: added the stuff from fabian gerlach on index, part2, see mail --sva

---
 locale/de/LC_MESSAGES/messages.po | 113 ++++++++++++++++++------------------
 locale/en/LC_MESSAGES/messages.po | 111 ++++++++++++++++++------------------
 locale/es/LC_MESSAGES/messages.po | 117 +++++++++++++++++++-------------------
 locale/fr/LC_MESSAGES/messages.po | 113 ++++++++++++++++++------------------
 locale/it/LC_MESSAGES/messages.po | 113 ++++++++++++++++++------------------
 template/index.html.j2            |  25 ++++----
 6 files changed, 288 insertions(+), 304 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 97c579e3..56f46e8e 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-06-30 16:59+0200\n"
+"POT-Creation-Date: 2019-06-30 18:17+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"
@@ -87,7 +87,7 @@ msgstr ""
 msgid "About"
 msgstr "Über GNUnet"
 
-#: common/navigation.j2.inc:42 template/index.html.j2:378
+#: common/navigation.j2.inc:42 template/index.html.j2:375
 msgid "News"
 msgstr "Neues"
 
@@ -1445,23 +1445,27 @@ msgid ""
 "GNUnet provides <a href=\"https://www.w3.org/2014/strint/papers/65.pdf"
 "\">privacy by design</a>, improving addressing, routing, naming and content "
 "distribution in a technically robust manner - as opposed to ad-hoc designs "
-"in place today. <!-- Proposal from fabian gerlach: GNUnet is built \"privacy "
-"by design\" and \"distributed by design\". This improves addressing, "
-"routing, naming and content distribution in a technically robust manner. -->"
+"in place today. <!-- Proposal from fabian gerlach: GNUnet is built <a href="
+"\"https://www.w3.org/2014/strint/papers/65.pdf\">\"privacy by design\"</> "
+"and \"distributed by design\". This improves addressing, routing, naming and "
+"content distribution in a technically robust manner. -->"
 msgstr ""
 
-#: template/index.html.j2:131
+#: template/index.html.j2:132
 msgid "Decentralization is hard"
 msgstr ""
 
-#: template/index.html.j2:134
+#: template/index.html.j2:135
 msgid ""
-"It seems as if every other distributed or P2P project develops its own "
-"library stack, covering transports, stream muxing, discovery and others. "
-"This divides effort and multiplies bug count."
+"<!-- replaced with Proposal from Fabian Gerlach: It seems as if every other "
+"distributed or P2P project develops its own library stack, covering "
+"transports, stream muxing, discovery and others. This divides effort and "
+"multiplies bug count.--> Instead of sharing common components and tools for "
+"building P2P systems, every P2P project seems to re-invent the wheel. That "
+"highens effort and number of vulnerabilities."
 msgstr ""
 
-#: template/index.html.j2:141
+#: template/index.html.j2:144
 msgid ""
 "GNUnet is a metadata-preserving foundation for your application, covering "
 "areas from addressing to reliable bidirectional Axolotl-encrypted channels, "
@@ -1469,34 +1473,31 @@ msgid ""
 "almost two decades."
 msgstr ""
 
-#: template/index.html.j2:155
+#: template/index.html.j2:158
 msgid "Metadata is exposed"
 msgstr ""
 
-#: template/index.html.j2:157
+#: template/index.html.j2:160
 msgid ""
-"Even though transport encryption is increasingly being deployed on the "
-"Internet, it still reveals data that can threaten democracy: the identities "
-"of senders and receivers, the times, frequency and the volume of "
-"communication are all still revealed. <!-- Looks like a weak argumentation "
-"to me: which <a href=\"https://www.freehaven.net/anonbib/cache/"
-"websitefingerprinting-pets2016.pdf\">enables reverse-engineering pages "
-"visited via website fingerprinting</a>. -->"
+"Your metadata is just as revealing as the actual content; and it gets "
+"exposed on the internet.<br> Even though transport encryption is "
+"increasingly being deployed on the Internet, it still reveals data that can "
+"threaten democracy: the identities of senders and receivers, the times, "
+"frequency and the volume of communication are all still revealed.<br> <!-- "
+"Looks like a weak argumentation to me: which <a href=\"https://www.freehaven."
+"net/anonbib/cache/websitefingerprinting-pets2016.pdf\">enables reverse-"
+"engineering pages visited via website fingerprinting</a>. --> GNUnet <a href="
+"\"https://secushare.org/anonymity\">addresses</a> these concerns with "
+"perfect forward secrecy via ephemeral public key addressing, fixed packet "
+"size to hinder traffic analysis, layered encryption, Sybil-resistant "
+"routing, and more."
 msgstr ""
 
-#: template/index.html.j2:171
-msgid ""
-"GNUnet <a href=\"https://secushare.org/anonymity\">addresses</a> these "
-"concerns with perfect forward secrecy via ephemeral public key addressing, "
-"fixed packet size to hinder traffic analysis, layered encryption, Sybil-"
-"resistant routing, and more."
-msgstr ""
-
-#: template/index.html.j2:184
+#: template/index.html.j2:185
 msgid "Freedoms are not respected"
 msgstr ""
 
-#: template/index.html.j2:186
+#: template/index.html.j2:187
 msgid ""
 "Today, monitoring increasingly centralized infrastructure, proprietary "
 "implementations, traffic shapers and firewalls restrict all of the <a href="
@@ -1504,7 +1505,7 @@ msgid ""
 "various degrees."
 msgstr ""
 
-#: template/index.html.j2:195
+#: template/index.html.j2:196
 msgid ""
 "GNUnet gives users freedoms to securely access information (\"run\" the "
 "network), to study all aspects of the network's operation (\"access the code"
@@ -1512,13 +1513,13 @@ msgid ""
 "new applications (\"modify\")."
 msgstr ""
 
-#: template/index.html.j2:207
+#: template/index.html.j2:208
 #, fuzzy
 #| msgid "About GNUnet"
-msgid "Learn more about the GNUnet"
+msgid "Learn more about GNUnet"
 msgstr "Über GNUnet"
 
-#: template/index.html.j2:209
+#: template/index.html.j2:210
 msgid ""
 "If you want to know more about the GNUnet please continue reading the <a "
 "href=\"about.html\">about page</a>. There are much more ressources, such as "
@@ -1527,40 +1528,36 @@ msgid ""
 "\"https://gnunet.org/en/video.html\">videos</a>."
 msgstr ""
 
-#: template/index.html.j2:218
+#: template/index.html.j2:219
 msgid ""
 "You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
 "engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
 "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>."
-msgstr ""
-
-#: template/index.html.j2:227
-msgid ""
-"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!"
+"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!"
 msgstr ""
 
-#: template/index.html.j2:245
+#: template/index.html.j2:242
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:254
+#: template/index.html.j2:251
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:256
+#: template/index.html.j2:253
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:268
+#: template/index.html.j2:265
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:271
+#: template/index.html.j2:268
 msgid ""
 "The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
 "decentralized replacement for the Domain Name System (DNS). Instead of using "
@@ -1571,11 +1568,11 @@ msgid ""
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:287
+#: template/index.html.j2:284
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:289
+#: template/index.html.j2:286
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1583,37 +1580,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:302
+#: template/index.html.j2:299
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:304
+#: template/index.html.j2:301
 msgid ""
 "GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
 "to provide censorship-resistant, anonymous filesharing. The publisher is "
 "empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:315
+#: template/index.html.j2:312
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:317
+#: template/index.html.j2:314
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:334
+#: template/index.html.j2:331
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:343
+#: template/index.html.j2:340
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:345
+#: template/index.html.j2:342
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1621,11 +1618,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:357
+#: template/index.html.j2:354
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:359
+#: template/index.html.j2:356
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 2bf4207f..f53f66de 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -56,7 +56,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:378
+#: common/navigation.j2.inc:42 template/index.html.j2:375
 msgid "News"
 msgstr ""
 
@@ -1394,23 +1394,27 @@ msgid ""
 "GNUnet provides <a href=\"https://www.w3.org/2014/strint/papers/65.pdf"
 "\">privacy by design</a>, improving addressing, routing, naming and content "
 "distribution in a technically robust manner - as opposed to ad-hoc designs "
-"in place today. <!-- Proposal from fabian gerlach: GNUnet is built \"privacy "
-"by design\" and \"distributed by design\". This improves addressing, "
-"routing, naming and content distribution in a technically robust manner. -->"
+"in place today. <!-- Proposal from fabian gerlach: GNUnet is built <a href="
+"\"https://www.w3.org/2014/strint/papers/65.pdf\">\"privacy by design\"</> "
+"and \"distributed by design\". This improves addressing, routing, naming and "
+"content distribution in a technically robust manner. -->"
 msgstr ""
 
-#: template/index.html.j2:131
+#: template/index.html.j2:132
 msgid "Decentralization is hard"
 msgstr ""
 
-#: template/index.html.j2:134
+#: template/index.html.j2:135
 msgid ""
-"It seems as if every other distributed or P2P project develops its own "
-"library stack, covering transports, stream muxing, discovery and others. "
-"This divides effort and multiplies bug count."
+"<!-- replaced with Proposal from Fabian Gerlach: It seems as if every other "
+"distributed or P2P project develops its own library stack, covering "
+"transports, stream muxing, discovery and others. This divides effort and "
+"multiplies bug count.--> Instead of sharing common components and tools for "
+"building P2P systems, every P2P project seems to re-invent the wheel. That "
+"highens effort and number of vulnerabilities."
 msgstr ""
 
-#: template/index.html.j2:141
+#: template/index.html.j2:144
 msgid ""
 "GNUnet is a metadata-preserving foundation for your application, covering "
 "areas from addressing to reliable bidirectional Axolotl-encrypted channels, "
@@ -1418,34 +1422,31 @@ msgid ""
 "almost two decades."
 msgstr ""
 
-#: template/index.html.j2:155
+#: template/index.html.j2:158
 msgid "Metadata is exposed"
 msgstr ""
 
-#: template/index.html.j2:157
+#: template/index.html.j2:160
 msgid ""
-"Even though transport encryption is increasingly being deployed on the "
-"Internet, it still reveals data that can threaten democracy: the identities "
-"of senders and receivers, the times, frequency and the volume of "
-"communication are all still revealed. <!-- Looks like a weak argumentation "
-"to me: which <a href=\"https://www.freehaven.net/anonbib/cache/"
-"websitefingerprinting-pets2016.pdf\">enables reverse-engineering pages "
-"visited via website fingerprinting</a>. -->"
+"Your metadata is just as revealing as the actual content; and it gets "
+"exposed on the internet.<br> Even though transport encryption is "
+"increasingly being deployed on the Internet, it still reveals data that can "
+"threaten democracy: the identities of senders and receivers, the times, "
+"frequency and the volume of communication are all still revealed.<br> <!-- "
+"Looks like a weak argumentation to me: which <a href=\"https://www.freehaven."
+"net/anonbib/cache/websitefingerprinting-pets2016.pdf\">enables reverse-"
+"engineering pages visited via website fingerprinting</a>. --> GNUnet <a href="
+"\"https://secushare.org/anonymity\">addresses</a> these concerns with "
+"perfect forward secrecy via ephemeral public key addressing, fixed packet "
+"size to hinder traffic analysis, layered encryption, Sybil-resistant "
+"routing, and more."
 msgstr ""
 
-#: template/index.html.j2:171
-msgid ""
-"GNUnet <a href=\"https://secushare.org/anonymity\">addresses</a> these "
-"concerns with perfect forward secrecy via ephemeral public key addressing, "
-"fixed packet size to hinder traffic analysis, layered encryption, Sybil-"
-"resistant routing, and more."
-msgstr ""
-
-#: template/index.html.j2:184
+#: template/index.html.j2:185
 msgid "Freedoms are not respected"
 msgstr ""
 
-#: template/index.html.j2:186
+#: template/index.html.j2:187
 msgid ""
 "Today, monitoring increasingly centralized infrastructure, proprietary "
 "implementations, traffic shapers and firewalls restrict all of the <a href="
@@ -1453,7 +1454,7 @@ msgid ""
 "various degrees."
 msgstr ""
 
-#: template/index.html.j2:195
+#: template/index.html.j2:196
 msgid ""
 "GNUnet gives users freedoms to securely access information (\"run\" the "
 "network), to study all aspects of the network's operation (\"access the code"
@@ -1461,11 +1462,11 @@ msgid ""
 "new applications (\"modify\")."
 msgstr ""
 
-#: template/index.html.j2:207
-msgid "Learn more about the GNUnet"
+#: template/index.html.j2:208
+msgid "Learn more about GNUnet"
 msgstr ""
 
-#: template/index.html.j2:209
+#: template/index.html.j2:210
 msgid ""
 "If you want to know more about the GNUnet please continue reading the <a "
 "href=\"about.html\">about page</a>. There are much more ressources, such as "
@@ -1474,40 +1475,36 @@ msgid ""
 "\"https://gnunet.org/en/video.html\">videos</a>."
 msgstr ""
 
-#: template/index.html.j2:218
+#: template/index.html.j2:219
 msgid ""
 "You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
 "engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
 "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>."
-msgstr ""
-
-#: template/index.html.j2:227
-msgid ""
-"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!"
+"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!"
 msgstr ""
 
-#: template/index.html.j2:245
+#: template/index.html.j2:242
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:254
+#: template/index.html.j2:251
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:256
+#: template/index.html.j2:253
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:268
+#: template/index.html.j2:265
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:271
+#: template/index.html.j2:268
 msgid ""
 "The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
 "decentralized replacement for the Domain Name System (DNS). Instead of using "
@@ -1518,11 +1515,11 @@ msgid ""
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:287
+#: template/index.html.j2:284
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:289
+#: template/index.html.j2:286
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1530,37 +1527,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:302
+#: template/index.html.j2:299
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:304
+#: template/index.html.j2:301
 msgid ""
 "GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
 "to provide censorship-resistant, anonymous filesharing. The publisher is "
 "empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:315
+#: template/index.html.j2:312
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:317
+#: template/index.html.j2:314
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:334
+#: template/index.html.j2:331
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:343
+#: template/index.html.j2:340
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:345
+#: template/index.html.j2:342
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1568,11 +1565,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:357
+#: template/index.html.j2:354
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:359
+#: template/index.html.j2:356
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index e6b3a926..7aec0d2a 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-06-30 16:59+0200\n"
+"POT-Creation-Date: 2019-06-30 18:17+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"
@@ -76,7 +76,7 @@ msgstr ""
 msgid "About"
 msgstr "Sobre"
 
-#: common/navigation.j2.inc:42 template/index.html.j2:378
+#: common/navigation.j2.inc:42 template/index.html.j2:375
 msgid "News"
 msgstr "Nuevo"
 
@@ -1416,23 +1416,27 @@ msgid ""
 "GNUnet provides <a href=\"https://www.w3.org/2014/strint/papers/65.pdf"
 "\">privacy by design</a>, improving addressing, routing, naming and content "
 "distribution in a technically robust manner - as opposed to ad-hoc designs "
-"in place today. <!-- Proposal from fabian gerlach: GNUnet is built \"privacy "
-"by design\" and \"distributed by design\". This improves addressing, "
-"routing, naming and content distribution in a technically robust manner. -->"
+"in place today. <!-- Proposal from fabian gerlach: GNUnet is built <a href="
+"\"https://www.w3.org/2014/strint/papers/65.pdf\">\"privacy by design\"</> "
+"and \"distributed by design\". This improves addressing, routing, naming and "
+"content distribution in a technically robust manner. -->"
 msgstr ""
 
-#: template/index.html.j2:131
+#: template/index.html.j2:132
 msgid "Decentralization is hard"
 msgstr ""
 
-#: template/index.html.j2:134
+#: template/index.html.j2:135
 msgid ""
-"It seems as if every other distributed or P2P project develops its own "
-"library stack, covering transports, stream muxing, discovery and others. "
-"This divides effort and multiplies bug count."
+"<!-- replaced with Proposal from Fabian Gerlach: It seems as if every other "
+"distributed or P2P project develops its own library stack, covering "
+"transports, stream muxing, discovery and others. This divides effort and "
+"multiplies bug count.--> Instead of sharing common components and tools for "
+"building P2P systems, every P2P project seems to re-invent the wheel. That "
+"highens effort and number of vulnerabilities."
 msgstr ""
 
-#: template/index.html.j2:141
+#: template/index.html.j2:144
 msgid ""
 "GNUnet is a metadata-preserving foundation for your application, covering "
 "areas from addressing to reliable bidirectional Axolotl-encrypted channels, "
@@ -1440,34 +1444,31 @@ msgid ""
 "almost two decades."
 msgstr ""
 
-#: template/index.html.j2:155
+#: template/index.html.j2:158
 msgid "Metadata is exposed"
 msgstr ""
 
-#: template/index.html.j2:157
+#: template/index.html.j2:160
 msgid ""
-"Even though transport encryption is increasingly being deployed on the "
-"Internet, it still reveals data that can threaten democracy: the identities "
-"of senders and receivers, the times, frequency and the volume of "
-"communication are all still revealed. <!-- Looks like a weak argumentation "
-"to me: which <a href=\"https://www.freehaven.net/anonbib/cache/"
-"websitefingerprinting-pets2016.pdf\">enables reverse-engineering pages "
-"visited via website fingerprinting</a>. -->"
+"Your metadata is just as revealing as the actual content; and it gets "
+"exposed on the internet.<br> Even though transport encryption is "
+"increasingly being deployed on the Internet, it still reveals data that can "
+"threaten democracy: the identities of senders and receivers, the times, "
+"frequency and the volume of communication are all still revealed.<br> <!-- "
+"Looks like a weak argumentation to me: which <a href=\"https://www.freehaven."
+"net/anonbib/cache/websitefingerprinting-pets2016.pdf\">enables reverse-"
+"engineering pages visited via website fingerprinting</a>. --> GNUnet <a href="
+"\"https://secushare.org/anonymity\">addresses</a> these concerns with "
+"perfect forward secrecy via ephemeral public key addressing, fixed packet "
+"size to hinder traffic analysis, layered encryption, Sybil-resistant "
+"routing, and more."
 msgstr ""
 
-#: template/index.html.j2:171
-msgid ""
-"GNUnet <a href=\"https://secushare.org/anonymity\">addresses</a> these "
-"concerns with perfect forward secrecy via ephemeral public key addressing, "
-"fixed packet size to hinder traffic analysis, layered encryption, Sybil-"
-"resistant routing, and more."
-msgstr ""
-
-#: template/index.html.j2:184
+#: template/index.html.j2:185
 msgid "Freedoms are not respected"
 msgstr ""
 
-#: template/index.html.j2:186
+#: template/index.html.j2:187
 msgid ""
 "Today, monitoring increasingly centralized infrastructure, proprietary "
 "implementations, traffic shapers and firewalls restrict all of the <a href="
@@ -1475,7 +1476,7 @@ msgid ""
 "various degrees."
 msgstr ""
 
-#: template/index.html.j2:195
+#: template/index.html.j2:196
 msgid ""
 "GNUnet gives users freedoms to securely access information (\"run\" the "
 "network), to study all aspects of the network's operation (\"access the code"
@@ -1483,11 +1484,13 @@ msgid ""
 "new applications (\"modify\")."
 msgstr ""
 
-#: template/index.html.j2:207
-msgid "Learn more about the GNUnet"
-msgstr ""
+#: template/index.html.j2:208
+#, fuzzy
+#| msgid "About GNUnet"
+msgid "Learn more about GNUnet"
+msgstr "Sobre GNUnet"
 
-#: template/index.html.j2:209
+#: template/index.html.j2:210
 msgid ""
 "If you want to know more about the GNUnet please continue reading the <a "
 "href=\"about.html\">about page</a>. There are much more ressources, such as "
@@ -1496,40 +1499,36 @@ msgid ""
 "\"https://gnunet.org/en/video.html\">videos</a>."
 msgstr ""
 
-#: template/index.html.j2:218
+#: template/index.html.j2:219
 msgid ""
 "You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
 "engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
 "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>."
+"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!"
 msgstr ""
 
-#: template/index.html.j2:227
-msgid ""
-"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!"
-msgstr ""
-
-#: template/index.html.j2:245
+#: template/index.html.j2:242
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:254
+#: template/index.html.j2:251
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:256
+#: template/index.html.j2:253
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:268
+#: template/index.html.j2:265
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:271
+#: template/index.html.j2:268
 msgid ""
 "The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
 "decentralized replacement for the Domain Name System (DNS). Instead of using "
@@ -1540,11 +1539,11 @@ msgid ""
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:287
+#: template/index.html.j2:284
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:289
+#: template/index.html.j2:286
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1552,37 +1551,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:302
+#: template/index.html.j2:299
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:304
+#: template/index.html.j2:301
 msgid ""
 "GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
 "to provide censorship-resistant, anonymous filesharing. The publisher is "
 "empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:315
+#: template/index.html.j2:312
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:317
+#: template/index.html.j2:314
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:334
+#: template/index.html.j2:331
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:343
+#: template/index.html.j2:340
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:345
+#: template/index.html.j2:342
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1590,11 +1589,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:357
+#: template/index.html.j2:354
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:359
+#: template/index.html.j2:356
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index c61e66ef..16c4cba9 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-06-30 16:59+0200\n"
+"POT-Creation-Date: 2019-06-30 18:17+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"
@@ -76,7 +76,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:378
+#: common/navigation.j2.inc:42 template/index.html.j2:375
 msgid "News"
 msgstr ""
 
@@ -1414,23 +1414,27 @@ msgid ""
 "GNUnet provides <a href=\"https://www.w3.org/2014/strint/papers/65.pdf"
 "\">privacy by design</a>, improving addressing, routing, naming and content "
 "distribution in a technically robust manner - as opposed to ad-hoc designs "
-"in place today. <!-- Proposal from fabian gerlach: GNUnet is built \"privacy "
-"by design\" and \"distributed by design\". This improves addressing, "
-"routing, naming and content distribution in a technically robust manner. -->"
+"in place today. <!-- Proposal from fabian gerlach: GNUnet is built <a href="
+"\"https://www.w3.org/2014/strint/papers/65.pdf\">\"privacy by design\"</> "
+"and \"distributed by design\". This improves addressing, routing, naming and "
+"content distribution in a technically robust manner. -->"
 msgstr ""
 
-#: template/index.html.j2:131
+#: template/index.html.j2:132
 msgid "Decentralization is hard"
 msgstr ""
 
-#: template/index.html.j2:134
+#: template/index.html.j2:135
 msgid ""
-"It seems as if every other distributed or P2P project develops its own "
-"library stack, covering transports, stream muxing, discovery and others. "
-"This divides effort and multiplies bug count."
+"<!-- replaced with Proposal from Fabian Gerlach: It seems as if every other "
+"distributed or P2P project develops its own library stack, covering "
+"transports, stream muxing, discovery and others. This divides effort and "
+"multiplies bug count.--> Instead of sharing common components and tools for "
+"building P2P systems, every P2P project seems to re-invent the wheel. That "
+"highens effort and number of vulnerabilities."
 msgstr ""
 
-#: template/index.html.j2:141
+#: template/index.html.j2:144
 msgid ""
 "GNUnet is a metadata-preserving foundation for your application, covering "
 "areas from addressing to reliable bidirectional Axolotl-encrypted channels, "
@@ -1438,34 +1442,31 @@ msgid ""
 "almost two decades."
 msgstr ""
 
-#: template/index.html.j2:155
+#: template/index.html.j2:158
 msgid "Metadata is exposed"
 msgstr ""
 
-#: template/index.html.j2:157
+#: template/index.html.j2:160
 msgid ""
-"Even though transport encryption is increasingly being deployed on the "
-"Internet, it still reveals data that can threaten democracy: the identities "
-"of senders and receivers, the times, frequency and the volume of "
-"communication are all still revealed. <!-- Looks like a weak argumentation "
-"to me: which <a href=\"https://www.freehaven.net/anonbib/cache/"
-"websitefingerprinting-pets2016.pdf\">enables reverse-engineering pages "
-"visited via website fingerprinting</a>. -->"
+"Your metadata is just as revealing as the actual content; and it gets "
+"exposed on the internet.<br> Even though transport encryption is "
+"increasingly being deployed on the Internet, it still reveals data that can "
+"threaten democracy: the identities of senders and receivers, the times, "
+"frequency and the volume of communication are all still revealed.<br> <!-- "
+"Looks like a weak argumentation to me: which <a href=\"https://www.freehaven."
+"net/anonbib/cache/websitefingerprinting-pets2016.pdf\">enables reverse-"
+"engineering pages visited via website fingerprinting</a>. --> GNUnet <a href="
+"\"https://secushare.org/anonymity\">addresses</a> these concerns with "
+"perfect forward secrecy via ephemeral public key addressing, fixed packet "
+"size to hinder traffic analysis, layered encryption, Sybil-resistant "
+"routing, and more."
 msgstr ""
 
-#: template/index.html.j2:171
-msgid ""
-"GNUnet <a href=\"https://secushare.org/anonymity\">addresses</a> these "
-"concerns with perfect forward secrecy via ephemeral public key addressing, "
-"fixed packet size to hinder traffic analysis, layered encryption, Sybil-"
-"resistant routing, and more."
-msgstr ""
-
-#: template/index.html.j2:184
+#: template/index.html.j2:185
 msgid "Freedoms are not respected"
 msgstr ""
 
-#: template/index.html.j2:186
+#: template/index.html.j2:187
 msgid ""
 "Today, monitoring increasingly centralized infrastructure, proprietary "
 "implementations, traffic shapers and firewalls restrict all of the <a href="
@@ -1473,7 +1474,7 @@ msgid ""
 "various degrees."
 msgstr ""
 
-#: template/index.html.j2:195
+#: template/index.html.j2:196
 msgid ""
 "GNUnet gives users freedoms to securely access information (\"run\" the "
 "network), to study all aspects of the network's operation (\"access the code"
@@ -1481,11 +1482,11 @@ msgid ""
 "new applications (\"modify\")."
 msgstr ""
 
-#: template/index.html.j2:207
-msgid "Learn more about the GNUnet"
+#: template/index.html.j2:208
+msgid "Learn more about GNUnet"
 msgstr ""
 
-#: template/index.html.j2:209
+#: template/index.html.j2:210
 msgid ""
 "If you want to know more about the GNUnet please continue reading the <a "
 "href=\"about.html\">about page</a>. There are much more ressources, such as "
@@ -1494,40 +1495,36 @@ msgid ""
 "\"https://gnunet.org/en/video.html\">videos</a>."
 msgstr ""
 
-#: template/index.html.j2:218
+#: template/index.html.j2:219
 msgid ""
 "You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
 "engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
 "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>."
-msgstr ""
-
-#: template/index.html.j2:227
-msgid ""
-"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!"
+"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!"
 msgstr ""
 
-#: template/index.html.j2:245
+#: template/index.html.j2:242
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:254
+#: template/index.html.j2:251
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:256
+#: template/index.html.j2:253
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:268
+#: template/index.html.j2:265
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:271
+#: template/index.html.j2:268
 msgid ""
 "The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
 "decentralized replacement for the Domain Name System (DNS). Instead of using "
@@ -1538,11 +1535,11 @@ msgid ""
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:287
+#: template/index.html.j2:284
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:289
+#: template/index.html.j2:286
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1550,37 +1547,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:302
+#: template/index.html.j2:299
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:304
+#: template/index.html.j2:301
 msgid ""
 "GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
 "to provide censorship-resistant, anonymous filesharing. The publisher is "
 "empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:315
+#: template/index.html.j2:312
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:317
+#: template/index.html.j2:314
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:334
+#: template/index.html.j2:331
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:343
+#: template/index.html.j2:340
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:345
+#: template/index.html.j2:342
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1588,11 +1585,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:357
+#: template/index.html.j2:354
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:359
+#: template/index.html.j2:356
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index a0243c17..dfa0c024 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-06-30 16:59+0200\n"
+"POT-Creation-Date: 2019-06-30 18:17+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"
@@ -76,7 +76,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:378
+#: common/navigation.j2.inc:42 template/index.html.j2:375
 msgid "News"
 msgstr ""
 
@@ -1414,23 +1414,27 @@ msgid ""
 "GNUnet provides <a href=\"https://www.w3.org/2014/strint/papers/65.pdf"
 "\">privacy by design</a>, improving addressing, routing, naming and content "
 "distribution in a technically robust manner - as opposed to ad-hoc designs "
-"in place today. <!-- Proposal from fabian gerlach: GNUnet is built \"privacy "
-"by design\" and \"distributed by design\". This improves addressing, "
-"routing, naming and content distribution in a technically robust manner. -->"
+"in place today. <!-- Proposal from fabian gerlach: GNUnet is built <a href="
+"\"https://www.w3.org/2014/strint/papers/65.pdf\">\"privacy by design\"</> "
+"and \"distributed by design\". This improves addressing, routing, naming and "
+"content distribution in a technically robust manner. -->"
 msgstr ""
 
-#: template/index.html.j2:131
+#: template/index.html.j2:132
 msgid "Decentralization is hard"
 msgstr ""
 
-#: template/index.html.j2:134
+#: template/index.html.j2:135
 msgid ""
-"It seems as if every other distributed or P2P project develops its own "
-"library stack, covering transports, stream muxing, discovery and others. "
-"This divides effort and multiplies bug count."
+"<!-- replaced with Proposal from Fabian Gerlach: It seems as if every other "
+"distributed or P2P project develops its own library stack, covering "
+"transports, stream muxing, discovery and others. This divides effort and "
+"multiplies bug count.--> Instead of sharing common components and tools for "
+"building P2P systems, every P2P project seems to re-invent the wheel. That "
+"highens effort and number of vulnerabilities."
 msgstr ""
 
-#: template/index.html.j2:141
+#: template/index.html.j2:144
 msgid ""
 "GNUnet is a metadata-preserving foundation for your application, covering "
 "areas from addressing to reliable bidirectional Axolotl-encrypted channels, "
@@ -1438,34 +1442,31 @@ msgid ""
 "almost two decades."
 msgstr ""
 
-#: template/index.html.j2:155
+#: template/index.html.j2:158
 msgid "Metadata is exposed"
 msgstr ""
 
-#: template/index.html.j2:157
+#: template/index.html.j2:160
 msgid ""
-"Even though transport encryption is increasingly being deployed on the "
-"Internet, it still reveals data that can threaten democracy: the identities "
-"of senders and receivers, the times, frequency and the volume of "
-"communication are all still revealed. <!-- Looks like a weak argumentation "
-"to me: which <a href=\"https://www.freehaven.net/anonbib/cache/"
-"websitefingerprinting-pets2016.pdf\">enables reverse-engineering pages "
-"visited via website fingerprinting</a>. -->"
+"Your metadata is just as revealing as the actual content; and it gets "
+"exposed on the internet.<br> Even though transport encryption is "
+"increasingly being deployed on the Internet, it still reveals data that can "
+"threaten democracy: the identities of senders and receivers, the times, "
+"frequency and the volume of communication are all still revealed.<br> <!-- "
+"Looks like a weak argumentation to me: which <a href=\"https://www.freehaven."
+"net/anonbib/cache/websitefingerprinting-pets2016.pdf\">enables reverse-"
+"engineering pages visited via website fingerprinting</a>. --> GNUnet <a href="
+"\"https://secushare.org/anonymity\">addresses</a> these concerns with "
+"perfect forward secrecy via ephemeral public key addressing, fixed packet "
+"size to hinder traffic analysis, layered encryption, Sybil-resistant "
+"routing, and more."
 msgstr ""
 
-#: template/index.html.j2:171
-msgid ""
-"GNUnet <a href=\"https://secushare.org/anonymity\">addresses</a> these "
-"concerns with perfect forward secrecy via ephemeral public key addressing, "
-"fixed packet size to hinder traffic analysis, layered encryption, Sybil-"
-"resistant routing, and more."
-msgstr ""
-
-#: template/index.html.j2:184
+#: template/index.html.j2:185
 msgid "Freedoms are not respected"
 msgstr ""
 
-#: template/index.html.j2:186
+#: template/index.html.j2:187
 msgid ""
 "Today, monitoring increasingly centralized infrastructure, proprietary "
 "implementations, traffic shapers and firewalls restrict all of the <a href="
@@ -1473,7 +1474,7 @@ msgid ""
 "various degrees."
 msgstr ""
 
-#: template/index.html.j2:195
+#: template/index.html.j2:196
 msgid ""
 "GNUnet gives users freedoms to securely access information (\"run\" the "
 "network), to study all aspects of the network's operation (\"access the code"
@@ -1481,11 +1482,11 @@ msgid ""
 "new applications (\"modify\")."
 msgstr ""
 
-#: template/index.html.j2:207
-msgid "Learn more about the GNUnet"
+#: template/index.html.j2:208
+msgid "Learn more about GNUnet"
 msgstr ""
 
-#: template/index.html.j2:209
+#: template/index.html.j2:210
 msgid ""
 "If you want to know more about the GNUnet please continue reading the <a "
 "href=\"about.html\">about page</a>. There are much more ressources, such as "
@@ -1494,40 +1495,36 @@ msgid ""
 "\"https://gnunet.org/en/video.html\">videos</a>."
 msgstr ""
 
-#: template/index.html.j2:218
+#: template/index.html.j2:219
 msgid ""
 "You are very welcome to <a href=\"https://gnunet.org/en/engage.html\"> get "
 "engaged into the conversation</a>, <a href=\"https://gnunet.org/en/install."
 "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>."
-msgstr ""
-
-#: template/index.html.j2:227
-msgid ""
-"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!"
+"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!"
 msgstr ""
 
-#: template/index.html.j2:245
+#: template/index.html.j2:242
 msgid "Featured Applications"
 msgstr ""
 
-#: template/index.html.j2:254
+#: template/index.html.j2:251
 msgid "GNU Taler (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:256
+#: template/index.html.j2:253
 msgid ""
 "<a href=\"https://taler.net/\">GNU Taler</a> is a new privacy-preserving "
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
 
-#: template/index.html.j2:268
+#: template/index.html.j2:265
 msgid "The GNU Name System"
 msgstr ""
 
-#: template/index.html.j2:271
+#: template/index.html.j2:268
 msgid ""
 "The <a href=\"use.html#gns\">GNU Name System (GNS)</a> is a fully "
 "decentralized replacement for the Domain Name System (DNS). Instead of using "
@@ -1538,11 +1535,11 @@ msgid ""
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
 
-#: template/index.html.j2:287
+#: template/index.html.j2:284
 msgid "re:claimID"
 msgstr ""
 
-#: template/index.html.j2:289
+#: template/index.html.j2:286
 msgid ""
 "<a href=\"https://reclaim-identity.io/\">re:claimID</a> is a decentralized "
 "Identity Provider (IdP) service built in top of the GNU Name System. It "
@@ -1550,37 +1547,37 @@ msgid ""
 "standardized protocols (OpenID Connect)."
 msgstr ""
 
-#: template/index.html.j2:302
+#: template/index.html.j2:299
 msgid "Filesharing (Alpha)"
 msgstr ""
 
-#: template/index.html.j2:304
+#: template/index.html.j2:301
 msgid ""
 "GNUnet <a href=\"use.html#fs\">filesharing</a> is an application that aims "
 "to provide censorship-resistant, anonymous filesharing. The publisher is "
 "empowered to make a gradual choice between performance and anonymity."
 msgstr ""
 
-#: template/index.html.j2:315
+#: template/index.html.j2:312
 msgid "Conversation (Pre-Alpha)"
 msgstr ""
 
-#: template/index.html.j2:317
+#: template/index.html.j2:314
 msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
 msgstr ""
 
-#: template/index.html.j2:334
+#: template/index.html.j2:331
 msgid "Upcoming Applications"
 msgstr ""
 
-#: template/index.html.j2:343
+#: template/index.html.j2:340
 msgid "secushare"
 msgstr ""
 
-#: template/index.html.j2:345
+#: template/index.html.j2:342
 msgid ""
 "<a href=\"https://secushare.org/\">secushare</a> is creating a decentralized "
 "social networking application on top of GNUnet. Using overlay multicast and "
@@ -1588,11 +1585,11 @@ msgid ""
 "encrypted to authorized recipients only."
 msgstr ""
 
-#: template/index.html.j2:357
+#: template/index.html.j2:354
 msgid "pretty Easy privacy"
 msgstr ""
 
-#: template/index.html.j2:359
+#: template/index.html.j2:356
 msgid ""
 "<a href=\"https://pep.foundation/\">pretty Easy privacy</a> (p&#8801;p) is "
 "creating a usable end-to-end encrypted e-mail solution using opportunistic "
diff --git a/template/index.html.j2 b/template/index.html.j2
index c6f23c8d..2f0030a1 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -119,7 +119,8 @@
 	  improving addressing, routing, naming and
           content distribution in a technically robust manner - as
           opposed to ad-hoc designs in place today.
-	<!-- Proposal from fabian gerlach: GNUnet is built "privacy by design" and
+	<!-- Proposal from fabian gerlach: GNUnet is built 
+	<a href="https://www.w3.org/2014/strint/papers/65.pdf">"privacy by design"</> and
 	"distributed by design". This improves addressing, routing, naming and
 	content distribution in a technically robust manner. -->
           {% endtrans %}
@@ -132,17 +133,19 @@
 
         <p>
           {% trans %}
-          It seems as if every other distributed or P2P project
+          <!-- replaced with Proposal from Fabian Gerlach: 
+	It seems as if every other distributed or P2P project
           develops its own library stack, covering transports, stream
           muxing, discovery and others. This divides effort and
-          multiplies bug count.
+          multiplies bug count.-->
+	Instead of sharing common components and tools for building P2P systems, every P2P project seems to re-invent the wheel. That highens effort and number of vulnerabilities.
 	  {% endtrans %}
 	<p>
 	  {% trans %}
           GNUnet is a metadata-preserving foundation for your
           application, covering areas from addressing to reliable
           bidirectional Axolotl-encrypted channels, with advanced
-          routing.  Our work is based on continuous research spanning
+          routing. Our work is based on continuous research spanning
           almost two decades.
           {% endtrans %}
         </p>
@@ -155,20 +158,18 @@
         <h3>{{ _("Metadata is exposed") }}</h3>
         <p>
           {% trans %}
+	Your metadata is just as revealing as the actual content; and it gets exposed on the internet.<br>
           Even though transport encryption is increasingly being
           deployed on the Internet, it still reveals data that can
           threaten democracy: the identities of senders and receivers,
           the times, frequency and the volume of communication are all
-          still revealed.
+          still revealed.<br>
 	  <!-- Looks like a weak argumentation to me:
           which <a
           href="https://www.freehaven.net/anonbib/cache/websitefingerprinting-pets2016.pdf">enables
           reverse-engineering pages visited via website
           fingerprinting</a>.
           -->
-	  {% endtrans %}
-	  <p>
-	  {% trans %}
           GNUnet
 	  <a href="https://secushare.org/anonymity">addresses</a>
 	  these concerns with perfect forward secrecy via ephemeral
@@ -204,7 +205,7 @@
       </div>
       <div class="col-lg-4">
         <section>
-        <h3>{{ _("Learn more about the GNUnet") }}</h3>
+        <h3>{{ _("Learn more about GNUnet") }}</h3>
         <p>
           {% trans %}
           If you want to know more about the GNUnet please continue reading 
@@ -220,11 +221,7 @@
 	get engaged into the conversation</a>, 
 	<a href="https://gnunet.org/en/install.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>. 
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
+	<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!
           {% endtrans %}
-- 
cgit v1.2.3


From d33ae93cc7880e0ef6857955a92cc2af9250a9ed Mon Sep 17 00:00:00 2001
From: "Schanzenbach, Martin" <mschanzenbach@posteo.de>
Date: Sun, 30 Jun 2019 20:59:25 +0200
Subject: remove language dropdown

---
 common/navigation.j2.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index cf199ece..33c5e107 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -91,8 +91,8 @@
       </li>
     </ul>
     <ul class="navbar-nav navbar-right nav">
-      <li class="nav-item dropdown">
-	<a class="nav-link dropdown-toggle" href="#"
+<!--      <li class="nav-item dropdown">
+  <a class="nav-link dropdown-toggle" href="#"
            data-toggle="dropdown" role="button"
            aria-haspopup="true" aria-expanded="false">
            {{ lang_full }} [{{ lang }}]
@@ -104,7 +104,8 @@
           <li><a class="dropdown-item" href="{{ self_localized('it') }}">Italiano [it]</a></li>
           <li><a class="dropdown-item" href="{{ self_localized('es') }}">Espa&ntilde;ol [es]</a></li>
         </ul>
-      </li> <!-- /navbar-right dropdown -->
+      </li> DISABLE FOR NOW FOR LACK OF EXISTING TRANSLATIONS -->
+      <!-- /navbar-right dropdown -->
     </ul> <!-- /navbar-right -->
   </div> <!-- /navbar -->
 </nav>
-- 
cgit v1.2.3


From 6e04f409a90994d878189eb454a6b065b2d42f49 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Sun, 30 Jun 2019 21:14:03 +0200
Subject: minor fix

---
 news/2019-06-DSTJ.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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>
-- 
cgit v1.2.3


From 3f509f382cb2c756b026289dc97b4ffc2efa772d Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Sun, 30 Jun 2019 21:14:21 +0200
Subject: update po-files

---
 locale/de/LC_MESSAGES/messages.po | 202 ++++++++++++++++++++------------------
 locale/en/LC_MESSAGES/messages.po | 198 +++++++++++++++++++------------------
 locale/es/LC_MESSAGES/messages.po | 202 ++++++++++++++++++++------------------
 locale/fr/LC_MESSAGES/messages.po | 200 +++++++++++++++++++------------------
 locale/it/LC_MESSAGES/messages.po | 200 +++++++++++++++++++------------------
 5 files changed, 513 insertions(+), 489 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index ec7df34b..907bfd40 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-06-29 21:51+0200\n"
+"POT-Creation-Date: 2019-06-30 09:10+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"
@@ -33,7 +33,7 @@ msgstr "Entwickelerteam"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: common/footer.j2.inc:9 common/navigation.j2.inc:55
+#: common/footer.j2.inc:9 common/navigation.j2.inc:52
 msgid "GNUnet e.V."
 msgstr "GNUnet e.V."
 
@@ -41,7 +41,7 @@ msgstr "GNUnet e.V."
 msgid "About GNUnet"
 msgstr "Über GNUnet"
 
-#: common/footer.j2.inc:15 common/navigation.j2.inc:68
+#: common/footer.j2.inc:15 common/navigation.j2.inc:65
 msgid "Bug Tracker"
 msgstr "Fehlerdatenbank"
 
@@ -55,11 +55,11 @@ msgstr "IRC Archive"
 msgid "Copyright Assignment"
 msgstr "Copyright Übertragung"
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:70
+#: common/footer.j2.inc:22 common/navigation.j2.inc:67
 msgid "Continuous Integration"
 msgstr "Kontinuierliche Integration"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografie"
@@ -83,80 +83,80 @@ msgstr ""
 "Software</a> erstellt.<br> Probleme bitte <a href='contact.html'>hier</a> "
 "melden."
 
-#: common/navigation.j2.inc:42 template/index.html.j2:46
+#: common/navigation.j2.inc:39 template/index.html.j2:46
 msgid "About"
 msgstr "Über GNUnet"
 
-#: common/navigation.j2.inc:45 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:357
 msgid "News"
 msgstr "Neues"
 
-#: common/navigation.j2.inc:50
+#: common/navigation.j2.inc:47
 msgid "Community"
 msgstr "Community"
 
-#: common/navigation.j2.inc:53 template/index.html.j2:58
+#: common/navigation.j2.inc:50 template/index.html.j2:58
 msgid "Engage"
 msgstr "Mach mit!"
 
-#: common/navigation.j2.inc:54
+#: common/navigation.j2.inc:51
 msgid "GSoC Projects"
 msgstr "GSoC Projekte"
 
-#: common/navigation.j2.inc:56
+#: common/navigation.j2.inc:53
 msgid "Copyright for Contributors"
 msgstr "Copyright für Mitwirkende"
 
-#: common/navigation.j2.inc:57
+#: common/navigation.j2.inc:54
 msgid "IRC Archive"
 msgstr "IRC Archiv"
 
-#: common/navigation.j2.inc:64
+#: common/navigation.j2.inc:61
 msgid "Development"
 msgstr "Entwicklung"
 
-#: common/navigation.j2.inc:67
+#: common/navigation.j2.inc:64
 msgid "System Architecture"
 msgstr "Systemarchitektur"
 
-#: common/navigation.j2.inc:69 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
 msgid "Source Code"
 msgstr "Quellkode"
 
-#: common/navigation.j2.inc:81
+#: common/navigation.j2.inc:78
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: common/navigation.j2.inc:84 template/index.html.j2:52
+#: common/navigation.j2.inc:81 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Installieren"
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:82
 msgid "Use"
 msgstr "Nutzen"
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:83
 msgid "Videos"
 msgstr "Videos"
 
-#: common/navigation.j2.inc:87 template/glossary.html.j2:6
+#: common/navigation.j2.inc:84 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glossar"
 
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:85
 msgid "Handbook"
 msgstr "Handbuch"
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:86
 msgid "REST API"
 msgstr "REST API"
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:87
 msgid "C-Tutorial"
 msgstr "C-Anleitung"
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -382,11 +382,11 @@ msgstr ""
 msgid "Contact information"
 msgstr "Kontaktinformation"
 
-#: template/contact.html.j2:13
+#: template/contact.html.j2:11
 msgid "The mailing list"
 msgstr "Die Mailingliste"
 
-#: template/contact.html.j2:15
+#: template/contact.html.j2:13
 msgid ""
 "An archived, public mailing list for GNUnet is hosted at <a href=\"https://"
 "lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists.gnu.org/"
@@ -394,31 +394,31 @@ msgid ""
 "<a href=\"mailto:gnunet-developers@gnu.org\">gnunet-developers@gnu.org</a>."
 msgstr ""
 
-#: template/contact.html.j2:25
+#: template/contact.html.j2:23
 msgid "The IRC channel"
 msgstr "Der IRC Kanal"
 
-#: template/contact.html.j2:27
+#: template/contact.html.j2:25
 msgid ""
 "#gnunet is reachable via irc.freenode.net. There is also an <a href="
 "\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:34
 msgid "Contacting individuals"
 msgstr "Individuelle Kontaktaufname"
 
-#: template/contact.html.j2:38
+#: template/contact.html.j2:36
 msgid ""
 "GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
 "Most of us support receiving GnuPG encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:45
 msgid "Reporting bugs"
 msgstr "Fehler melden"
 
-#: template/contact.html.j2:49
+#: template/contact.html.j2:47
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -995,24 +995,38 @@ msgid ""
 "finished projects."
 msgstr ""
 
-#: template/gsoc.html.j2:20
+#: template/gsoc.html.j2:23
+#, fuzzy
+#| msgid "GSoC Projects"
+msgid "Current projects"
+msgstr "GSoC Projekte"
+
+#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+msgid "Past projects"
+msgstr ""
+
+#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+msgid "Finished projects"
+msgstr ""
+
+#: template/gsoc.html.j2:30
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:24
+#: template/gsoc.html.j2:34
 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:31
+#: template/gsoc.html.j2:41
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:40
+#: template/gsoc.html.j2:50
 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 +1037,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:52
+#: template/gsoc.html.j2:62
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:61
+#: template/gsoc.html.j2:71
 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 +1051,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:77
+#: template/gsoc.html.j2:87
 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 +1070,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:108
+#: template/gsoc.html.j2:118
 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 +1092,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:143
+#: template/gsoc.html.j2:153
 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,22 +1108,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:164
+#: template/gsoc.html.j2:174
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:170
-msgid "Past projects"
-msgstr ""
-
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:184
 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:182
+#: template/gsoc.html.j2:192
 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 "
@@ -1117,26 +1127,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:192 template/gsoc.html.j2:216
-#: template/gsoc.html.j2:270 template/gsoc.html.j2:300
-#: template/gsoc.html.j2:544
+#: 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
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:197
+#: template/gsoc.html.j2:207
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:202
+#: template/gsoc.html.j2:212
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:210
+#: template/gsoc.html.j2:220
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:221
+#: template/gsoc.html.j2:231
 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 "
@@ -1144,17 +1154,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:230 template/gsoc.html.j2:404
-#: template/gsoc.html.j2:444 template/gsoc.html.j2:474
+#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
+#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:235 template/gsoc.html.j2:479
-#: template/gsoc.html.j2:584
+#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
+#: template/gsoc.html.j2:594
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:243
+#: template/gsoc.html.j2:253
 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 "
@@ -1162,11 +1172,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:254 template/gsoc.html.j2:574
+#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:262
+#: template/gsoc.html.j2:272
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1174,42 +1184,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:278
+#: template/gsoc.html.j2:288
 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:285
+#: template/gsoc.html.j2:295
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:293 template/gsoc.html.j2:537
+#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
 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:305
+#: template/gsoc.html.j2:315
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:310 template/gsoc.html.j2:367
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
+#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:318
+#: template/gsoc.html.j2:328
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:324
+#: template/gsoc.html.j2:334
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:338
 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 "
@@ -1219,11 +1229,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:339
+#: template/gsoc.html.j2:349
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:343
+#: template/gsoc.html.j2:353
 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 "
@@ -1232,21 +1242,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:352
+#: template/gsoc.html.j2:362
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:357
+#: template/gsoc.html.j2:367
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:372
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:375
+#: template/gsoc.html.j2:385
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1257,17 +1267,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:393
+#: template/gsoc.html.j2:403
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:399 template/gsoc.html.j2:439
+#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:416
+#: template/gsoc.html.j2:426
 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 "
@@ -1277,7 +1287,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:457
+#: template/gsoc.html.j2:467
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1286,33 +1296,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:469
+#: template/gsoc.html.j2:479
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:487
+#: template/gsoc.html.j2:497
 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:494 template/gsoc.html.j2:508
+#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:502
+#: template/gsoc.html.j2:512
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:516
+#: template/gsoc.html.j2:526
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:524
+#: template/gsoc.html.j2:534
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1320,17 +1330,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:552
+#: template/gsoc.html.j2:562
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:558
-msgid "Finished projects"
-msgstr ""
-
-#: template/gsoc.html.j2:564
+#: template/gsoc.html.j2:574
 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 "
@@ -1339,11 +1345,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:579
+#: template/gsoc.html.j2:589
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:599
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1352,9 +1358,9 @@ msgstr ""
 msgid ""
 "GNUnet is a new network protocol stack for building secure, distributed, and "
 "privacy-preserving applications. With strong roots in academic <a href="
-"\"https://old.gnunet.org/bibliography\">research</a>, our goal is to replace "
-"the <a href=\"https://secushare.org/broken-internet\">old insecure Internet</"
-"a> protocol stack."
+"\"https://bib.gnunet.org\">research</a>, our goal is to replace the <a href="
+"\"https://secushare.org/broken-internet\">old insecure Internet</a> protocol "
+"stack."
 msgstr ""
 
 #: template/index.html.j2:20
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 39ae893b..094892c4 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:9 common/navigation.j2.inc:55
+#: common/footer.j2.inc:9 common/navigation.j2.inc:52
 msgid "GNUnet e.V."
 msgstr ""
 
@@ -22,7 +22,7 @@ msgstr ""
 msgid "About GNUnet"
 msgstr ""
 
-#: common/footer.j2.inc:15 common/navigation.j2.inc:68
+#: common/footer.j2.inc:15 common/navigation.j2.inc:65
 msgid "Bug Tracker"
 msgstr ""
 
@@ -34,11 +34,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:70
+#: common/footer.j2.inc:22 common/navigation.j2.inc:67
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -52,80 +52,80 @@ msgid ""
 "href='contact.html'>Report issues with this website</a>."
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:46
+#: common/navigation.j2.inc:39 template/index.html.j2:46
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:45 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:357
 msgid "News"
 msgstr ""
 
-#: common/navigation.j2.inc:50
+#: common/navigation.j2.inc:47
 msgid "Community"
 msgstr ""
 
-#: common/navigation.j2.inc:53 template/index.html.j2:58
+#: common/navigation.j2.inc:50 template/index.html.j2:58
 msgid "Engage"
 msgstr ""
 
-#: common/navigation.j2.inc:54
+#: common/navigation.j2.inc:51
 msgid "GSoC Projects"
 msgstr ""
 
-#: common/navigation.j2.inc:56
+#: common/navigation.j2.inc:53
 msgid "Copyright for Contributors"
 msgstr ""
 
-#: common/navigation.j2.inc:57
+#: common/navigation.j2.inc:54
 msgid "IRC Archive"
 msgstr ""
 
-#: common/navigation.j2.inc:64
+#: common/navigation.j2.inc:61
 msgid "Development"
 msgstr ""
 
-#: common/navigation.j2.inc:67
+#: common/navigation.j2.inc:64
 msgid "System Architecture"
 msgstr ""
 
-#: common/navigation.j2.inc:69 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:81
+#: common/navigation.j2.inc:78
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:84 template/index.html.j2:52
+#: common/navigation.j2.inc:81 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:82
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:83
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:87 template/glossary.html.j2:6
+#: common/navigation.j2.inc:84 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:85
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:86
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:87
 msgid "C-Tutorial"
 msgstr ""
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr ""
 
@@ -331,11 +331,11 @@ msgstr ""
 msgid "Contact information"
 msgstr ""
 
-#: template/contact.html.j2:13
+#: template/contact.html.j2:11
 msgid "The mailing list"
 msgstr ""
 
-#: template/contact.html.j2:15
+#: template/contact.html.j2:13
 msgid ""
 "An archived, public mailing list for GNUnet is hosted at <a href=\"https://"
 "lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists.gnu.org/"
@@ -343,31 +343,31 @@ msgid ""
 "<a href=\"mailto:gnunet-developers@gnu.org\">gnunet-developers@gnu.org</a>."
 msgstr ""
 
-#: template/contact.html.j2:25
+#: template/contact.html.j2:23
 msgid "The IRC channel"
 msgstr ""
 
-#: template/contact.html.j2:27
+#: template/contact.html.j2:25
 msgid ""
 "#gnunet is reachable via irc.freenode.net. There is also an <a href="
 "\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:34
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:38
+#: template/contact.html.j2:36
 msgid ""
 "GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
 "Most of us support receiving GnuPG encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:45
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:49
+#: template/contact.html.j2:47
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -944,24 +944,36 @@ msgid ""
 "finished projects."
 msgstr ""
 
-#: template/gsoc.html.j2:20
+#: template/gsoc.html.j2:23
+msgid "Current projects"
+msgstr ""
+
+#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+msgid "Past projects"
+msgstr ""
+
+#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+msgid "Finished projects"
+msgstr ""
+
+#: template/gsoc.html.j2:30
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:24
+#: template/gsoc.html.j2:34
 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:31
+#: template/gsoc.html.j2:41
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:40
+#: template/gsoc.html.j2:50
 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 "
@@ -972,11 +984,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:52
+#: template/gsoc.html.j2:62
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:61
+#: template/gsoc.html.j2:71
 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 "
@@ -986,7 +998,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:77
+#: template/gsoc.html.j2:87
 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 "
@@ -1005,7 +1017,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:108
+#: template/gsoc.html.j2:118
 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 "
@@ -1027,7 +1039,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:143
+#: template/gsoc.html.j2:153
 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 "
@@ -1043,22 +1055,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:164
+#: template/gsoc.html.j2:174
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:170
-msgid "Past projects"
-msgstr ""
-
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:184
 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:182
+#: template/gsoc.html.j2:192
 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 "
@@ -1066,26 +1074,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:192 template/gsoc.html.j2:216
-#: template/gsoc.html.j2:270 template/gsoc.html.j2:300
-#: template/gsoc.html.j2:544
+#: 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
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:197
+#: template/gsoc.html.j2:207
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:202
+#: template/gsoc.html.j2:212
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:210
+#: template/gsoc.html.j2:220
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:221
+#: template/gsoc.html.j2:231
 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 "
@@ -1093,17 +1101,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:230 template/gsoc.html.j2:404
-#: template/gsoc.html.j2:444 template/gsoc.html.j2:474
+#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
+#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:235 template/gsoc.html.j2:479
-#: template/gsoc.html.j2:584
+#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
+#: template/gsoc.html.j2:594
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:243
+#: template/gsoc.html.j2:253
 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 "
@@ -1111,11 +1119,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:254 template/gsoc.html.j2:574
+#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:262
+#: template/gsoc.html.j2:272
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1123,42 +1131,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:278
+#: template/gsoc.html.j2:288
 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:285
+#: template/gsoc.html.j2:295
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:293 template/gsoc.html.j2:537
+#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
 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:305
+#: template/gsoc.html.j2:315
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:310 template/gsoc.html.j2:367
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
+#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:318
+#: template/gsoc.html.j2:328
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:324
+#: template/gsoc.html.j2:334
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:338
 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 "
@@ -1168,11 +1176,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:339
+#: template/gsoc.html.j2:349
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:343
+#: template/gsoc.html.j2:353
 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 "
@@ -1181,21 +1189,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:352
+#: template/gsoc.html.j2:362
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:357
+#: template/gsoc.html.j2:367
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:372
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:375
+#: template/gsoc.html.j2:385
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1206,17 +1214,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:393
+#: template/gsoc.html.j2:403
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:399 template/gsoc.html.j2:439
+#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:416
+#: template/gsoc.html.j2:426
 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 "
@@ -1226,7 +1234,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:457
+#: template/gsoc.html.j2:467
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1235,33 +1243,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:469
+#: template/gsoc.html.j2:479
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:487
+#: template/gsoc.html.j2:497
 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:494 template/gsoc.html.j2:508
+#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:502
+#: template/gsoc.html.j2:512
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:516
+#: template/gsoc.html.j2:526
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:524
+#: template/gsoc.html.j2:534
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1269,17 +1277,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:552
+#: template/gsoc.html.j2:562
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:558
-msgid "Finished projects"
-msgstr ""
-
-#: template/gsoc.html.j2:564
+#: template/gsoc.html.j2:574
 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 "
@@ -1288,11 +1292,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:579
+#: template/gsoc.html.j2:589
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:599
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1301,9 +1305,9 @@ msgstr ""
 msgid ""
 "GNUnet is a new network protocol stack for building secure, distributed, and "
 "privacy-preserving applications. With strong roots in academic <a href="
-"\"https://old.gnunet.org/bibliography\">research</a>, our goal is to replace "
-"the <a href=\"https://secushare.org/broken-internet\">old insecure Internet</"
-"a> protocol stack."
+"\"https://bib.gnunet.org\">research</a>, our goal is to replace the <a href="
+"\"https://secushare.org/broken-internet\">old insecure Internet</a> protocol "
+"stack."
 msgstr ""
 
 #: template/index.html.j2:20
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index bf3c912b..c02b0ca2 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-06-29 21:51+0200\n"
+"POT-Creation-Date: 2019-06-30 09:10+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"
@@ -34,7 +34,7 @@ msgstr "Equipo de desarrollo"
 msgid "Contact"
 msgstr "Contacto"
 
-#: common/footer.j2.inc:9 common/navigation.j2.inc:55
+#: common/footer.j2.inc:9 common/navigation.j2.inc:52
 msgid "GNUnet e.V."
 msgstr "GNUnet a. r."
 
@@ -42,7 +42,7 @@ msgstr "GNUnet a. r."
 msgid "About GNUnet"
 msgstr "Sobre GNUnet"
 
-#: common/footer.j2.inc:15 common/navigation.j2.inc:68
+#: common/footer.j2.inc:15 common/navigation.j2.inc:65
 msgid "Bug Tracker"
 msgstr "Herramienta de seguimiento de errores"
 
@@ -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:70
+#: common/footer.j2.inc:22 common/navigation.j2.inc:67
 msgid "Continuous Integration"
 msgstr "Integración continua"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografía"
@@ -72,80 +72,80 @@ msgid ""
 "href='contact.html'>Report issues with this website</a>."
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:46
+#: common/navigation.j2.inc:39 template/index.html.j2:46
 msgid "About"
 msgstr "Sobre"
 
-#: common/navigation.j2.inc:45 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:357
 msgid "News"
 msgstr "Nuevo"
 
-#: common/navigation.j2.inc:50
+#: common/navigation.j2.inc:47
 msgid "Community"
 msgstr "Comunidad"
 
-#: common/navigation.j2.inc:53 template/index.html.j2:58
+#: common/navigation.j2.inc:50 template/index.html.j2:58
 msgid "Engage"
 msgstr "Participa"
 
-#: common/navigation.j2.inc:54
+#: common/navigation.j2.inc:51
 msgid "GSoC Projects"
 msgstr "Projectos de GSoC"
 
-#: common/navigation.j2.inc:56
+#: common/navigation.j2.inc:53
 msgid "Copyright for Contributors"
 msgstr "Derecho de autor para contributores"
 
-#: common/navigation.j2.inc:57
+#: common/navigation.j2.inc:54
 msgid "IRC Archive"
 msgstr "Archivo de IRC"
 
-#: common/navigation.j2.inc:64
+#: common/navigation.j2.inc:61
 msgid "Development"
 msgstr "Desarrollo"
 
-#: common/navigation.j2.inc:67
+#: common/navigation.j2.inc:64
 msgid "System Architecture"
 msgstr "Architectura del sistema"
 
-#: common/navigation.j2.inc:69 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
 msgid "Source Code"
 msgstr "Códico fuente"
 
-#: common/navigation.j2.inc:81
+#: common/navigation.j2.inc:78
 msgid "Documentation"
 msgstr "Documentación"
 
-#: common/navigation.j2.inc:84 template/index.html.j2:52
+#: common/navigation.j2.inc:81 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Instala"
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:82
 msgid "Use"
 msgstr "Usa"
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:83
 msgid "Videos"
 msgstr "Videos"
 
-#: common/navigation.j2.inc:87 template/glossary.html.j2:6
+#: common/navigation.j2.inc:84 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glosario"
 
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:85
 msgid "Handbook"
 msgstr "Manual"
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:86
 msgid "REST API"
 msgstr "REST API"
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:87
 msgid "C-Tutorial"
 msgstr "Tutorial de C"
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -351,11 +351,11 @@ msgstr ""
 msgid "Contact information"
 msgstr ""
 
-#: template/contact.html.j2:13
+#: template/contact.html.j2:11
 msgid "The mailing list"
 msgstr ""
 
-#: template/contact.html.j2:15
+#: template/contact.html.j2:13
 msgid ""
 "An archived, public mailing list for GNUnet is hosted at <a href=\"https://"
 "lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists.gnu.org/"
@@ -363,31 +363,31 @@ msgid ""
 "<a href=\"mailto:gnunet-developers@gnu.org\">gnunet-developers@gnu.org</a>."
 msgstr ""
 
-#: template/contact.html.j2:25
+#: template/contact.html.j2:23
 msgid "The IRC channel"
 msgstr ""
 
-#: template/contact.html.j2:27
+#: template/contact.html.j2:25
 msgid ""
 "#gnunet is reachable via irc.freenode.net. There is also an <a href="
 "\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:34
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:38
+#: template/contact.html.j2:36
 msgid ""
 "GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
 "Most of us support receiving GnuPG encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:45
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:49
+#: template/contact.html.j2:47
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -964,24 +964,38 @@ msgid ""
 "finished projects."
 msgstr ""
 
-#: template/gsoc.html.j2:20
+#: template/gsoc.html.j2:23
+#, fuzzy
+#| msgid "GSoC Projects"
+msgid "Current projects"
+msgstr "Projectos de GSoC"
+
+#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+msgid "Past projects"
+msgstr ""
+
+#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+msgid "Finished projects"
+msgstr ""
+
+#: template/gsoc.html.j2:30
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:24
+#: template/gsoc.html.j2:34
 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:31
+#: template/gsoc.html.j2:41
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:40
+#: template/gsoc.html.j2:50
 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 "
@@ -992,11 +1006,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:52
+#: template/gsoc.html.j2:62
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:61
+#: template/gsoc.html.j2:71
 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 "
@@ -1006,7 +1020,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:77
+#: template/gsoc.html.j2:87
 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 "
@@ -1025,7 +1039,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:108
+#: template/gsoc.html.j2:118
 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 "
@@ -1047,7 +1061,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:143
+#: template/gsoc.html.j2:153
 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 "
@@ -1063,22 +1077,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:164
+#: template/gsoc.html.j2:174
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:170
-msgid "Past projects"
-msgstr ""
-
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:184
 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:182
+#: template/gsoc.html.j2:192
 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 "
@@ -1086,26 +1096,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:192 template/gsoc.html.j2:216
-#: template/gsoc.html.j2:270 template/gsoc.html.j2:300
-#: template/gsoc.html.j2:544
+#: 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
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:197
+#: template/gsoc.html.j2:207
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:202
+#: template/gsoc.html.j2:212
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:210
+#: template/gsoc.html.j2:220
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:221
+#: template/gsoc.html.j2:231
 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 "
@@ -1113,17 +1123,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:230 template/gsoc.html.j2:404
-#: template/gsoc.html.j2:444 template/gsoc.html.j2:474
+#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
+#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:235 template/gsoc.html.j2:479
-#: template/gsoc.html.j2:584
+#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
+#: template/gsoc.html.j2:594
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:243
+#: template/gsoc.html.j2:253
 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 "
@@ -1131,11 +1141,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:254 template/gsoc.html.j2:574
+#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:262
+#: template/gsoc.html.j2:272
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1143,42 +1153,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:278
+#: template/gsoc.html.j2:288
 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:285
+#: template/gsoc.html.j2:295
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:293 template/gsoc.html.j2:537
+#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
 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:305
+#: template/gsoc.html.j2:315
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:310 template/gsoc.html.j2:367
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
+#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:318
+#: template/gsoc.html.j2:328
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:324
+#: template/gsoc.html.j2:334
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:338
 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 "
@@ -1188,11 +1198,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:339
+#: template/gsoc.html.j2:349
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:343
+#: template/gsoc.html.j2:353
 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 "
@@ -1201,21 +1211,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:352
+#: template/gsoc.html.j2:362
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:357
+#: template/gsoc.html.j2:367
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:372
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:375
+#: template/gsoc.html.j2:385
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1226,17 +1236,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:393
+#: template/gsoc.html.j2:403
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:399 template/gsoc.html.j2:439
+#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:416
+#: template/gsoc.html.j2:426
 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 "
@@ -1246,7 +1256,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:457
+#: template/gsoc.html.j2:467
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1255,33 +1265,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:469
+#: template/gsoc.html.j2:479
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:487
+#: template/gsoc.html.j2:497
 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:494 template/gsoc.html.j2:508
+#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:502
+#: template/gsoc.html.j2:512
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:516
+#: template/gsoc.html.j2:526
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:524
+#: template/gsoc.html.j2:534
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1289,17 +1299,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:552
+#: template/gsoc.html.j2:562
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:558
-msgid "Finished projects"
-msgstr ""
-
-#: template/gsoc.html.j2:564
+#: template/gsoc.html.j2:574
 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 "
@@ -1308,11 +1314,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:579
+#: template/gsoc.html.j2:589
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:599
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1321,9 +1327,9 @@ msgstr ""
 msgid ""
 "GNUnet is a new network protocol stack for building secure, distributed, and "
 "privacy-preserving applications. With strong roots in academic <a href="
-"\"https://old.gnunet.org/bibliography\">research</a>, our goal is to replace "
-"the <a href=\"https://secushare.org/broken-internet\">old insecure Internet</"
-"a> protocol stack."
+"\"https://bib.gnunet.org\">research</a>, our goal is to replace the <a href="
+"\"https://secushare.org/broken-internet\">old insecure Internet</a> protocol "
+"stack."
 msgstr ""
 
 #: template/index.html.j2:20
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index ee3c250e..4b65a475 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-06-29 21:51+0200\n"
+"POT-Creation-Date: 2019-06-30 09:10+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"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:9 common/navigation.j2.inc:55
+#: common/footer.j2.inc:9 common/navigation.j2.inc:52
 msgid "GNUnet e.V."
 msgstr ""
 
@@ -42,7 +42,7 @@ msgstr ""
 msgid "About GNUnet"
 msgstr ""
 
-#: common/footer.j2.inc:15 common/navigation.j2.inc:68
+#: common/footer.j2.inc:15 common/navigation.j2.inc:65
 msgid "Bug Tracker"
 msgstr ""
 
@@ -54,11 +54,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:70
+#: common/footer.j2.inc:22 common/navigation.j2.inc:67
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -72,80 +72,80 @@ msgid ""
 "href='contact.html'>Report issues with this website</a>."
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:46
+#: common/navigation.j2.inc:39 template/index.html.j2:46
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:45 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:357
 msgid "News"
 msgstr ""
 
-#: common/navigation.j2.inc:50
+#: common/navigation.j2.inc:47
 msgid "Community"
 msgstr ""
 
-#: common/navigation.j2.inc:53 template/index.html.j2:58
+#: common/navigation.j2.inc:50 template/index.html.j2:58
 msgid "Engage"
 msgstr ""
 
-#: common/navigation.j2.inc:54
+#: common/navigation.j2.inc:51
 msgid "GSoC Projects"
 msgstr ""
 
-#: common/navigation.j2.inc:56
+#: common/navigation.j2.inc:53
 msgid "Copyright for Contributors"
 msgstr ""
 
-#: common/navigation.j2.inc:57
+#: common/navigation.j2.inc:54
 msgid "IRC Archive"
 msgstr ""
 
-#: common/navigation.j2.inc:64
+#: common/navigation.j2.inc:61
 msgid "Development"
 msgstr ""
 
-#: common/navigation.j2.inc:67
+#: common/navigation.j2.inc:64
 msgid "System Architecture"
 msgstr ""
 
-#: common/navigation.j2.inc:69 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:81
+#: common/navigation.j2.inc:78
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:84 template/index.html.j2:52
+#: common/navigation.j2.inc:81 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:82
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:83
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:87 template/glossary.html.j2:6
+#: common/navigation.j2.inc:84 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:85
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:86
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:87
 msgid "C-Tutorial"
 msgstr ""
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr ""
 
@@ -351,11 +351,11 @@ msgstr ""
 msgid "Contact information"
 msgstr ""
 
-#: template/contact.html.j2:13
+#: template/contact.html.j2:11
 msgid "The mailing list"
 msgstr ""
 
-#: template/contact.html.j2:15
+#: template/contact.html.j2:13
 msgid ""
 "An archived, public mailing list for GNUnet is hosted at <a href=\"https://"
 "lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists.gnu.org/"
@@ -363,31 +363,31 @@ msgid ""
 "<a href=\"mailto:gnunet-developers@gnu.org\">gnunet-developers@gnu.org</a>."
 msgstr ""
 
-#: template/contact.html.j2:25
+#: template/contact.html.j2:23
 msgid "The IRC channel"
 msgstr ""
 
-#: template/contact.html.j2:27
+#: template/contact.html.j2:25
 msgid ""
 "#gnunet is reachable via irc.freenode.net. There is also an <a href="
 "\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:34
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:38
+#: template/contact.html.j2:36
 msgid ""
 "GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
 "Most of us support receiving GnuPG encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:45
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:49
+#: template/contact.html.j2:47
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -964,24 +964,36 @@ msgid ""
 "finished projects."
 msgstr ""
 
-#: template/gsoc.html.j2:20
+#: template/gsoc.html.j2:23
+msgid "Current projects"
+msgstr ""
+
+#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+msgid "Past projects"
+msgstr ""
+
+#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+msgid "Finished projects"
+msgstr ""
+
+#: template/gsoc.html.j2:30
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:24
+#: template/gsoc.html.j2:34
 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:31
+#: template/gsoc.html.j2:41
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:40
+#: template/gsoc.html.j2:50
 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 "
@@ -992,11 +1004,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:52
+#: template/gsoc.html.j2:62
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:61
+#: template/gsoc.html.j2:71
 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 "
@@ -1006,7 +1018,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:77
+#: template/gsoc.html.j2:87
 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 "
@@ -1025,7 +1037,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:108
+#: template/gsoc.html.j2:118
 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 "
@@ -1047,7 +1059,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:143
+#: template/gsoc.html.j2:153
 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 "
@@ -1063,22 +1075,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:164
+#: template/gsoc.html.j2:174
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:170
-msgid "Past projects"
-msgstr ""
-
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:184
 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:182
+#: template/gsoc.html.j2:192
 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 "
@@ -1086,26 +1094,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:192 template/gsoc.html.j2:216
-#: template/gsoc.html.j2:270 template/gsoc.html.j2:300
-#: template/gsoc.html.j2:544
+#: 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
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:197
+#: template/gsoc.html.j2:207
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:202
+#: template/gsoc.html.j2:212
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:210
+#: template/gsoc.html.j2:220
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:221
+#: template/gsoc.html.j2:231
 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 "
@@ -1113,17 +1121,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:230 template/gsoc.html.j2:404
-#: template/gsoc.html.j2:444 template/gsoc.html.j2:474
+#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
+#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:235 template/gsoc.html.j2:479
-#: template/gsoc.html.j2:584
+#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
+#: template/gsoc.html.j2:594
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:243
+#: template/gsoc.html.j2:253
 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 "
@@ -1131,11 +1139,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:254 template/gsoc.html.j2:574
+#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:262
+#: template/gsoc.html.j2:272
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1143,42 +1151,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:278
+#: template/gsoc.html.j2:288
 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:285
+#: template/gsoc.html.j2:295
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:293 template/gsoc.html.j2:537
+#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
 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:305
+#: template/gsoc.html.j2:315
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:310 template/gsoc.html.j2:367
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
+#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:318
+#: template/gsoc.html.j2:328
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:324
+#: template/gsoc.html.j2:334
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:338
 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 "
@@ -1188,11 +1196,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:339
+#: template/gsoc.html.j2:349
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:343
+#: template/gsoc.html.j2:353
 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 "
@@ -1201,21 +1209,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:352
+#: template/gsoc.html.j2:362
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:357
+#: template/gsoc.html.j2:367
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:372
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:375
+#: template/gsoc.html.j2:385
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1226,17 +1234,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:393
+#: template/gsoc.html.j2:403
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:399 template/gsoc.html.j2:439
+#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:416
+#: template/gsoc.html.j2:426
 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 "
@@ -1246,7 +1254,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:457
+#: template/gsoc.html.j2:467
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1255,33 +1263,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:469
+#: template/gsoc.html.j2:479
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:487
+#: template/gsoc.html.j2:497
 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:494 template/gsoc.html.j2:508
+#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:502
+#: template/gsoc.html.j2:512
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:516
+#: template/gsoc.html.j2:526
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:524
+#: template/gsoc.html.j2:534
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1289,17 +1297,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:552
+#: template/gsoc.html.j2:562
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:558
-msgid "Finished projects"
-msgstr ""
-
-#: template/gsoc.html.j2:564
+#: template/gsoc.html.j2:574
 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 "
@@ -1308,11 +1312,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:579
+#: template/gsoc.html.j2:589
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:599
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1321,9 +1325,9 @@ msgstr ""
 msgid ""
 "GNUnet is a new network protocol stack for building secure, distributed, and "
 "privacy-preserving applications. With strong roots in academic <a href="
-"\"https://old.gnunet.org/bibliography\">research</a>, our goal is to replace "
-"the <a href=\"https://secushare.org/broken-internet\">old insecure Internet</"
-"a> protocol stack."
+"\"https://bib.gnunet.org\">research</a>, our goal is to replace the <a href="
+"\"https://secushare.org/broken-internet\">old insecure Internet</a> protocol "
+"stack."
 msgstr ""
 
 #: template/index.html.j2:20
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index abee0a23..c991bb3f 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-06-29 21:51+0200\n"
+"POT-Creation-Date: 2019-06-30 09:10+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"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:9 common/navigation.j2.inc:55
+#: common/footer.j2.inc:9 common/navigation.j2.inc:52
 msgid "GNUnet e.V."
 msgstr ""
 
@@ -42,7 +42,7 @@ msgstr ""
 msgid "About GNUnet"
 msgstr ""
 
-#: common/footer.j2.inc:15 common/navigation.j2.inc:68
+#: common/footer.j2.inc:15 common/navigation.j2.inc:65
 msgid "Bug Tracker"
 msgstr ""
 
@@ -54,11 +54,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
 
-#: common/footer.j2.inc:22 common/navigation.j2.inc:70
+#: common/footer.j2.inc:22 common/navigation.j2.inc:67
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -72,80 +72,80 @@ msgid ""
 "href='contact.html'>Report issues with this website</a>."
 msgstr ""
 
-#: common/navigation.j2.inc:42 template/index.html.j2:46
+#: common/navigation.j2.inc:39 template/index.html.j2:46
 msgid "About"
 msgstr ""
 
-#: common/navigation.j2.inc:45 template/index.html.j2:357
+#: common/navigation.j2.inc:42 template/index.html.j2:357
 msgid "News"
 msgstr ""
 
-#: common/navigation.j2.inc:50
+#: common/navigation.j2.inc:47
 msgid "Community"
 msgstr ""
 
-#: common/navigation.j2.inc:53 template/index.html.j2:58
+#: common/navigation.j2.inc:50 template/index.html.j2:58
 msgid "Engage"
 msgstr ""
 
-#: common/navigation.j2.inc:54
+#: common/navigation.j2.inc:51
 msgid "GSoC Projects"
 msgstr ""
 
-#: common/navigation.j2.inc:56
+#: common/navigation.j2.inc:53
 msgid "Copyright for Contributors"
 msgstr ""
 
-#: common/navigation.j2.inc:57
+#: common/navigation.j2.inc:54
 msgid "IRC Archive"
 msgstr ""
 
-#: common/navigation.j2.inc:64
+#: common/navigation.j2.inc:61
 msgid "Development"
 msgstr ""
 
-#: common/navigation.j2.inc:67
+#: common/navigation.j2.inc:64
 msgid "System Architecture"
 msgstr ""
 
-#: common/navigation.j2.inc:69 template/gnurl.html.j2:124
+#: common/navigation.j2.inc:66 template/gnurl.html.j2:124
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:81
+#: common/navigation.j2.inc:78
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:84 template/index.html.j2:52
+#: common/navigation.j2.inc:81 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:82
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:83
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:87 template/glossary.html.j2:6
+#: common/navigation.j2.inc:84 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:85
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:86
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:87
 msgid "C-Tutorial"
 msgstr ""
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr ""
 
@@ -351,11 +351,11 @@ msgstr ""
 msgid "Contact information"
 msgstr ""
 
-#: template/contact.html.j2:13
+#: template/contact.html.j2:11
 msgid "The mailing list"
 msgstr ""
 
-#: template/contact.html.j2:15
+#: template/contact.html.j2:13
 msgid ""
 "An archived, public mailing list for GNUnet is hosted at <a href=\"https://"
 "lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists.gnu.org/"
@@ -363,31 +363,31 @@ msgid ""
 "<a href=\"mailto:gnunet-developers@gnu.org\">gnunet-developers@gnu.org</a>."
 msgstr ""
 
-#: template/contact.html.j2:25
+#: template/contact.html.j2:23
 msgid "The IRC channel"
 msgstr ""
 
-#: template/contact.html.j2:27
+#: template/contact.html.j2:25
 msgid ""
 "#gnunet is reachable via irc.freenode.net. There is also an <a href="
 "\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:34
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:38
+#: template/contact.html.j2:36
 msgid ""
 "GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
 "Most of us support receiving GnuPG encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:45
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:49
+#: template/contact.html.j2:47
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -964,24 +964,36 @@ msgid ""
 "finished projects."
 msgstr ""
 
-#: template/gsoc.html.j2:20
+#: template/gsoc.html.j2:23
+msgid "Current projects"
+msgstr ""
+
+#: template/gsoc.html.j2:24 template/gsoc.html.j2:180
+msgid "Past projects"
+msgstr ""
+
+#: template/gsoc.html.j2:25 template/gsoc.html.j2:568
+msgid "Finished projects"
+msgstr ""
+
+#: template/gsoc.html.j2:30
 msgid "Current projects (2019)"
 msgstr ""
 
-#: template/gsoc.html.j2:24
+#: template/gsoc.html.j2:34
 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:31
+#: template/gsoc.html.j2:41
 msgid ""
 "<strong>Mentors:</strong> <a href=\"https://www.goebel-consult.de/\">Hartmut "
 "Goebel</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:40
+#: template/gsoc.html.j2:50
 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 "
@@ -992,11 +1004,11 @@ msgid ""
 "automatic dependency discovery (as done by the autotools) is also important."
 msgstr ""
 
-#: template/gsoc.html.j2:52
+#: template/gsoc.html.j2:62
 msgid "<strong>Mentors:</strong> TBD"
 msgstr ""
 
-#: template/gsoc.html.j2:61
+#: template/gsoc.html.j2:71
 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 "
@@ -1006,7 +1018,7 @@ msgid ""
 "<br> <strong>Mentors:</strong> Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:77
+#: template/gsoc.html.j2:87
 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 "
@@ -1025,7 +1037,7 @@ msgid ""
 "ol> <br/> <strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:108
+#: template/gsoc.html.j2:118
 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 "
@@ -1047,7 +1059,7 @@ msgid ""
 "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:143
+#: template/gsoc.html.j2:153
 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 "
@@ -1063,22 +1075,18 @@ msgid ""
 "more information and context, read"
 msgstr ""
 
-#: template/gsoc.html.j2:164
+#: template/gsoc.html.j2:174
 msgid "<strong>Mentors:</strong> lynX &amp; dvn"
 msgstr ""
 
-#: template/gsoc.html.j2:170
-msgid "Past projects"
-msgstr ""
-
-#: template/gsoc.html.j2:174
+#: template/gsoc.html.j2:184
 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:182
+#: template/gsoc.html.j2:192
 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 "
@@ -1086,26 +1094,26 @@ msgid ""
 "implementing a GNUNet API for his own mix network work."
 msgstr ""
 
-#: template/gsoc.html.j2:192 template/gsoc.html.j2:216
-#: template/gsoc.html.j2:270 template/gsoc.html.j2:300
-#: template/gsoc.html.j2:544
+#: 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
 msgid "<strong>Mentors:</strong> Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:197
+#: template/gsoc.html.j2:207
 msgid "Required Skills: Rust"
 msgstr ""
 
-#: template/gsoc.html.j2:202
+#: template/gsoc.html.j2:212
 msgid "Difficulty level: low"
 msgstr ""
 
-#: template/gsoc.html.j2:210
+#: template/gsoc.html.j2:220
 msgid ""
 "Implement the AnycastExit spec to enable GNUnet clients to connect over Tor."
 msgstr ""
 
-#: template/gsoc.html.j2:221
+#: template/gsoc.html.j2:231
 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 "
@@ -1113,17 +1121,17 @@ msgid ""
 "more collaborative approach NSS2 for now."
 msgstr ""
 
-#: template/gsoc.html.j2:230 template/gsoc.html.j2:404
-#: template/gsoc.html.j2:444 template/gsoc.html.j2:474
+#: template/gsoc.html.j2:240 template/gsoc.html.j2:414
+#: template/gsoc.html.j2:454 template/gsoc.html.j2:484
 msgid "Required Skills: C"
 msgstr ""
 
-#: template/gsoc.html.j2:235 template/gsoc.html.j2:479
-#: template/gsoc.html.j2:584
+#: template/gsoc.html.j2:245 template/gsoc.html.j2:489
+#: template/gsoc.html.j2:594
 msgid "Difficulty level: medium"
 msgstr ""
 
-#: template/gsoc.html.j2:243
+#: template/gsoc.html.j2:253
 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 "
@@ -1131,11 +1139,11 @@ msgid ""
 "UIs will be much easier to create on top of REST APIs."
 msgstr ""
 
-#: template/gsoc.html.j2:254 template/gsoc.html.j2:574
+#: template/gsoc.html.j2:264 template/gsoc.html.j2:584
 msgid "<strong>Mentors:</strong> Martin Schanzenbach"
 msgstr ""
 
-#: template/gsoc.html.j2:262
+#: template/gsoc.html.j2:272
 msgid ""
 "Improve the Rust implementation of GNUnet utils, possibly including adding "
 "support for asynchronous IO using mio, or perhaps a higher level "
@@ -1143,42 +1151,42 @@ msgid ""
 "gj."
 msgstr ""
 
-#: template/gsoc.html.j2:278
+#: template/gsoc.html.j2:288
 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:285
+#: template/gsoc.html.j2:295
 msgid "<strong>Mentors:</strong> Jeff Burdges and Christian Grothoff"
 msgstr ""
 
-#: template/gsoc.html.j2:293 template/gsoc.html.j2:537
+#: template/gsoc.html.j2:303 template/gsoc.html.j2:547
 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:305
+#: template/gsoc.html.j2:315
 msgid "Required Skills: Rust or C, crypto"
 msgstr ""
 
-#: template/gsoc.html.j2:310 template/gsoc.html.j2:367
-#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
+#: template/gsoc.html.j2:320 template/gsoc.html.j2:377
+#: template/gsoc.html.j2:419 template/gsoc.html.j2:459
 msgid "Difficulty level: high"
 msgstr ""
 
-#: template/gsoc.html.j2:318
+#: template/gsoc.html.j2:328
 msgid ""
 "Implement different place types and file sharing by creating a new place for "
 "the shared content."
 msgstr ""
 
-#: template/gsoc.html.j2:324
+#: template/gsoc.html.j2:334
 msgid "Place types to be implemented:"
 msgstr ""
 
-#: template/gsoc.html.j2:328
+#: template/gsoc.html.j2:338
 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 "
@@ -1188,11 +1196,11 @@ msgid ""
 "</ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:339
+#: template/gsoc.html.j2:349
 msgid "Also provide the following UI functionality:"
 msgstr ""
 
-#: template/gsoc.html.j2:343
+#: template/gsoc.html.j2:353
 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 "
@@ -1201,21 +1209,21 @@ msgid ""
 "ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:352
+#: template/gsoc.html.j2:362
 msgid ""
 "See also <a href=\"http://secushare.org/features\">http://secushare.org/"
 "features</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:357
+#: template/gsoc.html.j2:367
 msgid "<strong>Mentors:</strong> lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:362
+#: template/gsoc.html.j2:372
 msgid "Required Skills: C/C++"
 msgstr ""
 
-#: template/gsoc.html.j2:375
+#: template/gsoc.html.j2:385
 msgid ""
 "Implement aggregation of distributed state from various channels in order to "
 "provide for a powerful social graph API capable of producing social network "
@@ -1226,17 +1234,17 @@ msgid ""
 "Linda. You have 11 contacts in common with her. [ADD]\")."
 msgstr ""
 
-#: template/gsoc.html.j2:393
+#: template/gsoc.html.j2:403
 msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
 
-#: template/gsoc.html.j2:399 template/gsoc.html.j2:439
+#: template/gsoc.html.j2:409 template/gsoc.html.j2:449
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
 msgstr ""
 
-#: template/gsoc.html.j2:416
+#: template/gsoc.html.j2:426
 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 "
@@ -1246,7 +1254,7 @@ msgid ""
 "this task but it is not an requirement. </li> </ul>"
 msgstr ""
 
-#: template/gsoc.html.j2:457
+#: template/gsoc.html.j2:467
 msgid ""
 "Implementation of the GNUnet auction system described in Chapter 3 of <a "
 "href=\"https://gnunet.org/libbrand-thesis\">this thesis</a>. Specific tasks "
@@ -1255,33 +1263,33 @@ msgid ""
 "interface programs create, info and join."
 msgstr ""
 
-#: template/gsoc.html.j2:469
+#: template/gsoc.html.j2:479
 msgid "<strong>Mentors:</strong> mate, cg"
 msgstr ""
 
-#: template/gsoc.html.j2:487
+#: template/gsoc.html.j2:497
 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:494 template/gsoc.html.j2:508
+#: template/gsoc.html.j2:504 template/gsoc.html.j2:518
 msgid "<strong>Mentors:</strong> Matthias Wachs"
 msgstr ""
 
-#: template/gsoc.html.j2:502
+#: template/gsoc.html.j2:512
 msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
 
-#: template/gsoc.html.j2:516
+#: template/gsoc.html.j2:526
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 msgstr ""
 
-#: template/gsoc.html.j2:524
+#: template/gsoc.html.j2:534
 msgid ""
 "Improving libaboss to make computation on shared secrets (including repeated "
 "multiplication) based on <a href=\"https://dl.acm.org/citation.cfm?"
@@ -1289,17 +1297,13 @@ msgid ""
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
 
-#: template/gsoc.html.j2:552
+#: template/gsoc.html.j2:562
 msgid ""
 "Please refer to the description for this project listed under GNU Guix "
 "project ideas."
 msgstr ""
 
-#: template/gsoc.html.j2:558
-msgid "Finished projects"
-msgstr ""
-
-#: template/gsoc.html.j2:564
+#: template/gsoc.html.j2:574
 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 "
@@ -1308,11 +1312,11 @@ msgid ""
 "\">GNUnet API</a>."
 msgstr ""
 
-#: template/gsoc.html.j2:579
+#: template/gsoc.html.j2:589
 msgid "Required Skills: C, JavaScript, CSS"
 msgstr ""
 
-#: template/gsoc.html.j2:589
+#: template/gsoc.html.j2:599
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
 msgstr ""
@@ -1321,9 +1325,9 @@ msgstr ""
 msgid ""
 "GNUnet is a new network protocol stack for building secure, distributed, and "
 "privacy-preserving applications. With strong roots in academic <a href="
-"\"https://old.gnunet.org/bibliography\">research</a>, our goal is to replace "
-"the <a href=\"https://secushare.org/broken-internet\">old insecure Internet</"
-"a> protocol stack."
+"\"https://bib.gnunet.org\">research</a>, our goal is to replace the <a href="
+"\"https://secushare.org/broken-internet\">old insecure Internet</a> protocol "
+"stack."
 msgstr ""
 
 #: template/index.html.j2:20
-- 
cgit v1.2.3


From 6102472d93e7862a374d304c15019872b52ffa73 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Mon, 1 Jul 2019 09:34:48 +0000
Subject: After feedback from Christian, adjust the copyright start to 2001.

---
 common/footer.j2.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 5586adf4..6ec47a13 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -29,7 +29,7 @@
   <div class="container text-center">
     <p>
     {% trans %}
-      Copyright &copy; <a href="ev.html">GNUnet e.V.</a> 2015 &mdash; 2019.
+      Copyright &copy; <a href="ev.html">GNUnet e.V.</a> 2001 &mdash; 2019.
       <!-- This just takes up space no one is interested in: -->
     <!-- This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> -->
     <a href='https://git.gnunet.org/www.git'>Source code of this site.</a>
-- 
cgit v1.2.3


From c6f26b60e9a981215acee38564aefee1a1efcc95 Mon Sep 17 00:00:00 2001
From: mu <mu@m.m>
Date: Mon, 1 Jul 2019 15:55:15 +0200
Subject: fixed the double hhref in use --sva

---
 locale/de/LC_MESSAGES/messages.po | 4 ++--
 locale/en/LC_MESSAGES/messages.po | 2 +-
 locale/es/LC_MESSAGES/messages.po | 4 ++--
 locale/fr/LC_MESSAGES/messages.po | 4 ++--
 locale/it/LC_MESSAGES/messages.po | 4 ++--
 template/use.html.j2              | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 56f46e8e..72590d9c 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-06-30 18:17+0200\n"
+"POT-Creation-Date: 2019-07-01 15:53+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"
@@ -72,7 +72,7 @@ msgstr "Bibliografie"
 #| "org/'>Free Software</a> only.<br> Report issues with this website to <a "
 #| "href='contact.html'>us</a>."
 msgid ""
-"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2015 &mdash; 2019. <!-- "
+"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2001 &mdash; 2019. <!-- "
 "This just takes up space no one is interested in: --> <!-- This page was "
 "created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> --> "
 "<a href='https://git.gnunet.org/www.git'>Source code of this site.</a> <a "
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index f53f66de..7035c2d4 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -45,7 +45,7 @@ msgstr ""
 
 #: common/footer.j2.inc:31
 msgid ""
-"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2015 &mdash; 2019. <!-- "
+"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2001 &mdash; 2019. <!-- "
 "This just takes up space no one is interested in: --> <!-- This page was "
 "created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> --> "
 "<a href='https://git.gnunet.org/www.git'>Source code of this site.</a> <a "
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 7aec0d2a..41da637d 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-06-30 18:17+0200\n"
+"POT-Creation-Date: 2019-07-01 15:53+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"
@@ -65,7 +65,7 @@ msgstr "Bibliografía"
 
 #: common/footer.j2.inc:31
 msgid ""
-"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2015 &mdash; 2019. <!-- "
+"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2001 &mdash; 2019. <!-- "
 "This just takes up space no one is interested in: --> <!-- This page was "
 "created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> --> "
 "<a href='https://git.gnunet.org/www.git'>Source code of this site.</a> <a "
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 16c4cba9..71a63c8b 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-06-30 18:17+0200\n"
+"POT-Creation-Date: 2019-07-01 15:53+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"
@@ -65,7 +65,7 @@ msgstr ""
 
 #: common/footer.j2.inc:31
 msgid ""
-"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2015 &mdash; 2019. <!-- "
+"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2001 &mdash; 2019. <!-- "
 "This just takes up space no one is interested in: --> <!-- This page was "
 "created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> --> "
 "<a href='https://git.gnunet.org/www.git'>Source code of this site.</a> <a "
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index dfa0c024..9d78309b 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-06-30 18:17+0200\n"
+"POT-Creation-Date: 2019-07-01 15:53+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"
@@ -65,7 +65,7 @@ msgstr ""
 
 #: common/footer.j2.inc:31
 msgid ""
-"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2015 &mdash; 2019. <!-- "
+"Copyright &copy; <a href=\"ev.html\">GNUnet e.V.</a> 2001 &mdash; 2019. <!-- "
 "This just takes up space no one is interested in: --> <!-- This page was "
 "created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> --> "
 "<a href='https://git.gnunet.org/www.git'>Source code of this site.</a> <a "
diff --git a/template/use.html.j2 b/template/use.html.j2
index b417fd5c..3169ae71 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -376,7 +376,7 @@
   <section>
     <h4>{{ _("Conversation") }}</h4>
     <p>
-      TBD, see <a href="hhttps://docs.gnunet.org/#First-steps-_002d-Using-GNUnet-Conversation">chapter "Using GNUnet Conversation" in the handbook.</a>
+      TBD, see <a href="https://docs.gnunet.org/#First-steps-_002d-Using-GNUnet-Conversation">chapter "Using GNUnet Conversation" in the handbook.</a>
     </p>
   </section>
 </article>
-- 
cgit v1.2.3


From 4413047bfa418e0ae2ea73f20798e3bfd7e0db3b Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 20:33:36 +0200
Subject: add menu to use.html; improve menu on gsoc.html; shorten long string

---
 static/styles.sass    |   4 +
 template/gsoc.html.j2 |   2 +-
 template/use.html.j2  | 716 ++++++++++++++++++++++++++------------------------
 3 files changed, 371 insertions(+), 351 deletions(-)

diff --git a/static/styles.sass b/static/styles.sass
index 86bfc461..8fecbf00 100644
--- a/static/styles.sass
+++ b/static/styles.sass
@@ -289,3 +289,7 @@ header
     &:link, &:visited
       color: #419edb !important
 
+h1,h2,h3,h4,h5,h6
+  a 
+    position: relative
+    top: -80px
diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index 9b378f3b..ad8c8655 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -18,7 +18,7 @@
   </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>
diff --git a/template/use.html.j2 b/template/use.html.j2
index 3169ae71..472d0f8f 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -6,378 +6,394 @@
     <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"></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"></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"></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
+         </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>
-    <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"></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"></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"></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"></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 %}
-- 
cgit v1.2.3


From 835f146b20daeae7c9da2f438486f881c302e47f Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 20:53:11 +0200
Subject: fix links for subnav

---
 static/styles.sass    | 11 ++++++-----
 template/gsoc.html.j2 |  6 +++---
 template/use.html.j2  | 14 +++++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/static/styles.sass b/static/styles.sass
index 8fecbf00..8309ebf7 100644
--- a/static/styles.sass
+++ b/static/styles.sass
@@ -284,12 +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
-
-h1,h2,h3,h4,h5,h6
-  a 
-    position: relative
-    top: -80px
+a.subnav-anchor
+  position: relative
+  top: -80px
diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index ad8c8655..1f5d4f0b 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -27,7 +27,7 @@
     </div>
     <div class="col">
 
-  <h2>{{ _("Current projects (2019)") }}<a name="current"></a></h2>
+  <h2><a name="current" class="subnav-anchor"></a>{{ _("Current projects (2019)") }}</h2>
   <section>
     <h4>Android Port</h4>
     <p>
@@ -177,7 +177,7 @@
     </p>
   </section>
   <!-- Past projects: Previously proposed, but left unfinished. Inspiration for students. -->
-  <h2>{{ _("Past projects") }}<a name="past"></a></h2>
+  <h2><a name="past" class="subnav-anchor"></a>{{ _("Past projects") }}</h2>
   <section>
     <h4>Rust APIs for GNUnet services</h4>
     <p>
@@ -565,7 +565,7 @@
       {% endtrans %}
     </p>
   </section>
-  <h2>{{ _("Finished projects") }}<a name="finished"></a></h2>
+  <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>
diff --git a/template/use.html.j2 b/template/use.html.j2
index 472d0f8f..e420a392 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -61,7 +61,7 @@
 
 
       <section>
-        <h3><a name="filesharing"></a>{{ _("Filesharing") }}</h3>
+        <h3><a name="filesharing" class="subnav-anchor"></a>{{ _("Filesharing") }}</h3>
 
         <p>
           Let's publish a file in the GNUnet filesharing network. We use the keywords
@@ -102,7 +102,7 @@
 
 
       <section>
-        <h3><a name="cadet"></a>{{ _("CADET (and Chat)") }}</h3>
+        <h3><a name="cadet" class="subnav-anchor"></a>{{ _("CADET (and Chat)") }}</h3>
 
         <p>
           We can use the `gnunet-cadet` command line tool to open a port and from
@@ -136,7 +136,7 @@
       </section>
 
       <section>
-        <h3><a name="groupchat"></a>{{ _("Chatting with a (simple) client") }}</h3>
+        <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
@@ -178,7 +178,7 @@
 
 
       <section>
-        <h3><a name="gns_cli"></a>{{ _("Name resolution using GNS on the command line") }}</h3>
+        <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
@@ -250,7 +250,7 @@
 
 
       <section id='gns_proxy'>
-        <h3><a name="gns_browser"></a>{{ _("Name resolution using GNS with a browser") }}</h3>
+        <h3><a name="gns_browser" class="subnav-anchor"></a>{{ _("Name resolution using GNS with a browser") }}</h3>
 
         <p>
           In the previous use case "Name resolution using GNS on the command line" we got an idea
@@ -327,7 +327,7 @@
         </p>
       </section>
       <section>
-        <h3><a name="vpn"></a>{{ _("VPN") }}</h3>
+        <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>
@@ -388,7 +388,7 @@
         </p>
       </section>
       <section>
-        <h3><a name="conversation"></a>{{ _("Conversation") }}</h3>
+        <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>
-- 
cgit v1.2.3


From 24cb4505eda6be33bf8dc499421e24e209e69f90 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 20:53:36 +0200
Subject: install.html: fix layout

---
 template/install.html.j2 | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/template/install.html.j2 b/template/install.html.j2
index ecec1363..ec2a1abb 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">
       {% 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">
       {% 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 – 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-3">
       <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-3">
       <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-3">
       <!-- 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>
-- 
cgit v1.2.3


From 727b28c5abeade5ee8b7a4adee76aa6e004616d7 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 21:08:48 +0200
Subject: gsoc.html: indent

---
 template/gsoc.html.j2 | 1157 +++++++++++++++++++++++++------------------------
 1 file changed, 579 insertions(+), 578 deletions(-)

diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index 1f5d4f0b..5104e516 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -6,17 +6,6 @@
     <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 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">
@@ -27,580 +16,592 @@
     </div>
     <div class="col">
 
-  <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>
+        <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><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>
+      <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>
-- 
cgit v1.2.3


From 2f9e24265245b4ecb366e41ed9f8772410bf178c Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 21:29:46 +0200
Subject: update po-files

---
 locale/de/LC_MESSAGES/messages.po | 391 ++++++++++++++++++++------------------
 locale/en/LC_MESSAGES/messages.po | 381 +++++++++++++++++++------------------
 locale/es/LC_MESSAGES/messages.po | 385 +++++++++++++++++++------------------
 locale/fr/LC_MESSAGES/messages.po | 383 +++++++++++++++++++------------------
 locale/it/LC_MESSAGES/messages.po | 310 +++++++++++++++---------------
 5 files changed, 968 insertions(+), 882 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 72590d9c..70e279bb 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-01 21:27+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"
@@ -119,7 +119,7 @@ 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"
 
@@ -535,7 +535,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 +576,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 +590,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 +629,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 +654,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 +764,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 +776,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 +792,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 +814,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 +828,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 +851,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 +866,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 +885,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 +898,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 +1011,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 +1060,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 +1074,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 +1093,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 +1115,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 +1131,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 +1150,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 +1177,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 +1195,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 +1207,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 +1252,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 +1265,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 +1290,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 +1310,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 +1319,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 +1353,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 +1368,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 ""
@@ -1630,127 +1636,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 +1769,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 – 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 +1870,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:330
+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:391
+#, 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:181
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:253
+msgid "Name resolution using GNS with a browser"
 msgstr ""
 
 #: template/video.html.j2:6
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 7035c2d4..7f895cfb 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -88,7 +88,7 @@ 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 ""
 
@@ -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 ""
@@ -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  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:330
+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:391
+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:181
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:253
+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..2aa437ca 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-01 21:27+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"
@@ -108,7 +108,7 @@ 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"
 
@@ -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,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 +561,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 +600,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 +625,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 +735,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 +747,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 +763,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 +785,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 +799,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 +822,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 +837,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 +856,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 +869,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 +982,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 +1031,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 +1045,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 +1064,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 +1086,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 +1102,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 +1121,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 +1148,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 +1166,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 +1178,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 +1223,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 +1236,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 +1261,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 +1281,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 +1290,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 +1324,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 +1339,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 ""
@@ -1601,125 +1607,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 +1738,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 – 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 +1839,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:330
+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:391
+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:181
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:253
+msgid "Name resolution using GNS with a browser"
 msgstr ""
 
 #: template/video.html.j2:6
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 71a63c8b..d87944ba 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-01 21:27+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"
@@ -108,7 +108,7 @@ 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 ""
 
@@ -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 ""
@@ -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 – 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:330
+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:391
+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:181
+msgid "Name resolution using GNS on the command line"
+msgstr ""
+
+#: template/use.html.j2:253
+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 d348b01b..ffc07606 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 20:30+0200\n"
+"POT-Creation-Date: 2019-07-01 21:27+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"
@@ -108,7 +108,7 @@ 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 ""
 
@@ -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 ""
@@ -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 ""
 
-- 
cgit v1.2.3


From abe13cf5cbbbb6e60dcb286cfb8955bf01b0e9f3 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 21:30:33 +0200
Subject: simplify, unify, check responsiveness

---
 template/architecture.html.j2          |  12 +-
 template/engage.html.j2                |   8 +-
 template/ev.html.j2                    |  85 ++++++------
 template/gnurl.html.j2                 |  28 ++--
 template/index.html.j2                 |   2 +-
 template/install-on-archpi.html.j2     | 246 +++++++++++++++++----------------
 template/install-on-debian9.html.j2    |  47 +++----
 template/install-on-macos.html.j2      |  25 ++--
 template/install-on-netbsd.html.j2     |  20 +--
 template/install-on-ubuntu1804.html.j2 |  63 +++------
 template/install.html.j2               |  20 ++-
 11 files changed, 271 insertions(+), 285 deletions(-)

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..4049c8dd 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,7 +39,7 @@
         </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>.
@@ -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/index.html.j2 b/template/index.html.j2
index 2f0030a1..2d06f69b 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">
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 ec2a1abb..9911c974 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -7,7 +7,7 @@
   </header>
 
   <div class="row container justify-content-center">
-    <div class="col">
+    <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>
@@ -15,7 +15,7 @@
       <a href="https://gnunet.org/en/use">Check this out!</a> </p>
       {% endtrans %}
     </div>
-    <div class="col">
+    <div class="col-md">
       {% trans %}
       <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 
@@ -28,15 +28,15 @@
   </div>
 
   <div class="row container justify-content-center text-center">
-    <div class="col-md-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-md-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-md-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>
@@ -44,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>
-- 
cgit v1.2.3


From eebae0f2c18f9b4aedde0fd8209ebac5eee050cf Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 21:38:22 +0200
Subject: html encode dashes to satisfy po localization

---
 locale/de/LC_MESSAGES/messages.po | 20 ++++++++++----------
 locale/en/LC_MESSAGES/messages.po | 18 +++++++++---------
 locale/es/LC_MESSAGES/messages.po | 20 ++++++++++----------
 locale/fr/LC_MESSAGES/messages.po | 20 ++++++++++----------
 locale/it/LC_MESSAGES/messages.po | 20 ++++++++++----------
 template/about.html.j2            |  2 +-
 template/index.html.j2            |  2 +-
 template/install.html.j2          |  2 +-
 8 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 70e279bb..d63304cf 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 21:27+0200\n"
+"POT-Creation-Date: 2019-07-01 21:37+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"
@@ -301,8 +301,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
@@ -1541,7 +1541,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
@@ -1776,12 +1776,12 @@ msgstr ""
 #: template/install.html.j2:19
 msgid ""
 "<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>"
+"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
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 7f895cfb..a608f503 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -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
@@ -1486,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
@@ -1719,12 +1719,12 @@ msgstr ""
 #: template/install.html.j2:19
 msgid ""
 "<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>"
+"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
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 2aa437ca..2c66e9e0 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 21:27+0200\n"
+"POT-Creation-Date: 2019-07-01 21:37+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"
@@ -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
@@ -1512,7 +1512,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
@@ -1745,12 +1745,12 @@ msgstr ""
 #: template/install.html.j2:19
 msgid ""
 "<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>"
+"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
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index d87944ba..76e0c5ab 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 21:27+0200\n"
+"POT-Creation-Date: 2019-07-01 21:37+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"
@@ -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
@@ -1506,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
@@ -1739,12 +1739,12 @@ msgstr ""
 #: template/install.html.j2:19
 msgid ""
 "<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>"
+"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
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index ffc07606..8cfcbeda 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 21:27+0200\n"
+"POT-Creation-Date: 2019-07-01 21:37+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"
@@ -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
@@ -1506,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
@@ -1739,12 +1739,12 @@ msgstr ""
 #: template/install.html.j2:19
 msgid ""
 "<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>"
+"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
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/index.html.j2 b/template/index.html.j2
index 2d06f69b..110fad0e 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -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.html.j2 b/template/install.html.j2
index 9911c974..84c581a5 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -18,7 +18,7 @@
     <div class="col-md">
       {% trans %}
       <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 
+      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>
-- 
cgit v1.2.3


From 65682f907fd499aebc6d4d7cacaa3b56809da700 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 22:28:01 +0200
Subject: proposal for relocating C-Tutorial

---
 common/navigation.j2.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 33c5e107..8e134e22 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -65,6 +65,7 @@
           <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>
           <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,7 +85,6 @@
           <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>
 	</ul>
-- 
cgit v1.2.3


From 5532c8cc646c9ca3079e3d61578fd6f2fd504ae8 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Mon, 1 Jul 2019 22:38:42 +0200
Subject: fix typo

---
 template/engage.html.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 4049c8dd..ceeff7b8 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -46,7 +46,7 @@
      </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>
-- 
cgit v1.2.3


From fc19d5f77bf8f86a7084aa1943925bac0360df9a Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Tue, 2 Jul 2019 00:27:58 +0200
Subject: test new layout for bibliography list

---
 common/navigation.j2.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 8e134e22..9041f87b 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -86,7 +86,7 @@
 	  <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" 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>
-- 
cgit v1.2.3


From 9e82ec335a7aafd3ce4afd2f680361e0ae57cf3c Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Mon, 1 Jul 2019 22:43:26 +0000
Subject: new image, cropped already but still "big". Fits more into the
 general theme of the website.

---
 static/team-images/ng0.jpg | Bin 9653 -> 2298873 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/static/team-images/ng0.jpg b/static/team-images/ng0.jpg
index 1ca8faef..ad56aaed 100644
Binary files a/static/team-images/ng0.jpg and b/static/team-images/ng0.jpg differ
-- 
cgit v1.2.3


From 002866441739cd6a42c4d858d8fb24d69c329168 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Tue, 2 Jul 2019 00:51:39 +0200
Subject: nav: comment CI menu entry

---
 common/navigation.j2.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 9041f87b..8384a6ca 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -64,7 +64,10 @@
           <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>
-- 
cgit v1.2.3


From 56a25a9122b695ec02c5f67c5725fb70a284af10 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Tue, 2 Jul 2019 21:28:37 +0200
Subject: add alternativ groupchat address

---
 template/use.html.j2 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/template/use.html.j2 b/template/use.html.j2
index e420a392..2a4e4c3b 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -155,11 +155,13 @@
          </p>
          <p>
          <code>
-              $LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat --config=/path/to/gnunet.conf --server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss --nick=YOURNICK
+               $ 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 online and running groupchat on that port.
+              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>
-- 
cgit v1.2.3


From efd0d1188186623ec8bc90d95a92a82b202b5c64 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Tue, 2 Jul 2019 21:28:41 +0200
Subject: update po-files

---
 locale/de/LC_MESSAGES/messages.po | 43 ++++++++++++++++++++++-----------------
 locale/en/LC_MESSAGES/messages.po | 36 ++++++++++++++++----------------
 locale/es/LC_MESSAGES/messages.po | 43 ++++++++++++++++++++++-----------------
 locale/fr/LC_MESSAGES/messages.po | 38 +++++++++++++++++-----------------
 locale/it/LC_MESSAGES/messages.po | 38 +++++++++++++++++-----------------
 5 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index d63304cf..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 21:37+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"
@@ -123,40 +123,42 @@ msgstr "Systemarchitektur"
 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"
 
@@ -1890,11 +1892,11 @@ msgstr ""
 msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
 msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
 #, fuzzy
 #| msgid "Motivation"
 msgid "Conversation"
@@ -1916,11 +1918,11 @@ msgstr ""
 msgid "Chatting with a (simple) client"
 msgstr ""
 
-#: template/use.html.j2:181
+#: template/use.html.j2:183
 msgid "Name resolution using GNS on the command line"
 msgstr ""
 
-#: template/use.html.j2:253
+#: template/use.html.j2:255
 msgid "Name resolution using GNS with a browser"
 msgstr ""
 
@@ -1964,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 a608f503..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 ""
@@ -92,40 +92,40 @@ msgstr ""
 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 ""
 
@@ -1833,11 +1833,11 @@ msgstr ""
 msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
 msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
 msgid "Conversation"
 msgstr ""
 
@@ -1857,11 +1857,11 @@ msgstr ""
 msgid "Chatting with a (simple) client"
 msgstr ""
 
-#: template/use.html.j2:181
+#: template/use.html.j2:183
 msgid "Name resolution using GNS on the command line"
 msgstr ""
 
-#: template/use.html.j2:253
+#: template/use.html.j2:255
 msgid "Name resolution using GNS with a browser"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 2c66e9e0..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 21:37+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"
@@ -112,40 +112,42 @@ msgstr "Architectura del sistema"
 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"
 
@@ -1859,11 +1861,11 @@ msgstr ""
 msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
 msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
 msgid "Conversation"
 msgstr ""
 
@@ -1883,11 +1885,11 @@ msgstr ""
 msgid "Chatting with a (simple) client"
 msgstr ""
 
-#: template/use.html.j2:181
+#: template/use.html.j2:183
 msgid "Name resolution using GNS on the command line"
 msgstr ""
 
-#: template/use.html.j2:253
+#: template/use.html.j2:255
 msgid "Name resolution using GNS with a browser"
 msgstr ""
 
@@ -1930,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 76e0c5ab..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 21:37+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 ""
@@ -112,40 +112,40 @@ msgstr ""
 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 ""
 
@@ -1853,11 +1853,11 @@ msgstr ""
 msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
 msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
 msgid "Conversation"
 msgstr ""
 
@@ -1877,11 +1877,11 @@ msgstr ""
 msgid "Chatting with a (simple) client"
 msgstr ""
 
-#: template/use.html.j2:181
+#: template/use.html.j2:183
 msgid "Name resolution using GNS on the command line"
 msgstr ""
 
-#: template/use.html.j2:253
+#: template/use.html.j2:255
 msgid "Name resolution using GNS with a browser"
 msgstr ""
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 8cfcbeda..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 21:37+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 ""
@@ -112,40 +112,40 @@ msgstr ""
 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 ""
 
@@ -1853,11 +1853,11 @@ msgstr ""
 msgid "GNS with Browser"
 msgstr ""
 
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
 msgid "VPN"
 msgstr ""
 
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
 msgid "Conversation"
 msgstr ""
 
@@ -1877,11 +1877,11 @@ msgstr ""
 msgid "Chatting with a (simple) client"
 msgstr ""
 
-#: template/use.html.j2:181
+#: template/use.html.j2:183
 msgid "Name resolution using GNS on the command line"
 msgstr ""
 
-#: template/use.html.j2:253
+#: template/use.html.j2:255
 msgid "Name resolution using GNS with a browser"
 msgstr ""
 
-- 
cgit v1.2.3


From 8a6075078cd825442e5c25c16b416463393bf646 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Wed, 3 Jul 2019 10:00:07 +0000
Subject: Attempt to fix /gsoc 404 without touching httpd

---
 Makefile                          |  1 +
 locale/de/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 locale/es/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 locale/fr/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 locale/it/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 5 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 5424e812..de240dbd 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ all: css locale template
 	cp rss.xml rendered/it/rss.xml
 	cp static/moved.html rendered/frontpage.html
 	cd rendered; ln -fs frontpage.html frontpage
+	cd rendered; ln -fs en/gsoc.html gsoc
 
 # Extract translateable strings from jinja2 templates.
 # Because of the local i18nfix extractor module we need
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 1e18398b..adbc2485 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-03 09:58+0000\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"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1642,8 +1642,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1674,20 +1675,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1750,11 +1754,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 0e214e84..df75e6f4 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-03 09:58+0000\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"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1613,8 +1613,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1645,20 +1646,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1719,11 +1723,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index c4a188ed..826594ae 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-03 09:58+0000\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"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1605,8 +1605,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1637,20 +1638,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1711,11 +1715,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 5be199b3..44e25cdc 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-03 09:58+0000\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"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1605,8 +1605,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1637,20 +1638,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1711,11 +1715,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
-- 
cgit v1.2.3


From dfbaa3b541e8ed899f2a2ec98efab755a7d5acd1 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Wed, 3 Jul 2019 10:05:00 +0000
Subject: Make yet another redirect page.

---
 Makefile               |  3 ++-
 static/moved_gsoc.html | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 static/moved_gsoc.html

diff --git a/Makefile b/Makefile
index de240dbd..066fdfaa 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,8 @@ all: css locale template
 	cp rss.xml rendered/it/rss.xml
 	cp static/moved.html rendered/frontpage.html
 	cd rendered; ln -fs frontpage.html frontpage
-	cd rendered; ln -fs en/gsoc.html gsoc
+	cp static/moved_gsoc.html rendered/gsoc.html
+	cd rendered; ln -fs gsoc.html gsoc
 
 # Extract translateable strings from jinja2 templates.
 # Because of the local i18nfix extractor module we need
diff --git a/static/moved_gsoc.html b/static/moved_gsoc.html
new file mode 100644
index 00000000..c8b45bfe
--- /dev/null
+++ b/static/moved_gsoc.html
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <meta http-equiv="refresh" content="2;url=https://gnunet.org/en/gsoc.html" />
+    <title>Page Moved</title>
+  </head>
+  <body>
+    <!-- 
+         Hint, hint: server side aliases and redirects are good. Don't
+         make me add more pages like this.
+      -->
+    This page has moved. Click <a href="https://gnunet.org/en/gsoc.html">here</a> to go to the new page.
+  </body>
+</html>
-- 
cgit v1.2.3


From 09a396d964c921fb5a746439ac71a3bc9bacd835 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Wed, 3 Jul 2019 10:23:17 +0000
Subject: node/397 -> about

---
 Makefile                |  2 ++
 static/moved_about.html | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 static/moved_about.html

diff --git a/Makefile b/Makefile
index 066fdfaa..09c7c95a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,8 @@ all: css locale template
 	cd rendered; ln -fs frontpage.html frontpage
 	cp static/moved_gsoc.html rendered/gsoc.html
 	cd rendered; ln -fs gsoc.html gsoc
+	mkdir rendered/node ; cp static/moved_about.html rendered/node/about.html
+	cd rendered/node ; ln -fs about.html 397
 
 # Extract translateable strings from jinja2 templates.
 # Because of the local i18nfix extractor module we need
diff --git a/static/moved_about.html b/static/moved_about.html
new file mode 100644
index 00000000..0ff90e57
--- /dev/null
+++ b/static/moved_about.html
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <meta http-equiv="refresh" content="2;url=https://gnunet.org/en/about.html" />
+    <title>Page Moved</title>
+  </head>
+  <body>
+    <!-- 
+         Hint, hint: server side aliases and redirects are good. Don't
+         make me add more pages like this.
+      -->
+    This page has moved. Click <a href="https://gnunet.org/en/about.html">here</a> to go to the new page.
+  </body>
+</html>
-- 
cgit v1.2.3


From d03beed61530fc873a95a6bc16d34a6119507704 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Wed, 3 Jul 2019 10:27:24 +0000
Subject: proposal: link to matthew green's post about "the network is
 hostile"? Might be a bit too much for the /about page? But we get a proof for
 the quote and show that we are not fabricating truths.

---
 locale/de/LC_MESSAGES/messages.po |  6 ++++--
 locale/en/LC_MESSAGES/messages.po | 24 ++++++++++++++++--------
 locale/es/LC_MESSAGES/messages.po |  6 ++++--
 locale/fr/LC_MESSAGES/messages.po |  6 ++++--
 locale/it/LC_MESSAGES/messages.po |  6 ++++--
 template/about.html.j2            | 10 +++++-----
 6 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index adbc2485..d2d63c7e 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-03 09:58+0000\n"
+"POT-Creation-Date: 2019-07-03 10:26+0000\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"
@@ -191,7 +191,9 @@ msgid ""
 "Due to fundamental Internet design choices, Internet traffic can be "
 "misdirected, intercepted, censored and manipulated by hostile routers on the "
 "network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog."
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
 msgstr ""
 
 #: template/about.html.j2:41
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 52af3aae..5d937df1 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -156,7 +156,9 @@ msgid ""
 "Due to fundamental Internet design choices, Internet traffic can be "
 "misdirected, intercepted, censored and manipulated by hostile routers on the "
 "network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog."
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
 msgstr ""
 
 #: template/about.html.j2:41
@@ -1585,8 +1587,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1617,20 +1620,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1691,11 +1697,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index df75e6f4..a715b2cc 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-03 09:58+0000\n"
+"POT-Creation-Date: 2019-07-03 10:26+0000\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"
@@ -178,7 +178,9 @@ msgid ""
 "Due to fundamental Internet design choices, Internet traffic can be "
 "misdirected, intercepted, censored and manipulated by hostile routers on the "
 "network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog."
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
 msgstr ""
 
 #: template/about.html.j2:41
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 826594ae..c1be1b98 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-03 09:58+0000\n"
+"POT-Creation-Date: 2019-07-03 10:26+0000\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"
@@ -176,7 +176,9 @@ msgid ""
 "Due to fundamental Internet design choices, Internet traffic can be "
 "misdirected, intercepted, censored and manipulated by hostile routers on the "
 "network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog."
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
 msgstr ""
 
 #: template/about.html.j2:41
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 44e25cdc..99298a3b 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-03 09:58+0000\n"
+"POT-Creation-Date: 2019-07-03 10:26+0000\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"
@@ -176,7 +176,9 @@ msgid ""
 "Due to fundamental Internet design choices, Internet traffic can be "
 "misdirected, intercepted, censored and manipulated by hostile routers on the "
 "network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog."
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
 msgstr ""
 
 #: template/about.html.j2:41
diff --git a/template/about.html.j2 b/template/about.html.j2
index 16d42b44..685f5217 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -30,11 +30,11 @@
       </p>
       <p>
 	{% trans %}
-	Due to fundamental Internet design choices, Internet traffic can be
-	misdirected, intercepted, censored and manipulated by hostile routers
-	on the network. And indeed, the modern Internet has evolved exactly
-	to the point where, as Matthew Green put it, ``the network is
-	hostile''.
+	  Due to fundamental Internet design choices, Internet traffic can be
+	  misdirected, intercepted, censored and manipulated by hostile routers
+	  on the network. And indeed, the modern Internet has evolved exactly
+	  to the point where, as Matthew Green put it,
+          <a href="https://blog.cryptographyengineering.com/2015/08/16/the-network-is-hostile/">"the network is hostile"</a>.
 	{% endtrans %}
       </p>
       <p>
-- 
cgit v1.2.3


From bbe8d65b5937cad8b510de36b264f4dced947906 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Wed, 3 Jul 2019 10:35:56 +0000
Subject: philosophy -> about

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 09c7c95a..50fbc8a4 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,8 @@ all: css locale template
 	cd rendered; ln -fs gsoc.html gsoc
 	mkdir rendered/node ; cp static/moved_about.html rendered/node/about.html
 	cd rendered/node ; ln -fs about.html 397
+	cp static/moved_about.html rendered/about.html
+	cd rendered ; ln -fs about.html philosophy
 
 # Extract translateable strings from jinja2 templates.
 # Because of the local i18nfix extractor module we need
-- 
cgit v1.2.3


From 69ca839724b371a0fd9934333ef99b4f40a21829 Mon Sep 17 00:00:00 2001
From: mu <mu@m.m>
Date: Thu, 4 Jul 2019 14:11:14 +0200
Subject: fixed broken link in use/filesharing --sva

---
 locale/de/LC_MESSAGES/messages.po | 24 +++++++++---------------
 locale/es/LC_MESSAGES/messages.po | 24 +++++++++---------------
 locale/fr/LC_MESSAGES/messages.po | 24 +++++++++---------------
 locale/it/LC_MESSAGES/messages.po | 24 +++++++++---------------
 template/use.html.j2              |  4 ++--
 5 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index d2d63c7e..5347d54e 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-03 10:26+0000\n"
+"POT-Creation-Date: 2019-07-04 14:09+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"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1644,9 +1644,8 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1677,23 +1676,20 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59
-#: template/install-on-macos.html.j2:147
+#: 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:78
-#: template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167
-#: template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1756,13 +1752,11 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122
-#: template/install-on-netbsd.html.j2:182
+#: 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:200
-#: template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index a715b2cc..c4743fc5 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-03 10:26+0000\n"
+"POT-Creation-Date: 2019-07-04 14:09+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"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1615,9 +1615,8 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1648,23 +1647,20 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59
-#: template/install-on-macos.html.j2:147
+#: 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:78
-#: template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167
-#: template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1725,13 +1721,11 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122
-#: template/install-on-netbsd.html.j2:182
+#: 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:200
-#: template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index c1be1b98..273efc00 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-03 10:26+0000\n"
+"POT-Creation-Date: 2019-07-04 14:09+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"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1607,9 +1607,8 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1640,23 +1639,20 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59
-#: template/install-on-macos.html.j2:147
+#: 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:78
-#: template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167
-#: template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1717,13 +1713,11 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122
-#: template/install-on-netbsd.html.j2:182
+#: 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:200
-#: template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 99298a3b..57bd3e85 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-03 10:26+0000\n"
+"POT-Creation-Date: 2019-07-04 14:09+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"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1607,9 +1607,8 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1640,23 +1639,20 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59
-#: template/install-on-macos.html.j2:147
+#: 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:78
-#: template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167
-#: template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1717,13 +1713,11 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122
-#: template/install-on-netbsd.html.j2:182
+#: 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:200
-#: template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/template/use.html.j2 b/template/use.html.j2
index 2a4e4c3b..b4f2fdc8 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -94,8 +94,8 @@
           ostrom.pdf)!
         </p>
         <p>
-          Please also refer to the chapter on <a href="=> https://docs.gnunet.org/#File_002dsharing
-      ">filesharing in the handbook</a>.
+          Please also refer to the chapter on 
+	<a href="https://docs.gnunet.org/#File_002dsharing">filesharing in the handbook</a>.
 
       </section>
 
-- 
cgit v1.2.3


From 38162103eb01271eb7195bf92be9c48adc7eb243 Mon Sep 17 00:00:00 2001
From: "psyc://loupsycedyglgamf.onion/~lynX"
 <ircs://psyced.org/youbroketheinternet>
Date: Thu, 4 Jul 2019 12:11:15 +0000
Subject: -dig fooding

---
 locale/de/LC_MESSAGES/messages.po | 2 +-
 locale/en/LC_MESSAGES/messages.po | 2 +-
 locale/es/LC_MESSAGES/messages.po | 2 +-
 locale/fr/LC_MESSAGES/messages.po | 2 +-
 locale/it/LC_MESSAGES/messages.po | 2 +-
 news/2019-06-DSTJ.inc             | 4 ++--
 news/2019-06.inc                  | 2 +-
 template/index.html.j2            | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 5347d54e..6adda3aa 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1403,7 +1403,7 @@ msgstr ""
 
 #: template/index.html.j2:31
 msgid ""
-"GNUnet is made for an free and open society: It's a self-organizing network "
+"GNUnet is made for a free and open society: It's a self-organizing network "
 "and it is <a href=\"http://www.gnu.org/philosophy/free-sw.html\">free "
 "software</a> as in freedom. GNUnet puts you in control of your data. You "
 "determine which data to share with whom, and you're not pressured to accept "
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 5d937df1..aea33af2 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -1348,7 +1348,7 @@ msgstr ""
 
 #: template/index.html.j2:31
 msgid ""
-"GNUnet is made for an free and open society: It's a self-organizing network "
+"GNUnet is made for a free and open society: It's a self-organizing network "
 "and it is <a href=\"http://www.gnu.org/philosophy/free-sw.html\">free "
 "software</a> as in freedom. GNUnet puts you in control of your data. You "
 "determine which data to share with whom, and you're not pressured to accept "
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index c4743fc5..a1470f57 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1374,7 +1374,7 @@ msgstr ""
 
 #: template/index.html.j2:31
 msgid ""
-"GNUnet is made for an free and open society: It's a self-organizing network "
+"GNUnet is made for a free and open society: It's a self-organizing network "
 "and it is <a href=\"http://www.gnu.org/philosophy/free-sw.html\">free "
 "software</a> as in freedom. GNUnet puts you in control of your data. You "
 "determine which data to share with whom, and you're not pressured to accept "
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 273efc00..863ea7fc 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1368,7 +1368,7 @@ msgstr ""
 
 #: template/index.html.j2:31
 msgid ""
-"GNUnet is made for an free and open society: It's a self-organizing network "
+"GNUnet is made for a free and open society: It's a self-organizing network "
 "and it is <a href=\"http://www.gnu.org/philosophy/free-sw.html\">free "
 "software</a> as in freedom. GNUnet puts you in control of your data. You "
 "determine which data to share with whom, and you're not pressured to accept "
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 57bd3e85..79ddc4f8 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -1368,7 +1368,7 @@ msgstr ""
 
 #: template/index.html.j2:31
 msgid ""
-"GNUnet is made for an free and open society: It's a self-organizing network "
+"GNUnet is made for a free and open society: It's a self-organizing network "
 "and it is <a href=\"http://www.gnu.org/philosophy/free-sw.html\">free "
 "software</a> as in freedom. GNUnet puts you in control of your data. You "
 "determine which data to share with whom, and you're not pressured to accept "
diff --git a/news/2019-06-DSTJ.inc b/news/2019-06-DSTJ.inc
index cfe3f357..0e766db8 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>
+  <h3><a name="DSTJ">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 <tt>DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt> from the system. Here are two strategies to find copies of the respective file:
   </p>
   <p>
     <ol>
-      <li><tt>$ find / -name DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt></li>
       <li><tt>$ locate DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt></li>
+      <li><tt>$ find / -name DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt></li>
     </ol>
   </p>
 </article>
diff --git a/news/2019-06.inc b/news/2019-06.inc
index 1fc92ad6..dcc23887 100644
--- a/news/2019-06.inc
+++ b/news/2019-06.inc
@@ -1,7 +1,7 @@
 <article>
   <h3>2019-06-28: GNUnet Hacker Meeting 2019 at <a href="https://decentrale.ch">La Décentrale, Switzerland</a></h3>
   <p>
-    The members of the GNUnet community met again in the wonderful souroundings of St. Imier to hack on GNUnet. New people joined our sessions until late at night. From bug squashing to dog fooding, from workshops to theoretical discussions of new services and usecases. And of course, pizza was in the game. 
+    The members of the GNUnet community met again in the wonderful souroundings of St. Imier to hack on GNUnet. New people joined our sessions until late at night. From bug squashing to digging our own dog food, from workshops to theoretical discussions of new services and usecases. And of course, pizza was in the game. 
   </p>
 </article>
 
diff --git a/template/index.html.j2 b/template/index.html.j2
index 110fad0e..b1369086 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -29,7 +29,7 @@
         {% endtrans %}
         <br><br>
         {% trans %}
-        GNUnet is made for an free and open society: It's a self-organizing
+        GNUnet is made for a free and open society: It's a self-organizing
         network and it is
         <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>
         as in freedom. GNUnet puts you in control of your data. You
-- 
cgit v1.2.3


From a0c4ffb06c763eb23db24e7ff9a2a22f105769c6 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Thu, 4 Jul 2019 17:38:40 +0000
Subject: add link to openpgp to my profile.

---
 locale/de/LC_MESSAGES/messages.po | 16 ++++++++--------
 locale/en/LC_MESSAGES/messages.po | 14 +++++++-------
 locale/es/LC_MESSAGES/messages.po | 16 ++++++++--------
 locale/fr/LC_MESSAGES/messages.po | 16 ++++++++--------
 locale/it/LC_MESSAGES/messages.po | 16 ++++++++--------
 template/team.html.j2             |  1 +
 6 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 6adda3aa..a823e3ca 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-04 14:09+0200\n"
+"POT-Creation-Date: 2019-07-04 17:37+0000\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"
@@ -1832,7 +1832,7 @@ msgstr ""
 msgid "Random peer sampling"
 msgstr ""
 
-#: template/team.html.j2:75 template/team.html.j2:109
+#: template/team.html.j2:75 template/team.html.j2:110
 msgid "W32 port."
 msgstr ""
 
@@ -1844,29 +1844,29 @@ msgstr ""
 msgid "GNU Name System, Identity Management, ABE."
 msgstr ""
 
-#: template/team.html.j2:103
+#: template/team.html.j2:104
 msgid ""
 "Documentation, Website, libgnurl maintainer, System Integration, Build "
 "System, some admin roles, packaging (NetBSD pkgsrc, Guix, Gentoo)."
 msgstr ""
 
-#: template/team.html.j2:120
+#: template/team.html.j2:121
 msgid "Testbed, voice."
 msgstr ""
 
-#: template/team.html.j2:130
+#: template/team.html.j2:131
 msgid "Secushare, Social, PSYC, Multicast."
 msgstr ""
 
-#: template/team.html.j2:136
+#: template/team.html.j2:137
 msgid "Multicast."
 msgstr ""
 
-#: template/team.html.j2:142
+#: template/team.html.j2:143
 msgid "Web site, packaging (Nix/Guix)."
 msgstr ""
 
-#: template/team.html.j2:148
+#: template/team.html.j2:149
 msgid "Secushare, Data Protection Theory, Computer Science &amp; Society."
 msgstr ""
 
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index aea33af2..dc725971 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -1779,7 +1779,7 @@ msgstr ""
 msgid "Random peer sampling"
 msgstr ""
 
-#: template/team.html.j2:75 template/team.html.j2:109
+#: template/team.html.j2:75 template/team.html.j2:110
 msgid "W32 port."
 msgstr ""
 
@@ -1791,29 +1791,29 @@ msgstr ""
 msgid "GNU Name System, Identity Management, ABE."
 msgstr ""
 
-#: template/team.html.j2:103
+#: template/team.html.j2:104
 msgid ""
 "Documentation, Website, libgnurl maintainer, System Integration, Build "
 "System, some admin roles, packaging (NetBSD pkgsrc, Guix, Gentoo)."
 msgstr ""
 
-#: template/team.html.j2:120
+#: template/team.html.j2:121
 msgid "Testbed, voice."
 msgstr ""
 
-#: template/team.html.j2:130
+#: template/team.html.j2:131
 msgid "Secushare, Social, PSYC, Multicast."
 msgstr ""
 
-#: template/team.html.j2:136
+#: template/team.html.j2:137
 msgid "Multicast."
 msgstr ""
 
-#: template/team.html.j2:142
+#: template/team.html.j2:143
 msgid "Web site, packaging (Nix/Guix)."
 msgstr ""
 
-#: template/team.html.j2:148
+#: template/team.html.j2:149
 msgid "Secushare, Data Protection Theory, Computer Science &amp; Society."
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index a1470f57..7399811a 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-04 14:09+0200\n"
+"POT-Creation-Date: 2019-07-04 17:37+0000\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"
@@ -1801,7 +1801,7 @@ msgstr ""
 msgid "Random peer sampling"
 msgstr ""
 
-#: template/team.html.j2:75 template/team.html.j2:109
+#: template/team.html.j2:75 template/team.html.j2:110
 msgid "W32 port."
 msgstr ""
 
@@ -1813,29 +1813,29 @@ msgstr ""
 msgid "GNU Name System, Identity Management, ABE."
 msgstr ""
 
-#: template/team.html.j2:103
+#: template/team.html.j2:104
 msgid ""
 "Documentation, Website, libgnurl maintainer, System Integration, Build "
 "System, some admin roles, packaging (NetBSD pkgsrc, Guix, Gentoo)."
 msgstr ""
 
-#: template/team.html.j2:120
+#: template/team.html.j2:121
 msgid "Testbed, voice."
 msgstr ""
 
-#: template/team.html.j2:130
+#: template/team.html.j2:131
 msgid "Secushare, Social, PSYC, Multicast."
 msgstr ""
 
-#: template/team.html.j2:136
+#: template/team.html.j2:137
 msgid "Multicast."
 msgstr ""
 
-#: template/team.html.j2:142
+#: template/team.html.j2:143
 msgid "Web site, packaging (Nix/Guix)."
 msgstr ""
 
-#: template/team.html.j2:148
+#: template/team.html.j2:149
 msgid "Secushare, Data Protection Theory, Computer Science &amp; Society."
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 863ea7fc..4fd74aa9 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-04 14:09+0200\n"
+"POT-Creation-Date: 2019-07-04 17:37+0000\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"
@@ -1793,7 +1793,7 @@ msgstr ""
 msgid "Random peer sampling"
 msgstr ""
 
-#: template/team.html.j2:75 template/team.html.j2:109
+#: template/team.html.j2:75 template/team.html.j2:110
 msgid "W32 port."
 msgstr ""
 
@@ -1805,29 +1805,29 @@ msgstr ""
 msgid "GNU Name System, Identity Management, ABE."
 msgstr ""
 
-#: template/team.html.j2:103
+#: template/team.html.j2:104
 msgid ""
 "Documentation, Website, libgnurl maintainer, System Integration, Build "
 "System, some admin roles, packaging (NetBSD pkgsrc, Guix, Gentoo)."
 msgstr ""
 
-#: template/team.html.j2:120
+#: template/team.html.j2:121
 msgid "Testbed, voice."
 msgstr ""
 
-#: template/team.html.j2:130
+#: template/team.html.j2:131
 msgid "Secushare, Social, PSYC, Multicast."
 msgstr ""
 
-#: template/team.html.j2:136
+#: template/team.html.j2:137
 msgid "Multicast."
 msgstr ""
 
-#: template/team.html.j2:142
+#: template/team.html.j2:143
 msgid "Web site, packaging (Nix/Guix)."
 msgstr ""
 
-#: template/team.html.j2:148
+#: template/team.html.j2:149
 msgid "Secushare, Data Protection Theory, Computer Science &amp; Society."
 msgstr ""
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 79ddc4f8..fc36e1d7 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-04 14:09+0200\n"
+"POT-Creation-Date: 2019-07-04 17:37+0000\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"
@@ -1793,7 +1793,7 @@ msgstr ""
 msgid "Random peer sampling"
 msgstr ""
 
-#: template/team.html.j2:75 template/team.html.j2:109
+#: template/team.html.j2:75 template/team.html.j2:110
 msgid "W32 port."
 msgstr ""
 
@@ -1805,29 +1805,29 @@ msgstr ""
 msgid "GNU Name System, Identity Management, ABE."
 msgstr ""
 
-#: template/team.html.j2:103
+#: template/team.html.j2:104
 msgid ""
 "Documentation, Website, libgnurl maintainer, System Integration, Build "
 "System, some admin roles, packaging (NetBSD pkgsrc, Guix, Gentoo)."
 msgstr ""
 
-#: template/team.html.j2:120
+#: template/team.html.j2:121
 msgid "Testbed, voice."
 msgstr ""
 
-#: template/team.html.j2:130
+#: template/team.html.j2:131
 msgid "Secushare, Social, PSYC, Multicast."
 msgstr ""
 
-#: template/team.html.j2:136
+#: template/team.html.j2:137
 msgid "Multicast."
 msgstr ""
 
-#: template/team.html.j2:142
+#: template/team.html.j2:143
 msgid "Web site, packaging (Nix/Guix)."
 msgstr ""
 
-#: template/team.html.j2:148
+#: template/team.html.j2:149
 msgid "Secushare, Data Protection Theory, Computer Science &amp; Society."
 msgstr ""
 
diff --git a/template/team.html.j2 b/template/team.html.j2
index 23865a8e..613196a8 100644
--- a/template/team.html.j2
+++ b/template/team.html.j2
@@ -97,6 +97,7 @@
 		  <img src="{{ url('static/team-images/ng0.jpg') }}" alt="ng0" class="img-fluid">
 		  <ul class="text-center">
 		    <a href="https://n0.is"><li><i class="fas fa-home"></i></li></a>
+                    <a href="https://keys.openpgp.org/search?q=ng0%40n0.is"><li><i class="fas fa-key"></i></li></a>
 		  </ul>
 		</div>
 		<h1>ng0</h1>
-- 
cgit v1.2.3


From 2ce1d970128fcf8c8fbbf28ce78aeb05daeadee6 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Thu, 4 Jul 2019 17:41:47 +0000
Subject: locale.

---
 locale/de/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 locale/es/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 locale/fr/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 locale/it/LC_MESSAGES/messages.po | 24 +++++++++++++++---------
 4 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index a823e3ca..65222c73 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:37+0000\n"
+"POT-Creation-Date: 2019-07-04 17:41+0000\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"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1644,8 +1644,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1676,20 +1677,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1752,11 +1756,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 7399811a..829ea0e1 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:37+0000\n"
+"POT-Creation-Date: 2019-07-04 17:41+0000\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"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1615,8 +1615,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1647,20 +1648,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1721,11 +1725,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 4fd74aa9..423a783a 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:37+0000\n"
+"POT-Creation-Date: 2019-07-04 17:41+0000\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"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1607,8 +1607,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1639,20 +1640,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1713,11 +1717,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index fc36e1d7..5c769c93 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:37+0000\n"
+"POT-Creation-Date: 2019-07-04 17:41+0000\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"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Generated-By: Babel 2.4.0\n"
 
 #: common/base.j2:5
@@ -1607,8 +1607,9 @@ msgstr ""
 msgid "Tutorial: GNUnet on Archlinux/Pi"
 msgstr ""
 
-#: 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-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 ""
@@ -1639,20 +1640,23 @@ msgstr ""
 msgid "Make an installation directory"
 msgstr ""
 
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: 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:78 template/install-on-macos.html.j2:155
+#: 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:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: 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 ""
@@ -1713,11 +1717,13 @@ msgstr ""
 msgid "First steps"
 msgstr ""
 
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: 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:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
 msgid "Option 2: GNUnet experimental"
 msgstr ""
 
-- 
cgit v1.2.3


From 7cad0ae603ae814c4ac15e44fd0f743052d24096 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Thu, 4 Jul 2019 17:43:19 +0000
Subject: use gnunet.org instead.

---
 template/team.html.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/team.html.j2 b/template/team.html.j2
index 613196a8..030ca6df 100644
--- a/template/team.html.j2
+++ b/template/team.html.j2
@@ -97,7 +97,7 @@
 		  <img src="{{ url('static/team-images/ng0.jpg') }}" alt="ng0" class="img-fluid">
 		  <ul class="text-center">
 		    <a href="https://n0.is"><li><i class="fas fa-home"></i></li></a>
-                    <a href="https://keys.openpgp.org/search?q=ng0%40n0.is"><li><i class="fas fa-key"></i></li></a>
+                    <a href="https://keys.openpgp.org/search?q=ng0%40gnunet.org"><li><i class="fas fa-key"></i></li></a>
 		  </ul>
 		</div>
 		<h1>ng0</h1>
-- 
cgit v1.2.3


From b74efe5d353f296f4620e0c1a6d2397e6ce5e7cd Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Thu, 4 Jul 2019 21:46:52 +0200
Subject: improve video.html

---
 template/video.html.j2 | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/template/video.html.j2 b/template/video.html.j2
index 8760fd18..1851eec3 100644
--- a/template/video.html.j2
+++ b/template/video.html.j2
@@ -37,8 +37,8 @@
       </ul>
       <h3>{{ _("2015") }}</h3>
       <ul>
-        <li><a href="">Reproducible Software Deployment with GNU Guix</a></li> 
-	<li><a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/32c3/byzantine-fault-tolerant-set-consensus-with-efficient-set-reconciliation.mp4">Byzantine fault tolerant set consensus with efficient set reconciliation</a>, 32C4 <!--FIXME:link working?-->
+        <!-- FIXME: source only available on yt. <li>Ludovic Courtès, <a href="">Reproducible Software Deployment with GNU Guix</a>, Inria</li> -->
+        <!-- FIXME: source not available. <li><a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/32c3/byzantine-fault-tolerant-set-consensus-with-efficient-set-reconciliation.mp4">Byzantine fault tolerant set consensus with efficient set reconciliation</a>, 32C4 -->
  	<li>Daniel Golle, <a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/BattleMeshV8/GNUnet%20in%20Community%20Mesh%20Networks%20+%20Slides%20-%20BattleMeshV8.mkv">GNUnet in Community Networks</a>, BattleMesh 2015
  	<li>t3sserakt and demos, <a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/Datenspuren2015/datenspuren15-7069-de-EDN_-_Echt_Dezentrales_Netzwerk_webm.webm">Echt Dezentrales Netzwerk</a>, Datenspuren 2015
 	<li>Christian Grothoff, <a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/psc2015/grothoff.webm">The Architecture of the GNUnet: 45 Subsystems in 45 Minutes</a>
@@ -46,9 +46,9 @@
       </ul>
       <h3>{{ _("2014") }}</h3>
       <ul>
-        <li>Julian Kirsch, <a href="">"Knocking down the HACIENDA"</a>, GNU Hacker Meeting 2014</li>
-        <li>Peter Schaar, <a href="">"Technik, Recht und Überwachung"</a>, Technische Universität München</li>
-        <li>Christian Grothoff, <a href="">"A Public Key Infrastructure for Social Movements in the Age of Universal Surveillance"</a>, Univeristy of Oxford</li>
+        <!-- FIXME: no source link on web. <li>Julian Kirsch, <a href="">"Knocking down the HACIENDA"</a>, GNU Hacker Meeting 2014</li> -->
+        <!-- FIXME: no source link on web. <li>Peter Schaar, <a href="">"Technik, Recht und Überwachung"</a>, Technische Universität München</li> -->
+        <!-- FIXME: no source link on web. <li>Christian Grothoff, <a href="">"A Public Key Infrastructure for Social Movements in the Age of Universal Surveillance"</a>, Univeristy of Oxford</li> -->
         <li>Jacob Appelbaum, Douwe Korff and Christian Grothoff, <a href="https://git.gnunet.org/gnunet-videos-2014.git/plain/2014-coe.webm">"After Snowden: using law and technology to counter snooping"</a>, Counsil of Europe</li>
 	<li>Nicolas Benes, <a href="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/do-panic-do-panic.webm">Panic! An approach for home routers to securely erase sensitive data</a>, 31C3</li>
 	<li>Lucas Fulchir, <a href="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/fenrir-fenrir.webm">why TLS sucks and what I'm doing about it</a>, 31C3</li>
@@ -60,19 +60,17 @@
       </ul>
       <h3>{{ _("2013") }}</h3>
       <ul>
-        <li>Bart Polot, <a href="">"GNUnet CADET and GNUnet Conversation" at YBTI/30c3</a>, 30C3</li>
-        <li>Christian Grothoff, <a href="">"The GNU Name System"</a>, 30C3</li>
-        <li>Markus Teich on "Monkey, <a href="">Generating Useful Bug Reports Automatically"</a>, Technische Universität München</li>
-        <li>Christian Grothoff, <a href="">"The GNU Name System and the Future of Social Networking with GNUnet" at GHM</a></li>
-        <li>Christian Grothoff, Carlo von Lynx, Jacob Appelbaum and Richard Stallman, <a href="">"You broke the Internet. We're making ourselves a GNU one."</a>, Berlin</li>
-        <li>Roger Dingledine and Jacob Appelbaum, <a href="">"Q &amp; A"</a>, Technische Universität München</li>
-        <li>Maximilian Szengel, <a href="">"Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li>
-	<li><a href="https://git.gnunet.org/gnunet-videos-2013.git/plain/you%20broke%20the%20internet/internetistschuld.webm">You broke our internet</a>, Piratenpartei Berlin</li>
+        <!-- FIXME: no source link on web. <li>Bart Polot, <a href="">"GNUnet CADET and GNUnet Conversation" at YBTI/30c3</a>, 30C3</li> -->
+        <li>Christian Grothoff, <a href="https://media.ccc.de/v/30C3_-_5212_-_en_-_saal_6_-_201312272145_-_the_gnu_name_system_-_grothoff">"The GNU Name System"</a>, 30C3</li>
+        <li>Markus Teich, <a href="https://media.net.in.tum.de/v/Oberseminar-SS13--Monkey_-_Generating_Useful_Bug_R">"Monkey, generating Useful Bug Reports Automatically"</a>, Technische Universität München</li>
+        <li>Christian Grothoff, <a href="https://audio-video.gnu.org/video/ghm2013/Christian_Grothoff-The_GNU_Name_System_and_the_Future_of_Social_Networking_with_GNUnet_.webm">"The GNU Name System and the Future of Social Networking with GNUnet" at GHM</a></li>
+        <li>Christian Grothoff, Carlo von Lynx, Jacob Appelbaum and Richard Stallman, <a href="https://git.gnunet.org/gnunet-videos-2013.git/plain/you%20broke%20the%20internet/internetistschuld.webm">"You broke the Internet. We're making ourselves a GNU one."</a>, Berlin</li>
+        <li>Roger Dingledine and Jacob Appelbaum, <a href="https://archive.org/details/RogerDingledineAndJacobAppelbaumQAMarathon">"Q &amp; A"</a>, Technische Universität München</li>
+        <!-- FIXME: no source link on web. <li>Maximilian Szengel, <a href="">"Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li> -->
       </ul>
       <h3>{{ _("2012") }}</h3>
       <ul>
-        <li>Martin Schanzenbach, <a href="">"A Censorship-Resistant and Fully Decentralized Naming System",</a>Technische Universität München</li>
-        <li>Richard Stallman, <a href="">"Copyright vs. Community"</a>, Technische Universität München</li>
+        <li>Martin Schanzenbach, <a href="https://media.net.in.tum.de/v/Oberseminar-SS12--Design_and_Implementation_of_a_C">"A Censorship-Resistant and Fully Decentralized Naming System",</a>Technische Universität München</li>
       </ul>
       <h3>{{ _("2010") }}</h3>
       <ul>
-- 
cgit v1.2.3


From afd0aa494b25f89a41b5c57ba41603093ef720c5 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Fri, 5 Jul 2019 11:27:38 +0200
Subject: add doxygen menu entry

---
 common/navigation.j2.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 8384a6ca..2b584b0d 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -64,6 +64,7 @@
           <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>
+          <li><a class="dropdown-item" target="_blank" href="https://doxygen.gnunet.org">{{ _("Source Code Documentation") }}</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>
-- 
cgit v1.2.3


From 6dac2c25394ecba19c6c0fb79626d31e92aa124b Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Fri, 5 Jul 2019 16:55:14 +0000
Subject: contact: mention LASTNAME@ and clarify the logs availability.

---
 locale/de/LC_MESSAGES/messages.po | 53 +++++++++++++++++++++++----------------
 locale/en/LC_MESSAGES/messages.po | 49 ++++++++++++++++++++----------------
 locale/es/LC_MESSAGES/messages.po | 53 +++++++++++++++++++++++----------------
 locale/fr/LC_MESSAGES/messages.po | 51 +++++++++++++++++++++----------------
 locale/it/LC_MESSAGES/messages.po | 51 +++++++++++++++++++++----------------
 template/contact.html.j2          | 13 +++++++---
 6 files changed, 157 insertions(+), 113 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 65222c73..c15ec31b 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-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\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:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr "Kontinuierliche Integration"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografie"
@@ -123,42 +123,48 @@ msgstr "Systemarchitektur"
 msgid "Source Code"
 msgstr "Quellkode"
 
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+#, fuzzy
+#| msgid "Documentation"
+msgid "Source Code Documentation"
+msgstr "Dokumentation"
+
+#: common/navigation.j2.inc:72
 #, fuzzy
 #| msgid "Development"
 msgid "Development Tutorial"
 msgstr "Entwicklung"
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Installieren"
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr "Nutzen"
 
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr "Videos"
 
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glossar"
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr "Handbuch"
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr "REST API"
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -421,25 +427,28 @@ msgstr "Der IRC Kanal"
 
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
 
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr "Individuelle Kontaktaufname"
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
-"Most of us support receiving GnuPG encrypted Emails."
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr "Fehler melden"
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1966,11 +1975,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
 
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index dc725971..62ede9b1 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:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -92,40 +92,44 @@ msgstr ""
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+msgid "Source Code Documentation"
+msgstr ""
+
+#: common/navigation.j2.inc:72
 msgid "Development Tutorial"
 msgstr ""
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr ""
 
@@ -370,25 +374,28 @@ msgstr ""
 
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
 
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
-"Most of us support receiving GnuPG encrypted Emails."
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1905,11 +1912,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 829ea0e1..cd2e5552 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-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\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:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr "Integración continua"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografía"
@@ -112,42 +112,48 @@ msgstr "Architectura del sistema"
 msgid "Source Code"
 msgstr "Códico fuente"
 
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+#, fuzzy
+#| msgid "Documentation"
+msgid "Source Code Documentation"
+msgstr "Documentación"
+
+#: common/navigation.j2.inc:72
 #, fuzzy
 #| msgid "Development"
 msgid "Development Tutorial"
 msgstr "Desarrollo"
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr "Documentación"
 
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Instala"
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr "Usa"
 
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr "Videos"
 
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glosario"
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr "Manual"
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr "REST API"
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -392,25 +398,28 @@ msgstr ""
 
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
 
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
-"Most of us support receiving GnuPG encrypted Emails."
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1933,11 +1942,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 423a783a..9a2e95ce 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-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\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:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -112,40 +112,44 @@ msgstr ""
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+msgid "Source Code Documentation"
+msgstr ""
+
+#: common/navigation.j2.inc:72
 msgid "Development Tutorial"
 msgstr ""
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr ""
 
@@ -390,25 +394,28 @@ msgstr ""
 
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
 
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
-"Most of us support receiving GnuPG encrypted Emails."
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1925,10 +1932,10 @@ msgstr ""
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 5c769c93..a7ab4e20 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-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\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:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -112,40 +112,44 @@ msgstr ""
 msgid "Source Code"
 msgstr ""
 
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+msgid "Source Code Documentation"
+msgstr ""
+
+#: common/navigation.j2.inc:72
 msgid "Development Tutorial"
 msgstr ""
 
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr ""
 
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr ""
 
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
 
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr ""
 
@@ -390,25 +394,28 @@ msgstr ""
 
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
 
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
 
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
-"Most of us support receiving GnuPG encrypted Emails."
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
 
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
 
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1925,11 +1932,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
 
diff --git a/template/contact.html.j2 b/template/contact.html.j2
index ef7f5469..adf5691d 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -23,7 +23,11 @@
       <h2>{{ _("The IRC channel") }}</h2>
         <p>
           {% trans %}
-              #gnunet is reachable via irc.freenode.net. There is also an <a href="https://old.gnunet.org/bot/log/gnunet">archive</a> availabe.
+            <tt>#gnunet</tt> is reachable via
+            <a href="https://freenode.net">irc.freenode.net</a>.
+            There is also an
+            <a href="https://old.gnunet.org/bot/log/gnunet">archive</a>
+            available (currently unavailable, we are working on restoring access to it).
           {% endtrans %}
         </p>
     </div>
@@ -34,9 +38,10 @@
       <h2>{{ _("Contacting individuals") }}</h2>
       <p>
           {% trans %}
-               GNUnet developers are generally reachable at
-               <tt>PSEUDONYM@gnunet.org</tt>.  Most of us
-               support receiving GnuPG encrypted Emails.
+            GNUnet developers are generally reachable at
+            either <tt>PSEUDONYM@gnunet.org</tt> or
+            <tt>LASTNAME@gnunet.org</tt>.  Most of us
+            support receiving GnuPG encrypted Emails.
           {% endtrans %}
       </p>
     </div>
-- 
cgit v1.2.3