some more improvments on /engage and /tutorial -sva

7 files changed, 240 insertions, 205 deletions

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index b5e8fe20..e0a0695c 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-26 18:56+0200\n"
+"POT-Creation-Date: 2019-06-27 00:23+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"
@@ -59,7 +59,7 @@ msgstr "Copyright Übertragung"
 msgid "Continuous Integration"
 msgstr "Kontinuierliche Integration"
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:88
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografie"
@@ -119,27 +119,31 @@ msgstr "Quellcode"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: common/navigation.j2.inc:82 template/tutorial.html.j2:5
+#: common/navigation.j2.inc:82
 msgid "Tutorials"
 msgstr "Anleitungen"
 
 #: common/navigation.j2.inc:83
+msgid "Videos"
+msgstr ""
+
+#: common/navigation.j2.inc:84
 msgid "Glossary"
 msgstr "Glossar"
 
-#: common/navigation.j2.inc:84
+#: common/navigation.j2.inc:85
 msgid "Handbook"
 msgstr "Handbuch"
 
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:86
 msgid "REST API"
 msgstr ""
 
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "C-Tutorial"
 msgstr "C-Anleitung"
 
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -1769,13 +1773,29 @@ msgstr ""
 msgid "Tutorial: GNUnet on Ubuntu 18.04"
 msgstr ""
 
+#: template/tutorial.html.j2:5
+#, fuzzy
+#| msgid "Tutorials"
+msgid "Install-Tutorials"
+msgstr "Anleitungen"
+
 #: template/tutorial.html.j2:8
 msgid ""
-"This page holds various tutorials for GNUnet. Some of them are not complete, "
-"but we find them useful regardless of their state."
+"This page holds various simplified step-by-step tutorials for GNUnet. <br> "
+"Some of them are not complete, but we find them useful regardless of their "
+"state. <br> Find much more detailled documentation of the installation "
+"options in the <a href=\"https://docs.gnunet.org/#toc-Installing-"
+"GNUnet-1\">according section</a> of the <a href=\"https://docs.gnunet.org/"
+"\">handbook</a>."
+msgstr ""
+
+#: template/tutorial.html.j2:15
+msgid ""
+"Please note that the installation process will get much easier once we have "
+"proper packages again."
 msgstr ""
 
-#: template/tutorial.html.j2:14
+#: template/tutorial.html.j2:20
 msgid ""
 "GNUnet installation instructions: <ul> <li><a href=\"tutorial-ubuntu1804.html"
 "\">Ubuntu 18.04</a></li> <li><a href=\"tutorial-archpi.html\">Arch-Pi</a></"
@@ -1784,54 +1804,40 @@ msgid ""
 "\">NetBSD</a></li> </ul>"
 msgstr ""
 
-#: template/tutorial.html.j2:26
+#: template/tutorial.html.j2:32
 msgid ""
 "<a href=\"https://tutorial.gnunet.org/\">C Coding Tutorial for GNUnet</a>"
 msgstr ""
 
-#: template/video.html.j2:5
-msgid "Media related to GNUnet"
-msgstr ""
-
-#: template/video.html.j2:8
+#: template/tutorial.html.j2:37
 msgid ""
-"Over the years we've given a couple of talks, workshops and other "
-"presentations which have been recorded. The list below is neither "
-"chronological in order, nor complete."
-msgstr ""
-
-#: template/video.html.j2:21
-msgid "2017"
+"Once the installation is done, please head over to the <a href=\"https://"
+"gnunet.org/en/use\">\"How to use GNUnet\"-page</a> to get a brief intro on "
+"what can be done with your installation. <br> If you have any queries about "
+"the installation or the usage, please <a href=\"https://gnunet.org/en/engage."
+"html\">get in touch!</a>"
 msgstr ""
 
-#: template/video.html.j2:22
-msgid "2016"
+#: template/video.html.j2:8
+msgid "Talks related to GNUnet"
 msgstr ""
 
-#: template/video.html.j2:23
+#: template/video.html.j2:16
 msgid "2015"
 msgstr ""
 
-#: template/video.html.j2:24
+#: template/video.html.j2:20
 msgid "2014"
 msgstr ""
 
