add dissens news

13 files changed, 1450 insertions, 896 deletions

diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po
index bd4a2363..3f6d82e8 100644
--- a/locale/ar/LC_MESSAGES/messages.po
+++ b/locale/ar/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-03-20 10:40+0000\n"
 "Last-Translator: Shorouk Hassouna <shoroukhassuna@gmail.com>\n"
 "Language-Team: Arabic <http://weblate.taler.net/projects/gnunet/website/ar/"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "Contact"
 msgstr "جهات الاتصال"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr ""
 
@@ -148,10 +148,6 @@ msgstr ""
 msgid "Handbook"
 msgstr "الدليل"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr ""
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr ""
@@ -385,7 +381,7 @@ msgid ""
 "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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -471,8 +467,8 @@ msgstr ""
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 
 #: template/applications.html.j2:180
@@ -482,9 +478,8 @@ msgstr ""
 #: template/applications.html.j2:182
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 
 #: template/architecture.html.j2:6
@@ -500,7 +495,7 @@ 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
@@ -511,7 +506,7 @@ msgstr "الامان"
 #: 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 "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -753,8 +748,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 
 #: template/ev.html.j2:52
@@ -763,9 +758,9 @@ msgstr ""
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
@@ -972,9 +967,9 @@ msgstr ""
 #: template/faq.html.j2:183
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 
 #: template/faq.html.j2:195
@@ -990,7 +985,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr ""
 
 #: template/faq.html.j2:212
@@ -1061,7 +1056,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr ""
 
 #: template/faq.html.j2:288
@@ -1081,10 +1076,10 @@ msgid ""
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 
 #: template/faq.html.j2:410
@@ -1123,9 +1118,9 @@ msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 
 #: template/faq.html.j2:453
@@ -1503,7 +1498,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2748,8 +2743,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -2781,7 +2776,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 97a99a1c..c95f394a 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-04-26 03:52+0000\n"
 "Last-Translator: Ariane Kristof <ariane@kristofs.de>\n"
-"Language-Team: German <http://weblate.taler.net/projects/gnunet/website/de/>"
-"\n"
+"Language-Team: German <http://weblate.taler.net/projects/gnunet/website/de/"
+">\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr "GNU's Architektur für sichere p2p Netzwerke"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr "GNUnet e.V."
 
@@ -147,10 +147,6 @@ msgstr "Glossar"
 msgid "Handbook"
 msgstr "Handbuch"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr "Lebensbedingungen"
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr "REST API"
@@ -230,8 +226,8 @@ msgstr ""
 "kann der Internetverkehr von feindlichen Routern im Netzwerk fehlgeleitet, "
 "abgefangen, zensiert und manipuliert werden. Und tatsächlich hat sich das "
 "moderne Internet zu dem Punkt entwickelt, von dem Matthew Green sagt: <a "
-"href=\"https://blog.cryptographyengineering.com/2015/08/16/"
-"the-network-is-hostile/\">\"das Netzwerk ist feindlich\"</a>."
+"href=\"https://blog.cryptographyengineering.com/2015/08/16/the-network-is-"
+"hostile/\">\"das Netzwerk ist feindlich\"</a>."
 
 #: template/about.html.j2:41
 msgid ""
@@ -259,8 +255,8 @@ msgid ""
 "GNUnet must be implemented as <a href=\"https://www.gnu.org/philosophy/free-"
 "sw.html\">Free Software</a>."
 msgstr ""
-"GNUnet muss als <a href=\"https://www.gnu.org/philosophy/free-sw.html\""
-">Freie Software</a> gestaltet werden."
+"GNUnet muss als <a href=\"https://www.gnu.org/philosophy/free-sw.html"
+"\">Freie Software</a> gestaltet werden."
 
 #: template/about.html.j2:60
 msgid ""
@@ -342,22 +338,22 @@ msgid ""
 "\"https://docs.gnunet.org/handbook/gnunet.html#Egos\">Egos</a></li> </ul>"
 msgstr ""
 "Weitere Informationen finden Sie in unserem <a href=\"https://docs.gnunet."
-"org/handbook/gnunet.html\">Handbuch</a>, insbesondere im <a href=\"https"
-"://docs.gnunet.org/handbook/gnunet.html#Key-Concepts\">Kapitel über "
+"org/handbook/gnunet.html\">Handbuch</a>, insbesondere im <a href=\"https://"
+"docs.gnunet.org/handbook/gnunet.html#Key-Concepts\">Kapitel über "
 "\"Kerngedanken\"</a>, in dem die grundlegenden Konzepte von GNUnet erläutert "
-"werden:<ul><li> <a href=\"https://docs.gnunet.org/handbook/gnunet.html#"
-"Authentication\">Authentifizierung</a></li><li> <a href=\"https://docs.gnunet"
-".org/handbook/gnunet.html#Accounting-to-Encourage-Resource-Sharing\""
-">Gemeinschaftsfördernde Rechnungsführung</li></a>.<li><a href=\"https://docs."
-"gnunet.org/handbook/gnunet.html#Confidentiality\">Vertraulichkeit</a></"
-"li>.<li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#Anonymity\""
-">Anonymität</a></li>.<li><a href=\"https://docs.gnunet.org/handbook/gnunet."
+"werden:<ul><li> <a href=\"https://docs.gnunet.org/handbook/gnunet."
+"html#Authentication\">Authentifizierung</a></li><li> <a href=\"https://docs."
+"gnunet.org/handbook/gnunet.html#Accounting-to-Encourage-Resource-Sharing"
+"\">Gemeinschaftsfördernde Rechnungsführung</li></a>.<li><a href=\"https://"
+"docs.gnunet.org/handbook/gnunet.html#Confidentiality\">Vertraulichkeit</a></"
+"li>.<li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#Anonymity"
+"\">Anonymität</a></li>.<li><a href=\"https://docs.gnunet.org/handbook/gnunet."
 "html#Deniability\">Recht auf Ablehnung</a></li>.<li><a href=\"https://docs."
 "gnunet.org/handbook/gnunet.html#Peer-Identities\">Teilnehmeridentitäten</a></"
 "li>.<li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#Zones-in-the-"
-"GNU-Name-System-_0028GNS-Zones_0029\">Zonen im GNU Namen-system (GNS "
-"Zonen)</a></li>.<li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#"
-"Egos\">Egos</a></li>.</ul>"
+"GNU-Name-System-_0028GNS-Zones_0029\">Zonen im GNU Namen-system (GNS Zonen)</"
+"a></li>.<li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#Egos"
+"\">Egos</a></li>.</ul>"
 
 #: template/about.html.j2:88
 msgid "More Resources"
@@ -427,8 +423,8 @@ msgid ""
 msgstr ""
 "Dieses Projekt erhielt eine Förderung durch das Horizon 2020 Forschungs- und "
 "Innovationsprogramm der Europäischen Union im Rahmen der NGI_Trust "
-"Zuwendungsvereinbarung Nr. 646573. Das Projekt hat die Integration von "
-"re.claimID mit dem GNU Taler Zahlungssystem in einen gemeinsamen Piloten zum "
+"Zuwendungsvereinbarung Nr. 646573. Das Projekt hat die Integration von re."
+"claimID mit dem GNU Taler Zahlungssystem in einen gemeinsamen Piloten zum "
 "Ziel, um die praktische Durchführbarkeit und die Vorzüge von Systemen, die "
 "den Datenschutz verbessern, für Nutzer und kommerzielle "
 "Dienstleistungsanbieter zu demonstrieren."
@@ -463,12 +459,21 @@ msgid "The GNU Name System"
 msgstr "Das GNU-Namenssystem"
 
 #: template/applications.html.j2:15
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"gns.html\">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. -->"
 msgid ""
 "The <a href=\"gns.html\">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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -590,11 +595,17 @@ msgid "Cadet-GTK"
 msgstr "Cadet-GTK"
 
 #: template/applications.html.j2:162
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> "
+#| "is a convenient but feature-rich graphical application providing "
+#| "messaging using especially the CADET subsystem. It is developed using GTK "
+#| "and libhandy for a convergent design."
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> ist "
 "eine praktische, aber funktionsreiche grafische Anwendung, die "
@@ -608,11 +619,16 @@ msgid "groupchat"
 msgstr "Gruppenchat"
 
 #: template/applications.html.j2:182
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
+#| "terminal user interface providing messaging using especially the CADET "
+#| "subsystem. It is developed using nim. Cadet-GTK and groupchat are planned "
+#| "to be compatible."
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> "
 "Benutzeroberfläche für Terminals, die Nachrichtenübermittlung insbesondere "
@@ -628,11 +644,18 @@ msgid "Foundations"
 msgstr "Grundlagen"
 
 #: template/architecture.html.j2:22
+#, fuzzy
+#| 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 (GNS) and a pluggable transport system (TRANSPORT).<br> "
+#| "Using public keys for addresses and self-organized decentralized routing "
+#| "algorithms, these subsystems replace the traditional TCP/IP stack."
 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 "GNUnet basiert auf einer verteilten Hashtabelle (R5N), einem SCTP ähnlichen "
@@ -647,9 +670,16 @@ msgid "Security"
 msgstr "Sicherheit"
 
 #: template/architecture.html.j2:38
+#, fuzzy
+#| msgid ""
+#| "GNUnet is implemented using a multi-process architecture. Each subsystem "
+#| "runs as a separate process, providing fault-isolation and enabling tight "
+#| "permissions to be granted to each subsystem. Naturally, the "
+#| "implementation is a <a href=\"https://www.gnu.org/\">GNU</a> package, and "
+#| "will always remain free software."
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
-"runs as a separate process, providing fault-isolation and enabling tight "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -699,8 +729,8 @@ msgstr ""
 "Eine archivierte öffentliche Mailingliste für GNUnet wird unter <a href="
 "\"https://lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists."
 "gnu.org/mailman/listinfo/gnunet-developers gehostet</a>. Du kannst "
-"Nachrichten an die Liste unter <a href=\"mailto:gnunet-developers@gnu.org\""
-">gnunet-developers@gnu.org</a>."
+"Nachrichten an die Liste unter <a href=\"mailto:gnunet-developers@gnu.org"
+"\">gnunet-developers@gnu.org</a>."
 
 #: template/contact.html.j2:23
 msgid "The IRC channel"
@@ -713,8 +743,8 @@ msgid ""
 "IjaAfLiruzjxFFzKAV:matrix.org/\">archive</a> available."
 msgstr ""
 "<tt>#gnunet</tt> ist über <a href=\"https://freenode.net\">irc.freenode.net "
-"erreichbar</a>. Ein Archiv <a href=\"https://view.matrix.org/room/"
-"!IjaAfLiruzjxFFzKAV:matrix.org/\">archive</a>gibt es auch."
+"erreichbar</a>. Ein Archiv <a href=\"https://view.matrix.org/room/!"
+"IjaAfLiruzjxFFzKAV:matrix.org/\">archive</a>gibt es auch."
 
 #: template/contact.html.j2:38
 msgid "Contacting individuals"
@@ -762,8 +792,8 @@ msgid ""
 msgstr ""
 "<p> Wer zum Projekt GNUnet beitragen möchte, ist dazu herzlich eingeladen. "
 "Voraussetzung dafür ist neben einem Zugang über Git, dass die Urheberrechte "
-"des eigenen Beitrags an das Projekt gemäß <a href=\"/pdf/copyright.pdf\""
-">Copyright Assignment</a> abgetreten werden, um sicherzustellen, dass die "
+"des eigenen Beitrags an das Projekt gemäß <a href=\"/pdf/copyright.pdf"
+"\">Copyright Assignment</a> abgetreten werden, um sicherzustellen, dass die "
 "Lizenzvereinbarung und die Richtlinien der Mitarbeit gegenüber GNUnet e.V. "
 "und Taler Systems SA erfüllt werden (siehe <a href=\"https://git.gnunet.org/"
 "gnunet-ev.git/tree/gnunet_taler_agreement.tex\">GNUnet e.V. --- Taler "
@@ -812,8 +842,8 @@ msgid ""
 "A list of our Git repositories can be found on our our <a href=\"https://git."
 "gnunet.org/\">Git Server</a>."
 msgstr ""
-"Unsere Quellcode-Repositories befinden sich auf unserem <a href=\"https://git"
-".gnunet.org/\">Git-Server</a>."
+"Unsere Quellcode-Repositories befinden sich auf unserem <a href=\"https://"
+"git.gnunet.org/\">Git-Server</a>."
 
 #: template/developers.html.j2:27
 msgid ""
@@ -880,8 +910,8 @@ msgid ""
 "org/gauger/\">https://old.gnunet.org/gauger/</a>."
 msgstr ""
 "Wir verwenden <a href=\"https://old.gnunet.org/gauger\">Gauger</a> für die "
-"Regressionsanalyse der Leistung des Exchange-Backends unter <a href=\"https"
-"://old.gnunet.org/gauger/\">https://old.gnunet.org/gauger/</a> ."
+"Regressionsanalyse der Leistung des Exchange-Backends unter <a href="
+"\"https://old.gnunet.org/gauger/\">https://old.gnunet.org/gauger/</a> ."
 
 #: template/download.html.j2:7 template/gnurl.html.j2:209
 msgid "Downloads"
@@ -969,6 +999,17 @@ msgid "Becoming a Member of GNUnet e.V."
 msgstr "Ein Mitglied von GNUnet e.V. werden"
 
 #: template/ev.html.j2:33
+#, fuzzy
+#| 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)."
 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 "
@@ -977,8 +1018,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 "GNUnet-Entwickler mit Git-Zugriff (Schreibzugriff) können Mitglieder werden, "
 "um am Entscheidungsprozess teilzunehmen und GNUnet e.V. offiziell zu "
@@ -987,32 +1028,41 @@ msgstr ""
 "a>Speicher mit deinem Namen zu ergänzen. Es gibt keine Mitgliedsbeiträge; "
 "allerdings sind Mitglieder verpflichtet, GNUnet e.V. zu unterstützen und "
 "insbesondere im Rahmen ihrer Möglichkeiten zu dessen technischer Entwicklung "
-"beizutragen. Für weitere Einzelheiten verweisen wir auf die <a href=\"https"
-"://git.gnunet.org/gnunet-ev.git/\">Satzung</a> (zur Zeit nur auf Deutsch "
-"erhältlich, Übersetzungen sind willkommen)."
+"beizutragen. Für weitere Einzelheiten verweisen wir auf die <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/\">Satzung</a> (zur Zeit nur auf "
+"Deutsch erhältlich, Übersetzungen sind willkommen)."
 
 #: template/ev.html.j2:52
 msgid "Governance"
 msgstr "Führung"
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+#, fuzzy
+#| 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.org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists "
+#| "of: <dl><dt>Vorsitz</dt> <dd><a href=\"https://schanzen.eu\">Martin "
+#| "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</"
+#| "dd> <dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a "
+#| "href=\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </"
+#| "dd> </dl>"
+msgid ""
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
 "\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </dd> </dl>"
 msgstr ""
-"Du findest unsere Satzung und das Mitgliederverzeichnis unter <a href=\"https"
-"://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet.org/"
-"gnunet-ev.git/tree/satzung.tex</a>. Der Vorstand besteht gegenwärtig aus: "
-"<dl><dt>Vorsitz</dt>.<dd>.<a href=\"https://schanzen.eu\">Martin "
-"Schanzenbach</a></dd>.<dt>stellvertretender "
-"Vorsitz</dt>.<dd>t3sserakt</dd>.<dt>Kassenwart</dt>.<dd>Florian "
-"Dold</dd>.<dt>Beisitzer</dt>.<dd>.<a href=\"https://grothoff.org/christian/\""
-">Christian Grothoff</a>, ch3 </dd>.</dl>"
+"Du findest unsere Satzung und das Mitgliederverzeichnis unter <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet."
+"org/gnunet-ev.git/tree/satzung.tex</a>. Der Vorstand besteht gegenwärtig "
+"aus: <dl><dt>Vorsitz</dt>.<dd>.<a href=\"https://schanzen.eu\">Martin "
+"Schanzenbach</a></dd>.<dt>stellvertretender Vorsitz</dt>.<dd>t3sserakt</dd>."
+"<dt>Kassenwart</dt>.<dd>Florian Dold</dd>.<dt>Beisitzer</dt>.<dd>.<a href="
+"\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </dd>.</dl>"
 
 #: template/ev.html.j2:73
 msgid "Official Meeting Notes"
@@ -1041,9 +1091,9 @@ msgstr ""
 "Beachtung, daß es uns nicht möglich, ist Spendenbescheinigungen "
 "auszustellen. Falls du daran denkst einen größeren Betrag zu spenden, so "
 "bitte setze dich vorher mit uns in Verbindung. Eventuell bietet sich in dem "
-"Fall eine individuelle Lösung an. "
-"<dl><dt>BitCoin</dt>.<dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</dd>.<dt>SEPA/"
-"IBAN<dt>.<dd>DE67830654080004822650 (BIC/SWIFT:GENODEF1SLR)</dd>.</dl>"
+"Fall eine individuelle Lösung an. <dl><dt>BitCoin</dt>."
+"<dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</dd>.<dt>SEPA/IBAN<dt>."
+"<dd>DE67830654080004822650 (BIC/SWIFT:GENODEF1SLR)</dd>.</dl>"
 
 #: template/faq.html.j2:12 template/faq.html.j2:23
 msgid "General"
@@ -1078,9 +1128,9 @@ msgid ""
 "documentation or ask the question on the help-gnunet@gnu.org mailing list or "
 "the #gnunet IRC on irc.freenode.net."
 msgstr ""
-"A: Es gibt viele weitere Informationsquellen. Du kannst auf der help-gnunet@"
-"gnu.org Mailingliste oder dem #gnunet IRC auf irc.freenode.net weitere "
-"Dokumentationen nachlesen oder die Frage erneut stellen."
+"A: Es gibt viele weitere Informationsquellen. Du kannst auf der help-"
+"gnunet@gnu.org Mailingliste oder dem #gnunet IRC auf irc.freenode.net "
+"weitere Dokumentationen nachlesen oder die Frage erneut stellen."
 
 #: template/faq.html.j2:36
 msgid "When are you going to release the next version?"
@@ -1130,12 +1180,12 @@ msgid ""
 "you believe a bug is sensitive, you can set its view status to private (this "
 "should be the exception)."
 msgstr ""
-"A: Wir verfolgen die Liste der derzeit bekannten Fehler im <a href=\"https"
-"://bugs.gnunet.org/\">Mantis-System</a>. Manche Fehler werden gelegentlich "
-"den Entwicklern oder der Entwickler-Mailingliste direkt gemeldet. Hiervon "
-"wird abgeraten, da die Entwickler oft nicht die Zeit haben, diese Bugs "
-"wieder in die Mantis Datenbank einzupflegen. Bitte melde Fehler direkt in "
-"das Fehlermeldesystem. Falls du der Meinung bist, es handele sich um einen "
+"A: Wir verfolgen die Liste der derzeit bekannten Fehler im <a href=\"https://"
+"bugs.gnunet.org/\">Mantis-System</a>. Manche Fehler werden gelegentlich den "
+"Entwicklern oder der Entwickler-Mailingliste direkt gemeldet. Hiervon wird "
+"abgeraten, da die Entwickler oft nicht die Zeit haben, diese Bugs wieder in "
+"die Mantis Datenbank einzupflegen. Bitte melde Fehler direkt in das "
+"Fehlermeldesystem. Falls du der Meinung bist, es handele sich um einen "
 "sensiblen Fehler, kannst du die Sichtbarkeit auf privat setzen (dies sollte "
 "die Ausnahme bleiben)."
 
@@ -1148,8 +1198,8 @@ msgid ""
 "A: gnunet-gtk is a separate download. The package contains various GTK+ "
 "based graphical interfaces, including a graphical tool for configuration."
 msgstr ""
-"A: gnunet-gtk ist ein separater Download. Das Paket enthält verschiedene "
-"GTK+-basierte grafische Schnittstellen, u.a. auch ein grafisches Tool zur "
+"A: gnunet-gtk ist ein separater Download. Das Paket enthält verschiedene GTK"
+"+-basierte grafische Schnittstellen, u.a. auch ein grafisches Tool zur "
 "Konfiguration."
 
 #: template/faq.html.j2:83
@@ -1168,8 +1218,8 @@ msgid ""
 "nse&quot; section of your configuration file to a higher value. The default "
 "is &quot;5 ms&quot;."
 msgstr ""
-"A: Der gnunet-service-nse-Prozess berechnet zunächst einen sogenannten &quot"
-";Proof-of-Work&quot;, mit dem das Netzwerk davon überzeugt wird, dass dein "
+"A: Der gnunet-service-nse-Prozess berechnet zunächst einen sogenannten &quot;"
+"Proof-of-Work&quot;, mit dem das Netzwerk davon überzeugt wird, dass dein "
 "Peer real ist (bzw. eigentlich es für einen Gegner aufwendig macht, einen "
 "Sybil-Angriff auf den Netzwerkgrößenschätzer durchzuführen). Die Kalkulation "
 "sollte erwartungsgemäß ein paar Tage dauern, je nachdem wie schnell dein CPU "
@@ -1299,11 +1349,17 @@ msgstr ""
 "Ist es möglich, über einen Browser als anonymes WWW auf GNUnet zuzugreifen?"
 
 #: template/faq.html.j2:183
+#, fuzzy
+#| msgid ""
+#| "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
+#| "would make it accessible with a browser. It is possible to build such a "
+#| "proxy and all one needs to know is the protocol used between browser and "
+#| "proxy and a swift look at the GNUnet code for file-sharing."
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 "A: Derzeit gibt es keinen Proxy (wie fproxy in Freenet) für GNUnet, der es "
 "mit einem Browser zugänglich machen würde. Es wäre möglich einen solche "
@@ -1333,7 +1389,7 @@ msgstr ""
 
 #: template/faq.html.j2:210
 #, fuzzy
-msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr "Auf welchen Betriebssystemen läuft GNUnet?"
 
 #: template/faq.html.j2:212
@@ -1449,7 +1505,7 @@ msgstr ""
 
 #: template/faq.html.j2:286
 #, fuzzy
-msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr "Wie vergleicht sich GNS mit anderen Namenssystemen?"
 
 #: template/faq.html.j2:288
@@ -1458,10 +1514,10 @@ msgid ""
 "ns2018.pdf\">has been published </a> and below is a table from the "
 "publication. For detailed descriptions please refer to the paper."
 msgstr ""
-"A: Es gibt einen wissenschaftlicher Aufsatz zu diesem Thema: <a href=\"https"
-"://grothoff.org/christian/ns2018.pdf\">und</a> nachfolgend finden Sie eine "
-"Tabelle aus der Veröffentlichung. Für genaue Erklärungen verweisen wir dich "
-"auf den Aufsatz."
+"A: Es gibt einen wissenschaftlicher Aufsatz zu diesem Thema: <a href="
+"\"https://grothoff.org/christian/ns2018.pdf\">und</a> nachfolgend finden Sie "
+"eine Tabelle aus der Veröffentlichung. Für genaue Erklärungen verweisen wir "
+"dich auf den Aufsatz."
 
 #: template/faq.html.j2:392
 #, fuzzy
@@ -1469,15 +1525,25 @@ msgid "What is the difference between GNS and CoDoNS?"
 msgstr "Was ist der Unterschied zwischen GNS und CoDoNS?"
 
 #: template/faq.html.j2:394
+#, fuzzy
+#| msgid ""
+#| "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
+#| "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, "
+#| "and there are still registrars that determine who owns a name. <br><br> "
+#| "With GNS, we decentralize the database and also decentralize the "
+#| "responsibility for naming: each user runs his own personal root zone and "
+#| "is thus in complete control of the names he uses. GNS also has many "
+#| "additional features (to keep names short and enable migration) which "
+#| "don't even make sense in the context of CoDoNS."
 msgid ""
 "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 "A: CoDoNS dezentralisiert die DNS-Datenbank (mithilfe eines DHT), behält "
 "jedoch die Berechtigungsstruktur von DNS bei. Mit CoDoNS verbleiben IANA/"
@@ -1537,13 +1603,21 @@ msgid "What is the difference between GNS and Handshake?"
 msgstr "Was ist der Unterschied zwischen GNS und Handshake?"
 
 #: template/faq.html.j2:441
+#, fuzzy
+#| msgid ""
+#| "A: Handshake is a blockchain-based method for root zone governance. "
+#| "Hence, it does not address the name resolution process itself but "
+#| "delegates resolution into DNS after the initial TLD resolution. Not "
+#| "taking sustainablility considerations into account, handshake could be "
+#| "used as an additional supporting GNS root zone governance model but we "
+#| "currently do not have such plans in mind."
 msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 "A: Handshake ist eine Blockchain-basierte Methode für die Root-Zonen-"
 "Governance. Folglich betrifft es nicht den Prozess zur Namensauflösung "
@@ -1625,9 +1699,9 @@ msgid ""
 "to ignore this preference and use a name of their choice (or even assign no "
 "name) for this user."
 msgstr ""
-"A: Namen haben keine Eigentümer in GNS, daher kann es keinen "
-"&quot;legitimen&quot; Domaininhaber geben. Jeder Nutzer kann jeden Namen ("
-"als seinen präferierten Namen oder &quot;Pseudonym&quot;) in seinem NICK Log "
+"A: Namen haben keine Eigentümer in GNS, daher kann es keinen &quot;"
+"legitimen&quot; Domaininhaber geben. Jeder Nutzer kann jeden Namen (als "
+"seinen präferierten Namen oder &quot;Pseudonym&quot;) in seinem NICK Log "
 "beanspruchen. Auf ähnliche Art und Weise haben alle übrigen Nutzer die Wahl, "
 "diese Präferenz zu ignorieren und können einen von ihnen selbst bestimmten "
 "Namen (oder sogar gar keinen Namen) für diesen Nutzer verwenden."
@@ -1996,8 +2070,8 @@ msgid ""
 "'iptables: No chain/target/match by that name.' (when running gnunet-service-"
 "dns)?"
 msgstr ""
-"&quot;iptables: Keine Kette/ Ziel/Übereinstimmung mit diesem Namen.&quot; ("
-"beim Ausführen von gnunet-service-dns)?"
+"&quot;iptables: Keine Kette/ Ziel/Übereinstimmung mit diesem Namen.&quot; "
+"(beim Ausführen von gnunet-service-dns)?"
 
 #: template/faq.html.j2:724
 msgid ""
@@ -2066,8 +2140,8 @@ msgstr ""
 "Zeile \"/usr/local/lib/\" zu /etc/ld.so.conf hinzufügst und \"ldconfig\" "
 "laufen läßt. Falls du GNUnet zu /opt oder irgendeinen ähnlichen Pfad "
 "installiert hast, wirst du offensichtlich \"/usr/local\" entsprechend ändern "
