[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch master updated (001a3d2 -> bddc04c)
|
From: |
gnunet |
|
Subject: |
[taler-www] branch master updated (001a3d2 -> bddc04c) |
|
Date: |
Mon, 28 Oct 2019 16:17:25 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a change to branch master
in repository www.
from 001a3d2 add Dold's PhD thesis to bibliography
new f249f9d locale regen
new beb9237 add taler-build-scripts
new 0e9e0f0 new tbs commit
new bddc04c rewrite build mechanism to use build-script.
The 4 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:
.gitignore | 2 +
.gitmodules | 3 ++
GNUmakefile | 104 ++++++++++++++++++++++++++++++++++++++
bootstrap | 14 +++++
build-system/taler-build-scripts | 1 +
config.mk | 7 ---
configure | 53 +++++++++++++++++++
configure.py | 31 ++++++++++++
locale/de/LC_MESSAGES/messages.po | 18 +++----
locale/en/LC_MESSAGES/messages.po | 18 +++----
locale/es/LC_MESSAGES/messages.po | 18 +++----
locale/fr/LC_MESSAGES/messages.po | 18 +++----
locale/it/LC_MESSAGES/messages.po | 18 +++----
locale/pt/LC_MESSAGES/messages.po | 18 +++----
locale/ru/LC_MESSAGES/messages.po | 18 +++----
15 files changed, 271 insertions(+), 70 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 e1ce6c4..a7f5ed8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ __pycache__
*.pyc
node_modules
+
+config.mk
diff --git a/.gitmodules b/.gitmodules
index 0e2b9bd..0a881d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,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/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..46fc58e
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,104 @@
+# This file is in the public domain.
+
+# 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: build HTML pages in all languages and compile the
+# TypeScript logic in web-common.
+.PHONY: all
+all: locale template
+ cd web-common && $(tsc)
+ $(sh) make_sitemap.sh
+ for x in en de fr it es ru pt ; do $(cp) robots.txt rendered/$$x ; done
+ for x in en de fr it es ru pt ; do $(cp) favicon.ico rendered/$$x ; done
+ for x in en de fr it es ru pt ; do $(cp) rendered/sitemap.xml
rendered/$$x ; done
+ $(cp) styles.css rendered/
+ $(cp) -R images rendered/
+ for x in en de fr it es ru pt ; do $(cp) -R images rendered/$$x ; done
+ for x in en de fr it es ru pt ; do $(cp) -R web-common rendered/$$x ;
done
+ $(cp) -R dist rendered/
+ $(cp) -R icons rendered/
+ $(cp) -R papers rendered/
+ $(cp) -R pdf rendered/
+ $(cp) -R presentations rendered/
+
+# Extract translateable strings from jinja2 templates.
+locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
+ $(env) PYTHONPATH="." $(BABEL) extract -F locale/babel.map -o
locale/messages.pot .
+
+# Update translation (.po) files with new strings.
+.PHONY: locale-update
+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
+ $(msgmerge) -U -m --previous locale/ru/LC_MESSAGES/messages.po
locale/messages.pot
+ $(msgmerge) -U -m --previous locale/pt/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
+
+# Compile translation files for use.
+.PHONY: locale-compile
+locale-compile:
+ $(pybabel) compile -d locale -l en --use-fuzzy
+ $(pybabel) compile -d locale -l de --use-fuzzy
+ $(pybabel) compile -d locale -l fr --use-fuzzy
+ $(pybabel) compile -d locale -l it --use-fuzzy
+ $(pybabel) compile -d locale -l es --use-fuzzy
+ $(pybabel) compile -d locale -l ru --use-fuzzy
+ $(pybabel) compile -d locale -l pt --use-fuzzy
+
+# Process everything related to gettext translations.
+.PHONY: locale
+locale: locale-update locale-compile
+
+# Run the jinja2 templating engine to expand templates to HTML
+# incorporating translations.
+template: locale-compile
+ $(python) ./template.py
+
+.PHONY: run
+run: all
+ $(browser) http://0.0.0.0:8000 &
+ $(python) -m http.server
+
+.PHONY: install
+install: all
+ $(mkdir) -p $(prefix)/share/taler-www
+ $(cp) -r rendered/* $(prefix)/share/taler-www
+
+.PHONY: uninstall
+ $(rm) -rf $(prefix)/share/taler-www
+
+.PHONY: clean
+clean:
+ $(rm) -rf __pycache__ *.pyc *~ \.*~ \#*\#
+ $(rm) -rf en/ de/ fr/ it/ es/ ru/
+ $(rm) -rf rendered/
+
+submodules/init:
+ $(git) submodule update --init --recursive
+
+submodules/update:
+ $(git) submodule update --recursive --remote
+
+.SILENT: show-help
+show-help:
+ $(printf) "install:\t\tInstall the website\n"
+ $(printf) "all:\t\t\tBuild the website\n"
+ $(printf) "locale/messages.pot:\tExtract translateable strings from
jinja2 templates.\n"
+ $(printf) "locale-update:\t\tUpdate translation files with new
strings.\n"
+ $(printf) "locale-compile:\t\tCompile translation files for use.\n"
+ $(printf) "locale:\t\t\tProcess everything related to gettext
translations.\n"
+ $(printf) "template:\t\texpand jinja2 templates to html.\n"
+ $(printf) "run:\t\t\tspawn python webserver and open the current
directory.\n"
+ $(printf) "clean:\t\t\tclean.\n"
+ $(printf) "submodules/init:\tinit git submodules\n"
+ $(printf) "submodules/update:\tupdate git submodules\n"
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 6d0dae0..0000000
--- a/config.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# config.mk Makefile fragment to set custom variables.
-
-TSC=tsc
-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..beea0c2
--- /dev/null
+++ b/configure.py
@@ -0,0 +1,31 @@
+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("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(BrowserTool())
+b.run()
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index bcadeee..9cfa6a1 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-17 19:26+0000\n"
+"POT-Creation-Date: 2019-10-28 12:50+0000\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <address@hidden>\n"
"Language-Team: de <address@hidden, address@hidden>\n"
@@ -35,9 +35,9 @@ msgstr ""
msgid "Bibliography"
msgstr "Bibliografie von GNU Taler"
-#: common/footer.j2.inc:27 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36 template/developers.html.j2:66
+#: common/footer.j2.inc:27 template/bibliography.html.j2:23
+#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
+#: template/bibliography.html.j2:43 template/developers.html.j2:66
msgid "and"
msgstr "und"
@@ -75,11 +75,11 @@ msgstr "Bibliografie von GNU Taler"
#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36
+#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
msgid "by"
msgstr "von"
-#: template/bibliography.html.j2:37
+#: template/bibliography.html.j2:44
msgid "available upon request"
msgstr "erhältlich auf Anfrage"
@@ -2800,9 +2800,9 @@ msgstr "Wie schützt Taler meine privaten Daten?"
#: template/principles.html.j2:60
msgid ""
"Privacy should be guaranteed via technical measures, as opposed to mere "
-"policies. Especially with micropayments for online content, a disproportion- "
-"ate amount of rather private data about buyers would be revealed, if the "
-"payment system does not have privacy protections."
+"policies. Especially with micropayments for online publications, a "
+"disproportionate amount of rather private data about buyers would be "
+"revealed, if the payment system does not have privacy protections."
msgstr ""
#: template/principles.html.j2:68
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 7a6bfba..d2d7449 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-17 19:26+0000\n"
+"POT-Creation-Date: 2019-10-28 12:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <address@hidden>\n"
@@ -33,9 +33,9 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:27 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36 template/developers.html.j2:66
+#: common/footer.j2.inc:27 template/bibliography.html.j2:23
+#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
+#: template/bibliography.html.j2:43 template/developers.html.j2:66
msgid "and"
msgstr ""
@@ -73,11 +73,11 @@ msgstr ""
#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36
+#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
msgid "by"
msgstr ""
-#: template/bibliography.html.j2:37
+#: template/bibliography.html.j2:44
msgid "available upon request"
msgstr ""
@@ -1917,9 +1917,9 @@ msgstr ""
#: template/principles.html.j2:60
msgid ""
"Privacy should be guaranteed via technical measures, as opposed to mere "
-"policies. Especially with micropayments for online content, a disproportion- "
-"ate amount of rather private data about buyers would be revealed, if the "
-"payment system does not have privacy protections."
+"policies. Especially with micropayments for online publications, a "
+"disproportionate amount of rather private data about buyers would be "
+"revealed, if the payment system does not have privacy protections."
msgstr ""
#: template/principles.html.j2:68
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index f679dfe..462eb52 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-17 19:26+0000\n"
+"POT-Creation-Date: 2019-10-28 12:50+0000\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <address@hidden>\n"
@@ -34,9 +34,9 @@ msgstr "Preguntas frecuentes"
msgid "Bibliography"
msgstr "Bibliografía"
-#: common/footer.j2.inc:27 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36 template/developers.html.j2:66
+#: common/footer.j2.inc:27 template/bibliography.html.j2:23
+#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
+#: template/bibliography.html.j2:43 template/developers.html.j2:66
msgid "and"
msgstr "y"
@@ -76,11 +76,11 @@ msgstr "Bibliografía de GNU Taler"
#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36
+#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
msgid "by"
msgstr "por"
-#: template/bibliography.html.j2:37
+#: template/bibliography.html.j2:44
msgid "available upon request"
msgstr "disponible bajo petición"
@@ -2500,9 +2500,9 @@ msgstr "¿De qué manera Taler protege mi privacidad?"
#: template/principles.html.j2:60
msgid ""
"Privacy should be guaranteed via technical measures, as opposed to mere "
-"policies. Especially with micropayments for online content, a disproportion- "
-"ate amount of rather private data about buyers would be revealed, if the "
-"payment system does not have privacy protections."
+"policies. Especially with micropayments for online publications, a "
+"disproportionate amount of rather private data about buyers would be "
+"revealed, if the payment system does not have privacy protections."
msgstr ""
#: template/principles.html.j2:68
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 5b058f0..3bc6986 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-17 19:26+0000\n"
+"POT-Creation-Date: 2019-10-28 12:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <address@hidden>\n"
@@ -33,9 +33,9 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:27 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36 template/developers.html.j2:66
+#: common/footer.j2.inc:27 template/bibliography.html.j2:23
+#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
+#: template/bibliography.html.j2:43 template/developers.html.j2:66
msgid "and"
msgstr ""
@@ -75,11 +75,11 @@ msgstr ""
#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36
+#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
msgid "by"
msgstr ""
-#: template/bibliography.html.j2:37
+#: template/bibliography.html.j2:44
msgid "available upon request"
msgstr ""
@@ -1935,9 +1935,9 @@ msgstr ""
#: template/principles.html.j2:60
msgid ""
"Privacy should be guaranteed via technical measures, as opposed to mere "
-"policies. Especially with micropayments for online content, a disproportion- "
-"ate amount of rather private data about buyers would be revealed, if the "
-"payment system does not have privacy protections."
+"policies. Especially with micropayments for online publications, a "
+"disproportionate amount of rather private data about buyers would be "
+"revealed, if the payment system does not have privacy protections."
msgstr ""
#: template/principles.html.j2:68
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 92bf657..0c2e2fd 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-17 19:26+0000\n"
+"POT-Creation-Date: 2019-10-28 12:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <address@hidden>\n"
@@ -35,9 +35,9 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:27 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36 template/developers.html.j2:66
+#: common/footer.j2.inc:27 template/bibliography.html.j2:23
+#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
+#: template/bibliography.html.j2:43 template/developers.html.j2:66
msgid "and"
msgstr "e"
@@ -77,11 +77,11 @@ msgstr "Bibliografia GNU Taler"
#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36
+#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
msgid "by"
msgstr "di"
-#: template/bibliography.html.j2:37
+#: template/bibliography.html.j2:44
msgid "available upon request"
msgstr "disponibile su richiesta"
@@ -2497,9 +2497,9 @@ msgstr "Come protegge Taler la mia privacy?"
#: template/principles.html.j2:60
msgid ""
"Privacy should be guaranteed via technical measures, as opposed to mere "
-"policies. Especially with micropayments for online content, a disproportion- "
-"ate amount of rather private data about buyers would be revealed, if the "
-"payment system does not have privacy protections."
+"policies. Especially with micropayments for online publications, a "
+"disproportionate amount of rather private data about buyers would be "
+"revealed, if the payment system does not have privacy protections."
msgstr ""
#: template/principles.html.j2:68
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index b93699c..c203488 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-17 19:26+0000\n"
+"POT-Creation-Date: 2019-10-28 12:50+0000\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -38,9 +38,9 @@ msgstr "FAQ"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:27 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36 template/developers.html.j2:66
+#: common/footer.j2.inc:27 template/bibliography.html.j2:23
+#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
+#: template/bibliography.html.j2:43 template/developers.html.j2:66
msgid "and"
msgstr "e"
@@ -80,11 +80,11 @@ msgstr "Bibliografia do GNU Taler"
#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36
+#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
msgid "by"
msgstr "por"
-#: template/bibliography.html.j2:37
+#: template/bibliography.html.j2:44
msgid "available upon request"
msgstr "disponível mediante solicitação"
@@ -2464,9 +2464,9 @@ msgstr "Como o Taler protege minha privacidade?"
#: template/principles.html.j2:60
msgid ""
"Privacy should be guaranteed via technical measures, as opposed to mere "
-"policies. Especially with micropayments for online content, a disproportion- "
-"ate amount of rather private data about buyers would be revealed, if the "
-"payment system does not have privacy protections."
+"policies. Especially with micropayments for online publications, a "
+"disproportionate amount of rather private data about buyers would be "
+"revealed, if the payment system does not have privacy protections."
msgstr ""
#: template/principles.html.j2:68
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index feeeecd..a65604f 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/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-09-17 19:26+0000\n"
+"POT-Creation-Date: 2019-10-28 12:50+0000\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <address@hidden>\n"
@@ -39,9 +39,9 @@ msgstr ""
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:27 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36 template/developers.html.j2:66
+#: common/footer.j2.inc:27 template/bibliography.html.j2:23
+#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
+#: template/bibliography.html.j2:43 template/developers.html.j2:66
msgid "and"
msgstr ""
@@ -79,11 +79,11 @@ msgstr ""
#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:36
+#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
msgid "by"
msgstr ""
-#: template/bibliography.html.j2:37
+#: template/bibliography.html.j2:44
msgid "available upon request"
msgstr ""
@@ -1923,9 +1923,9 @@ msgstr ""
#: template/principles.html.j2:60
msgid ""
"Privacy should be guaranteed via technical measures, as opposed to mere "
-"policies. Especially with micropayments for online content, a disproportion- "
-"ate amount of rather private data about buyers would be revealed, if the "
-"payment system does not have privacy protections."
+"policies. Especially with micropayments for online publications, a "
+"disproportionate amount of rather private data about buyers would be "
+"revealed, if the payment system does not have privacy protections."
msgstr ""
#: template/principles.html.j2:68
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-www] branch master updated (001a3d2 -> bddc04c),
gnunet <=