-#: template/video.html.j2:25
+#: template/video.html.j2:28
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:26
+#: template/video.html.j2:38
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:27
-msgid "2011"
-msgstr ""
-
-#: template/video.html.j2:28
-msgid "2010"
-msgstr ""
-
 #~ msgid "Talk With Us"
 #~ msgstr "Mitmachen"
 
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 82dd07d4..8b06995d 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:88
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -88,27 +88,31 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:82 template/tutorial.html.j2:5
+#: common/navigation.j2.inc:82
 msgid "Tutorials"
 msgstr ""
 
 #: common/navigation.j2.inc:83
-msgid "Glossary"
+msgid "Videos"
 msgstr ""
 
 #: common/navigation.j2.inc:84
-msgid "Handbook"
+msgid "Glossary"
 msgstr ""
 
 #: common/navigation.j2.inc:85
-msgid "REST API"
+msgid "Handbook"
 msgstr ""
 
 #: common/navigation.j2.inc:86
-msgid "C-Tutorial"
+msgid "REST API"
 msgstr ""
 
 #: common/navigation.j2.inc:87
+msgid "C-Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr ""
 
@@ -1724,13 +1728,27 @@ msgstr ""
 msgid "Tutorial: GNUnet on Ubuntu 18.04"
 msgstr ""
 
+#: template/tutorial.html.j2:5
+msgid "Install-Tutorials"
+msgstr ""
+
 #: template/tutorial.html.j2:8
 msgid ""
-"This page holds various tutorials for GNUnet. Some of them are not complete, "
-"but we find them useful regardless of their state."
+"This page holds various simplified step-by-step tutorials for GNUnet. <br> "
+"Some of them are not complete, but we find them useful regardless of their "
+"state. <br> Find much more detailled documentation of the installation "
+"options in the <a href=\"https://docs.gnunet.org/#toc-Installing-"
+"GNUnet-1\">according section</a> of the <a href=\"https://docs.gnunet.org/"
+"\">handbook</a>."
 msgstr ""
 
-#: template/tutorial.html.j2:14
+#: template/tutorial.html.j2:15
+msgid ""
+"Please note that the installation process will get much easier once we have "
+"proper packages again."
+msgstr ""
+
+#: template/tutorial.html.j2:20
 msgid ""
 "GNUnet installation instructions: <ul> <li><a href=\"tutorial-ubuntu1804.html"
 "\">Ubuntu 18.04</a></li> <li><a href=\"tutorial-archpi.html\">Arch-Pi</a></"
@@ -1739,53 +1757,39 @@ msgid ""
 "\">NetBSD</a></li> </ul>"
 msgstr ""
 
-#: template/tutorial.html.j2:26
+#: template/tutorial.html.j2:32
 msgid ""
 "<a href=\"https://tutorial.gnunet.org/\">C Coding Tutorial for GNUnet</a>"
 msgstr ""
 
-#: template/video.html.j2:5
-msgid "Media related to GNUnet"
-msgstr ""
-
-#: template/video.html.j2:8
+#: template/tutorial.html.j2:37
 msgid ""
-"Over the years we've given a couple of talks, workshops and other "
-"presentations which have been recorded. The list below is neither "
-"chronological in order, nor complete."
+"Once the installation is done, please head over to the <a href=\"https://"
+"gnunet.org/en/use\">\"How to use GNUnet\"-page</a> to get a brief intro on "
+"what can be done with your installation. <br> If you have any queries about "
+"the installation or the usage, please <a href=\"https://gnunet.org/en/engage."
+"html\">get in touch!</a>"
 msgstr ""
 
-#: template/video.html.j2:21
-msgid "2017"
-msgstr ""
-
-#: template/video.html.j2:22
-msgid "2016"
+#: template/video.html.j2:8
+msgid "Talks related to GNUnet"
 msgstr ""
 
-#: template/video.html.j2:23
+#: template/video.html.j2:16
 msgid "2015"
 msgstr ""
 
-#: template/video.html.j2:24
+#: template/video.html.j2:20
 msgid "2014"
 msgstr ""
 
-#: template/video.html.j2:25
+#: template/video.html.j2:28
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:26
+#: template/video.html.j2:38
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:27
-msgid "2011"
-msgstr ""
-
-#: template/video.html.j2:28
-msgid "2010"
-msgstr ""
-
 #~ msgid "_project_title"
 #~ msgstr "GNUnet is the Next Generation Internet"
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index ddb8ecc0..38bcda4a 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-26 18:56+0200\n"
+"POT-Creation-Date: 2019-06-27 00:23+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"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:88
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -108,27 +108,31 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:82 template/tutorial.html.j2:5
+#: common/navigation.j2.inc:82
 msgid "Tutorials"
 msgstr ""
 
 #: common/navigation.j2.inc:83