-"müssen. Falls du keine 'root'-Rechte hast oder du GNUnet etwa unter \"/home/$"
-"USER/\" installiert hast, dann kannst du deinen Linker explizit anweisen, "
+"müssen. Falls du keine 'root'-Rechte hast oder du GNUnet etwa unter \"/home/"
+"$USER/\" installiert hast, dann kannst du deinen Linker explizit anweisen, "
 "ein bestimmtes Verzeichnis für Bibliotheken mittels der \"LD_LIBRARY_PATH\" "
 "Umgebungsvariablen abzusuchen. Z.B., solltest du GNUnet unter Verwendung "
 "eines Präfix \"$HOME/gnunet/\" konfiguriert haben, dann solltest du:"
@@ -2156,11 +2230,21 @@ msgstr ""
 "Publikationen (und vermutlich sogar den Code) lesen."
 
 #: template/faq.html.j2:915
+#, fuzzy
+#| msgid ""
+#| "Another important point of reference are the various anonymous peer-to-"
+#| "peer networks. Here, there are differences in terms of application domain "
+#| "and how specifically anonymity is achieved. Anonymous routing is a hard "
+#| "research topic, so for a superficial comparisson like this one we focus "
+#| "on the latency. Another important factor is the programming language. "
+#| "Type-safe languages may offer certain security benefits; however, this "
+#| "may come at the cost of significant increases in resource consumption "
+#| "which in turn may reduce anonymity."
 msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2215,14 +2299,14 @@ msgid ""
 "be difficult to impossible for an adversary to distinguish between the "
 "originating peer and all other peers."
 msgstr ""
-"A: Anonymität ist die fehlende Unterscheidung einer Person aus einer (großen)"
-" Gruppe. Ein zentrales Ziel des anonymen Datenaustausches in GNUnet ist es, "
-"alle Nutzer (Peers) in einer Gruppe zusammenzuführen und die Kommunikation "
-"innerhalb der Gruppe dann anonym zu machen; d.h. niemand (außer der "
-"Initiator) sollte in der Lage sein zu erkennen, von welchem der Peers der "
-"Gruppe eine Nachricht stammt. Mit anderen Worten, es sollte für einen Gegner "
-"schwierig bis unmöglich sein, zwischen dem ursprünglichen Peer und allen "
-"anderen Peers zu unterscheiden."
+"A: Anonymität ist die fehlende Unterscheidung einer Person aus einer "
+"(großen) Gruppe. Ein zentrales Ziel des anonymen Datenaustausches in GNUnet "
+"ist es, alle Nutzer (Peers) in einer Gruppe zusammenzuführen und die "
+"Kommunikation innerhalb der Gruppe dann anonym zu machen; d.h. niemand "
+"(außer der Initiator) sollte in der Lage sein zu erkennen, von welchem der "
+"Peers der Gruppe eine Nachricht stammt. Mit anderen Worten, es sollte für "
+"einen Gegner schwierig bis unmöglich sein, zwischen dem ursprünglichen Peer "
+"und allen anderen Peers zu unterscheiden."
 
 #: template/faq.html.j2:958
 #, fuzzy
@@ -2261,11 +2345,11 @@ msgid ""
 "result in the loss of permissions."
 msgstr ""
 "A: Zuerst müssen Sie ein Konto bei unserem Weblate-System registrieren. "
-"Bitte schicke eine Email mit der gewünschten Zielsprache an translators@"
-"gnunet.org oder frage nach Hilfe auf dem #gnunet chat auf irc.freenode.net. "
-"Typischerweise wird jemand mit ausreichender Autorisierung dir dann Zugang "
-"gewähren. Selbstverständlich führt ein Missbrauch zu einem Verlust der "
-"Berechtigungen."
+"Bitte schicke eine Email mit der gewünschten Zielsprache an "
+"translators@gnunet.org oder frage nach Hilfe auf dem #gnunet chat auf irc."
+"freenode.net. Typischerweise wird jemand mit ausreichender Autorisierung dir "
+"dann Zugang gewähren. Selbstverständlich führt ein Missbrauch zu einem "
+"Verlust der Berechtigungen."
 
 #: template/faq.html.j2:989
 #, fuzzy
@@ -2301,8 +2385,8 @@ msgstr ""
 "Sinne von \"Alter Egos\". Mehr als nur eine Identität haben zu können ist "
 "ein entscheidendes Merkmal, da wir eventuell unsere geschäftlichen Egos von "
 "denen, die wir für politische oder romantische Zwecke einsetzen, getrennt "
-"halten wollen.<br> Egos in GNUnet sind technisch äquivalent mit Identitäten ("
-"und der Code unterscheidet nicht zwischen ihnen). Manchmal benutzen wir "
+"halten wollen.<br> Egos in GNUnet sind technisch äquivalent mit Identitäten "
+"(und der Code unterscheidet nicht zwischen ihnen). Manchmal benutzen wir "
 "einfach den Ausdruck \"Ego\" um zu betonen, daß du mehr als eins haben "
 "kannst."
 
@@ -2568,8 +2652,8 @@ msgstr ""
 "Version von GnuTLS gelinkt sind. Daraus folgt, daß dieselbe Binärzelle gegen "
 "zwei verschiedene Versionen von GnuTLS gelinkt würde. Damit ist die "
 "Katastrophe vorprogrammiert. Folglich ist es erforderlich, um die "
-"Notwendigkeit der Aktualisierung dutzender Systembibliotheken zu umgehen ("
-"und dann auch noch jeweils zwei Versionen davon zu installieren), alle cURL-"
+"Notwendigkeit der Aktualisierung dutzender Systembibliotheken zu umgehen "
+"(und dann auch noch jeweils zwei Versionen davon zu installieren), alle cURL-"
 "Merkmale, die GNUnet nicht verwendet, außer Kraft zu setzen. Davon gibt es "
 "übrigens viele. Bei GNUnet sind die eher obskuren Protokolle, die von cURL "
 "unterstützt werden, fast toter Code --- meistens harmlos, aber nicht "
@@ -2658,8 +2742,8 @@ msgid ""
 "the original curl source have been written."
 msgstr ""
 "Projekte, die cURL nur für HTTP/HTTPS verwenden und mit GnuTLS funktionieren "
-"würden, sollten in der Lage sein, zu libgnurl zu wechseln, indem sie \"-"
-"lcurl\" in \"-lgnurl\" ändern. Mehr nicht. Es sollten keine Änderungen am "
+"würden, sollten in der Lage sein, zu libgnurl zu wechseln, indem sie \"-lcurl"
+"\" in \"-lgnurl\" ändern. Mehr nicht. Es sollten keine Änderungen am "
 "Quellcode nötig sein, da libgnurl eine Fehler-zu-Fehler-Kompatibilität mit "
 "den HTTP/HTTPS/GnuTLS-Untergruppen von cURL anstrebt. Wir könnten zu dieser "
 "wesentlichen Untergruppe neue Funktionen hinzufügen, falls solche "
@@ -2714,15 +2798,15 @@ msgid ""
 "\"https://nixos.org/nix/\">Nix</a>, and as www/gnurl in <a href=\"https://"
 "pkgsrc.org\">pkgsrc</a>."
 msgstr ""
-"Releases werden auf <a href=\"https://ftpmirror.gnu.org/gnu/gnunet/\""
-">ftpmirror.gnu.org/gnu/gnunet veröffentlicht</a>. gnurl ist über eine Reihe "
-"von Verteilungen und Paket-Managern erhältlich. Einige Paket-Manager, die "
-"gnurl einschließen, sind: <a href=\"https://www.gnu.org/software/guix/\">GNU "
-"Guix</a> (erhältlich als \"gnurl\"), <a href=\"https://gentoo.org\">Gentoo</"
-"a> über die kollaborative ebuild-Sammlung <a href=\"https://git.gnunet.org/"
-"youbroketheinternet-overlay.git/\">youbroketheinternet</a>,<a href=\"https"
-"://nixos.org/nix/\">Nix</a>, oder als www/gnurl in<a href=\"https://pkgsrc."
-"org\">pkgsrc</a>."
+"Releases werden auf <a href=\"https://ftpmirror.gnu.org/gnu/gnunet/"
+"\">ftpmirror.gnu.org/gnu/gnunet veröffentlicht</a>. gnurl ist über eine "
+"Reihe von Verteilungen und Paket-Managern erhältlich. Einige Paket-Manager, "
+"die gnurl einschließen, sind: <a href=\"https://www.gnu.org/software/guix/"
+"\">GNU Guix</a> (erhältlich als \"gnurl\"), <a href=\"https://gentoo.org"
+"\">Gentoo</a> über die kollaborative ebuild-Sammlung <a href=\"https://git."
+"gnunet.org/youbroketheinternet-overlay.git/\">youbroketheinternet</a>,<a "
+"href=\"https://nixos.org/nix/\">Nix</a>, oder als www/gnurl in<a href="
+"\"https://pkgsrc.org\">pkgsrc</a>."
 
 #: template/gnurl.html.j2:228
 #, fuzzy
@@ -2856,8 +2940,8 @@ msgid ""
 "\">bugs.gnunet.org</a>. Alternatively you can use our bug mailinglist, but "
 "we prefer to track bugs on the bugtracker."
 msgstr ""
-"Du kannst Fehler auf unserem Bug-Tracker <a href=\"https://bugs.gnunet.org/\""
-">bugs.gnunet.org</a>melden. Alternativ kannst du unsere Bug-Mailingliste "
+"Du kannst Fehler auf unserem Bug-Tracker <a href=\"https://bugs.gnunet.org/"
+"\">bugs.gnunet.org</a>melden. Alternativ kannst du unsere Bug-Mailingliste "
 "verwenden, aber wir ziehe es vor, Bugs auf dem Bug-Tracker zu verfolgen."
 
 #: template/gnurl.html.j2:395
@@ -2875,10 +2959,10 @@ msgid ""
 msgstr ""
 "gnurl/libgnurl sucht einen neuen Betreuer. Releases nach der Version 7.69.1 "
 "und bis zu Version 7.72.0 wurden mit dem OpenPGPKey <br>0xD6B570842F7E7F8D</"
-"br> unterschrieben (<a href=\"https://keys.openpgp.org/search?q="
-"6115012DEA3026F62A98A556D6B570842F7E7F8D\">keys.openpgp.or</a>), mit dem "
-"Schlüsselfingerabdruck <b>6115 012D EA30 26F6 2A98 A556 D6B5 7084 2F7E "
-"7F8D</br>."
+"br> unterschrieben (<a href=\"https://keys.openpgp.org/search?"
+"q=6115012DEA3026F62A98A556D6B570842F7E7F8D\">keys.openpgp.or</a>), mit dem "
+"Schlüsselfingerabdruck <b>6115 012D EA30 26F6 2A98 A556 D6B5 7084 2F7E 7F8D</"
+"br>."
 
 #: template/gsoc-2018-gnunet-webui.html.j2:7
 #, fuzzy
@@ -2950,26 +3034,27 @@ msgid ""
 "api.git/\">GNUnet REST API Docmentation Git</a>).<br /> Clone the repository "
 "and \"make html\". Then open the 'index.html' under 'build/html/'. </li>"
 msgstr ""
-"<li>Die in GNUnet entwickelte REST-API<br> Die REST-API ist bereits im gnunet"
-".git-Repository ( <a href=\"https://gnunet.org/git/gnunet.git/\">GNUnet Main "
-"Git</a> ) zusammengeführt.<br /> Um die neuen Funktionen zu nutzen, klonst "
-"du das Repository und folgst der <a href=\"https://gnunet.org/en/install."
-"html\">Installation</a> auf gnunet.org. Starte dann den Rest-Service mit "
-"\"gnunet-arm -i rest\". </li> <li> Die Web-Anwendung<br> Die Web-Anwendung "
-"ist verfügbar unter der GNUnet-webui.git-Repository (<a href=\"https://gnunet"
-".org/git/gnunet-webui.git/\">GNUnet WebUI Git</a>).<br /> Du mußt die neuste "
-"Version von 'node' und 'yarn' installieren. In Abhängigkeit von deinem "
-"System mußt du eventuell neuere Versionen herunterladen und manuell anstatt "
-"über deinen Paket-Manager installieren. Nach erfolgreicher Installation mußt "
-"du die Repository klonen. Anschließend läßt du \"yarn install\" und \"yarn "
-"start\" für Testzwecke laufen. Um die Webseite bereitzustellen (beachte "
-"dabei, daß diese Webseite mit einer weiteren lokalen Host-Instanz "
-"kommuniziert) benutzt du \"yarn build\", um die Webapplikationen zu bauen, "
-"und verwendest das Ergebnis im 'dist'-Verzeichnis. </li> <li> Die "
-"Dokumentation<br /> Die Dokumentation ist verfügbar unter der gnunet-rest-api"
-".git-Repository (<a href=\"https://gnunet.org/git/gnunet-rest-api.git/\""
-">GNUnet REST API Docmentation Git</a>).<br /> Klone die Repository und \"make"
-" html\". Dann öffnest du den 'index.html' unter 'build/html/'. </li>"
+"<li>Die in GNUnet entwickelte REST-API<br> Die REST-API ist bereits im "
+"gnunet.git-Repository ( <a href=\"https://gnunet.org/git/gnunet.git/"
+"\">GNUnet Main Git</a> ) zusammengeführt.<br /> Um die neuen Funktionen zu "
+"nutzen, klonst du das Repository und folgst der <a href=\"https://gnunet.org/"
+"en/install.html\">Installation</a> auf gnunet.org. Starte dann den Rest-"
+"Service mit \"gnunet-arm -i rest\". </li> <li> Die Web-Anwendung<br> Die Web-"
+"Anwendung ist verfügbar unter der GNUnet-webui.git-Repository (<a href="
+"\"https://gnunet.org/git/gnunet-webui.git/\">GNUnet WebUI Git</a>).<br /> Du "
+"mußt die neuste Version von 'node' und 'yarn' installieren. In Abhängigkeit "
+"von deinem System mußt du eventuell neuere Versionen herunterladen und "
+"manuell anstatt über deinen Paket-Manager installieren. Nach erfolgreicher "
+"Installation mußt du die Repository klonen. Anschließend läßt du \"yarn "
+"install\" und \"yarn start\" für Testzwecke laufen. Um die Webseite "
+"bereitzustellen (beachte dabei, daß diese Webseite mit einer weiteren "
+"lokalen Host-Instanz kommuniziert) benutzt du \"yarn build\", um die "
+"Webapplikationen zu bauen, und verwendest das Ergebnis im 'dist'-"
+"Verzeichnis. </li> <li> Die Dokumentation<br /> Die Dokumentation ist "
+"verfügbar unter der gnunet-rest-api.git-Repository (<a href=\"https://gnunet."
+"org/git/gnunet-rest-api.git/\">GNUnet REST API Docmentation Git</a>).<br /> "
+"Klone die Repository und \"make html\". Dann öffnest du den 'index.html' "
+"unter 'build/html/'. </li>"
 
 #: template/gsoc-2018-gnunet-webui.html.j2:91
 msgid ""
@@ -3103,12 +3188,11 @@ msgstr ""
 "Unterstützung der Nutzerauthentifizierung erweitert werden. Dieses schließt "
 "die korrekte Handhabung von Nutzerkontextschaltern ein. "
 "<ol><li>Implementiere Nutzerauthentifizierung.</li><li>Teste die "
-"Zugangskontrolle.</li><li>Dokumentiere die Veränderungen an der REST-"
-"API.</li></ol> Vorteilhafte Fähigkeiten/Sprachen/Systeme: <ol><li>C</"
-"li><li>Kenntnis von Nutzerauthentifizierungs-Subsystemen auf Linux/"
-"Unix.</li><li>REST/HTTP Authentifizierungsmethoden</li></ol><br/"
-"><strong>Niveau:</strong> Anfänger <br/><strong>Mentoren:</strong> Martin "
-"Schanzenbach"
+"Zugangskontrolle.</li><li>Dokumentiere die Veränderungen an der REST-API.</"
+"li></ol> Vorteilhafte Fähigkeiten/Sprachen/Systeme: <ol><li>C</"
+"li><li>Kenntnis von Nutzerauthentifizierungs-Subsystemen auf Linux/Unix.</"
+"li><li>REST/HTTP Authentifizierungsmethoden</li></ol><br/><strong>Niveau:</"
+"strong> Anfänger <br/><strong>Mentoren:</strong> Martin Schanzenbach"
 
 #: template/gsoc.html.j2:111
 msgid ""
@@ -3139,13 +3223,12 @@ msgstr ""
 "unterstützen. Die Schwierigkeit des Projekts hängt zum größten Teil von den "
 "Fähigkeiten der Studenten bzgl. Toolbau, Emscripten und Improvisation ab. "
 "Die unvollständige Aufgabenliste wäre: <ol><li>Verbessere den gegenwärtigen "
-"GNUnet Emscripten-Aufbau, um mehr Subsysteme "
-"unterzubringen.<li><li>Integriere das Ergebnis in eine "
-"Webextension.<li><li>Integriere das Ergebnis in die re:claim ID "
-"Webextension<li></ol> Vorteilhafte Kenntnisse/Sprachen/Systeme: "
-"<ol><li>C</li><li>emscripten</li><li>Webextensions</li></ol><br/"
-"><strong>Schwierigkeit:</strong> Herausfordernd <br/><strong>Mentoren:</"
-"<strong> Martin Schanzenbach"
+"GNUnet Emscripten-Aufbau, um mehr Subsysteme unterzubringen."
+"<li><li>Integriere das Ergebnis in eine Webextension.<li><li>Integriere das "
+"Ergebnis in die re:claim ID Webextension<li></ol> Vorteilhafte Kenntnisse/"
+"Sprachen/Systeme: <ol><li>C</li><li>emscripten</li><li>Webextensions</li></"
+"ol><br/><strong>Schwierigkeit:</strong> Herausfordernd <br/><strong>Mentoren:"
+"</<strong> Martin Schanzenbach"
 
 #: template/gsoc.html.j2:147
 msgid ""
@@ -3168,8 +3251,8 @@ msgstr ""
 "Derzeit sind die Schlüssel in unserer Statistikdatenbank zu umfangreich. Zum "
 "Beispiel: </p> <p> nse # flood messages received: 13<br/> nse # peers "
 "connected: 4<br/> nse # nodes in the network (estimate): 203<br/> nse # "
-"flood messages started: 5<br/> nse # estimated network diameter: 3<br/> nse #"
-" flood messages transmitted: 10<br/> </p> <p> Mit derart umfangreichen "
+"flood messages started: 5<br/> nse # estimated network diameter: 3<br/> nse "
+"# flood messages transmitted: 10<br/> </p> <p> Mit derart umfangreichen "
 "Schlüsseln gibt es keinen einfachen Weg, ein kompaktes JSON Dokument oder "
 "Einträge für eine Zeitreihendatenbank zu bilden. Und es lassen sich keine "
 "einzelnen Statistiken anfragen, ohne die Zeile exakt zu copypasten und in "
@@ -3178,10 +3261,10 @@ msgstr ""
 "werden können.</li> <li>Setze die Veränderung um und migriere die "
 "bestehenden Verwendungen.</li> <li>Dokumentiere das bzw. die Format(e) und "
 "definiere einen geeigneten Registrierungmechanismus für Bezeichner</li> </"
-"ol> Relevante Fehler: <a href=\"https://bugs.gnunet.org/view.php?id=5650\""
-">#5650</a><br/> Vorteilhafte Kenntnisse/Sprachen/Systeme: <ol> <li>C</li> "
-"<li>HTML</li> </ol> <br/> <strong>Schwierigkeit:</strong> Anfänger <br/> "
-"<strong>Mentoren:</strong> Martin Schanzenbach"
+"ol> Relevante Fehler: <a href=\"https://bugs.gnunet.org/view.php?"
+"id=5650\">#5650</a><br/> Vorteilhafte Kenntnisse/Sprachen/Systeme: <ol> "
+"<li>C</li> <li>HTML</li> </ol> <br/> <strong>Schwierigkeit:</strong> "
+"Anfänger <br/> <strong>Mentoren:</strong> Martin Schanzenbach"
 
 #: template/gsoc.html.j2:187
 msgid ""
@@ -3417,8 +3500,8 @@ msgstr ""
 "Chatrooms oder Kanäle.</li><li>Teile einen Beitrag (bearbeite und poste "
 "etwas woanders, zum Beispiel auf einer Fanseite).</li><li>Bearbeite einen "
 "zuvor veröffentlichten Beitrag und biete den Lesern einen "
-"Bearbeitungsverlauf an.</li><li> Kontrolliere wann die Kanalhistorie "
-"abläuft.</li></ul>"
+"Bearbeitungsverlauf an.</li><li> Kontrolliere wann die Kanalhistorie abläuft."
+"</li></ul>"
 
 #: template/gsoc.html.j2:404
 msgid ""
@@ -3544,8 +3627,8 @@ msgid ""
 "doid=62212.62213\">Ben-Or et al.</a> if possible. This in particular means "
 "moving libaboss to bignums (gcry_mpi)."
 msgstr ""
-"Verbesserung von Libaboss zur Berechnung gemeinsamer Geheimnisse ("
-"einschließlich wiederholter Multiplikation) basierend wenn möglich auf <a "
+"Verbesserung von Libaboss zur Berechnung gemeinsamer Geheimnisse "
+"(einschließlich wiederholter Multiplikation) basierend wenn möglich auf <a "
 "href=\"https://dl.acm.org/citation.cfm?doid=62212.62213\">Ben-Or et al.</a>. "
 "Insbesondere bedeutet dies, Libaboss zu Bignums zu bewegen (gcry_mpi)."
 
@@ -3570,8 +3653,8 @@ msgstr ""
 "Abhängigkeit von Python beseitigen. Das bestehende GNUnet-qr-Tool ist eine "
 "relativ einfache Hülle um Python-zbar, welches selber libzbar umhüllt. Das "
 "Ziel dieses Projekt ist es, libzbar direkt für des Scannen von QR-Codes für "
-"GNUnet / das GNU-Namen-System zu verwenden (siehe auch <a href=\"https://bugs"
-".gnunet.org/view.php?id=5562\">#5562</a>)."
+"GNUnet / das GNU-Namen-System zu verwenden (siehe auch <a href=\"https://"
+"bugs.gnunet.org/view.php?id=5562\">#5562</a>)."
 
 #: template/gsoc.html.j2:612
 msgid "<strong>Mentors:</strong> Christian Grothoff"
@@ -3930,8 +4013,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -3963,7 +4046,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
@@ -4083,6 +4166,9 @@ msgstr ""
 msgid "Videos related to GNUnet"
 msgstr ""
 
+#~ msgid "Living Standards"
+#~ msgstr "Lebensbedingungen"
+
 #, fuzzy
 #~| msgid "GNUnet"
 #~ msgid "Get off GNUnet"
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index e0a91168..daa24898 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-03 21:41+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-04-20 23:43+0000\n"
 "Last-Translator: Lucía López <lulopezcabrera@gmail.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"
@@ -32,7 +32,7 @@ msgstr "Estructura de GNU para redes p2p seguras"
 msgid "Contact"
 msgstr "Contacto"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr "GNUnet a. r."
 
@@ -147,10 +147,6 @@ msgstr "Glosario"
 msgid "Handbook"
 msgstr "Manual"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr "Estándares de vida"
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr "REST API"
@@ -373,8 +369,8 @@ 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 breve<a href=\"https://gnunet.org/en/glossary.html\"> "
+"las diversas capas, muchos <a href=\"https://gnunet.org/en/video.html"
+"\">videos</a> o un breve<a href=\"https://gnunet.org/en/glossary.html\"> "
 "glosario</a>."
 
 #: template/about.html.j2:95
@@ -455,12 +451,21 @@ msgid "The GNU Name System"
 msgstr "El Sistema de Nombres GNU"
 
 #: template/applications.html.j2:15
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"gns.html\">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. -->"
 msgid ""
 "The <a href=\"gns.html\">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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -577,11 +582,17 @@ msgid "Cadet-GTK"
 msgstr "Cadet-GTK"
 
 #: template/applications.html.j2:162
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> "
+#| "is a convenient but feature-rich graphical application providing "
+#| "messaging using especially the CADET subsystem. It is developed using GTK "
+#| "and libhandy for a convergent design."
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a>es "
 "una sencilla aplicación gráfica con abundantes herramientas, que ofrece un "
@@ -594,11 +605,16 @@ msgid "groupchat"
 msgstr "groupchat"
 
 #: template/applications.html.j2:182
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
+#| "terminal user interface providing messaging using especially the CADET "
+#| "subsystem. It is developed using nim. Cadet-GTK and groupchat are planned "
+#| "to be compatible."
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a>es una "
 "interfaz de usuario que proporciona un servicio de mensajería utilizando "
@@ -614,11 +630,18 @@ msgid "Foundations"
 msgstr "Fundamentos"
 
 #: template/architecture.html.j2:22
+#, fuzzy
+#| 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 (GNS) and a pluggable transport system (TRANSPORT).<br> "
+#| "Using public keys for addresses and self-organized decentralized routing "
+#| "algorithms, these subsystems replace the traditional TCP/IP stack."
 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 "Las bases de GNUnet son una tabla hash distribuida (R5N), una capa de "
@@ -632,9 +655,16 @@ msgid "Security"
 msgstr "Seguridad"
 
 #: template/architecture.html.j2:38
+#, fuzzy
+#| msgid ""
+#| "GNUnet is implemented using a multi-process architecture. Each subsystem "
+#| "runs as a separate process, providing fault-isolation and enabling tight "
+#| "permissions to be granted to each subsystem. Naturally, the "
+#| "implementation is a <a href=\"https://www.gnu.org/\">GNU</a> package, and "
+#| "will always remain free software."
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
-"runs as a separate process, providing fault-isolation and enabling tight "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -642,8 +672,8 @@ msgstr ""
 "GNUnet es implementado usando múltiples procesos de arquitectura. Cada "
 "subsistema se ejecuta como un proceso separado, proporcionando aislamiento "
 "de fallas y permitiendo que se otorguen permisos estrictos a cada "
-"subsistema. Naturalmente, la implementación es un paquete <a href=\"https"
-"://www.gnu.org/\">GNU</a> y siempre será de software libre."
+"subsistema. Naturalmente, la implementación es un paquete <a href=\"https://"
+"www.gnu.org/\">GNU</a> y siempre será de software libre."
 
 #: template/architecture.html.j2:52
 msgid "System architecture"
