[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [www] 02/02: resolve conflict
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [www] 02/02: resolve conflict |
|
Date: |
Tue, 13 Aug 2019 21:14:55 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
commit 08724a4492d141e3cab8e10aa7cc6efbdb06efb1
Merge: 9f6e459 b7e7a95
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Aug 13 21:13:19 2019 +0200
resolve conflict
Dockerfile | 3 +-
Makefile | 8 +
common/footer.j2.inc | 2 +-
common/navigation.j2.inc | 53 +-
favicon.ico | Bin 0 -> 1467 bytes
locale/de/LC_MESSAGES/messages.po | 1139 +++++++------
locale/en/LC_MESSAGES/messages.po | 1068 ++++++------
locale/es/LC_MESSAGES/messages.po | 1133 +++++++------
locale/fr/LC_MESSAGES/messages.po | 1070 ++++++------
locale/it/LC_MESSAGES/messages.po | 1070 ++++++------
news/2019-0.11.6.inc | 113 ++
news/2019-06-DSTJ.inc | 13 +
news/2019-06.inc | 7 +
news/2019-07-GHM_Aug_2019.inc | 7 +
rss.xml | 220 ++-
static/images/NetBSD_Logo.svg | 57 +
static/images/apple-logo.svg | 4 +
static/images/archlinux-logo.svg | 156 ++
static/images/debian-logo.svg | 86 +
static/images/gnunet-logo-dark-only-text.png | Bin 0 -> 3083 bytes
static/images/gnunet-logo-dark-only-text.svg | 87 +-
.../images/gnunet-logo-dark-text-traditional.png | Bin 0 -> 29932 bytes
...t.svg => gnunet-logo-dark-text-traditional.svg} | 1741 +++++++++++++-------
static/images/gnunet-logo-dark-text.png | Bin 0 -> 31064 bytes
...ark-only-text.svg => gnunet-logo-dark-text.svg} | 1724 ++++++++++++-------
static/images/netbsd-logo.png | Bin 0 -> 37359 bytes
static/images/ubuntu-logo32.png | Bin 0 -> 13282 bytes
static/moved_about.html | 13 +
static/moved_gsoc.html | 13 +
static/stage.robots.txt | 21 +
static/styles.sass | 52 +-
static/team-images/ng0.jpg | Bin 9653 -> 2298873 bytes
static/team-images/no-foto.svg | 403 +++++
static/team-images/xrs.jpg | Bin 0 -> 56327 bytes
template/about.html.j2 | 105 +-
template/architecture.html.j2 | 150 +-
template/contact.html.j2 | 99 +-
template/copyright.html.j2 | 7 +-
template/engage.html.j2 | 206 ++-
template/ev.html.j2 | 118 +-
template/glossary.html.j2 | 211 +--
template/gnurl.html.j2 | 28 +-
template/gsoc.html.j2 | 1170 ++++++-------
template/index.html.j2 | 104 +-
template/install-on-archpi.html.j2 | 130 ++
...-debian9.html.j2 => install-on-debian9.html.j2} | 288 +---
...rial-macos.html.j2 => install-on-macos.html.j2} | 27 +-
...al-netbsd.html.j2 => install-on-netbsd.html.j2} | 22 +-
...u1804.html.j2 => install-on-ubuntu1804.html.j2} | 294 +---
template/install.html.j2 | 60 +
template/news.html.j2.inc | 5 +-
template/old-news.html.j2 | 1 +
template/team.html.j2 | 88 +-
template/tutorial-archpi.html.j2 | 163 --
template/use.html.j2 | 622 ++++---
template/video.html.j2 | 416 ++++-
56 files changed, 8829 insertions(+), 5748 deletions(-)
diff --cc template/about.html.j2
index b3780e5,199de37..409fe7a
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@@ -63,18 -72,33 +72,33 @@@
{% trans %}
To get know and learn more, please check our <a
href="https://docs.gnunet.org/handbook/gnunet.html";>handbook</a>, especially
the <a href="https://docs.gnunet.org/handbook/gnunet.html#Key-Concepts";>chapter
on "Key Concepts"</a>, explaining the fundamental concepts of GNUnet:
<ul>
- <li><a
href="https://docs.gnunet.org/#Authentication";>Authentication</a></li>
- <li><a
href="https://docs.gnunet.org/#Accounting-to-Encourage-Resource-Sharing";>Accounting
to Encourage Resource Sharing</a></li>
- <li><a
href="https://docs.gnunet.org/#Confidentiality";>Confidentiality</a></li>
- <li><a href="https://docs.gnunet.org/#Anonymity";>Anonymity</a></li>
- <li><a href="https://docs.gnunet.org/#Deniability";>Deniability</a></li>
- <li><a href="https://docs.gnunet.org/#Peer-Identities";>Peer
Identities</a></li>
- <li><a
href="https://docs.gnunet.org/#Zones-in-the-GNU-Name-System-_0028GNS-Zones_0029";>Zones
in the GNU Name System (GNS Zones)</a></li>
- <li><a href="https://docs.gnunet.org/#Egos";>Egos</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Authentication";>Authentication</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Accounting-to-Encourage-Resource-Sharing";>Accounting
to Encourage Resource Sharing</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Confidentiality";>Confidentiality</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Anonymity";>Anonymity</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Deniability";>Deniability</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Peer-Identities";>Peer
Identities</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Zones-in-the-GNU-Name-System-_0028GNS-Zones_0029";>Zones
in the GNU Name System (GNS Zones)</a></li>
+ <li><a
href="https://docs.gnunet.org/handbook/gnunet.html#Egos";>Egos</a></li>
</ul>
{% endtrans %}
+ </p>
+ </div>
+ <div class="col">
+ <h3>{{ _("More Resources") }}</h3>
+ <p>
{% trans %}
- There are much more ressources to learn about GNUnet besides the <a
href="https://docs.gnunet.org/handbook/gnunet.html";>main handbook</a>, such as
the <a href="https://bib.gnunet.org/";>bibliography</a>, lots of <a
href="https://gnunet.org/en/video.html";>videos</a> or a <a
href="https://gnunet.org/en/glossary.html";>glossary</a>. You are very welcome
to <a href="https://gnunet.org/en/engage.html";>get engaged into the
conversation</a>, <a href="https://gnunet.org/en/tutorial.html";>install [...]
- There are much more resources to learn about GNUnet besides the <a
href="https://docs.gnunet.org/handbook/gnunet.html";>handbook</a>, such as the
<a href="https://bib.gnunet.org/";>bibliography</a> with papers covering the
various layers, many <a href="https://gnunet.org/en/video.html";>videos</a> or a
brief <a href="https://gnunet.org/en/glossary.html";>glossary</a>.
++ There are many more resources to learn about GNUnet besides the <a
href="https://docs.gnunet.org/handbook/gnunet.html";>handbook</a>, such as the
<a href="https://bib.gnunet.org/";>bibliography</a> with papers covering the
various layers, many <a href="https://gnunet.org/en/video.html";>videos</a> or a
brief <a href="https://gnunet.org/en/glossary.html";>glossary</a>.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ You are most welcome to <a href="engage.html">get engaged into the
conversation</a>, <a href="install.html">install GNUnet</a>, <a
href="use.html">use it</a> and <a href="contribute.html">contribute</a> in
various ways.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Please be aware that this project is (despite of it's age) still in
an early alpha stage when it comes to software – its not an easy task to
rewrite the whole Internet!
{% endtrans %}
<br>
</p>
--
To stop receiving notification emails like this one, please contact
address@hidden.