-msgid "Glossary"
+msgid "Videos"
 msgstr ""
 
 #: common/navigation.j2.inc:84
-msgid "Handbook"
+msgid "Glossary"
 msgstr ""
 
 #: common/navigation.j2.inc:85
-msgid "REST API"
+msgid "Handbook"
 msgstr ""
 
 #: common/navigation.j2.inc:86
-msgid "C-Tutorial"
+msgid "REST API"
 msgstr ""
 
 #: common/navigation.j2.inc:87
+msgid "C-Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr ""
 
@@ -1744,13 +1748,27 @@ msgstr ""
 msgid "Tutorial: GNUnet on Ubuntu 18.04"
 msgstr ""
 
+#: template/tutorial.html.j2:5
+msgid "Install-Tutorials"
+msgstr ""
+
 #: template/tutorial.html.j2:8
 msgid ""
-"This page holds various tutorials for GNUnet. Some of them are not complete, "
-"but we find them useful regardless of their state."
+"This page holds various simplified step-by-step tutorials for GNUnet. <br> "
+"Some of them are not complete, but we find them useful regardless of their "
+"state. <br> Find much more detailled documentation of the installation "
+"options in the <a href=\"https://docs.gnunet.org/#toc-Installing-"
+"GNUnet-1\">according section</a> of the <a href=\"https://docs.gnunet.org/"
+"\">handbook</a>."
 msgstr ""
 
-#: template/tutorial.html.j2:14
+#: template/tutorial.html.j2:15
+msgid ""
+"Please note that the installation process will get much easier once we have "
+"proper packages again."
+msgstr ""
+
+#: template/tutorial.html.j2:20
 msgid ""
 "GNUnet installation instructions: <ul> <li><a href=\"tutorial-ubuntu1804.html"
 "\">Ubuntu 18.04</a></li> <li><a href=\"tutorial-archpi.html\">Arch-Pi</a></"
@@ -1759,50 +1777,36 @@ msgid ""
 "\">NetBSD</a></li> </ul>"
 msgstr ""
 
-#: template/tutorial.html.j2:26
+#: template/tutorial.html.j2:32
 msgid ""
 "<a href=\"https://tutorial.gnunet.org/\">C Coding Tutorial for GNUnet</a>"
 msgstr ""
 
-#: template/video.html.j2:5
-msgid "Media related to GNUnet"
-msgstr ""
-
-#: template/video.html.j2:8
+#: template/tutorial.html.j2:37
 msgid ""
-"Over the years we've given a couple of talks, workshops and other "
-"presentations which have been recorded. The list below is neither "
-"chronological in order, nor complete."
+"Once the installation is done, please head over to the <a href=\"https://"
+"gnunet.org/en/use\">\"How to use GNUnet\"-page</a> to get a brief intro on "
+"what can be done with your installation. <br> If you have any queries about "
+"the installation or the usage, please <a href=\"https://gnunet.org/en/engage."
+"html\">get in touch!</a>"
 msgstr ""
 
-#: template/video.html.j2:21
-msgid "2017"
-msgstr ""
-
-#: template/video.html.j2:22
-msgid "2016"
+#: template/video.html.j2:8
+msgid "Talks related to GNUnet"
 msgstr ""
 
-#: template/video.html.j2:23
+#: template/video.html.j2:16
 msgid "2015"
 msgstr ""
 
-#: template/video.html.j2:24
+#: template/video.html.j2:20
 msgid "2014"
 msgstr ""
 
-#: template/video.html.j2:25
+#: template/video.html.j2:28
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:26
+#: template/video.html.j2:38
 msgid "2012"
 msgstr ""
-
-#: template/video.html.j2:27
-msgid "2011"
-msgstr ""
-
-#: template/video.html.j2:28
-msgid "2010"
-msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 2c48516f..63af4885 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-26 18:56+0200\n"
+"POT-Creation-Date: 2019-06-27 00:23+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"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:88
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -108,27 +108,31 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:82 template/tutorial.html.j2:5
+#: common/navigation.j2.inc:82
 msgid "Tutorials"
 msgstr ""
 
 #: common/navigation.j2.inc:83