@@ -683,8 +713,8 @@ msgstr ""
 "Una lista pública de correo archivada por GNUnet está alojada en <a href="
 "\"https://lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists."
 "gnu.org/mailman/listinfo/gnunet-developers</a>.Puedes enviar mensajes a la "
-"lista usando la dirección <a href=\"mailto:gnunet-developers@gnu.org\""
-">gnunet-developers@gnu.org</a>."
+"lista usando la dirección <a href=\"mailto:gnunet-developers@gnu.org"
+"\">gnunet-developers@gnu.org</a>."
 
 #: template/contact.html.j2:23
 msgid "The IRC channel"
@@ -696,9 +726,9 @@ msgid ""
 "freenode.net</a>. There is also an <a href=\"https://view.matrix.org/room/!"
 "IjaAfLiruzjxFFzKAV:matrix.org/\">archive</a> available."
 msgstr ""
-"<tt>#gnunet</tt> es accesible a través de <a href=\"https://freenode.net\""
-">irc.freenode.net</a>. También hay un <a href=\"https://view.matrix.org/room/"
-"!IjaAfLiruzjxFFzKAV:matrix.org/\">archivo</a> disponible."
+"<tt>#gnunet</tt> es accesible a través de <a href=\"https://freenode.net"
+"\">irc.freenode.net</a>. También hay un <a href=\"https://view.matrix.org/"
+"room/!IjaAfLiruzjxFFzKAV:matrix.org/\">archivo</a> disponible."
 
 #: template/contact.html.j2:38
 msgid "Contacting individuals"
@@ -762,8 +792,8 @@ msgstr ""
 "de software libre, pero da a los desarrolladores libertad para intercambiar "
 "código entre GNUnet y GNU Taler sin preocuparse por las licencias o por la "
 "capacidad de la compañía para emitir licencias duales (por ejemplo, para que "
-"podamos distribuir en tiendas de aplicaciones hostiles al software "
-"libre).</p>"
+"podamos distribuir en tiendas de aplicaciones hostiles al software libre).</"
+"p>"
 
 #: template/copyright.html.j2:30
 msgid ""
@@ -827,9 +857,9 @@ msgid ""
 "detect regressions and check for portability at <a href=\"https://old.gnunet."
 "org/buildbot/gnunet/\">https://old.gnunet.org/buildbot/gnunet/</a>."
 msgstr ""
-"Usamos pruebas de automatización de <a href=\"https://buildbot.net/\""
-">Buildbot</a> para detectar regresiones y para verificar portabilidad en <a "
-"href=\"https://old.gnunet.org/buildbot/gnunet/\">https://old.gnunet.org/"
+"Usamos pruebas de automatización de <a href=\"https://buildbot.net/"
+"\">Buildbot</a> para detectar regresiones y para verificar portabilidad en "
+"<a href=\"https://old.gnunet.org/buildbot/gnunet/\">https://old.gnunet.org/"
 "buildbot/gnunet/</a>."
 
 #: template/developers.html.j2:59
@@ -844,8 +874,8 @@ msgid ""
 msgstr ""
 "Usamos <a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a> "
 "para analizar la cobertura del código de nuestras pruebas; los resultados "
-"están disponibles en <a href=\"https://old.gnunet.org/coverage/\">https://old"
-".gnunet.org/coverage/</a> ."
+"están disponibles en <a href=\"https://old.gnunet.org/coverage/\">https://"
+"old.gnunet.org/coverage/</a> ."
 
 #: template/developers.html.j2:72
 msgid "Performance Analysis"
@@ -942,6 +972,17 @@ msgid "Becoming a Member of GNUnet e.V."
 msgstr "Convertirse en miembro de GNUnet e.V."
 
 #: template/ev.html.j2:33
+#, fuzzy
+#| 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)."
 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 "
@@ -950,14 +991,14 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 "Los desarrolladores de GNUnet con acceso a git (escritura) pueden "
 "convertirse en miembros para participar en el proceso de decisión y apoyar "
 "formalmente a GNUnet e.V. Para ello, todo lo que tienes que hacer es "
-"actualizar el archivo <tt> members.txt </tt> del repositorio <a href=\"https"
-"://git.gnunet.org/gnunet-ev.git/\"> gnunet-ev </a>. No hay cuotas de "
+"actualizar el archivo <tt> members.txt </tt> del repositorio <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/\"> gnunet-ev </a>. No hay cuotas de "
 "membresía; sin embargo, se invita a que los miembros apoyen GNUnet e.V., y "
 "en particular a que contribuyan con su desarrollo técnico dentro de sus "
 "posibilidades. Para obtener más detalles, consulte el <a href=\"https://git."
@@ -969,23 +1010,33 @@ msgid "Governance"
 msgstr "Gobernanza"
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+#, fuzzy
+#| 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.org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists "
+#| "of: <dl><dt>Vorsitz</dt> <dd><a href=\"https://schanzen.eu\">Martin "
+#| "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</"
+#| "dd> <dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a "
+#| "href=\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </"
+#| "dd> </dl>"
+msgid ""
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
 "\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </dd> </dl>"
 msgstr ""
-"Puede encontrar nuestro \"Satzung\" y la lista de miembros en <a href=\"https"
-"://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\"> https://git.gnunet.org/"
-"gnunet-ev.git/tree/satzung.tex</a>. La actual junta directiva está formada "
-"por: <dl><dt>Vorsitz</dt><dd><a href=\"https://schanzen.eu\">Martin "
-"Schanzenbach</a></dd><dt>Stellvertretender "
-"Vorsitz</dt><dd>t3sserakt</dd><dt>Kassenwart</dt><dd>Florian "
-"Dold</dd><dt>Beisitzer</dt><dd><a href=\"https://grothoff.org/christian/\""
-">Christian Grothoff </a>, ch3 </dd> </dl>"
+"Puede encontrar nuestro \"Satzung\" y la lista de miembros en <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\"> https://git."
+"gnunet.org/gnunet-ev.git/tree/satzung.tex</a>. La actual junta directiva "
+"está formada por: <dl><dt>Vorsitz</dt><dd><a href=\"https://schanzen.eu"
+"\">Martin Schanzenbach</a></dd><dt>Stellvertretender Vorsitz</"
+"dt><dd>t3sserakt</dd><dt>Kassenwart</dt><dd>Florian Dold</dd><dt>Beisitzer</"
+"dt><dd><a href=\"https://grothoff.org/christian/\">Christian Grothoff </a>, "
+"ch3 </dd> </dl>"
 
 #: template/ev.html.j2:73
 msgid "Official Meeting Notes"
@@ -1098,8 +1149,8 @@ msgid ""
 "you believe a bug is sensitive, you can set its view status to private (this "
 "should be the exception)."
 msgstr ""
-"R: Damos seguimiento a la lista de \"bugs\" conocidos en el <a href=\"https"
-"://bugs.gnunet.org/\">Sistema Mantis</a>. En ocasiones, se informa de "
+"R: Damos seguimiento a la lista de \"bugs\" conocidos en el <a href="
+"\"https://bugs.gnunet.org/\">Sistema Mantis</a>. En ocasiones, se informa de "
 "algunos errores directamente a los programadores o a la lista de correo de "
 "desarrolladores. Se desaconseja esto, ya que los desarrolladores a menudo no "
 "tienen tiempo para enviar estos errores a la base de datos de Mantis. "
@@ -1142,9 +1193,9 @@ msgstr ""
 "un intruso organizar un ataque Sybil en la estimación del tamaño de la red). "
 "Se espera que los cálculos se realicen en varios días, dependiendo de lo "
 "rápido que sea tu CPU. Si la carga del CPU te produce un problema, puedes "
-"especificar un valor mayor de &quot;WORKDELAY&quot; en la sección "
-"&quot;nse&quot; de tu archivo de configuración. El valor por defecto es "
-"&quot;5 ms&quot;."
+"especificar un valor mayor de &quot;WORKDELAY&quot; en la sección &quot;"
+"nse&quot; de tu archivo de configuración. El valor por defecto es &quot;5 "
+"ms&quot;."
 
 #: template/faq.html.j2:99
 msgid "How does GNUnet compare to Tor?"
@@ -1261,11 +1312,17 @@ msgstr ""
 "¿Es posible acceder a GNUnet desde un navegador de internet en modo anónimo?"
 
 #: template/faq.html.j2:183
+#, fuzzy
+#| msgid ""
+#| "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
+#| "would make it accessible with a browser. It is possible to build such a "
+#| "proxy and all one needs to know is the protocol used between browser and "
+#| "proxy and a swift look at the GNUnet code for file-sharing."
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 "R: Actualmente no hay ningún proxy, como el proxy libre de Freenet, que "
 "permita acceder a GNUnet con un navegador. Es posible desarrollar semejante "
@@ -1294,7 +1351,9 @@ msgstr ""
 "separado, ya que la instalación requiere que la red de pares se detenga."
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+#, fuzzy
+#| msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr "¿Sobre qué sistemas operativos se ejecuta GNUnet?"
 
 #: template/faq.html.j2:212
@@ -1402,7 +1461,9 @@ msgstr ""
 "cualquier otra zona delegada a ésta alcanzará una resolución adecuada."
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+#, fuzzy
+#| msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr "¿Cómo se compara GNS a otros sistemas de nombres de dominio?"
 
 #: template/faq.html.j2:288
@@ -1421,15 +1482,25 @@ msgid "What is the difference between GNS and CoDoNS?"
 msgstr "¿Cuál es la diferencia entre GNS y CoDoNS?"
 
 #: template/faq.html.j2:394
+#, fuzzy
+#| msgid ""
+#| "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
+#| "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, "
+#| "and there are still registrars that determine who owns a name. <br><br> "
+#| "With GNS, we decentralize the database and also decentralize the "
+#| "responsibility for naming: each user runs his own personal root zone and "
+#| "is thus in complete control of the names he uses. GNS also has many "
+#| "additional features (to keep names short and enable migration) which "
+#| "don't even make sense in the context of CoDoNS."
 msgid ""
 "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 "R: CoDoNS descentraliza la base de datos de DNS (usando DHT), pero preserva "
 "su estructura de mando. Con CoDoNS, IANA/ICANN aún están bajo control, y "
@@ -1486,13 +1557,21 @@ msgid "What is the difference between GNS and Handshake?"
 msgstr "¿Cuál es la diferencia entre GNS y Handshake?"
 
 #: template/faq.html.j2:441
+#, fuzzy
+#| msgid ""
+#| "A: Handshake is a blockchain-based method for root zone governance. "
+#| "Hence, it does not address the name resolution process itself but "
+#| "delegates resolution into DNS after the initial TLD resolution. Not "
+#| "taking sustainablility considerations into account, handshake could be "
+#| "used as an additional supporting GNS root zone governance model but we "
+#| "currently do not have such plans in mind."
 msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 "R: Handshake es un método desarrollado a partir de \"blockchain\" para la "
 "gobernanza de la zona raíz. Por lo tanto, no gestiona el proceso de "
@@ -1575,10 +1654,10 @@ msgid ""
 msgstr ""
 "R: Los nombres no tienen propietario en GNS, por lo que no puede haber un "
 "propietario &quot;legítimo&quot; de dominio. Cualquier usuario puede "
-"reclamar cualquier nombre (como su nombre preferido o &quot;seudónimo &quot;)"
-" en su registro NICK. Del mismo modo, todos los demás usuarios pueden optar "
-"por ignorar esta preferencia y utilizar un nombre de su elección (o incluso "
-"no asignar ningún nombre) para este usuario."
+"reclamar cualquier nombre (como su nombre preferido o &quot;seudónimo "
+"&quot;) en su registro NICK. Del mismo modo, todos los demás usuarios pueden "
+"optar por ignorar esta preferencia y utilizar un nombre de su elección (o "
+"incluso no asignar ningún nombre) para este usuario."
 
 #: template/faq.html.j2:498
 msgid ""
@@ -1620,8 +1699,8 @@ msgstr ""
 "debido a la escasez de direcciones IPv4, y que (b) los LEHO solo son útiles "
 "en el contexto del alojamiento virtual. Sin embargo, los LEHO también son "
 "útiles para ayudar con la validación del certificado X.509 (ya que "
-"especifican para qué nombre de host heredado debe ser válido el certificado)"
-". Además, incluso con IPv6 completamente implementado y las "
+"especifican para qué nombre de host heredado debe ser válido el "
+"certificado). Además, incluso con IPv6 completamente implementado y las "
 "&quot;infinitas&quot; direcciones IP disponibles, no estamos seguros de que "
 "el alojamiento virtual desaparezca. Por último, no queremos tener que "
 "esperar a que IPv6 se convierta en algo común. GNS debería funcionar con las "
@@ -1758,11 +1837,11 @@ msgid ""
 "was able to reassign the management of the country-TLDs of Afganistan and "
 "Iraq during the wars at the beginning of the 21st century."
 msgstr ""
-"R: Decimos que el DNS está 'centralizado' porque tiene un componente central "
-"/ punto central de falla --- la zona raíz y su administración por parte de "
-"IANA / ICANN. Esta centralización crea vulnerabilidades. Por ejemplo, el "
-"gobierno de EE. UU. pudo modificar la gestión nacional de los TLD en "
-"Afganistán e Irak durante las guerras de principios del siglo XXI."
+"R: Decimos que el DNS está 'centralizado' porque tiene un componente "
+"central / punto central de falla --- la zona raíz y su administración por "
+"parte de IANA / ICANN. Esta centralización crea vulnerabilidades. Por "
+"ejemplo, el gobierno de EE. UU. pudo modificar la gestión nacional de los "
+"TLD en Afganistán e Irak durante las guerras de principios del siglo XXI."
 
 #: template/faq.html.j2:613
 msgid "How does GNS protect against layer-3 censorship?"
@@ -1784,10 +1863,10 @@ msgstr ""
 "ayuda de forma indirecta de dos maneras : <ol> <li> Hoy en día, muchos "
 "sitios web usan alojamiento virtual, por lo que bloquear una dirección IP "
 "causa mayor daño colateral que bloquear un nombre DNS. Esto aumenta el costo "
-"de la censura. </li> <li> Las soluciones de evasión de capa 3 existentes ("
-"como Tor) se beneficiarían de un sistema de nombres resistente a la censura. "
-"En la actualidad, para acceder a la &quot;.onion&quot; del espacio de "
-"nombres de Tor, es necesario que los usuarios usen identificadores "
+"de la censura. </li> <li> Las soluciones de evasión de capa 3 existentes "
+"(como Tor) se beneficiarían de un sistema de nombres resistente a la "
+"censura. En la actualidad, para acceder a la &quot;.onion&quot; del espacio "
+"de nombres de Tor, es necesario que los usuarios usen identificadores "
 "criptográficos nada memorables. Con nombres más agradables, los servicios "
 "tipo Tor y tor2web serían aún más fáciles de usar. </ol>"
 
@@ -1882,10 +1961,10 @@ msgid ""
 "record type) to it."
 msgstr ""
 "R: Cuando GNS divide un nombre de dominio en etiquetas para su resolución, "
-"detecta la sintaxis del &quot; _Service._Proto&quot;, convierte "
-"&quot;Service&quot; al número de puerto correspondiente y &quot;Proto&quot; "
-"al número de protocolo correspondiente. El resto del nombre se resuelve como "
-"de costumbre. Luego, cuando se presenta el resultado, GNS busca el tipo de "
+"detecta la sintaxis del &quot; _Service._Proto&quot;, convierte &quot;"
+"Service&quot; al número de puerto correspondiente y &quot;Proto&quot; al "
+"número de protocolo correspondiente. El resto del nombre se resuelve como de "
+"costumbre. Luego, cuando se presenta el resultado, GNS busca el tipo de "
 "registro específico de GNS &quot;BOX&quot;. Un registro BOX es un registro "
 "que contiene otro registro (como registros SRV o TLSA) y le agrega un número "
 "de servicio y protocolo (y el tipo de registro en caja original)."
@@ -2043,18 +2122,18 @@ msgstr ""
 "prioridad. Procuramos producir una red con características de seguridad "
 "comprensibles. Muchas otras redes P2P se encuentran abiertas a una gran "
 "variedad de ataques y los usuarios tienen poca privacidad. GNUnet también es "
-"un Software Gratuito, por lo tanto, su código fuente se encuentra disponible;"
-" de esta forma no tendrá que preocuparse de ser espiado por el software. La "
-"siguiente tabla resume las principales diferencias entre GNUnet y otros "
-"sistemas; la información es precisa a nuestro entendimiento. La comparación "
-"es difícil ya que, algunas veces, existen diferencias entre múltiples "
-"implementaciones de (casi) el mismo protocolo. En general, seleccionamos una "
-"implementación libre como la referencia de implementación, debido a que es "
-"posible inspeccionar el código libre; también, todos estos sistemas se "
-"encuentran cambiando con el tiempo, por lo tanto, los datos a continuación "
-"podrían no encontrarse actualizados. Si encuentra errores por favor "
-"háganoslo saber. Finalmente, la tabla no aporta mucho (es difícil comparar "
-"estos sistemas de forma tan breve), así que, si desea conocer las "
+"un Software Gratuito, por lo tanto, su código fuente se encuentra "
+"disponible; de esta forma no tendrá que preocuparse de ser espiado por el "
+"software. La siguiente tabla resume las principales diferencias entre GNUnet "
+"y otros sistemas; la información es precisa a nuestro entendimiento. La "
+"comparación es difícil ya que, algunas veces, existen diferencias entre "
+"múltiples implementaciones de (casi) el mismo protocolo. En general, "
+"seleccionamos una implementación libre como la referencia de implementación, "
+"debido a que es posible inspeccionar el código libre; también, todos estos "
+"sistemas se encuentran cambiando con el tiempo, por lo tanto, los datos a "
+"continuación podrían no encontrarse actualizados. Si encuentra errores por "
+"favor háganoslo saber. Finalmente, la tabla no aporta mucho (es difícil "
+"comparar estos sistemas de forma tan breve), así que, si desea conocer las "
 "diferencias reales, lea los artículos de investigación (y probablemente el "
 "código)."
 
@@ -2063,7 +2142,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2589,8 +2668,8 @@ msgid ""
 msgstr ""
 "gnurl/libgnurl está buscando un nuevo mantenedor. Los lanzamientos tras la "
 "versión 7.69.1 y hasta la versión 7.72.0 se firmaron con la clave OpenPGP "
-"Key <b>0xD6B570842F7E7F8D</b><a href=\"https://keys.openpgp.org/search?q="
-"6115012DEA3026F62A98A556D6B570842F7E7F8D\">keys.openpgp.org</a>, con la "
+"Key <b>0xD6B570842F7E7F8D</b><a href=\"https://keys.openpgp.org/search?"
+"q=6115012DEA3026F62A98A556D6B570842F7E7F8D\">keys.openpgp.org</a>, con la "
 "huella digital de clave pública,<b>6115 012D EA30 26F6 2A98 A556 D6B5 7084 "
 "2F7E 7F8D</b>."
 
@@ -3410,8 +3489,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -3443,7 +3522,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
@@ -3561,6 +3640,9 @@ msgstr ""
 msgid "Videos related to GNUnet"
 msgstr ""
 
+#~ msgid "Living Standards"
+#~ msgstr "Estándares de vida"
+
 #, fuzzy
 #~| msgid "What is GNUnet?"
 #~ msgid "Get off GNUnet"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index ab4c15ef..75b90f04 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/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-03 21:41+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-04-20 23:43+0000\n"
 "Last-Translator: Edhyne Dablé <edhyne.dable@gmail.com>\n"
-"Language-Team: French <http://weblate.taler.net/projects/gnunet/website/fr/>"
-"\n"
+"Language-Team: French <http://weblate.taler.net/projects/gnunet/website/fr/"
+">\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr "Système GNU pour un réseau p2p sécurisé"
 msgid "Contact"
 msgstr "Contact"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr "GNUnet e.V."
 
@@ -147,11 +147,6 @@ msgstr "Glossaire"
 msgid "Handbook"
 msgstr "Manuel"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-#, fuzzy
-msgid "Living Standards"
-msgstr "Standards"
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr "API REST"
@@ -233,9 +228,9 @@ msgstr ""
 "A cause des choix de conception fondamentaux d'Internet, le trafic Internet "
 "peut être détourné, intercepté, censuré et manipulé par des des routeurs "
 "malveillants sur le réseau. Et en effet, le réseau Internet moderne a évolué "
-"précisément jusqu'au point où, comme dit Matthew Green, <a href=\"https"
-"://blog.cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"le"
-" réseau est malveillant\"</a>."
+"précisément jusqu'au point où, comme dit Matthew Green, <a href=\"https://"
+"blog.cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"le "
+"réseau est malveillant\"</a>."
 
 #: template/about.html.j2:41
 msgid ""
@@ -270,7 +265,8 @@ msgstr ""
 msgid ""
 "GNUnet must minimize the amount of personally identifiable information "
 "exposed."
-msgstr "GNUnet doit exposer le moins possible de données à caractère personnel."
+msgstr ""
+"GNUnet doit exposer le moins possible de données à caractère personnel."
 
 #: template/about.html.j2:61
 msgid ""
@@ -314,7 +310,8 @@ msgstr ""
 #: template/about.html.j2:67
 #, fuzzy
 msgid "The GNUnet architecture must be resource efficient."
-msgstr "L'architecture de GNUnet doit avoir recourt à des ressources efficaces."
+msgstr ""
+"L'architecture de GNUnet doit avoir recourt à des ressources efficaces."
 
 #: template/about.html.j2:68
 msgid ""
@@ -346,20 +343,20 @@ msgstr ""
 "Vous trouverez davantage d'informations dans notre <a href=\"https://docs."
 "gnunet.org/handbook/gnunet.html\">manuel</a>, en particulier dans le <a href="
 "\"https://docs.gnunet.org/handbook/gnunet.html#Key-Concepts\">chapitre sur "
-"les \"Concepts Clés\"</a>, qui explique les concepts fondamentaux de GNUnet :"
-" <ul> <li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#"
-"Authentication\">Authentification</a></li> <li><a href=\"https://docs.gnunet."
-"org/handbook/gnunet.html#Accounting-to-Encourage-Resource-Sharing\""
-">Comptabilité pour favoriser le partage des ressources</a></li> <li><a href="
-"\"https://docs.gnunet.org/handbook/gnunet.html#Confidentiality\""
-">Confidentialité</a></li> <li><a href=\"https://docs.gnunet.org/handbook/"
+"les \"Concepts Clés\"</a>, qui explique les concepts fondamentaux de "
+"GNUnet : <ul> <li><a href=\"https://docs.gnunet.org/handbook/gnunet."
+"html#Authentication\">Authentification</a></li> <li><a href=\"https://docs."
+"gnunet.org/handbook/gnunet.html#Accounting-to-Encourage-Resource-Sharing"
+"\">Comptabilité pour favoriser le partage des ressources</a></li> <li><a "
+"href=\"https://docs.gnunet.org/handbook/gnunet.html#Confidentiality"
+"\">Confidentialité</a></li> <li><a href=\"https://docs.gnunet.org/handbook/"
 "gnunet.html#Anonymity\">Annonymat</a></li> <li><a href=\"https://docs.gnunet."
 "org/handbook/gnunet.html#Deniability\">Deni de responsabilité</a></li> "
-"<li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#Peer-Identities\""
-">Qui sont nos pairs ?</a></li> <li><a href=\"https://docs.gnunet.org/"
-"handbook/gnunet.html#Zones-in-the-GNU-Name-System-_0028GNS-Zones_0029\""
-">Zones du GNU Name System (GNS Zones)</a></li> <li><a href=\"https://docs."
-"gnunet.org/handbook/gnunet.html#Egos\">Egos</a></li> </ul>"
+"<li><a href=\"https://docs.gnunet.org/handbook/gnunet.html#Peer-Identities"
+"\">Qui sont nos pairs ?</a></li> <li><a href=\"https://docs.gnunet.org/"
+"handbook/gnunet.html#Zones-in-the-GNU-Name-System-_0028GNS-"
+"Zones_0029\">Zones du GNU Name System (GNS Zones)</a></li> <li><a href="
+"\"https://docs.gnunet.org/handbook/gnunet.html#Egos\">Egos</a></li> </ul>"
 
 #: template/about.html.j2:88
 msgid "More Resources"
@@ -378,8 +375,8 @@ msgstr ""
 "\"https://docs.gnunet.org/handbook/gnunet.html\">manuel</a>, comme la <a "
 "href=\"https://bib.gnunet.org/\">bibliographie</a> avec des articles "
 "traitant des différents cas, plusieurs <a href=\"https://gnunet.org/en/video."
-"html\">vidéos</a> ou un <a href=\"https://gnunet.org/en/glossary.html\""
-">glossaire</a> court."
+"html\">vidéos</a> ou un <a href=\"https://gnunet.org/en/glossary.html"
+"\">glossaire</a> court."
 
 #: template/about.html.j2:95
 msgid ""
@@ -468,7 +465,7 @@ msgid ""
 "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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -583,11 +580,17 @@ msgid "Cadet-GTK"
 msgstr "Cadet-GTK"
 
 #: template/applications.html.j2:162
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> "
+#| "is a convenient but feature-rich graphical application providing "
+#| "messaging using especially the CADET subsystem. It is developed using GTK "
+#| "and libhandy for a convergent design."
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> est "
 "une interface graphique modeste mais riche en caractéristiques qui fournit "
@@ -600,11 +603,16 @@ msgid "groupchat"
 msgstr "groupe de chat"
 
 #: template/applications.html.j2:182
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
+#| "terminal user interface providing messaging using especially the CADET "
+#| "subsystem. It is developed using nim. Cadet-GTK and groupchat are planned "
+#| "to be compatible."
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> est un "
 "terminal d'interface utilisateur qui fournit ds services de messagerie en "
@@ -620,28 +628,42 @@ msgid "Foundations"
 msgstr "Bases"
 
 #: template/architecture.html.j2:22
+#, fuzzy
+#| 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 (GNS) and a pluggable transport system (TRANSPORT).<br> "
+#| "Using public keys for addresses and self-organized decentralized routing "
+#| "algorithms, these subsystems replace the traditional TCP/IP stack."
 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 "GNUnet repose sur une table de hachage distribuée (R5N), une couche de "
 "messagerie codée de bout en bout (CADET) similaire à SCPT, une "
 "infrastructure à clé publique (GNS) et un système de transport branchable "
-"(TRANSPORT). <br> À l’aide de clés publiques pour les adresses et d’"
-"algorithmes de routage décentralisés autonomes, ces sous-systèmes remplacent "
-"la pile TCP/IP traditionnelle."
+"(TRANSPORT). <br> À l’aide de clés publiques pour les adresses et "
+"d’algorithmes de routage décentralisés autonomes, ces sous-systèmes "
+"remplacent la pile TCP/IP traditionnelle."
 
 #: template/architecture.html.j2:35
 msgid "Security"
 msgstr "Sécurité"
 
 #: template/architecture.html.j2:38
