From c14b419bbaea272b8218e3b53c41a0fdc6d317ac Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Wed, 3 Mar 2021 21:41:56 +0100
Subject: readd architecture

---
 locale/de/LC_MESSAGES/messages.po | 26 ++++++------
 locale/es/LC_MESSAGES/messages.po | 36 ++++++++--------
 locale/fr/LC_MESSAGES/messages.po | 26 ++++++------
 locale/it/LC_MESSAGES/messages.po | 26 ++++++------
 locale/messages.pot               | 26 ++++++------
 template/architecture.html.j2     | 86 ++++++++++++++++++++-------------------
 6 files changed, 114 insertions(+), 112 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 2a97ba3f..99538b83 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: 2021-03-01 20:31+0100\n"
+"POT-Creation-Date: 2021-03-03 21:41+0100\n"
 "PO-Revision-Date: 2021-02-17 15:13+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: German <http://weblate.taler.net/projects/gnunet/website/de/"
@@ -497,15 +497,11 @@ msgstr ""
 msgid "GNUnet System Architecture"
 msgstr "GNUnet Systemarchitektur"
 
-#: template/architecture.html.j2:15
-msgid "Legend"
-msgstr ""
-
-#: template/architecture.html.j2:60
+#: template/architecture.html.j2:20
 msgid "Foundations"
 msgstr "Grundlagen"
 
-#: template/architecture.html.j2:62
+#: template/architecture.html.j2:22
 msgid ""
 "The foundations of GNUnet are a distributed hash table (R5N), an SCTP-like "
 "end-to-end encrypted messaging layer (CADET), a public key infrastructure "
@@ -520,11 +516,11 @@ msgstr ""
 "decentralizierte Routingalgorithmen benutzt. Diese Komponenten ersetzen das "
 "traditionelle Internet (TCP/IP)."
 
-#: template/architecture.html.j2:75
+#: template/architecture.html.j2:35
 msgid "Security"
 msgstr "Sicherheit"
 
-#: template/architecture.html.j2:78
+#: template/architecture.html.j2:38
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
 "runs as a separate process, providing fault-isolation and enabling tight "
@@ -533,26 +529,30 @@ msgid ""
 "remain free software."
 msgstr ""
 
-#: template/architecture.html.j2:92
+#: template/architecture.html.j2:52
 #, fuzzy
 #| msgid "System Architecture"
 msgid "System architecture"
 msgstr "System Architekture"
 
-#: template/architecture.html.j2:98
+#: template/architecture.html.j2:58
 msgid "Subsystems"
 msgstr ""
 
-#: template/architecture.html.j2:107
+#: template/architecture.html.j2:67
 #, fuzzy
 #| msgid "libgnurl"
 msgid "libgnunetutil"
 msgstr "libgnurl"
 
-#: template/architecture.html.j2:113
+#: template/architecture.html.j2:73
 msgid "APIs"
 msgstr ""
 
+#: template/architecture.html.j2:86
+msgid "Legend"
+msgstr ""
+
 #: template/contact.html.j2:6
 msgid "Contact information"
 msgstr "Kontaktinformation"
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 7d891b62..6ee0a67c 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-01 20:31+0100\n"
+"POT-Creation-Date: 2021-03-03 21:41+0100\n"
 "PO-Revision-Date: 2021-03-03 18:34+0000\n"
 "Last-Translator: Erika Fombella <fombellaerika@hotmail.com>\n"
-"Language-Team: Spanish <http://weblate.taler.net/projects/gnunet/website/es/>"
-"\n"
+"Language-Team: Spanish <http://weblate.taler.net/projects/gnunet/website/es/"
+">\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -340,9 +340,9 @@ msgstr ""
 "Hay muchos más recursos disponibles para aprender sobre GNUnet fuera del <a "
 "href=\"https://docs.gnunet.org/handbook/gnunet.html\">manual</a>, como <a "
 "href=\"https://bib.gnunet.org/\">bibliografía</a> con artículos que cubren "
-"las diversas capas, muchos <a href=\"https://gnunet.org/en/video.html\""
-">videos</a> o un corto <a href=\"https://gnunet.org/en/glossary.html\""
-">glosario</a>."
+"las diversas capas, muchos <a href=\"https://gnunet.org/en/video.html"
+"\">videos</a> o un corto <a href=\"https://gnunet.org/en/glossary.html"
+"\">glosario</a>."
 
 #: template/about.html.j2:95
 msgid ""
@@ -535,17 +535,13 @@ msgstr ""
 msgid "GNUnet System Architecture"
 msgstr "Architectura del sistema"
 
-#: template/architecture.html.j2:15
-msgid "Legend"
-msgstr ""
-
-#: template/architecture.html.j2:60
+#: template/architecture.html.j2:20
 #, fuzzy
 #| msgid "Documentation"
 msgid "Foundations"
 msgstr "Documentación"
 
-#: template/architecture.html.j2:62
+#: template/architecture.html.j2:22
 msgid ""
 "The foundations of GNUnet are a distributed hash table (R5N), an SCTP-like "
 "end-to-end encrypted messaging layer (CADET), a public key infrastructure "