-msgid "Glossary"
+msgid "Videos"
 msgstr ""
 
 #: common/navigation.j2.inc:84
-msgid "Handbook"
+msgid "Glossary"
 msgstr ""
 
 #: common/navigation.j2.inc:85
-msgid "REST API"
+msgid "Handbook"
 msgstr ""
 
 #: common/navigation.j2.inc:86
-msgid "C-Tutorial"
+msgid "REST API"
 msgstr ""
 
 #: common/navigation.j2.inc:87
+msgid "C-Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr ""
 
@@ -1744,13 +1748,27 @@ msgstr ""
 msgid "Tutorial: GNUnet on Ubuntu 18.04"
 msgstr ""
 
+#: template/tutorial.html.j2:5
+msgid "Install-Tutorials"
+msgstr ""
+
 #: template/tutorial.html.j2:8
 msgid ""
-"This page holds various tutorials for GNUnet. Some of them are not complete, "
-"but we find them useful regardless of their state."
+"This page holds various simplified step-by-step tutorials for GNUnet. <br> "
+"Some of them are not complete, but we find them useful regardless of their "
+"state. <br> Find much more detailled documentation of the installation "
+"options in the <a href=\"https://docs.gnunet.org/#toc-Installing-"
+"GNUnet-1\">according section</a> of the <a href=\"https://docs.gnunet.org/"
+"\">handbook</a>."
 msgstr ""
 
-#: template/tutorial.html.j2:14
+#: template/tutorial.html.j2:15
+msgid ""
+"Please note that the installation process will get much easier once we have "
+"proper packages again."
+msgstr ""
+
+#: template/tutorial.html.j2:20
 msgid ""
 "GNUnet installation instructions: <ul> <li><a href=\"tutorial-ubuntu1804.html"
 "\">Ubuntu 18.04</a></li> <li><a href=\"tutorial-archpi.html\">Arch-Pi</a></"
@@ -1759,50 +1777,36 @@ msgid ""
 "\">NetBSD</a></li> </ul>"
 msgstr ""
 
-#: template/tutorial.html.j2:26
+#: template/tutorial.html.j2:32
 msgid ""
 "<a href=\"https://tutorial.gnunet.org/\">C Coding Tutorial for GNUnet</a>"
 msgstr ""
 
-#: template/video.html.j2:5
-msgid "Media related to GNUnet"
-msgstr ""
-
-#: template/video.html.j2:8
+#: template/tutorial.html.j2:37
 msgid ""
-"Over the years we've given a couple of talks, workshops and other "
-"presentations which have been recorded. The list below is neither "
-"chronological in order, nor complete."
+"Once the installation is done, please head over to the <a href=\"https://"
+"gnunet.org/en/use\">\"How to use GNUnet\"-page</a> to get a brief intro on "
+"what can be done with your installation. <br> If you have any queries about "
+"the installation or the usage, please <a href=\"https://gnunet.org/en/engage."
+"html\">get in touch!</a>"
 msgstr ""
 
-#: template/video.html.j2:21
-msgid "2017"
-msgstr ""
-
-#: template/video.html.j2:22
-msgid "2016"
+#: template/video.html.j2:8
+msgid "Talks related to GNUnet"
 msgstr ""
 
-#: template/video.html.j2:23
+#: template/video.html.j2:16
 msgid "2015"
 msgstr ""
 
-#: template/video.html.j2:24
+#: template/video.html.j2:20
 msgid "2014"
 msgstr ""
 
-#: template/video.html.j2:25
+#: template/video.html.j2:28
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:26
+#: template/video.html.j2:38
 msgid "2012"
 msgstr ""
-
-#: template/video.html.j2:27
-msgid "2011"
-msgstr ""
-
-#: template/video.html.j2:28
-msgid "2010"
-msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 996331af..ac008ce6 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-26 18:56+0200\n"
+"POT-Creation-Date: 2019-06-27 00:23+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"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Continuous Integration"
 msgstr ""
 
-#: common/footer.j2.inc:23 common/navigation.j2.inc:88
+#: common/footer.j2.inc:23 common/navigation.j2.inc:89
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -108,27 +108,31 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: common/navigation.j2.inc:82 template/tutorial.html.j2:5
+#: common/navigation.j2.inc:82
 msgid "Tutorials"
 msgstr ""
 
 #: common/navigation.j2.inc:83
