[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [www] branch stable updated (0f922d0 -> e3a18a2)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [www] branch stable updated (0f922d0 -> e3a18a2) |
|
Date: |
Tue, 02 Jul 2019 21:29:54 +0200 |
This is an automated email from the git hooks/post-receive script.
xrs pushed a change to branch stable
in repository www.
from 0f922d0 Merge branch 'stable' of ssh://git.gnunet.org/www into stable
add 65682f9 proposal for relocating C-Tutorial
add 5532c8c fix typo
add fc19d5f test new layout for bibliography list
add 0028664 nav: comment CI menu entry
add 9e82ec3 new image, cropped already but still "big". Fits more into
the general theme of the website.
add a21812f Merge branch 'master' of ssh://git.gnunet.org/www
add 56a25a9 add alternativ groupchat address
add efd0d11 update po-files
new e3a18a2 Merge branch 'stable' of ssh://git.gnunet.org/www 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 | 7 +++++--
locale/de/LC_MESSAGES/messages.po | 43 +++++++++++++++++++++-----------------
locale/en/LC_MESSAGES/messages.po | 36 +++++++++++++++----------------
locale/es/LC_MESSAGES/messages.po | 43 +++++++++++++++++++++-----------------
locale/fr/LC_MESSAGES/messages.po | 38 ++++++++++++++++-----------------
locale/it/LC_MESSAGES/messages.po | 38 ++++++++++++++++-----------------
static/team-images/ng0.jpg | Bin 9653 -> 2298873 bytes
template/engage.html.j2 | 2 +-
template/use.html.j2 | 6 ++++--
9 files changed, 114 insertions(+), 99 deletions(-)
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 33c5e10..8384a6c 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -64,7 +64,11 @@
<li><a class="dropdown-item" href="architecture.html">{{ _("System
Architecture") }}</a></li>
<li><a class="dropdown-item" href="https://bugs.gnunet.org";
target="_blank">{{ _("Bug Tracker") }}</a></li>
<li><a class="dropdown-item" href="https://git.gnunet.org";
target="_blank">{{ _("Source Code") }}</a></li>
+ <!--
+ /* Until there is no functional CI we don't show this */
<li><a class="dropdown-item" href="https://gitlab.gnunet.org/";
target="_blank">{{ _("Continuous Integration") }}</a></li>
+ -->
+ <li><a class="dropdown-item" target="_blank"
href="https://tutorial.gnunet.org/";>{{ _("Development Tutorial") }}</a></li>
<li><a class="dropdown-item" href="gnurl.html">libgnurl</a></li>
</ul>
</li>
@@ -84,9 +88,8 @@
<li><a class="dropdown-item" href="glossary.html">{{ _("Glossary")
}}</a></li>
<li><a class="dropdown-item" target="_blank"
href="https://docs.gnunet.org";>{{ _("Handbook") }}</a></li>
<li><a class="dropdown-item" target="_blank"
href="https://rest.gnunet.org";>{{ _("REST API") }}</a></li>
- <li><a class="dropdown-item" target="_blank"
href="https://tutorial.gnunet.org/";>{{ _("C-Tutorial") }}</a></li>
<li><a class="dropdown-item" href="faq.html">{{ _("FAQ") }}</a></li>
- <li><a class="dropdown-item" href="https://bib.gnunet.org/";
target="_blank">{{ _("Bibliography") }}</a></li>
+ <li><a class="dropdown-item" href="https://bib.gnunet.org/date.html";
target="_blank">{{ _("Bibliography") }}</a></li>
</ul>
</li>
</ul>
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index d63304c..1e18398 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-01 21:37+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+0200\n"
"PO-Revision-Date: 2018-02-24 17:42\n"
"Last-Translator: Torsten Grothoff <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -55,11 +55,11 @@ msgstr "IRC Archive"
msgid "Copyright Assignment"
msgstr "Copyright Übertragung"
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
msgid "Continuous Integration"
msgstr "Kontinuierliche Integration"
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
#: template/developers.html.j2:24
msgid "Bibliography"
msgstr "Bibliografie"
@@ -123,40 +123,42 @@ msgstr "Systemarchitektur"
msgid "Source Code"
msgstr "Quellkode"
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+#, fuzzy
+#| msgid "Development"
+msgid "Development Tutorial"
+msgstr "Entwicklung"
+
+#: common/navigation.j2.inc:82
msgid "Documentation"
msgstr "Dokumentation"
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
#: template/install.html.j2:6
msgid "Install"
msgstr "Installieren"
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
msgid "Use"
msgstr "Nutzen"
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
msgid "Videos"
msgstr "Videos"
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
msgid "Glossary"
msgstr "Glossar"
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
msgid "Handbook"
msgstr "Handbuch"
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
msgid "REST API"
msgstr "REST API"
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr "C-Anleitung"
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
msgid "FAQ"
msgstr "FAQ"
@@ -1890,11 +1892,11 @@ msgstr ""
msgid "GNS with Browser"
msgstr ""
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
msgid "VPN"
msgstr ""
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
#, fuzzy
#| msgid "Motivation"
msgid "Conversation"
@@ -1916,11 +1918,11 @@ msgstr ""
msgid "Chatting with a (simple) client"
msgstr ""
-#: template/use.html.j2:181
+#: template/use.html.j2:183
msgid "Name resolution using GNS on the command line"
msgstr ""
-#: template/use.html.j2:253
+#: template/use.html.j2:255
msgid "Name resolution using GNS with a browser"
msgstr ""
@@ -1964,6 +1966,9 @@ msgstr ""
msgid "2010"
msgstr ""
+#~ msgid "C-Tutorial"
+#~ msgstr "C-Anleitung"
+
#~ msgid "We currently do not have any grants. All work is done by volunteers."
#~ msgstr ""
#~ "Wir haben im moment keine Zuwendung. Die ganze Arbeit wird von "
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index a608f50..52af3aa 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -34,11 +34,11 @@ msgstr ""
msgid "Copyright Assignment"
msgstr ""
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
msgid "Continuous Integration"
msgstr ""
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
#: template/developers.html.j2:24
msgid "Bibliography"
msgstr ""
@@ -92,40 +92,40 @@ msgstr ""
msgid "Source Code"
msgstr ""
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+msgid "Development Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:82
msgid "Documentation"
msgstr ""
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
#: template/install.html.j2:6
msgid "Install"
msgstr ""
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
msgid "Use"
msgstr ""
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
msgid "Videos"
msgstr ""
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
msgid "Glossary"
msgstr ""
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
msgid "Handbook"
msgstr ""
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
msgid "REST API"
msgstr ""
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr ""
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
msgid "FAQ"
msgstr ""
@@ -1833,11 +1833,11 @@ msgstr ""
msgid "GNS with Browser"
msgstr ""
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
msgid "VPN"
msgstr ""
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
msgid "Conversation"
msgstr ""
@@ -1857,11 +1857,11 @@ msgstr ""
msgid "Chatting with a (simple) client"
msgstr ""
-#: template/use.html.j2:181
+#: template/use.html.j2:183
msgid "Name resolution using GNS on the command line"
msgstr ""
-#: template/use.html.j2:253
+#: template/use.html.j2:255
msgid "Name resolution using GNS with a browser"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 2c66e9e..0e214e8 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-01 21:37+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+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"
@@ -54,11 +54,11 @@ msgstr "Archivo IRC"
msgid "Copyright Assignment"
msgstr "Transmisión de derechos de autor"
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
msgid "Continuous Integration"
msgstr "Integración continua"
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
#: template/developers.html.j2:24
msgid "Bibliography"
msgstr "Bibliografía"
@@ -112,40 +112,42 @@ msgstr "Architectura del sistema"
msgid "Source Code"
msgstr "Códico fuente"
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+#, fuzzy
+#| msgid "Development"
+msgid "Development Tutorial"
+msgstr "Desarrollo"
+
+#: common/navigation.j2.inc:82
msgid "Documentation"
msgstr "Documentación"
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
#: template/install.html.j2:6
msgid "Install"
msgstr "Instala"
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
msgid "Use"
msgstr "Usa"
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
msgid "Videos"
msgstr "Videos"
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
msgid "Glossary"
msgstr "Glosario"
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
msgid "Handbook"
msgstr "Manual"
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
msgid "REST API"
msgstr "REST API"
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr "Tutorial de C"
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
msgid "FAQ"
msgstr "FAQ"
@@ -1859,11 +1861,11 @@ msgstr ""
msgid "GNS with Browser"
msgstr ""
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
msgid "VPN"
msgstr ""
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
msgid "Conversation"
msgstr ""
@@ -1883,11 +1885,11 @@ msgstr ""
msgid "Chatting with a (simple) client"
msgstr ""
-#: template/use.html.j2:181
+#: template/use.html.j2:183
msgid "Name resolution using GNS on the command line"
msgstr ""
-#: template/use.html.j2:253
+#: template/use.html.j2:255
msgid "Name resolution using GNS with a browser"
msgstr ""
@@ -1930,3 +1932,6 @@ msgstr ""
#: template/video.html.j2:77
msgid "2010"
msgstr ""
+
+#~ msgid "C-Tutorial"
+#~ msgstr "Tutorial de C"
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 76e0c5a..c4a188e 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-01 21:37+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+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"
@@ -54,11 +54,11 @@ msgstr ""
msgid "Copyright Assignment"
msgstr ""
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
msgid "Continuous Integration"
msgstr ""
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
#: template/developers.html.j2:24
msgid "Bibliography"
msgstr ""
@@ -112,40 +112,40 @@ msgstr ""
msgid "Source Code"
msgstr ""
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+msgid "Development Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:82
msgid "Documentation"
msgstr ""
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
#: template/install.html.j2:6
msgid "Install"
msgstr ""
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
msgid "Use"
msgstr ""
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
msgid "Videos"
msgstr ""
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
msgid "Glossary"
msgstr ""
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
msgid "Handbook"
msgstr ""
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
msgid "REST API"
msgstr ""
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr ""
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
msgid "FAQ"
msgstr ""
@@ -1853,11 +1853,11 @@ msgstr ""
msgid "GNS with Browser"
msgstr ""
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
msgid "VPN"
msgstr ""
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
msgid "Conversation"
msgstr ""
@@ -1877,11 +1877,11 @@ msgstr ""
msgid "Chatting with a (simple) client"
msgstr ""
-#: template/use.html.j2:181
+#: template/use.html.j2:183
msgid "Name resolution using GNS on the command line"
msgstr ""
-#: template/use.html.j2:253
+#: template/use.html.j2:255
msgid "Name resolution using GNS with a browser"
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 8cfcbed..5be199b 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-01 21:37+0200\n"
+"POT-Creation-Date: 2019-07-02 00:50+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"
@@ -54,11 +54,11 @@ msgstr ""
msgid "Copyright Assignment"
msgstr ""
-#: common/footer.j2.inc:22 common/navigation.j2.inc:67
+#: common/footer.j2.inc:22 common/navigation.j2.inc:69
msgid "Continuous Integration"
msgstr ""
-#: common/footer.j2.inc:23 common/navigation.j2.inc:89
+#: common/footer.j2.inc:23 common/navigation.j2.inc:92
#: template/developers.html.j2:24
msgid "Bibliography"
msgstr ""
@@ -112,40 +112,40 @@ msgstr ""
msgid "Source Code"
msgstr ""
-#: common/navigation.j2.inc:78
+#: common/navigation.j2.inc:71
+msgid "Development Tutorial"
+msgstr ""
+
+#: common/navigation.j2.inc:82
msgid "Documentation"
msgstr ""
-#: common/navigation.j2.inc:81 template/index.html.j2:52
+#: common/navigation.j2.inc:85 template/index.html.j2:52
#: template/install.html.j2:6
msgid "Install"
msgstr ""
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:86
msgid "Use"
msgstr ""
-#: common/navigation.j2.inc:83
+#: common/navigation.j2.inc:87
msgid "Videos"
msgstr ""
-#: common/navigation.j2.inc:84 template/glossary.html.j2:6
+#: common/navigation.j2.inc:88 template/glossary.html.j2:6
msgid "Glossary"
msgstr ""
-#: common/navigation.j2.inc:85
+#: common/navigation.j2.inc:89
msgid "Handbook"
msgstr ""
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:90
msgid "REST API"
msgstr ""
-#: common/navigation.j2.inc:87
-msgid "C-Tutorial"
-msgstr ""
-
-#: common/navigation.j2.inc:88
+#: common/navigation.j2.inc:91
msgid "FAQ"
msgstr ""
@@ -1853,11 +1853,11 @@ msgstr ""
msgid "GNS with Browser"
msgstr ""
-#: template/use.html.j2:17 template/use.html.j2:330
+#: template/use.html.j2:17 template/use.html.j2:332
msgid "VPN"
msgstr ""
-#: template/use.html.j2:18 template/use.html.j2:391
+#: template/use.html.j2:18 template/use.html.j2:393
msgid "Conversation"
msgstr ""
@@ -1877,11 +1877,11 @@ msgstr ""
msgid "Chatting with a (simple) client"
msgstr ""
-#: template/use.html.j2:181
+#: template/use.html.j2:183
msgid "Name resolution using GNS on the command line"
msgstr ""
-#: template/use.html.j2:253
+#: template/use.html.j2:255
msgid "Name resolution using GNS with a browser"
msgstr ""
diff --git a/static/team-images/ng0.jpg b/static/team-images/ng0.jpg
index 1ca8fae..ad56aae 100644
Binary files a/static/team-images/ng0.jpg and b/static/team-images/ng0.jpg
differ
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 4049c8d..ceeff7b 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -46,7 +46,7 @@
</p>
<h2>Use GNUnet!</h2>
<p>
- <a href="use.html">Let's gets started...</a>
+ <a href="use.html">Let's get started...</a>
</p>
<h2>Report bugs!</h2>
<p>
diff --git a/template/use.html.j2 b/template/use.html.j2
index e420a39..2a4e4c3 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -155,11 +155,13 @@
</p>
<p>
<code>
- $LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat
--config=/path/to/gnunet.conf
--server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss
--nick=YOURNICK
+ $ LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat
--config=/path/to/gnunet.conf
--server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss
--nick=YOURNICK<br>
</code>
+ <p>
+ (or as alternative server
"YV6G9EP9K3X41BM3FJ3D29BDZR6358XNZ6KDZVV7DFW729YB0KCG" and port "welcome")
</p>
<p>
- The peer and port in this example should work in real, because
that peer is almost online and running groupchat on that port.
+ The peer and port in this example should work in real, because
that peer is almost always online and running groupchat on that port.
<p>
You should now see something like this:
</p>
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [www] branch stable updated (0f922d0 -> e3a18a2),
gnunet <=