commit a70f822ae87f90845732acf81cf27299a2071c58
parent 9c593bd61e9fdc358dd7e24b4c66974532717a67
Author: Stefan Kügel <skuegel@web.de>
Date: Tue, 30 Jul 2024 08:15:01 +0200
Merge branch 'master' into stable
Diffstat:
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/locale/messages.pot b/locale/messages.pot
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-07-29 12:17+0200\n"
+"POT-Creation-Date: 2024-07-30 07:45+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.10.3\n"
#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
diff --git a/locale/uk/LC_MESSAGES/messages.po b/locale/uk/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-07-12 23:00+0200\n"
-"PO-Revision-Date: 2024-07-28 11:00+0000\n"
-"Last-Translator: Vlada Svirsh <vlada.svirsh@students.bfh.ch>\n"
+"PO-Revision-Date: 2024-07-29 13:40+0000\n"
+"Last-Translator: Bohdan Potuzhnyi <bohdan.potuzhnyi@students.bfh.ch>\n"
"Language-Team: Ukrainian <https://weblate.taler.net/projects/gnu-taler/"
"main-web-site/uk/>\n"
"Language: uk\n"
@@ -1849,7 +1849,7 @@ msgstr "Ідеї проєкту"
#: template/ideas.html.j2:13
msgid "Open"
-msgstr "Відкрито"
+msgstr "Відкрити"
#: template/ideas.html.j2:68
msgid "Claimed"
diff --git a/template/news/2021-09.html.j2 b/template/news/2021-09.html.j2
@@ -35,7 +35,7 @@ Notable changes include:
<p>
Some of the major changes are based on the security audit performed by Code
Blau in 2020. Addressing these recommendations was done as part of the NLnet
-Grant 2019-06-28 funded by the European Commissions great <a
+Grant 2019-06-28 funded by the European Commission's great <a
href="https://ngi.eu/">Next Generation Internet</a> initiative under grant
agreement number 825310. In particular, Code Blau had recommended
strengthening the isolation of the private keys, which is now implemented
diff --git a/template/news/2022-10.html.j2 b/template/news/2022-10.html.j2
@@ -20,7 +20,7 @@ Notable changes include:
</ul>
<p>
Many of the major new features were developed under an NGI POINTER grant
-funded by the European Commissions great <a href="https://ngi.eu/">Next
+funded by the European Commission's great <a href="https://ngi.eu/">Next
Generation Internet</a> initiative under grant
agreement number 871528.
Performance measurements and improvements were funded by an NGI Fed4Fire+
diff --git a/template/news/2023-11.html.j2 b/template/news/2023-11.html.j2
@@ -32,8 +32,8 @@ Notable changes include:
The <a href="https://nlnet.nl/project/Taler-iOS-wallet/">iOS wallet development</a>
and the work on <a href="https://nlnet.nl/project/GNUTaler-LocalCurrencies/">support for regional currencies</a>
was
-funded by the European Commissions great <a href="https://ngi.eu/">Next
-Generation Internet</a> initiative. We also contine to receive some funding
+funded by the European Commission's great <a href="https://ngi.eu/">Next
+Generation Internet</a> initiative. We also continue to receive some funding
for the work on <a href="https://nlnet.nl/project/GNUTaler-KYC/">improving AML and KYC support</a>.
</p>
<p>
diff --git a/template/news/2024-05.html.j2 b/template/news/2024-05.html.j2
@@ -20,7 +20,7 @@ Notable changes include:
</ul>
<p>
Our work is funded by <a href="https://nlnet.nl/project/GNUTaler-KYC/">NLnet grant 2022-08-058</a>
-as well as by the European Commissions and the Swiss State Secretariat for Education, Research and
+as well as by the European Commission and the Swiss State Secretariat for Education, Research and
Innovation (SERI) as part of the <a href="https://taler.net/en/ngi-taler.html">NGI TALER</a> project.
</p>
diff --git a/template/news/2024-06.html.j2 b/template/news/2024-06.html.j2
@@ -23,7 +23,7 @@ Notable changes include:
<li>Various minor bugfixes, user experience and documentation improvements</li>
</ul>
<p>
-Our work is co-funded by the European Commissions and the Swiss State Secretariat for Education, Research and
+Our work is co-funded by the European Commission and the Swiss State Secretariat for Education, Research and
Innovation (SERI) as part of the <a href="https://taler.net/en/ngi-taler.html">NGI TALER</a> project.
</p>
diff --git a/template/news/2024-11.html.j2 b/template/news/2024-11.html.j2
@@ -17,7 +17,7 @@ Notable changes include:
<li>Various minor bugfixes, user experience and documentation improvements</li>
</ul>
<p>
-Our work is co-funded by the European Commissions and the Swiss State Secretariat for Education, Research and
+Our work is co-funded by the European Commission and the Swiss State Secretariat for Education, Research and
Innovation (SERI) as part of the <a href="https://taler.net/en/ngi-taler.html">NGI TALER</a> project.
</p>
diff --git a/template/news/2024-23.html.j2 b/template/news/2024-23.html.j2
@@ -19,7 +19,7 @@ Notable changes include:
<li>Various minor bugfixes, user experience and documentation improvements</li>
</ul>
<p>
-Our work is co-funded by the European Commissions and the Swiss State Secretariat for Education, Research and
+Our work is co-funded by the European Commission and the Swiss State Secretariat for Education, Research and
Innovation (SERI) as part of the <a href="https://taler.net/en/ngi-taler.html">NGI TALER</a> project.
</p>