-msgid "Glossary"
+msgid "Videos"
 msgstr ""
 
 #: common/navigation.j2.inc:84
-msgid "Handbook"
+msgid "Glossary"
 msgstr ""
 
 #: common/navigation.j2.inc:85
-msgid "REST API"
+msgid "Handbook"
 msgstr ""
 
 #: common/navigation.j2.inc:86
-msgid "C-Tutorial"
+msgid "REST API"
 msgstr ""
 
 #: common/navigation.j2.inc:87
+msgid "C-Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:88
 msgid "FAQ"
 msgstr ""
 
@@ -1744,13 +1748,27 @@ msgstr ""
 msgid "Tutorial: GNUnet on Ubuntu 18.04"
 msgstr ""
 
+#: template/tutorial.html.j2:5
+msgid "Install-Tutorials"
+msgstr ""
+
 #: template/tutorial.html.j2:8
 msgid ""
-"This page holds various tutorials for GNUnet. Some of them are not complete, "
-"but we find them useful regardless of their state."
+"This page holds various simplified step-by-step tutorials for GNUnet. <br> "
+"Some of them are not complete, but we find them useful regardless of their "
+"state. <br> Find much more detailled documentation of the installation "
+"options in the <a href=\"https://docs.gnunet.org/#toc-Installing-"
+"GNUnet-1\">according section</a> of the <a href=\"https://docs.gnunet.org/"
+"\">handbook</a>."
 msgstr ""
 
-#: template/tutorial.html.j2:14
+#: template/tutorial.html.j2:15
+msgid ""
+"Please note that the installation process will get much easier once we have "
+"proper packages again."
+msgstr ""
+
+#: template/tutorial.html.j2:20
 msgid ""
 "GNUnet installation instructions: <ul> <li><a href=\"tutorial-ubuntu1804.html"
 "\">Ubuntu 18.04</a></li> <li><a href=\"tutorial-archpi.html\">Arch-Pi</a></"
@@ -1759,53 +1777,39 @@ msgid ""
 "\">NetBSD</a></li> </ul>"
 msgstr ""
 
-#: template/tutorial.html.j2:26
+#: template/tutorial.html.j2:32
 msgid ""
 "<a href=\"https://tutorial.gnunet.org/\">C Coding Tutorial for GNUnet</a>"
 msgstr ""
 
-#: template/video.html.j2:5
-msgid "Media related to GNUnet"
-msgstr ""
-
-#: template/video.html.j2:8
+#: template/tutorial.html.j2:37
 msgid ""
-"Over the years we've given a couple of talks, workshops and other "
-"presentations which have been recorded. The list below is neither "
-"chronological in order, nor complete."
+"Once the installation is done, please head over to the <a href=\"https://"
+"gnunet.org/en/use\">\"How to use GNUnet\"-page</a> to get a brief intro on "
+"what can be done with your installation. <br> If you have any queries about "
+"the installation or the usage, please <a href=\"https://gnunet.org/en/engage."
+"html\">get in touch!</a>"
 msgstr ""
 
-#: template/video.html.j2:21
-msgid "2017"
-msgstr ""
-
-#: template/video.html.j2:22
-msgid "2016"
+#: template/video.html.j2:8
+msgid "Talks related to GNUnet"
 msgstr ""
 
-#: template/video.html.j2:23
+#: template/video.html.j2:16
 msgid "2015"
 msgstr ""
 
-#: template/video.html.j2:24
+#: template/video.html.j2:20
 msgid "2014"
 msgstr ""
 
-#: template/video.html.j2:25
+#: template/video.html.j2:28
 msgid "2013"
 msgstr ""
 
-#: template/video.html.j2:26
+#: template/video.html.j2:38
 msgid "2012"
 msgstr ""
 
-#: template/video.html.j2:27
-msgid "2011"
-msgstr ""
-
-#: template/video.html.j2:28
-msgid "2010"
-msgstr ""
-
 #~ msgid "_project_title"
 #~ msgstr "Stack di protocolli GNU per un nuovo Internet etico"
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index ab4506cd..1ff3c08e 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -20,21 +20,22 @@
           </p>
           <h4>Mailing List</h4>
           <p>
