summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kügel <skuegel@web.de>2023-11-28 09:25:58 +0100
committerStefan Kügel <skuegel@web.de>2023-11-28 09:25:58 +0100
commit0b39107189580da8979e7de6b1d6aff7287b67fb (patch)
tree6c327553db33343eedd47aebb17b2d65d91dce27
parent3a8daa7c6f4298e102d8679b629330140dd0cb9c (diff)
downloadwww-0b39107189580da8979e7de6b1d6aff7287b67fb.tar.gz
www-0b39107189580da8979e7de6b1d6aff7287b67fb.tar.bz2
www-0b39107189580da8979e7de6b1d6aff7287b67fb.zip
Small changes to text elements and names
Signed-off-by: Stefan Kügel <skuegel@web.de>
-rw-r--r--common/footer-eu.j2.inc9
-rw-r--r--properties.d/events_eu-project.yml14
-rw-r--r--template/consortium.html.j218
3 files changed, 19 insertions, 22 deletions
diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc
index 03b69b63..fa7cb219 100644
--- a/common/footer-eu.j2.inc
+++ b/common/footer-eu.j2.inc
@@ -13,15 +13,16 @@
</div>
<div class="dark-grey-text container container-fluid">
<p class="text-muted w-responsive mx-auto mt-4">
- Funded by the European Union. Views and opinions expressed are however those of the author(s) only and do not necessarily reflect those of the European Union or [name of the granting authority]. Neither the European Union nor the granting authority can be held responsible for them.
+ Funded by the European Union. Views and opinions expressed are however those of the author(s) only and do not necessarily reflect those of the European Union or
+ [name of the granting authority]. Neither the European Union nor the granting authority can be held responsible for them.
</p>
</div>
</div>
<div class="col-md-4 col-sm-12">
<h4>{% trans %}TALER Project{% endtrans %}</h4>
<ul class="footer-list">
- <li><strong>Coordinator:</strong> Technische Universiteit Eindhoven (TUE)</li>
- {# TODO Adapt the consortium e-mail addrqyess bevore publishing #}
+ <li><strong>Coordinator:</strong> Eindhoven University of Technology (TUE)</li>
+ {# TODO Adapt the consortium e-mail address before publishing #}
<li><strong>E-Mail: </strong><a href="mailto:questions'AT'taler.net?subject=Mail from EU project Website">{% trans %}Contact us{% endtrans %}</a></li>
<li><strong>{% trans %}Programme Call{% endtrans %}:</strong> HORIZON-CL4-2023-HUMAN-01-CNECT</li>
<li><strong>{% trans %}Type of action{% endtrans %}:</strong> HORIZON Innovation Actions</li>
@@ -37,7 +38,7 @@
</div>
<div class="container container-fluid">
<p class="dark-grey-text text-muted w-responsive mx-auto mt-2">
- This work has received funding from the Swiss State Secretariat for Education, Research and Innovation (SERI)
+ This work has received funding from the Swiss State Secretariat for Education, Research and Innovation (SERI).
<p>
</div>
</div>
diff --git a/properties.d/events_eu-project.yml b/properties.d/events_eu-project.yml
index 098c7aef..cab4f097 100644
--- a/properties.d/events_eu-project.yml
+++ b/properties.d/events_eu-project.yml
@@ -17,7 +17,7 @@ events:
url_html:
teaser: ""
location: |
- Chem. des Crêts 17
+ Chem. des Crêts 17,
1209 Geneva, Switzerland
speaker: Marie Walrafen
email: mw'AT'taler.net
@@ -26,11 +26,11 @@ events:
url_img: images/diagram-simple.png
url_ext: https://moztw.kktix.cc/events/gnu-taler
url_html:
- teaser: In this lecture, we will introduce the political goals, architecture and technology behind Taler, demonstrate the current state of development and outline likely future developments.
+ teaser: In this lecture, we will introduce the political goals, architecture and technology behind GNU Taler, demonstrate the current state of development and outline likely future developments.
location: |
- Mozilla Community Space Taipei
+ Mozilla Community Space, Taipei,
台北市中正區八德路一段 94 號 3F
- speaker: Christian Grothoff
+ speaker: Prof. Dr. Christian Grothoff
email: cg'AT'taler.net
- date: 2023-12-21
titel: Privacy in e-commerce
@@ -39,7 +39,7 @@ events:
url_html:
teaser: GNU Taler is a privacy-preserving payment system. Customers can stay anonymous, but merchants can not hide their income through payments with GNU Taler. This helps to avoid tax evasion and money laundering.
location: |
- Freedom of the Internet Meetup
+ Freedom of the Internet Meetup,
Taipei
- speaker: Christian Empty
- email: cg'AT'taler.net \ No newline at end of file
+ speaker: Prof. Dr. Christian Grothoff
+ email: cg'AT'taler.net
diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index 95681afe..bda7a1d0 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -109,9 +109,9 @@
<p class="text-muted w-responsive mx-auto mb-3">
{% trans %}
The TALER project is an initiative of Horizon Europe (Pilots for the Next Generation Internet)
- with the aim of bringing the GNU Taler to market across Europe.
+ with the aim of bringing GNU Taler to market across Europe.
<br>
- To make the GNU Taler accessible to European citizens, we need a commercially viable use of
+ To make GNU Taler accessible to European citizens, we need a commercially viable use of
the GNU Taler technology. We will achieve this through the four key project objectives.
{% endtrans %}
</p>
@@ -149,19 +149,15 @@
<div class="col-md-11">
<p class="text-muted w-responsive mx-auto mb-3">
{% trans %}
- TALER consortium consists of 11 partners from 8 European countries (the Netherlands,
- Belgium, France,
- Germany, Greece, Hungary, Luxembourg and Switzerland).
+ The TALER consortium consists of 11 partners from 8 European countries (the Netherlands,
+ Belgium, France, Germany, Greece, Hungary, Luxembourg and Switzerland).
{% endtrans %}
</p>
<p class="text-muted w-responsive mx-auto mb-3">
{% trans %}
The consortium is diverse in terms of types of institutions, including research (TUE) and
- applied
- science
- universities (BFH), small for-profit (CBG, TSYS, VV) and non-profit (PS) companies,
- cooperative banks
- (GLS, MAG), a foundation (NLnet) and grassroots movements (ESEN, HODI).
+ applied science universities (BFH), small for-profit (CBG, TSYS, VV) and non-profit (PS) companies,
+ cooperative banks (GLS, MAG), a foundation (NLnet) and grassroots movements (ESEN, HODI).
{% endtrans %}
</p>
@@ -199,4 +195,4 @@
</div>
</main>
-{% endblock body_content %} \ No newline at end of file
+{% endblock body_content %}