+#, fuzzy
+#| msgid ""
+#| "GNUnet is implemented using a multi-process architecture. Each subsystem "
+#| "runs as a separate process, providing fault-isolation and enabling tight "
+#| "permissions to be granted to each subsystem. Naturally, the "
+#| "implementation is a <a href=\"https://www.gnu.org/\">GNU</a> package, and "
+#| "will always remain free software."
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
-"runs as a separate process, providing fault-isolation and enabling tight "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -649,8 +671,8 @@ msgstr ""
 "GNUnet est implanté grâce à une architecture multi-procédés. Chaque sous-"
 "système fonctionne comme procédé à part, ce qui permet d'isoler les défauts "
 "et de garantir les permissions strictes pour chaque sous-système. "
-"Naturellement, l’exécution est un progiciel <a href=\"https://www.gnu.org/\""
-">GNU</a>, et restera toujours un logiciel libre."
+"Naturellement, l’exécution est un progiciel <a href=\"https://www.gnu.org/"
+"\">GNU</a>, et restera toujours un logiciel libre."
 
 #: template/architecture.html.j2:52
 msgid "System architecture"
@@ -690,8 +712,8 @@ msgstr ""
 "Une liste mailing archivée et publique pour GNUnet est hébergée à <a href="
 "\"https://lists.gnu.org/mailman/listinfo/gnunet-developers\">https://lists."
 "gnu.org/mailman/listinfo/gnunet-developers</a>. Vous pouvez envoyer un "
-"message à cette liste ici :<a href=\"mailto:gnunet-developers@gnu.org\""
-">gnunet-developers@gnu.org</a>."
+"message à cette liste ici :<a href=\"mailto:gnunet-developers@gnu.org"
+"\">gnunet-developers@gnu.org</a>."
 
 #: template/contact.html.j2:23
 msgid "The IRC channel"
@@ -704,8 +726,8 @@ msgid ""
 "IjaAfLiruzjxFFzKAV:matrix.org/\">archive</a> available."
 msgstr ""
 "<tt>#gnunet</tt> est accessible depuis <a href=\"https://freenode.net\">irc."
-"freenode.net</a>. Les <a href=\"https://view.matrix.org/room/"
-"!IjaAfLiruzjxFFzKAV:matrix.org/\">archives</a> sont également disponibles."
+"freenode.net</a>. Les <a href=\"https://view.matrix.org/room/!"
+"IjaAfLiruzjxFFzKAV:matrix.org/\">archives</a> sont également disponibles."
 
 #: template/contact.html.j2:38
 msgid "Contacting individuals"
@@ -901,8 +923,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 
 #: template/ev.html.j2:52
@@ -911,9 +933,9 @@ msgstr ""
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
@@ -1120,9 +1142,9 @@ msgstr ""
 #: template/faq.html.j2:183
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 
 #: template/faq.html.j2:195
@@ -1138,7 +1160,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr ""
 
 #: template/faq.html.j2:212
@@ -1209,7 +1231,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr ""
 
 #: template/faq.html.j2:288
@@ -1229,10 +1251,10 @@ msgid ""
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 
 #: template/faq.html.j2:410
@@ -1271,9 +1293,9 @@ msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 
 #: template/faq.html.j2:453
@@ -1651,7 +1673,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2896,8 +2918,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -2929,7 +2951,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
@@ -3042,3 +3064,7 @@ msgstr ""
 #: template/video.html.j2:12
 msgid "Videos related to GNUnet"
 msgstr "Vidéos en lien avec GNUnet"
+
+#, fuzzy
+#~ msgid "Living Standards"
+#~ msgstr "Standards"
diff --git a/locale/hi/LC_MESSAGES/messages.po b/locale/hi/LC_MESSAGES/messages.po
index 51fbf8f5..1ed97f22 100644
--- a/locale/hi/LC_MESSAGES/messages.po
+++ b/locale/hi/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-03-09 18:35+0000\n"
 "Last-Translator: Jigisha Sharma <jigishas38@gmail.com>\n"
 "Language-Team: Hindi <http://weblate.taler.net/projects/gnunet/website/hi/>\n"
@@ -31,7 +31,7 @@ msgstr "कम्प्यूटिंग का ढाँचा सुरक्
 msgid "Contact"
 msgstr "सम्पर्क"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr "कम्प्यूटिंग नेट ई.वी."
 
@@ -146,10 +146,6 @@ msgstr "शब्दकोष"
 msgid "Handbook"
 msgstr "पुस्तिका"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr "जीवन स्तर"
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr "र.ई.एस.टी ए .पी .इ"
@@ -376,7 +372,7 @@ msgid ""
 "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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -462,8 +458,8 @@ msgstr ""
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 
 #: template/applications.html.j2:180
@@ -473,9 +469,8 @@ msgstr ""
 #: template/applications.html.j2:182
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 
 #: template/architecture.html.j2:6
@@ -491,7 +486,7 @@ 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
@@ -502,7 +497,7 @@ msgstr ""
 #: 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 "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -744,8 +739,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 
 #: template/ev.html.j2:52
@@ -754,9 +749,9 @@ msgstr ""
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
@@ -965,9 +960,9 @@ msgstr ""
 #: template/faq.html.j2:183
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 
 #: template/faq.html.j2:195
@@ -983,7 +978,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr ""
 
 #: template/faq.html.j2:212
@@ -1054,7 +1049,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr ""
 
 #: template/faq.html.j2:288
@@ -1074,10 +1069,10 @@ msgid ""
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 
 #: template/faq.html.j2:410
@@ -1116,9 +1111,9 @@ msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 
 #: template/faq.html.j2:453
@@ -1496,7 +1491,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2741,8 +2736,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -2774,7 +2769,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
@@ -2887,3 +2882,6 @@ msgstr ""
 #: template/video.html.j2:12
 msgid "Videos related to GNUnet"
 msgstr ""
+
+#~ msgid "Living Standards"
+#~ msgstr "जीवन स्तर"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 2cc31d8b..296d3e03 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-04-25 04:48+0000\n"
 "Last-Translator: Francesca Cipriani <cesca.cipriani@gmail.com>\n"
-"Language-Team: Italian <http://weblate.taler.net/projects/gnunet/website/it/>"
-"\n"
+"Language-Team: Italian <http://weblate.taler.net/projects/gnunet/website/it/"
+">\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr "Il contesto operativo dello GNU per un sicuro p2p networking"
 msgid "Contact"
 msgstr "Contatti"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr "GNUnet e V."
 
@@ -147,10 +147,6 @@ msgstr "Glossario"
 msgid "Handbook"
 msgstr "Manuale"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr "Standard di vita"
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr "API REST"
@@ -453,12 +449,21 @@ msgid "The GNU Name System"
 msgstr "Il GNU Name System"
 
 #: template/applications.html.j2:15
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"gns.html\">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. -->"
 msgid ""
 "The <a href=\"gns.html\">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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -574,11 +579,17 @@ msgid "Cadet-GTK"
 msgstr "Cadet-GTK"
 
 #: template/applications.html.j2:162
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> "
+#| "is a convenient but feature-rich graphical application providing "
+#| "messaging using especially the CADET subsystem. It is developed using GTK "
+#| "and libhandy for a convergent design."
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> è "
 "un'applicazione grafica conveniente ma allo stesso tempo ricca di "
@@ -591,11 +602,16 @@ msgid "groupchat"
 msgstr "groupchat"
 
 #: template/applications.html.j2:182
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
+#| "terminal user interface providing messaging using especially the CADET "
+#| "subsystem. It is developed using nim. Cadet-GTK and groupchat are planned "
+#| "to be compatible."
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> è un "
 "terminale di interfaccia utente che fornisce messaggistica utilizzando in "
@@ -611,11 +627,18 @@ msgid "Foundations"
 msgstr "Foundations"
 
 #: template/architecture.html.j2:22
+#, fuzzy
+#| 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 (GNS) and a pluggable transport system (TRANSPORT).<br> "
+#| "Using public keys for addresses and self-organized decentralized routing "
+#| "algorithms, these subsystems replace the traditional TCP/IP stack."
 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 "Le basi di GNUnet sono una tabella hash distribuita (R5N), un livello di "
@@ -630,17 +653,24 @@ msgid "Security"
 msgstr "Sicurezza"
 
 #: template/architecture.html.j2:38
+#, fuzzy
+#| msgid ""
+#| "GNUnet is implemented using a multi-process architecture. Each subsystem "
+#| "runs as a separate process, providing fault-isolation and enabling tight "
+#| "permissions to be granted to each subsystem. Naturally, the "
+#| "implementation is a <a href=\"https://www.gnu.org/\">GNU</a> package, and "
+#| "will always remain free software."
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
-"runs as a separate process, providing fault-isolation and enabling tight "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
 msgstr ""
 "GNUnet è implementato con un’architettura multiprocesso. Ogni sottosistema "
 "viene eseguito come un processo separato, permettendo l’isolamento degli "
-"errori e la concessione di autorizzazioni limitate a ciascun sottosistema. L’"
-"implementazione è un pacchetto <a href=\"https://www.gnu.org/\">GNU</a>, "
+"errori e la concessione di autorizzazioni limitate a ciascun sottosistema. "
+"L’implementazione è un pacchetto <a href=\"https://www.gnu.org/\">GNU</a>, "
 "quindi sarà sempre un software gratuito."
 
 #: template/architecture.html.j2:52
@@ -681,8 +711,8 @@ msgstr ""
 "All'indirizzo <a href=\"https://lists.gnu.org/mailman/listinfo/gnunet-"
 "developers\">https://lists.gnu.org/mailman/listinfo/gnunet-developers</a> è "
 "possibile trovare una mailing list di GNUnet pubblica e archiviata. Per "
-"inviare un messaggio all'intera mailing list, scrivere a <a href=\"mailto"
-":gnunet-developers@gnu.org\">gnunet-developers@gnu.org</a>."
+"inviare un messaggio all'intera mailing list, scrivere a <a href=\"mailto:"
+"gnunet-developers@gnu.org\">gnunet-developers@gnu.org</a>."
 
 #: template/contact.html.j2:23
 msgid "The IRC channel"
@@ -728,8 +758,8 @@ msgid ""
 "subscription."
 msgstr ""
 "Monitoriamo richieste di funzionalità e bug aperti per i progetti "
-"all'interno di GNUnet nel nostro <a href=\"https://bugs.gnunet.org/\""
-">Registro bug</a>. È possibile segnalare bug o richieste di funzionalità "
+"all'interno di GNUnet nel nostro <a href=\"https://bugs.gnunet.org/"
+"\">Registro bug</a>. È possibile segnalare bug o richieste di funzionalità "
 "scrivendo alla mailing list <a href=\"https://lists.gnu.org/mailman/listinfo/"
 "bug-gnunet\">bug-gnunet</a>. Non è necessario iscriversi alla mailing list "
 "per inviare un messaggio."
@@ -826,9 +856,9 @@ msgid ""
 "detect regressions and check for portability at <a href=\"https://old.gnunet."
 "org/buildbot/gnunet/\">https://old.gnunet.org/buildbot/gnunet/</a>."
 msgstr ""
-"Disponiamo di test automatici tramite <a href=\"https://buildbot.net/\""
-">Buildbot</a> per individuare regressioni e verificare la portabilità su <a "
-"href=\"https://old.gnunet.org/buildbot/gnunet/\">https://old.gnunet.org/"
+"Disponiamo di test automatici tramite <a href=\"https://buildbot.net/"
+"\">Buildbot</a> per individuare regressioni e verificare la portabilità su "
+"<a href=\"https://old.gnunet.org/buildbot/gnunet/\">https://old.gnunet.org/"
 "buildbot/gnunet/</a>."
 
 #: template/developers.html.j2:59
@@ -940,6 +970,17 @@ msgid "Becoming a Member of GNUnet e.V."
 msgstr "Entrare a far parte di GNUnet e.V."
 
 #: template/ev.html.j2:33
+#, fuzzy
+#| 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)."
 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 "
@@ -948,8 +989,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 "Gli sviluppatori di GNUnet con accesso git (scrittura) possono diventare "
 "membri per partecipare al processo decisionale e sostenere formalmente "
@@ -957,32 +998,41 @@ msgstr ""
 "nell'archivio <a href=\"https://git.gnunet.org/gnunet-ev.git/\">gnunet-ev</"
 "a>. Non ci sono quote associative. Tuttavia, i membri devono sostenere "
 "GNUnet e.V. e soprattutto contribuire allo sviluppo tecnico secondo le "
-"proprie possibilità. Per maggiori informazioni, consultare lo <a href=\"https"
-"://git.gnunet.org/gnunet-ev.git/\">Satzung</a> (attualmente disponibile solo "
-"in tedesco, sono ben accette traduzioni)."
+"proprie possibilità. Per maggiori informazioni, consultare lo <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/\">Satzung</a> (attualmente "
+"disponibile solo in tedesco, sono ben accette traduzioni)."
 
 #: template/ev.html.j2:52
 msgid "Governance"
 msgstr "Governance"
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+#, fuzzy
+#| 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.org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists "
+#| "of: <dl><dt>Vorsitz</dt> <dd><a href=\"https://schanzen.eu\">Martin "
+#| "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</"
+#| "dd> <dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a "
+#| "href=\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </"
+#| "dd> </dl>"
+msgid ""
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
 "\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </dd> </dl>"
 msgstr ""
-"Il nostro \"Satzung\" e l'elenco dei membri è disponibile su <a href=\"https"
-"://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet.org/"
-"gnunet-ev.git/tree/satzung.tex</a>. Il consiglio direttivo attuale è "
+"Il nostro \"Satzung\" e l'elenco dei membri è disponibile su <a href="
+"\"https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex\">https://git.gnunet."
+"org/gnunet-ev.git/tree/satzung.tex</a>. Il consiglio direttivo attuale è "
 "composto da: <dl><dt>Vorsitz</dt><dd><a href=\"https://schanzen.eu\">Martin "
-"Schanzenbach</a></dd><dt>stellvertretender "
-"Vorsitz</dt><dd>t3sserakt</dd><dt>Kassenwart</dt><dd>Florian "
-"Dold</dd><dt>Beisitzer</dt><dd><a href=\"https://grothoff.org/christian/\""
-">Christian Grothoff</a>, ch3 </dd></dl>"
+"Schanzenbach</a></dd><dt>stellvertretender Vorsitz</dt><dd>t3sserakt</"
+"dd><dt>Kassenwart</dt><dd>Florian Dold</dd><dt>Beisitzer</dt><dd><a href="
+"\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </dd></dl>"
 
 #: template/ev.html.j2:73
 msgid "Official Meeting Notes"
@@ -1011,9 +1061,9 @@ msgstr ""
 "riportate qui di seguito. Ricordiamo che non possiamo fornire ricevute per "
 "le donazioni. Se hai intenzione di donare un importo notevole, prima di "
 "farlo contattaci, poiché potrebbe convenire concludere un accordo "
-"personalizzato. "
-"<dl><dt>BitCoin</dt><dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</dd><dt>SEPA/"
-"IBAN</dt><dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd></dl>"
+"personalizzato. <dl><dt>BitCoin</dt><dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</"
+"dd><dt>SEPA/IBAN</dt><dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</"
+"dd></dl>"
 
 #: template/faq.html.j2:12 template/faq.html.j2:23
 msgid "General"
@@ -1131,8 +1181,8 @@ msgid ""
 "nse&quot; section of your configuration file to a higher value. The default "
 "is &quot;5 ms&quot;."
 msgstr ""
-"R: All'inizio il processo gnunet-service-nse computerà una cosiddetta &quot"
-";proof-of-work&quot;, affinché la rete riconosca che il peer è reale (o, "
+"R: All'inizio il processo gnunet-service-nse computerà una cosiddetta &quot;"
+"proof-of-work&quot;, affinché la rete riconosca che il peer è reale (o, "
 "meglio, per renderlo troppo dispendioso perché un nemico organizzi un "
 "attacco di Sybil allo strumento che stima le dimensioni della rete). Il "
 "calcolo dovrebbe avvenire in qualche giorno, a seconda della velocità della "
@@ -1192,8 +1242,8 @@ msgstr ""
 "ancora pronto perché possa essere usato da altri, al di fuori degli "
 "sviluppatori. La sua efficacia varia a seconda della funzionalità "
 "utilizzata, ma probabilmente riscontrerai problemi con il nostro attuale "
-"sistema di trasporto di livello base. Al momento lo stiamo riscrivendo ("
-"Projetto &quot;Transport Next Generation [TNG]&quot;)"
+"sistema di trasporto di livello base. Al momento lo stiamo riscrivendo "
+"(Projetto &quot;Transport Next Generation [TNG]&quot;)"
 
 #: template/faq.html.j2:136
 msgid "Is GNUnet build using distributed ledger technologies?"
@@ -1251,11 +1301,17 @@ msgid "Is it possible to access GNUnet via a browser as an anonymous WWW?"
 msgstr "Si può accedere a GNUnet tramite una navigazione in incognito?"
 
 #: template/faq.html.j2:183
+#, fuzzy
+#| msgid ""
+#| "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
+#| "would make it accessible with a browser. It is possible to build such a "
+#| "proxy and all one needs to know is the protocol used between browser and "
+#| "proxy and a swift look at the GNUnet code for file-sharing."
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 "A: Attualmente non c'è un proxy (come fproxy di Freenet) per GNUnet che "
 "potrebbe permettervi l'accesso con un browser. E' possibile creare un proxy "
@@ -1281,11 +1337,13 @@ msgstr ""
 "necessario installare il pacchetto gnunet-gtk, che bisogna scaricare a "
 "parte. gnunet-gtk è un'interfaccia grafica utente che integra la maggior "
 "parte delle altre interfacce grafiche in una finestra. gnunet-setup è "
-"un'eccezione, perché attualmente deve ancora essere eseguita separatamente ("
-"dato che per installarla è necessario fermare il peer)."
+"un'eccezione, perché attualmente deve ancora essere eseguita separatamente "
+"(dato che per installarla è necessario fermare il peer)."
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+#, fuzzy
+#| msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr "Su quale sistema operativo si esegue GNUnet?"
 
 #: template/faq.html.j2:212
@@ -1393,7 +1451,9 @@ msgstr ""
 "delegata a questa conquisterà la propria risoluzione."
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+#, fuzzy
+#| msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr "Qual è la differenza tra GNS e altri sistemi di nomi di dominio?"
 
 #: template/faq.html.j2:288
@@ -1402,8 +1462,8 @@ msgid ""
 "ns2018.pdf\">has been published </a> and below is a table from the "
 "publication. For detailed descriptions please refer to the paper."
 msgstr ""
-"R: Un documento scientifico riguardo questo argomento <a href=\"https"
-"://grothoff.org/christian/ns2018.pdf\"> è stato pubblicato </a> e più avanti "
+"R: Un documento scientifico riguardo questo argomento <a href=\"https://"
+"grothoff.org/christian/ns2018.pdf\"> è stato pubblicato </a> e più avanti "
 "c'è una tabella di questa pubblicazione. Per descrizioni più dettagliate per "
 "piacere fare riferimento al documento."
 
@@ -1412,24 +1472,34 @@ msgid "What is the difference between GNS and CoDoNS?"
 msgstr "Qual è la differenza tra GNS e CoDoNS?"
 
 #: template/faq.html.j2:394
+#, fuzzy
+#| msgid ""
+#| "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
+#| "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, "
+#| "and there are still registrars that determine who owns a name. <br><br> "
+#| "With GNS, we decentralize the database and also decentralize the "
+#| "responsibility for naming: each user runs his own personal root zone and "
+#| "is thus in complete control of the names he uses. GNS also has many "
+#| "additional features (to keep names short and enable migration) which "
+#| "don't even make sense in the context of CoDoNS."
 msgid ""
 "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 "R: CoDoNS decentralizza il database DNS (usando un DHT) ma preserva la "
 "struttura autoritaria di un DNS. Con CoDoNS, IANA/ICANN sono ancora sotto "
 "controllo, e ci sono anche processi che determinano chi possiede un nome. "
 "<br><br> Con GNS, noi decentralizziamo il database e la responsabilità di "
 "nominare: ogni utente amministra la propria zona radicale e questo è in "
-"completo controllo dei nomi che usa. GNS ha anche molte qualità addizionali ("
-"mantenere i nomi brevi e abilitare migrazioni) le quali non hanno alcun tipo "
-"di senso nel contesto di CoDoNS."
+"completo controllo dei nomi che usa. GNS ha anche molte qualità addizionali "
+"(mantenere i nomi brevi e abilitare migrazioni) le quali non hanno alcun "
+"tipo di senso nel contesto di CoDoNS."
 
 #: template/faq.html.j2:410
 msgid "What is the difference between GNS and SocialDNS?"
@@ -1475,13 +1545,21 @@ msgid "What is the difference between GNS and Handshake?"
 msgstr "Qual è la differenza tra GNS e Handshake?"
 
 #: template/faq.html.j2:441
+#, fuzzy
+#| msgid ""
+#| "A: Handshake is a blockchain-based method for root zone governance. "
+#| "Hence, it does not address the name resolution process itself but "
+#| "delegates resolution into DNS after the initial TLD resolution. Not "
+#| "taking sustainablility considerations into account, handshake could be "
+#| "used as an additional supporting GNS root zone governance model but we "
+#| "currently do not have such plans in mind."
 msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 "R: Handshake è un metodo per la governance della zona radice basato su "
 "blockchain. Quindi non si occupa del processo della risoluzione dei nomi in "
@@ -1563,10 +1641,10 @@ msgid ""
 msgstr ""
 "R: Su GNS i nomi non hanno proprietari, quindi non ci possono essere dei "
 "proprietari di dominio &quot;legittimi&quot;. Qualsiasi utente può "
-"rivendicare qualsiasi nome (come suo nome preferito o &quot;pseudonimo&quot;)"
-" nel suo registro NICK. Allo stesso modo, tutti gli altri utenti possono "
-"decidere di ignorare questa preferenza e impostare un nome a loro scelta per "
-"questo utente (o, addirittura, non assegnare alcun nome)."
+"rivendicare qualsiasi nome (come suo nome preferito o &quot;"
+"pseudonimo&quot;) nel suo registro NICK. Allo stesso modo, tutti gli altri "
+"utenti possono decidere di ignorare questa preferenza e impostare un nome a "
+"loro scelta per questo utente (o, addirittura, non assegnare alcun nome)."
 
 #: template/faq.html.j2:498
 msgid ""
@@ -2065,11 +2143,21 @@ msgstr ""
 "leggere i documenti di ricerca (e probabilmente anche il codice)."
 
 #: template/faq.html.j2:915
+#, fuzzy
+#| msgid ""
+#| "Another important point of reference are the various anonymous peer-to-"
+#| "peer networks. Here, there are differences in terms of application domain "
+#| "and how specifically anonymity is achieved. Anonymous routing is a hard "
+#| "research topic, so for a superficial comparisson like this one we focus "
+#| "on the latency. Another important factor is the programming language. "
+#| "Type-safe languages may offer certain security benefits; however, this "
+#| "may come at the cost of significant increases in resource consumption "
+#| "which in turn may reduce anonymity."
 msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2359,9 +2447,9 @@ msgid ""
 "resolution</li> <li>Compatibility with DNS</li>"
 msgstr ""
 "Lo GNU Name System (GNS) è un sistema di nomi sicuro e decentralizzato. "
-"Permette agli utenti di registrare i nomi come domini di primo livello (TLD -"
-" Top Level Domain) e risolvere altri spazi dei nomi all'interno dei TLD. <br/"
-"> GNS è progettato per fornire: <ul> <li>Resistenza alla censura</li> "
+"Permette agli utenti di registrare i nomi come domini di primo livello (TLD "
+"- Top Level Domain) e risolvere altri spazi dei nomi all'interno dei TLD. "
+"<br/> GNS è progettato per fornire: <ul> <li>Resistenza alla censura</li> "
 "<li>Privacy nelle query</li> <li>Risoluzione dei nomi sicura</li> "
 "<li>Compatibilità con il DNS</li>"
 
@@ -3511,8 +3599,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -3544,7 +3632,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
@@ -3658,5 +3746,8 @@ msgstr ""
 msgid "Videos related to GNUnet"
 msgstr ""
 
+#~ msgid "Living Standards"
+#~ msgstr "Standard di vita"
+
 #~ msgid "_project_title"
 #~ msgstr "Stack di protocolli GNU per un nuovo Internet etico"
diff --git a/locale/ja/LC_MESSAGES/messages.po b/locale/ja/LC_MESSAGES/messages.po
index f0ac6e8c..f88cb67f 100644
--- a/locale/ja/LC_MESSAGES/messages.po
+++ b/locale/ja/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-04-15 10:31+0000\n"
 "Last-Translator: Kanoko Kondo <yves0625@gmail.com>\n"
 "Language-Team: Japanese <http://weblate.taler.net/projects/gnunet/website/ja/"
@@ -32,7 +32,7 @@ msgstr "安全な P2P ネットワーキングを可能にする GNU のフレ�
 msgid "Contact"
 msgstr "お問い合わせ"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr "GNUnet e.V."
 
@@ -147,10 +147,6 @@ msgstr "用語集"
 msgid "Handbook"
 msgstr "ハンドブック"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr "規格や標準"
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr "REST API"
@@ -437,12 +433,21 @@ msgid "The GNU Name System"
 msgstr "GNU ネームシステム"
 
 #: template/applications.html.j2:15
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"gns.html\">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. -->"
 msgid ""
 "The <a href=\"gns.html\">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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -551,11 +556,17 @@ msgid "Cadet-GTK"
 msgstr "Cadet-GTK"
 
 #: template/applications.html.j2:162
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> "
+#| "is a convenient but feature-rich graphical application providing "
+#| "messaging using especially the CADET subsystem. It is developed using GTK "
+#| "and libhandy for a convergent design."
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> は、"
 "高い利便性と豊富な機能を備えたグラフィカル アプリケーションで、特に CADET サ"
@@ -567,11 +578,16 @@ msgid "groupchat"
 msgstr "groupchat"
 
 #: template/applications.html.j2:182
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
+#| "terminal user interface providing messaging using especially the CADET "
+#| "subsystem. It is developed using nim. Cadet-GTK and groupchat are planned "
+#| "to be compatible."
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> は、主に "
 "CADET サブシステムを使用してメッセージ機能を提供するターミナル ユーザーイン"