-            You can get help on our mailing list <a href="https://lists.gnu.org/mailman/listinfo/help-gnunet">help-gnunet</a>. If you want to hack on GNUnet or generally want to be informed about recent updates and happening, get in touch over our mailing list <a href="https://lists.gnu.org/mailman/listinfo/gnunet-developers">gnunet-developers</a>.
+            You can get help on our mailing list <a href="https://lists.gnu.org/mailman/listinfo/help-gnunet">help-gnunet</a>. <br>If you want to hack on GNUnet or generally want to be informed about recent updates and happenings, get in touch over our mailing list <a href="https://lists.gnu.org/mailman/listinfo/gnunet-developers">gnunet-developers</a>.
           </p>
           <h4>IRC</h4>
           <p>
-            Most of the GNUnet developer are on the <a href="ircs://chat.freenode.net:6697/#gnunet">IRC channel #gnunet on freenode</a>. Please be patient and stay around at least for some hours to get an answer for your request. There is also a Matrix bridge to the IRC where you can get a backlog without staying connected. 
+            Most of the GNUnet developers are on the <a href="ircs://chat.freenode.net:6697/#gnunet">IRC channel #gnunet on freenode</a>. Please be patient and stay around at least for some hours to get an answer for your request. <!-- There is also a Matrix bridge to the IRC where you can get a backlog without staying connected. -->
           </p>
           <h4>Mumble</h4>
           <p>
-We have a monthly get-together on mumble where we talk about recent developments, strategies, and politics ;-) We come together on that day of the month, where n.day==n.month. E.g. we’ll meet on 6th of June, 7th of July, 8th of August, 9th of September, 10th of October and so on. We will usually start around 8 PM CEST, but try to be there earlier and stay longer that day itself.<br>
-To connect just enter "gnunet.org" as server into your mumble client, leave everything else as default. 
+                We have a monthly get-together on mumble where we talk about recent developments, strategies, and politics ;-) <br>
+                We come together on that day of the month, where n.day==n.month. E.g. we’ll meet on 6th of June, 7th of July, 8th of August, 9th of September, 10th of October and so on. We will usually start around 8 PM CEST, but try to be there earlier and stay longer just to hang around together.<br>
+                To connect just enter "gnunet.org" as server into your mumble client; leave everything else as default. 
           </p>
           </p>
           <h4>PSYC</h4>
           <p>
-            You find us also on PSYC using the following adresses: 
+            You find some of us on PSYC using the following adresses: 
             <ul>
               <li>psyc://loupsycedyglgamf.onion/@welcome</li>
               <li>irc://loupsycedyglgamf.onion:67/welcome</li>
@@ -48,30 +49,30 @@ To connect just enter "gnunet.org" as server into your mumble client, leave ever
 <!-- OBEN RECHTS  -->
 
         <div class="col-lg-5 offset-md-1">
-          <h2>Get GNUnet Installed!</h2>
+          <h2>Install GNUnet!</h2>
           <p>
-            Another thing you most likely want to have is <a href="https://gnunet.org/en/tutorial.html">your own GNUnet installation</a>. 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>. Some of them are not complete, but we find them useful regardless of their state.
+            Another thing you might want now is your own GNUnet installation. As we haven’t packaged the new versions yet (June 2019) we provide <a href="https://gnunet.org/en/tutorial.html">some tutorials how to install step-by-step</a>.
          </p>
          <h2>Use GNUnet!</h2>
           <p>
-            <a href="https://gnunet.org/use">Let's gets started...</a>
+            <a href="https://gnunet.org/use.html">Let's gets started...</a>
           </p>
          <h2>Report bugs!</h2>
           <p>
             While using GNUnet you will find bugs. Here are some notes on how to do that the most effective way: 
               <ul>
-                <li>run 'gnunet-bugreport'</li>
-                <li>Report the output into our <a href="https://bugs.gnunet.org/">bug tracker</a>. Add more details into the description e.g. what happened and what you expected to be happening instead. </li>
-                <li>In case you do not want to use the public bugtracker, you can also eMail the output to bug-gnunet@gnu.org with the same content.</li>
-                <li>It would also be helpful to inform us if your Operating System applies any vendor changes to gnunet which you know about (to exclude sources of problems introduced by your OS).</li>
-                <li>Then please be patient and wait until your bug report is acknowledged/replied to. Note that only volunteers work on this, so responses may take a while.</li>
-                <li>Also please follow up with eventual questions to the bug to help getting it fixed properly. </li>
+                <li>Run 'gnunet-bugreport'</li>
+                <li>Report the output into our <a href="https://bugs.gnunet.org/">bug tracker</a>. Add more details e.g. what happened and what you expected to happen. </li>
+                <li>If you do not want to use the public bug tracker, you can also eMail to bug-gnunet@gnu.org.</li>
+                <li>Please inform us if your operating system applies any vendor changes to GNUnet which you know about (to exclude sources of problems introduced by your OS).</li>
+                <li>Wait until your bug report is acknowledged/replied to. Note that only volunteers work on this – responses may take a while.</li>
+                <li>Please follow up with eventual questions about the bug. </li>
                 <li>Once a fix is there: Check if it's working as expected, so that we can properly close the bug report and/or give you credits :)</li>
              </ul>
           </p>
         <h2>Contribute!</h2>
           <p>
