[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] branch stable updated (e20fe92 -> 420df40)
From: |
gnunet |
Subject: |
[www] branch stable updated (e20fe92 -> 420df40) |
Date: |
Tue, 29 Oct 2019 10:57:03 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch stable
in repository www.
from e20fe92 make it a monday
add 0c18b1c add build-scripts.
add 37bb08c rename.
add 2f5e554 use new build-system.
add 134a611 fix Dockerfile by guessing.
add 899fbe3 README
add 420df40 fix link
No new revisions were added by this update.
Summary of changes:
.gitignore | 2 +
.gitmodules | 3 +
Dockerfile | 3 +-
GNUmakefile | 115 +++++++++++++++++++++++++++
Makefile | 162 +++++++++++++++++++-------------------
README | 34 ++++++--
bootstrap | 14 ++++
build-system/taler-build-scripts | 1 +
config.mk | 6 --
configure | 53 +++++++++++++
configure.py | 34 ++++++++
locale/de/LC_MESSAGES/messages.po | 55 ++++++-------
locale/en/LC_MESSAGES/messages.po | 51 ++++++------
locale/es/LC_MESSAGES/messages.po | 55 ++++++-------
locale/fr/LC_MESSAGES/messages.po | 55 ++++++-------
locale/it/LC_MESSAGES/messages.po | 55 ++++++-------
template/engage.html.j2 | 2 +-
17 files changed, 454 insertions(+), 246 deletions(-)
create mode 100644 GNUmakefile
create mode 100755 bootstrap
create mode 160000 build-system/taler-build-scripts
delete mode 100644 config.mk
create mode 100755 configure
create mode 100644 configure.py
diff --git a/.gitignore b/.gitignore
index 7b902d0..ffeeaad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ sitemap.html
*~
\#*\#
futility_engine_loader.sh
+
+config.mk
diff --git a/.gitmodules b/.gitmodules
index d83bc58..a55f079 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
path = help
url = git://taler.net/help
branch = master
+[submodule "build-system/taler-build-scripts"]
+ path = build-system/taler-build-scripts
+ url = git://git.taler.net/taler-build-scripts
diff --git a/Dockerfile b/Dockerfile
index b792d04..7b17dc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && \
python3-setuptools \
python3-babel \
python3-jinja2 \
+ git \
sassc && \
apt-get clean all && \
apt-get -y autoremove && \
@@ -20,4 +21,4 @@ RUN apt-get update && \
/var/lib/apt/lists/* \
/tmp/*
-CMD /bin/bash -c "cd /tmp/ && make"
+CMD /bin/bash -c "cd /tmp/ && ./boostrap && ./configure && make"
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..4ee63f8
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,115 @@
+#
+# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
+#
+# ----
+
+# All: build HTML pages in all languages and compile the
+# TypeScript logic in web-common.
+
+# Hardly anyone seems to read README files anymore, so keep this note here:
+# Don't remove the variables for python etc. They exist
+# because one system sticks with PEPs, and others opt
+# for installing every version side-by-side,
+# Same goes for babel.
+
+include config.mk
+
+all: css locale template
+ $(cp) -R dist rendered/
+ $(cp) -R static rendered/
+ $(cp) rendered/static/robots.txt rendered/robots.txt
+ $(cp) rendered/static/stage.robots.txt rendered/stage.robots.txt
+ $(cp) rendered/static/robots.txt rendered/dist/robots.txt
+ $(cp) rendered/static/robots.txt rendered/en/robots.txt
+ $(cp) rendered/static/robots.txt rendered/de/robots.txt
+ $(cp) rendered/static/robots.txt rendered/es/robots.txt
+ $(cp) rendered/static/robots.txt rendered/fr/robots.txt
+ $(cp) rendered/static/robots.txt rendered/it/robots.txt
+ $(cp) favicon.ico rendered/favicon.ico
+ $(sh) make_sitemap.sh
+ $(cp) rendered/sitemap.xml rendered/en/sitemap.xml
+ $(cp) rss.xml rendered/rss.xml
+ $(cp) rss.xml rendered/en/rss.xml
+ $(cp) rss.xml rendered/de/rss.xml
+ $(cp) rss.xml rendered/es/rss.xml
+ $(cp) rss.xml rendered/fr/rss.xml
+ $(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
+ $(cp) static/moved_gns.html rendered/gns.html
+ cd rendered; $(ln) -fs gns.html gns
+ $(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
+# to set the pythonpath before invoking pybabel.
+locale/messages.pot: common/*.j2.inc template/*.j2
+ $(env) PYTHONPATH=. $(pybabel) -q extract -F locale/babel.map -o
locale/messages.pot .
+
+# Update translation (.po) files with new strings.
+locale-update: locale/messages.pot
+ $(msgmerge) -q -U -m --previous locale/en/LC_MESSAGES/messages.po
locale/messages.pot
+ $(msgmerge) -q -U -m --previous locale/de/LC_MESSAGES/messages.po
locale/messages.pot
+ $(msgmerge) -q -U -m --previous locale/fr/LC_MESSAGES/messages.po
locale/messages.pot
+ $(msgmerge) -q -U -m --previous locale/es/LC_MESSAGES/messages.po
locale/messages.pot
+ $(msgmerge) -q -U -m --previous locale/it/LC_MESSAGES/messages.po
locale/messages.pot
+
+ if $(grep) -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo
-e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
+
+# sass preprocessor
+css:
+ $(sassc) static/styles.sass static/styles.css
+
+# Compile translation files for use.
+locale-compile:
+ $(pybabel) -q compile -d locale -l en --use-fuzzy
+ $(pybabel) -q compile -d locale -l de --use-fuzzy
+ $(pybabel) -q compile -d locale -l fr --use-fuzzy
+ $(pybabel) -q compile -d locale -l it --use-fuzzy
+ $(pybabel) -q compile -d locale -l es --use-fuzzy
+
+# Process everything related to gettext translations.
+locale: locale-update locale-compile
+
+# Run the jinja2 templating engine to expand templates to HTML
+# incorporating translations.
+template: locale-compile
+ $(python) ./template.py
+
+it: template
+
+current_dir = $(shell pwd)
+
+run: all
+ @[ "$(BROWSER)" ] || ( echo "You need to export the environment
variable 'BROWSER' to run this."; exit 1 )
+ $(browser) http://0.0.0.0:8000 &
+ cd rendered && $(PYTHON) -m http.server
+
+
+# docker-all: Build using a docker image which contains all the needed
+# packages.
+
+docker: docker-all
+
+docker-all:
+ $(docker) build -t gnunet-www-builder .
+ # Importing via the shell like this is hacky,
+ # but after trying lots of other ways, this works most reliably...
+ $(python) -c 'import i18nfix'
+ $(docker) run --rm -v $$(pwd):/tmp/ --user $$(id -u):$$(id -g)
gnunet-www-builder
+
+clean:
+ $(rm) -rf __pycache__
+ $(rm) -rf en/ de/ fr/ it/ es/ ru/
+ $(rm) -rf rendered/
+ $(rm) -rf *.pyc *~ \.*~ \#*\#
diff --git a/Makefile b/Makefile
index f2c5041..307d781 100644
--- a/Makefile
+++ b/Makefile
@@ -1,82 +1,70 @@
+# Makefile for NetBSD make (portable version: "bmake"),
+# GNU make will find 'GNUmakefile' first and use that file instead.
+# This file is in the public domain.
#
-# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved. This file is offered as-is,
-# without any warranty.
-#
-# ----
+# I keep and maintain this file for personal use, it is faster than
+# the gmake approach.
-# All: build HTML pages in all languages and compile the
-# TypeScript logic in web-common.
+.include "config.mk"
-# Hardly anyone seems to read README files anymore, so keep this note here:
-# Don't remove the variables for python etc. They exist
-# because one system sticks with PEPs, and others opt
-# for installing every version side-by-side,
-# Same goes for babel.
+DESTDIR=$(prefix)
-include config.mk
+_LOCALELIST= en de fr it es
+_DIRLIST= dist static
+.PHONY: all run locale-compile locale install clean css
+
+.OBJDIR=rendered
+
+# Work this into an mk file
+
+# All: build HTML pages in all languages and compile the
+# TypeScript logic in web-common.
all: css locale template
- cp -R dist rendered/
- cp -R static rendered/
- cp rendered/static/robots.txt rendered/robots.txt
- cp rendered/static/stage.robots.txt rendered/stage.robots.txt
- cp rendered/static/robots.txt rendered/dist/robots.txt
- cp rendered/static/robots.txt rendered/en/robots.txt
- cp rendered/static/robots.txt rendered/de/robots.txt
- cp rendered/static/robots.txt rendered/es/robots.txt
- cp rendered/static/robots.txt rendered/fr/robots.txt
- cp rendered/static/robots.txt rendered/it/robots.txt
- cp favicon.ico rendered/favicon.ico
- /bin/sh make_sitemap.sh
- cp rendered/sitemap.xml rendered/en/sitemap.xml
- cp rss.xml rendered/rss.xml
- cp rss.xml rendered/en/rss.xml
- cp rss.xml rendered/de/rss.xml
- cp rss.xml rendered/es/rss.xml
- cp rss.xml rendered/fr/rss.xml
- 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
- cp static/moved_gns.html rendered/gns.html
- cd rendered; ln -fs gns.html gns
- 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
+.for _dir in ${_DIRLIST}
+ $(cp) -R ${_dir} rendered/
+.endfor
+.for _lang in ${_LOCALELIST}
+ $(cp) rendered/static/robots.txt rendered/${_lang}
+ $(cp) rendered/static/stage.robots.txt rendered/${_lang}
+ $(cp) rss.xml rendered/${_lang}
+.endfor
+ $(cp) rendered/static/robots.txt rendered/dist/robots.txt
+ $(cp) favicon.ico rendered/
+ $(sh) make_sitemap.sh
+.for _lang in ${_LOCALELIST}
+ $(cp) rendered/sitemap.xml rendered/${_lang}
+.endfor
+ $(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
+ $(cp) static/moved_gns.html rendered/gns.html
+ cd rendered; $(ln) -fs gns.html gns
+ $(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
-# to set the pythonpath before invoking pybabel.
-locale/messages.pot: common/*.j2.inc template/*.j2
- PYTHONPATH=. $(BABEL) -v extract -F locale/babel.map -o
locale/messages.pot .
+locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
+ $(env) PYTHONPATH="." $(pybabel) -q extract -F locale/babel.map -o
locale/messages.pot .
# Update translation (.po) files with new strings.
locale-update: locale/messages.pot
- msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po
locale/messages.pot
- msgmerge -U -m --previous locale/de/LC_MESSAGES/messages.po
locale/messages.pot
- msgmerge -U -m --previous locale/fr/LC_MESSAGES/messages.po
locale/messages.pot
- msgmerge -U -m --previous locale/es/LC_MESSAGES/messages.po
locale/messages.pot
- msgmerge -U -m --previous locale/it/LC_MESSAGES/messages.po
locale/messages.pot
-
- if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e
"\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
-
-# sass preprocessor
-css:
- sassc static/styles.sass static/styles.css
+.for _lang in ${_LOCALELIST}
+ $(msgmerge) -q -U -m --previous locale/${_lang}/LC_MESSAGES/messages.po
locale/messages.pot
+.endfor
+ if $(grep) -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then \
+ $(echo) -e "\nERROR: Conflicts encountered in PO files.\n"; \
+ exit 1; \
+ fi
# Compile translation files for use.
locale-compile:
- $(BABEL) -v compile -d locale -l en --use-fuzzy
- $(BABEL) -v compile -d locale -l de --use-fuzzy
- $(BABEL) -v compile -d locale -l fr --use-fuzzy
- $(BABEL) -v compile -d locale -l it --use-fuzzy
- $(BABEL) -v compile -d locale -l es --use-fuzzy
+.for _lang in ${_LOCALELIST}
+ $(pybabel) -q compile -d locale -l ${_lang} --use-fuzzy
+.endfor
# Process everything related to gettext translations.
locale: locale-update locale-compile
@@ -84,31 +72,41 @@ locale: locale-update locale-compile
# Run the jinja2 templating engine to expand templates to HTML
# incorporating translations.
template: locale-compile
- $(PYTHON) ./template.py
+ $(python) ./template.py
-it: template
+css:
+ $(sassc) static/styles.sass static/styles.css
+
+run:
+.if defined(browser) && !empty(DESTDIR) && !empty(python)
+ $(browser) http://0.0.0.0:8000 &
+ $(python) -m http.server
+.endif
-current_dir = $(shell pwd)
+install:
+ $(mkdir) -p $(prefix)/share/gnunet-www
+ $(cp) -R rendered/* $(prefix)/share/gnunet-www
-run: all
- @[ "$(BROWSER)" ] || ( echo "You need to export the environment
variable 'BROWSER' to run this."; exit 1 )
- $(RUN_BROWSER) http://0.0.0.0:8000 &
- cd rendered && $(PYTHON) -m http.server
+uninstall:
+ $(rm) -rf $(prefix)/share/gnunet-www
+submodules/init:
+ $(git) submodule update --init --recursive
-# docker-all: Build using a docker image which contains all the needed
packages.
+submodules/update:
+ $(git) submodule update --recursive --remote
docker: docker-all
docker-all:
- docker build -t gnunet-www-builder .
+.if defined(docker)
+ $(docker) build -t gnunet-www-builder .
# Importing via the shell like this is hacky,
# but after trying lots of other ways, this works most reliably...
- $(PYTHON) -c 'import i18nfix'
- docker run --rm -v $$(pwd):/tmp/ --user $$(id -u):$$(id -g)
gnunet-www-builder
-
-clean:
- rm -rf __pycache__
- rm -rf en/ de/ fr/ it/ es/ ru/
- rm -rf rendered/
- rm -rf *.pyc *~ \.*~ \#*\#
+ $(python) -c 'import i18nfix'
+ $(docker) run --rm -v $$(pwd):/tmp/ --user $$(id -u):$$(id -g)
gnunet-www-builder
+.endif
+
+CLEANFILES+= *.pyc *~ \.*~ *.core
+
+.include <bsd.prog.mk>
diff --git a/README b/README
index 93bbd08..d65adf7 100644
--- a/README
+++ b/README
@@ -2,31 +2,49 @@
GNUnet Website
==============
-Sourcecode for https://gnunet.org created from the https://taler.net code base.
+Sourcecode for https://gnunet.org created from the https://taler.net
+code base.
Requirements
------------
- python3 modules:
- python3-jinja2, python3-babel
- python3 interpreter:
- - python 3.7 (although any 3.x version should work)
+ - python 3.7 or later.
- gettext
- sassc, to compile the stylesheets
+general short buildsteps:
-Run "make" to build the HTML.
-If you experience a failure related to a python module, run
-"make" again.
+ ./bootstrap
+ ./configure
+ make
-Expect it to show up in rendered/en/ and other language folders.
+'configure' takes arguments, run ./configure --help or ./configure -h
+to find out what could be fitting for you. Generally configure tries
+to be smart about detecting names, if it doesn't find them for you,
+you should report this as a bug.
+
+GNU make operates on "GNUmakefile", "Makefile" is used by at least
+NetBSD make in this context (we do get a speed improvement by
+writing different files with different structures optimized for
+the make implementation).
+
+Running "make" builds the HTML.
+Expect its output to show up in rendered/en/ and other language
+folders.
Run the following to start a python webserver:
-BROWSER=firefox make run
+
+ make run
+or
+
+ BROWSER=firefox make run
Layout / how this comes to be
=============================
-config.mk local variables for values in the Makefile
+config.mk autogenerated file by taler-build-scripts
static/ contains images, css, PDFs, robots.txt,
team-images
static/navbar.css CSS for the navigation bar (common/navigation.j2.inc)
static/styles.css CSS for the rest of the website
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..82700e1
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Bootstrap the repository. Used when the repository is checked out from git.
+# When using the source tarball, running this script is not necessary.
+
+set -eu
+
+if ! git --version >/dev/null; then
+ echo "git not installed"
+ exit 1
+fi
+
+git submodule update --init
+cp build-system/taler-build-scripts/configure ./configure
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
new file mode 160000
index 0000000..5c4681c
--- /dev/null
+++ b/build-system/taler-build-scripts
@@ -0,0 +1 @@
+Subproject commit 5c4681cf16a996a41b4c50445125810dd99635f0
diff --git a/config.mk b/config.mk
deleted file mode 100644
index 8491416..0000000
--- a/config.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-DEBUG=0
-
-PYTHON=python3
-BABEL=pybabel
-
-RUN_BROWSER=$(BROWSER)
diff --git a/configure b/configure
new file mode 100755
index 0000000..4ffb738
--- /dev/null
+++ b/configure
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# This file is part of TALER
+# (C) 2019 GNUnet e.V.
+#
+# This is very simple POSIX sh script which
+# identifies the first matching
+# python3 identifier in $PATH and produces
+# configure.py from configure.py.in, and then
+# calls the new executable configure.py.
+#
+# It should be portable on Unices. Report bugs on
+# the bugtracker if you discover that it isn't
+# working as intended.
+#
+# Authors:
+# Author: ng0 <address@hidden>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
+# LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+# THIS SOFTWARE.
+#
+# SPDX-License-Identifier: 0BSD
+
+# we invoke configure not as a symlink but as a copy,
+# so we have to use a fixed location for the repository!
+dir=$(dirname "$(readlink -f -- "$0")")/build-system/taler-build-scripts
+. $dir/sh/lib.sh/existence.sh
+. $dir/sh/lib.sh/existence_python.sh
+
+scriptpath=build-system/taler-build-scripts
+
+if ! test -d "$scriptpath"; then
+ echo "fatal error: taler-build-scripts not found at $scriptpath" >&2
+ exit 1
+fi
+
+export PYTHONPATH="$scriptpath:${PYTHONPATH:-}"
+
+# Call configure.py, assuming all went well.
+# $1 is read by configure.py as the prefix.
+# If $1 is empty, the python script checks the
+# environment for PREFIX. We might need more
+# variables and switches, such as DESTDIR.
+exec "$PYTHON" ./configure.py $@
diff --git a/configure.py b/configure.py
new file mode 100644
index 0000000..829c352
--- /dev/null
+++ b/configure.py
@@ -0,0 +1,34 @@
+import sys
+from pathlib import Path
+
+base_dir = Path(__file__, "../build-system/taler-build-scripts").resolve()
+
+if not base_dir.exists():
+ print(f"build system directory (${base_dir}) missing", file=sys.stderr)
+ sys.exit(1)
+
+sys.path.insert(0, str(base_dir))
+
+from talerbuildconfig import *
+
+b = BuildConfig()
+b.enable_prefix()
+b.enable_configmk()
+b.add_tool(PythonTool())
+b.add_tool(PyBabelTool())
+b.add_tool(PosixTool("cp"))
+b.add_tool(PosixTool("echo"))
+b.add_tool(PosixTool("env"))
+b.add_tool(PosixTool("printf"))
+b.add_tool(PosixTool("grep"))
+b.add_tool(PosixTool("ln"))
+b.add_tool(PosixTool("mkdir"))
+b.add_tool(PosixTool("rm"))
+b.add_tool(PosixTool("sh"))
+b.add_tool(PosixTool("msgmerge"))
+b.add_tool(PosixTool("tsc"))
+b.add_tool(PosixTool("git"))
+b.add_tool(PosixTool("docker"))
+b.add_tool(PosixTool("sassc"))
+b.add_tool(BrowserTool())
+b.run()
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 3b6ee11..882c05a 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-20 11:37+0200\n"
+"POT-Creation-Date: 2019-10-28 16:59+0000\n"
"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"
#: common/base.j2:5
@@ -370,11 +370,11 @@ msgstr ""
"decentralizierte Routingalgorithmen benutzt. Diese Komponenten ersetzen das "
"traditionelle Internet (TCP/IP)."
-#: template/architecture.html.j2:70 template/gns.html.j2:27
+#: template/architecture.html.j2:70
msgid "Security"
msgstr "Sicherheit"
-#: template/architecture.html.j2:73 template/gns.html.j2:29
+#: template/architecture.html.j2:73
msgid ""
"GNUnet is implemented using a multi-process architecture. Each subsystem "
"runs as a separate process, providing fault-isolation and enabling tight "
@@ -383,13 +383,13 @@ msgid ""
"remain free software."
msgstr ""
-#: template/architecture.html.j2:87 template/gns.html.j2:43
+#: template/architecture.html.j2:87
#, fuzzy
#| msgid "System Architecture"
msgid "System architecture"
msgstr "System Architekture"
-#: template/architecture.html.j2:93 template/gns.html.j2:49
+#: template/architecture.html.j2:93
msgid "Subsystems"
msgstr ""
@@ -775,24 +775,6 @@ msgid ""
"with egos."
msgstr ""
-#: template/gns.html.j2:6 template/index.html.j2:274
-msgid "The GNU Name System"
-msgstr ""
-
-#: template/gns.html.j2:12 template/gnurl.html.j2:43
-msgid "Motivation"
-msgstr "Motivation"
-
-#: template/gns.html.j2:14
-msgid ""
-"The Domain Name System today enables traffic amplification attacks, "
-"censorship (i.e. China), mass surveillance (MORECOWBELL) and offensive cyber "
-"war (QUANTUMDNS).<br/> Unfortunately, band aid solutions such as DoT, DoH, "
-"DNSSEC, DPRIVE and the like will not fix this. This is why we built the GNU "
-"Name System (GNS), a secure, decentralized name system built on top of "
-"GNUnet."
-msgstr ""
-
#: template/gnurl.html.j2:20
msgid ""
"libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
@@ -816,6 +798,10 @@ msgid ""
"Large parts of the following 6 paragraphs are old and need to be rewritten."
msgstr ""
+#: template/gnurl.html.j2:43
+msgid "Motivation"
+msgstr "Motivation"
+
#: template/gnurl.html.j2:45
msgid ""
"cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
@@ -1690,6 +1676,10 @@ msgid ""
"confirmed within milliseconds with extremely low transaction costs."
msgstr ""
+#: template/index.html.j2:274
+msgid "The GNU Name System"
+msgstr ""
+
#: template/index.html.j2:277
msgid ""
"<!-- The <a href=\"use.html#gns\">GNU Name System (GNS)</a> --> The <a href="
@@ -1809,13 +1799,15 @@ msgstr ""
msgid "Make an installation directory"
msgstr ""
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:134
+#: template/install-on-debian9.html.j2:59
+#: template/install-on-macos.html.j2:134
#: 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:142
+#: template/install-on-debian9.html.j2:78
+#: template/install-on-macos.html.j2:142
#: template/install-on-netbsd.html.j2:232
#: template/install-on-ubuntu1804.html.j2:61
msgid "Compile and Install"
@@ -1865,15 +1857,18 @@ msgstr ""
msgid "First steps"
msgstr ""
-#: template/install-on-macos.html.j2:109 template/install-on-netbsd.html.j2:182
+#: template/install-on-macos.html.j2:109
+#: template/install-on-netbsd.html.j2:182
msgid "Alternative: Installation from source"
msgstr ""
-#: template/install-on-macos.html.j2:154 template/install-on-netbsd.html.j2:242
+#: template/install-on-macos.html.j2:154
+#: template/install-on-netbsd.html.j2:242
msgid "Option 1: GNUnet for production / usage"
msgstr ""
-#: template/install-on-macos.html.j2:187 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:187
+#: template/install-on-netbsd.html.j2:267
msgid "Option 2: GNUnet experimental"
msgstr ""
@@ -1905,7 +1900,7 @@ msgid ""
"\"engage.html\">get in touch!</a></p>"
msgstr ""
-#: template/news.html.j2.inc:14
+#: template/news.html.j2.inc:15
msgid "More news"
msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 66d93fc..94376a6 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -321,11 +321,11 @@ msgid ""
"subsystems replace the traditional TCP/IP stack."
msgstr ""
-#: template/architecture.html.j2:70 template/gns.html.j2:27
+#: template/architecture.html.j2:70
msgid "Security"
msgstr ""
-#: template/architecture.html.j2:73 template/gns.html.j2:29
+#: template/architecture.html.j2:73
msgid ""
"GNUnet is implemented using a multi-process architecture. Each subsystem "
"runs as a separate process, providing fault-isolation and enabling tight "
@@ -334,11 +334,11 @@ msgid ""
"remain free software."
msgstr ""
-#: template/architecture.html.j2:87 template/gns.html.j2:43
+#: template/architecture.html.j2:87
msgid "System architecture"
msgstr ""
-#: template/architecture.html.j2:93 template/gns.html.j2:49
+#: template/architecture.html.j2:93
msgid "Subsystems"
msgstr ""
@@ -720,24 +720,6 @@ msgid ""
"with egos."
msgstr ""
-#: template/gns.html.j2:6 template/index.html.j2:274
-msgid "The GNU Name System"
-msgstr ""
-
-#: template/gns.html.j2:12 template/gnurl.html.j2:43
-msgid "Motivation"
-msgstr ""
-
-#: template/gns.html.j2:14
-msgid ""
-"The Domain Name System today enables traffic amplification attacks, "
-"censorship (i.e. China), mass surveillance (MORECOWBELL) and offensive cyber "
-"war (QUANTUMDNS).<br/> Unfortunately, band aid solutions such as DoT, DoH, "
-"DNSSEC, DPRIVE and the like will not fix this. This is why we built the GNU "
-"Name System (GNS), a secure, decentralized name system built on top of "
-"GNUnet."
-msgstr ""
-
#: template/gnurl.html.j2:20
msgid ""
"libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
@@ -759,6 +741,10 @@ msgid ""
"Large parts of the following 6 paragraphs are old and need to be rewritten."
msgstr ""
+#: template/gnurl.html.j2:43
+msgid "Motivation"
+msgstr ""
+
#: template/gnurl.html.j2:45
msgid ""
"cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
@@ -1627,6 +1613,10 @@ msgid ""
"confirmed within milliseconds with extremely low transaction costs."
msgstr ""
+#: template/index.html.j2:274
+msgid "The GNU Name System"
+msgstr ""
+
#: template/index.html.j2:277
msgid ""
"<!-- The <a href=\"use.html#gns\">GNU Name System (GNS)</a> --> The <a href="
@@ -1746,13 +1736,15 @@ msgstr ""
msgid "Make an installation directory"
msgstr ""
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:134
+#: template/install-on-debian9.html.j2:59
+#: template/install-on-macos.html.j2:134
#: 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:142
+#: template/install-on-debian9.html.j2:78
+#: template/install-on-macos.html.j2:142
#: template/install-on-netbsd.html.j2:232
#: template/install-on-ubuntu1804.html.j2:61
msgid "Compile and Install"
@@ -1800,15 +1792,18 @@ msgstr ""
msgid "First steps"
msgstr ""
-#: template/install-on-macos.html.j2:109 template/install-on-netbsd.html.j2:182
+#: template/install-on-macos.html.j2:109
+#: template/install-on-netbsd.html.j2:182
msgid "Alternative: Installation from source"
msgstr ""
-#: template/install-on-macos.html.j2:154 template/install-on-netbsd.html.j2:242
+#: template/install-on-macos.html.j2:154
+#: template/install-on-netbsd.html.j2:242
msgid "Option 1: GNUnet for production / usage"
msgstr ""
-#: template/install-on-macos.html.j2:187 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:187
+#: template/install-on-netbsd.html.j2:267
msgid "Option 2: GNUnet experimental"
msgstr ""
@@ -1840,7 +1835,7 @@ msgid ""
"\"engage.html\">get in touch!</a></p>"
msgstr ""
-#: template/news.html.j2.inc:14
+#: template/news.html.j2.inc:15
msgid "More news"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 0e23916..ab3a472 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-20 11:37+0200\n"
+"POT-Creation-Date: 2019-10-28 16:59+0000\n"
"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"
#: common/base.j2:5
@@ -345,11 +345,11 @@ msgid ""
"subsystems replace the traditional TCP/IP stack."
msgstr ""
-#: template/architecture.html.j2:70 template/gns.html.j2:27
+#: template/architecture.html.j2:70
msgid "Security"
msgstr ""
-#: template/architecture.html.j2:73 template/gns.html.j2:29
+#: template/architecture.html.j2:73
msgid ""
"GNUnet is implemented using a multi-process architecture. Each subsystem "
"runs as a separate process, providing fault-isolation and enabling tight "
@@ -358,11 +358,11 @@ msgid ""
"remain free software."
msgstr ""
-#: template/architecture.html.j2:87 template/gns.html.j2:43
+#: template/architecture.html.j2:87
msgid "System architecture"
msgstr ""
-#: template/architecture.html.j2:93 template/gns.html.j2:49
+#: template/architecture.html.j2:93
msgid "Subsystems"
msgstr ""
@@ -746,24 +746,6 @@ msgid ""
"with egos."
msgstr ""
-#: template/gns.html.j2:6 template/index.html.j2:274
-msgid "The GNU Name System"
-msgstr ""
-
-#: template/gns.html.j2:12 template/gnurl.html.j2:43
-msgid "Motivation"
-msgstr ""
-
-#: template/gns.html.j2:14
-msgid ""
-"The Domain Name System today enables traffic amplification attacks, "
-"censorship (i.e. China), mass surveillance (MORECOWBELL) and offensive cyber "
-"war (QUANTUMDNS).<br/> Unfortunately, band aid solutions such as DoT, DoH, "
-"DNSSEC, DPRIVE and the like will not fix this. This is why we built the GNU "
-"Name System (GNS), a secure, decentralized name system built on top of "
-"GNUnet."
-msgstr ""
-
#: template/gnurl.html.j2:20
msgid ""
"libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
@@ -787,6 +769,10 @@ msgid ""
"Large parts of the following 6 paragraphs are old and need to be rewritten."
msgstr ""
+#: template/gnurl.html.j2:43
+msgid "Motivation"
+msgstr ""
+
#: template/gnurl.html.j2:45
msgid ""
"cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
@@ -1659,6 +1645,10 @@ msgid ""
"confirmed within milliseconds with extremely low transaction costs."
msgstr ""
+#: template/index.html.j2:274
+msgid "The GNU Name System"
+msgstr ""
+
#: template/index.html.j2:277
msgid ""
"<!-- The <a href=\"use.html#gns\">GNU Name System (GNS)</a> --> The <a href="
@@ -1778,13 +1768,15 @@ msgstr ""
msgid "Make an installation directory"
msgstr ""
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:134
+#: template/install-on-debian9.html.j2:59
+#: template/install-on-macos.html.j2:134
#: 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:142
+#: template/install-on-debian9.html.j2:78
+#: template/install-on-macos.html.j2:142
#: template/install-on-netbsd.html.j2:232
#: template/install-on-ubuntu1804.html.j2:61
msgid "Compile and Install"
@@ -1832,15 +1824,18 @@ msgstr ""
msgid "First steps"
msgstr ""
-#: template/install-on-macos.html.j2:109 template/install-on-netbsd.html.j2:182
+#: template/install-on-macos.html.j2:109
+#: template/install-on-netbsd.html.j2:182
msgid "Alternative: Installation from source"
msgstr ""
-#: template/install-on-macos.html.j2:154 template/install-on-netbsd.html.j2:242
+#: template/install-on-macos.html.j2:154
+#: template/install-on-netbsd.html.j2:242
msgid "Option 1: GNUnet for production / usage"
msgstr ""
-#: template/install-on-macos.html.j2:187 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:187
+#: template/install-on-netbsd.html.j2:267
msgid "Option 2: GNUnet experimental"
msgstr ""
@@ -1872,7 +1867,7 @@ msgid ""
"\"engage.html\">get in touch!</a></p>"
msgstr ""
-#: template/news.html.j2.inc:14
+#: template/news.html.j2.inc:15
msgid "More news"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index d8550d0..c195538 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-20 11:37+0200\n"
+"POT-Creation-Date: 2019-10-28 16:59+0000\n"
"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"
#: common/base.j2:5
@@ -341,11 +341,11 @@ msgid ""
"subsystems replace the traditional TCP/IP stack."
msgstr ""
-#: template/architecture.html.j2:70 template/gns.html.j2:27
+#: template/architecture.html.j2:70
msgid "Security"
msgstr ""
-#: template/architecture.html.j2:73 template/gns.html.j2:29
+#: template/architecture.html.j2:73
msgid ""
"GNUnet is implemented using a multi-process architecture. Each subsystem "
"runs as a separate process, providing fault-isolation and enabling tight "
@@ -354,11 +354,11 @@ msgid ""
"remain free software."
msgstr ""
-#: template/architecture.html.j2:87 template/gns.html.j2:43
+#: template/architecture.html.j2:87
msgid "System architecture"
msgstr ""
-#: template/architecture.html.j2:93 template/gns.html.j2:49
+#: template/architecture.html.j2:93
msgid "Subsystems"
msgstr ""
@@ -740,24 +740,6 @@ msgid ""
"with egos."
msgstr ""
-#: template/gns.html.j2:6 template/index.html.j2:274
-msgid "The GNU Name System"
-msgstr ""
-
-#: template/gns.html.j2:12 template/gnurl.html.j2:43
-msgid "Motivation"
-msgstr ""
-
-#: template/gns.html.j2:14
-msgid ""
-"The Domain Name System today enables traffic amplification attacks, "
-"censorship (i.e. China), mass surveillance (MORECOWBELL) and offensive cyber "
-"war (QUANTUMDNS).<br/> Unfortunately, band aid solutions such as DoT, DoH, "
-"DNSSEC, DPRIVE and the like will not fix this. This is why we built the GNU "
-"Name System (GNS), a secure, decentralized name system built on top of "
-"GNUnet."
-msgstr ""
-
#: template/gnurl.html.j2:20
msgid ""
"libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
@@ -779,6 +761,10 @@ msgid ""
"Large parts of the following 6 paragraphs are old and need to be rewritten."
msgstr ""
+#: template/gnurl.html.j2:43
+msgid "Motivation"
+msgstr ""
+
#: template/gnurl.html.j2:45
msgid ""
"cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
@@ -1647,6 +1633,10 @@ msgid ""
"confirmed within milliseconds with extremely low transaction costs."
msgstr ""
+#: template/index.html.j2:274
+msgid "The GNU Name System"
+msgstr ""
+
#: template/index.html.j2:277
msgid ""
"<!-- The <a href=\"use.html#gns\">GNU Name System (GNS)</a> --> The <a href="
@@ -1766,13 +1756,15 @@ msgstr ""
msgid "Make an installation directory"
msgstr ""
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:134
+#: template/install-on-debian9.html.j2:59
+#: template/install-on-macos.html.j2:134
#: 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:142
+#: template/install-on-debian9.html.j2:78
+#: template/install-on-macos.html.j2:142
#: template/install-on-netbsd.html.j2:232
#: template/install-on-ubuntu1804.html.j2:61
msgid "Compile and Install"
@@ -1820,15 +1812,18 @@ msgstr ""
msgid "First steps"
msgstr ""
-#: template/install-on-macos.html.j2:109 template/install-on-netbsd.html.j2:182
+#: template/install-on-macos.html.j2:109
+#: template/install-on-netbsd.html.j2:182
msgid "Alternative: Installation from source"
msgstr ""
-#: template/install-on-macos.html.j2:154 template/install-on-netbsd.html.j2:242
+#: template/install-on-macos.html.j2:154
+#: template/install-on-netbsd.html.j2:242
msgid "Option 1: GNUnet for production / usage"
msgstr ""
-#: template/install-on-macos.html.j2:187 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:187
+#: template/install-on-netbsd.html.j2:267
msgid "Option 2: GNUnet experimental"
msgstr ""
@@ -1860,7 +1855,7 @@ msgid ""
"\"engage.html\">get in touch!</a></p>"
msgstr ""
-#: template/news.html.j2.inc:14
+#: template/news.html.j2.inc:15
msgid "More news"
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index c7822a5..6765fd7 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-20 11:37+0200\n"
+"POT-Creation-Date: 2019-10-28 16:59+0000\n"
"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"
#: common/base.j2:5
@@ -341,11 +341,11 @@ msgid ""
"subsystems replace the traditional TCP/IP stack."
msgstr ""
-#: template/architecture.html.j2:70 template/gns.html.j2:27
+#: template/architecture.html.j2:70
msgid "Security"
msgstr ""
-#: template/architecture.html.j2:73 template/gns.html.j2:29
+#: template/architecture.html.j2:73
msgid ""
"GNUnet is implemented using a multi-process architecture. Each subsystem "
"runs as a separate process, providing fault-isolation and enabling tight "
@@ -354,11 +354,11 @@ msgid ""
"remain free software."
msgstr ""
-#: template/architecture.html.j2:87 template/gns.html.j2:43
+#: template/architecture.html.j2:87
msgid "System architecture"
msgstr ""
-#: template/architecture.html.j2:93 template/gns.html.j2:49
+#: template/architecture.html.j2:93
msgid "Subsystems"
msgstr ""
@@ -740,24 +740,6 @@ msgid ""
"with egos."
msgstr ""
-#: template/gns.html.j2:6 template/index.html.j2:274
-msgid "The GNU Name System"
-msgstr ""
-
-#: template/gns.html.j2:12 template/gnurl.html.j2:43
-msgid "Motivation"
-msgstr ""
-
-#: template/gns.html.j2:14
-msgid ""
-"The Domain Name System today enables traffic amplification attacks, "
-"censorship (i.e. China), mass surveillance (MORECOWBELL) and offensive cyber "
-"war (QUANTUMDNS).<br/> Unfortunately, band aid solutions such as DoT, DoH, "
-"DNSSEC, DPRIVE and the like will not fix this. This is why we built the GNU "
-"Name System (GNS), a secure, decentralized name system built on top of "
-"GNUnet."
-msgstr ""
-
#: template/gnurl.html.j2:20
msgid ""
"libgnurl is a micro fork of libcurl. The goal of libgnurl is to support only "
@@ -779,6 +761,10 @@ msgid ""
"Large parts of the following 6 paragraphs are old and need to be rewritten."
msgstr ""
+#: template/gnurl.html.j2:43
+msgid "Motivation"
+msgstr ""
+
#: template/gnurl.html.j2:45
msgid ""
"cURL supports many crypto backends. GNUnet requires the use of GnuTLS, but "
@@ -1647,6 +1633,10 @@ msgid ""
"confirmed within milliseconds with extremely low transaction costs."
msgstr ""
+#: template/index.html.j2:274
+msgid "The GNU Name System"
+msgstr ""
+
#: template/index.html.j2:277
msgid ""
"<!-- The <a href=\"use.html#gns\">GNU Name System (GNS)</a> --> The <a href="
@@ -1766,13 +1756,15 @@ msgstr ""
msgid "Make an installation directory"
msgstr ""
-#: template/install-on-debian9.html.j2:59 template/install-on-macos.html.j2:134
+#: template/install-on-debian9.html.j2:59
+#: template/install-on-macos.html.j2:134
#: 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:142
+#: template/install-on-debian9.html.j2:78
+#: template/install-on-macos.html.j2:142
#: template/install-on-netbsd.html.j2:232
#: template/install-on-ubuntu1804.html.j2:61
msgid "Compile and Install"
@@ -1820,15 +1812,18 @@ msgstr ""
msgid "First steps"
msgstr ""
-#: template/install-on-macos.html.j2:109 template/install-on-netbsd.html.j2:182
+#: template/install-on-macos.html.j2:109
+#: template/install-on-netbsd.html.j2:182
msgid "Alternative: Installation from source"
msgstr ""
-#: template/install-on-macos.html.j2:154 template/install-on-netbsd.html.j2:242
+#: template/install-on-macos.html.j2:154
+#: template/install-on-netbsd.html.j2:242
msgid "Option 1: GNUnet for production / usage"
msgstr ""
-#: template/install-on-macos.html.j2:187 template/install-on-netbsd.html.j2:267
+#: template/install-on-macos.html.j2:187
+#: template/install-on-netbsd.html.j2:267
msgid "Option 2: GNUnet experimental"
msgstr ""
@@ -1860,7 +1855,7 @@ msgid ""
"\"engage.html\">get in touch!</a></p>"
msgstr ""
-#: template/news.html.j2.inc:14
+#: template/news.html.j2.inc:15
msgid "More news"
msgstr ""
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 600d362..bd31d7d 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -15,7 +15,7 @@
<h4>Mailing List</h4>
<p>
You can get help on our mailing list <a
href="https://lists.gnu.org/mailman/listinfo/help-gnunet">help-gnunet</a>.
<br>If you generally want to be informed about recent updates and happenings,
get in touch over our <a
href="https://lists.gnu.org/mailman/listinfo/info-gnunet">info mailing
list</a>.<br/>
- If you want to hack on GNUnet or want to follow technical discussions,
try our <a
href="https://lists.gnu.org/mailman/listinfo/gnunet-developer">developer
mailing list</a>
+ If you want to hack on GNUnet or want to follow technical discussions,
try our <a
href="https://lists.gnu.org/mailman/listinfo/gnunet-developers">developer
mailing list</a>
</p>
<h4>IRC</h4>
<p>
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [www] branch stable updated (e20fe92 -> 420df40),
gnunet <=