[www] branch stable updated (c511e99 -> f60c977)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch stable
in repository www.

    from c511e99  Merge branch 'master' into stable
     add bbc83d8  remove gns redirect
     add 3c2d697  Revert "remove gns redirect"
     add b47b0f7  change redirect (should be jinja template to be honest), add 
GNS to navigation.
     add 495e66a  featured: adjust gns url.
     new f60c977  Merge branch 'master' into stable

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 common/navigation.j2.inc          | 1 +
 locale/de/LC_MESSAGES/messages.po | 2 +-
 locale/es/LC_MESSAGES/messages.po | 2 +-
 locale/fr/LC_MESSAGES/messages.po | 2 +-
 locale/it/LC_MESSAGES/messages.po | 2 +-
 static/moved_gns.html             | 8 ++------
 template/index.html.j2            | 3 +--
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index dd7bb86..1befac8 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -67,6 +67,7 @@
           -->
           <li><a class="dropdown-item" target="_blank" 
href="https://docs.gnunet.org/tutorial/gnunet-tutorial.html";>{{ _("Development 
Tutorial") }}</a></li>
          <li><a class="dropdown-item" href="{{ url_localized('gnurl.html') 
}}">libgnurl</a></li>
+          <li><a class="dropdown-item" href="{{ url_localized('gns.html') 
}}">GNS</a></li>
         </ul>
       </li>
       <li class="nav-item dropdown">
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 0647713..bef9c6d 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2018-02-24 17:42\n"
 "Last-Translator: Torsten Grothoff <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "GNUnet"
diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index a19f6a5..13e165e 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "Contact"
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 1d1ec76..2a89f10 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -12,8 +12,8 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Generated-By: Babel 2.4.0\n"
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index ca9bf92..433198f 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "_project_title"
diff --git a/static/moved_gns.html b/static/moved_gns.html
index 4863a0e..b34ebb5 100644
--- a/static/moved_gns.html
+++ b/static/moved_gns.html
@@ -1,13 +1,9 @@
 <html>
   <head>
-    <meta http-equiv="refresh" 
content="2;url=https://docs.gnunet.org/handbook/gnunet.html#The-GNU-Name-System";
 />
+    <meta http-equiv="refresh" content="2;url=https://gnunet.org/en/gns.html"; 
/>
     <title>Page Moved</title>
   </head>
   <body>
-    <!-- 
-         Hint, hint: server side aliases and redirects are good. Don't
-         make me add more pages like this.
-      -->
-    This page has moved. Click <a 
href="https://docs.gnunet.org/handbook/gnunet.html#The-GNU-Name-System";>here</a>
 to go to the new page.
+    This page has moved. Click <a 
href="https://gnunet.org/en/gns.html";>here</a> to go to the new page.
   </body>
 </html>
diff --git a/template/index.html.j2 b/template/index.html.j2
index ee58c59..365ac67 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -259,8 +259,7 @@
 
       <p>
         {% trans %}
-          <!-- The <a href="use.html#gns">GNU Name System (GNS)</a> -->
-          The <a 
href="https://docs.gnunet.org/handbook/gnunet.html#The-GNU-Name-System";>GNU 
Name System (GNS)</a>
+          The <a href="https://gnunet.org/en/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

-- 
To stop receiving notification emails like this one, please contact
address@hidden.