commit 0767b87f9f0887e210dcc61a08f25e846cb543e3
parent f2499a003c6117053a07897cae5d35706ee9fe40
Author: Christian Grothoff <christian@grothoff.org>
Date: Fri, 11 Oct 2024 09:16:00 +0200
Merge branch 'master' into stable
Diffstat:
6 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
@@ -3,10 +3,10 @@ msgstr ""
"Project-Id-Version: German (Taler Website)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-09-11 17:47+0200\n"
-"PO-Revision-Date: 2024-07-01 20:41+0000\n"
+"PO-Revision-Date: 2024-10-07 20:32+0000\n"
"Last-Translator: Stefan Kügel <stefan.kuegel@taler.net>\n"
-"Language-Team: German <https://weblate.taler.net/projects/gnu-taler/main-web-"
-"site/de/>\n"
+"Language-Team: German <https://weblate.taler.net/projects/gnu-taler/"
+"main-web-site/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -476,7 +476,7 @@ msgstr ""
#: template/development.html.j2:91
msgid "MCH 2022 Badge Integration"
-msgstr "MCH 2022 Badge Integration"
+msgstr "MCH 2022 Badge-Integration"
#: template/development.html.j2:93
msgid "Accept GNU Taler payments on your MCH 2022 badge."
@@ -587,7 +587,7 @@ msgstr "Anleitung zur Konfiguration und Inbetriebnahme der POS-Anwendung."
#: template/docs.html.j2:76
msgid "Exchange"
-msgstr "Exchange"
+msgstr "Zahlungsdienstleister"
#: template/docs.html.j2:78
msgid "Operator's manual for the GNU Taler Exchange."
@@ -739,7 +739,7 @@ msgstr ""
#: template/docs.html.j2:237
msgid "Magento Payment Backend"
-msgstr "Magento Payment Backend"
+msgstr "Magento Payment-Backend"
#: template/docs.html.j2:239
msgid ""
@@ -1228,6 +1228,12 @@ msgid ""
"0.64 CHF and 2.56 CHF coins, resulting in a total of 3.24 CHF "
"with 0.01 CHF returned as change."
msgstr ""
+"Beim Abheben von 5 CHF werden elektronische Münzen mit den Nennwerten "
+"0,04 CHF, 0,16 CHF, 0,32 CHF, 0,64 CHF, 1,28 CHF "
+"und 2,56 CHF erzeugt. Beim Bezahlen von beispielsweise 3,23 CHF "
+"würden dann die Münzen der Nennwerte 0,04 CHF, 0,64 CHF und "
+"2,56 CHF verwendet, so dass ein Gesamtbetrag von 3,24 CHF bezahlt "
+"und eine Münze von 0,01 CHF als Wechselgeld zurückgegeben werden."
#: template/faq.html.j2:244
msgid ""
@@ -1240,6 +1246,16 @@ msgid ""
"willing to cover. Taler wallets inform customers about applicable deposit "
"fees they have to pay before every transaction."
msgstr ""
+"Die <b>Einlösegebühr</b>, die von Taler-Zahlungsdienstleistern erhoben wird, "
+"hängt von den eingesetzten elektronischen Münzen ab, die für die jeweilige "
+"Transaktion verwendet werden. Eine Einlösegebühr für eine 1,28 CHF-"
+"Münze könnte beispielsweise höher sein als für eine 0,01 CHF-Münze. Ihr "
+"Wallet wird automatisch versuchen, Münzen so auszuwählen, dass es die von "
+"Ihnen zu zahlenden Gebühren minimiert. Verkäufer können zudem anbieten, die "
+"Einlösegebühr bis zu einer bestimmten Höhe zu übernehmen; die Käufer müssen "
+"dann nur die Einlösegebühr zahlen, die über diesen Betrag hinausgeht. Taler-"
+"Wallets informieren die Käufer vor jeder Transaktion über die anfallenden "
+"Gebühren, die sie zu tragen haben."
#: template/faq.html.j2:258
msgid "How do bounce fees work?"
@@ -2505,18 +2521,13 @@ msgid "Android 7.0 (API 24) or later"
msgstr "Android 7.0 (API 24) oder höher"
#: template/wallet.html.j2:201
-#, fuzzy
-#| msgid ""
-#| "You can <a href=\"https://taler.net/files/wallet/wallet-nightly-debug-"
-#| "latest.apk\" target=\"_blank\" rel=\"noopener noreferrer\"> directly "
-#| "download the APK for Android.</a>"
msgid ""
"You can <a href=\"https://taler.net/files/wallet/wallet-nightly-debug-latest."
"apk\" target=\"_blank\" rel=\"noopener noreferrer\"> directly download the "
"APK for Android.</a>"
msgstr ""
-"Man kann <a href=\"https://taler.net/files/wallet/wallet-nightly-debug-"
-"latest.apk\" target=\"_blank\" rel=\"noopener noreferrer\">die APK-Datei für "
+"Man kann <a href=\"https://taler.net/files/wallet/wallet-nightly-debug-latest"
+".apk\" target=\"_blank\" rel=\"noopener noreferrer\">die APK-Datei für "
"Android</a> direkt herunterladen."
#: template/wallet.html.j2:207
diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-09-11 17:47+0200\n"
-"PO-Revision-Date: 2024-09-01 13:20+0000\n"
+"PO-Revision-Date: 2024-09-14 05:26+0000\n"
"Last-Translator: Muha Aliss <muhaaliss@tuta.io>\n"
-"Language-Team: Turkish <https://weblate.taler.net/projects/gnu-taler/main-"
-"web-site/tr/>\n"
+"Language-Team: Turkish <https://weblate.taler.net/projects/gnu-taler/"
+"main-web-site/tr/>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -150,7 +150,7 @@ msgstr "İlkelerimiz"
#: common/navigation.j2.inc:34
msgid "NGI TALER"
-msgstr ""
+msgstr "NGI TALER"
#: common/navigation.j2.inc:36 template/index.html.j2:54
#: template/news/index.html.j2:9
@@ -725,8 +725,6 @@ msgstr ""
"tabanlı)."
#: template/docs.html.j2:237
-#, fuzzy
-#| msgid "Pretix Payment Backend"
msgid "Magento Payment Backend"
msgstr "Magento Ödeme Arka Ucu"
@@ -1145,7 +1143,7 @@ msgstr ""
#: template/faq.html.j2:217
msgid "How do wire fees work?"
-msgstr ""
+msgstr "Banka havalesi ücretleri nasıl çalışır?"
#: template/faq.html.j2:219
msgid ""
@@ -1158,12 +1156,22 @@ msgid ""
"wire transfer fee would only be charged once per week. The fee is simply "
"subtracted from the total amount wired."
msgstr ""
+"Taler bir banka hesabına para aktarmak için kullanıldığında, yapılan banka "
+"havaleleri için Taler operatörleri tarafından bir <b>havale ücreti</b> "
+"alınır. Tüccarların, banka havalesi ücretlerini en aza indirmek için "
+"Taler'in birçok küçük ödemeyi geciktirmesine ve ardından tek bir toplu banka "
+"havalesinde toplamasına izin vermesi teşvik edilmektedir. Örneğin, bir "
+"haftalık <b>havale son tarihi</b> yapılandırılarak, bir hafta içindeki tüm "
+"ödemeler tek bir banka havalesinde toplanabilir ve dolayısıyla banka "
+"havalesi ücreti yalnızca haftada bir kez tahsil edilebilir. Ücret, havale "
+"edilen toplam tutardan düşülür."
#: template/faq.html.j2:232
msgid "How do deposit fees work?"
-msgstr ""
+msgstr "Para yatırma ücretleri nasıl çalışır?"
#: template/faq.html.j2:234
+#, fuzzy
msgid ""
"Withdrawing 5 CHF creates electronic coins with denominations of "
"0.04 CHF, 0.16 CHF, 0.32 CHF, 0.64 CHF, 1.28 CHF, "
@@ -1171,6 +1179,11 @@ msgid ""
"0.64 CHF and 2.56 CHF coins, resulting in a total of 3.24 CHF "
"with 0.01 CHF returned as change."
msgstr ""
+"5 CHF'nin çekilmesi, 0.04 CHF, 0.16 CHF, 0.32 CHF, 0."
+"64 CHF, 1.28 CHF ve 2.56 CHF değerlerinde elektronik paralar "
+"oluşturur. 3.23 CHF ödediğinizde 0.04 CHF, 0.64 CHF ve 2."
+"56 CHF jetonları kullanılabilir, bu da 0.01 CHF'nin bozuk para "
+"olarak iade edildiği toplam 3.24 CHF ile sonuçlanır."
#: template/faq.html.j2:244
msgid ""
@@ -2309,8 +2322,6 @@ msgid "Opera 36+"
msgstr "Opera 36+"
#: template/wallet.html.j2:186
-#, fuzzy
-#| msgid "Install Download Chrome Extension"
msgid "Install a Chrome extension for Opera"
msgstr "Opera için bir Chrome uzantısı yükleyin"
@@ -2329,32 +2340,22 @@ msgid "Android 7.0 (API 24) or later"
msgstr "Android 7.0 (API 24) veya daha yeni sürümünü yükleyin"
#: template/wallet.html.j2:201
-#, fuzzy
-#| msgid ""
-#| "You can <a href=\"https://taler.net/files/wallet/wallet-nightly-"
-#| "debug-1667560285.apk\" target=\"_blank\" rel=\"noopener noreferrer\"> "
-#| "download the APK for Android</a> directly."
msgid ""
"You can <a href=\"https://taler.net/files/wallet/wallet-nightly-debug-latest."
"apk\" target=\"_blank\" rel=\"noopener noreferrer\"> directly download the "
"APK for Android.</a>"
msgstr ""
"<a href=\"https://taler.net/files/wallet/wallet-nightly-debug-latest.apk\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Android için APK'yi</a> "
-"doğrudan indirebilirsiniz."
+"target=\"_blank\" rel=\"noopener noreferrer\"> Android için APK'yı doğrudan "
+"indirebilirsiniz.</a>"
#: template/wallet.html.j2:207
-#, fuzzy
-#| msgid "Install the Android App from Google App Store."
msgid "Install the Taler wallet app for Android from the Google App Store."
-msgstr "Android Uygulamasını Google Play Store'dan yükleyin."
+msgstr "Android için Taler cüzdan uygulamasını Google Play Store'dan yükleyin."
#: template/wallet.html.j2:212
-#, fuzzy
-#| msgid ""
-#| "Download the Android App from F-Droid (bypassing Google registration)."
msgid "Download the Android app from F-Droid (bypassing Google registration)."
-msgstr "Android uygulamasını Google kaydını atlayarak F-Droid'den indirin."
+msgstr "Android uygulamasını F-Droid'den indirin (Google gerek kalmadan)."
#: template/wallet.html.j2:223
msgid "Other browsers"
diff --git a/locale/zh_Hans/LC_MESSAGES/messages.po b/locale/zh_Hans/LC_MESSAGES/messages.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-09-11 17:47+0200\n"
-"PO-Revision-Date: 2024-07-01 20:41+0000\n"
-"Last-Translator: Stefan Kügel <stefan.kuegel@taler.net>\n"
-"Language-Team: Chinese (Simplified) <https://weblate.taler.net/projects/gnu-"
-"taler/main-web-site/zh_Hans/>\n"
+"PO-Revision-Date: 2024-10-11 06:22+0000\n"
+"Last-Translator: Paxtra Ronny <paxtrapliment@fsfans.club>\n"
+"Language-Team: Chinese (Simplified) <https://weblate.taler.net/projects/"
+"gnu-taler/main-web-site/zh_Hans/>\n"
"Language: zh_Hans\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -156,8 +156,8 @@ msgid ""
"This page was created using <a href=\"https://www.gnu.org/\" "
"target=\"_blank\" rel=\"noopener noreferrer\">Free Software</a> only."
msgstr ""
-"此页面仅使用<a href=\"https://www.gnu.org/\" target=\"_blank\" "
-"rel=\"noopener noreferrer\">免费软件</a>创建。"
+"此页面仅使用<a href=\"https://www.gnu.org/\" target=\"_blank\" rel=\"noopener"
+" noreferrer\">自由软件</a>创建。"
#: common/footer.j2.inc:46
msgid "JavaScript license information"
diff --git a/template/news/2021-03.html.j2 b/template/news/2021-03.html.j2
@@ -46,6 +46,7 @@ the risks.
<li><a href="https://mkukri.xyz/2024/06/01/tpm-gpio-fail.html">Intel TPM (2024)</a></li>
<li><a href="https://x.com/_markel___/status/1828112469010596347">Intel SGX root of trust private key extraction (2024)</a></li>
<li><a href="https://ninjalab.io/eucleak/">Yubikey, Infineon SLE78 / Infineon Optiga Trust M / Infineon Optiga TPM (2024)</a></li>
+<li><a href="https://www.heise.de/news/Forscher-entdecken-Schwachstellen-in-Intels-Trust-Domain-Extensions-9974224.html">Intel TDX (2024)</a></li>
</ul>
{% endblock body_content %}
diff --git a/template/news/2024-25.html.j2 b/template/news/2024-25.html.j2
@@ -5,7 +5,7 @@
We are happy to announce the release of GNU Taler v0.14.
</p>
<p>
-We have addressed over 50 individual issues, our bug tracker
+We have addressed over 100 individual issues, our bug tracker
has the <a href="https://bugs.gnunet.org/changelog_page.php?version_id=441">full list</a>.
Notable changes include:
</p>
diff --git a/template/press.html.j2 b/template/press.html.j2
@@ -5,6 +5,8 @@
<h1>{{ _("GNU Taler in the Press")}}</h1>
<h2>{{ _("2024")}}</h2>
<ul>
+ <li><a href="https://zevedi.de/security-through-obscurity-die-ezb-und-moegliche-design-probleme-des-digitalen-euro/">Security through obscurity?</a></li>
+ <li><a href="https://zevedi.de/efin-blog-anonymitaet-beim-geldausgeben-und-transparenz-bei-einkommen-das-taler-bezahlsystem/">„Anonymität beim Geldausgeben und Transparenz bei Einkommen“: Das Taler-Bezahlsystem</a></li>
<li><a href="https://pyngu.com/magazin/tech/gnu-taler/">Digitale Bezahlsysteme - Kann der GNU Taler das Bargeld der Zukunft sein?</a></li>
<li><a href="https://gnulinux.ch/gnu-taler-ausprobiert">GNU Taler ausprobiert</a></li>
<li><a href="http://www.monetative.de/stimmen-zum-digitalen-euro">Stimmen zum Digitalen Euro</a></li>
@@ -21,6 +23,7 @@
<li><a href="https://finanzbusiness.de/nachrichten/banken/article16791813.ece">Digitaler Euro bekommt Konkurrenz vom "Taler"</a></li>
<li><a href="https://www.boersen-zeitung.de/banken-finanzen/wer-den-bitcoin-nicht-ehrt-ist-des-talers-nicht-wert">Wer den Bitcoin nicht ehrt, ist des Talers nicht wert</a></li>
<li><a href="https://news.ycombinator.com/item?id=39039209">Hacker News</a></li>
+ <li><a href="https://bankinformation.de/geno-meldung/gni-taler-digitales-und-anonymes-bezahlverfahren-in-arbeit/52242/">GNU Taler – Digitales und anonymes Bezahlverfahren in Arbeit</a></li>
</ul>
<h2>{{ _("2023")}}</h2>
<ul>
