some more word on about and a new engage-page

6 files changed, 83 insertions, 170 deletions

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index dc9f5d6f..b5e8fe20 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 17:52+0200\n"
+"POT-Creation-Date: 2019-06-26 18:56+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"
@@ -501,33 +501,7 @@ msgid ""
 msgstr ""
 
 #: template/engage.html.j2:7
-msgid "Talk With Us"
-msgstr "Mitmachen"
-
-#: template/engage.html.j2:34
-msgid ""
-"Use the mailing lists, and join our <a href=\"ircs://chat.freenode.net:6697/"
-"#gnunet\">IRC channel</a> to keep up with development, find technical help, "
-"and discuss GNUnet."
-msgstr ""
-
-#: template/engage.html.j2:43
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"help-gnunet\">General Help Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:49
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"gnunet-developers\">Development Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:55
-msgid ""
-"<i class=\"far fa-comments\"></i> Available on <a href=\"https://freenode.net"
-"\">irc.freenode.net</a> in the channel <a href=\"ircs://chat.freenode."
-"net:6697/#gnunet\">#gnunet</a>."
+msgid "Engage!"
 msgstr ""
 
 #: template/ev.html.j2:7
@@ -1858,6 +1832,9 @@ msgstr ""
 msgid "2010"
 msgstr ""
 
+#~ msgid "Talk With Us"
+#~ msgstr "Mitmachen"
+
 #, fuzzy
 #~| msgid "Download GNUnet (via Git)"
 #~ msgid "Download GNUnet"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 3b283570..82dd07d4 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -456,33 +456,7 @@ msgid ""
 msgstr ""
 
 #: template/engage.html.j2:7
-msgid "Talk With Us"
-msgstr ""
-
-#: template/engage.html.j2:34
-msgid ""
-"Use the mailing lists, and join our <a href=\"ircs://chat.freenode.net:6697/"
-"#gnunet\">IRC channel</a> to keep up with development, find technical help, "
-"and discuss GNUnet."
-msgstr ""
-
-#: template/engage.html.j2:43
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"help-gnunet\">General Help Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:49
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"gnunet-developers\">Development Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:55
-msgid ""
-"<i class=\"far fa-comments\"></i> Available on <a href=\"https://freenode.net"
-"\">irc.freenode.net</a> in the channel <a href=\"ircs://chat.freenode."
-"net:6697/#gnunet\">#gnunet</a>."
+msgid "Engage!"
 msgstr ""
 
 #: template/ev.html.j2:7
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index ded0b7ca..ddb8ecc0 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 17:52+0200\n"
+"POT-Creation-Date: 2019-06-26 18:56+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"
@@ -476,33 +476,7 @@ msgid ""
 msgstr ""
 
 #: template/engage.html.j2:7
-msgid "Talk With Us"
-msgstr ""
-
-#: template/engage.html.j2:34
-msgid ""
-"Use the mailing lists, and join our <a href=\"ircs://chat.freenode.net:6697/"
-"#gnunet\">IRC channel</a> to keep up with development, find technical help, "
-"and discuss GNUnet."
-msgstr ""
-
-#: template/engage.html.j2:43
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"help-gnunet\">General Help Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:49
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"gnunet-developers\">Development Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:55
-msgid ""
-"<i class=\"far fa-comments\"></i> Available on <a href=\"https://freenode.net"
-"\">irc.freenode.net</a> in the channel <a href=\"ircs://chat.freenode."
-"net:6697/#gnunet\">#gnunet</a>."
+msgid "Engage!"
 msgstr ""
 
 #: template/ev.html.j2:7
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 9cbf0df9..2c48516f 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 17:52+0200\n"
+"POT-Creation-Date: 2019-06-26 18:56+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"
@@ -476,33 +476,7 @@ msgid ""
 msgstr ""
 
 #: template/engage.html.j2:7
-msgid "Talk With Us"
-msgstr ""
-
-#: template/engage.html.j2:34
-msgid ""
-"Use the mailing lists, and join our <a href=\"ircs://chat.freenode.net:6697/"
-"#gnunet\">IRC channel</a> to keep up with development, find technical help, "
-"and discuss GNUnet."
-msgstr ""
-
-#: template/engage.html.j2:43
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"help-gnunet\">General Help Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:49
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"gnunet-developers\">Development Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:55
-msgid ""
-"<i class=\"far fa-comments\"></i> Available on <a href=\"https://freenode.net"
-"\">irc.freenode.net</a> in the channel <a href=\"ircs://chat.freenode."
-"net:6697/#gnunet\">#gnunet</a>."
+msgid "Engage!"
 msgstr ""
 
 #: template/ev.html.j2:7
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 2eed955c..996331af 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 17:52+0200\n"
+"POT-Creation-Date: 2019-06-26 18:56+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"
@@ -476,33 +476,7 @@ msgid ""
 msgstr ""
 
 #: template/engage.html.j2:7
