[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch stable updated (ad2d592 -> 7e19fdc)
|
From: |
gnunet |
|
Subject: |
[taler-www] branch stable updated (ad2d592 -> 7e19fdc) |
|
Date: |
Tue, 10 Dec 2019 21:45:23 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch stable
in repository www.
discard ad2d592 try to fix build
discard 58c7a5e do ignore
add f249f9d locale regen
add beb9237 add taler-build-scripts
add 0e9e0f0 new tbs commit
add bddc04c rewrite build mechanism to use build-script.
add 54d8ca3 core
add 39faa52 BABEL -> pybabel
add 9f52039 Makefile: provide NetBSD make / bmake variant. GNUmake will
find "GNUmakefile" first.
add ab72a2d Makefile comment.
add 57d99f4 more quiet.
add e59072f for-loop for directories.
add 75a086d bump build-system
add f090b5b change url of build-common.
add 25bff32 fix .gitignore
add 67c7bc6 add missing file
add f114a91 add to ign
add 32abb68 bump submodules
add d870b94 configure should not be versioned, as it is created by
bootstrap
add 6bfcf18 generate relative URLs
add 7e19fdc wallet privacy policy draft
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ad2d592)
\
N -- N -- N refs/heads/stable (7e19fdc)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.gitignore | 5 +-
.gitmodules | 3 +
GNUmakefile | 100 ++++++++++++++++++++++++++++
Makefile | 117 ++++++++++++++++-----------------
build-system/taler-build-scripts | 1 +
common/navigation.j2.inc | 2 +-
configure | 53 ---------------
help | 2 +-
locale/de/LC_MESSAGES/messages.po | 26 ++++----
locale/en/LC_MESSAGES/messages.po | 20 +++---
locale/es/LC_MESSAGES/messages.po | 20 +++---
locale/fr/LC_MESSAGES/messages.po | 20 +++---
locale/it/LC_MESSAGES/messages.po | 20 +++---
locale/pt/LC_MESSAGES/messages.po | 20 +++---
locale/ru/LC_MESSAGES/messages.po | 24 +++----
template/wallet-privacy-policy.html.j2 | 25 +++++++
web-common | 2 +-
17 files changed, 265 insertions(+), 195 deletions(-)
create mode 100644 GNUmakefile
create mode 160000 build-system/taler-build-scripts
delete mode 100755 configure
create mode 100644 template/wallet-privacy-policy.html.j2
diff --git a/.gitignore b/.gitignore
index c557f94..ced8cef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+/configure
+
./*.html
common/*.inc
@@ -18,8 +20,7 @@ ru/
pt/
config.mk
-
__pycache__
*.pyc
-node_modules
+*.core
diff --git a/.gitmodules b/.gitmodules
index 0e2b9bd..d578e5d 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/build-common
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..c460217
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,100 @@
+# 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
+ for d in dist icons papers pdf presentations ; do $(cp) -R $$d
rendered/ ; done
+
+# Extract translateable strings from jinja2 templates.
+locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
+ $(env) PYTHONPATH="." $(pybabel) 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/Makefile b/Makefile
index 5b329e7..309d899 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,57 @@
+# 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.
+#
+# I keep and maintain this file for personal use, it is faster than
+# the gmake approach.
-# 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"
-include config.mk
+DESTDIR=$(prefix)
+
+_LOCALELIST= en de fr it es ru pt
+_DIRLIST= dist icons papers pdf presentations images
+
+.PHONY: all run locale-compile locale install clean
+
+.OBJDIR=rendered
+
+# Work this into an mk file
# All: build HTML pages in all languages and compile the
# TypeScript logic in web-common.
all: locale template
cd web-common && $(tsc)
- /bin/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/
+ $(sh) make_sitemap.sh
+.for _lang in ${_LOCALELIST}
+ $(cp) robots.txt rendered/${_lang}
+ $(cp) favicon.ico rendered/${_lang}
+ $(cp) rendered/sitemap.xml rendered/${_lang}
+.endfor
+.for _dir in ${_DIRLIST}
+ $(cp) -R ${_dir} rendered/
+.endfor
+ $(cp) styles.css rendered/
# Extract translateable strings from jinja2 templates.
locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
- env PYTHONPATH="." $(pybabel) extract -F locale/babel.map -o
locale/messages.pot .
+ $(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
- 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
+.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:
- $(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
+.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
@@ -58,35 +59,27 @@ 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
+
+run:
+.if defined(browser) && !empty(DESTDIR) && !empty(python)
+ $(browser) http://0.0.0.0:8000 &
+ $(python) -m http.server
+.endif
-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
- $(PYTHON) -m http.server
+install:
+ $(mkdir) -p $(prefix)/share/taler-www
+ $(cp) -R rendered/* $(prefix)/share/taler-www
-clean:
- rm -rf __pycache__ *.pyc *~ \.*~ \#*\#
- rm -rf en/ de/ fr/ it/ es/ ru/
- rm -rf rendered/
+uninstall:
+ $(rm) -rf $(prefix)/share/taler-www
submodules/init:
- git submodule update --init --recursive
+ $(git) submodule update --init --recursive
submodules/update:
- git submodule update --recursive --remote
-
-.SILENT: show-help
-
-show-help:
- 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"
+ $(git) submodule update --recursive --remote
+
+CLEANFILES+= *.pyc *~ \.*~ *.core
+
+.include <bsd.prog.mk>
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
new file mode 160000
index 0000000..d725a0c
--- /dev/null
+++ b/build-system/taler-build-scripts
@@ -0,0 +1 @@
+Subproject commit d725a0cd1b4aa3ff54452a702b8c19db3f3c3393
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index c8a645b..278a70c 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,6 +1,6 @@
{% macro navlink(site, text) -%}
<a class="nav-link {{ 'active' if filename == site else '' }}"
- href="/{{ lang }}/{{ site }}">
+ href="{{ site }}">
{{ text }}
</a>
{%- endmacro %}
diff --git a/configure b/configure
deleted file mode 100755
index 4ffb738..0000000
--- a/configure
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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/help b/help
index 1ca9f1b..183cb78 160000
--- a/help
+++ b/help
@@ -1 +1 @@
-Subproject commit 1ca9f1b35b286625b05672feea1c16a4de368ed5
+Subproject commit 183cb78c3aa2415b038f6030ca353c3d592301ac
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index bcadeee..54506c2 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ 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-12-01 21:29+0100\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"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.4.0\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"
@@ -245,9 +245,9 @@ msgstr ""
"Taler ist freie Software mit einem offenen Protokoll. Alle Programmierer "
"sind dazu eingeladen, unseren Referenzcode in ihre Anwendungen aufzunehmen. "
"Verschiedene Taler-Komponenten sind unter verschiedenen Lizenzformen "
-"verfügbar. Für die Taler-Wechselstube (den \"Exchange\") dient Affero GPLv3"
-"+, LGPLv3+ für den Referenzcode der Integration in Handelsplattformen, GPLv3"
-"+-Lizenzen gelten für Geldbörsen (\"Wallets\") und Kundeninteraktions-"
+"verfügbar. Für die Taler-Wechselstube (den \"Exchange\") dient Affero "
+"GPLv3+, LGPLv3+ für den Referenzcode der Integration in Handelsplattformen, "
+"GPLv3+-Lizenzen gelten für Geldbörsen (\"Wallets\") und Kundeninteraktions-"
"Software. Wir heißen alle konstruktiven Vorschläge willkommen, die Taler-"
"Komponenten in eigene Anwendungen zu integrieren."
@@ -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..d1f1086 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ 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-12-01 21:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <address@hidden>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\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..e20c1fe 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ 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-12-01 21:29+0100\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <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"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"Generated-By: Babel 2.3.4\n"
"X-Generator: Poedit 2.0.2\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..4746f68 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ 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-12-01 21:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <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"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\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..a4d1774 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ 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-12-01 21:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <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"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"Generated-By: Babel 2.3.4\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..eebdf7a 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,14 +6,14 @@ 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-12-01 21:29+0100\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 1.0.0-beta1\n"
"Generated-By: Babel 2.5.3\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..236a331 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,16 +7,16 @@ 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-12-01 21:29+0100\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <address@hidden>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"Generated-By: Babel 2.5.1\n"
#: common/base.j2:5
@@ -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
diff --git a/template/wallet-privacy-policy.html.j2
b/template/wallet-privacy-policy.html.j2
new file mode 100644
index 0000000..87f74c3
--- /dev/null
+++ b/template/wallet-privacy-policy.html.j2
@@ -0,0 +1,25 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+
+<div class="container">
+
+<h1>GNU Taler Android Wallet Privacy Policy</h1>
+
+<p>The GNU Taler Android Wallet allows its users to interact with third-party
+service providers (such as exchanges, banks and merchants) through the GNU
+Taler protocol. When using the GNU Taler Android Wallet to interact with such
+service providers, these interactions are subject to the Privacy Policy of the
+respective service provider.</p>
+
+
+<p>The GNU Taler Android Wallet does not automatically collect and send data
to
+the developers of the app or any third party.</p>
+
+<h2>Why are camera permissions required?</h2>
+
+<p>The camera permissions are required to scan QR codes. The images taken are
+processed locally on your devices and never sent to a third party.</p>
+
+</div>
+
+{% endblock body_content %}
diff --git a/web-common b/web-common
index caf5a98..0968eb3 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c
+Subproject commit 0968eb3d4023a8a0a37f7069f162eb786a6e04d2
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch stable updated (ad2d592 -> 7e19fdc),
gnunet <=