@@ -587,11 +603,18 @@ msgid "Foundations"
 msgstr "基盤"
 
 #: template/architecture.html.j2:22
+#, fuzzy
+#| 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 (GNS) and a pluggable transport system (TRANSPORT).<br> "
+#| "Using public keys for addresses and self-organized decentralized routing "
+#| "algorithms, these subsystems replace the traditional TCP/IP stack."
 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 "GNUnet の基盤は、分散ハッシュ テーブル（R5N）、SCTP に類似したエンド ツー エ"
@@ -605,9 +628,16 @@ msgid "Security"
 msgstr "セキュリティ"
 
 #: template/architecture.html.j2:38
+#, fuzzy
+#| msgid ""
+#| "GNUnet is implemented using a multi-process architecture. Each subsystem "
+#| "runs as a separate process, providing fault-isolation and enabling tight "
+#| "permissions to be granted to each subsystem. Naturally, the "
+#| "implementation is a <a href=\"https://www.gnu.org/\">GNU</a> package, and "
+#| "will always remain free software."
 msgid ""
 "GNUnet is implemented using a multi-process architecture. Each subsystem "
-"runs as a separate process, providing fault-isolation and enabling tight "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -901,6 +931,17 @@ msgid "Becoming a Member of GNUnet e.V."
 msgstr "GNUnet e.V. のメンバーになる"
 
 #: template/ev.html.j2:33
+#, fuzzy
+#| 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)."
 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 "
@@ -909,8 +950,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 "Git（書き込み）アクセス権を持つ GNUnet 開発者は、メンバーとして意思決定プロセ"
 "スに参加し、GNUnet e.V. を正式にサポートすることができます。メンバーとなるに"
@@ -926,10 +967,20 @@ msgid "Governance"
 msgstr "ガバナンス"
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+#, fuzzy
+#| 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.org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists "
+#| "of: <dl><dt>Vorsitz</dt> <dd><a href=\"https://schanzen.eu\">Martin "
+#| "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</"
+#| "dd> <dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a "
+#| "href=\"https://grothoff.org/christian/\">Christian Grothoff</a>, ch3 </"
+#| "dd> </dl>"
+msgid ""
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
@@ -1105,8 +1156,10 @@ msgid ""
 "GNUnet does not really have one focus; our theme is secure decentralized "
 "networking, but that is too broad to be called a focus."
 msgstr ""
-"回答：Tor は、Tor Browser Bundle により、特にウェブにおける匿名通信と TCP 接続の検閲保護に焦点を当てています。GNUnet "
-"は、安全で分散したネットワーク化を趣旨としますが、焦点と呼ぶには大変広義であるため、実質的に一つの焦点はないと言えます。"
+"回答：Tor は、Tor Browser Bundle により、特にウェブにおける匿名通信と TCP 接"
+"続の検閲保護に焦点を当てています。GNUnet は、安全で分散したネットワーク化を趣"
+"旨としますが、焦点と呼ぶには大変広義であるため、実質的に一つの焦点はないと言"
+"えます。"
 
 #: template/faq.html.j2:111
 msgid "How does GNUnet compare to I2P?"
@@ -1120,11 +1173,11 @@ msgid ""
 "using onion (or garlic) routing as the basis for various (anonymized) "
 "applications. I2P is largely used via a Web frontend."
 msgstr ""
-"回答：GNUnet と I2P "
-"はどちらも、安全性と分散化を高め、より優れたインターネットの構築を目指しています。しかし、技術面においてほぼ共通点はありません。<br><br> I2P "
-"は Java "
-"を使用しており、各種（匿名化された）アプリケーションの基盤として、オニオン（またはガーリック）ルーティングを使った（非対称）トンネルを持ちます。I2P "
-"はウェブのフロントエンドで広く使われています。"
+"回答：GNUnet と I2P はどちらも、安全性と分散化を高め、より優れたインターネッ"
+"トの構築を目指しています。しかし、技術面においてほぼ共通点はありません。"
+"<br><br> I2P は Java を使用しており、各種（匿名化された）アプリケーションの基"
+"盤として、オニオン（またはガーリック）ルーティングを使った（非対称）トンネル"
+"�����ちます。I2P ��ウェブのフロントエンドで広く使われています。"
 
 #: template/faq.html.j2:124
 msgid "Is GNUnet ready for use on production systems?"
@@ -1168,8 +1221,9 @@ msgid ""
 "do more than just one thing. Naturally, the implementation and documentation "
 "of some of the features that exist are more advanced than others."
 msgstr ""
-"回答：GNUnet はピアツーピアのフレームワークであり、つまり、できることは一つに限りません。そのため、既存機能の実装とドキュメンテーションは、他のもの"
-"よりも進んでいることがあります。"
+"回答：GNUnet はピアツーピアのフレームワークであり、つまり、できることは一つに"
+"限りません。そのため、既存機能の実装とドキュメンテーションは、他のものよりも"
+"進んでいることがあります。"
 
 #: template/faq.html.j2:160
 msgid ""
@@ -1177,8 +1231,9 @@ msgid ""
 "decentralized and censorship-resistant replacement for DNS and a mechanism "
 "for IPv4-IPv6 protocol translation and tunneling (NAT-PT with DNS-ALG)."
 msgstr ""
-"ユーザーの観点からは、GNUnet は匿名および非匿名でのファイル共有、完全に分散化され検閲保護された DNS の代替手段、IPv4-IPv6 "
-"プロトコル変換およびトンネリングのメカニズム（DNS-ALG を使用した NAT-PT）を提供します。"
+"ユーザーの観点からは、GNUnet は匿名および非匿名でのファイル共有、完全に分散化"
+"され検閲保護された DNS の代替手段、IPv4-IPv6 プロトコル変換およびトンネリング"
+"のメカニズム（DNS-ALG を使用した NAT-PT）を提供します。"
 
 #: template/faq.html.j2:171
 msgid "Is it possible to surf the WWW anonymously with GNUnet?"
@@ -1188,22 +1243,32 @@ msgstr "GNUnet では匿名の WWW サーフィンは可能ですか？"
 msgid ""
 "A: It is not possible use GNUnet for anonymous browsing at this point. We "
 "recommend that you use Tor for anonymous surfing."
-msgstr "回答：現時点で匿名ブラウジングに GNUnet を使用することはできません。匿名サーフィンには Tor をお勧めします。"
+msgstr ""
+"回答：現時点で匿名ブラウジングに GNUnet を使用することはできません。匿名サー"
+"フィンには Tor をお勧めします。"
 
 #: template/faq.html.j2:181
 msgid "Is it possible to access GNUnet via a browser as an anonymous WWW?"
-msgstr "匿名の WWW としてブラウザ経由で GNUnet にアクセスすることは可能ですか？"
+msgstr ""
+"匿名の WWW としてブラウザ経由で GNUnet にアクセスすることは可能ですか？"
 
 #: template/faq.html.j2:183
+#, fuzzy
+#| msgid ""
+#| "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
+#| "would make it accessible with a browser. It is possible to build such a "
+#| "proxy and all one needs to know is the protocol used between browser and "
+#| "proxy and a swift look at the GNUnet code for file-sharing."
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
-"回答：現在、ブラウザでのアクセスを可能にする GNUnet 用のプロキシ（Freenet の fproxy "
-"など）はありません。こうしたプロキシの構築は可能で、必要となるのは、ブラウザとプロキシ間で利用されるプロトコルと、ファイル共通のための GNUnet "
-"コード概要のみです。"
+"回答：現在、ブラウザでのアクセスを可能にする GNUnet 用のプロキシ（Freenet の "
+"fproxy など）はありません。こうしたプロキシの構築は可能で、必要となるのは、ブ"
+"ラウザとプロキシ間で利用されるプロトコルと、ファイル共通のための GNUnet コー"
+"ド概要のみです。"
 
 #: template/faq.html.j2:195
 msgid ""
@@ -1216,14 +1281,18 @@ msgid ""
 "gnunet-setup, which must still be run separately at this time (as setup "
 "requires the peer to be stopped)."
 msgstr ""
-"回答：実際、異なる機能に向けたグラフィカル ユーザーインターフェースが数種類あります。例えば、gnunet-setup は GNUnet 構成"
-"、gnunet-fs-gtk はファイル共有のためのものです。重要性は下がりますが、gnunet-XXX-gtk GUI はその他にもあります。GUI "
-"を取得するためには、gnunet-gtk パッケージが必要で、別途ダウンロードを要します。gnunet-gtk はその他ほぼ全ての GUI "
-"を一つのウィンドウに統合したメタ GUI です。例外は gnunet-setup "
-"で、現時点では単独で実行が必要となります（設定でピアを停止する必要があるため）。"
+"回答：実際、異なる機能に向けたグラフィカル ユーザーインターフェースが数種類あ"
+"ります。例えば、gnunet-setup は GNUnet 構成、gnunet-fs-gtk はファイル共有のた"
+"めのものです。重要性は下がりますが、gnunet-XXX-gtk GUI はその他にもあります。"
+"GUI を取得するためには、gnunet-gtk パッケージが必要で、別途ダウンロードを要し"
+"ます。gnunet-gtk はその他ほぼ全ての GUI を一つのウィンドウに統合したメタ GUI "
+"です。例外は gnunet-setup で、現時点では単独で実行が必要となります（設定でピ"
+"アを停止する必要があるため）。"
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+#, fuzzy
+#| msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr "GNUnet はどのオペレーティングシステム上で実行されますか？"
 
 #: template/faq.html.j2:212
@@ -1235,10 +1304,12 @@ msgid ""
 "NetBSD, OpenBSD and Solaris. However, not all of those reports are recent, "
 "so if you cannot get GNUnet to work on those systems please let us know."
 msgstr ""
-"回答：GNUnet の開発とテストは、主に Debian GNU / Linux で実施しています。さらに、Fedora、Ubuntu、 Arch、 "
-"FreeBSD、 macOS でも定期的に構築やテストを実施しています。そのほか多くの GNU/Linux でも正常な稼働が認められたという報告があり、"
-"これまで NetBSD、OpenBSD、Solaris 上での稼働が報告されています。ただ、こうした報告全てが最近のものとは限らず、これらシステム上で "
-"GNUnet を稼働できない場合はお知らせください。"
+"回答：GNUnet の開発とテストは、主に Debian GNU / Linux で実施しています。さら"
+"に、Fedora、Ubuntu、 Arch、 FreeBSD、 macOS でも定期的に構築やテストを実施し"
+"ています。そのほか多くの GNU/Linux でも正常な稼働が認められたという報告があ"
+"り、これまで NetBSD、OpenBSD、Solaris 上での稼働が報告されています。ただ、こ"
+"うした報告全てが最近のものとは限らず、これらシステム上で GNUnet を稼働できな"
+"い場合はお知らせください。"
 
 #: template/faq.html.j2:228
 msgid "Who runs the GNS root zone?"
@@ -1252,9 +1323,11 @@ msgid ""
 "modify this configuration at will. We expect normal users to have no need to "
 "edit their own GNS zone(s) unless they host services themselves."
 msgstr ""
-"回答：簡潔な回答は「みなさん」です。詳しくいうと、GNUnet は上位ドメインのデフォルト設定でリリースされ、このデフォルト設定のガバナンスはまだ構築され"
-"ていません。いずれにしても、ユーザー側でこの設定を好きに変更することができます。一般のユーザーは、サービスを自らホストしない限り、その GNS "
-"ゾーンを編集する必要はないとみなしています。"
+"回答：簡潔な回答は「みなさん」です。詳しくいうと、GNUnet は上位ドメインのデ"
+"フォルト設定でリリースされ、このデフォルト設定のガバナンスはまだ構築されてい"
+"ません。いずれにしても、ユーザー側でこの設定を好きに変更することができます。"
+"一般のユーザーは、サービスを自らホストしない限り、その GNS ゾーンを編集する必"
+"要はないとみなしています。"
 
 #: template/faq.html.j2:241
 msgid "Where is the per-user GNS database kept?"
@@ -1271,15 +1344,19 @@ msgid ""
 "which various replication options are again applicable. Ultimately, there "
 "are many options for how users can store (and secure) their GNS database."
 msgstr ""
-"回答：簡潔には、データベースはユーザーの GNUnet ピアに保管されています。現在、ユーザーが複数の GNUnet "
-"ピアを走らせた場合、データベースは各ピアに保管されます（ただし、便宜的なレプリケーションのためのコードはありません）。同様に、複数の GNUnet "
-"ピアは、データベースの一つのインスタンスを共有することができ、 &quot;gnunet-service-namestore&quot; は TCP "
-"経由で遠隔からアクセスできます。実際のデータは Postgres データベースに保管され、各種レプリケーションのオプションが適用されます。つまり、GNS "
-"データベースの保管方法（または安全性の確保）については、ユーザーに多くの選択肢が与えられることになります。"
+"回答：簡潔には、データベースはユーザーの GNUnet ピアに保管されています。現"
+"在、ユーザーが複数の GNUnet ピアを走らせた場合、データベースは各ピアに保管さ"
+"れます（ただし、便宜的なレプリケーションのためのコードはありません）。同様"
+"に、複数の GNUnet ピアは、データベースの一つのインスタンスを共有することがで"
+"き、 &quot;gnunet-service-namestore&quot; は TCP 経由で遠隔からアクセスできま"
+"す。実際のデータは Postgres データベースに保管され、各種レプリケーションのオ"
+"プションが適用されます。つまり、GNS データベースの保管方法（または安全性の確"
+"保）については、ユーザーに多くの選択肢が与えられることになります。"
 
 #: template/faq.html.j2:258
 msgid "What is the expected average size of a GNS namestore database?"
-msgstr "GNS ネームストア データベースの平均サイズはどれくらいと予測されますか？"
+msgstr ""
+"GNS ネームストア データベースの平均サイズはどれくらいと予測されますか？"
 
 #: template/faq.html.j2:260
 msgid ""
@@ -1288,8 +1365,9 @@ msgid ""
 "will only grow to a few tens of thousands of entries, small enough to fit "
 "even on mobile devices."
 msgstr ""
-"回答：かなり小さいと言えます。実施した調査で、ブラウザ履歴とアクセスしたドメイン数を確認したところ、GNS "
-"データベースの規模は数万エントリーに留まり、モバイル端末でも対応できるほど小規模です。"
+"回答：かなり小さいと言えます。実施した調査で、ブラウザ履歴とアクセスしたドメ"
+"イン数を確認したところ、GNS データベースの規模は数万エントリーに留まり、モバ"
+"イル端末でも対応できるほど小規模です。"
 
 #: template/faq.html.j2:270
 msgid "Is GNS resistant to the attacks on DNS used by the US?"
@@ -1306,13 +1384,18 @@ msgid ""
 "unavailable for enforcement, the respective zone cannot be changed and any "
 "other zone delegating to this zone will achieve proper resolution."
 msgstr ""
-"回答：そのように考えます。理由として、個々のユーザーを除き、いかなる政府も名前のマッピングを変更するよう強制できる組織がないためです（その場合、変更は当該"
-"のユーザーが権限を持つ名前にのみ適用されます）。そのため、全員が GNS を利用した場合に唯一考えられる政府による攻撃は、"
-"サーバー運用者に対して該当サーバーが他の地点を指すよう GNS レコードの変更を強制することです。しかし、あるゾーンのプライベートキーの所有者が従わないな"
-"どの場合、該当するゾーンは変更できず、このゾーンに委任する他のゾーンは全て正常通りに動作します。"
+"回答：そのように考えます。理由として、個々のユーザーを除き、いかなる政府も名"
+"前のマッピングを変更するよう強制できる組織がないためです（その場合、変更は当"
+"該のユーザーが権限を持つ名前にのみ適用されます）。そのため、全員が GNS を利用"
+"した場合に唯一考えられる政府による攻撃は、サーバー運用者に対して該当サーバー"
+"が他の地点を指すよう GNS レコードの変更を強制することです。しかし、あるゾーン"
+"のプライベートキーの所有者が従わないなどの場合、該当するゾーンは変更できず、"
+"このゾーンに委任する他のゾーンは全て正常通りに動作します。"
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+#, fuzzy
+#| msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr "GNS は他のネームシステムとどのように比較されますか？"
 
 #: template/faq.html.j2:288
@@ -1321,28 +1404,42 @@ msgid ""
 "ns2018.pdf\">has been published </a> and below is a table from the "
 "publication. For detailed descriptions please refer to the paper."
 msgstr ""
-"回答：このトピックに関する科学論文が<a href=\"https://grothoff.org/christian/ns2018.pdf\""
-">公開されており</a>、以下は論文からの表です。詳細については、論文をご覧ください。"
+"回答：このトピックに関する科学論文が<a href=\"https://grothoff.org/christian/"
+"ns2018.pdf\">公開されており</a>、以下は論文からの表です。詳細については、論文"
+"をご覧ください。"
 
 #: template/faq.html.j2:392
 msgid "What is the difference between GNS and CoDoNS?"
 msgstr "GNS と CoDoNS の違いは何ですか？"
 
 #: template/faq.html.j2:394
+#, fuzzy
+#| msgid ""
+#| "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
+#| "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, "
+#| "and there are still registrars that determine who owns a name. <br><br> "
+#| "With GNS, we decentralize the database and also decentralize the "
+#| "responsibility for naming: each user runs his own personal root zone and "
+#| "is thus in complete control of the names he uses. GNS also has many "
+#| "additional features (to keep names short and enable migration) which "
+#| "don't even make sense in the context of CoDoNS."
 msgid ""
 "A: CoDoNS decentralizes the DNS database (using a DHT) but preserves the "
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
-msgstr ""
-"回答：CoDoNS は DHT を使用して DNS データベースを分散しますが、DNS の権限構造を保持しています。CoDoNS は IANA/"
-"ICANN で管理され、ドメイン名の所有者を決定するレジストラが存在します。<br><br>一方で GNS は、データベースを分散化するとともに命名につい"
-"ても中央管理はせずに分散化させています。つまり、各ユーザーが自らのルートゾーンを管理するため、使用するドメイン名を完全に制御することになります。GNU "
-"には CoDoNS では必要のない追加機能も豊富にあります（名前を短くし移行を実施するため）。"
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
+msgstr ""
+"回答：CoDoNS は DHT を使用して DNS データベースを分散しますが、DNS の権限構造"
+"を保持しています。CoDoNS は IANA/ICANN で管理され、ドメイン名の所有者を決定す"
+"るレジストラが存在します。<br><br>一方で GNS は、データベースを分散化するとと"
+"もに命名についても中央管理はせずに分散化させています。つまり、各ユーザーが自"
+"らのルートゾーンを管理するため、使用するドメイン名を完全に制御することになり"
+"ます。GNU には CoDoNS では必要のない追加機能も豊富にあります（名前を短くし移"
+"行を実施するため）。"
 
 #: template/faq.html.j2:410
 msgid "What is the difference between GNS and SocialDNS?"
@@ -1357,10 +1454,12 @@ msgid ""
 "delegation, and thus mappings will only change if the user responsible for "
 "the name (the authority) manually changes the record."
 msgstr ""
-"回答：GNS と同様、SocialDNS では各ユーザーが DNS マッピングを作成できます。しかし、SocialDNS "
-"ではマッピングがソーシャルネットワークで共有されてランキング対象となるため、関連が複雑化するにつれ、名前が予期せず変更されることがあり得ます。"
-"<br><br>一方 GNS "
-"では、名前の共有は主に移譲によって実施されるため、マッピングは名前の責任者（権限のあるユーザー）が手動で記録を変更した場合にのみ変更されます。"
+"回答：GNS と同様、SocialDNS では各ユーザーが DNS マッピングを作成できます。し"
+"かし、SocialDNS ではマッピングがソーシャルネットワークで共有されてランキング"
+"対象となるため、関連が複雑化するにつれ、名前が予期せず変更されることがあり得"
+"ます。<br><br>一方 GNS では、名前の共有は主に移譲によって実施されるため、マッ"
+"ピングは名前の責任者（権限のあるユーザー）が手動で記録を変更した場合にのみ変"
+"更されます。"
 
 #: template/faq.html.j2:426
 msgid "What is the difference between GNS and ODDNS?"
@@ -1374,26 +1473,38 @@ msgid ""
 "domains (like \"gnu.org\") and the IP addresses of the respective name "
 "servers. Resolution will fail if the target name servers change IPs."
 msgstr ""
-"回答：ODDNS は主に DNS ルート ゾーンと TLD レジストリ（「.com」や「."
-"org」など）をバイパスするように設計されています。これらを使わず、各ユーザーは（セカンドレベル）ドメインのデータベース（「gnu.org」など）と、"
-"該当するネームサーバーの IP アドレスを保持することが求められます。ターゲットのネームサーバーが IP を変更すると名前解決は失敗します。"
+"回答：ODDNS は主に DNS ルート ゾーンと TLD レジストリ（「.com」や「.org」な"
+"ど）をバイパスするように設計されています。これらを使わず、各ユーザーは（セカ"
+"ンドレベル）ドメインのデータベース（「gnu.org」など）と、該当するネームサー"
+"バーの IP アドレスを保持することが求められます。ターゲットのネームサーバーが "
+"IP を変更すると名前解決は失敗します。"
 
 #: template/faq.html.j2:439
 msgid "What is the difference between GNS and Handshake?"
 msgstr "GNS とハンドシェイクの違いは何ですか?？"
 
 #: template/faq.html.j2:441
+#, fuzzy
+#| msgid ""
+#| "A: Handshake is a blockchain-based method for root zone governance. "
+#| "Hence, it does not address the name resolution process itself but "
+#| "delegates resolution into DNS after the initial TLD resolution. Not "
+#| "taking sustainablility considerations into account, handshake could be "
+#| "used as an additional supporting GNS root zone governance model but we "
+#| "currently do not have such plans in mind."
 msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
-"回答：ハンドシェイクは、ブロックチェーンベースのルートゾーンガバナンスのための手法です。そのため、名前解決プロセス自体には対処せず、最初の TLD "
-"の名前解決後、DNS に名前解決を委任します。ハンドシェイクでは持続性が考慮されていないため、GNS ルートゾーン "
-"ガバナンスモデルの追加サポートとして利用できますが、現時点でその予定はありません。"
+"回答：ハンドシェイクは、ブロックチェーンベースのルートゾーンガバナンスのため"
+"の手法です。そのため、名前解決プロセス自体には対処せず、最初の TLD の名前解決"
+"後、DNS に名前解決を委任します。ハンドシェイクでは持続性が考慮されていないた"
+"め、GNS ルートゾーン ガバナンスモデルの追加サポートとして利用できますが、現時"
+"点でその予定はありません。"
 
 #: template/faq.html.j2:453
 msgid "What is the difference between GNS and TrickleDNS?"
@@ -1410,17 +1521,21 @@ msgid ""
 "distribution of authoritative records, and authority remains derived from "
 "the DNS hierarchy."
 msgstr ""
-"回答：TrickleDNS は、参加ドメインの DNS リゾルバー間で（&quot;クリティカルな&quot;）DNS "
-"レコードをプッシュし、&quot;可用性の向上、クエリ解決時間の短縮、更新のプロパゲーション高速化&quot;を実現します。そのため "
-"TrickleDNS は、例えば DNS ルートサーバーへの DDoS 攻撃など、DNS "
-"におけるレコードプロパゲーションの可用性（およびパフォーマンス）に対する攻撃への対処に主軸をおきます。TrickleDNS "
-"は確実に信頼できるレコードを分配する方法を考慮し、権限はこれまで通り DNS 階層に起因しています。"
+"回答：TrickleDNS は、参加ドメインの DNS リゾルバー間で（&quot;クリティカルな"
+"&quot;）DNS レコードをプッシュし、&quot;可用性の向上、クエリ解決時間の短縮、"
+"更新のプロパゲーション高速化&quot;を実現します。そのため TrickleDNS は、例え"
+"ば DNS ルートサーバーへの DDoS 攻撃など、DNS におけるレコードプロパゲーション"
+"の可用性（およびパフォーマンス）に対する攻撃への対処に主軸をおきます。"
+"TrickleDNS は確実に信頼できるレコードを分配する方法を考慮し、権限はこれまで通"
+"り DNS 階層に起因しています。"
 
 #: template/faq.html.j2:468
 msgid ""
 "Does GNS require real-world introduction (secure PKEY exchange) in the style "
 "of the PGP web of trust?"
-msgstr "GNS は PGP Web の信用モデル（web of trust）による実導入（セキュア PKEY 交換）を必要としますか？"
+msgstr ""
+"GNS は PGP Web の信用モデル（web of trust）による実導入（セキュア PKEY 交換）"
+"を必要としますか？"
 
 #: template/faq.html.j2:470
 msgid ""
@@ -1434,16 +1549,21 @@ msgid ""
 "depends entirely on the trustworthiness of the FCFS authority. The authority "
 "can be queried under the &quot;.pin&quot; TLD."
 msgstr ""
-"回答：セキュリティの観点から最初の時点で二者間に信頼パスが必要とされていますが、これが必要とされないアプリケーションでは、より脆弱なメカニズムも利用できま"
-"す。例えば、私たちは FCFS 権限を実装しており、どのユーザーでも任意の名前を登録できるようになっています。この権限の鍵は全ての GNUnet "
-"インストールに含まれるため、FCFS で登録された名前はいずれも事実上グローバルであり、周知のものとなります。ただし、これらの名前のセキュリティは完全に "
-"FCFS 権限の信頼性に依ることになります。権限は &quot;.pin&quot; TLD で照会できます。"
+"回答：セキュリティの観点から最初の時点で二者間に信頼パスが必要とされています"
+"が、これが必要とされないアプリケーションでは、より脆弱なメカニズムも利用でき"
+"ます。例えば、私たちは FCFS 権限を実装しており、どのユーザーでも任意の名前を"
+"登録できるようになっています。この権限の鍵は全ての GNUnet インストールに含ま"
+"れるため、FCFS で登録された名前はいずれも事実上グローバルであり、周知のものと"
+"なります。ただし、これらの名前のセキュリティは完全に FCFS 権限の信頼性に依る"
+"ことになります。権限は &quot;.pin&quot; TLD で照会できます。"
 
 #: template/faq.html.j2:485
 msgid ""
 "How can a legitimate domain owner tell other people to not use his name in "
 "GNS?"
-msgstr "正当なドメイン所有者が他者に GNS でその名前を使用しないよう伝えるにはどうすればよいですか？"
+msgstr ""
+"正当なドメイン所有者が他者に GNS でその名前を使用しないよう伝えるにはどうすれ"
+"ばよいですか？"
 
 #: template/faq.html.j2:487
 msgid ""
@@ -1453,9 +1573,11 @@ msgid ""
 "to ignore this preference and use a name of their choice (or even assign no "
 "name) for this user."
 msgstr ""