@@ -554,11 +550,11 @@ msgid ""
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
-#: template/architecture.html.j2:75
+#: template/architecture.html.j2:35
 msgid "Security"
 msgstr ""
 
-#: template/architecture.html.j2:78
+#: template/architecture.html.j2:38
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
 "runs as a separate process, providing fault-isolation and enabling tight "
@@ -567,24 +563,28 @@ msgid ""
 "remain free software."
 msgstr ""
 
-#: template/architecture.html.j2:92
+#: template/architecture.html.j2:52
 #, fuzzy
 #| msgid "System Architecture"
 msgid "System architecture"
 msgstr "Architectura del sistema"
 
-#: template/architecture.html.j2:98
+#: template/architecture.html.j2:58
 msgid "Subsystems"
 msgstr ""
 
-#: template/architecture.html.j2:107
+#: template/architecture.html.j2:67
 msgid "libgnunetutil"
 msgstr ""
 
-#: template/architecture.html.j2:113
+#: template/architecture.html.j2:73
 msgid "APIs"
 msgstr ""
 
+#: template/architecture.html.j2:86
+msgid "Legend"
+msgstr ""
+
 #: template/contact.html.j2:6
 #, fuzzy
 #| msgid "Continuous Integration"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 498f95ad..e9e7597d 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: 2021-03-01 20:31+0100\n"
+"POT-Creation-Date: 2021-03-03 21:41+0100\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"
@@ -477,15 +477,11 @@ msgstr ""
 msgid "GNUnet System Architecture"
 msgstr ""
 
-#: template/architecture.html.j2:15
-msgid "Legend"
-msgstr ""
-
-#: template/architecture.html.j2:60
+#: template/architecture.html.j2:20
 msgid "Foundations"
 msgstr ""
 
-#: template/architecture.html.j2:62
+#: template/architecture.html.j2:22
 msgid ""
 "The foundations of GNUnet are a distributed hash table (R5N), an SCTP-like "
 "end-to-end encrypted messaging layer (CADET), a public key infrastructure "
@@ -494,11 +490,11 @@ msgid ""
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
-#: template/architecture.html.j2:75
+#: template/architecture.html.j2:35
 msgid "Security"
 msgstr ""
 
-#: template/architecture.html.j2:78
+#: template/architecture.html.j2:38
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
 "runs as a separate process, providing fault-isolation and enabling tight "
@@ -507,22 +503,26 @@ msgid ""
 "remain free software."
 msgstr ""
 
-#: template/architecture.html.j2:92
+#: template/architecture.html.j2:52
 msgid "System architecture"
 msgstr ""
 
-#: template/architecture.html.j2:98
+#: template/architecture.html.j2:58
 msgid "Subsystems"
 msgstr ""
 
-#: template/architecture.html.j2:107
+#: template/architecture.html.j2:67
 msgid "libgnunetutil"
 msgstr ""
 
-#: template/architecture.html.j2:113
+#: template/architecture.html.j2:73
 msgid "APIs"
 msgstr ""
 
+#: template/architecture.html.j2:86
+msgid "Legend"
+msgstr ""
+
 #: template/contact.html.j2:6
 msgid "Contact information"
 msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index b8907fd8..b3501213 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: 2021-03-01 20:31+0100\n"
+"POT-Creation-Date: 2021-03-03 21:41+0100\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"
@@ -477,15 +477,11 @@ msgstr ""
 msgid "GNUnet System Architecture"
 msgstr ""
 
-#: template/architecture.html.j2:15
-msgid "Legend"
-msgstr ""
-
-#: template/architecture.html.j2:60
+#: template/architecture.html.j2:20
 msgid "Foundations"
 msgstr ""
 
-#: template/architecture.html.j2:62
+#: template/architecture.html.j2:22
 msgid ""
 "The foundations of GNUnet are a distributed hash table (R5N), an SCTP-like "
 "end-to-end encrypted messaging layer (CADET), a public key infrastructure "
@@ -494,11 +490,11 @@ msgid ""
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
-#: template/architecture.html.j2:75
+#: template/architecture.html.j2:35
 msgid "Security"
 msgstr ""
 
-#: template/architecture.html.j2:78
+#: template/architecture.html.j2:38
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
 "runs as a separate process, providing fault-isolation and enabling tight "
@@ -507,22 +503,26 @@ msgid ""
 "remain free software."
 msgstr ""
 
-#: template/architecture.html.j2:92
+#: template/architecture.html.j2:52
 msgid "System architecture"
 msgstr ""
 
-#: template/architecture.html.j2:98
+#: template/architecture.html.j2:58
 msgid "Subsystems"
 msgstr ""
 
-#: template/architecture.html.j2:107
+#: template/architecture.html.j2:67
 msgid "libgnunetutil"
 msgstr ""
 
-#: template/architecture.html.j2:113
+#: template/architecture.html.j2:73
 msgid "APIs"
 msgstr ""
 
