[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [www] branch stable updated (e3a18a2 -> af4f18b)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [www] branch stable updated (e3a18a2 -> af4f18b) |
|
Date: |
Thu, 04 Jul 2019 14:20:33 +0200 |
This is an automated email from the git hooks/post-receive script.
sva pushed a change to branch stable
in repository www.
from e3a18a2 Merge branch 'stable' of ssh://git.gnunet.org/www into stable
new 6cd2970 Merge branch 'stable' of ssh://git.gnunet.org/www into stable
new ff9308b Merge branch 'stable' of ssh://git.gnunet.org/www into stable
add 8a60750 Attempt to fix /gsoc 404 without touching httpd
add dfbaa3b Make yet another redirect page.
add 09a396d node/397 -> about
add d03beed proposal: link to matthew green's post about "the network is
hostile"? Might be a bit too much for the /about page? But we get a proof for
the quote and show that we are not fabricating truths.
add bbe8d65 philosophy -> about
add 69ca839 fixed broken link in use/filesharing --sva
new af4f18b Merge branch 'master' into stable
The 3 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:
Makefile | 6 ++++++
locale/de/LC_MESSAGES/messages.po | 6 ++++--
locale/en/LC_MESSAGES/messages.po | 24 ++++++++++++++++--------
locale/es/LC_MESSAGES/messages.po | 6 ++++--
locale/fr/LC_MESSAGES/messages.po | 6 ++++--
locale/it/LC_MESSAGES/messages.po | 6 ++++--
static/{moved.html => moved_about.html} | 4 ++--
static/{moved.html => moved_gsoc.html} | 4 ++--
template/about.html.j2 | 10 +++++-----
template/use.html.j2 | 4 ++--
10 files changed, 49 insertions(+), 27 deletions(-)
copy static/{moved.html => moved_about.html} (69%)
copy static/{moved.html => moved_gsoc.html} (69%)
diff --git a/Makefile b/Makefile
index 5424e81..50fbc8a 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,12 @@ all: css locale template
cp rss.xml rendered/it/rss.xml
cp static/moved.html rendered/frontpage.html
cd rendered; ln -fs frontpage.html frontpage
+ cp static/moved_gsoc.html rendered/gsoc.html
+ cd rendered; ln -fs gsoc.html gsoc
+ mkdir rendered/node ; cp static/moved_about.html
rendered/node/about.html
+ cd rendered/node ; ln -fs about.html 397
+ cp static/moved_about.html rendered/about.html
+ cd rendered ; ln -fs about.html philosophy
# Extract translateable strings from jinja2 templates.
# Because of the local i18nfix extractor module we need
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 1e18398..5347d54 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-04 14:09+0200\n"
"PO-Revision-Date: 2018-02-24 17:42\n"
"Last-Translator: Torsten Grothoff <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -191,7 +191,9 @@ msgid ""
"Due to fundamental Internet design choices, Internet traffic can be "
"misdirected, intercepted, censored and manipulated by hostile routers on the "
"network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog.";
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
msgstr ""
#: template/about.html.j2:41
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 52af3aa..5d937df 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -156,7 +156,9 @@ msgid ""
"Due to fundamental Internet design choices, Internet traffic can be "
"misdirected, intercepted, censored and manipulated by hostile routers on the "
"network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog.";
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
msgstr ""
#: template/about.html.j2:41
@@ -1585,8 +1587,9 @@ msgstr ""
msgid "Tutorial: GNUnet on Archlinux/Pi"
msgstr ""
-#: template/install-on-archpi.html.j2:15 template/install-on-debian9.html.j2:29
-#: template/install-on-macos.html.j2:17 template/install-on-netbsd.html.j2:19
+#: template/install-on-archpi.html.j2:15
+#: template/install-on-debian9.html.j2:29 template/install-on-macos.html.j2:17
+#: template/install-on-netbsd.html.j2:19
#: template/install-on-ubuntu1804.html.j2:26
msgid "Requirements"
msgstr ""
@@ -1617,20 +1620,23 @@ msgstr ""
msgid "Make an installation directory"
msgstr ""
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:147
+#: template/install-on-debian9.html.j2:59
+#: template/install-on-macos.html.j2:147
#: template/install-on-netbsd.html.j2:224
#: template/install-on-ubuntu1804.html.j2:53
msgid "Get the source code"
msgstr ""
-#: template/install-on-debian9.html.j2:78 template/install-on-macos.html.j2:155
+#: template/install-on-debian9.html.j2:78
+#: template/install-on-macos.html.j2:155
#: template/install-on-netbsd.html.j2:232
#: template/install-on-ubuntu1804.html.j2:61
msgid "Compile and Install"
msgstr ""
#: template/install-on-debian9.html.j2:103
-#: template/install-on-macos.html.j2:167 template/install-on-netbsd.html.j2:242
+#: template/install-on-macos.html.j2:167
+#: template/install-on-netbsd.html.j2:242
#: template/install-on-ubuntu1804.html.j2:70
msgid "Option 1: GNUnet for production / usage"
msgstr ""
@@ -1691,11 +1697,13 @@ msgstr ""
msgid "First steps"
msgstr ""
-#: template/install-on-macos.html.j2:122 template/install-on-netbsd.html.j2:182
+#: template/install-on-macos.html.j2:122
+#: template/install-on-netbsd.html.j2:182
msgid "Alternative: Installation from source"
msgstr ""
-#: template/install-on-macos.html.j2:200 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:200
+#: template/install-on-netbsd.html.j2:267
msgid "Option 2: GNUnet experimental"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 0e214e8..c4743fc 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-04 14:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -178,7 +178,9 @@ msgid ""
"Due to fundamental Internet design choices, Internet traffic can be "
"misdirected, intercepted, censored and manipulated by hostile routers on the "
"network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog.";
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
msgstr ""
#: template/about.html.j2:41
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index c4a188e..273efc0 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-04 14:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -176,7 +176,9 @@ msgid ""
"Due to fundamental Internet design choices, Internet traffic can be "
"misdirected, intercepted, censored and manipulated by hostile routers on the "
"network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog.";
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
msgstr ""
#: template/about.html.j2:41
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 5be199b..57bd3e8 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-02 00:50+0200\n"
+"POT-Creation-Date: 2019-07-04 14:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -176,7 +176,9 @@ msgid ""
"Due to fundamental Internet design choices, Internet traffic can be "
"misdirected, intercepted, censored and manipulated by hostile routers on the "
"network. And indeed, the modern Internet has evolved exactly to the point "
-"where, as Matthew Green put it, ``the network is hostile''."
+"where, as Matthew Green put it, <a href=\"https://blog.";
+"cryptographyengineering.com/2015/08/16/the-network-is-hostile/\">\"the "
+"network is hostile\"</a>."
msgstr ""
#: template/about.html.j2:41
diff --git a/static/moved.html b/static/moved_about.html
similarity index 69%
copy from static/moved.html
copy to static/moved_about.html
index d692c2c..0ff90e5 100644
--- a/static/moved.html
+++ b/static/moved_about.html
@@ -1,6 +1,6 @@
<html>
<head>
- <meta http-equiv="refresh" content="2;url=https://gnunet.org"; />
+ <meta http-equiv="refresh"
content="2;url=https://gnunet.org/en/about.html"; />
<title>Page Moved</title>
</head>
<body>
@@ -8,6 +8,6 @@
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://gnunet.org";>here</a> to go to
the new page.
+ This page has moved. Click <a
href="https://gnunet.org/en/about.html";>here</a> to go to the new page.
</body>
</html>
diff --git a/static/moved.html b/static/moved_gsoc.html
similarity index 69%
copy from static/moved.html
copy to static/moved_gsoc.html
index d692c2c..c8b45bf 100644
--- a/static/moved.html
+++ b/static/moved_gsoc.html
@@ -1,6 +1,6 @@
<html>
<head>
- <meta http-equiv="refresh" content="2;url=https://gnunet.org"; />
+ <meta http-equiv="refresh" content="2;url=https://gnunet.org/en/gsoc.html";
/>
<title>Page Moved</title>
</head>
<body>
@@ -8,6 +8,6 @@
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://gnunet.org";>here</a> to go to
the new page.
+ This page has moved. Click <a
href="https://gnunet.org/en/gsoc.html";>here</a> to go to the new page.
</body>
</html>
diff --git a/template/about.html.j2 b/template/about.html.j2
index 16d42b4..685f521 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -30,11 +30,11 @@
</p>
<p>
{% trans %}
- Due to fundamental Internet design choices, Internet traffic can be
- misdirected, intercepted, censored and manipulated by hostile routers
- on the network. And indeed, the modern Internet has evolved exactly
- to the point where, as Matthew Green put it, ``the network is
- hostile''.
+ Due to fundamental Internet design choices, Internet traffic can be
+ misdirected, intercepted, censored and manipulated by hostile routers
+ on the network. And indeed, the modern Internet has evolved exactly
+ to the point where, as Matthew Green put it,
+ <a
href="https://blog.cryptographyengineering.com/2015/08/16/the-network-is-hostile/";>"the
network is hostile"</a>.
{% endtrans %}
</p>
<p>
diff --git a/template/use.html.j2 b/template/use.html.j2
index 2a4e4c3..b4f2fdc 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -94,8 +94,8 @@
ostrom.pdf)!
</p>
<p>
- Please also refer to the chapter on <a href="=>
https://docs.gnunet.org/#File_002dsharing
- ">filesharing in the handbook</a>.
+ Please also refer to the chapter on
+ <a href="https://docs.gnunet.org/#File_002dsharing";>filesharing in the
handbook</a>.
</section>
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [www] branch stable updated (e3a18a2 -> af4f18b),
gnunet <=