-"回答：GNS では名前に所有者はいないため、&quot;正当な&quot;ドメイン所有者は存在しません。NICK レコードには、どのユーザーがどの名前（好"
-"きな名前または&quot;偽名&quot;）を使っても構いません。同様に、他のユーザーもこれを無視し、このユーザーに対し好きな名前を使うことができます（ま"
-"たは名前を付けないことも可）。"
+"回答：GNS では名前に所有者はいないため、&quot;正当な&quot;ドメイン所有者は存"
+"在しません。NICK レコードには、どのユーザーがどの名前（好きな名前または&quot;"
+"偽名&quot;）を使っても構いません。同様に、他のユーザーもこれを無視し、この"
+"ユーザーに対し好きな名前を使うことができます（または名前を付けないことも"
+"可）。"
 
 #: template/faq.html.j2:498
 msgid ""
@@ -1470,13 +1592,15 @@ msgid ""
 "Thus, users have full control over what information about their zones is "
 "made public."
 msgstr ""
-"回答：GNS "
-"の各レコードには&quot;プライベート&quot;フラグがあります。レコードは、このフラグが設定されていない場合のみ他のユーザーと共有されます（DHT "
-"またはゾーン転送により）。そのため、ゾーンのどの情報を開示するかについては、ユーザーが全て管理することができます。"
+"回答：GNS の各レコードには&quot;プライベート&quot;フラグがあります。レコード"
+"は、このフラグが設定されていない場合のみ他のユーザーと共有されます（DHT また"
+"はゾーン転送により）。そのため、ゾーンのどの情報を開示するかについては、ユー"
+"ザーが全て管理することができます。"
 
 #: template/faq.html.j2:510
 msgid "Are \"Legacy Host\" (LEHO) records not going to be obsolete with IPv6?"
-msgstr "「レガシーホスト」（LEHO）レコードは IPv6 で廃止されるのではありませんか？"
+msgstr ""
+"「レガシーホスト」（LEHO）レコードは IPv6 で廃止されるのではありませんか？"
 
 #: template/faq.html.j2:512
 msgid ""
@@ -1489,17 +1613,21 @@ msgid ""
 "hosting would disappear. Finally, we don't want to have to wait for IPv6 to "
 "become commonplace, GNS should work with today's networks."
 msgstr ""
-"回答：この質問は次のことを仮定しています。（a）仮想ホスティングの唯一の必要性は IPv4 アドレスが不足しているため。（b）LEHO "
-"は仮想ホスティングの文脈でのみ有用。しかし、LEHO は X.509 "
-"証明書の検証にも有用です（証明書が検証されるべきレガシーのホスト名を指定するため）。また、IPv6 が完全に実装され、IP "
-"アドレスが&quot;無限に&quot;活用できたとしても、仮想ホスティングが無くなるとは言い切れません。最後に、IPv6 "
-"が一般的に利用できるようになるのを待つよりも、GNS は現行のネットワークで運用できるべきです。"
+"回答：この質問は次のことを仮定しています。（a）仮想ホスティングの唯一の必要性"
+"は IPv4 アドレスが不足しているため。（b）LEHO は仮想ホスティングの文脈でのみ"
+"有用。しかし、LEHO は X.509 証明書の検証にも有用です（証明書が検証されるべき"
+"レガシーのホスト名を指定するため）。また、IPv6 が完全に実装され、IP アドレス"
+"が&quot;無限に&quot;活用できたとしても、仮想ホスティングが無くなるとは言い切"
+"れません。最後に、IPv6 が一般的に利用できるようになるのを待つよりも、GNS は現"
+"行のネットワークで運用できるべきです。"
 
 #: template/faq.html.j2:526
 msgid ""
 "Why does GNS not use a trust metric or consensus to determine globally "
 "unique names?"
-msgstr "GNS がトラストメトリックまたはコンセンサスを使用してグローバルに一意の名前を決定しないのはなぜですか？"
+msgstr ""
+"GNS がトラストメトリックまたはコンセンサスを使用してグローバルに一意の名前を"
+"決定しないのはなぜですか？"
 
 #: template/faq.html.j2:528
 msgid ""
@@ -1509,8 +1637,11 @@ msgid ""
 "of the resolution process was not acceptable. Furthermore, trust and "
 "consensus might be easy to manipulate by adversaries."
 msgstr ""
-"回答：トラストメトリックには、しきい値があるという根本的な問題があります。信頼関係が進化すると、マッピングがそれぞれのしきい値を超えるため、意味が変化しま"
-"す。結果として解決プロセスが予測不能となるのは受け入れられないと結論付けました。さらに、信頼とコンセンサスは、攻撃者により操作されやすい可能性もあります。"
+"回答：トラストメトリックには、しきい値があるという根本的な問題があります。信"
+"頼関係が進化すると、マッピングがそれぞれのしきい値を超えるため、意味が変化し"
+"ます。結果として解決プロセスが予測不能となるのは受け入れられないと結論付けま"
+"した。さらに、信頼とコンセンサスは、攻撃者により操作されやすい可能性もありま"
+"す。"
 
 #: template/faq.html.j2:539
 msgid "How do you handle compromised zone keys in GNS?"
@@ -1525,9 +1656,11 @@ msgid ""
 "resolve. Peers always automatically check for the existence of a revocation "
 "message when resolving names."
 msgstr ""
-"回答：秘密鍵の所有者は失効メッセージを作成できます。その後、オーバーレイ ネットワーク全体に周知し、全てのピアで複製を作成することが可能です。公開鍵を利用"
-"する前に、ピアは鍵が失効しているかを確認します。失効ゾーンを経由して委任された名前は、いずれも解決できません。ピアは名前解決に際して、常に自動で失効メッセ"
-"ージの有無を確認しています。"
+"回答：秘密鍵の所有者は失効メッセージを作成できます。その後、オーバーレイ ネッ"
+"トワーク全体に周知し、全てのピアで複製を作成することが可能です。公開鍵を利用"
+"する前に、ピアは鍵が失効しているかを確認します。失効ゾーンを経由して委任され"
+"た名前は、いずれも解決できません。ピアは名前解決に際して、常に自動で失効メッ"
+"セージの有無を確認しています。"
 
 #: template/faq.html.j2:553
 msgid "Could the signing algorithm of GNS be upgraded in the future?"
@@ -1542,14 +1675,18 @@ msgid ""
 "existing system by using a new record type to indicate the use of a "
 "different cipher system."
 msgstr ""
-"回答：はい、できます。GNS を標準化する過程で、代替の委任レコードに対応できるようプロトコルをすでに変更しています。<br> <br>そのため、"
-"デプロイされた GNS 実装は、新しい署名スキームに対応できるよう更新する必要があります。新しいスキームはその後、新しいレコードタイプを使い異なる暗号シス"
-"テムの利用を示すことで、既存スキームと並行して実行することができます。"
+"回答：はい、できます。GNS を標準化する過程で、代替の委任レコードに対応できる"
+"ようプロトコルをすでに変更しています。<br> <br>そのため、デプロイされた GNS "
+"実装は、新しい署名スキームに対応できるよう更新する必要があります。新しいス"
+"キームはその後、新しいレコードタイプを使い異なる暗号システムの利用を示すこと"
+"で、既存スキームと並行して実行することができます。"
 
 #: template/faq.html.j2:569
 msgid ""
 "How can a GNS zone maintain several name servers, e.g. for load balancing?"
-msgstr "GNS ゾーンは、例えば負荷分散などで、どのように複数のネーム サーバーを保守していますか？"
+msgstr ""
+"GNS ゾーンは、例えば負荷分散などで、どのように複数のネーム サーバーを保守して"
+"いますか？"
 
 #: template/faq.html.j2:571
 msgid ""
@@ -1561,9 +1698,12 @@ msgid ""
 "necessary, the owner of the zone can simply run multiple peers (and share "
 "the zone's key and database among them)."
 msgstr ""
-"回答：GNS レコードは R5N DHT に保存（および複製）されるため、そうしたことは必要ないと考えています。そのため、通常クライアントがルックアップを"
-"実行するたびに、権威サーバーは連絡を受けません。権威サーバーが（一時的に）オフラインになった場合であっても、DHT はレコードを一定期間キャッシュします。"
-"しかし、一つのゾーンに複数のサーバーがどうしても必要な場合、ゾーンの所有者は複数のピアを走らせることができます（ゾーンの鍵とデータベースを共有可能）。"
+"回答：GNS レコードは R5N DHT に保存（および複製）されるため、そうしたことは必"
+"要ないと考えています。そのため、通常クライアントがルックアップを実行するたび"
+"に、権威サーバーは連絡を受けません。権威サーバーが（一時的に）オフラインに"
+"なった場合であっても、DHT はレコードを一定期間キャッシュします。しかし、一つ"
+"のゾーンに複数のサーバーがどうしても必要な場合、ゾーンの所有者は複数のピアを"
+"走らせることができます（ゾーンの鍵とデータベースを共有可能）。"
 
 #: template/faq.html.j2:584
 msgid ""
@@ -1582,11 +1722,14 @@ msgid ""
 "unique names may very well be worth the cost. After all, what is a &quot;"
 "globally&quot; unique name worth, if it does not resolve?"
 msgstr ""
-"回答：GNU ネームシステムは、検閲から保護された DNS "
-"の代替手段を提供します。どのセキュリティメカニズムにも言えることですが、これには代償もあります（名前がグローバルに一意ではない点）。他の例として、"
-"HTTPS 接続は HTTP 接続に比べてより多くの帯域を使用し、レイテンシも大きくなります。使っているアプリケーションによっては、HTTPS のコストは"
-"見合わないこともあります。しかし、検閲の対象となっていいる（またはこれを危惧する）ユーザーにとって、グローバルに一意の名前を放棄するという代償は払うに値す"
-"るものであると言えます。結局、&quot;グローバルに&quot;一意の名前も、名前解決できなければ意味がありません。"
+"回答：GNU ネームシステムは、検閲から保護された DNS の代替手段を提供します。ど"
+"のセキュリティメカニズムにも言えることですが、これには代償もあります（名前が"
+"グローバルに一意ではない点）。他の例として、HTTPS 接続は HTTP 接続に比べてよ"
+"り多くの帯域を使用し、レイテンシも大きくなります。使っているアプリケーション"
+"によっては、HTTPS のコストは見合わないこともあります。しかし、検閲の対象と"
+"なっていいる（またはこれを危惧する）ユーザーにとって、グローバルに一意の名前"
+"を放棄するという代償は払うに値するものであると言えます。結局、&quot;グローバ"
+"ルに&quot;一意の名前も、名前解決できなければ意味がありません。"
 
 #: template/faq.html.j2:600
 msgid "Why do you say that DNS is 'centralized' and 'distributed'?"
@@ -1600,9 +1743,10 @@ msgid ""
 "was able to reassign the management of the country-TLDs of Afganistan and "
 "Iraq during the wars at the beginning of the 21st century."
 msgstr ""
-"回答：DNS が「集中型」であるのは、中央コンポーネント/中央障害点があり、ルートゾーンを IANA / ICANN "
-"が管理しているためです。こうした集中化により、脆弱性が生まれます。例えば米国政府は、21 世紀が明けて戦争を開始した際にアフガニスタンとイラクの国別 "
-"TLD の再割り当てを実施しています。"
+"回答：DNS が「集中型」であるのは、中央コンポーネント/中央障害点があり、ルート"
+"ゾーンを IANA / ICANN が管理しているためです。こうした集中化により、脆弱性が"
+"生まれます。例えば米国政府は、21 世紀が明けて戦争を開始した際にアフガニスタン"
+"とイラクの国別 TLD の再割り当てを実施しています。"
 
 #: template/faq.html.j2:613
 msgid "How does GNS protect against layer-3 censorship?"
@@ -1620,11 +1764,13 @@ msgid ""
 "identifiers. With nicer names, Tor and tor2web-like services would be even "
 "easier to use. </ol>"
 msgstr ""
-"回答：GNS は、レイヤー 3 の検閲には直接対応しませんが、次の 2 つの方法で間接的に対応します。<ol><li>今日では、多くの Web "
-"サイトが仮想ホスティングを使用しているため、特定の IP アドレスをブロックすると、DNS "
-"名をブロックするよりもはるかに多くの被害が発生します。そのため、検閲コストも上昇します。</li> <li>既存のレイヤー 3 回避策（Tor "
-"など）は、検閲耐性のある命名システムによる利点があります。Tor の「."
-"onion」ネームスペースへのアクセスは現在、ユーザーに非記憶型の暗号化識別子を利用することを要しています。名前が向上すれば、Tor や tor2web "
+"回答：GNS は、レイヤー 3 の検閲には直接対応しませんが、次の 2 つの方法で間接"
+"的に対応します。<ol><li>今日では、多くの Web サイトが仮想ホスティングを使用し"
+"ているため、特定の IP アドレスをブロックすると、DNS 名をブロックするよりもは"
+"るかに多くの被害が発生します。そのため、検閲コストも上昇します。</li> <li>既"
+"存のレイヤー 3 回避策（Tor など）は、検閲耐性のある命名システムによる利点があ"
+"ります。Tor の「.onion」ネームスペースへのアクセスは現在、ユーザーに非記憶型"
+"の暗号化識別子を利用することを要しています。名前が向上すれば、Tor や tor2web "
 "のようなサービスはより使いやすくなるでしょう。</ol>"
 
 #: template/faq.html.j2:634
@@ -1642,14 +1788,19 @@ msgid ""
 "breaks the cryptographic chain of trust, legacy search engines will "
 "obviously not obtain censorship-resistant names."
 msgstr ""
-"回答：GNS を使用して名前解決やあらゆる標準ユーザーを実行できるため、検索エンジンに大きな問題はありません。通常、標準ユーザーは、カスタムのソフトウェア"
-"をインストールして名前解決すると考えられますが、現在この方法は検索エンジンでは使えません。ただし、DNS2GNS ゲートウェイにより検索エンジンが "
-"DNS を使用して GNS 名を解決できるため、GNS リソースのインデックスは可能です。しかし、DNS2GNS "
-"ゲートウェイの利用は暗号化による信頼の連鎖を崩すため、レガシーの検索エンジンは検閲耐性のある名前を取得できません。"
+"回答：GNS を使用して名前解決やあらゆる標準ユーザーを実行できるため、検索エン"
+"ジンに大きな問題はありません。通常、標準ユーザーは、カスタムのソフトウェアを"
+"インストールして名前解決すると考えられますが、現在この方法は検索エンジンでは"
+"使えません。ただし、DNS2GNS ゲートウェイにより検索エンジンが DNS を使用して "
+"GNS 名を解決できるため、GNS リソースのインデックスは可能です。しかし、"
+"DNS2GNS ゲートウェイの利用は暗号化による信頼の連鎖を崩すため、レガシーの検索"
+"エンジンは検閲耐性のある名前を取得できません。"
 
 #: template/faq.html.j2:650
 msgid "How does GNS compare to the Unmanaged Internet Architecture (UIA)?"
-msgstr "GNS はアンマネージド インターネット アーキテクチャ（UIA）とどのように比較されますか？"
+msgstr ""
+"GNS はアンマネージド インターネット アーキテクチャ（UIA）とどのように比較され"
+"ますか？"
 
 #: template/faq.html.j2:652
 msgid ""
@@ -1661,10 +1812,12 @@ msgid ""
 "possible with the existing Web infrastructure. UIA is not at all concerned "
 "about legacy systems (clean slate)."
 msgstr ""
-"回答：UIA と GNS は、どちらも同じ基本命名モデルを共有しており、これは実際 Rivest の SDSI に由来しています。しかし、UIA "
-"はレガシー アプリケーションとの統合は考慮せず、ユーザーの複数マシン間における汎用性のあるコネクティビティに注力しています。一方、GNS は DNS "
-"との相互運用に加え、既存の Web インフラとの親和性を最大限に考慮して設計されています。UIA "
-"はレガシーシステムを全く考慮していません（クリーンスレート）。"
+"回答：UIA と GNS は、どちらも同じ基本命名モデルを共有しており、これは実際 "
+"Rivest の SDSI に由来しています。しかし、UIA はレガシー アプリケーションとの"
+"統合は考慮せず、ユーザーの複数マシン間における汎用性のあるコネクティビティに"
+"注力しています。一方、GNS は DNS との相互運用に加え、既存の Web インフラとの"
+"親和性を最大限に考慮して設計されています。UIA はレガシーシステムを全く考慮し"
+"ていません（クリーンスレート）。"
 
 #: template/faq.html.j2:665
 msgid "Doesn't GNS increase the trusted-computing base compared to DNS(SEC)?"
@@ -1679,15 +1832,19 @@ msgid ""
 "given the name length restriction, for an individual name it is always less "
 "than about 128 entities."
 msgstr ""
-"回答：まず、GNS では信頼チェーンを明示的に確認することができるため、解決する名前の所有者が友人または友人の友人であるなどを把握でき、結果がどの程度信頼"
-"できるかが分かります。この方法ではトラステッド コンピューティング "
-"ベース（TCB）が恣意的に大規模になりえますが、名前の長さに制限があるため、大抵の場合、個別の名前は約 128 エンティティ以内です。"
+"回答：まず、GNS では信頼チェーンを明示的に確認することができるため、解決する"
+"名前の所有者が友人または友人の友人であるなどを把握でき、結果がどの程度信頼で"
+"きるかが分かります。この方法ではトラステッド コンピューティング ベース（TCB）"
+"が恣意的に大規模になりえますが、名前の長さに制限があるため、大抵の場合、個別"
+"の名前は約 128 エンティティ以内です。"
 
 #: template/faq.html.j2:679
 msgid ""
 "How does GNS handle SRV/TLSA records where service and protocol are part of "
 "the domain name?"
-msgstr "GNS は、サービスとプロトコルがドメイン名の一部である SRV / TLSA レコードをどのように処理しますか？"
+msgstr ""
+"GNS は、サービスとプロトコルがドメイン名の一部である SRV / TLSA レコードをど"
+"のように処理しますか？"
 
 #: template/faq.html.j2:681
 msgid ""
@@ -1700,10 +1857,13 @@ msgid ""
 "TLSA records) and adds a service and protocol number (and the original boxed "
 "record type) to it."
 msgstr ""
-"回答：GNS が解決のためにドメイン名をラベルに分割すると、「_ Service._Proto」構文が検出され、「Service」が対応するポート番号に変"
-"換、「Proto」が対応するプロトコル番号に変換されます。また、名前のその他の部分は通常通り解決されます。その後、結果が表示された際、GNS は GNS "
-"特有の「BOX」レコード種別を検索します。BOX レコードは、別のレコード（SRV や TLSA "
-"レコードなど）を含むレコードを指し、サービスやプロトコル番号（また、オリジナルのボックス型レコードタイプ）を追加します。"
+"回答：GNS が解決のためにドメイン名をラベルに分割すると、「_ Service._Proto」"
+"構文が検出され、「Service」が対応するポート番号に変換、「Proto」が対応するプ"
+"ロトコル番号に変換されます。また、名前のその他の部分は通常通り解決されます。"
+"その後、結果が表示された際、GNS は GNS 特有の「BOX」レコード種別を検索しま"
+"す。BOX レコードは、別のレコード（SRV や TLSA レコードなど）を含むレコードを"
+"指し、サービスやプロトコル番号（また、オリジナルのボックス型レコードタイプ）"
+"を追加します。"
 
 #: template/faq.html.j2:697
 msgid ""
@@ -1733,15 +1893,17 @@ msgstr "`/dev/net/tun': No such file or directory のエラーとなります。
 msgid ""
 "A: If you get this error message, the solution is simple. Issue the "
 "following commands (as root) to create the required device file"
-msgstr "回答：このエラーメッセージが表示された場合の解決策は簡単です。次のコマンドを（ルートとして）実行し、必要なデバイスファイルを作成してください。"
+msgstr ""
+"回答：このエラーメッセージが表示された場合の解決策は簡単です。次のコマンドを"
+"（ルートとして）実行し、必要なデバイスファイルを作成してください。"
 
 #: template/faq.html.j2:722
 msgid ""
 "'iptables: No chain/target/match by that name.' (when running gnunet-service-"
 "dns)?"
 msgstr ""
-"'iptables: No chain/target/match by that name.' （gnunet-service-dns "
-"���実行�����いる場合）"
+"'iptables: No chain/target/match by that name.' （gnunet-service-dns を実行し"
+"ている場合）"
 
 #: template/faq.html.j2:724
 msgid ""
@@ -1750,25 +1912,30 @@ msgid ""
 "your kernel has CONFIG_NETFILTER_XT_MATCH_OWNER set to either 'y' or "
 "'m' (and the module is loaded)."
 msgstr ""
-"回答：GNUnet DNS の場合、iptables "
-"には「所有者」の一致サポートが必要です。これにはカーネルオプションが正しく設定されていることが必要となります。カーネルの "
-"CONFIG_NETFILTER_XT_MATCH_OWNER "
-"が「y」または「m」に設定されているか（またモジュールがロードされているか）確認してください。"
+"回答：GNUnet DNS の場合、iptables には「所有者」の一致サポートが必要です。こ"
+"れにはカーネルオプションが正しく設定されていることが必要となります。カーネル"
+"の CONFIG_NETFILTER_XT_MATCH_OWNER が「y」または「m」に設定されているか（また"
+"モジュールがロードされているか）確認してください。"
 
 #: template/faq.html.j2:736
 msgid "'Timeout was reached' when running PT on Fedora (and possibly others)?"
-msgstr "Fedora で PT を実行すると（他でも発生の可能性）「Timeout was reached（タイムアウトとなりました）」となります。"
+msgstr ""
+"Fedora で PT を実行すると（他でも発生の可能性）「Timeout was reached（タイム"
+"アウトとなりました）」となります。"
 
 #: template/faq.html.j2:738
 msgid ""
 "A: If you get an error stating that the VPN timeout was reached, check if "
 "your firewall is enabled and blocking the connections."
-msgstr "回答：VPN タイムアウトのエラーが表示された場合は、ファイアウォールが有効となり接続がブロックされていないかを確認してください。"
+msgstr ""
+"回答：VPN タイムアウトのエラーが表示された場合は、ファイアウォールが有効とな"
+"り接続がブロックされていないかを確認してください。"
 
 #: template/faq.html.j2:746
 msgid ""
 "I'm getting an 'error while loading shared libraries: libgnunetXXX.so.X'"
-msgstr "「共有ライブラリのロード中にエラーが発生：libgnunetXXX.so.X」が表示されます。"
+msgstr ""
+"「共有ライブラリのロード中にエラーが発生：libgnunetXXX.so.X」が表示されます。"
 
 #: template/faq.html.j2:748
 msgid ""
@@ -1842,7 +2009,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -3087,8 +3254,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -3120,7 +3287,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
@@ -3233,3 +3400,6 @@ msgstr ""
 #: template/video.html.j2:12
 msgid "Videos related to GNUnet"
 msgstr ""
+
+#~ msgid "Living Standards"
+#~ msgstr "規格や標準"
diff --git a/locale/ko/LC_MESSAGES/messages.po b/locale/ko/LC_MESSAGES/messages.po
index ea357201..c8762327 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-04-11 02:59+0000\n"
 "Last-Translator: Chaewon Park <wonnie0624@gmail.com>\n"
-"Language-Team: Korean <http://weblate.taler.net/projects/gnunet/website/ko/>"
-"\n"
+"Language-Team: Korean <http://weblate.taler.net/projects/gnunet/website/ko/"
+">\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr "안전한 p2p 네트워킹을 위한 GNU의 프레임워크"
 msgid "Contact"
 msgstr "연락처"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr ""
 
@@ -147,10 +147,6 @@ msgstr "용어 사전"
 msgid "Handbook"
 msgstr "핸드북"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr "생활 수준"
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr ""
@@ -193,9 +189,11 @@ msgid ""
 "secure publication of files, it has grown to include all kinds of basic "
 "protocol components and applications towards the creation of a GNU internet."
 msgstr ""
-"GNUnet은 안전하고 분권적이며 개인 정보를 보호할 수 있는 분산형 어플리케이션을 만들기 위한 대체적 네트워크 스택입니다. 우리의 "
-"목표는 오래되어 안전하지 않은 인터넷 프로토콜 스택을 대체하는 것입니다. 우리는 파일의 안전한 게시를 위한 응용 프로그램에서부터 "
-"시작하여, GNU 인터넷 생성을 위한 모든 종류의 기본 프로토콜 구성요소와 응용 프로그램을 포함하게 되기까지 성장했습니다."
+"GNUnet은 안전하고 분권적이며 개인 정보를 보호할 수 있는 분산형 어플리케이션"
+"을 만들기 위한 대체적 네트워크 스택입니다. 우리의 목표는 오래되어 안전하지 않"
+"은 인터넷 프로토콜 스택을 대체하는 것입니다. 우리는 파일의 안전한 게시를 위"
+"한 응용 프로그램에서부터 시작하여, GNU 인터넷 생성을 위한 모든 종류의 기본 프"
+"로토콜 구성요소와 응용 프로그램을 포함하게 되기까지 성장했습니다."
 
 #: template/about.html.j2:23
 msgid ""
@@ -205,9 +203,10 @@ msgid ""
 "hierarchy and when necessary isolated from the rest of the world, the "
 "situation is less tenable for civil society."
 msgstr ""
-"오늘날, 글로벌 네트워크를 사람들이 이용하는 방식과 그에 따라 네트워크에 주어지는 사회적 책임은, 1970년의 그것과는 매우 다릅니다. "
-"위계에 의해 네트워크 장비가 운용되고 외부 사회와 격리되어 있는 군대에서 사용하기에는 인터넷이 여전히 유용할지 모르지만, 시민 사회에서의 "
-"상황은 달라졌습니다."
+"오늘날, 글로벌 네트워크를 사람들이 이용하는 방식과 그에 따라 네트워크에 주어"
+"지는 사회적 책임은, 1970년의 그것과는 매우 다릅니다. 위계에 의해 네트워크 장"
+"비가 운용되고 외부 사회와 격리되어 있는 군대에서 사용하기에는 인터넷이 여전"
+"히 유용할지 모르지만, 시민 사회에서의 상황은 달라졌습니다."
 
 #: template/about.html.j2:32
 msgid ""
@@ -383,7 +382,7 @@ msgid ""
 "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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -469,8 +468,8 @@ msgstr ""
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 
 #: template/applications.html.j2:180
@@ -480,9 +479,8 @@ msgstr ""
 #: template/applications.html.j2:182
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 
 #: template/architecture.html.j2:6
@@ -498,7 +496,7 @@ 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
@@ -509,7 +507,7 @@ msgstr ""
 #: 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 "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -751,8 +749,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 
 #: template/ev.html.j2:52