+#: template/architecture.html.j2:86
+msgid "Legend"
+msgstr ""
+
 #: template/contact.html.j2:6
 msgid "Contact information"
 msgstr ""
diff --git a/locale/messages.pot b/locale/messages.pot
index 2ae626c6..c129e8f2 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-01 20:48+0100\n"
+"POT-Creation-Date: 2021-03-03 21:41+0100\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"
@@ -482,15 +482,11 @@ msgstr ""
 msgid "GNUnet System Architecture"
 msgstr ""
 
-#: template/architecture.html.j2:15
-msgid "Legend"
-msgstr ""
-
-#: template/architecture.html.j2:60
+#: template/architecture.html.j2:20
 msgid "Foundations"
 msgstr ""
 
-#: template/architecture.html.j2:62
+#: template/architecture.html.j2:22
 msgid ""
 "The foundations of GNUnet are a distributed hash table (R5N), an SCTP-"
 "like end-to-end encrypted messaging layer (CADET), a public key "
@@ -499,11 +495,11 @@ msgid ""
 "algorithms, these subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
-#: template/architecture.html.j2:75
+#: template/architecture.html.j2:35
 msgid "Security"
 msgstr ""
 
-#: template/architecture.html.j2:78
+#: template/architecture.html.j2:38
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
 "runs as a separate process, providing fault-isolation and enabling tight "
@@ -512,22 +508,26 @@ msgid ""
 " will always remain free software."
 msgstr ""
 
-#: template/architecture.html.j2:92
+#: template/architecture.html.j2:52
 msgid "System architecture"
 msgstr ""
 
-#: template/architecture.html.j2:98
+#: template/architecture.html.j2:58
 msgid "Subsystems"
 msgstr ""
 
-#: template/architecture.html.j2:107
+#: template/architecture.html.j2:67
 msgid "libgnunetutil"
 msgstr ""
 
-#: template/architecture.html.j2:113
+#: template/architecture.html.j2:73
 msgid "APIs"
 msgstr ""
 
+#: template/architecture.html.j2:86
+msgid "Legend"
+msgstr ""
+
 #: template/contact.html.j2:6
 msgid "Contact information"
 msgstr ""
diff --git a/template/architecture.html.j2 b/template/architecture.html.j2
index ef6e8799..4165c860 100644
--- a/template/architecture.html.j2
+++ b/template/architecture.html.j2
@@ -8,49 +8,9 @@
 
   <div class="container">
     <div class="row">
-     <!--<div class="col-10">
-        <img class="img-fluid border rounded" src="../static/images/gnunet-arch-full.svg">
+      <div class="col-10">
+       <img class="img-fluid" src="../static/images/arch.png">
       </div>
-      <div class="col-2 d-none d-sm-block">
-        <h4>{{ _("Legend") }}:</h4>
-        <dl>
-          <dt>house</dt>
-          <dd>application</dd>
-        </dl>
-        <dl>
-          <dt>circle</dt>
-          <dd>application</dd>
-        </dl>
-        <dl>
-          <dt>box</dt>
-          <dd>daemon</dd>
-        </dl>
-        <dl>
-          <dt>diamond</dt>
-          <dd>library</dd>
-        </dl>
-        <dl>
-          <dt>blackline</dt>
-          <dd>dependency</dd>
-        </dl>
-        <dl>
-          <dt>blue line</dt>
-          <dd>extension via plugin</dd>
-        </dl>
-        <dl>
-          <dt>red line</dt>
-          <dd>possibly useful</dd>
-        </dl>
-        <dl>
-          <dt>dashed</dt>
-          <dd>in planning</dd>
-        </dl>
-      </div>-->
-  <div class="col-10">
-     <img class="img-fluid" src="../static/images/arch.png">
-  </div>
-
-
     </div>
   </div>
 
@@ -117,6 +77,48 @@
       </div>
     </div>
   </div>
+  <div class="container">
+    <div class="row">
+     <div class="col-10">
+        <img class="img-fluid border rounded" src="../static/images/gnunet-arch-full.svg">
+      </div>
+      <div class="col-2 d-none d-sm-block">
+        <h4>{{ _("Legend") }}:</h4>
+        <dl>
+          <dt>house</dt>
+          <dd>application</dd>
+        </dl>
+        <dl>
+          <dt>circle</dt>
+          <dd>application</dd>
+        </dl>
+        <dl>
+          <dt>box</dt>
+          <dd>daemon</dd>
+        </dl>
+        <dl>
+          <dt>diamond</dt>
+          <dd>library</dd>
+        </dl>
+        <dl>
+          <dt>blackline</dt>
+          <dd>dependency</dd>
+        </dl>
+        <dl>
+          <dt>blue line</dt>
+          <dd>extension via plugin</dd>
+        </dl>
+        <dl>
+          <dt>red line</dt>
+          <dd>possibly useful</dd>
+        </dl>
+        <dl>
+          <dt>dashed</dt>
+          <dd>in planning</dd>
+        </dl>
+      </div>
+    </div>
+  </div>
 
 </article>
 {% endblock body_content %}
-- 
cgit v1.2.3