[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-merchant-demos] branch master updated: share menu and style
|
From: |
gnunet |
|
Subject: |
[taler-taler-merchant-demos] branch master updated: share menu and style sheets across demo pages (fixes #5704) |
|
Date: |
Mon, 12 Oct 2020 13:38:37 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository taler-merchant-demos.
The following commit(s) were added to refs/heads/master by this push:
new 46dd63a share menu and style sheets across demo pages (fixes #5704)
46dd63a is described below
commit 46dd63af682246c162423e37e0361e2d644c93e1
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Oct 12 13:38:35 2020 +0200
share menu and style sheets across demo pages (fixes #5704)
---
bin/taler-merchant-demos | 4 +-
setup.py | 4 +
talermerchantdemos/blog/templates/base.html.j2 | 72 +--
talermerchantdemos/blog/templates/footer.html.j2 | 1 +
.../blog/templates/language-switcher.html.j2 | 1 +
talermerchantdemos/blog/templates/menu.html.j2 | 1 +
.../donations/templates/base.html.j2 | 73 +--
.../donations/templates/footer.html.j2 | 1 +
.../donations/templates/language-switcher.html.j2 | 1 +
.../donations/templates/menu.html.j2 | 1 +
talermerchantdemos/landing/templates/base.html.j2 | 72 +--
.../landing/templates/footer.html.j2 | 1 +
talermerchantdemos/landing/templates/index.html.j2 | 2 +-
.../landing/templates/language-switcher.html.j2 | 1 +
talermerchantdemos/landing/templates/menu.html.j2 | 1 +
talermerchantdemos/survey/templates/base.html.j2 | 72 +--
talermerchantdemos/survey/templates/footer.html.j2 | 1 +
.../survey/templates/language-switcher.html.j2 | 1 +
talermerchantdemos/survey/templates/menu.html.j2 | 1 +
.../templates/language-switcher.html.j2 | 12 +
translations/de/LC_MESSAGES/messages.po | 571 +++++++++++++++------
translations/messages.pot | 357 +++++++------
22 files changed, 667 insertions(+), 584 deletions(-)
diff --git a/bin/taler-merchant-demos b/bin/taler-merchant-demos
index e7c3821..aa63c20 100755
--- a/bin/taler-merchant-demos
+++ b/bin/taler-merchant-demos
@@ -105,8 +105,8 @@ def handle_serve_from_config(config_obj, which_shop):
def demos(config, http_port, which_shop):
"""WHICH_SHOP is one of: blog, donations, survey or landing."""
- if which_shop not in ["blog", "donations", "survey"]:
- print("Please use a valid shop name: blog, donations, survey.")
+ if which_shop not in ["blog", "donations", "landing", "survey"]:
+ print("Please use a valid shop name: blog, donations, landing,
survey.")
sys.exit(1)
config_obj = TalerConfig.from_file(config)
if http_port:
diff --git a/setup.py b/setup.py
index 5e8db52..fdd48db 100755
--- a/setup.py
+++ b/setup.py
@@ -20,21 +20,25 @@ setup(name='talermerchantdemos',
"static/*.svg",
# Landing files
"landing/templates/*.j2",
+ "landing/static/*.css",
"landing/translations/*/LC_MESSAGES/*.mo",
# Blog files
"blog/templates/*.html",
"blog/templates/*.j2",
"blog/static/favicon.ico",
+ "blog/static/*.css",
"blog/articles/*/*",
"blog/translations/*/LC_MESSAGES/*.mo",
"blog/data/*",
# Donation files
"donations/templates/*.j2",
+ "donations/static/*.css",
"donations/translations/*/LC_MESSAGES/*.mo",
# Survey files
"survey/templates/*.j2",
"survey/static/favicon.ico",
"survey/static/*.js",
+ "survey/static/*.css",
"survey/translations/*/LC_MESSAGES/*.mo",
]
},
diff --git a/talermerchantdemos/blog/templates/base.html.j2
b/talermerchantdemos/blog/templates/base.html.j2
index 65f8461..c4935f1 100644
--- a/talermerchantdemos/blog/templates/base.html.j2
+++ b/talermerchantdemos/blog/templates/base.html.j2
@@ -24,45 +24,7 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='pure.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='demo.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='navbar.css') }}" />
- <style>
- .warn {
- background-color: #aa393977;
- padding: 1em;
- }
- @keyframes hoveranim {
- from {left:0;}
- to {left:1vw;}
- }
- @keyframes hoveranimrevert {
- from {left:1vw;}
- to {left:0;}
- }
- .notice {
- border-radius: 1em;
- background: #0333;
- border-left: 0.3em solid #033;
- padding-left: 1em;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- margin-top: 2em;
- margin-bottom: 2em;
- }
- .notice {
- position: relative;
- left: 0;
- animation-name: hoveranimrevert;
- animation-duration: 1s;
- }
- .notice:hover {
- left: 1vw;
- animation-name: hoveranim;
- animation-duration: 1s;
- }
- #main a:link, #main a:visited, #main a:hover, #main a:active {
- color: black;
- }
- </style>
-
+ <link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='torsten.css') }}" />
{% block styles %}{% endblock %}
{% block scripts %}{% endblock %}
</head>
@@ -78,41 +40,13 @@
}}
</p>
</header>
- <div style="display:flex; flex-direction: column;" class="navcontainer">
- <nav class="demolist">
- <a href="{{ env('TALER_ENV_URL_INTRO', '#')
}}">{{gettext("Introduction")}}</a>
- <a href="{{ env('TALER_ENV_URL_BANK', '#') }}">{{gettext("Bank")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">{{gettext("Essay
Shop")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#')
}}">{{gettext("Donations")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}"
class="active">{{gettext("Tipping/Survey")}}</a>
- <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#')
}}">{{gettext("Back-office")}}</a -->
- <span class="right">
- {{ gettext("English [en]") }}
- <!-- <input type="checkbox"> -->
- <div class="nav">
- <br>
- <!--<hr style="width: 100%;">-->
- {% if lang != 'en' %}
- <a href="{{ self_localized('en') }}" class="navbtn">English
[en]</a><br>
- {% endif %}
- {% if lang != 'de' %}
- <a href="{{ self_localized('de') }}" class="navbtn">Deutsch
[de]</a><br>
- {% endif %}
- </div>
- </span>
- </nav>
- </div>
+ {% from 'templates/menu.html.j2' import menu with context %} {{ menu('blog')
}}
<section id="main" class="content">
{% block main %}
This is the main content of the page.
{% endblock %}
- <hr />
- <div>
- <p>{{ gettext('You can learn more about GNU Taler on our main <a
href="{site}">website</a>.').format(site="https://taler.net/";) }}</p>
- <div style="flex-grow:1"></div>
- <p>Copyright © 2014—2020 Taler Systems SA</p>
- </div>
+ {% include 'templates/footer.html.j2' %}
</section>
</body>
</html>
diff --git a/talermerchantdemos/blog/templates/footer.html.j2
b/talermerchantdemos/blog/templates/footer.html.j2
new file mode 120000
index 0000000..028b093
--- /dev/null
+++ b/talermerchantdemos/blog/templates/footer.html.j2
@@ -0,0 +1 @@
+../../templates/footer.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/blog/templates/language-switcher.html.j2
b/talermerchantdemos/blog/templates/language-switcher.html.j2
new file mode 120000
index 0000000..6423c5c
--- /dev/null
+++ b/talermerchantdemos/blog/templates/language-switcher.html.j2
@@ -0,0 +1 @@
+../../templates/language-switcher.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/blog/templates/menu.html.j2
b/talermerchantdemos/blog/templates/menu.html.j2
new file mode 120000
index 0000000..b9575ea
--- /dev/null
+++ b/talermerchantdemos/blog/templates/menu.html.j2
@@ -0,0 +1 @@
+../../templates/menu.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/donations/templates/base.html.j2
b/talermerchantdemos/donations/templates/base.html.j2
index f3b1359..307705f 100644
--- a/talermerchantdemos/donations/templates/base.html.j2
+++ b/talermerchantdemos/donations/templates/base.html.j2
@@ -21,45 +21,7 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='pure.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='demo.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='navbar.css') }}" />
- <style>
- .warn {
- background-color: #aa393977;
- padding: 1em;
- }
- @keyframes hoveranim {
- from {left:0;}
- to {left:1vw;}
- }
- @keyframes hoveranimrevert {
- from {left:1vw;}
- to {left:0;}
- }
- .notice {
- border-radius: 1em;
- background: #0333;
- border-left: 0.3em solid #033;
- padding-left: 1em;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- margin-top: 2em;
- margin-bottom: 2em;
- }
- .notice {
- position: relative;
- left: 0;
- animation-name: hoveranimrevert;
- animation-duration: 1s;
- }
- .notice:hover {
- left: 1vw;
- animation-name: hoveranim;
- animation-duration: 1s;
- }
- #main a:link, #main a:visited, #main a:hover, #main a:active {
- color: black;
- }
- </style>
-
+ <link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='torsten.css') }}" />
{% block styles %}{% endblock %}
{% block scripts %}{% endblock %}
</head>
@@ -74,42 +36,13 @@
}}
</p>
</header>
-
- <div style="display:flex; flex-direction: column;" class="navcontainer">
- <nav class="demolist">
- <a href="{{ env('TALER_ENV_URL_INTRO', '#')
}}">{{gettext("Introduction")}}</a>
- <a href="{{ env('TALER_ENV_URL_BANK', '#') }}">{{gettext("Bank")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">{{gettext("Essay
Shop")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') }}"
class="active>">{{gettext("Donations")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#')
}}">{{gettext("Tipping/Survey")}}</a>
- <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#')
}}">{{gettext("Back-office")}}</a -->
- <span class="right">
- {{ gettext("English [en]") }}
- <!-- <input type="checkbox"> -->
- <div class="nav">
- <br>
- <!--<hr style="width: 100%;">-->
- {% if lang != 'en' %}
- <a href="/en/" class="navbtn">English [en]</a><br>
- {% endif %}
- {% if lang != 'de' %}
- <a href="/de/" class="navbtn">Deutsch [de]</a><br>
- {% endif %}
- </div>
- </span>
- </nav>
- </div>
+ {% from 'templates/menu.html.j2' import menu with context %} {{
menu('donations') }}
<section id="main" class="content">
{% block main %}
This is the main content of the page.
{% endblock %}
- <hr />
- <div>
- <p>{{ gettext('You can learn more about GNU Taler on our main <a
href="{site}">website</a>.').format(site="https://taler.net/";) }}</p>
- <div style="flex-grow:1"></div>
- <p>Copyright © 2014—2020 Taler Systems SA</p>
- </div>
+ {% include 'templates/footer.html.j2' %}
</section>
</body>
</html>
diff --git a/talermerchantdemos/donations/templates/footer.html.j2
b/talermerchantdemos/donations/templates/footer.html.j2
new file mode 120000
index 0000000..028b093
--- /dev/null
+++ b/talermerchantdemos/donations/templates/footer.html.j2
@@ -0,0 +1 @@
+../../templates/footer.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/donations/templates/language-switcher.html.j2
b/talermerchantdemos/donations/templates/language-switcher.html.j2
new file mode 120000
index 0000000..6423c5c
--- /dev/null
+++ b/talermerchantdemos/donations/templates/language-switcher.html.j2
@@ -0,0 +1 @@
+../../templates/language-switcher.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/donations/templates/menu.html.j2
b/talermerchantdemos/donations/templates/menu.html.j2
new file mode 120000
index 0000000..b9575ea
--- /dev/null
+++ b/talermerchantdemos/donations/templates/menu.html.j2
@@ -0,0 +1 @@
+../../templates/menu.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/landing/templates/base.html.j2
b/talermerchantdemos/landing/templates/base.html.j2
index c88ee90..2114347 100644
--- a/talermerchantdemos/landing/templates/base.html.j2
+++ b/talermerchantdemos/landing/templates/base.html.j2
@@ -21,45 +21,7 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='pure.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='demo.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='navbar.css') }}" />
- <style>
- .warn {
- background-color: #aa393977;
- padding: 1em;
- }
- @keyframes hoveranim {
- from {left:0;}
- to {left:1vw;}
- }
- @keyframes hoveranimrevert {
- from {left:1vw;}
- to {left:0;}
- }
- .notice {
- border-radius: 1em;
- background: #0333;
- border-left: 0.3em solid #033;
- padding-left: 1em;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- margin-top: 2em;
- margin-bottom: 2em;
- }
- .notice {
- position: relative;
- left: 0;
- animation-name: hoveranimrevert;
- animation-duration: 1s;
- }
- .notice:hover {
- left: 1vw;
- animation-name: hoveranim;
- animation-duration: 1s;
- }
- #main a:link, #main a:visited, #main a:hover, #main a:active {
- color: black;
- }
- </style>
-
+ <link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='torsten.css') }}" />
{% block styles %}{% endblock %}
{% block scripts %}{% endblock %}
</head>
@@ -74,41 +36,13 @@
}}
</p>
</header>
- <div style="display:flex; flex-direction: column;" class="navcontainer">
- <nav class="demolist">
- <a href="{{ env('TALER_ENV_URL_INTRO', '#') }}"
class="active">{{gettext("Introduction")}}</a>
- <a href="{{ env('TALER_ENV_URL_BANK', '#') }}">{{gettext("Bank")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">{{gettext("Essay
Shop")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#')
}}">{{gettext("Donations")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#')
}}">{{gettext("Tipping/Survey")}}</a>
- <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#')
}}">{{gettext("Back-office")}}</a -->
- <span class="right">
- {{ gettext("English [en]") }}
- <!-- <input type="checkbox"> -->
- <div class="nav">
- <br>
- <!--<hr style="width: 100%;">-->
- {% if lang != 'en' %}
- <a href="/en/" class="navbtn">English [en]</a><br>
- {% endif %}
- {% if lang != 'de' %}
- <a href="/de/" class="navbtn">Deutsch [de]</a><br>
- {% endif %}
- </div>
- </span>
- </nav>
- </div>
+ {% from 'templates/menu.html.j2' import menu with context %} {{
menu('landing') }}
<section id="main" class="content">
{% block main %}
This is the main content of the page.
{% endblock %}
- <hr />
- <div>
- <p>{{ gettext('You can learn more about GNU Taler on our main <a
href="{site}">website</a>.').format(site="https://taler.net/";) }}</p>
- <div style="flex-grow:1"></div>
- <p>Copyright © 2014—2020 Taler Systems SA</p>
- </div>
+ {% include 'templates/footer.html.j2' %}
</section>
</body>
</html>
diff --git a/talermerchantdemos/landing/templates/footer.html.j2
b/talermerchantdemos/landing/templates/footer.html.j2
new file mode 120000
index 0000000..028b093
--- /dev/null
+++ b/talermerchantdemos/landing/templates/footer.html.j2
@@ -0,0 +1 @@
+../../templates/footer.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/landing/templates/index.html.j2
b/talermerchantdemos/landing/templates/index.html.j2
index 399dd25..f005279 100644
--- a/talermerchantdemos/landing/templates/index.html.j2
+++ b/talermerchantdemos/landing/templates/index.html.j2
@@ -66,7 +66,7 @@
<p>
{{
gettext("Websites can give tips to visitors for completing tasks.")
+ "<br>" +
- gettext("You can earn some {currency} coins by filling in our <a
href="{url}">survey</a>.").format(url=merchant_survey_url,currency=merchant_currency)
+ gettext('You can earn some {currency} coins by filling in our <a
href="{url}">survey</a>.').format(url=merchant_survey_url,currency=merchant_currency)
}}
</p>
</article>
diff --git a/talermerchantdemos/landing/templates/language-switcher.html.j2
b/talermerchantdemos/landing/templates/language-switcher.html.j2
new file mode 120000
index 0000000..6423c5c
--- /dev/null
+++ b/talermerchantdemos/landing/templates/language-switcher.html.j2
@@ -0,0 +1 @@
+../../templates/language-switcher.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/landing/templates/menu.html.j2
b/talermerchantdemos/landing/templates/menu.html.j2
new file mode 120000
index 0000000..b9575ea
--- /dev/null
+++ b/talermerchantdemos/landing/templates/menu.html.j2
@@ -0,0 +1 @@
+../../templates/menu.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/survey/templates/base.html.j2
b/talermerchantdemos/survey/templates/base.html.j2
index 2b424f1..734da6f 100644
--- a/talermerchantdemos/survey/templates/base.html.j2
+++ b/talermerchantdemos/survey/templates/base.html.j2
@@ -21,45 +21,7 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='pure.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='demo.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='navbar.css') }}" />
- <style>
- .warn {
- background-color: #aa393977;
- padding: 1em;
- }
- @keyframes hoveranim {
- from {left:0;}
- to {left:1vw;}
- }
- @keyframes hoveranimrevert {
- from {left:1vw;}
- to {left:0;}
- }
- .notice {
- border-radius: 1em;
- background: #0333;
- border-left: 0.3em solid #033;
- padding-left: 1em;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- margin-top: 2em;
- margin-bottom: 2em;
- }
- .notice {
- position: relative;
- left: 0;
- animation-name: hoveranimrevert;
- animation-duration: 1s;
- }
- .notice:hover {
- left: 1vw;
- animation-name: hoveranim;
- animation-duration: 1s;
- }
- #main a:link, #main a:visited, #main a:hover, #main a:active {
- color: black;
- }
- </style>
-
+ <link rel="stylesheet" type="text/css" href="{{ url_for('static',
filename='torsten.css') }}" />
{% block styles %}{% endblock %}
{% block scripts %}{% endblock %}
</head>
@@ -74,41 +36,13 @@
}}
</p>
</header>
- <div style="display:flex; flex-direction: column;" class="navcontainer">
- <nav class="demolist">
- <a href="{{ env('TALER_ENV_URL_INTRO', '#')
}}">{{gettext("Introduction")}}</a>
- <a href="{{ env('TALER_ENV_URL_BANK', '#') }}">{{gettext("Bank")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}"
class="active">{{gettext("Essay Shop")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#')
}}">{{gettext("Donations")}}</a>
- <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#')
}}">{{gettext("Tipping/Survey")}}</a>
- <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#')
}}">{{gettext("Back-office")}}</a -->
- <span class="right">
- {{ gettext("English [en]") }}
- <!-- <input type="checkbox"> -->
- <div class="nav">
- <br>
- <!--<hr style="width: 100%;">-->
- {% if lang != 'en' %}
- <a href="/en/" class="navbtn">English [en]</a><br>
- {% endif %}
- {% if lang != 'de' %}
- <a href="/de/" class="navbtn">Deutsch [de]</a><br>
- {% endif %}
- </div>
- </span>
- </nav>
- </div>
+ {% from 'templates/menu.html.j2' import menu with context %} {{
menu('survey') }}
<section id="main" class="content">
{% block main %}
This is the main content of the page.
{% endblock %}
- <hr />
- <div>
- <p>{{ gettext('You can learn more about GNU Taler on our main <a
href="{site}">website</a>.').format(site="https://taler.net/";) }}</p>
- <div style="flex-grow:1"></div>
- <p>Copyright © 2014—2020 Taler Systems SA</p>
- </div>
+ {% include 'templates/footer.html.j2' %}
</section>
</body>
</html>
diff --git a/talermerchantdemos/survey/templates/footer.html.j2
b/talermerchantdemos/survey/templates/footer.html.j2
new file mode 120000
index 0000000..028b093
--- /dev/null
+++ b/talermerchantdemos/survey/templates/footer.html.j2
@@ -0,0 +1 @@
+../../templates/footer.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/survey/templates/language-switcher.html.j2
b/talermerchantdemos/survey/templates/language-switcher.html.j2
new file mode 120000
index 0000000..6423c5c
--- /dev/null
+++ b/talermerchantdemos/survey/templates/language-switcher.html.j2
@@ -0,0 +1 @@
+../../templates/language-switcher.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/survey/templates/menu.html.j2
b/talermerchantdemos/survey/templates/menu.html.j2
new file mode 120000
index 0000000..b9575ea
--- /dev/null
+++ b/talermerchantdemos/survey/templates/menu.html.j2
@@ -0,0 +1 @@
+../../templates/menu.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/templates/language-switcher.html.j2
b/talermerchantdemos/templates/language-switcher.html.j2
new file mode 100644
index 0000000..22eef42
--- /dev/null
+++ b/talermerchantdemos/templates/language-switcher.html.j2
@@ -0,0 +1,12 @@
+ <span class="right">
+ {{ gettext("English [en]") }}
+ <div class="nav">
+ <br>
+ {% if lang != 'en' %}
+ <a href="/en/" class="navbtn">English [en]</a><br>
+ {% endif %}
+ {% if lang != 'de' %}
+ <a href="/de/" class="navbtn">Deutsch [de]</a><br>
+ {% endif %}
+ </div>
+</span>
diff --git a/translations/de/LC_MESSAGES/messages.po
b/translations/de/LC_MESSAGES/messages.po
index 6b9bff2..69ecd63 100644
--- a/translations/de/LC_MESSAGES/messages.po
+++ b/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: taler-merchant-demos\n"
"Report-Msgid-Bugs-To: taler@gnu.org\n"
-"POT-Creation-Date: 2020-10-11 17:28+0200\n"
+"POT-Creation-Date: 2020-10-12 13:36+0200\n"
"PO-Revision-Date: 2020-10-09 21:25+0200\n"
"Last-Translator: Christian Grothoff <cg@taler.net>\n"
"Language: de\n"
@@ -65,104 +65,45 @@ msgid "Page not found"
msgstr ""
#: talermerchantdemos/blog/templates/article_frame.html.j2:9
-msgid "You did not like this article?"
+msgid "Taler allows merchants to offer refunds to customers."
msgstr ""
#: talermerchantdemos/blog/templates/article_frame.html.j2:10
msgid ""
"You can <a href=\"{url}\">request a refund</a> within the first hour "
-"after buying it."
+"after buying this article."
msgstr ""
#: talermerchantdemos/blog/templates/base.html.j2:23
-msgid "Taler Essay Shop Demo"
+msgid "GNU Taler Demo: Essay Shop"
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:72
-#: talermerchantdemos/donations/templates/base.html.j2:69
-#: talermerchantdemos/landing/templates/base.html.j2:20
-#: talermerchantdemos/landing/templates/base.html.j2:69
-#: talermerchantdemos/survey/templates/base.html.j2:69
+#: talermerchantdemos/blog/templates/base.html.j2:34
+#: talermerchantdemos/donations/templates/base.html.j2:31
+#: talermerchantdemos/landing/templates/base.html.j2:31
msgid "Taler Demo"
msgstr "Taler Demonstrator"
-#: talermerchantdemos/blog/templates/base.html.j2:73
-msgid "Shop"
-msgstr "Laden"
+#: talermerchantdemos/blog/templates/base.html.j2:35
+msgid "Essay shop"
+msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:75
+#: talermerchantdemos/blog/templates/base.html.j2:37
msgid "On this page you can buy articles using an imaginary currency."
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:76
+#: talermerchantdemos/blog/templates/base.html.j2:38
msgid ""
"The articles are chapters from Richard Stallman's book "Free "
"Software, Free Society"."
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:77
+#: talermerchantdemos/blog/templates/base.html.j2:39
msgid ""
"The book is <a href=\"{shop}\">published by the FSF</a> and available "
"gratis at <a href=\"{gnu}\">gnu.org</a>."
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:83
-#: talermerchantdemos/donations/templates/base.html.j2:80
-#: talermerchantdemos/landing/templates/base.html.j2:79
-#: talermerchantdemos/survey/templates/base.html.j2:80
-msgid "Introduction"
-msgstr "Einführung"
-
-#: talermerchantdemos/blog/templates/base.html.j2:84
-#: talermerchantdemos/donations/templates/base.html.j2:81
-#: talermerchantdemos/landing/templates/base.html.j2:80
-#: talermerchantdemos/survey/templates/base.html.j2:81
-msgid "Bank"
-msgstr "Bank"
-
-#: talermerchantdemos/blog/templates/base.html.j2:85
-#: talermerchantdemos/donations/templates/base.html.j2:82
-#: talermerchantdemos/landing/templates/base.html.j2:81
-#: talermerchantdemos/survey/templates/base.html.j2:82
-msgid "Essay Shop"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:86
-#: talermerchantdemos/donations/templates/base.html.j2:70
-#: talermerchantdemos/donations/templates/base.html.j2:83
-#: talermerchantdemos/landing/templates/base.html.j2:82
-#: talermerchantdemos/survey/templates/base.html.j2:83
-msgid "Donations"
-msgstr "Spenden"
-
-#: talermerchantdemos/blog/templates/base.html.j2:87
-#: talermerchantdemos/donations/templates/base.html.j2:84
-#: talermerchantdemos/landing/templates/base.html.j2:83
-#: talermerchantdemos/survey/templates/base.html.j2:84
-msgid "Tipping/Survey"
-msgstr "Umfrage"
-
-#: talermerchantdemos/blog/templates/base.html.j2:88
-#: talermerchantdemos/donations/templates/base.html.j2:85
-#: talermerchantdemos/landing/templates/base.html.j2:84
-#: talermerchantdemos/survey/templates/base.html.j2:85
-msgid "Back-office"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:90
-#: talermerchantdemos/donations/templates/base.html.j2:87
-#: talermerchantdemos/landing/templates/base.html.j2:86
-#: talermerchantdemos/survey/templates/base.html.j2:87
-msgid "English [en]"
-msgstr "Deutsch [de]"
-
-#: talermerchantdemos/blog/templates/base.html.j2:112
-#: talermerchantdemos/donations/templates/base.html.j2:109
-#: talermerchantdemos/landing/templates/base.html.j2:108
-#: talermerchantdemos/survey/templates/base.html.j2:109
-msgid "You can learn more about Taler on our main <a
href=\"{site}\">website</a>."
-msgstr ""
-
#: talermerchantdemos/blog/templates/error.html.j2:3
#: talermerchantdemos/donations/templates/error.html.j2:3
#: talermerchantdemos/landing/templates/error.html.j2:3
@@ -189,6 +130,16 @@ msgstr ""
msgid "Stack trace:"
msgstr ""
+#: talermerchantdemos/blog/templates/footer.html.j2:5
+#: talermerchantdemos/donations/templates/footer.html.j2:5
+#: talermerchantdemos/landing/templates/footer.html.j2:5
+#: talermerchantdemos/survey/templates/footer.html.j2:5
+#: talermerchantdemos/templates/footer.html.j2:5
+msgid ""
+"You can learn more about GNU Taler on our main <a "
+"href=\"{site}\">website</a>."
+msgstr ""
+
#: talermerchantdemos/blog/templates/index.html.j2:3
msgid "Essay Shop: Free Software, Free Society"
msgstr ""
@@ -231,22 +182,80 @@ msgstr "Bezahlen um weiterzulesen..."
msgid "No articles available in this language."
msgstr "Keine Artikel in dieser Sprache verfügbar."
+#: talermerchantdemos/blog/templates/language-switcher.html.j2:2
+#: talermerchantdemos/donations/templates/language-switcher.html.j2:2
+#: talermerchantdemos/landing/templates/language-switcher.html.j2:2
+#: talermerchantdemos/survey/templates/language-switcher.html.j2:2
+#: talermerchantdemos/templates/language-switcher.html.j2:2
+msgid "English [en]"
+msgstr "Deutsch [de]"
+
+#: talermerchantdemos/blog/templates/menu.html.j2:6
+#: talermerchantdemos/donations/templates/menu.html.j2:6
+#: talermerchantdemos/landing/templates/base.html.j2:32
+#: talermerchantdemos/landing/templates/menu.html.j2:6
+#: talermerchantdemos/survey/templates/menu.html.j2:6
+#: talermerchantdemos/templates/menu.html.j2:6
+msgid "Introduction"
+msgstr "Einführung"
+
+#: talermerchantdemos/blog/templates/menu.html.j2:9
+#: talermerchantdemos/donations/templates/menu.html.j2:9
+#: talermerchantdemos/landing/templates/menu.html.j2:9
+#: talermerchantdemos/survey/templates/menu.html.j2:9
+#: talermerchantdemos/templates/menu.html.j2:9
+msgid "Bank"
+msgstr "Bank"
+
+#: talermerchantdemos/blog/templates/menu.html.j2:12
+#: talermerchantdemos/donations/templates/menu.html.j2:12
+#: talermerchantdemos/landing/templates/menu.html.j2:12
+#: talermerchantdemos/survey/templates/menu.html.j2:12
+#: talermerchantdemos/templates/menu.html.j2:12
+msgid "Essay Shop"
+msgstr ""
+
+#: talermerchantdemos/blog/templates/menu.html.j2:15
+#: talermerchantdemos/donations/templates/base.html.j2:32
+#: talermerchantdemos/donations/templates/menu.html.j2:15
+#: talermerchantdemos/landing/templates/menu.html.j2:15
+#: talermerchantdemos/survey/templates/menu.html.j2:15
+#: talermerchantdemos/templates/menu.html.j2:15
+msgid "Donations"
+msgstr "Spenden"
+
+#: talermerchantdemos/blog/templates/menu.html.j2:18
+#: talermerchantdemos/donations/templates/menu.html.j2:18
+#: talermerchantdemos/landing/templates/menu.html.j2:18
+#: talermerchantdemos/survey/templates/menu.html.j2:18
+#: talermerchantdemos/templates/menu.html.j2:18
+msgid "Tipping/Survey"
+msgstr "Umfrage"
+
+#: talermerchantdemos/blog/templates/menu.html.j2:21
+#: talermerchantdemos/donations/templates/menu.html.j2:21
+#: talermerchantdemos/landing/templates/menu.html.j2:21
+#: talermerchantdemos/survey/templates/menu.html.j2:21
+#: talermerchantdemos/templates/menu.html.j2:21
+msgid "Back-office"
+msgstr ""
+
#: talermerchantdemos/donations/donations.py:143
msgid "parameter '{}' required"
msgstr ""
#: talermerchantdemos/donations/templates/base.html.j2:20
-msgid "Taler Donation Demo"
+msgid "GNU Taler Demo: Donations"
msgstr ""
-#: talermerchantdemos/donations/templates/base.html.j2:72
+#: talermerchantdemos/donations/templates/base.html.j2:34
msgid "This is the donation page."
msgstr ""
-#: talermerchantdemos/donations/templates/base.html.j2:73
+#: talermerchantdemos/donations/templates/base.html.j2:35
msgid ""
-"Using this page you can make donations (in an imaginary currency) to Free"
-" Software projects."
+"Using this page you can make donations in {currency} to Free Software "
+"projects."
msgstr ""
#: talermerchantdemos/donations/templates/checkout.html.j2:5
@@ -254,24 +263,40 @@ msgid "Select your payment method"
msgstr ""
#: talermerchantdemos/donations/templates/checkout.html.j2:9
+msgid "This is an example for a \"checkout\" page of a Web shop."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:10
+msgid ""
+"On the previous page, you have created the shopping cart and decided "
+"which product to buy (i.e. which project to donate KUDOS to)."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:11
msgid ""
-"This is an example for a \"checkout\" page of a Web shop. On the previous"
-" page, you have created the shopping cart and decided which product to "
-"buy (i.e. which project to donate KUDOS to). Now in this page, you are "
-"asked to select a payment option. As Taler is not yet universally used, "
-"we expect merchants will offer various payment options."
+"As Taler is not yet universally used, we expect merchants will offer "
+"various payment options."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:12
+msgid "To continue with the demo, select the "Taler" payment option."
msgstr ""
-#: talermerchantdemos/donations/templates/checkout.html.j2:14
+#: talermerchantdemos/donations/templates/checkout.html.j2:17
msgid ""
-"Note that you MUST select Taler here for the demo to continue, as the "
+"Note that you must select Taler here for the demo to continue, as the "
"other payment options are just placeholders and not really working in the"
-" demonstration. Also, it is of course possible to ask the user to make "
-"this choice already on the previous page (with the shopping cart), we "
-"just separated the two steps to keep each step as simple as possible."
+" demonstration."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:18
+msgid ""
+"It would be possible to ask the user to make this choice already on the "
+"previous page (with the shopping cart); we just separated the two steps "
+"to keep each step as simple as possible."
msgstr ""
-#: talermerchantdemos/donations/templates/checkout.html.j2:40
+#: talermerchantdemos/donations/templates/checkout.html.j2:44
msgid "Confirm selection"
msgstr ""
@@ -302,11 +327,13 @@ msgid "You can always make <a href=\"{link}\">another
donation</a>."
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:4
-msgid "Taler donation demonstrator"
+msgid "Donate to Free Software projects"
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:8
-msgid "This donations website shows the user experience for donations with
Taler."
+msgid ""
+"This donations website shows the user experience for donations with GNU "
+"Taler."
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:9
@@ -316,7 +343,7 @@ msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:16
msgid ""
"Please select a project, the amount (*) of {currency} you wish to donate,"
-" and enter the name that will appear on your receipt:"
+" and enter the donor's name that will appear on your receipt:"
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:33
@@ -329,12 +356,24 @@ msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:39
msgid ""
-"(*) To make it a bit more fun, the 5 {currency} option is deliberately "
-"implemented with a fault: the merchant will try to make you donate 6 "
-"{currency} instead of the 5 {currency} shown in the form. But do not "
-"worry, you will be given the opportunity to review the final offer from "
-"the merchant in a window secured by the Taler extension. That way, you "
-"can spot the error before committing to an incorrect contract or amount."
+"(*) To make the demo a bit more interesting, the 5 {currency} option is "
+"deliberately implemented with a fault: the merchant will try to make you "
+"donate 6 {currency} instead of the 5 {currency} shown in the form. But "
+"do not worry, you will be given the opportunity to review the final offer"
+" from the merchant in the Taler wallet. That way, Taler protects you "
+"from committing to erroneous payments."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/provider-not-supported.html.j2:4
+msgid "Payment Provider Not Supported"
+msgstr ""
+
+#: talermerchantdemos/donations/templates/provider-not-supported.html.j2:7
+msgid "Unfortunately the selected payment provider is not supported in this
demo."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/provider-not-supported.html.j2:8
+msgid "Please go back and select "Taler"."
msgstr ""
#: talermerchantdemos/httpcommon/__init__.py:35
@@ -357,142 +396,158 @@ msgstr ""
msgid "HTTP method not allowed for this page"
msgstr ""
-#: talermerchantdemos/landing/templates/base.html.j2:70
-#: talermerchantdemos/survey/templates/base.html.j2:70
-msgid "Survey"
-msgstr "Umfrage"
+#: talermerchantdemos/landing/templates/base.html.j2:20
+msgid "GNU Taler Demo: Introduction"
+msgstr ""
-#: talermerchantdemos/landing/templates/base.html.j2:72
-msgid "This is the Taler demo."
+#: talermerchantdemos/landing/templates/base.html.j2:34
+msgid "This is the GNU Taler demo."
msgstr ""
-#: talermerchantdemos/landing/templates/base.html.j2:73
-msgid "Here you can try out the Taler payment system using a toy currency."
+#: talermerchantdemos/landing/templates/base.html.j2:35
+msgid "Here you can try out the GNU Taler payment system using a toy currency."
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:4
msgid "Step 1: Install the Taler wallet"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:6
+#: talermerchantdemos/landing/templates/index.html.j2:7
msgid "Install the wallet from the <a href=\"{link}\">installation page</a>."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:7
+#: talermerchantdemos/landing/templates/index.html.j2:8
msgid "Installation only takes one click."
msgstr ""
+#: talermerchantdemos/landing/templates/index.html.j2:12
+msgid ""
+"After installation, you may be asked to grant the brower-based Taler "
+"wallet additional optional permissions that allow it to improve your user"
+" experience."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:13
+msgid ""
+"These permissions will allow the wallet to automatically open if a page "
+"asks for a Taler payment."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:14
+msgid ""
+"Regardless of the permissions you grant, the wallet will never transmit "
+"information about you or your browsing history to anyone."
+msgstr ""
+
#: talermerchantdemos/landing/templates/index.html.j2:19
msgid "Step 2: Withdraw coins"
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:22
-msgid ""
-"Next you can withdraw coins into your wallet by going to our <a "
-"href=\"{bank}\">bank</a>."
+msgid "In this demo you are paying with {currency}, an imaginary currency."
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:23
-msgid "In this demo you are paying with {currency}, an imaginary currency."
+msgid ""
+"To withdraw {currency} coins you must first create an account at our <a "
+"href=\"{bank}\">bank</a>."
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:24
+msgid "Signing up only requires you to pick a username and password."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:25
+msgid ""
+"When you create an account at our bank, you will be credited 100 "
+"{currency} for signing up."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:26
msgid ""
-"When you create an account at our bank, you will receive 100 {currency} "
-"for free."
+"Afterwards, use the bank's Web interface to authorize the transfer of "
+"{currency} to your wallet."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:28
+#: talermerchantdemos/landing/templates/index.html.j2:30
msgid ""
"Once you have completed this step, you can click on the Taler icon in "
"your browser to check your balance."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:33
+#: talermerchantdemos/landing/templates/index.html.j2:35
msgid "Step 3: Pay"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:35
+#: talermerchantdemos/landing/templates/index.html.j2:38
msgid "We have two demo merchants where you can spend your coins:"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:40
+#: talermerchantdemos/landing/templates/index.html.j2:44
msgid ""
"At the <a href=\"{blog}\">essay store</a> you can pay in {currency} for "
"individual chapters of Richard Stallman's book "Free Software, "
"Free Society"."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:41
+#: talermerchantdemos/landing/templates/index.html.j2:45
msgid "The book is also available for free at <a href=\"{fsf}\">the FSF</a>."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:46
+#: talermerchantdemos/landing/templates/index.html.j2:50
msgid ""
-"At the <a href=\"{donations}\">project donation website</a> you can show "
+"At the project <a href=\"{donations}\">donation website</a> you can show "
"respect to a software project of your choice by donating {currency} to "
"them."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:52
+#: talermerchantdemos/landing/templates/index.html.j2:56
msgid "Step 4: Check money flow"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:56
+#: talermerchantdemos/landing/templates/index.html.j2:59
msgid ""
-"To check if people who received your Taler payment got eventually paid by"
-" the exchange via a wire transfer visit the <a href=\"{bank}/public-"
-"accounts\">public accounts page</a> at the bank."
+"You can see the wire transfers from the escrow account of the exchange to"
+" the merchants on the <a href=\"{bank}/public-accounts\">public accounts "
+"page</a> of the bank."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:57
+#: talermerchantdemos/landing/templates/index.html.j2:60
msgid ""
-"Note that only accounts set to be publicly viewable are shown on that "
-"page."
+"Note that only accounts configured to be publicly viewable are shown on "
+"that page."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:63
+#: talermerchantdemos/landing/templates/index.html.j2:65
msgid "Step 5: Survey"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:67
+#: talermerchantdemos/landing/templates/index.html.j2:68
msgid "Websites can give tips to visitors for completing tasks."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:68
-msgid "Go earn some coins by filling in our <a href=\"{url}\">survey</a>."
+#: talermerchantdemos/landing/templates/index.html.j2:69
+msgid ""
+"You can earn some {currency} coins by filling in our <a "
+"href=\"{url}\">survey</a>."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:83
+#: talermerchantdemos/landing/templates/index.html.j2:81
msgid "Step 6: Reach out to us"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:85
-msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
-msgstr ""
-
-#: talermerchantdemos/survey/templates/base.html.j2:20
-msgid "Taler Survey Demo"
-msgstr ""
-
-#: talermerchantdemos/survey/templates/base.html.j2:72
-msgid "This is the Taler survey demonstration."
+#: talermerchantdemos/landing/templates/index.html.j2:84
+msgid "We appreciate feedback about Taler and this demonstrator."
msgstr ""
-#: talermerchantdemos/survey/templates/base.html.j2:73
-msgid "It demonatrates how merchants can reward their users by granting tips."
-msgstr ""
-
-#: talermerchantdemos/survey/templates/base.html.j2:74
-msgid ""
-"Tipping is a way for offer cash rewards that go directly into a user's "
-"wallet."
+#: talermerchantdemos/landing/templates/index.html.j2:85
+msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
msgstr ""
#: talermerchantdemos/survey/templates/index.html.j2:6
msgid ""
-"On this page, you can participate in our survey about payment systems and"
-" receive a tip in return."
+"Please participate in our survey about payment systems and receive a tip "
+"in return."
msgstr ""
#: talermerchantdemos/survey/templates/index.html.j2:12
@@ -503,3 +558,213 @@ msgstr "Welches Bezahlsystem bevorzugen Sie?"
msgid "Submit Survey"
msgstr "Antwort abschicken"
+#~ msgid "You did not like this article?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can <a href=\"{url}\">request a "
+#~ "refund</a> within the first hour after"
+#~ " buying it."
+#~ msgstr ""
+
+#~ msgid "Taler Essay Shop Demo"
+#~ msgstr ""
+
+#~ msgid "Shop"
+#~ msgstr "Laden"
+
+#~ msgid ""
+#~ "You can learn more about Taler on"
+#~ " our main <a href=\"{site}\">website</a>."
+#~ msgstr ""
+
+#~ msgid "Taler Donation Demo"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Using this page you can make "
+#~ "donations (in an imaginary currency) to"
+#~ " Free Software projects."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is an example for a "
+#~ "\"checkout\" page of a Web shop. "
+#~ "On the previous page, you have "
+#~ "created the shopping cart and decided"
+#~ " which product to buy (i.e. which "
+#~ "project to donate KUDOS to). Now "
+#~ "in this page, you are asked to "
+#~ "select a payment option. As Taler "
+#~ "is not yet universally used, we "
+#~ "expect merchants will offer various "
+#~ "payment options."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that you MUST select Taler "
+#~ "here for the demo to continue, as"
+#~ " the other payment options are just"
+#~ " placeholders and not really working "
+#~ "in the demonstration. Also, it is "
+#~ "of course possible to ask the user"
+#~ " to make this choice already on "
+#~ "the previous page (with the shopping "
+#~ "cart), we just separated the two "
+#~ "steps to keep each step as simple"
+#~ " as possible."
+#~ msgstr ""
+
+#~ msgid "Taler donation demonstrator"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This donations website shows the user"
+#~ " experience for donations with Taler."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Please select a project, the amount "
+#~ "(*) of {currency} you wish to "
+#~ "donate, and enter the name that "
+#~ "will appear on your receipt:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "(*) To make it a bit more "
+#~ "fun, the 5 {currency} option is "
+#~ "deliberately implemented with a fault: "
+#~ "the merchant will try to make you"
+#~ " donate 6 {currency} instead of the"
+#~ " 5 {currency} shown in the form. "
+#~ "But do not worry, you will be "
+#~ "given the opportunity to review the "
+#~ "final offer from the merchant in a"
+#~ " window secured by the Taler "
+#~ "extension. That way, you can spot "
+#~ "the error before committing to an "
+#~ "incorrect contract or amount."
+#~ msgstr ""
+
+#~ msgid "Survey"
+#~ msgstr "Umfrage"
+
+#~ msgid "This is the Taler demo."
+#~ msgstr ""
+
+#~ msgid "Here you can try out the Taler payment system using a toy currency."
+#~ msgstr ""
+
+#~ msgid "Step 1: Install the Taler wallet"
+#~ msgstr ""
+
+#~ msgid "Install the wallet from the <a href=\"{link}\">installation
page</a>."
+#~ msgstr ""
+
+#~ msgid "Installation only takes one click."
+#~ msgstr ""
+
+#~ msgid "Step 2: Withdraw coins"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Next you can withdraw coins into "
+#~ "your wallet by going to our <a "
+#~ "href=\"{bank}\">bank</a>."
+#~ msgstr ""
+
+#~ msgid "In this demo you are paying with {currency}, an imaginary currency."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you create an account at our"
+#~ " bank, you will receive 100 "
+#~ "{currency} for free."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have completed this step, "
+#~ "you can click on the Taler icon"
+#~ " in your browser to check your "
+#~ "balance."
+#~ msgstr ""
+
+#~ msgid "Step 3: Pay"
+#~ msgstr ""
+
+#~ msgid "We have two demo merchants where you can spend your coins:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "At the <a href=\"{blog}\">essay store</a> "
+#~ "you can pay in {currency} for "
+#~ "individual chapters of Richard Stallman's"
+#~ " book "Free Software, Free "
+#~ "Society"."
+#~ msgstr ""
+
+#~ msgid "The book is also available for free at <a href=\"{fsf}\">the
FSF</a>."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "At the <a href=\"{donations}\">project "
+#~ "donation website</a> you can show "
+#~ "respect to a software project of "
+#~ "your choice by donating {currency} to"
+#~ " them."
+#~ msgstr ""
+
+#~ msgid "Step 4: Check money flow"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To check if people who received "
+#~ "your Taler payment got eventually paid"
+#~ " by the exchange via a wire "
+#~ "transfer visit the <a href=\"{bank}/public-"
+#~ "accounts\">public accounts page</a> at the "
+#~ "bank."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that only accounts set to be"
+#~ " publicly viewable are shown on that"
+#~ " page."
+#~ msgstr ""
+
+#~ msgid "Step 5: Survey"
+#~ msgstr ""
+
+#~ msgid "Websites can give tips to visitors for completing tasks."
+#~ msgstr ""
+
+#~ msgid "Go earn some coins by filling in our <a href=\"{url}\">survey</a>."
+#~ msgstr ""
+
+#~ msgid "Step 6: Reach out to us"
+#~ msgstr ""
+
+#~ msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
+#~ msgstr ""
+
+#~ msgid "Taler Survey Demo"
+#~ msgstr ""
+
+#~ msgid "This is the Taler survey demonstration."
+#~ msgstr ""
+
+#~ msgid "It demonatrates how merchants can reward their users by granting
tips."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tipping is a way for offer cash"
+#~ " rewards that go directly into a "
+#~ "user's wallet."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "On this page, you can participate "
+#~ "in our survey about payment systems "
+#~ "and receive a tip in return."
+#~ msgstr ""
+
diff --git a/translations/messages.pot b/translations/messages.pot
index 2a3853a..1dbb22c 100644
--- a/translations/messages.pot
+++ b/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-11 17:28+0200\n"
+"POT-Creation-Date: 2020-10-12 13:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,104 +64,45 @@ msgid "Page not found"
msgstr ""
#: talermerchantdemos/blog/templates/article_frame.html.j2:9
-msgid "You did not like this article?"
+msgid "Taler allows merchants to offer refunds to customers."
msgstr ""
#: talermerchantdemos/blog/templates/article_frame.html.j2:10
msgid ""
"You can <a href=\"{url}\">request a refund</a> within the first hour "
-"after buying it."
+"after buying this article."
msgstr ""
#: talermerchantdemos/blog/templates/base.html.j2:23
-msgid "Taler Essay Shop Demo"
+msgid "GNU Taler Demo: Essay Shop"
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:72
-#: talermerchantdemos/donations/templates/base.html.j2:69
-#: talermerchantdemos/landing/templates/base.html.j2:20
-#: talermerchantdemos/landing/templates/base.html.j2:69
-#: talermerchantdemos/survey/templates/base.html.j2:69
+#: talermerchantdemos/blog/templates/base.html.j2:34
+#: talermerchantdemos/donations/templates/base.html.j2:31
+#: talermerchantdemos/landing/templates/base.html.j2:31
msgid "Taler Demo"
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:73
-msgid "Shop"
+#: talermerchantdemos/blog/templates/base.html.j2:35
+msgid "Essay shop"
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:75
+#: talermerchantdemos/blog/templates/base.html.j2:37
msgid "On this page you can buy articles using an imaginary currency."
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:76
+#: talermerchantdemos/blog/templates/base.html.j2:38
msgid ""
"The articles are chapters from Richard Stallman's book "Free "
"Software, Free Society"."
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:77
+#: talermerchantdemos/blog/templates/base.html.j2:39
msgid ""
"The book is <a href=\"{shop}\">published by the FSF</a> and available "
"gratis at <a href=\"{gnu}\">gnu.org</a>."
msgstr ""
-#: talermerchantdemos/blog/templates/base.html.j2:83
-#: talermerchantdemos/donations/templates/base.html.j2:80
-#: talermerchantdemos/landing/templates/base.html.j2:79
-#: talermerchantdemos/survey/templates/base.html.j2:80
-msgid "Introduction"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:84
-#: talermerchantdemos/donations/templates/base.html.j2:81
-#: talermerchantdemos/landing/templates/base.html.j2:80
-#: talermerchantdemos/survey/templates/base.html.j2:81
-msgid "Bank"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:85
-#: talermerchantdemos/donations/templates/base.html.j2:82
-#: talermerchantdemos/landing/templates/base.html.j2:81
-#: talermerchantdemos/survey/templates/base.html.j2:82
-msgid "Essay Shop"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:86
-#: talermerchantdemos/donations/templates/base.html.j2:70
-#: talermerchantdemos/donations/templates/base.html.j2:83
-#: talermerchantdemos/landing/templates/base.html.j2:82
-#: talermerchantdemos/survey/templates/base.html.j2:83
-msgid "Donations"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:87
-#: talermerchantdemos/donations/templates/base.html.j2:84
-#: talermerchantdemos/landing/templates/base.html.j2:83
-#: talermerchantdemos/survey/templates/base.html.j2:84
-msgid "Tipping/Survey"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:88
-#: talermerchantdemos/donations/templates/base.html.j2:85
-#: talermerchantdemos/landing/templates/base.html.j2:84
-#: talermerchantdemos/survey/templates/base.html.j2:85
-msgid "Back-office"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:90
-#: talermerchantdemos/donations/templates/base.html.j2:87
-#: talermerchantdemos/landing/templates/base.html.j2:86
-#: talermerchantdemos/survey/templates/base.html.j2:87
-msgid "English [en]"
-msgstr ""
-
-#: talermerchantdemos/blog/templates/base.html.j2:112
-#: talermerchantdemos/donations/templates/base.html.j2:109
-#: talermerchantdemos/landing/templates/base.html.j2:108
-#: talermerchantdemos/survey/templates/base.html.j2:109
-msgid "You can learn more about Taler on our main <a
href=\"{site}\">website</a>."
-msgstr ""
-
#: talermerchantdemos/blog/templates/error.html.j2:3
#: talermerchantdemos/donations/templates/error.html.j2:3
#: talermerchantdemos/landing/templates/error.html.j2:3
@@ -188,6 +129,16 @@ msgstr ""
msgid "Stack trace:"
msgstr ""
+#: talermerchantdemos/blog/templates/footer.html.j2:5
+#: talermerchantdemos/donations/templates/footer.html.j2:5
+#: talermerchantdemos/landing/templates/footer.html.j2:5
+#: talermerchantdemos/survey/templates/footer.html.j2:5
+#: talermerchantdemos/templates/footer.html.j2:5
+msgid ""
+"You can learn more about GNU Taler on our main <a "
+"href=\"{site}\">website</a>."
+msgstr ""
+
#: talermerchantdemos/blog/templates/index.html.j2:3
msgid "Essay Shop: Free Software, Free Society"
msgstr ""
@@ -230,22 +181,80 @@ msgstr ""
msgid "No articles available in this language."
msgstr ""
+#: talermerchantdemos/blog/templates/language-switcher.html.j2:2
+#: talermerchantdemos/donations/templates/language-switcher.html.j2:2
+#: talermerchantdemos/landing/templates/language-switcher.html.j2:2
+#: talermerchantdemos/survey/templates/language-switcher.html.j2:2
+#: talermerchantdemos/templates/language-switcher.html.j2:2
+msgid "English [en]"
+msgstr ""
+
+#: talermerchantdemos/blog/templates/menu.html.j2:6
+#: talermerchantdemos/donations/templates/menu.html.j2:6
+#: talermerchantdemos/landing/templates/base.html.j2:32
+#: talermerchantdemos/landing/templates/menu.html.j2:6
+#: talermerchantdemos/survey/templates/menu.html.j2:6
+#: talermerchantdemos/templates/menu.html.j2:6
+msgid "Introduction"
+msgstr ""
+
+#: talermerchantdemos/blog/templates/menu.html.j2:9
+#: talermerchantdemos/donations/templates/menu.html.j2:9
+#: talermerchantdemos/landing/templates/menu.html.j2:9
+#: talermerchantdemos/survey/templates/menu.html.j2:9
+#: talermerchantdemos/templates/menu.html.j2:9
+msgid "Bank"
+msgstr ""
+
+#: talermerchantdemos/blog/templates/menu.html.j2:12
+#: talermerchantdemos/donations/templates/menu.html.j2:12
+#: talermerchantdemos/landing/templates/menu.html.j2:12
+#: talermerchantdemos/survey/templates/menu.html.j2:12
+#: talermerchantdemos/templates/menu.html.j2:12
+msgid "Essay Shop"
+msgstr ""
+
+#: talermerchantdemos/blog/templates/menu.html.j2:15
+#: talermerchantdemos/donations/templates/base.html.j2:32
+#: talermerchantdemos/donations/templates/menu.html.j2:15
+#: talermerchantdemos/landing/templates/menu.html.j2:15
+#: talermerchantdemos/survey/templates/menu.html.j2:15
+#: talermerchantdemos/templates/menu.html.j2:15
+msgid "Donations"
+msgstr ""
+
+#: talermerchantdemos/blog/templates/menu.html.j2:18
+#: talermerchantdemos/donations/templates/menu.html.j2:18
+#: talermerchantdemos/landing/templates/menu.html.j2:18
+#: talermerchantdemos/survey/templates/menu.html.j2:18
+#: talermerchantdemos/templates/menu.html.j2:18
+msgid "Tipping/Survey"
+msgstr ""
+
+#: talermerchantdemos/blog/templates/menu.html.j2:21
+#: talermerchantdemos/donations/templates/menu.html.j2:21
+#: talermerchantdemos/landing/templates/menu.html.j2:21
+#: talermerchantdemos/survey/templates/menu.html.j2:21
+#: talermerchantdemos/templates/menu.html.j2:21
+msgid "Back-office"
+msgstr ""
+
#: talermerchantdemos/donations/donations.py:143
msgid "parameter '{}' required"
msgstr ""
#: talermerchantdemos/donations/templates/base.html.j2:20
-msgid "Taler Donation Demo"
+msgid "GNU Taler Demo: Donations"
msgstr ""
-#: talermerchantdemos/donations/templates/base.html.j2:72
+#: talermerchantdemos/donations/templates/base.html.j2:34
msgid "This is the donation page."
msgstr ""
-#: talermerchantdemos/donations/templates/base.html.j2:73
+#: talermerchantdemos/donations/templates/base.html.j2:35
msgid ""
-"Using this page you can make donations (in an imaginary currency) to Free"
-" Software projects."
+"Using this page you can make donations in {currency} to Free Software "
+"projects."
msgstr ""
#: talermerchantdemos/donations/templates/checkout.html.j2:5
@@ -253,24 +262,40 @@ msgid "Select your payment method"
msgstr ""
#: talermerchantdemos/donations/templates/checkout.html.j2:9
+msgid "This is an example for a \"checkout\" page of a Web shop."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:10
+msgid ""
+"On the previous page, you have created the shopping cart and decided "
+"which product to buy (i.e. which project to donate KUDOS to)."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:11
msgid ""
-"This is an example for a \"checkout\" page of a Web shop. On the previous"
-" page, you have created the shopping cart and decided which product to "
-"buy (i.e. which project to donate KUDOS to). Now in this page, you are "
-"asked to select a payment option. As Taler is not yet universally used, "
-"we expect merchants will offer various payment options."
+"As Taler is not yet universally used, we expect merchants will offer "
+"various payment options."
msgstr ""
-#: talermerchantdemos/donations/templates/checkout.html.j2:14
+#: talermerchantdemos/donations/templates/checkout.html.j2:12
+msgid "To continue with the demo, select the "Taler" payment option."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:17
msgid ""
-"Note that you MUST select Taler here for the demo to continue, as the "
+"Note that you must select Taler here for the demo to continue, as the "
"other payment options are just placeholders and not really working in the"
-" demonstration. Also, it is of course possible to ask the user to make "
-"this choice already on the previous page (with the shopping cart), we "
-"just separated the two steps to keep each step as simple as possible."
+" demonstration."
msgstr ""
-#: talermerchantdemos/donations/templates/checkout.html.j2:40
+#: talermerchantdemos/donations/templates/checkout.html.j2:18
+msgid ""
+"It would be possible to ask the user to make this choice already on the "
+"previous page (with the shopping cart); we just separated the two steps "
+"to keep each step as simple as possible."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/checkout.html.j2:44
msgid "Confirm selection"
msgstr ""
@@ -301,11 +326,13 @@ msgid "You can always make <a href=\"{link}\">another
donation</a>."
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:4
-msgid "Taler donation demonstrator"
+msgid "Donate to Free Software projects"
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:8
-msgid "This donations website shows the user experience for donations with
Taler."
+msgid ""
+"This donations website shows the user experience for donations with GNU "
+"Taler."
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:9
@@ -315,7 +342,7 @@ msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:16
msgid ""
"Please select a project, the amount (*) of {currency} you wish to donate,"
-" and enter the name that will appear on your receipt:"
+" and enter the donor's name that will appear on your receipt:"
msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:33
@@ -328,12 +355,24 @@ msgstr ""
#: talermerchantdemos/donations/templates/index.html.j2:39
msgid ""
-"(*) To make it a bit more fun, the 5 {currency} option is deliberately "
-"implemented with a fault: the merchant will try to make you donate 6 "
-"{currency} instead of the 5 {currency} shown in the form. But do not "
-"worry, you will be given the opportunity to review the final offer from "
-"the merchant in a window secured by the Taler extension. That way, you "
-"can spot the error before committing to an incorrect contract or amount."
+"(*) To make the demo a bit more interesting, the 5 {currency} option is "
+"deliberately implemented with a fault: the merchant will try to make you "
+"donate 6 {currency} instead of the 5 {currency} shown in the form. But "
+"do not worry, you will be given the opportunity to review the final offer"
+" from the merchant in the Taler wallet. That way, Taler protects you "
+"from committing to erroneous payments."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/provider-not-supported.html.j2:4
+msgid "Payment Provider Not Supported"
+msgstr ""
+
+#: talermerchantdemos/donations/templates/provider-not-supported.html.j2:7
+msgid "Unfortunately the selected payment provider is not supported in this
demo."
+msgstr ""
+
+#: talermerchantdemos/donations/templates/provider-not-supported.html.j2:8
+msgid "Please go back and select "Taler"."
msgstr ""
#: talermerchantdemos/httpcommon/__init__.py:35
@@ -356,142 +395,158 @@ msgstr ""
msgid "HTTP method not allowed for this page"
msgstr ""
-#: talermerchantdemos/landing/templates/base.html.j2:70
-#: talermerchantdemos/survey/templates/base.html.j2:70
-msgid "Survey"
+#: talermerchantdemos/landing/templates/base.html.j2:20
+msgid "GNU Taler Demo: Introduction"
msgstr ""
-#: talermerchantdemos/landing/templates/base.html.j2:72
-msgid "This is the Taler demo."
+#: talermerchantdemos/landing/templates/base.html.j2:34
+msgid "This is the GNU Taler demo."
msgstr ""
-#: talermerchantdemos/landing/templates/base.html.j2:73
-msgid "Here you can try out the Taler payment system using a toy currency."
+#: talermerchantdemos/landing/templates/base.html.j2:35
+msgid "Here you can try out the GNU Taler payment system using a toy currency."
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:4
msgid "Step 1: Install the Taler wallet"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:6
+#: talermerchantdemos/landing/templates/index.html.j2:7
msgid "Install the wallet from the <a href=\"{link}\">installation page</a>."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:7
+#: talermerchantdemos/landing/templates/index.html.j2:8
msgid "Installation only takes one click."
msgstr ""
+#: talermerchantdemos/landing/templates/index.html.j2:12
+msgid ""
+"After installation, you may be asked to grant the brower-based Taler "
+"wallet additional optional permissions that allow it to improve your user"
+" experience."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:13
+msgid ""
+"These permissions will allow the wallet to automatically open if a page "
+"asks for a Taler payment."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:14
+msgid ""
+"Regardless of the permissions you grant, the wallet will never transmit "
+"information about you or your browsing history to anyone."
+msgstr ""
+
#: talermerchantdemos/landing/templates/index.html.j2:19
msgid "Step 2: Withdraw coins"
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:22
-msgid ""
-"Next you can withdraw coins into your wallet by going to our <a "
-"href=\"{bank}\">bank</a>."
+msgid "In this demo you are paying with {currency}, an imaginary currency."
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:23
-msgid "In this demo you are paying with {currency}, an imaginary currency."
+msgid ""
+"To withdraw {currency} coins you must first create an account at our <a "
+"href=\"{bank}\">bank</a>."
msgstr ""
#: talermerchantdemos/landing/templates/index.html.j2:24
+msgid "Signing up only requires you to pick a username and password."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:25
msgid ""
-"When you create an account at our bank, you will receive 100 {currency} "
-"for free."
+"When you create an account at our bank, you will be credited 100 "
+"{currency} for signing up."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:28
+#: talermerchantdemos/landing/templates/index.html.j2:26
+msgid ""
+"Afterwards, use the bank's Web interface to authorize the transfer of "
+"{currency} to your wallet."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:30
msgid ""
"Once you have completed this step, you can click on the Taler icon in "
"your browser to check your balance."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:33
+#: talermerchantdemos/landing/templates/index.html.j2:35
msgid "Step 3: Pay"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:35
+#: talermerchantdemos/landing/templates/index.html.j2:38
msgid "We have two demo merchants where you can spend your coins:"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:40
+#: talermerchantdemos/landing/templates/index.html.j2:44
msgid ""
"At the <a href=\"{blog}\">essay store</a> you can pay in {currency} for "
"individual chapters of Richard Stallman's book "Free Software, "
"Free Society"."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:41
+#: talermerchantdemos/landing/templates/index.html.j2:45
msgid "The book is also available for free at <a href=\"{fsf}\">the FSF</a>."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:46
+#: talermerchantdemos/landing/templates/index.html.j2:50
msgid ""
-"At the <a href=\"{donations}\">project donation website</a> you can show "
+"At the project <a href=\"{donations}\">donation website</a> you can show "
"respect to a software project of your choice by donating {currency} to "
"them."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:52
+#: talermerchantdemos/landing/templates/index.html.j2:56
msgid "Step 4: Check money flow"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:56
+#: talermerchantdemos/landing/templates/index.html.j2:59
msgid ""
-"To check if people who received your Taler payment got eventually paid by"
-" the exchange via a wire transfer visit the <a href=\"{bank}/public-"
-"accounts\">public accounts page</a> at the bank."
+"You can see the wire transfers from the escrow account of the exchange to"
+" the merchants on the <a href=\"{bank}/public-accounts\">public accounts "
+"page</a> of the bank."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:57
+#: talermerchantdemos/landing/templates/index.html.j2:60
msgid ""
-"Note that only accounts set to be publicly viewable are shown on that "
-"page."
+"Note that only accounts configured to be publicly viewable are shown on "
+"that page."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:63
+#: talermerchantdemos/landing/templates/index.html.j2:65
msgid "Step 5: Survey"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:67
+#: talermerchantdemos/landing/templates/index.html.j2:68
msgid "Websites can give tips to visitors for completing tasks."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:68
-msgid "Go earn some coins by filling in our <a href=\"{url}\">survey</a>."
+#: talermerchantdemos/landing/templates/index.html.j2:69
+msgid ""
+"You can earn some {currency} coins by filling in our <a "
+"href=\"{url}\">survey</a>."
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:83
+#: talermerchantdemos/landing/templates/index.html.j2:81
msgid "Step 6: Reach out to us"
msgstr ""
-#: talermerchantdemos/landing/templates/index.html.j2:85
-msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
+#: talermerchantdemos/landing/templates/index.html.j2:84
+msgid "We appreciate feedback about Taler and this demonstrator."
msgstr ""
-#: talermerchantdemos/survey/templates/base.html.j2:20
-msgid "Taler Survey Demo"
-msgstr ""
-
-#: talermerchantdemos/survey/templates/base.html.j2:72
-msgid "This is the Taler survey demonstration."
-msgstr ""
-
-#: talermerchantdemos/survey/templates/base.html.j2:73
-msgid "It demonatrates how merchants can reward their users by granting tips."
-msgstr ""
-
-#: talermerchantdemos/survey/templates/base.html.j2:74
-msgid ""
-"Tipping is a way for offer cash rewards that go directly into a user's "
-"wallet."
+#: talermerchantdemos/landing/templates/index.html.j2:85
+msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
msgstr ""
#: talermerchantdemos/survey/templates/index.html.j2:6
msgid ""
-"On this page, you can participate in our survey about payment systems and"
-" receive a tip in return."
+"Please participate in our survey about payment systems and receive a tip "
+"in return."
msgstr ""
#: talermerchantdemos/survey/templates/index.html.j2:12
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-merchant-demos] branch master updated: share menu and style sheets across demo pages (fixes #5704),
gnunet <=