@@ -761,9 +759,9 @@ msgstr ""
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
@@ -970,9 +968,9 @@ msgstr ""
 #: template/faq.html.j2:183
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 
 #: template/faq.html.j2:195
@@ -988,7 +986,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr ""
 
 #: template/faq.html.j2:212
@@ -1059,7 +1057,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr ""
 
 #: template/faq.html.j2:288
@@ -1079,10 +1077,10 @@ msgid ""
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 
 #: template/faq.html.j2:410
@@ -1121,9 +1119,9 @@ msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 
 #: template/faq.html.j2:453
@@ -1501,7 +1499,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2746,8 +2744,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -2779,7 +2777,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
@@ -2892,3 +2890,6 @@ msgstr ""
 #: template/video.html.j2:12
 msgid "Videos related to GNUnet"
 msgstr ""
+
+#~ msgid "Living Standards"
+#~ msgstr "생활 수준"
diff --git a/locale/messages.pot b/locale/messages.pot
index e218f8d4..3d5caad7 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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+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"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr ""
 
@@ -144,10 +144,6 @@ msgstr ""
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr ""
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr ""
@@ -380,8 +376,8 @@ msgid ""
 "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. -->"
+"look-ups are cryptographically secured. <!-- Too technical: GNS "
+"integrates a robust, efficient and instant key revocation mechanism. -->"
 msgstr ""
 
 #: template/applications.html.j2:38
@@ -466,8 +462,8 @@ msgstr ""
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> "
 "is a convenient but feature-rich graphical application providing "
-"messaging using especially the CADET subsystem. It is developed using GTK"
-" and libhandy for a convergent design."
+"messaging using the CADET subsystem. It is developed using GTK and "
+"libhandy for a convergent design."
 msgstr ""
 
 #: template/applications.html.j2:180
@@ -477,9 +473,9 @@ msgstr ""
 #: template/applications.html.j2:182
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned"
-" to be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It"
+" is developed using nim. Cadet-GTK and groupchat are planned to be "
+"compatible."
 msgstr ""
 
 #: template/architecture.html.j2:6
@@ -495,8 +491,8 @@ 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 (GNS) and a pluggable transport system (TRANSPORT).<br> "
-"Using public keys for addresses and self-organized decentralized routing "
-"algorithms, these subsystems replace the traditional TCP/IP stack."
+"Using public keys for addresses and self-organizing decentralized routing"
+" algorithms, these subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
 #: template/architecture.html.j2:35
@@ -506,7 +502,7 @@ msgstr ""
 #: 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 "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the "
 "implementation is a <a href=\"https://www.gnu.org/\">GNU</a> package, and"
 " will always remain free software."
@@ -753,8 +749,8 @@ msgid ""
 "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)."
+"href=\"https://git.gnunet.org/gnunet-ev.git/\">Satzung (Charter)</a> "
+"(currently only available in German, translations welcome)."
 msgstr ""
 
 #: template/ev.html.j2:52
@@ -763,7 +759,7 @@ msgstr ""
 
 #: template/ev.html.j2:54
 msgid ""
-"You can find our \"Satzung\", and the list of members under <a "
+"You can find our charter, 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: "
@@ -980,9 +976,9 @@ msgstr ""
 #: template/faq.html.j2:183
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a "
+"proxy and all one needs to know is the protocol used between the browser "
+"and the proxy and the GNUnet code for file-sharing."
 msgstr ""
 
 #: template/faq.html.j2:195
@@ -998,7 +994,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr ""
 
 #: template/faq.html.j2:212
@@ -1073,7 +1069,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr ""
 
 #: template/faq.html.j2:288
@@ -1094,8 +1090,8 @@ msgid ""
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, "
 "and there are still registrars that determine who owns a name. <br><br> "
 "With GNS, we decentralize the database and also decentralize the "
-"responsibility for naming: each user runs his own personal root zone and "
-"is thus in complete control of the names he uses. GNS also has many "
+"responsibility for naming: each user runs their own personal root zone "
+"and is thus in complete control of the names they use. GNS also has many "
 "additional features (to keep names short and enable migration) which "
 "don't even make sense in the context of CoDoNS."
 msgstr ""
@@ -1136,8 +1132,8 @@ msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. "
 "Hence, it does not address the name resolution process itself but "
 "delegates resolution into DNS after the initial TLD resolution. Not "
-"taking sustainablility considerations into account, handshake could be "
-"used as an additional supporting GNS root zone governance model but we "
+"taking sustainablility considerations into account, Handshake could be "
+"used as an additional supporting GNS root zone governance model, but we "
 "currently do not have such plans in mind."
 msgstr ""
 
@@ -1519,11 +1515,11 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-"
 "peer networks. Here, there are differences in terms of application domain"
 " and how specifically anonymity is achieved. Anonymous routing is a hard "
-"research topic, so for a superficial comparisson like this one we focus "
-"on the latency. Another important factor is the programming language. "
-"Type-safe languages may offer certain security benefits; however, this "
-"may come at the cost of significant increases in resource consumption "
-"which in turn may reduce anonymity."
+"research topic, so for a superficial comparison like this one we focus on"
+" the latency. Another important factor is the programming language. Type-"
+"safe languages may offer certain security benefits; however, this may "
+"come at the cost of significant increases in resource consumption which "
+"in turn may reduce anonymity."
 msgstr ""
 
 #: template/faq.html.j2:928
@@ -2800,7 +2796,7 @@ msgid ""
 "it to this list. Furthermore, if you are interested in packaging GNUnet "
 "for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using "
-"an Operating System with the Alpine package manager, GNUnet could be "
+"an Operating System with the APT package manager, GNUnet could be "
 "installed as simple as:"
 msgstr ""
 
@@ -2834,7 +2830,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index dc1ec5a9..d17fb86a 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr ""
 
@@ -144,10 +144,6 @@ msgstr ""
 msgid "Handbook"
 msgstr ""
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-msgid "Living Standards"
-msgstr ""
-
 #: common/navigation.j2.inc:88
 msgid "REST API"
 msgstr ""
@@ -374,7 +370,7 @@ msgid ""
 "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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -460,8 +456,8 @@ msgstr ""
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 
 #: template/applications.html.j2:180
@@ -471,9 +467,8 @@ msgstr ""
 #: template/applications.html.j2:182
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
 
 #: template/architecture.html.j2:6
@@ -489,7 +484,7 @@ 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
@@ -500,7 +495,7 @@ msgstr ""
 #: 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 "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -742,8 +737,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 
 #: template/ev.html.j2:52
@@ -752,9 +747,9 @@ msgstr ""
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
@@ -961,9 +956,9 @@ msgstr ""
 #: template/faq.html.j2:183
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 
 #: template/faq.html.j2:195
@@ -979,7 +974,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr ""
 
 #: template/faq.html.j2:212
@@ -1050,7 +1045,7 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr ""
 
 #: template/faq.html.j2:288
@@ -1070,10 +1065,10 @@ msgid ""
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 
 #: template/faq.html.j2:410
@@ -1112,9 +1107,9 @@ msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 
 #: template/faq.html.j2:453
@@ -1492,7 +1487,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -2737,8 +2732,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -2770,7 +2765,7 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
+msgid "To compile gnunet from the git source you can do so by entering:"
 msgstr ""
 
 #: template/install.html.j2:106
diff --git a/locale/zh_Hant/LC_MESSAGES/messages.po b/locale/zh_Hant/LC_MESSAGES/messages.po
index c6f98fba..fd2521e3 100644
--- a/locale/zh_Hant/LC_MESSAGES/messages.po
+++ b/locale/zh_Hant/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-12 16:12+0100\n"
+"POT-Creation-Date: 2021-04-28 14:41+0200\n"
 "PO-Revision-Date: 2021-04-25 04:48+0000\n"
 "Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/"
@@ -34,7 +34,7 @@ msgstr "GNU為安全p2p制定的網路框架"
 msgid "Contact"
 msgstr "聯絡"
 
-#: common/footer.j2.inc:8 common/navigation.j2.inc:49
+#: common/footer.j2.inc:8
 msgid "GNUnet e.V."
 msgstr "GNUnet e.V."
 
@@ -158,11 +158,6 @@ msgstr "詞彙表"
 msgid "Handbook"
 msgstr "手冊"
 
-#: common/navigation.j2.inc:87 template/livingstandards.html.j2:8
-#, fuzzy
-msgid "Living Standards"
-msgstr "生活水準"
-
 #: common/navigation.j2.inc:88
 #, fuzzy
 msgid "REST API"
@@ -247,7 +242,8 @@ msgid ""
 "GNUnet must be implemented as <a href=\"https://www.gnu.org/philosophy/free-"
 "sw.html\">Free Software</a>."
 msgstr ""
-"GNUnet 必須實施為<a href=\"https://www.gnu.org/philosophy/free-sw.html\">免費軟體</a>。"
+"GNUnet 必須實施為<a href=\"https://www.gnu.org/philosophy/free-sw.html\">免費"
+"軟體</a>。"
 
 #: template/about.html.j2:60
 msgid ""
@@ -399,7 +395,7 @@ msgid ""
 "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 "
+"answers. The integrity of records and privacy of look-ups are "
 "cryptographically secured. <!-- Too technical: GNS integrates a robust, "
 "efficient and instant key revocation mechanism. -->"
 msgstr ""
@@ -438,7 +434,9 @@ msgid ""
 "GNUnet conversation is an application that provides secure voice "
 "communication in a fully decentralized way by employing GNUnet for routing "
 "and transport."
-msgstr "GNUnet對話是一種通過採用GNUnet進行路由和傳輸以完全分散的方式提供安全語音通信的應用程序。"
+msgstr ""
+"GNUnet對話是一種通過採用GNUnet進行路由和傳輸以完全分散的方式提供安全語音通信"
+"的應用程序。"
 
 #: template/applications.html.j2:91
 msgid "Applications utilizing GNUnet"
@@ -454,8 +452,8 @@ msgid ""
 "electronic payment system. Payments are cryptographically secured and are "
 "confirmed within milliseconds with extremely low transaction costs."
 msgstr ""
-"<a href=\"https://taler.net/\">GNU "
-"Taler</a>是一種新的保護隱私的電子支付系統。付款由密碼保護，並且可以在幾毫秒內以極低的交易成本進行確認。"
+"<a href=\"https://taler.net/\">GNU Taler</a>是一種新的保護隱私的電子支付系"
+"統。付款由密碼保護，並且可以在幾毫秒內以極低的交易成本進行確認。"
 
 #: template/applications.html.j2:118
 msgid "secushare"
@@ -469,9 +467,9 @@ msgid ""
 "the extensible PSYC protocol, notifications are distributed end-to-end "
 "encrypted to authorized recipients only."
 msgstr ""
-"<a href=\"https://secushare.org/\""
-">安全共享</a>正在GNUnet之上建立一個去中心化的社交網路應用程序。使用覆蓋多播(multicast)和可擴展的PSYC協議，透過端對端(end-"
-"to-end)加密將通知分發給授權接收者。"
+"<a href=\"https://secushare.org/\">安全共享</a>正在GNUnet之上建立一個去中心化"
+"的社交網路應用程序。使用覆蓋多播(multicast)和可擴展的PSYC協議，透過端對端"
+"(end-to-end)加密將通知分發給授權接收者。"
 
 #: template/applications.html.j2:139
 #, fuzzy
@@ -486,8 +484,9 @@ msgid ""
 "cryptographic protocols to verify keys."
 msgstr ""
 "<a href=\"https://pep.foundation/\">相當容易的隱私(pretty Easy Privacy)</a> "
-"(p&#8801;p)使用機會密鑰交換(opportunistic key exchange)建立可用的端到端(end-to-"
-"end)加密電子郵件解決方案。p&#8801;p將會使用GNUnet來保護元資料(metadata)並利用新的加密協議來驗證密鑰。"
+"(p&#8801;p)使用機會密鑰交換(opportunistic key exchange)建立可用的端到端(end-"
+"to-end)加密電子郵件解決方案。p&#8801;p將會使用GNUnet來保護元資料(metadata)並"
+"利用新的加密協議來驗證密鑰。"
 
 #: template/applications.html.j2:160
 #, fuzzy
@@ -499,12 +498,12 @@ msgstr "學員GTK(Cadet-GTK)"
 msgid ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">Cadet-GTK</a> is a "
 "convenient but feature-rich graphical application providing messaging using "
-"especially the CADET subsystem. It is developed using GTK and libhandy for a "
-"convergent design."
+"the CADET subsystem. It is developed using GTK and libhandy for a convergent "
+"design."
 msgstr ""
 "<a href=\"https://gitlab.com/gnunet-messenger/cadet-gtk\">學員-GTK(Cadet-"
-"GTK)</a>是一種方便而功能豐富的圖形應用程序，學員-GTK(Cadet-"
-"GTK)���其使用CADET���系統提供消息傳遞。它是使用GTK和libhandy開發的以收斂設計。"
+"GTK)</a>是一種方便而功能豐富的圖形應用程序，學員-GTK(Cadet-GTK)尤其使用CADET"
+"子系統提供消息傳遞。它是使用GTK和libhandy開發的以收斂設計。"
 
 #: template/applications.html.j2:180
 msgid "groupchat"
@@ -514,13 +513,12 @@ msgstr "群組聊天"
 #, fuzzy
 msgid ""
 "<a href=\"https://git.gnunet.org/groupchat.git/\">groupchat</a> is a "
-"terminal user interface providing messaging using especially the CADET "
-"subsystem. It is developed using nim. Cadet-GTK and groupchat are planned to "
-"be compatible."
+"terminal user interface providing messaging using the CADET subsystem. It is "
+"developed using nim. Cadet-GTK and groupchat are planned to be compatible."
 msgstr ""
-"<a href=\"https://git.gnunet.org/groupchat.git/\""
-">群組聊天(groupchat)</a>是一個終端用戶界面，特別是使用CADET子系統提供消息傳遞。它使用nim來開發。學員-GTK(Cadet-"
-"GTK)與群組聊天(groupchat)兩者計劃兼容。"
+"<a href=\"https://git.gnunet.org/groupchat.git/\">群組聊天(groupchat)</a>是一"
+"個終端用戶界面，特別是使用CADET子系統提供消息傳遞。它使用nim來開發。學員-"
+"GTK(Cadet-GTK)與群組聊天(groupchat)兩者計劃兼容。"
 
 #: template/architecture.html.j2:6
 msgid "GNUnet System Architecture"
@@ -535,7 +533,7 @@ 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 "
 "(GNS) and a pluggable transport system (TRANSPORT).<br> Using public keys "
-"for addresses and self-organized decentralized routing algorithms, these "
+"for addresses and self-organizing decentralized routing algorithms, these "
 "subsystems replace the traditional TCP/IP stack."
 msgstr ""
 
@@ -546,7 +544,7 @@ msgstr "安全性"
 #: 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 "
+"runs as a separate process, providing fault isolation and enabling tight "
 "permissions to be granted to each subsystem. Naturally, the implementation "
 "is a <a href=\"https://www.gnu.org/\">GNU</a> package, and will always "
 "remain free software."
@@ -599,9 +597,9 @@ msgid ""
 "freenode.net</a>. There is also an <a href=\"https://view.matrix.org/room/!"
 "IjaAfLiruzjxFFzKAV:matrix.org/\">archive</a> available."
 msgstr ""
-"<tt>#gnunet</tt>可通過<a href=\"https://freenode.net\">irc.freenode.net</a>被聯繫。"
-"這也有一個<a href=\"https://view.matrix.org/room/!IjaAfLiruzjxFFzKAV:matrix.org/\""
-">檔案</a>可用。"
+"<tt>#gnunet</tt>可通過<a href=\"https://freenode.net\">irc.freenode.net</a>被"
+"聯繫。這也有一個<a href=\"https://view.matrix.org/room/!IjaAfLiruzjxFFzKAV:"
+"matrix.org/\">檔案</a>可用。"
 
 #: template/contact.html.j2:38
 msgid "Contacting individuals"
@@ -666,13 +664,17 @@ msgstr "儲存庫"
 msgid ""
 "A list of our Git repositories can be found on our our <a href=\"https://git."
 "gnunet.org/\">Git Server</a>."
-msgstr "您可以在我們的<a href=\"https://git.gnunet.org/\">Git伺服器</a>上找到我們的Git存儲庫列表。"
+msgstr ""
+"您可以在我們的<a href=\"https://git.gnunet.org/\">Git伺服器</a>上找到我們的"
+"Git存儲庫列表。"
 
 #: template/developers.html.j2:27
 msgid ""
 "Technical papers can be found in our <a href=\"https://old.gnunet.org/"
 "bibliography\">bibliography</a>."
-msgstr "您可以於我們的<a href=\"https://old.gnunet.org/bibliography\">參考書目中</a>找到技術文件。"
+msgstr ""
+"您可以於我們的<a href=\"https://old.gnunet.org/bibliography\">參考書目中</a>"
+"找到技術文件。"
 
 #: template/developers.html.j2:34
 msgid "Discussion"
@@ -685,9 +687,9 @@ msgid ""
 "gnunet-developers\">http://lists.gnu.org/mailman/listinfo/gnunet-developers</"
 "a>."
 msgstr ""
-"我們有一個郵件列表供開發人員討論。您可以於<a href=\"http://lists.gnu.org/mailman/listinfo/gnunet-"
-"developers\">http://lists.gnu.org/mailman/listinfo/gnunet-"
-"developers</a>訂閱或是閱讀此檔案清單。"
+"我們有一個郵件列表供開發人員討論。您可以於<a href=\"http://lists.gnu.org/"
+"mailman/listinfo/gnunet-developers\">http://lists.gnu.org/mailman/listinfo/"
+"gnunet-developers</a>訂閱或是閱讀此檔案清單。"
 
 #: template/developers.html.j2:47
 msgid "Regression Testing"
@@ -700,8 +702,8 @@ msgid ""
 "org/buildbot/gnunet/\">https://old.gnunet.org/buildbot/gnunet/</a>."
 msgstr ""
 "我們在<a href=\"https://old.gnunet.org/buildbot/gnunet/\">https://old.gnunet."
-"org/buildbot/gnunet/</a>上，提供了<a href=\"https://buildbot.net/\""
-">Buildbot</a>自動化測試，以檢測回歸併檢查可移植性。"
+"org/buildbot/gnunet/</a>上，提供了<a href=\"https://buildbot.net/"
+"\">Buildbot</a>自動化測試，以檢測回歸併檢查可移植性。"
 
 #: template/developers.html.j2:59
 msgid "Code Coverage Analysis"
@@ -713,9 +715,9 @@ msgid ""
 "analyze the code coverage of our tests, the results are available at <a href="
 "\"https://old.gnunet.org/coverage/\">https://old.gnunet.org/coverage/</a>."
 msgstr ""
-"我們使用<a href=\"http://ltp.sourceforge.net/coverage/lcov.php\""
-">LCOV</a>來分析我們測試的程式碼覆蓋率，其結果可從<a href=\"https://old.gnunet.org/coverage/\""
-">https://old.gnunet.org/coverage/</a>上獲得。"
+"我們使用<a href=\"http://ltp.sourceforge.net/coverage/lcov.php\">LCOV</a>來分"
+"析我們測試的程式碼覆蓋率，其結果可從<a href=\"https://old.gnunet.org/"
+"coverage/\">https://old.gnunet.org/coverage/</a>上獲得。"
 
 #: template/developers.html.j2:72
 msgid "Performance Analysis"
@@ -727,8 +729,9 @@ msgid ""
 "regression analysis of the exchange backend at <a href=\"https://old.gnunet."
 "org/gauger/\">https://old.gnunet.org/gauger/</a>."
 msgstr ""
-"我們於<a href=\"https://old.gnunet.org/gauger/\">https://old.gnunet.org/gauger/"
-"</a>上使用<a href=\"https://old.gnunet.org/gauger\">Gauger</a>對交換後端進行性能回歸分析。"
+"我們於<a href=\"https://old.gnunet.org/gauger/\">https://old.gnunet.org/"
+"gauger/</a>上使用<a href=\"https://old.gnunet.org/gauger\">Gauger</a>對交換後"
+"端進行性能回歸分析。"
 
 #: template/download.html.j2:7 template/gnurl.html.j2:209
 #, fuzzy
@@ -807,8 +810,8 @@ msgid ""
 "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)."
+"git/\">Satzung (Charter)</a> (currently only available in German, "
+"translations welcome)."
 msgstr ""
 
 #: template/ev.html.j2:52
@@ -817,9 +820,9 @@ msgstr "治理"
 
 #: 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."
-"org/gnunet-ev.git/tree/satzung.tex</a>. The current board consists of: "
+"You can find our charter, 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://schanzen.eu\">Martin "
 "Schanzenbach</a></dd> <dt>stellvertretender Vorsitz</dt> <dd>t3sserakt</dd> "
 "<dt>Kassenwart</dt> <dd>Florian Dold</dd> <dt>Beisitzer</dt> <dd> <a href="
@@ -878,8 +881,8 @@ msgid ""
 "documentation or ask the question on the help-gnunet@gnu.org mailing list or "
 "the #gnunet IRC on irc.freenode.net."
 msgstr ""
-"答:還有許多其他信息來源可供您參考。您可以閱讀額外的文件、透過help-gnunet@gnu.org寄件名單或是 irc.freenode.net上的#"
-"gnunet IRC來訊問問題。"
+"答:還有許多其他信息來源可供您參考。您可以閱讀額外的文件、透過help-gnunet@gnu."
+"org寄件名單或是 irc.freenode.net上的#gnunet IRC來訊問問題。"
 
 #: template/faq.html.j2:36
 msgid "When are you going to release the next version?"
@@ -903,8 +906,8 @@ msgid ""
 "A: GNUnet is free software, available under the <a href=\"https://www.gnu."
 "org/licenses/agpl-3.0.en.html\">GNU Affero Public License (AGPL)</a>."
 msgstr ""
-"答: GNUnet是免費軟體，您可以根據<a href=\"https://www.gnu.org/licenses/agpl-3.0.en.html\""
-">GNU Affero公共許可證(AGPL)</a>來取得。"
+"答: GNUnet是免費軟體，您可以根據<a href=\"https://www.gnu.org/licenses/"
+"agpl-3.0.en.html\">GNU Affero公共許可證(AGPL)</a>來取得。"
 
 #: template/faq.html.j2:58
 msgid "Are there any known bugs?"
@@ -1033,9 +1036,9 @@ msgstr "是否可以通過瀏覽器作為匿名WWW訪問GNUnet？"
 #: template/faq.html.j2:183
 msgid ""
 "A: There is currently no proxy (like fproxy in Freenet) for GNUnet that "
-"would make it accessible with a browser. It is possible to build such a "
-"proxy and all one needs to know is the protocol used between browser and "
-"proxy and a swift look at the GNUnet code for file-sharing."
+"would make it accessible via a browser. It is possible to build such a proxy "
+"and all one needs to know is the protocol used between the browser and the "
+"proxy and the GNUnet code for file-sharing."
 msgstr ""
 
 #: template/faq.html.j2:195
@@ -1051,7 +1054,9 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:210
-msgid "On top of which operating systems does GNUnet run?"
+#, fuzzy
+#| msgid "On top of which operating systems does GNUnet run?"
+msgid "Which operating systems does GNUnet run on?"
 msgstr "GNUnet在哪些操作系統上運行？"
 
 #: template/faq.html.j2:212
@@ -1122,7 +1127,9 @@ msgid ""
 msgstr ""
 
 #: template/faq.html.j2:286
-msgid "How does GNS compare to other name systems"
+#, fuzzy
+#| msgid "How does GNS compare to other name systems"
+msgid "How does GNS compare to other name systems?"
 msgstr "GNS與其他名稱系統(name systems)相比如何"
 
 #: template/faq.html.j2:288
@@ -1131,8 +1138,8 @@ msgid ""
 "ns2018.pdf\">has been published </a> and below is a table from the "
 "publication. For detailed descriptions please refer to the paper."
 msgstr ""
-"答: 有關該主題的科學論文<a href=\"https://grothoff.org/christian/ns2018.pdf\""
-">已被發表</a>，以下是該出版物的表格。請參閱該論文以閱讀更多細節及描述。"
+"答: 有關該主題的科學論文<a href=\"https://grothoff.org/christian/ns2018.pdf"
+"\">已被發表</a>，以下是該出版物的表格。請參閱該論文以閱讀更多細節及描述。"
 
 #: template/faq.html.j2:392
 msgid "What is the difference between GNS and CoDoNS?"
@@ -1144,10 +1151,10 @@ msgid ""
 "authority structure of DNS. With CoDoNS, IANA/ICANN are still in charge, and "
 "there are still registrars that determine who owns a name. <br><br> With "
 "GNS, we decentralize the database and also decentralize the responsibility "
-"for naming: each user runs his own personal root zone and is thus in "
-"complete control of the names he uses. GNS also has many additional features "
-"(to keep names short and enable migration) which don't even make sense in "
-"the context of CoDoNS."
+"for naming: each user runs their own personal root zone and is thus in "
+"complete control of the names they use. GNS also has many additional "
+"features (to keep names short and enable migration) which don't even make "
+"sense in the context of CoDoNS."
 msgstr ""
 
 #: template/faq.html.j2:410
@@ -1186,9 +1193,9 @@ msgid ""
 "A: Handshake is a blockchain-based method for root zone governance. Hence, "
 "it does not address the name resolution process itself but delegates "
 "resolution into DNS after the initial TLD resolution. Not taking "
-"sustainablility considerations into account, handshake could be used as an "
-"additional supporting GNS root zone governance model but we currently do not "
-"have such plans in mind."
+"sustainablility considerations into account, Handshake could be used as an "
+"additional supporting GNS root zone governance model, but we currently do "
+"not have such plans in mind."
 msgstr ""
 
 #: template/faq.html.j2:453
@@ -1211,7 +1218,9 @@ msgstr ""
 msgid ""
 "Does GNS require real-world introduction (secure PKEY exchange) in the style "
 "of the PGP web of trust?"
-msgstr "GNS是否需要以PGP信任網路(PGP web of trust)的方式進行真實世界的介紹(安全的PKEY交換)?"
+msgstr ""
+"GNS是否需要以PGP信任網路(PGP web of trust)的方式進行真實世界的介紹(安全的PKEY"
+"交換)?"
 
 #: template/faq.html.j2:470
 msgid ""
@@ -1321,7 +1330,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "How can a GNS zone maintain several name servers, e.g. for load balancing?"
-msgstr "GNS區域如何維護多個名稱伺服器(name servers)，如: 負載平衡(load balancing)?"
+msgstr ""
+"GNS區域如何維護多個名稱伺服器(name servers)，如: 負載平衡(load balancing)?"
 
 #: template/faq.html.j2:571
 msgid ""