-            There are various ways to contribute. We especially need coders with great C skills and a good knowledge of crypto - but helping with this website, the bibliography and our wide documentation efforts are most welcome, too. As we are delivereing a new version now regularly, some packaging skills (for any OS) would a great thing to have - and if you are a designer we engineers would urgently need a hand here, too. 
+            There are various ways to contribute. We especially need coders with C skills and knowledge of crypto – but supporting with this website, it's translations, the bibliography and our wide documentation efforts are most welcome, too. As we are delivereing a new version now regularly, some packaging skills (for any OS) would a great thing to have – and if you are a designer we would need a hand, too. 
         </p>
         </div>
       </div>
@@ -84,7 +85,7 @@ To connect just enter "gnunet.org" as server into your mumble client, leave ever
           <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="https://gnunet.org/videos">videos</a> of our talks on conferences.</p>
+          <p>...or if you rather want hear us talking to you, lean back and watch some <a href="https://gnunet.org/videos">videos</a> of our talks at conferences.</p>
         </div>
 
 
@@ -96,8 +97,8 @@ To connect just enter "gnunet.org" as server into your mumble client, leave ever
             We meet in meatspace occasionally, mostly in Germany and Switzerland. The usual occasions are:
             <ul>
               <li><a href="https://events.ccc.de/congress">Chaos Communication Congress</a> in Leipzig (DE), 27th-30th December</li>
-              <li><a href="https://datenspuren.de>Datenspuren</a> in Dresden (DE), usually by mid/end of September</li>
-              <li>GNUnet Hackweek in Mont-Soleil (CH), usually by the end of June</li>
+              <li><a href="https://datenspuren.de">Datenspuren</a> in Dresden (DE), usually end of September</li>
+              <li>GNUnet Hackweek in Mont-Soleil (CH), usually end of June</li>
               <li>Other meetings happening throughout the year: You’ll get to know about it on our Mailinglist (or propose them yourself).</li>
             </ul>
           </p>
diff --git a/template/tutorial.html.j2 b/template/tutorial.html.j2
index 61ed74d6..f322749f 100644
--- a/template/tutorial.html.j2
+++ b/template/tutorial.html.j2
@@ -2,12 +2,18 @@
 {% block body_content %}
 <article class="d-flex flex-column p-5 bd-highlight">
     <header>
-      <h1>{{ _("Tutorials") }}</h1>
+      <h1>{{ _("Install-Tutorials") }}</h1>
     </header>
     <p>
       {% trans %}
-      This page holds various tutorials for GNUnet. Some of them are not
-      complete, but we find them useful regardless of their state.
+      This page holds various simplified step-by-step tutorials for GNUnet. <br>
+        Some of them are not complete, but we find them useful regardless of their state. <br>
+        Find much more detailled documentation of the installation options in the <a href="https://docs.gnunet.org/#toc-Installing-GNUnet-1">according section</a> of the <a href="https://docs.gnunet.org/">handbook</a>. 
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+      Please note that the installation process will get much easier once we have proper packages again. 
       {% endtrans %}
     </p>
     <p>
@@ -27,5 +33,11 @@
       <a href="https://tutorial.gnunet.org/">C Coding Tutorial for GNUnet</a>
       {% endtrans %}
     </p>
+    <p>
+      {% trans %}
+        Once the installation is done, please head over to the <a href="https://gnunet.org/en/use">"How to use GNUnet"-page</a> to get a brief intro on what can be done with your installation. <br>
+        If you have any queries about the installation or the usage, please <a href="https://gnunet.org/en/engage.html">get in touch!</a>
+      {% endtrans %}
+    </p>
 </article>
 {% endblock body_content %}