diff options
author | ng0 <ng0@n0.is> | 2019-12-20 08:51:22 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-12-20 08:51:22 +0000 |
commit | f60c977c63112326628eebc189bd597a3e083344 (patch) | |
tree | e07557b5d10abc5bd56e93f8d2ce8d7796f5bde9 | |
parent | c511e990a3208730371663a9c7847a9f9fab9b83 (diff) | |
parent | 495e66ae6e141533bec7fa6d7f8fa627835c56ea (diff) | |
download | www-f60c977c63112326628eebc189bd597a3e083344.tar.gz www-f60c977c63112326628eebc189bd597a3e083344.zip |
Merge branch 'master' into stable
-rw-r--r-- | common/navigation.j2.inc | 1 | ||||
-rw-r--r-- | locale/de/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/it/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | static/moved_gns.html | 8 | ||||
-rw-r--r-- | 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 dd7bb86d..1befac86 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc | |||
@@ -67,6 +67,7 @@ | |||
67 | --> | 67 | --> |
68 | <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org/tutorial/gnunet-tutorial.html">{{ _("Development Tutorial") }}</a></li> | 68 | <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org/tutorial/gnunet-tutorial.html">{{ _("Development Tutorial") }}</a></li> |
69 | <li><a class="dropdown-item" href="{{ url_localized('gnurl.html') }}">libgnurl</a></li> | 69 | <li><a class="dropdown-item" href="{{ url_localized('gnurl.html') }}">libgnurl</a></li> |
70 | <li><a class="dropdown-item" href="{{ url_localized('gns.html') }}">GNS</a></li> | ||
70 | </ul> | 71 | </ul> |
71 | </li> | 72 | </li> |
72 | <li class="nav-item dropdown"> | 73 | <li class="nav-item dropdown"> |
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index 06477135..bef9c6d6 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po | |||
@@ -11,10 +11,10 @@ msgstr "" | |||
11 | "PO-Revision-Date: 2018-02-24 17:42\n" | 11 | "PO-Revision-Date: 2018-02-24 17:42\n" |
12 | "Last-Translator: Torsten Grothoff <torsten@grothoff.org>\n" | 12 | "Last-Translator: Torsten Grothoff <torsten@grothoff.org>\n" |
13 | "Language-Team: German <LL@li.org>\n" | 13 | "Language-Team: German <LL@li.org>\n" |
14 | "Language: de\n" | ||
15 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
16 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
17 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
17 | "Language: de\n" | ||
18 | "Generated-By: Babel 2.4.0\n" | 18 | "Generated-By: Babel 2.4.0\n" |
19 | 19 | ||
20 | #~ msgid "GNUnet" | 20 | #~ msgid "GNUnet" |
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index a19f6a50..13e165e9 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po | |||
@@ -12,10 +12,10 @@ msgstr "" | |||
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
15 | "Language: es\n" | ||
16 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
17 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
18 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | "Language: es\n" | ||
19 | "Generated-By: Babel 2.4.0\n" | 19 | "Generated-By: Babel 2.4.0\n" |
20 | 20 | ||
21 | #~ msgid "Contact" | 21 | #~ msgid "Contact" |
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 1d1ec761..2a89f105 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po | |||
@@ -12,8 +12,8 @@ msgstr "" | |||
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
15 | "Language: fr\n" | ||
16 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
17 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
18 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | "Language: fr\n" | ||
19 | "Generated-By: Babel 2.4.0\n" | 19 | "Generated-By: Babel 2.4.0\n" |
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index ca9bf922..433198f8 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po | |||
@@ -12,10 +12,10 @@ msgstr "" | |||
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
15 | "Language: it\n" | ||
16 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
17 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
18 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | "Language: it\n" | ||
19 | "Generated-By: Babel 2.4.0\n" | 19 | "Generated-By: Babel 2.4.0\n" |
20 | 20 | ||
21 | #~ msgid "_project_title" | 21 | #~ msgid "_project_title" |
diff --git a/static/moved_gns.html b/static/moved_gns.html index 4863a0ee..b34ebb5a 100644 --- a/static/moved_gns.html +++ b/static/moved_gns.html | |||
@@ -1,13 +1,9 @@ | |||
1 | <html> | 1 | <html> |
2 | <head> | 2 | <head> |
3 | <meta http-equiv="refresh" content="2;url=https://docs.gnunet.org/handbook/gnunet.html#The-GNU-Name-System" /> | 3 | <meta http-equiv="refresh" content="2;url=https://gnunet.org/en/gns.html" /> |
4 | <title>Page Moved</title> | 4 | <title>Page Moved</title> |
5 | </head> | 5 | </head> |
6 | <body> | 6 | <body> |
7 | <!-- | 7 | This page has moved. Click <a href="https://gnunet.org/en/gns.html">here</a> to go to the new page. |
8 | Hint, hint: server side aliases and redirects are good. Don't | ||
9 | make me add more pages like this. | ||
10 | --> | ||
11 | 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. | ||
12 | </body> | 8 | </body> |
13 | </html> | 9 | </html> |
diff --git a/template/index.html.j2 b/template/index.html.j2 index ee58c593..365ac67f 100644 --- a/template/index.html.j2 +++ b/template/index.html.j2 | |||
@@ -259,8 +259,7 @@ | |||
259 | 259 | ||
260 | <p> | 260 | <p> |
261 | {% trans %} | 261 | {% trans %} |
262 | <!-- The <a href="use.html#gns">GNU Name System (GNS)</a> --> | 262 | The <a href="https://gnunet.org/en/gns.html">GNU Name System (GNS)</a> |
263 | The <a href="https://docs.gnunet.org/handbook/gnunet.html#The-GNU-Name-System">GNU Name System (GNS)</a> | ||
264 | is a fully decentralized replacement | 263 | is a fully decentralized replacement |
265 | for the Domain Name System (DNS). Instead of using a | 264 | for the Domain Name System (DNS). Instead of using a |
266 | hierarchy, GNS uses a directed graph. Naming conventions | 265 | hierarchy, GNS uses a directed graph. Naming conventions |