@@ -1338,7 +1348,9 @@ msgstr ""
 msgid ""
 "Why do you believe it is worth giving up unique names for censorship "
 "resistance?"
-msgstr "您為什麼認為值得為了抵抗審查(censorship resistance)放棄獨特名稱(unique names)?"
+msgstr ""
+"您為什麼認為值得為了抵抗審查(censorship resistance)放棄獨特名稱(unique "
+"names)?"
 
 #: template/faq.html.j2:586
 msgid ""
@@ -1449,7 +1461,8 @@ msgstr ""
 msgid ""
 "I receive many &quot;WARNING Calculated flow delay for X at Y for Z&quot;. "
 "Should I worry?"
-msgstr "我收到許多 &quot;警告: 對於Z的Y處X計算流量延遲&quot;。請問我需要擔心嗎?"
+msgstr ""
+"我收到許多 &quot;警告: 對於Z的Y處X計算流量延遲&quot;。請問我需要擔心嗎?"
 
 #: template/faq.html.j2:699
 msgid ""
@@ -1467,14 +1480,18 @@ msgstr "開啟 '/dev/net/tun' 時出現錯誤: 沒有此文件或目錄?"
 msgid ""
 "A: If you get this error message, the solution is simple. Issue the "
 "following commands (as root) to create the required device file"
-msgstr "答: 若您收到此錯誤訊息，解決方法很簡單。發出以下命令(以root用戶身份)創建所需的設備文件"
+msgstr ""
+"答: 若您收到此錯誤訊息，解決方法很簡單。發出以下命令(以root用戶身份)創建所需"
+"的設備文件"
 
 #: template/faq.html.j2:722
 #, fuzzy
 msgid ""
 "'iptables: No chain/target/match by that name.' (when running gnunet-service-"
 "dns)?"
-msgstr "\"iptables: 沒有該名稱的鍊(chain)/目標/匹配項目。\"(運行gnunet-service-dns時)?"
+msgstr ""
+"\"iptables: 沒有該名稱的鍊(chain)/目標/匹配項目。\"(運行gnunet-service-dns"
+"時)?"
 
 #: template/faq.html.j2:724
 msgid ""
@@ -1483,8 +1500,9 @@ msgid ""
 "your kernel has CONFIG_NETFILTER_XT_MATCH_OWNER set to either 'y' or "
 "'m' (and the module is loaded)."
 msgstr ""
-"答: 對於GNUnet DNS，您的iptables需具有 &quot;所有者&quot; 匹配支持。這可以通過使用正確的內核(kernel)選項來達成。"
-"請檢察您的內核的CONFIG_NETFILTER_XT_MATCH_OWNER是否已設定為 'y'或是'm'(並且已載入模板)。"
+"答: 對於GNUnet DNS，您的iptables需具有 &quot;所有者&quot; 匹配支持。這可以通"
+"過使用正確的內核(kernel)選項來達成。請檢察您的內核的"
+"CONFIG_NETFILTER_XT_MATCH_OWNER是否已設定為 'y'或是'm'(並且已載入模板)。"
 
 #: template/faq.html.j2:736
 msgid "'Timeout was reached' when running PT on Fedora (and possibly others)?"
@@ -1494,7 +1512,9 @@ msgstr "在Fedora(或其他)上運行PT時“已超時”?"
 msgid ""
 "A: If you get an error stating that the VPN timeout was reached, check if "
 "your firewall is enabled and blocking the connections."
-msgstr "答: 如果收到指出已達到VPN超時的錯誤訊息，請檢查您的防火牆是否為啟用狀態且阻擋連線。"
+msgstr ""
+"答: 如果收到指出已達到VPN超時的錯誤訊息，請檢查您的防火牆是否為啟用狀態且阻擋"
+"連線。"
 
 #: template/faq.html.j2:746
 msgid ""
@@ -1573,7 +1593,7 @@ msgid ""
 "Another important point of reference are the various anonymous peer-to-peer "
 "networks. Here, there are differences in terms of application domain and how "
 "specifically anonymity is achieved. Anonymous routing is a hard research "
-"topic, so for a superficial comparisson like this one we focus on the "
+"topic, so for a superficial comparison like this one we focus on the "
 "latency. Another important factor is the programming language. Type-safe "
 "languages may offer certain security benefits; however, this may come at the "
 "cost of significant increases in resource consumption which in turn may "
@@ -1781,7 +1801,9 @@ msgstr ""
 msgid ""
 "Our main usecase is for GNUnet and Taler, but it might be usable for others, "
 "hence we&#39;re releasing the code to the general public."
-msgstr "我們的程式碼主要用於GNUnet和Taler，但考慮到對其他人可能也有幫助，我們決定&#39;將程式碼公之於眾。"
+msgstr ""
+"我們的程式碼主要用於GNUnet和Taler，但考慮到對其他人可能也有幫助，我們決定"
+"&#39;將程式碼公之於眾。"
 
 #: template/gnurl.html.j2:37
 #, fuzzy
@@ -1790,8 +1812,8 @@ msgid ""
 "README for instructions, as you must supply the correct options to configure "
 "to get a proper build of libgnurl."
 msgstr ""
-"libgnurl與libcurl由相同的許可證所發行。由於您必須提供正確的選項來進行配置以獲取正確的libgnurl建構，請閱讀README以了解更多的相"
-"關指令。"
+"libgnurl與libcurl由相同的許可證所發行。由於您必須提供正確的選項來進行配置以獲"
+"取正確的libgnurl建構，請���讀README以了解更多的相���指令。"
 
 #: template/gnurl.html.j2:48
 msgid "About gnurl"
@@ -1954,7 +1976,9 @@ msgstr "從分佈式tarballr建立(首選方法)"
 msgid ""
 "If you want to verify the signature, install an OpenPGP compatible tool such "
 "as security/gnupgp2 (and set it up). Assuming you use pkgin:"
-msgstr "如果您想要驗證簽名，請安裝與OpenPGP兼容的工具，例如security/gnupgp2(並進行設置)。假設您使用pkgin:"
+msgstr ""
+"如果您想要驗證簽名，請安裝與OpenPGP兼容的工具，例如security/gnupgp2(並進行設"
+"置)。假設您使用pkgin:"
 
 #: template/gnurl.html.j2:267
 #, fuzzy
@@ -2034,8 +2058,9 @@ msgid ""
 "\">bugs.gnunet.org</a>. Alternatively you can use our bug mailinglist, but "
 "we prefer to track bugs on the bugtracker."
 msgstr ""
-"您可以透過我們的錯誤追踪器報告錯誤:<a href=\"https://bugs.gnunet.org/\">bugs.gnunet."
-"org</a>。或是您也可以使用我們的報錯寄件名單，但我們較偏好您使用錯誤追踪器來舉報錯誤。"
+"您可以透過我們的錯誤追踪器報告錯誤:<a href=\"https://bugs.gnunet.org/\">bugs."
+"gnunet.org</a>。或是您也可以使用我們的報錯寄件名單，但我們較偏好您使用錯誤追"
+"踪器來舉報錯誤。"
 
 #: template/gnurl.html.j2:395
 msgid "Maintainer and Cryptographic signatures"
@@ -2064,8 +2089,8 @@ msgid ""
 "Schanzenbach) and I have worked on creating and extending the REST API of "
 "GNUnet. Currently, we mirrored the functionality of following commands:"
 msgstr ""
-"於Google Summer of Code 2018，我的導師(Martin Schanzenbach)和我一直致力於創建和擴展GNUnet的REST "
-"API。目前，我們鏡像了下列命令的功能:"
+"於Google Summer of Code 2018，我的導師(Martin Schanzenbach)和我一直致力於創建"
+"和擴展GNUnet的REST API。目前，我們鏡像了下列命令的功能:"
 
 #: template/gsoc-2018-gnunet-webui.html.j2:32
 msgid ""
@@ -2073,8 +2098,8 @@ msgid ""
 "and the design framework iotaCSS to use the new REST API. The REST API of "
 "GNUnet is now documented with Sphinx."
 msgstr ""
-"此外，我們使用Javascript框架Angular 6和設計框架iotaCSS開發了一個網站，以使用新的REST API。GNUnet的REST "
-"API現在使用Sphinx來做記載。"
+"此外，我們使用Javascript框架Angular 6和設計框架iotaCSS開發了一個網站，以使用"
+"新的REST API。GNUnet���REST API���在使用Sphinx來做記載。"
 
 #: template/gsoc-2018-gnunet-webui.html.j2:41
 msgid ""
@@ -2260,15 +2285,17 @@ msgid ""
 "written in C, and this is not about rewriting GNUnet in Java, but about "
 "getting the C code to run on Android."
 msgstr ""
-"是時候讓GNUnet在Android上正常運行了。請注意，GNUnet是使用C所撰寫，而這裡並不是要重新以Java來撰寫GNUnet，而是使C語言在And"
-"roid上運行。"
+"是時候讓GNUnet在Android上正常運行了。請注意，GNUnet是使用C所撰寫，而這裡並不"
+"是要重新以Java來撰寫GNUnet，而是使C語言在Android上運行。"
 
 #: template/gsoc.html.j2:229
 msgid ""
 "Includes: Implementation of rudimentary Android compatibility for GNUnet, in "
 "part by porting the GNUnet utils scheduler to act as a thin wrapper over "
 "libuv."
-msgstr "包括: 對GNUnet的基本Android兼容性的實現，部分是通過移植GNUnet utils調度程序來充當libuv的精簡包裝。"
+msgstr ""
+"包括: 對GNUnet的基本Android兼容性的實現，部分是通過移植GNUnet utils調度程序來"
+"充當libuv的精簡包裝。"
 
 #: template/gsoc.html.j2:236
 msgid ""
@@ -2330,8 +2357,9 @@ msgid ""
 "about how names should be moved around the local system. We're calling this "
 "more collaborative approach NSS2 for now."
 msgstr ""
-"注意: 有一個特殊的TLDs規範，允許Tor也可以使用GNS而不是Tor來解析域名，但是直到同仁們對如何在本地系統中移動名稱進行更多思考之前，這將持續處於"
-"擱置狀態。我們目前暫時將這種更協作的方法稱為NSS2。"
+"注意: 有一個特殊的TLDs規範，允許Tor也可以使用GNS而不是Tor來解析域名，但是直到"
+"同仁們對如何在本地系統中移動名稱進行更多思考之前，這將持續處於擱置狀態。我們"
+"目前暫時將這種更協作的方法稱為NSS2。"
 
 #: template/gsoc.html.j2:316 template/gsoc.html.j2:456
 #: template/gsoc.html.j2:496 template/gsoc.html.j2:526
@@ -2345,14 +2373,17 @@ msgid ""
 "asynchronous IO library built upon it, such as rotor, mioco, eventual_io, or "
 "gj."
 msgstr ""
-"改進GNUnet utils的Rust實現，可能包括使用mio或基於它構建的更高級的異步IO庫(asynchronous IO library)(例如: "
-"rotor、mioco、eventual_io或gj)添加對異步IO(asynchronous IO)的支持。"
+"改進GNUnet utils的Rust實現，可能包括使用mio或基於它構建的更高級的異步IO庫"
+"(asynchronous IO library)(例如: rotor、mioco、eventual_io或gj)添加對異步"
+"IO(asynchronous IO)的支持。"
 
 #: template/gsoc.html.j2:345
 msgid ""
 "Implementation of a replacement for PANDA (see Pond) with better security, "
 "and maybe integration with the GNU Name System for key exchange."
-msgstr "實現具有更好安全性的PANDA替代品(請參閱Pond)，並且可能與GNU名稱系統整合以進行密鑰交換。"
+msgstr ""
+"實現具有更好安全性的PANDA替代品(請參閱Pond)，並且可能與GNU名稱系統整合以進行"
+"密鑰交換。"
 
 #: template/gsoc.html.j2:357
 msgid "Required Skills: Rust or C, crypto"
@@ -2428,7 +2459,8 @@ msgid ""
 "Related to <a href=\"http://secushare.org/rendezvous\">secushare.org/"
 "rendezvous</a>"
 msgstr ""
-"與之相關 <a href=\"http://secushare.org/rendezvous\">secushare.org/rendezvous</a>"
+"與之相關 <a href=\"http://secushare.org/rendezvous\">secushare.org/"
+"rendezvous</a>"
 
 #: template/gsoc.html.j2:451 template/gsoc.html.j2:491
 msgid "<strong>Mentors:</strong> t3sserakt, lynX"
@@ -2462,7 +2494,9 @@ msgid ""
 "Implementation of additional transports to make GNUnet communication more "
 "robust in the presence of problematic networks: GNUnet-over-SMTP, GNUnet-"
 "over-DNS"
-msgstr "在存在問題網絡的情況下，實現附加傳輸以使GNUnet通訊更加健壯: GNUnet-over-SMTP、GNUnet-over-DNS"
+msgstr ""
+"在存在問題網絡的情況下，實現附加傳輸以使GNUnet通訊更加健壯: GNUnet-over-"
+"SMTP、GNUnet-over-DNS"
 
 #: template/gsoc.html.j2:546 template/gsoc.html.j2:560
 msgid "<strong>Mentors:</strong> Matthias Wachs"
@@ -2473,12 +2507,14 @@ msgid ""
 "Implementation of ALG-based NAT traversal methods (FTP/SIP-based hole "
 "punching, better STUN support)"
 msgstr ""
-"基於ALG的NAT遍歷方法(traversal methods)的實現(基於FTP/SIP的hole punching，更好的STUN support)"
+"基於ALG的NAT遍歷方法(traversal methods)的實現(基於FTP/SIP的hole punching，更"
+"好的STUN support)"
 
 #: template/gsoc.html.j2:568
 msgid ""
 "<strong>Mentors:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
-msgstr "<strong>導師:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
+msgstr ""
+"<strong>導師:</strong> Matthias Wachs, Christian Grothoff, Jeff Burdges"
 
 #: template/gsoc.html.j2:576
 msgid ""
@@ -2539,11 +2575,13 @@ msgstr "要求技能: C、JavaScript、CSS"
 #: template/gsoc.html.j2:667
 msgid ""
 "Report: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018: GNUnet WebUI</a>"
-msgstr "報告: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018：GNUnet WebUI</a>"
+msgstr ""
+"報告: <a href=\"gsoc-2018-gnunet-webui.html\">GSoC 2018：GNUnet WebUI</a>"
 
 #: template/index.html.j2:8
 msgid "The Internet of tomorrow needs GNUnet today"
-msgstr "明天的互聯網需要今天的GNUnet(The Internet of tomorrow needs GNUnet today)"
+msgstr ""
+"明天的互聯網需要今天的GNUnet(The Internet of tomorrow needs GNUnet today)"
 
 #: template/index.html.j2:26
 msgid "Latest news"
@@ -2633,8 +2671,9 @@ msgid ""
 "\"link\" href=\"https://www.gnu.org/philosophy/free-sw.html\">essential "
 "freedoms</a> to various degrees."
 msgstr ""
-"如今，監視日益集中化的基礎架構、專有實現(proprietary implementations)、流量整形器和防火牆在各種程度上限制了所有<a "
-"class=\"link\" href=\"https://www.gnu.org/philosophy/free-sw.html\">基本自由</a>。"
+"如今，監視日益集中化的基礎架構、專有實現(proprietary implementations)、流量整"
+"形器和防火牆在各種程度上限制了所有<a class=\"link\" href=\"https://www.gnu."
+"org/philosophy/free-sw.html\">基本自由</a>。"
 
 #: template/index.html.j2:203
 msgid "GNUnet supports a free and open society"
@@ -2820,7 +2859,8 @@ msgstr "教學: Ubuntu 18.04上的GNUnet"
 msgid ""
 "Notice: GNUnet is still undergoing major development. It is largely <i>not "
 "yet ready</i> for usage beyond developers."
-msgstr "注意: GNUnet仍在進行重大開發。它很大部分地<i>尚未準備好</i>供開發人員使用。"
+msgstr ""
+"注意: GNUnet仍在進行重大開發。它很大部分地<i>尚未準備好</i>供開發人員使用。"
 
 #: template/install.html.j2:18
 msgid ""
@@ -2851,8 +2891,8 @@ msgid ""
 "that we can add it to this list. Furthermore, if you are interested in "
 "packaging GNUnet for your Operating System, get in touch with us at gnunet-"
 "developers@gnu.org if you require help with this job. If you were using an "
-"Operating System with the Alpine package manager, GNUnet could be installed "
-"as simple as:"
+"Operating System with the APT package manager, GNUnet could be installed as "
+"simple as:"
 msgstr ""
 
 #: template/install.html.j2:61
@@ -2873,8 +2913,8 @@ msgid ""
 "\">required dependencies</a> of GNUnet. There are base requirements and "
 "optional requirements."
 msgstr ""
-"首先，安裝<a href=\"https://git.gnunet.org/gnunet.git/tree/README\""
-">所需的GNUnet從屬物</a>。有許多與之相關的基礎要求與非強制的要求。"
+"首先，安裝<a href=\"https://git.gnunet.org/gnunet.git/tree/README\">所需的"
+"GNUnet從屬物</a>。有許多與之相關的基礎要求與非強制的要求。"
 
 #: template/install.html.j2:81
 msgid ""
@@ -2886,14 +2926,16 @@ msgid ""
 msgstr ""
 
 #: template/install.html.j2:98
-msgid "Alternatively, get the sources from git by entering:"
-msgstr "或者，通過輸入以下命令從git中取得原始碼:"
+msgid "To compile gnunet from the git source you can do so by entering:"
+msgstr ""
 
 #: template/install.html.j2:106
 msgid ""
 "Before building GNUnet, make sure that you setup the required groups and add "
 "your user to the group <code>gnunet</code>:"
-msgstr "在構建GNUnet之前，請確保您設置了所需的組並將您的用戶添加到組<code>gnunet</code>:"
+msgstr ""
+"在構建GNUnet之前，請確保您設置了所需的組並將您的用戶添加到組<code>gnunet</"
+"code>:"
 
 #: template/install.html.j2:117
 msgid "To compile GNUnet, execute:"
@@ -2904,8 +2946,8 @@ msgid ""
 "You can find more configuration flags in the <a href=\"https://git.gnunet."
 "org/gnunet.git/tree/README\">README</a>.<br> Install GNUnet with:"
 msgstr ""
-"您可以在 <a href=\"https://git.gnunet.org/gnunet.git/tree/README\""
-">README</a>中找到更多配置標誌。<br> 使用以下命令安裝GNUnet:"
+"您可以在 <a href=\"https://git.gnunet.org/gnunet.git/tree/README\">README</a>"
+"中找到更多配置標誌。<br> 使用以下命令安裝GNUnet:"
 
 #: template/install.html.j2:138
 msgid "You can now start GNUnet by running:"
@@ -2918,8 +2960,8 @@ msgid ""
 "experience, <a href=\"https://gnunet.org/en/use.html\">continue here</a>."
 msgstr ""
 "查看<a href=\"https://docs.gnunet.org/handbook/gnunet.html#Minimal-"
-"configuration\">手冊</a>以獲得詳細文檔。欲獲得更多實際操作經驗，<a href=\"https://gnunet.org/en/use"
-".html\">請於此處繼續</a>。"
+"configuration\">手冊</a>以獲得詳細文檔。欲獲得更多實際操作經驗，<a href="
+"\"https://gnunet.org/en/use.html\">請於此處繼續</a>。"
 
 #: template/livingstandards.html.j2:11
 msgid "On this page you can find links to our technical specifications."
@@ -3007,3 +3049,10 @@ msgstr "天哪，你們打破了我的網際網路"
 #: template/video.html.j2:12
 msgid "Videos related to GNUnet"
 msgstr "與GNUnet相關的影片"
+
+#, fuzzy
+#~ msgid "Living Standards"
+#~ msgstr "生活水準"
+
+#~ msgid "Alternatively, get the sources from git by entering:"
+#~ msgstr "或者，通過輸入以下命令從git中取得原始碼:"
diff --git a/news/2021-04-DISSENS.html.j2 b/news/2021-04-DISSENS.html.j2
new file mode 100644
index 00000000..51a5cd6a
--- /dev/null
+++ b/news/2021-04-DISSENS.html.j2
@@ -0,0 +1,65 @@
+{% extends "common/news.j2" %}
+{% block body_content %}
+  <h1>DISSENS: Decentralized Identities for Self-sovereign End-users (NGI TRUST)</h1>
+<p>
+  Since mid 2020, a consortium between <a class="link" href="https://taler.net">Taler Systems S.A.</a>,
+the <a class="link" href="https://bfh.ch">Bern University of Applied Sciences</a> and <a class="link" href="https://aisec.fraunhofer.de">Fraunhofer AISEC</a> has been working
+  on bringing privacy-friendly payments using GNU Taler and self-sovereign
+  identity using GNUnet's <a class="link" href="https://reclaim.gnunet.org">re:claimID</a>
+  together in an e-commerce framework.
+</p>
+<p>
+<img style="width: 100%; border: 1px solid #333" src="{{ url_static('dissens-overview.png')}}"/>
+</p>
+<h2>Content</h2>
+<p>
+  Registrations of accounts prior to receiving services online is the standard process for commercial offerings on the Internet which depend on two corner stones of the Web: Payment processing and digital identities. The use of third-party identity provider services (IdPs) is practical as it delegates the task of verifying and storing personal information. The use of payment processors is convenient for the customer as it provides one-click payments. However, the quasi-oligopoly of services providers in those areas include Google and Facebook for identities and PayPal or Stripe for payment processing. Those corporations are not only based in privacy-unfriendly jurisdictions, but also exploit private data for profit.
+</p>
+<p>
+DISSENS makes the case that what is urgently needed are fundamentally different, user-centric and privacy-friendly alternatives to the above.
+Self-sovereign identity (SSI) management is the way to replace IdPs with a user-centric, decentralized mechanism where data and access control is fully under the control of the data subject.
+In combination with a privacy-friendly payment system, DISSENS aims to achieve the same one-click user experience that is currently achieved by privacy-invasive account-based Web shops, but without the users having to setup accounts.
+</p>
+<p>
+To achieve this, DISSENS integrates re:claimID with the GNU Taler payment system in a pilot in order to demonstrate the practical feasibility and benefits of privacy enhancing technologies for users and commercial service providers.
+DISSENS also implements a reference scenario which includes credentials issued by the partners Fraunhofer AISEC and BFH for employees and students, respectively. Users are able to access and use a pilot service developed by Taler Systems S.A. while being able to claim specific discounts for students and researchers.
+</p>
+<p>
+This approach offers significant benefits over existing solutions built using other SSI systems such as <a class="link" href="https://www.sovrin.org">Sovrin</a> or <a class="link" href="https://www.serto.id">serto</a> (formerly uPort):
+</p>
+<b>No gatekeepers; No vendor lock-in:</b>
+<p>
+The approach is completely open to issuers and does not impose any registration restrictions (such as registration fees) in order to define domain specific credentials. Further, the system does not impose a consortium-based governance model — which tend to eventually be driven by commercial interests and not consumer interests. The design enables all participants in the ecosystem to participate without prior onboarding while at the same time being offered full transparency and control regarding their personal data and processes involved.
+</p>
+<b>Support for non-interactive business processes:</b>
+<p>
+At the same time, unlike the SSI systems cited above, re:claimID offers a way to access user information without online interaction with the user. Offline access of shared identity data is a crucial requirement in almost any business process as such processes often occur after direct interaction with the user. For example, customer information such as billing addresses are required in — possibly recurring — back office billing processes which occur well after interaction with a customer.
+</p>
+<b>Scalability and sustainability:</b>
+<p>
+Finally, both re:claimID as the SSI system as well as Taler do not suffer from the usual predicament Blockchain-based systems find themselves in: Both systems do not require a decentralized, public ledger. This eliminates the need for consensus mechanisms, which do not scale and are ecologically unsustainable. In fact, DISSENS employs decentralization only where it provides the most value and use more efficient technology stacks where needed: re:claimID builds on top of the <a class="link" href="{{ url_localized('gns.html') }}">GNU Name System</a>, which makes use of a DHT, an efficient (O(log n)) peer-to-peer data structure. For payments, GNU Taler uses centralized infrastructure operated by audited and regulated exchange providers and facilitates account-less end-to-end interactions between customers and services where all parties have O(1) transaction costs.
+</p>
+<p>
+The result of DISSENS will provide businesses and credential issuers with ready-to-use and standards-compliant templates to build privacy-friendly services in the Web.
+The aim of the DISSENS project was to design a technology stack which combines privacy-friendly online payments with self-sovereign personal data management. The result enables users to be in complete control over their digital identity and personal information while at the same time being able to selectively share information necessary to use commercial services. The pilot demonstrates a sustainable, user-centric, standard-compliant and accessible use case for public service employees and students in the domain of commercial food delivery.
+It serves as an easy-to-adapt template for the integration of other scenarios and use cases.
+</p>
+<h2>Future work</h2>
+<p>
+GNUnet is working on the underlying components mature to the point that Taler+re:claimID can be recommended to operators to enable for account-less shopping with or without verified credentials. This will also require the continuation of our
+work on the low-level transport rewrite as it is a core component of GNS which
+in turn is what makes re:claimID spin.
+</p>
+<h2>Links</h2>
+<ul>
+  <li><a class="link" href="https://git.gnunet.org/bibliography.git/plain/docs/dissens2021.pdf">The paper</a> (also accepted for publication without appendix at the <a class="link" href="https://oid2021.compute.dtu.dk/">Open Identity Summit 2021</a>)</li>
+  <li>The privacy credential library <a class="link" href="https://github.com/Fraunhofer-AISEC/libpabc">libpabc</a> (Link to github).</li>
+  <li>Mid-project <a class="link" href="https://gnunet.org/~schanzen/2021-01-18-reclaimID-Taler-Shopping.webm">demonstration video</a>.</li>
+  <li><a class="link" href="https://git.taler.net/woocommerce-taler.git">Setup scripts and installation documentation for a Taler + re:claimID + WooCommerce service</a> (Link to taler.net).</li>
+</ul>
+<p>
+</p>
+<p>
+  This work is generously funded by <a class="link" href="https://www.ngi.eu">the EC's Next Generation Internet (NGI) initiative</a> as part of their <a class="link" href="https://www.ngi.eu/ngi-projects/ngi-trust/">NGI TRUST</a> programme.
+</p>
+{% endblock body_content %}
diff --git a/static/dissens-overview.png b/static/dissens-overview.png
new file mode 100644
index 00000000..1d1a2cf5
--- /dev/null
+++ b/static/dissens-overview.png