-msgid "Talk With Us"
-msgstr ""
-
-#: template/engage.html.j2:34
-msgid ""
-"Use the mailing lists, and join our <a href=\"ircs://chat.freenode.net:6697/"
-"#gnunet\">IRC channel</a> to keep up with development, find technical help, "
-"and discuss GNUnet."
-msgstr ""
-
-#: template/engage.html.j2:43
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"help-gnunet\">General Help Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:49
-msgid ""
-"<i class=\"fas fa-at\"></i> <a href=\"https://lists.gnu.org/mailman/listinfo/"
-"gnunet-developers\">Development Mailing List</a>"
-msgstr ""
-
-#: template/engage.html.j2:55
-msgid ""
-"<i class=\"far fa-comments\"></i> Available on <a href=\"https://freenode.net"
-"\">irc.freenode.net</a> in the channel <a href=\"ircs://chat.freenode."
-"net:6697/#gnunet\">#gnunet</a>."
+msgid "Engage!"
 msgstr ""
 
 #: template/ev.html.j2:7
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index ca71791e..ab4506cd 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -4,28 +4,33 @@
     <div class="container">
       <div class="text-center">
         <header>
-          <h1>{{ _("Engage") }}</h1>
+          <h1>{{ _("Engage!") }}</h1>
         </header>
       </div>
     </div>
     <div class="container">
+
+<!-- OBEN LINKS  -->
+
       <div class="row">
         <div class="col-lg-5">
           <h2>Join the conversation!</h2>
           <p>
-            There are many ways to get engaged with GNUnet. A first step might be to join the conversation on the mailing lists and on our IRC channel to keep up with development, find technical help, and discuss GNUnet:
+            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:
           </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 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>. 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>.
           </p>
           <h4>IRC</h4>
           <p>
-            Most of the GNUnet developer are on the <a href="ircs://chat.freenode.net:6697/#gnunet">IRC channel</a>. Please be patient to get an answere for your request. There is also a Matrix bridge to the IRC.
+            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. 
           </p>
           <h4>Mumble</h4>
           <p>
-            We have a weekly mumble at <a href="https://gnuner.org">https://gnunet.org</a> where we talk about recent developments, strategies, and politics ;-)
+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. 
+          </p>
           </p>
           <h4>PSYC</h4>
           <p>
@@ -39,48 +44,83 @@
             </li>
           </p>
         </div>
+
+<!-- OBEN RECHTS  -->
+
         <div class="col-lg-5 offset-md-1">
-          <h2>Get together!</h2>
+          <h2>Get GNUnet Installed!</h2>
           <p>
-            We have a monthly get-together on mumble that happens on that day of the month, where n.day==n.month. E.g. we’ll meet on 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.
+            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.
+         </p>
+         <h2>Use GNUnet!</h2>
+          <p>
+            <a href="https://gnunet.org/use">Let's gets started...</a>
           </p>
+         <h2>Report bugs!</h2>
           <p>
-            We have some meatspace meetings that happen occasionally, mostly in Germany and Switzerland. The usual occasions are:
-            <ul>
-              <li>Chaos Communication Congress in Leipzig (DE), 27th-30th December (https://events.ccc.de/congress)</li>
-              <li>Datenspuren in Dresden (DE), usually by mid/end of September (https://datenspuren.de)</li>
-              <li>GNUnet hackweek in Mont-Soleil (CH), usually by end of June</li>
-              <li>Other meetings on-the-fly, you’ll get to know about them on our Mailinglist or sometimes via the news/blog.</li>
-            </ul>
+            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>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>
-
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-lg-5">
-          <h2><a href="https://gnunet.org/en/tutorial.html">Get GNUnet Installed!</a></h2>
+        <h2>Contribute!</h2>
           <p>
-            The next thing you most likely want to have is your own GNUnet installation. As we haven’t packaged the new versions yet (June 2019) we provide some tutorials how to install step-by-step. Some of them are not complete, but we find them useful regardless of their state.
-        </div>
-        <div class="col-lg-5 offset-md-1">
-          <h2><a href="https://bib.gnunet.org/">Bibliography</a></h2>
-          <p>If you are more the reading kind of person, please take a seat in our libary.</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. 
+        </p>
         </div>
       </div>
+
+
+<!-- MITTE LINKS ^ -->
+
       <div class="row">
         <div class="col-lg-5">
-          <h2><a href="">Use GNUnet</a></h2>
-          <p>
-            Let's gets started...
-          </p>
+          <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>
         </div>
+
+
+<!-- MITTE RECHTS -->
+
         <div class="col-lg-5 offset-md-1">
-          <h2><a href="">Report bugs</a></h2>
+          <h2>Get together!</h2>
           <p>
-            Help us to find bugs and write them into our <a href="https://gnunet.org/en/tutorial.html">bug tracker</a>.
+            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>Other meetings happening throughout the year: You’ll get to know about it on our Mailinglist (or propose them yourself).</li>
+            </ul>
           </p>
         </div>
       </div>
     </div>
+
+
+<!-- UNTEN LINKS ^ -->
+
+      <div class="row">
+        <div class="col-lg-5">
+
+
+
+<!-- UNTEN RECHTS ^ -->
+
+        <div class="col-lg-5 offset-md-1">
+ 
+
+
+
+
+    </div>
   </article>
 {% endblock body_content %}