[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch stable updated (2a7da80 -> beb000e)
|
From: |
gnunet |
|
Subject: |
[taler-www] branch stable updated (2a7da80 -> beb000e) |
|
Date: |
Fri, 14 Oct 2022 21:12:25 +0200 |
This is an automated email from the git hooks/post-receive script.
skuegel pushed a change to branch stable
in repository www.
from 2a7da80 Updating the German messages.po file for taler.net
add 9bf582f heise
add 5f90d0c blick
add 4672aed Updated paragraph and deleted another one @ 'Can I send money
to my friends with Taler?'
add 315c5e4 Translated using Weblate (German)
add 54a631e Updating the source strings for Weblate
add 920bf52 Updating all language files for Weblate
add beb000e Translated using Weblate (German)
No new revisions were added by this update.
Summary of changes:
locale/ar/LC_MESSAGES/messages.po | 122 +++++++++++++------------
locale/cs/LC_MESSAGES/messages.po | 89 +++++++++----------
locale/de/LC_MESSAGES/messages.po | 130 +++++++++++++++------------
locale/en/LC_MESSAGES/messages.po | 85 +++++++++---------
locale/es/LC_MESSAGES/messages.po | 158 +++++++++++++++++----------------
locale/fr/LC_MESSAGES/messages.po | 145 ++++++++++++++++--------------
locale/hi/LC_MESSAGES/messages.po | 122 +++++++++++++------------
locale/hu/LC_MESSAGES/messages.po | 115 +++++++++++++-----------
locale/it/LC_MESSAGES/messages.po | 129 ++++++++++++++-------------
locale/ja/LC_MESSAGES/messages.po | 139 +++++++++++++++--------------
locale/ko/LC_MESSAGES/messages.po | 117 +++++++++++++-----------
locale/messages.pot | 68 +++++++-------
locale/pt/LC_MESSAGES/messages.po | 95 ++++++++++----------
locale/pt_BR/LC_MESSAGES/messages.po | 122 +++++++++++++------------
locale/ru/LC_MESSAGES/messages.po | 143 +++++++++++++++--------------
locale/sv/LC_MESSAGES/messages.po | 142 +++++++++++++++--------------
locale/tr/LC_MESSAGES/messages.po | 133 ++++++++++++++-------------
locale/zh_Hans/LC_MESSAGES/messages.po | 126 ++++++++++++++------------
locale/zh_Hant/LC_MESSAGES/messages.po | 128 +++++++++++++-------------
template/faq.html.j2 | 10 +--
template/press.html.j2 | 2 +
21 files changed, 1218 insertions(+), 1102 deletions(-)
diff --git a/locale/ar/LC_MESSAGES/messages.po
b/locale/ar/LC_MESSAGES/messages.po
index ef7c05d..0ef6ba3 100644
--- a/locale/ar/LC_MESSAGES/messages.po
+++ b/locale/ar/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-03-04 17:02+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Arabic <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -226,10 +226,11 @@ msgstr "التنازل عن حقوق التأليف والنشر"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"يجب على المساهمين في نظام GNU Taler والذين لديهم حق الدخول إلى نظام Git "
"توقيع اتفاقية <a href=\"/pdf/copyright.pdf\">التنازل عن حقوق التأليف والنشر</"
@@ -286,8 +287,8 @@ msgstr "إدارة المهام الخلفية للتاجر"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"إرشادات ودليل إدارة عملية تجارية. متاحة بصيغة <a href=\"https://%(docshost)s/"
"pdf/taler-merchant-manual.pdf\">PDF</a>أيضاً."
@@ -716,32 +717,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "هل يمكنني إرسال الأموال لصديقي عبر نظام Taler؟"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"إذا قدم لك صديقك سلعًا أو خدمات مقابل مدفوعات، يمكنهم بسهولة فتح حساب تاجر في
"
-"نظام Taler واستلام الدفع في حسابهم المصرفي."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"قد تتيح الإصدارات المستقبلية من محفظة Taler بتبادل العملات المعدنية بين "
-"الأصدقاء مباشرة أيضًا."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "كيف يتعامل نظام Taler مع المدفوعات بعملات مختلفة؟"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -749,15 +737,15 @@ msgstr ""
"يمكن لمحافظ Taler حفظ العملات الرقمية المقابلة لعدة عملات مختلفة مثل اليورو "
"أو الدولار الأمريكي أو عملات البيتكوين."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "لا يمنح نظام Taler حاليًا التحويل بين العملات."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "كيف يحمي نظام Taler خصوصيتي؟"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -769,11 +757,11 @@ msgstr ""
"التوقيع المستتر خصوصيتك لأنه يمنع شركة الصرافة من معرفة العملة التي وقع "
"عليها أي عميل."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "كم تكلّف هذه العملية؟"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -794,11 +782,11 @@ msgstr ""
"يُرجى ملاحظة أنّ هذا تقدير مبكر ، فقد تعتمد التفاصيل على متطلبات الاستضافة "
"والنسخ الاحتياطي من الجهة المنظمة، وبالتالي يمكن أن تزيد بسهولة عن 10 أضعاف."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "هل يتعامل نظام Taler بالمدفوعات الدولية؟"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -813,11 +801,11 @@ msgstr ""
"ويسمح بعمليات السحب بعملة أخرى. ينصب تركيز نظام Taler على المدفوعات اليومية، "
"لذلك ليس لدينا خطط لدعم تحويل العملات في المستقبل القريب."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr "كيف يرتبط نظام Taler بتوجيهات الأموال الإلكترونية (الأوروبية)؟"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -826,7 +814,7 @@ msgstr ""
"نعتقدُ بأن التوجيهات الأوروبية للأموال الإلكترونية يوفر جزءًا من الإطار "
"التنظيمي الذي يجب أن شركة الصرافةلنظام الدفع Taler بالعملات المعدنية باليورو."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -834,7 +822,7 @@ msgstr ""
"ما هو البنك الذي سيضمن التحويل بين عملات نظام الدفع Taler وأموال البنوك في "
"الحسابات المصرفية العادية؟"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -849,13 +837,13 @@ msgstr ""
"البنك للوائح المصرفية ذات الصلة التي تحدد سبب ثقة العملاء في التحويل من "
"عملات نظام Taler إلى أموال بنكية عادية."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr "إلى من سيشتكي العملاء في حالة عدم التحويل أو عدم الامتثال؟"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -874,11 +862,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "هل هناك أي مؤسسات تستخدم نظام Talerفعليًا؟"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -890,15 +878,15 @@ msgstr ""
"نحن على دراية بالعديد من الشركات التي تدير مشاريع تمهيدية أو طورت نماذج عمل "
"أولية. كما أننا نجري مناقشات مع العديد من البنوك العادية بالإضافة إلى العديد "
"من البنوك المركزية عن المشروع. ومع ذلك، لا توجد حاليًا أي منتجات في السوق حتى
"
-"الآن، ونعتقدُ أن هذا سيكون سابقًا لأوانه نظرًا لحالة المشروع (شاهد أيضًا <a
href="
-"\"https://gnunet.org/bugs/\";>متعقب الأخطاء</a>للحصول على قائمة المشاكل "
+"الآن، ونعتقدُ أن هذا سيكون سابقًا لأوانه نظرًا لحالة المشروع (شاهد أيضًا <a "
+"href=\"https://gnunet.org/bugs/\";>متعقب الأخطاء</a>للحصول على قائمة المشاكل "
"المفتوحة)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "هل يدعم نظام Taler الدفعات المتكررة؟"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -939,8 +927,8 @@ msgid ""
msgstr ""
"إنّ نظام GNU Taler هو <span class=\"tlr\">نظام مدفوعات يحافظ على الخصوصية</"
"span>. يستطيع العملاء عدم الكشف عن هويتهم، لكن لا يستطيع للتجار إخفاء دخلهم "
-"من خلال المدفوعات باستخدام نظام GNU Taler. هذا يساعد في <span class=\"tlr"
-"\">تجنب التهرب الضريبي وغسل الأموال</span>."
+"من خلال المدفوعات باستخدام نظام GNU Taler. هذا يساعد في <span "
+"class=\"tlr\">تجنب التهرب الضريبي وغسل الأموال</span>."
#: template/features.html.j2:23
msgid ""
@@ -1474,31 +1462,31 @@ msgstr "نظام GNU Taler في الصحافة"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1522,8 +1510,8 @@ msgstr "... في مجال الحوسبة، تعني الحرية عدم استخ
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1862,6 +1850,26 @@ msgstr "اشترك في نشرتنا الإخبارية RSS"
msgid "read more"
msgstr "اقرأ المزيد"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "إذا قدم لك صديقك سلعًا أو خدمات مقابل مدفوعات، يمكنهم بسهولة فتح حساب تاجر
"
+#~ "في نظام Taler واستلام الدفع في حسابهم المصرفي."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "قد تتيح الإصدارات المستقبلية من محفظة Taler بتبادل العملات المعدنية بين "
+#~ "الأصدقاء مباشرة أيضًا."
+
#~ msgid "Components"
#~ msgstr "المحتويات"
diff --git a/locale/cs/LC_MESSAGES/messages.po
b/locale/cs/LC_MESSAGES/messages.po
index dce9bb2..9102d10 100644
--- a/locale/cs/LC_MESSAGES/messages.po
+++ b/locale/cs/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2021-04-08 12:55+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: Czech <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -235,10 +235,11 @@ msgstr "Přidělení autorských práv (Copyright Assignment)"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Pokud chcete přispívat do projektu GNU Taler musíte mít přístup do systému "
"Git a podepsat <a href=\"/pdf/copyright.pdf\">přidělení autorských práv</a> "
@@ -296,12 +297,12 @@ msgstr "Backendová správa obchodníka"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Výukový program a příručka pro obsluhu obchodníka (Merchant). K dispozici "
-"také jako <a href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf"
-"\">PDF</a>."
+"také jako <a href=\"https://%(docshost)s/pdf/taler-merchant-manual."
+"pdf\">PDF</a>."
#: template/docs.html.j2:48
msgid "Merchant API Tutorial"
@@ -716,36 +717,32 @@ msgstr ""
#: template/faq.html.j2:61
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
msgstr ""
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -753,11 +750,11 @@ msgid ""
"which coin it signed for which customer."
msgstr ""
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -770,11 +767,11 @@ msgid ""
"regulator and could thus easily be 10x higher."
msgstr ""
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -785,24 +782,24 @@ msgid ""
"future."
msgstr ""
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow."
msgstr ""
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -812,13 +809,13 @@ msgid ""
"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -837,11 +834,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -851,11 +848,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1316,31 +1313,31 @@ msgstr ""
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
@@ -1364,8 +1361,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 1adc5d1..fe2035b 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,11 +2,11 @@ msgid ""
msgstr ""
"Project-Id-Version: German (Taler Website)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-10-04 16:27+0200\n"
-"PO-Revision-Date: 2022-10-04 17:07+0000\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
+"PO-Revision-Date: 2022-10-14 19:05+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\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"
@@ -759,30 +759,24 @@ msgstr "Kann ich anderen Menschen mit Taler Geld senden?"
#: template/faq.html.j2:61
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Wer Coins aus dem Taler-Bezahlsystem annimmt und wieder in reale Geldwerte "
-"umwandeln möchte, kann sich die Taler-Verkäuferschnittstelle einrichten, den "
-"sog. \"Merchant\". Die Coins werden über die Verkäuferschnittstelle durch "
-"den Exchange gesammelt und ihre entsprechenden Geldwerte mit einer "
-"Sammelbuchung auf dem Bankkonto des Verkäufers gutgeschrieben."
+"Taler unterstützt Push- and Pull-Zahlungen zwischen Wallets (auch bekannt "
+"als Peer-to-Peer-Zahlungen). Während die Zahlung direkt zwischen Wallets "
+"erfolgt, wird der Vorgang technisch gesehen durch den Taler-Exchange als "
+"Zahlungsdienstleister vermittelt, welcher in der Regel gesetzlich "
+"verpflichtet ist, den Geldempfänger zuerst zu identifizieren, bevor die "
+"Transaktion abgeschlossen werden kann."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"Zukünftige Versionen des Taler-Wallet sehen vor, unter Freunden auch direkt "
-"Coins auszutauschen (peer-to-peer). Möchte man Coins aus dem Taler-Wallet an "
-"andere Personen senden, wird dies dann schnell und kostengünstig ermöglicht."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Wie behandelt Taler Zahlungen in verschiedenen Währungen?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -790,17 +784,17 @@ msgstr ""
"Ein Taler-Wallet verwaltet digitale Münzen in verschiedenen Währungen wie "
"Euro, Dollar oder Bitcoin."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
"Taler bietet zurzeit keinen direkten Umtausch zwischen verschiedenen "
"Währungen."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Wie schützt Taler meine privaten Daten?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -814,11 +808,11 @@ msgstr ""
"Informationen dazu hat die <a href=\"https://de.wikipedia.org/wiki/";
"Digitale_Signatur\">Wikipedia-Seite zur digitalen Signatur</a>."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "Wie hoch sind die Kosten? Welche Gebühren fallen an?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -845,11 +839,11 @@ msgstr ""
"(für den Fall von hohen Transaktionsmengen, auf welche die Betriebskosten "
"degressiv verteilt werden)."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Funktioniert Taler mit grenzüberschreitenden Zahlungen?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -870,12 +864,12 @@ msgstr ""
"bietet Taler jedenfalls in der näheren Zukunft keine Funktionalität für den "
"Umtausch von Währungen."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
"In welchem Verhältnis steht Taler zur (europäischen) E-Geld-Richtlinie?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -885,7 +879,7 @@ msgstr ""
"Recht einen Bestandteil der Regulatorik darstellt, die ein Taler-Exchange "
"erfüllen muss, um Buchungen in Euro verarbeiten zu können."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -893,7 +887,7 @@ msgstr ""
"Welche Bank zeichnet sich verantwortlich für die Weiterbuchung von Coins aus "
"dem Taler-Wallet auf ein gewöhnliches Geschäftsbankenkonto?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -920,7 +914,7 @@ msgstr ""
"Zahlungsdiensterichtlinie und die Anforderungen der Regulierungsbehörden "
"erfüllen, wenn sie das Vertrauen der Nutzer erhalten wollen."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
@@ -928,7 +922,7 @@ msgstr ""
"An welche Stelle können sich Nutzer des Bezahlsystems wenden, falls es zu "
"Problemen mit Umwandlungen von Geldwerten oder Transaktionen kommt?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -965,11 +959,11 @@ msgstr ""
"Streitbeilegung (<a href=\"http://ec.europa.eu/odr\";>ODR</a>) eine "
"Beschwerde einzureichen."
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "Gibt es schon Projekte, die Taler verwenden?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -987,11 +981,11 @@ msgstr ""
"Betrieb noch zu früh wäre (siehe Liste der offenen Arbeiten in unserem <a "
"href=\"https://gnunet.org/bugs/\";>Bug-Tracker</a>)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Beherrscht Taler Daueraufträge (wiederkehrende Zahlungen)?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1057,10 +1051,10 @@ msgid ""
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-"Zahlungen erfolgen mit <span class=\"tlr\">elektronischen Münzen als "
-"digitalen Repräsentanten </span> der ursprünglichen Geldwerte mit Hilfe des "
-"Taler Exchange. Der Exchange stellt den Bezahldienstleister (payment service "
-"provider) im Taler-System dar."
+"Zahlungen können erfolgen nach dem <span class=\"tlr\">Eintauschen von Geld "
+"aus bestehenden Währungen</span> in <em>digitales Geld</em> mit Hilfe des "
+"Taler-Exchange, der zentralen Steuerungslogik des Taler-Bezahlsystems "
+"(payment service provider)."
#: template/features.html.j2:41
msgid ""
@@ -1080,10 +1074,11 @@ msgid ""
"loss or theft, only the limited amount of money left in the wallet might be "
"gone."
msgstr ""
-"Taler muss viele Betrugsrisiken wie z.B. das Phishing von Kunden- oder "
-"Kartendaten nicht fürchten. Im Fall des Verlusts eines Wallets droht "
-"allerhöchstens, dass die zum Zeitpunkt des Verlusts darauf gespeicherten "
-"Münzen zusammen mit den ihnen entsprechenden realen Geldwerten verloren sind."
+"Taler muss viele <span class=\"tlr\">Betrugsrisiken</span> wie z.B. das "
+"Phishing von Kunden- oder Kartendaten nicht fürchten. Im Fall des Verlusts "
+"eines Wallets droht schlimmstenfalls, dass die zum Zeitpunkt des Verlusts "
+"darauf gespeicherten Münzen mit den ihnen entsprechenden realen Geldwerten "
+"verloren sind."
#: template/features.html.j2:69
msgid "Paying with Taler"
@@ -1536,8 +1531,8 @@ msgid ""
"or depositing coins respectively"
msgstr ""
"Käufer und Verkäufer sind eindeutig identifizierbar anhand ihrer jeweiligen "
-"KYC-geprüften Bankkonten, von denen sie in das Taler-Bezahlsystem abheben "
-"(Käufer) bzw. auf die sie ihre Erlöse buchen lassen (Verkäufer)."
+"KYC-geprüften Bankkonten, wenn sie von diesen in das Taler-Bezahlsystem "
+"abheben (Käufer) bzw. auf die sie ihre Erlöse buchen lassen (Verkäufer)."
# Suggested in Weblate: Datenschutz-Grundverordnung (DSGVO)
#: template/governments.html.j2:123
@@ -1702,31 +1697,31 @@ msgstr "GNU Taler in den Medien"
msgid "2022"
msgstr "2022"
-#: template/press.html.j2:12
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:45
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:59
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:65
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:75
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:85
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:103
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -2140,6 +2135,27 @@ msgstr "Abonniere unseren RSS-Feed"
msgid "read more"
msgstr "weiterlesen"
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Wer Coins aus dem Taler-Bezahlsystem annimmt und wieder in reale "
+#~ "Geldwerte umwandeln möchte, kann sich die Taler-Verkäuferschnittstelle "
+#~ "einrichten, den sog. \"Merchant\". Die Coins werden über die "
+#~ "Verkäuferschnittstelle durch den Exchange gesammelt und ihre "
+#~ "entsprechenden Geldwerte mit einer Sammelbuchung auf dem Bankkonto des "
+#~ "Verkäufers gutgeschrieben."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Zukünftige Versionen des Taler-Wallet sehen vor, unter Freunden auch "
+#~ "direkt Coins auszutauschen (peer-to-peer). Möchte man Coins aus dem Taler-"
+#~ "Wallet an andere Personen senden, wird dies dann schnell und "
+#~ "kostengünstig ermöglicht."
+
#~ msgid "Components"
#~ msgstr "Systembestandteile"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 6d266fe..ecd84f9 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@@ -195,10 +195,11 @@ msgstr ""
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
#: template/copyright.html.j2:19
@@ -240,8 +241,8 @@ msgstr ""
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:48
@@ -626,36 +627,32 @@ msgstr ""
#: template/faq.html.j2:61
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
msgstr ""
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -663,11 +660,11 @@ msgid ""
"which coin it signed for which customer."
msgstr ""
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -680,11 +677,11 @@ msgid ""
"regulator and could thus easily be 10x higher."
msgstr ""
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -695,24 +692,24 @@ msgid ""
"future."
msgstr ""
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow."
msgstr ""
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -722,13 +719,13 @@ msgid ""
"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -747,11 +744,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -761,11 +758,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1224,31 +1221,31 @@ msgstr ""
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
@@ -1272,8 +1269,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 033448e..95804a4 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-11 16:47+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Spanish <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -229,16 +229,17 @@ msgstr "Asignación de derechos de autor"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Contribuidores con GNU Taler con acceso GIT deben firmar la <a href=\"/pdf/"
-"copyright.pdf\">asignación de copyright</a> para asegurar que <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex\";>el "
-"acuerdo de licencia y desarrollo colaborativo GNUnet e.V. --- Taler Systems "
-"SA </a>de los proyectos GNUnet y GNU Taler está satisfecho."
+"copyright.pdf\">asignación de copyright</a> para asegurar que <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">el acuerdo de licencia y desarrollo colaborativo GNUnet e.V. --- Taler "
+"Systems SA </a>de los proyectos GNUnet y GNU Taler está satisfecho."
#: template/copyright.html.j2:19
msgid ""
@@ -291,11 +292,11 @@ msgstr "Panel de administración de comerciante"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-"Tutorial y manual para operar como vendedor. También disponible en <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial y manual para operar como vendedor. También disponible en <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
#: template/docs.html.j2:48
msgid "Merchant API Tutorial"
@@ -729,33 +730,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "¿Puedo mandar dinero a mi amigo con Taler?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Si tu amigo provee de bienes o servicios para ti a cambio de un pago, ellos "
-"pueden fácilmente configurar una cuenta Taler de vendedor y recibir pagos en "
-"su cuenta bancaria."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"Futuras versiones de la cartera Taler podrían permitir intercambiar monedas "
-"entre amigos directamente también."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "¿Como maneja Taler pagos en diferentes divisas?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -763,15 +750,15 @@ msgstr ""
"Las carteras Taler pueden almacenar monedas digitales correspondiendo a "
"múltiples diferentes divisas como el Euro, dólar o Bitcoins."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "Taler no ofrece actualmente conversiones entre divisas."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "¿Como protege taler mi privacidad?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -783,11 +770,11 @@ msgstr ""
"firma ciega protege tu privacidad porque previene al banco saber que moneda "
"ha sido firmada para cada cliente."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "¿Cuanto cuesta?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -812,11 +799,11 @@ msgstr ""
"requerimientos de copias de seguridad del regulador y podrían ser fácilmente "
"diez veces más altos."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "¿Funciona Taler con pagos internacionales?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -834,12 +821,12 @@ msgstr ""
"enfoque de Taler son los pagos del día a día, así que no tenemos planes de "
"soportar conversión de divisas en un futuro cercano."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
"¿Como se relaciona Taler con la directiva de dinero electrónico (Europea)?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -849,7 +836,7 @@ msgstr ""
"parte del marco de regulación, debería seguir a un exchange Taler con "
"monedas denominadas en Euros."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -857,7 +844,7 @@ msgstr ""
"¿Que banco garantizaría la conversión entre monedas Taler y dinero de banco "
"en cuentas bancarias normales?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -874,7 +861,7 @@ msgstr ""
"tendrían fe en la conversión desde monedas Taler hacia dinero bancario "
"normal."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
@@ -882,7 +869,7 @@ msgstr ""
"¿A quien se quejarían los consumidores en el caso de una no-conversión o un "
"no-cumplimiento?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -901,11 +888,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "¿Hay algún proyecto que ya esté usando Taler?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -922,11 +909,11 @@ msgstr ""
"(ver también <a href=\"https://gnunet.org/bugs/\";>nuestro rastreador de "
"errores </a> para ver una lista de incidencias abiertas)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "¿Soporta Taler pagos recurrentes?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1552,31 +1539,31 @@ msgstr "GNU Taler en la prensa"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1604,8 +1591,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1613,8 +1600,8 @@ msgid ""
"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
"principle</a> and to establish public confidence."
msgstr ""
-"GNU Taler debe ser <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Software Libre</a>. Para comerciantes, el software libre previene el "
+"GNU Taler debe ser <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Software Libre</a>. Para comerciantes, el software libre previene el "
"bloqueo en un proveedor, significando que los comerciantes pueden fácilmente "
"elegir otro proveedor de servicio para procesar sus pagos. Para los países, "
"el Software Libre significa que GNU Taler no puede comprometer la soberanía "
@@ -1961,6 +1948,27 @@ msgstr "suscribirse a nuestro RSS"
msgid "read more"
msgstr "leer más"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Si tu amigo provee de bienes o servicios para ti a cambio de un pago, "
+#~ "ellos pueden fácilmente configurar una cuenta Taler de vendedor y recibir "
+#~ "pagos en su cuenta bancaria."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Futuras versiones de la cartera Taler podrían permitir intercambiar "
+#~ "monedas entre amigos directamente también."
+
#~ msgid "Components"
#~ msgstr "Componentes"
@@ -2294,8 +2302,8 @@ msgstr "leer más"
#~ msgstr "La Tecnología"
#~ msgid ""
-#~ "All transactions in Taler are secured using <a href=\"bibliography.html"
-#~ "\">modern cryptography</a> and trust in all parties is minimized. "
+#~ "All transactions in Taler are secured using <a href=\"bibliography."
+#~ "html\">modern cryptography</a> and trust in all parties is minimized. "
#~ "Financial damage is bounded (for customers, merchants and the "
#~ "exchange) even in the case that systems are compromised and private "
#~ "keys are stolen. Databases can be audited for consistency, resulting in "
@@ -2303,15 +2311,15 @@ msgstr "leer más"
#~ "participants were honest. Actual transaction costs are fractions of a "
#~ "cent."
#~ msgstr ""
-#~ "Todas las transacciones de Taler están aseguradas usando <a href="
-#~ "\"bibliography.html\">criptografía moderna</a> y la confianza en todas "
-#~ "las partes es minimizada. El daño financiero está limitado (para los "
-#~ "clientes, comerciantes y para el exchange) incluso en el caso de que "
-#~ "los sistemas fueran comprometidos y las claves privadas robadas. Las "
-#~ "bases de datos pueden ser auditadas para comprobar la coherencia, "
-#~ "resultando o bien en la detección de sistemas comprometidos o en la "
-#~ "demostración de que los participantes fueron honestos. Los costes de "
-#~ "transacción actuales son de fracciones de céntimo."
+#~ "Todas las transacciones de Taler están aseguradas usando <a "
+#~ "href=\"bibliography.html\">criptografía moderna</a> y la confianza en "
+#~ "todas las partes es minimizada. El daño financiero está limitado ("
+#~ "para los clientes, comerciantes y para el exchange) incluso en el "
+#~ "caso de que los sistemas fueran comprometidos y las claves privadas "
+#~ "robadas. Las bases de datos pueden ser auditadas para comprobar la "
+#~ "coherencia, resultando o bien en la detección de sistemas comprometidos o "
+#~ "en la demostración de que los participantes fueron honestos. Los costes "
+#~ "de transacción actuales son de fracciones de céntimo."
#~ msgid "The Business"
#~ msgstr "El Negocio"
@@ -2572,8 +2580,8 @@ msgstr "leer más"
#~ "<a href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
#~ msgid ""
-#~ "Manual to run the back-office Web application. Also available as <a href="
-#~ "\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#~ "Manual to run the back-office Web application. Also available as <a "
+#~ "href=\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
#~ msgstr ""
#~ "Manual para ejecutar el panel de control de la aplicación Web. También "
#~ "disponible en <a href=\"https://%(baseurl)s/pdf/taler-backoffice-manual."
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 831261a..3f14329 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: French (Taler Website)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-11 15:52+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: French <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -235,16 +235,17 @@ msgstr "Cession de droits d'auteur"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Les contributeurs à GNU Taler avec accès à Git doivent signer une <a href=\"/"
"pdf/copyright.pdf\">cession de droits d'auteurs</a> afin de garantir que <a "
-"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">l'accord sur les licences et le développement collaboratif de GNUnet e.V. "
-"--- Taler Systems SA du projet GNUnet et GNU TAler</a> soit respecté."
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">l'accord sur les licences et le développement collaboratif de GNUnet e."
+"V. --- Taler Systems SA du projet GNUnet et GNU TAler</a> soit respecté."
#: template/copyright.html.j2:19
msgid ""
@@ -298,8 +299,8 @@ msgstr "Administration du système interne du commerçant"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Tutoriel et manuel pour l'exploitation d'un commerce. Également disponible "
"en <a href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
@@ -740,33 +741,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "Puis-je envoyer de l'argent à mon ami avec Taler ?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Si votre ami vous fournit des biens ou des services en échange d'un "
-"paiement, il peut facilement mettre en place un commerce Taler et recevoir "
-"le paiement sur son compte en banque."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"Une future version du porte-monnaie Taler devrait également permettre "
-"d'échanger des pièces directement entre amis."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Comment Taler gère les paiements dans des devises différentes ?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -774,16 +761,16 @@ msgstr ""
"Un porte-monnaie Taler peut stocker des pièces numériques correspondant à "
"plusieurs devises différentes telles que l'Euro, le Dollar ou le Bitcoin."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
"Actuellement Taler ne permet pas de convertir d'une devise à une autre."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Comment Taler protège ma vie privée ?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -796,11 +783,11 @@ msgstr ""
"puisqu'elle empêche le bureau de change de savoir quelle pièce il a signée "
"pour quel acheteur."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "Combien ça coûte ?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -825,11 +812,11 @@ msgstr ""
"exigences de sauvegarde de la part du régulateur et cela pourrait donc "
"facilement être 10x plus élevé."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Est-ce Taler permet les paiements à l'international ?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -848,13 +835,13 @@ msgstr ""
"au jour le jour, donc nous n'avons pas prévu de supporter la conversion de "
"devise dans un futur proche."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
"Comment se situe Taler par rapport à la directive européenne sur les "
"monnaies électroniques ?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -864,7 +851,7 @@ msgstr ""
"fournit une partie du cadre de travail réglementaire qu'un bureau de change "
"Taler avec des pièces estampillées en Euro devrait suivre."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -872,7 +859,7 @@ msgstr ""
"Quelle banque garantirait la conversion entre de l'argent en Taler et de "
"l'argent dans des comptes en banque classiques ?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -889,7 +876,7 @@ msgstr ""
"les consommateurs auraient confiance dans la conversion d'argent Taler en "
"argent de banque classique."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
@@ -897,7 +884,7 @@ msgstr ""
"Auprès de qui se plaindraient les consommateurs en cas de non-conversion ou "
"de non-conformité ?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -916,11 +903,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "Y a-t-il des projets utilisant Taler ?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -934,15 +921,15 @@ msgstr ""
"également en discussion avec plusieurs banques traditionnelles ainsi que "
"plusieurs banques centrales à propos du projet. Cela dit, il n'y a "
"actuellement aucun produit sur le marché, et nous pensons que ce serait "
-"prématuré étant donné l'état d'avancement du projet (voir aussi <a href="
-"\"https://gnunet.org/bugs/\";>notre gestionnaire de suivi des bogues</a> pour "
-"une liste des tickets en cours)."
+"prématuré étant donné l'état d'avancement du projet (voir aussi <a "
+"href=\"https://gnunet.org/bugs/\";>notre gestionnaire de suivi des bogues</a> "
+"pour une liste des tickets en cours)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Est-ce que Taler permet les paiements récurrents ?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1020,8 +1007,9 @@ msgid ""
"span> on the merchant's Website."
msgstr ""
"Au moment de payer, les acheteurs ont seulement besoin d'avoir un porte-"
-"monnaie alimenté. Un commerçant peut accepter les paiements <span class=\"tlr"
-"\">sans obliger ses clients à enregistrer un compte</span> sur leur site Web."
+"monnaie alimenté. Un commerçant peut accepter les paiements <span "
+"class=\"tlr\">sans obliger ses clients à enregistrer un compte</span> sur "
+"leur site Web."
# J'ai traduit "chargeback fraud" par "fraude par rétro-facturation" mais
clairement je ne sais pas de quoi il s'agit. Il y a donc probablement une
meilleure traduction possible.
#: template/features.html.j2:50
@@ -1582,31 +1570,31 @@ msgstr "GNU Taler dans la presse"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1634,8 +1622,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1643,8 +1631,8 @@ msgid ""
"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
"principle</a> and to establish public confidence."
msgstr ""
-"GNU Taler doit être un <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Logiciel libre</a>. Pour les commerçants, le logiciel libre évite "
+"GNU Taler doit être un <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Logiciel libre</a>. Pour les commerçants, le logiciel libre évite "
"l'emprisonnement commercial, ce qui signifie que les commerçants peuvent "
"facilement choisir un autre fournisseur de service pour traiter leurs "
"paiements. Pour les états, le logiciel libre signifie que GNU Taler ne peut "
@@ -2007,6 +1995,27 @@ msgstr "s'abonner à notre flux RSS"
msgid "read more"
msgstr "lire la suite"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Si votre ami vous fournit des biens ou des services en échange d'un "
+#~ "paiement, il peut facilement mettre en place un commerce Taler et "
+#~ "recevoir le paiement sur son compte en banque."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Une future version du porte-monnaie Taler devrait également permettre "
+#~ "d'échanger des pièces directement entre amis."
+
#~ msgid "Components"
#~ msgstr "Composants"
@@ -2112,12 +2121,12 @@ msgstr "lire la suite"
#~ "href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
#~ msgstr ""
#~ "Manuel d'exploitation pour un bureau de change GNU Taler. Également "
-#~ "disponible en <a href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf"
-#~ "\">PDF</a>."
+#~ "disponible en <a href=\"https://%(baseurl)s/pdf/taler-exchange-manual."
+#~ "pdf\">PDF</a>."
#~ msgid ""
-#~ "Manual to run the back-office Web application. Also available as <a href="
-#~ "\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#~ "Manual to run the back-office Web application. Also available as <a "
+#~ "href=\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
#~ msgstr ""
#~ "Manuel pour faire fonctionner l'application Web d'arrière boutique. "
#~ "Également disponible en <a href=\"https://%(baseurl)s/pdf/taler-"
diff --git a/locale/hi/LC_MESSAGES/messages.po
b/locale/hi/LC_MESSAGES/messages.po
index bd63c79..c09c077 100644
--- a/locale/hi/LC_MESSAGES/messages.po
+++ b/locale/hi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-21 20:25+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Hindi <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -231,10 +231,11 @@ msgstr "प्रतिलिप्यधिकार अभिहस्ता
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Git पहुंच के साथ GNU टेलर के योगदानकर्ताओं को <h href =
\"https://git.gnunet.org/";
"gnunet- यह सुनिश्चित करने के लिए <a href=\"/pdf/copyright.pdf\"> कॉपीराइट "
@@ -278,8 +279,8 @@ msgid ""
"full documentation contents can be found <a href=\"https://docs.taler.net/";
"\">here</a>."
msgstr ""
-"यह GNU टेलर लिए प्रलेखन और अन्य संसाधनों का अवलोकन है। पूर्ण प्रलेखन सामग्री
<a href="
-"\"https://docs.taler.net/\";> यहां </a> देखी जा सकती है।"
+"यह GNU टेलर लिए प्रलेखन और अन्य संसाधनों का अवलोकन है। पूर्ण प्रलेखन सामग्री
<a "
+"href=\"https://docs.taler.net/\";> यहां </a> देखी जा सकती है।"
#: template/docs.html.j2:26
msgid "Core Component Documentation"
@@ -292,8 +293,8 @@ msgstr "व्यापारी पश्च सिरा प्रशासन
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"एक व्यापारी के संचालन के लिए अनुशिक्षण और नियमावली भी उपलब्ध है <a
href=\"https://";
"%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
@@ -354,8 +355,8 @@ msgid ""
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-"टेलर वालेट बारे में मैनुअल (WebExtensions, Android, CLI)। आप <a
href=\"wallet.html"
-"\"> द टैलर वॉलेट वेब साइट </a> से प्री-पैकेज्ड बायनेरिज़ डाउनलोड कर सकते हैं।"
+"टेलर वालेट बारे में मैनुअल (WebExtensions, Android, CLI)। आप <a
href=\"wallet."
+"html\"> द टैलर वॉलेट वेब साइट </a> से प्री-पैकेज्ड बायनेरिज़ डाउनलोड कर सकते
हैं।"
#: template/docs.html.j2:115
msgid "Cashier"
@@ -712,32 +713,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "क्या मैं अपने दोस्त को टेलर के साथ पैसे भेज सकता हूं?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"यदि आपका दोस्त भुगतान के बदले में आपके लिए सामान या सेवाएं प्रदान करता है, तो
वे आसानी से "
-"एक टेलर मर्चेंट सेट कर सकते हैं और अपने बैंक खाते में भुगतान प्राप्त कर सकते
हैं।"
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"टेलर वॉलेट के भविष्य के संस्करण सीधे दोस्तों के बीच भी सिक्कों के आदान-प्रदान
की अनुमति दे "
-"सकते हैं।"
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "टाएँलर विभिन्न मुद्राओं में भुगतान कैसे करता है?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -745,15 +733,15 @@ msgstr ""
"टेलर पर्स यूरो, यूएस डॉलर या बिटकॉइन जैसी कई अलग-अलग मुद्राओं के अनुरूप
डिजिटल सिक्कों को "
"स्टोर कर सकते हैं।"
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "वर्तमान में टेलर मुद्राओं के बीच विनिमय की पेशकश नहीं करता है।"
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "टैलर मेरी निजता की रक्षा कैसे करता है?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -765,11 +753,11 @@ msgstr ""
"उपयोग आपकी गोपनीयता की रक्षा करता है क्योंकि यह एक्सचेंज को यह जानने से रोकता
है कि यह "
"किस ग्राहक के लिए किस सिक्के पर हस्ताक्षर किया गया है।"
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "इसकी क्या कीमत है?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -789,11 +777,11 @@ msgstr ""
"लग बग एक अरब स्थानांतरण, ना मान के प्रवास मूल्य)। ध्यान दे कि ये एक शीघ्र
अंदाज़ा हे, "
"विस्तार हो सके निर्भर करे समुदाय एवं पूर्तिकर आवश्यकताओ"
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "क्या Taler अंतर्राष्ट्रीय भुगतान से काम करता है ?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -804,24 +792,24 @@ msgid ""
"future."
msgstr ""
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow."
msgstr ""
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -831,13 +819,13 @@ msgid ""
"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -856,11 +844,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -870,13 +858,13 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
#, fuzzy
#| msgid "Does Taler work with international payments?"
msgid "Does Taler support recurring payments?"
msgstr "क्या Taler अंतर्राष्ट्रीय भुगतान से काम करता है ?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1341,31 +1329,31 @@ msgstr ""
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
@@ -1391,8 +1379,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1671,6 +1659,26 @@ msgstr "हमारी आरएसएस फीड को सब्सक्
msgid "read more"
msgstr "और पढ़ें..."
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "यदि आपका दोस्त भुगतान के बदले में आपके लिए सामान या सेवाएं प्रदान करता है,
तो वे "
+#~ "आसानी से एक टेलर मर्चेंट सेट कर सकते हैं और अपने बैंक खाते में भुगतान
प्राप्त कर सकते हैं।"
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "टेलर वॉलेट के भविष्य के संस्करण सीधे दोस्तों के बीच भी सिक्कों के
आदान-प्रदान की अनुमति दे "
+#~ "सकते हैं।"
+
#~ msgid "Components"
#~ msgstr "अवयव"
diff --git a/locale/hu/LC_MESSAGES/messages.po
b/locale/hu/LC_MESSAGES/messages.po
index 164dd0b..1c8f96e 100644
--- a/locale/hu/LC_MESSAGES/messages.po
+++ b/locale/hu/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2021-04-08 12:55+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Hungarian <http://weblate.taler.net/projects/gnu-taler/main-";
@@ -234,10 +234,11 @@ msgstr ""
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
#: template/copyright.html.j2:19
@@ -288,8 +289,8 @@ msgstr ""
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Bemutató és kézikönyv a merchant üzemeltetéséhez. Elérhető <a href=\"https://";
"%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a> formátumban is."
@@ -714,32 +715,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "Tudok pénzt küldeni a barátomnak a Taler segítségével?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Ha a barátod árut vagy szolgáltatást kínál neked fizetésért cserébe, könnyen "
-"létrehozhat egy Taler merchant-et, és a fizetést a bankszámlájára kaphatja."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"A Taler tárca jövőbeli verziói lehetővé tehetik az érmék közvetlen cseréjét "
-"a barátok között is."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Hogyan kezeli a Taler a különböző pénznemekben történő fizetéseket?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -747,17 +735,17 @@ msgstr ""
"A Taler pénztárcák több különböző pénznemnek, például eurónak, amerikai "
"dollárnak vagy bitcoinoknak megfelelő digitális érméket is képesek tárolni."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
"A Taler jelenleg nem kínál átváltási lehetőséget a különböző pénznemek "
"között."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -765,11 +753,11 @@ msgid ""
"which coin it signed for which customer."
msgstr ""
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -782,11 +770,11 @@ msgid ""
"regulator and could thus easily be 10x higher."
msgstr ""
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -797,24 +785,24 @@ msgid ""
"future."
msgstr ""
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow."
msgstr ""
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -824,13 +812,13 @@ msgid ""
"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -849,11 +837,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -863,11 +851,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1328,31 +1316,31 @@ msgstr ""
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
@@ -1376,8 +1364,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1651,6 +1639,27 @@ msgstr "iratkozzon fel RSS hírlevelünkre"
msgid "read more"
msgstr "olvasson tovább"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Ha a barátod árut vagy szolgáltatást kínál neked fizetésért cserébe, "
+#~ "könnyen létrehozhat egy Taler merchant-et, és a fizetést a bankszámlájára "
+#~ "kaphatja."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "A Taler tárca jövőbeli verziói lehetővé tehetik az érmék közvetlen "
+#~ "cseréjét a barátok között is."
+
#~ msgid "Components"
#~ msgstr "Komponensek"
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 81f6c9e..6322f04 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-07 15:13+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Italian <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -230,10 +230,11 @@ msgstr "Diritti di Copyright"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"I collaboratori di GNU taler con l'accesso Git devono firmare i <a href=\"/"
"pdf/copyright.pdf\">diritti di copy right</a> per assicurare che l'accordo "
@@ -293,8 +294,8 @@ msgstr "Amministrazione dei rivenditori"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Guida per i rivenditori a lavoro. Disponibile anche in <a href=\"https://";
"%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
@@ -724,33 +725,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "Posso inviare denaro a un mio amico con Taler?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Se il tuo amico fornisce merci o servizi per te in cambio di un pagamento, "
-"possono organizzare una rivendita a Taler e ricevere il pagamento nel conto "
-"concorrente."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"Le prossime versioni di Taler Wallet potranno permettere anche lo scambio "
-"diretto di denaro tra amici."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "In che modo Taler gestisce i pagamenti tra valute diverse?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -758,16 +745,16 @@ msgstr ""
"I wallet Taler possono contenere monete digitali afferenti a diversi tipi di "
"valuta quali Euro, Dollari USA e Bitcoin."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
"Attualmente Taler non offre la possibilità di convertire le valute tra loro."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "In che modo Taler protegge la mia privacy?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -779,11 +766,11 @@ msgstr ""
"cambio. L'uso di una firma anonima protegge la tua privacy perché impedisce "
"al cambio di sapere quale valuta è stata siglata per quale cliente."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "Quanto costa?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -807,11 +794,11 @@ msgstr ""
"iniziale, i dettagli possono dipendere dai requisiti di hosting e di backup "
"del regolatore e potrebbero quindi essere facilmente 10 volte più alti."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Taler accetta pagamenti internazionali?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -829,13 +816,13 @@ msgstr ""
"concentra sui pagamenti giornalieri e non è prevista la conversione delle "
"valute nel prossimo futuro."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
"Come si pone Taler rispetto alla direttiva (europea) sulla moneta "
"elettronica?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -845,7 +832,7 @@ msgstr ""
"del quadro normativo che un cambio di Taler con monete espresse in euro "
"dovrebbe seguire."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -853,7 +840,7 @@ msgstr ""
"Quale banca garantirebbe la conversione tra le monete Taler e il denaro in "
"conti bancari abituali?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -870,7 +857,7 @@ msgstr ""
"i consumatori si fiderebbero della conversione da monete Taler in denaro "
"bancario tradizionale."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
@@ -878,7 +865,7 @@ msgstr ""
"A chi si rivolgerebbero i consumatori in caso di mancata conversione o non "
"conformità?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -897,11 +884,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "Esistono progetti che già utilizzano Taler?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -914,15 +901,15 @@ msgstr ""
"sperimentali o che hanno sviluppato prototipi funzionanti. Stiamo anche "
"trattando con alcune banche regolari e con più banche centrali. Detto "
"questo, attualmente non ci sono ancora prodotti sul mercato, e crediamo che "
-"questo sarebbe prematuro dato lo stato del progetto (vedi anche <a href="
-"\"https://gnunet.org/bugs/\";>il nostro bugtracker</a> per una lista di "
+"questo sarebbe prematuro dato lo stato del progetto (vedi anche <a "
+"href=\"https://gnunet.org/bugs/\";>il nostro bugtracker</a> per una lista di "
"questioni aperte)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Taler gestisce i pagamenti ricorrenti?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -996,8 +983,9 @@ msgid ""
"span> on the merchant's Website."
msgstr ""
"Quando effettuano un pagamento, i clienti hanno solo bisogno di un "
-"portafoglio carico. Un negoziante può accettare pagamenti <span class=\"tlr"
-"\">senza far registrare i propri clienti</span> sul sito web del negozio."
+"portafoglio carico. Un negoziante può accettare pagamenti <span "
+"class=\"tlr\">senza far registrare i propri clienti</span> sul sito web del "
+"negozio."
#: template/features.html.j2:50
msgid ""
@@ -1531,31 +1519,31 @@ msgstr "GNU Taler sulla stampa"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1583,8 +1571,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1598,8 +1586,8 @@ msgstr ""
"facilmente scegliere un altro fornitore di servizi per elaborare i loro "
"pagamenti. Per i governi, il software libero significa che GNU Taler non può "
"compromettere la sovranità imponendo restrizioni. E per gli operatori di un "
-"Taler Exchange, la trasparenza è fondamentale per soddisfare il <a href="
-"\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">principio di "
+"Taler Exchange, la trasparenza è fondamentale per soddisfare il <a "
+"href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">principio di "
"Kerckhoff</a> e instaurare la fiducia del pubblico."
#: template/principles.html.j2:49
@@ -1942,6 +1930,27 @@ msgstr "Abbonati ai nostri RSS feed"
msgid "read more"
msgstr "Leggi di più"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Se il tuo amico fornisce merci o servizi per te in cambio di un "
+#~ "pagamento, possono organizzare una rivendita a Taler e ricevere il "
+#~ "pagamento nel conto concorrente."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Le prossime versioni di Taler Wallet potranno permettere anche lo scambio "
+#~ "diretto di denaro tra amici."
+
#~ msgid "Components"
#~ msgstr "Elementi"
diff --git a/locale/ja/LC_MESSAGES/messages.po
b/locale/ja/LC_MESSAGES/messages.po
index 0339aae..a267cf3 100644
--- a/locale/ja/LC_MESSAGES/messages.po
+++ b/locale/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-22 10:35+0000\n"
"Last-Translator: Mizuhashi Lexee <nekohamushi@outlook.jp>\n"
"Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/main-";
@@ -225,10 +225,11 @@ msgstr "著作権譲渡書"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"GNU Talerプロジェクト参加者でGitアクセス権のある方は <a href=\"/pdf/"
"copyright.pdf\">著作権譲渡書</a>に署名して <a href=\"https://git.gnunet.org/";
@@ -291,8 +292,8 @@ msgstr "マーチャントバックエンド管理"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"マーチャント運用のチュートリアル及びマニュアルの<a href=\"https://";
"%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>はこちら 。"
@@ -718,27 +719,18 @@ msgstr "GNU Talerで友人に送金できますか？"
#: template/faq.html.j2:61
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"ご友人があなたの支払いの対価として商品やサービスを提供する場合、GNU Talerマー"
-"チャントを簡単に設定することでそのご友人の銀行口座で支払いを受け取ることがで"
-"きるようになります。"
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"GNU Talerウォレットの将来的な形として、友人間で直にコインを交換することができ"
-"るようになるでしょう。"
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "GNU Talerは異なる通貨での支払いをどのように処理しますか？"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -746,31 +738,31 @@ msgstr ""
"GNUTalerウォレットはユーロ、米ドル、ビットコインといった複数の異なる通貨に対"
"応するデジタルコインを持っています。"
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "GNU Talerは通貨間の変換には対応していません。"
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Talerはどのように私のプライバシーを保護しますか？"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
"signature protects your privacy as it prevents the exchange from knowing "
"which coin it signed for which customer."
msgstr ""
-"ウォレットには取引所が<a href=\"https://en.wikipedia.org/wiki/Blind_signature";
-"\">ブラインド署名</a>したデジタルコインがあります。ブラインド署名方式を使うこ"
-"とでプライバシーが保護され、取引所は署名したコインのどれがどの顧客のものかは"
-"わからない仕組みになっています。"
+"ウォレットには取引所が<a href=\"https://en.wikipedia.org/wiki/";
+"Blind_signature\">ブラインド署名</a>したデジタルコインがあります。ブラインド"
+"署名方式を使うことでプライバシーが保護され、取引所は署名したコインのどれがど"
+"の顧客のものかはわからない仕組みになっています。"
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "どのくらいの費用がかかりますか？"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -791,11 +783,11 @@ msgstr ""
"期段階での見積もりのため、詳細は監督当局による運用やバックアップに関する規則"
"に因ります。取引コストが十倍となっていることも容易に起こり得ます。"
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Talerは国際決済可能ですか？"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -811,11 +803,11 @@ msgstr ""
"に複雑な傾向です。GNU Talerとしては日々の支払いに注力しており、当面は通貨間の"
"変換には対応しない予定です。"
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr "GNU Talerは（欧州）電子マネー指令にどのように対応していますか？"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -824,7 +816,7 @@ msgstr ""
"欧州電子マネー指令はユーロ建てコインを取り扱うGNU Taler取引所が則るべき規制枠"
"組みの一部を規定していると思われます。"
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -832,7 +824,7 @@ msgstr ""
"GNUコインと通常の銀行口座にある資金間の変換を銀行はどうやって保証しているので"
"しょうか?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -847,13 +839,13 @@ msgstr ""
"通常の銀行資金へ変換する場合、その理由を確認することが各銀行の規定となってい"
"ます。"
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr "変換が行われないときや不履行の場合の問い合わせ先はどこですか？"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -872,11 +864,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "すでにTalerを使用しているプロジェクトはありますか？"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -891,11 +883,11 @@ msgstr ""
"しょう（未決課題リストに関しては<a href=\"https://gnunet.org/bugs/\";>バグ管理"
"システム</a> も併せて参照ください）。"
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "GNU Talerは自動引き落としに対応していますか？"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -946,9 +938,9 @@ msgid ""
"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
"always backed by an existing currency."
msgstr ""
-"GNU Talerの主な利用は <span class=\"tlr\">支払い決済</span>で、<span class="
-"\"tlr\">資金を保存しておく</span>ことではありません。支払いは常時既存の通貨で"
-"サポートされています。"
+"GNU Talerの主な利用は <span class=\"tlr\">支払い決済</span>で、<span "
+"class=\"tlr\">資金を保存しておく</span>ことではありません。支払いは常時既存の"
+"通貨でサポートされています。"
#: template/features.html.j2:32
msgid ""
@@ -1477,31 +1469,31 @@ msgstr "GNU Taler関連の記事"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021年"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020年"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019年"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018年"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017年"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016年"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015年"
@@ -1528,17 +1520,18 @@ msgstr ""
#: template/principles.html.j2:36
#, fuzzy
#| msgid ""
-#| "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-#| "\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
-#| "vendor lock-in meaning merchants can easily choose another service "
-#| "provider to process their payments. For countries, Free/Libre software "
-#| "means GNU Taler can not compromise sovereignty by imposing restrictions "
-#| "or requirements. And for exchange operators, transparency is crucial to "
-#| "satisfy <a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle"
-#| "\">Kerckhoff's principle</a> and to establish public confidence."
-msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+#| "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+#| "html\">Free/Libre Software</a>. For merchants, Free/Libre Software "
+#| "prevents vendor lock-in meaning merchants can easily choose another "
+#| "service provider to process their payments. For countries, Free/Libre "
+#| "software means GNU Taler can not compromise sovereignty by imposing "
+#| "restrictions or requirements. And for exchange operators, transparency is "
+#| "crucial to satisfy <a href=\"https://en.wikipedia.org/wiki/";
+#| "Kerckhoffs's_principle\">Kerckhoff's principle</a> and to establish "
+#| "public confidence."
+msgid ""
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1883,6 +1876,22 @@ msgstr "RSSフィードを購読する"
msgid "read more"
msgstr "続きを読む"
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "ご友人があなたの支払いの対価として商品やサービスを提供する場合、GNU Taler"
+#~ "マーチャントを簡単に設定することでそのご友人の銀行口座で支払いを受け取るこ"
+#~ "とができるようになります。"
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "GNU Talerウォレットの将来的な形として、友人間で直にコインを交換することが"
+#~ "できるようになるでしょう。"
+
#~ msgid "Components"
#~ msgstr "コンポーネント"
diff --git a/locale/ko/LC_MESSAGES/messages.po
b/locale/ko/LC_MESSAGES/messages.po
index 65c0b66..f94f9ae 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2021-03-20 15:15+0000\n"
"Last-Translator: Choyi Whang <choyi.whang@gmail.com>\n"
"Language-Team: Korean <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -235,10 +235,11 @@ msgstr "저작권 배정"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"GNU 탈러 컨트리뷰터(기여자)는 GNUnet과 GNU 탈러 프로젝트의 <a href=\"https://";
"git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex\">GNUnet e.V. "
@@ -295,8 +296,8 @@ msgstr "상인 백앤드(후위) 관리"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"상인으로서의 운영에 대한 사용지침서와 설명서. <a href=\"https://%(docshost)s/"
"pdf/taler-merchant-manual.pdf\">PDF</a>로도 이용 가능합니다."
@@ -357,8 +358,8 @@ msgid ""
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-"탈러 지갑 설명서 (웹익스텐션,안드로이드, CLI). 프리패키지 바이너리는 <a href="
-"\"wallet.html\">탈러 지갑 웹사이트</a>에서 다운로드가 가능합니다."
+"탈러 지갑 설명서 (웹익스텐션,안드로이드, CLI). 프리패키지 바이너리는 <a "
+"href=\"wallet.html\">탈러 지갑 웹사이트</a>에서 다운로드가 가능합니다."
#: template/docs.html.j2:115
msgid "Cashier"
@@ -723,31 +724,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "탈러를 통해 내 친구에게 돈을 송금할 수 있나요?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"당신의 친구가 당신이 지불한 돈에 대해 물건 혹은 서비스를 제공한다면, 친구는 "
-"쉽게 탈러 상인 계정을 만들어 친구 본인의 은행계좌를 통해 돈을 받을 수 있습니"
-"다."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr "이후 버전의 탈러 지갑에서는 친구 간 코인 거래도 가능할 수도 있습니다."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "탈러를 통해 다른 통화로의 지불은 어떻게 처리되나요?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -755,15 +744,15 @@ msgstr ""
"탈러 지갑은 유로, 미국달러 혹은 비트코인과 같은 다수의 다른 통화에 해당하는 "
"디지털 코인으로 저장할 수 있습니다."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "탈러는 현재 다른 통화 간 환전을 제공하지 않습니다."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "탈러는 어떻게 나의 사생활(프라이버시)을 보호하나요?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -775,11 +764,11 @@ msgstr ""
"래에서 어떤 고객이 어떤 코인을 서명했는지 알지 못하게 하기 때문에, 은닉서명"
"을 통해 당신의 사생활을 보호합니다."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "비용은 얼마인가요?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -800,11 +789,11 @@ msgstr ""
"초기 예측 비용으로, 자세한 사항은 규제 담당자의 호스팅과 백업 요건에 따라 변"
"경될 수 있으며 예측된 비용의 10배가 될 가능성도 높습니다."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "탈러를 해외 결제에 사용할 수 있나요?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -820,11 +809,11 @@ msgstr ""
"다로울만큼 복잡합니다. 탈러는 매일 일어나는 결제에 초점을 맞추고 있기 때문에 "
"가까운 미래에 통화 간 환전을 지원할 계획이 없습니다."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr "(유럽) 전자화폐 지침과 탈러는 어떻게 연관이 되어있나요?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -833,14 +822,14 @@ msgstr ""
"유럽 전자화폐 지침(European Electronic Money Directive)는 유로화로 표시된 코"
"인을 탈러로 교환할 때 따라야 할 규율 체계를 규정하고 있다고 생각합니다."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
"어느 은행이 탈러 코인과 일반적인 은행계좌 내 예치금과의 전환을 보장하나요?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -854,13 +843,13 @@ msgstr ""
"수 있습니다. 이에 상관없이, 해당 은행은 소비자들이 탈러 코인과 은행 예치금 "
"간 전환에 대한 믿음을 줄 수 있는 관련 은행 규율 하에 놓이게 됩니다."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr "미전환 혹은 미준수 사항이 생길 시 소비자는 누구에게 항의하나요?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -879,11 +868,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "이미 탈러를 사용하고 있는 프로젝트가 있나요?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -898,11 +887,11 @@ msgstr ""
"황 상 아직 이르다고 판단하고 있습니다 (공개된 이슈 관련 <a href=\"https://";
"gnunet.org/bugs/\">버그트래커</a> 참고)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "반복되는 결제를 탈러가 지원하나요?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1473,31 +1462,31 @@ msgstr "언론에서 보여지는 GNU 탈러"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021년"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020년"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019년"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018년"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017년"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016년"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015년"
@@ -1523,8 +1512,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1859,6 +1848,26 @@ msgstr "RSS 피드 구독"
msgid "read more"
msgstr "더 읽기"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "당신의 친구가 당신이 지불한 돈에 대해 물건 혹은 서비스를 제공한다면, 친구"
+#~ "는 쉽게 탈러 상인 계정을 만들어 친구 본인의 은행계좌를 통해 돈을 받을 수 "
+#~ "있습니다."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "이후 버전의 탈러 지갑에서는 친구 간 코인 거래도 가능할 수도 있습니다."
+
#~ msgid "Components"
#~ msgstr "구성요소"
diff --git a/locale/messages.pot b/locale/messages.pot
index db61036..f70798b 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+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"
@@ -633,36 +633,32 @@ msgstr ""
#: template/faq.html.j2:61
msgid ""
-"If your friends provide goods or services for you in exchange for a "
-"payment, they can easily set up a Taler merchant and receive the payment "
-"in their bank account."
+"Taler supports push and pull payments between wallets (also known as "
+"peer-to-peer payments). While the payment appears to be directly between "
+"wallets, technically the operation is intermediated by the payment "
+"service provider which will typically be legally required to identify the"
+" recipient of the funds before allowing the transaction to complete."
msgstr ""
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among "
-"friends directly as well."
-msgstr ""
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different"
" currencies such as the Euro, US Dollars or Bitcoins."
msgstr ""
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a "
"href=\"https://en.wikipedia.org/wiki/Blind_signature\";>blindly signed</a>"
@@ -671,11 +667,11 @@ msgid ""
"customer."
msgstr ""
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or"
@@ -688,11 +684,11 @@ msgid ""
" requirements from the regulator and could thus easily be 10x higher."
msgstr ""
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently"
" does not support conversion between currencies. However, in principle an"
@@ -703,24 +699,24 @@ msgid ""
"near future."
msgstr ""
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros "
"would have to follow."
msgstr ""
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank "
"money in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, "
"and that bank would hold the funds in escrow. Note that this bank could "
@@ -730,13 +726,13 @@ msgid ""
"conversion from Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -756,11 +752,11 @@ msgid ""
"European Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having"
" developed working prototypes. We are also in discussions with several "
@@ -771,11 +767,11 @@ msgid ""
"issues)."
msgstr ""
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis "
@@ -1239,31 +1235,31 @@ msgstr ""
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index 32b5b2d..fabb7ac 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2021-03-25 09:18+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Portuguese <http://weblate.taler.net/projects/gnu-taler/main-";
@@ -233,15 +233,16 @@ msgstr "Transferência dos Direitos de Autor"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Os contribuintes da GNU Taler com acesso Git devem assinar o <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> para garantir que a <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA convenção de licenciamento e do "
+"copyright.pdf\">copyright assignment</a> para garantir que a <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA convenção de licenciamento e do "
"desenvolvimento colaborativo</a> dos projetos GNUnet e GNU Taler é "
"respeitada."
@@ -305,11 +306,11 @@ msgstr "Administração de backend do comerciante"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-"Tutorial e manual para operar como vendedor. Também disponível como <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial e manual para operar como vendedor. Também disponível como <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
#: template/docs.html.j2:48
msgid "Merchant API Tutorial"
@@ -713,36 +714,32 @@ msgstr ""
#: template/faq.html.j2:61
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr ""
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
msgstr ""
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr ""
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr ""
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -750,11 +747,11 @@ msgid ""
"which coin it signed for which customer."
msgstr ""
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr ""
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -767,11 +764,11 @@ msgid ""
"regulator and could thus easily be 10x higher."
msgstr ""
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr ""
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -782,24 +779,24 @@ msgid ""
"future."
msgstr ""
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
"have to follow."
msgstr ""
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr ""
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -809,13 +806,13 @@ msgid ""
"Taler coins into regular bank money."
msgstr ""
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr ""
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -834,11 +831,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr ""
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -848,11 +845,11 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr ""
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1317,31 +1314,31 @@ msgstr ""
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
@@ -1367,8 +1364,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po
b/locale/pt_BR/LC_MESSAGES/messages.po
index 2274c62..20c67c7 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-22 10:48+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Portuguese (Brazil) <http://weblate.taler.net/projects/gnu-";
@@ -250,16 +250,17 @@ msgstr "Cessão de direitos autorais"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Contribuidores do GNU Taler com acesso ao Git devem assinar a <a href=\"/pdf/"
-"copyright.pdf\">cessão de direitos autorais</a> para garantir que <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex\";>o "
-"acordo de licença e desenvolvimento colaborativo GNUnet e.V. --- Taler "
-"Systems SA</a> dos projetos GNUnet e GNU Taler seja cumprido."
+"copyright.pdf\">cessão de direitos autorais</a> para garantir que <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">o acordo de licença e desenvolvimento colaborativo GNUnet e.V. --- "
+"Taler Systems SA</a> dos projetos GNUnet e GNU Taler seja cumprido."
#: template/copyright.html.j2:19
#, fuzzy
@@ -318,11 +319,11 @@ msgstr "Administração de back-end de comerciante"
#: template/docs.html.j2:39
#, fuzzy, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-"Tutorial e manual para operar como comerciante. Também disponível em <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial e manual para operar como comerciante. Também disponível em <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
#: template/docs.html.j2:48
#, fuzzy
@@ -774,31 +775,20 @@ msgid "Can I send money to my friends with Taler?"
msgstr "Posso enviar dinheiro por Taler a um amigo?"
#: template/faq.html.j2:61
-#, fuzzy
-msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
-msgstr ""
-"Se o seu amigo fornece bens ou serviços para você em troca de um pagamento, "
-"ele pode facilmente configurar uma conta de comerciante Taler e receber o "
-"pagamento em sua conta bancária."
-
-#: template/faq.html.j2:68
-#, fuzzy
msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Versões futuras da carteira Taler poderão permitir a troca de moedas "
-"diretamente entre amigos também."
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
#, fuzzy
msgid "How does Taler handle payments in different currencies?"
msgstr "Como funcionam pagamentos Taler em diferentes moedas?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
#, fuzzy
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
@@ -807,17 +797,17 @@ msgstr ""
"As carteiras Taler podem armazenar moedas digitais correspondentes a várias "
"moedas diferentes, como Euro, Dólares Americanos ou Bitcoins."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
#, fuzzy
msgid "Taler currently does not offer conversion between currencies."
msgstr "Atualmente, não oferecemos conversão entre moedas."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
#, fuzzy
msgid "How does Taler protect my privacy?"
msgstr "Como Taler protege minha privacidade?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
#, fuzzy
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
@@ -830,12 +820,12 @@ msgstr ""
"uso de uma assinatura oculta protege sua privacidade, assim como previne o "
"câmbio de saber qual moeda foi assinada para qual cliente."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
#, fuzzy
msgid "How much does it cost?"
msgstr "Quanto custa?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
#, fuzzy
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
@@ -860,12 +850,12 @@ msgstr ""
"solicitações de hospedagem e back-up do segurador e, portanto, chegar "
"facilmente a 10 vezes mais caros."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
#, fuzzy
msgid "Does Taler work with international payments?"
msgstr "Taler funciona com pagamentos internacionais?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
#, fuzzy
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
@@ -883,13 +873,13 @@ msgstr ""
"especialmente complexos. O nosso foco é nos pagamentos diários, então não "
"temos planos de suportar conversão entre moedas no futuro próximo."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
#, fuzzy
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
"Como é a relação entre Taler e a Diretiva (Europeia) de Dinheiro Eletrônico?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
#, fuzzy
msgid ""
"We believe the European Electronic Money Directive provides part of the "
@@ -900,7 +890,7 @@ msgstr ""
"estrutura regulatória que um câmbio de Taler com moedas denominadas em Euros "
"deveria seguir."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
#, fuzzy
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
@@ -909,7 +899,7 @@ msgstr ""
"Qual banco garantiria a conversão entre as moedas Taler e o dinheiro do "
"banco em contas bancárias quaisquer?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
#, fuzzy
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
@@ -926,7 +916,7 @@ msgstr ""
"bancárias, demonstrando o motivo pelo qual consumidores teriam fé na "
"conversão de modeas Taler para dinheiro de bancos comuns."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
#, fuzzy
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
@@ -935,7 +925,7 @@ msgstr ""
"A quem os consumidores reclamariam em caso de não conversão ou não "
"conformidade?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -954,12 +944,12 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
#, fuzzy
msgid "Are there any projects already using Taler?"
msgstr "Já existem projetos usando Taler?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -969,12 +959,12 @@ msgid ""
"gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
msgstr ""
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
#, fuzzy
msgid "Does Taler support recurring payments?"
msgstr "Taler funciona com pagamentos internacionais?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1438,31 +1428,31 @@ msgstr ""
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
@@ -1487,8 +1477,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1766,6 +1756,24 @@ msgstr "Inscrever-se no Feed RSS"
msgid "read more"
msgstr "ler mais"
+#, fuzzy
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Se o seu amigo fornece bens ou serviços para você em troca de um "
+#~ "pagamento, ele pode facilmente configurar uma conta de comerciante Taler "
+#~ "e receber o pagamento em sua conta bancária."
+
+#, fuzzy
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Versões futuras da carteira Taler poderão permitir a troca de moedas "
+#~ "diretamente entre amigos também."
+
#~ msgid "Components"
#~ msgstr "Componentes"
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index 7d13755..ba2fb48 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-10 22:16+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Russian <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -16,8 +16,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.4.2\n"
"Generated-By: Babel 2.5.1\n"
@@ -233,10 +233,11 @@ msgstr "Передача авторского права"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Контрибуторы - участники, вносящие вклад в разработку GNU Taler, с доступом "
"к Git должны подписать <a href=\"/pdf/copyright.pdf\">соглашение о передаче "
@@ -306,8 +307,8 @@ msgstr "Управление бэкэндом продавца"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Руководство по управлению работой продавца. Также достопупно в формате <a "
"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
@@ -370,8 +371,8 @@ msgid ""
"Web site</a>."
msgstr ""
"Инструкция разработчика по настройке кошелька Таler (WebExtensions, Android, "
-"CLI). Скомпилированные бинарные файлы можно скачать со страницы <a href="
-"\"wallet.html\">Taler Кошелёк</a>."
+"CLI). Скомпилированные бинарные файлы можно скачать со страницы <a "
+"href=\"wallet.html\">Taler Кошелёк</a>."
#: template/docs.html.j2:115
msgid "Cashier"
@@ -733,33 +734,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "Могу ли я отправить деньги другу с помощью Taler?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
-msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
-msgstr ""
-"Если ваш друг продает вам товар или оказывает услуги за деньги, то он может "
-"установить компонент «Taler Мерчант» и принимать платёж на его банковский "
-"счёт."
-
-#: template/faq.html.j2:68
msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Новые версии кошелька Taler также позволят друзьям напрямую обмениваться "
-"монетами между собой."
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Как Taler работает с платежами в разной валюте?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -767,15 +754,15 @@ msgstr ""
"Кошельки Taler поддерживают хранение цифровых монет, соотносящихся с "
"несколькими разными валютами, такими как евро, доллар США и биткойн."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "На данный момент Taler не поддерживает конвертацию валюты."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Как Taler обеспечивает защиту моих данных?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -783,16 +770,16 @@ msgid ""
"which coin it signed for which customer."
msgstr ""
"Ваш кошелёк хранит цифровые монеты, подписанные биржей вслепую. "
-"Использование <a href=\"https://en.wikipedia.org/wiki/Blind_signature";
-"\">метода «подписи вслепую»</a> обеспечивает защиту ваших данных, так как "
-"это не позволяет бирже видеть информацию о том, какая монета и для какого "
-"покупателя была подписана."
+"Использование <a href=\"https://en.wikipedia.org/wiki/";
+"Blind_signature\">метода «подписи вслепую»</a> обеспечивает защиту ваших "
+"данных, так как это не позволяет бирже видеть информацию о том, какая монета "
+"и для какого покупателя была подписана."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "Какова стоимость транзакций?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -817,11 +804,11 @@ msgstr ""
"хостингу и резервному копированию и, таким образом, запросто повысить ее в "
"десять раз."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Работает ли Taler с международными платежами?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -839,11 +826,11 @@ msgstr ""
"повседневными платежами, поэтому мы не планируем поддерживать конвертацию "
"валюты в ближайшем будущем."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr "Как Директива ЕС по электронным деньгам затрагивает Taler?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -854,7 +841,7 @@ msgstr ""
"которым Taler должен будет руководствоваться при работе с обменом монет, "
"деноминированных в евро."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -862,7 +849,7 @@ msgstr ""
"Какой банк может гарантировать конвертацию монет Taler в безналичные деньги, "
"хранящиеся на счёте в банке?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -878,7 +865,7 @@ msgstr ""
"под соответствующее регулирование. Это даёт потребителям основание уверенно "
"конвертировать монеты Taler в безналичные деньги."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
@@ -886,7 +873,7 @@ msgstr ""
"Куда потребитель может подать жалобу в случае отказа от конвертации или "
"несоблюдения требований?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -905,11 +892,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "Какие проекты используют Taler?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -926,11 +913,11 @@ msgstr ""
"<a href=\"https://gnunet.org/bugs/\";>система отслеживания ошибок</a> и "
"список ошибок)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Поддерживает ли Taler регулярные платежи?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -973,11 +960,12 @@ msgid ""
"through payments with GNU Taler. This helps to <span class=\"tlr\">avoid tax "
"evasion and money laundering</span>."
msgstr ""
-"GNU Taler - платёжная система, обеспечивающая <span class=\"tlr"
-"\">сохранность конфиденциальности персональных данных</span>. Покупатели "
-"могут оставаться анонимными, а продавцы не могут скрывать информацию о своих "
-"доходах посредством платежей через GNU Taler. Это помогает <span class=\"tlr"
-"\">избежать уклонения от уплаты налогов и отмывания денег</span>."
+"GNU Taler - платёжная система, обеспечивающая <span "
+"class=\"tlr\">сохранность конфиденциальности персональных данных</span>. "
+"Покупатели могут оставаться анонимными, а продавцы не могут скрывать "
+"информацию о своих доходах посредством платежей через GNU Taler. Это "
+"помогает <span class=\"tlr\">избежать уклонения от уплаты налогов и "
+"отмывания денег</span>."
#: template/features.html.j2:23
msgid ""
@@ -1477,31 +1465,31 @@ msgstr "GNU Taler: особенности"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr ""
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr ""
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr ""
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr ""
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr ""
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr ""
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr ""
@@ -1525,8 +1513,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1898,6 +1886,27 @@ msgstr "подпишитесь на нашу RSS-ленту"
msgid "read more"
msgstr "Подробнее"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Если ваш друг продает вам товар или оказывает услуги за деньги, то он "
+#~ "может установить компонент «Taler Мерчант» и принимать платёж на его "
+#~ "банковский счёт."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Новые версии кошелька Taler также позволят друзьям напрямую обмениваться "
+#~ "монетами между собой."
+
#~ msgid "Components"
#~ msgstr "Компоненты"
diff --git a/locale/sv/LC_MESSAGES/messages.po
b/locale/sv/LC_MESSAGES/messages.po
index 5a1e8d8..d821d2d 100644
--- a/locale/sv/LC_MESSAGES/messages.po
+++ b/locale/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-02-11 12:44+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Swedish <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -231,10 +231,11 @@ msgstr "Upphovsrätt"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Utvecklare till GNU Taler med Git access måste underteckna <a href=\"/pdf/"
"copyright.pdf\"> upphovsrättsavtalet </a>för att säkerställa att<a href = "
@@ -293,11 +294,11 @@ msgstr "Säljarens Backend hantering"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-"Handledning och manual för drift av en säljare. Finns även som <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\"> PDF </a>."
+"Handledning och manual för drift av en säljare. Finns även som <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\"> PDF </a>."
#: template/docs.html.j2:48
msgid "Merchant API Tutorial"
@@ -726,33 +727,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "Kan jag skicka pengar till en vän med Taler?"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Om din vän säljer varor eller tjänster till dig i utbyte mot en betalning "
-"kan de enkelt sätta upp en Taler-säljare och ta emot betalningen på sitt "
-"bankkonto."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"Framtida versioner av Taler-plånboken kan också göra det möjligt att direkt "
-"överföra mynt mellan vänner."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Hur hanterar Taler betalningar i olika valutor?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -760,15 +747,15 @@ msgstr ""
"Talerplånböcker kan lagra digitala mynt som motsvarar flera olika valutor "
"som euro, amerikanska dollar eller bitcoins."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "Taler erbjuder för närvarande inte konvertering mellan valutor."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Hur skyddar Taler min integritet?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -781,11 +768,11 @@ msgstr ""
"förhindrar växlingskontoret från att veta vilket mynt det signerade eller "
"vilken kund."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "Hur mycket kostar det?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -808,11 +795,11 @@ msgstr ""
"säkerhetskopieringskrav från tillsynsmyndigheter och kan därför lätt bli 10 "
"gånger högre."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Fungerar Taler med internationella betalningar?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -829,12 +816,12 @@ msgstr ""
"betalningar, så vi har inga planer på att stödja valutakonvertering inom en "
"snar framtid."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
"Hur relaterar Taler till (det europeiska) direktivet om elektroniska pengar?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -843,7 +830,7 @@ msgstr ""
"Vi tror att det europeiska direktivet om elektroniska pengar utgör en del av "
"regelverket som ett Taler-växlingskontor för Euro skulle behöva följa."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -851,7 +838,7 @@ msgstr ""
"Vilken bank skulle garantera omvandlingen mellan Taler-mynt och bankpengar "
"till vanliga bankkonton?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -867,7 +854,7 @@ msgstr ""
"anledning till att konsumenterna skulle tro på omvandlingen från Taler-mynt "
"till vanliga pengar."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
@@ -875,7 +862,7 @@ msgstr ""
"Till vem skulle konsumenter klaga på i händelse av bristande omvandling "
"eller bristande efterlevnad?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -894,11 +881,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "Finns det några projekt som redan använder Taler?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -914,11 +901,11 @@ msgstr ""
"projektets tillstånd (se även <a href=\"https://gnunet.org/bugs/\";> vår "
"bugtracker </a> för en lista över öppna problem)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Stöder Taler återkommande betalningar?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1532,31 +1519,31 @@ msgstr "GNU Taler i Pressen"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1582,8 +1569,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1591,8 +1578,8 @@ msgid ""
"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
"principle</a> and to establish public confidence."
msgstr ""
-"GNU Taler måste vara <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Fri programvara</a>. För säljare förhindrar Free / Libre Software "
+"GNU Taler måste vara <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Fri programvara</a>. För säljare förhindrar Free / Libre Software "
"leverantörslås, vilket innebär att säljare enkelt kan välja en annan "
"tjänsteleverantör för att behandla sina betalningar. För länder betyder fri "
"programvara att GNU Taler inte kan äventyra suveräniteten genom att införa "
@@ -1932,6 +1919,27 @@ msgstr "prenumerera på vårt RSS-flöde"
msgid "read more"
msgstr "läs mer"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Om din vän säljer varor eller tjänster till dig i utbyte mot en betalning "
+#~ "kan de enkelt sätta upp en Taler-säljare och ta emot betalningen på sitt "
+#~ "bankkonto."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Framtida versioner av Taler-plånboken kan också göra det möjligt att "
+#~ "direkt överföra mynt mellan vänner."
+
#~ msgid "Components"
#~ msgstr "Komponenter"
@@ -2250,8 +2258,8 @@ msgstr "läs mer"
#~ msgstr "Vår teknologi"
#~ msgid ""
-#~ "All transactions in Taler are secured using <a href=\"bibliography.html"
-#~ "\">modern cryptography</a> and trust in all parties is minimized. "
+#~ "All transactions in Taler are secured using <a href=\"bibliography."
+#~ "html\">modern cryptography</a> and trust in all parties is minimized. "
#~ "Financial damage is bounded (for customers, merchants and the "
#~ "exchange) even in the case that systems are compromised and private "
#~ "keys are stolen. Databases can be audited for consistency, resulting in "
@@ -2259,13 +2267,13 @@ msgstr "läs mer"
#~ "participants were honest. Actual transaction costs are fractions of a "
#~ "cent."
#~ msgstr ""
-#~ "Alla transaktioner i Taler är skyddade med <a href=\"bibliography.html"
-#~ "\">modern kryptering</a> och förtroendet för alla parter ökas. Ekonomisk "
-#~ "skada begränsas (för kunder, handlare och börsen) även om "
-#~ "systemen hackas och privata nycklar blir stulna. Databaser kan granskas "
-#~ "för konsistens, vilket antingen upptäcker komprometterade system eller "
-#~ "visar att deltagarna var ärliga. De faktiska transaktionskostnaderna är "
-#~ "bråkdelar av en krona."
+#~ "Alla transaktioner i Taler är skyddade med <a href=\"bibliography."
+#~ "html\">modern kryptering</a> och förtroendet för alla parter ökas. "
+#~ "Ekonomisk skada begränsas (för kunder, handlare och börsen) "
+#~ "även om systemen hackas och privata nycklar blir stulna. Databaser kan "
+#~ "granskas för konsistens, vilket antingen upptäcker komprometterade system "
+#~ "eller visar att deltagarna var ärliga. De faktiska "
+#~ "transaktionskostnaderna är bråkdelar av en krona."
#~ msgid "The Business"
#~ msgstr "Verksamheten"
diff --git a/locale/tr/LC_MESSAGES/messages.po
b/locale/tr/LC_MESSAGES/messages.po
index 14e14b9..14d9258 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2022-03-10 18:04+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: Turkish <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -228,15 +228,16 @@ msgstr "Telif Hakkı Ataması"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"Git erişimine sahip GNU Taler'a katkıda bulunanlar, <a href=\"/pdf/copyright."
-"pdf\">telif hakkı atamasını</a> imzalamak zorundadır sebebi <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA lisanslama ve işbirliğine dayalı "
+"pdf\">telif hakkı atamasını</a> imzalamak zorundadır sebebi <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA lisanslama ve işbirliğine dayalı "
"geliştirme anlaşması</a> GNUnet ve GNU Taler projelerinden incelenebilir."
#: template/copyright.html.j2:19
@@ -289,8 +290,8 @@ msgstr "Satıcı Backend(Sistem tarafı) Yönetimi"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Bir işletme için eğitim ve kılavuzumuz. <a href=\"https://%(docshost)s/pdf/"
"taler-merchant-manual.pdf\"> PDF </a> olarak da mevcuttur."
@@ -725,26 +726,18 @@ msgstr "Taler ile arkadaşlarıma para gönderebilir miyim?"
#: template/faq.html.j2:61
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"Arkadaşlarınız size bir ödeme karşılığında mal veya hizmet sağlarsa, kolayca "
-"bir Taler tüccarı kurabilir ve ödemeyi banka hesaplarına alabilirler."
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr ""
-"Taler cüzdanının gelecekteki sürümleri, doğrudan arkadaşlar arasında para "
-"alışverişine de izin verebilir."
-
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Taler, farklı para birimlerindeki ödemeleri nasıl ele alır?"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -752,15 +745,15 @@ msgstr ""
"Taler cüzdanlar, Euro, ABD Doları veya Bitcoin gibi birden fazla farklı para "
"birimine karşılık gelen dijital paraları saklayabilir."
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "Taler şu anda para birimleri arasında dönüştürme sunmamaktadır."
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Taler mahremiyetimi nasıl koruyor?"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -772,11 +765,11 @@ msgstr ""
"imza kullanımı, takasın hangi parayı hangi müşteri için imzaladığını "
"bilmesini engellediği için gizliliğinizi korur."
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "Fiyatı ne kadar?"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -800,11 +793,11 @@ msgstr ""
"gereksinimlerine bağlı olabileceğini ve bu nedenle kolayca 10 kat daha "
"yüksek olabileceğini unutmayın."
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Taler uluslararası ödemelerde çalışıyor mu?"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -822,12 +815,12 @@ msgstr ""
"günlük ödemelerdir, bu nedenle yakın gelecekte para birimi dönüştürmeyi "
"destekleme planımız yoktur."
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr ""
"Taler'in (Avrupa) Elektronik Para Direktifi ile nasıl bir ilişkisi var?"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -836,7 +829,7 @@ msgstr ""
"Avrupa Elektronik Para Direktifi'nin düzenleyici çerçevenin bir bölümünü "
"Euro cinsinden paralarla Taler takasının takip etmesi gerektiğine inanıyoruz."
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
@@ -844,7 +837,7 @@ msgstr ""
"Normal banka hesaplarında Taler coinleri ile banka parası arasındaki "
"dönüşümü hangi banka garanti eder?"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -860,7 +853,7 @@ msgstr ""
"paralarının normal banka parasına dönüştürülmesine neden inandıklarını "
"belirleyen ilgili bankacılık düzenlemelerine tabi olacaktı."
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
@@ -868,7 +861,7 @@ msgstr ""
"Dönüşüm olmaması veya uyumsuzluk durumunda tüketiciler kime şikayette "
"bulunur?"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -887,11 +880,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "Halihazırda Taler kullanan herhangi bir proje var mı?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -907,11 +900,11 @@ msgstr ""
"olacağına inanıyoruz (ayrıca bkz. <a href=\"https://gnunet.org/bugs/\";> hata "
"takip aracımıza </a> açık sorunların listesi için)."
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Taler, yinelenen ödemeleri destekliyor mu?"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -955,9 +948,9 @@ msgid ""
msgstr ""
"GNU Taler, <span class=\"tlr\">gizliliği koruyan</span> bir ödeme "
"sistemidir. Müşteriler anonim kalabilir, ancak tüccarlar GNU Taler ile "
-"yapılan ödemeler yoluyla gelirlerini gizleyemezler. Bu, <span class=\"tlr"
-"\">vergi kaçakçılığının ve kara para aklamanın önlenmesine</span> yardımcı "
-"olur."
+"yapılan ödemeler yoluyla gelirlerini gizleyemezler. Bu, <span "
+"class=\"tlr\">vergi kaçakçılığının ve kara para aklamanın önlenmesine</span> "
+"yardımcı olur."
#: template/features.html.j2:23
msgid ""
@@ -1214,9 +1207,9 @@ msgid ""
"organizations (and <a href=\"https://weblate.taler.net/stats/\";>all the "
"volunteers</a> that are helping with the translation effort):"
msgstr ""
-"Çeviri çalışmalarına yardımcı olan aşağıdaki kuruluşlara (ve <a href="
-"\"https://weblate.taler.net/stats/\";>tüm gönüllülere</a>) sunulan çeviri "
-"desteği için minnettarız:"
+"Çeviri çalışmalarına yardımcı olan aşağıdaki kuruluşlara (ve <a "
+"href=\"https://weblate.taler.net/stats/\";>tüm gönüllülere</a>) sunulan "
+"çeviri desteği için minnettarız:"
#: template/funding.html.j2:62
msgid "Past funding"
@@ -1526,31 +1519,31 @@ msgstr "Basında GNU Taler haberleri"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1576,8 +1569,8 @@ msgstr ""
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1931,6 +1924,22 @@ msgstr "RSS akışına abone olun"
msgid "read more"
msgstr "daha fazlasını okumak için"
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "Arkadaşlarınız size bir ödeme karşılığında mal veya hizmet sağlarsa, "
+#~ "kolayca bir Taler tüccarı kurabilir ve ödemeyi banka hesaplarına "
+#~ "alabilirler."
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr ""
+#~ "Taler cüzdanının gelecekteki sürümleri, doğrudan arkadaşlar arasında para "
+#~ "alışverişine de izin verebilir."
+
#~ msgid "Components"
#~ msgstr "Bileşenler"
@@ -2107,9 +2116,9 @@ msgstr "daha fazlasını okumak için"
#~ "be found <a href=\"https://docs.taler.net/api/api-merchant.html#dynamic-";
#~ "merchant-instance\">here</a>."
#~ msgstr ""
-#~ "Satıcı merkezini dinamik olarak yönetmek için API dokümantasyonu <a href="
-#~ "\"https://docs.taler.net/api/api-merchant.html#dynamic-merchant-instance";
-#~ "\">burada</a> bulunabilir."
+#~ "Satıcı merkezini dinamik olarak yönetmek için API dokümantasyonu <a "
+#~ "href=\"https://docs.taler.net/api/api-merchant.html#dynamic-merchant-";
+#~ "instance\">burada</a> bulunabilir."
#~ msgid "Use Case Diagram"
#~ msgstr "Kullanım Şeması"
@@ -2250,8 +2259,8 @@ msgstr "daha fazlasını okumak için"
#~ msgstr "Teknolojilerimiz"
#~ msgid ""
-#~ "All transactions in Taler are secured using <a href=\"bibliography.html"
-#~ "\">modern cryptography</a> and trust in all parties is minimized. "
+#~ "All transactions in Taler are secured using <a href=\"bibliography."
+#~ "html\">modern cryptography</a> and trust in all parties is minimized. "
#~ "Financial damage is bounded (for customers, merchants and the "
#~ "exchange) even in the case that systems are compromised and private "
#~ "keys are stolen. Databases can be audited for consistency, resulting in "
diff --git a/locale/zh_Hans/LC_MESSAGES/messages.po
b/locale/zh_Hans/LC_MESSAGES/messages.po
index 7cb7cde..042c826 100644
--- a/locale/zh_Hans/LC_MESSAGES/messages.po
+++ b/locale/zh_Hans/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2021-08-24 09:07+0000\n"
"Last-Translator: Yiyuan Zhou <hi7fair@gmail.com>\n"
"Language-Team: Chinese (Simplified) <http://weblate.taler.net/projects/gnu-";
@@ -221,10 +221,11 @@ msgstr "版权声明"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"有Git权限的GNU Taler的贡献者必须签署<a href=\"/pdf/copyright.pdf\">版权转让</"
"a>，以确保满足<a href=\"https://git.gnunet.org/gnunet-ev.git/tree/";
@@ -278,8 +279,8 @@ msgstr "商户后台管理"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"经营商户的教程和手册。也可见 <a href=\"https://%(docshost)s/pdf/taler-"
"merchant-manual.pdf\">PDF</a>。"
@@ -340,8 +341,8 @@ msgid ""
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-"Taler钱包（WebExtensions, Android, CLI）手册。你可以从<a href=\"wallet.html"
-"\">Taler钱包网站</a>下载预先打包的二进制文件。"
+"Taler钱包（WebExtensions, Android, CLI）手册。你可以从<a href=\"wallet."
+"html\">Taler钱包网站</a>下载预先打包的二进制文件。"
#: template/docs.html.j2:115
msgid "Cashier"
@@ -701,45 +702,34 @@ msgid "Can I send money to my friends with Taler?"
msgstr "我可以用 Taler 给我的朋友汇款吗？"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"如果您的朋友为您提供商品或服务以换取付款，他们可以轻松创建一个 Taler 商家，并"
-"通过他们的银行帐户接收付款。"
-
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr "未来版本的Taler钱包也可能允许直接在朋友之间交换电子货币。"
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Taler如何处理不同货币的支付？"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
msgstr ""
"Taler 钱包可以存储与多种不同货币相对应的数字货币，如欧元、美元或比特币。"
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "目前，Taler不支持不同货币之间的兑换。"
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Taler 如何保护我的隐私？"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -750,11 +740,11 @@ msgstr ""
"Blind_signature\">盲签名</a>的数字货币。使用盲签可以保护您的隐私，因为它可以"
"防止交易所知道它为哪个客户签署了哪种货币。"
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "它的费用是多少？"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -772,11 +762,11 @@ msgstr ""
"下，按数十亿交易分摊，不包括迁移成本）。 请注意，这只是一个早期估计，细节可能"
"取决于监管机构的托管和备份要求。因此，最终可能很容易高出数10 倍。"
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Taler是否支持国际收支？"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -791,11 +781,11 @@ msgstr ""
"管障碍往往特别复杂。 Taler 的重心是日常支付，因此我们近期没有支持外汇兑换的计"
"划。"
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr "Taler与（欧盟）电子货币指令有什么关系？"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -804,13 +794,13 @@ msgstr ""
"我们认为，欧盟电子货币指令是以欧元计价的Taler交易所必须遵循的监管框架的一部"
"分。"
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr "哪家银行会保证 Taler 货币和普通银行账户中的银行货币之间的转换？"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -824,13 +814,13 @@ msgstr ""
"该银行都将遵循其所属的银行法规，这也是消费者可以信任Taler货币兑换为普通银行货"
"币的原因。"
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr "如果出现无法兑换或不遵守规定的情况，消费者向谁投诉？"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -849,11 +839,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "是否有项目已经在使用Taler？"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -867,11 +857,11 @@ msgstr ""
"项目的状态，我们认为目前还为时过早（另请参阅我们的<a href=\"https://gnunet.";
"org/bugs/\">错误跟踪器</a> 获取未决问题清单）。"
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Taler支持定期付款吗？"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -907,8 +897,8 @@ msgid ""
"evasion and money laundering</span>."
msgstr ""
"GNU Taler 是一个<span class=\"tlr\">保护隐私的</span>支付系统。顾客可以保持匿"
-"名，但商家不能通过使用GNU Taler付款来隐藏他们的收入。这有助于<span class="
-"\"tlr\">避免逃税和洗钱</span>。"
+"名，但商家不能通过使用GNU Taler付款来隐藏他们的收入。这有助于<span "
+"class=\"tlr\">避免逃税和洗钱</span>。"
#: template/features.html.j2:23
msgid ""
@@ -916,8 +906,8 @@ msgid ""
"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
"always backed by an existing currency."
msgstr ""
-"GNU Taler 的主要用途是<span class=\"tlr\">支付</span>；而非<span class=\"tlr"
-"\">价值存储</span>。支付始终由现有货币支持。"
+"GNU Taler 的主要用途是<span class=\"tlr\">支付</span>；而非<span "
+"class=\"tlr\">价值存储</span>。支付始终由现有货币支持。"
#: template/features.html.j2:32
msgid ""
@@ -934,8 +924,8 @@ msgid ""
"accept payments <span class=\"tlr\">without making their customers register</"
"span> on the merchant's Website."
msgstr ""
-"付款时，客户只需要一个已充值的钱包。 商家可以直接接收付款<span class=\"tlr"
-"\">，而无需客户在商家's网站上注册</span>。"
+"付款时，客户只需要一个已充值的钱包。 商家可以直接接收付款<span "
+"class=\"tlr\">，而无需客户在商家's网站上注册</span>。"
#: template/features.html.j2:50
msgid ""
@@ -1413,31 +1403,31 @@ msgstr "GNU Taler在媒体上的报道"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1461,8 +1451,8 @@ msgstr "...在计算机领域，自由意味着不使用专利软件"
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1777,6 +1767,24 @@ msgstr "订阅我们的 RSS 提要"
msgid "read more"
msgstr "阅读更多"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "如果您的朋友为您提供商品或服务以换取付款，他们可以轻松创建一个 Taler 商"
+#~ "家，并通过他们的银行帐户接收付款。"
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr "未来版本的Taler钱包也可能允许直接在朋友之间交换电子货币。"
+
#~ msgid "Components"
#~ msgstr "组成部分"
diff --git a/locale/zh_Hant/LC_MESSAGES/messages.po
b/locale/zh_Hant/LC_MESSAGES/messages.po
index 000a9c2..4ddaad9 100644
--- a/locale/zh_Hant/LC_MESSAGES/messages.po
+++ b/locale/zh_Hant/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-16 23:46+0200\n"
+"POT-Creation-Date: 2022-10-14 20:31+0200\n"
"PO-Revision-Date: 2021-08-23 08:58+0000\n"
"Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
"Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/gnu-";
@@ -222,10 +222,11 @@ msgstr "版權轉讓"
#: template/copyright.html.j2:8
msgid ""
"Contributors to GNU Taler with Git access must sign the <a href=\"/pdf/"
-"copyright.pdf\">copyright assignment</a> to ensure that the <a href="
-"\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex";
-"\">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative "
-"development</a> of the GNUnet and GNU Taler projects is satisfied."
+"copyright.pdf\">copyright assignment</a> to ensure that the <a "
+"href=\"https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.";
+"tex\">GNUnet e.V. --- Taler Systems SA agreement on licensing and "
+"collaborative development</a> of the GNUnet and GNU Taler projects is "
+"satisfied."
msgstr ""
"擁有 Git 存取權限的 GNU Taler 貢獻者必須簽署 <a href=\"/pdf/copyright.pdf\">"
"版權轉讓</a> ，以確保已滿足 GNUnet 與 GNU Taler 項目的<a href=\"https://git.";
@@ -279,8 +280,8 @@ msgstr "商家後端管理"
#: template/docs.html.j2:39
#, python-format
msgid ""
-"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"經營商家的教學以及操作手冊也有 <a href=\"https://%(docshost)s/pdf/taler-"
"merchant-manual.pdf\">PDF</a>檔案可供參考。"
@@ -341,9 +342,9 @@ msgid ""
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-"關於 Taler wallets 的手冊 (WebExtensions, Android, CLI)。您可以從 <a href="
-"\"wallet.html\">Taler wallet 的網站</a>下載預包裝的二進制文件 (pre-packaged "
-"binaries)。"
+"關於 Taler wallets 的手冊 (WebExtensions, Android, CLI)。您可以從 <a "
+"href=\"wallet.html\">Taler wallet 的網站</a>下載預包裝的二進制文件 (pre-"
+"packaged binaries)。"
#: template/docs.html.j2:115
msgid "Cashier"
@@ -703,30 +704,19 @@ msgid "Can I send money to my friends with Taler?"
msgstr "我可以透過 Taler 轉帳給我的朋友嗎？"
#: template/faq.html.j2:61
-#, fuzzy
-#| msgid ""
-#| "If your friend provides goods or services for you in exchange for a "
-#| "payment, they can easily set up a Taler merchant and receive the payment "
-#| "in their bank account."
msgid ""
-"If your friends provide goods or services for you in exchange for a payment, "
-"they can easily set up a Taler merchant and receive the payment in their "
-"bank account."
+"Taler supports push and pull payments between wallets (also known as peer-to-"
+"peer payments). While the payment appears to be directly between wallets, "
+"technically the operation is intermediated by the payment service provider "
+"which will typically be legally required to identify the recipient of the "
+"funds before allowing the transaction to complete."
msgstr ""
-"如果您的朋友為您提供商品或服務以換取付款，他們可以輕鬆地建立 Taler merchant "
-"並通過其銀行帳戶接收付款。"
-
-#: template/faq.html.j2:68
-msgid ""
-"Future versions of the Taler wallet may allow exchanging coins among friends "
-"directly as well."
-msgstr "未來版本的 Taler 錢包也可能允許朋友之間直接交換貨幣。"
-#: template/faq.html.j2:74
+#: template/faq.html.j2:66
msgid "How does Taler handle payments in different currencies?"
msgstr "Taler 如何處理不同幣值的款項？"
-#: template/faq.html.j2:76
+#: template/faq.html.j2:68
msgid ""
"Taler wallets can store digital coins corresponding to multiple different "
"currencies such as the Euro, US Dollars or Bitcoins."
@@ -734,15 +724,15 @@ msgstr ""
"Taler 錢包可以存儲與多種不同相對應貨幣（例如，歐元，美元或比特幣）的數位貨"
"幣。"
-#: template/faq.html.j2:82
+#: template/faq.html.j2:74
msgid "Taler currently does not offer conversion between currencies."
msgstr "Taler 目前不提供貨幣之間的轉換。"
-#: template/faq.html.j2:87
+#: template/faq.html.j2:79
msgid "How does Taler protect my privacy?"
msgstr "Taler 如何保護我的隱私？"
-#: template/faq.html.j2:89
+#: template/faq.html.j2:81
msgid ""
"Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/";
"wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -753,11 +743,11 @@ msgstr ""
"Blind_signature\">盲簽名</a>的數位硬幣。由於盲簽名防止交易所得知該錢幣被哪個"
"顧客所簽署，盲簽名可以用來保護您的隱私。"
-#: template/faq.html.j2:99
+#: template/faq.html.j2:91
msgid "How much does it cost?"
msgstr "這需要花費多少錢？"
-#: template/faq.html.j2:101
+#: template/faq.html.j2:93
msgid ""
"The Taler protocol allows any exchange to set its own fee structure, "
"allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -776,11 +766,11 @@ msgstr ""
"期的估計數字，更多細節可能會取決於管理機關對於託管以及備份的相關要求，因此，"
"這個數字可能會很容易地比預期的高出 10 倍以上。"
-#: template/faq.html.j2:115
+#: template/faq.html.j2:107
msgid "Does Taler work with international payments?"
msgstr "Taler 支持跨國轉帳嗎？"
-#: template/faq.html.j2:117
+#: template/faq.html.j2:109
msgid ""
"Taler's wallet supports multiple currencies, but the system currently "
"does not support conversion between currencies. However, in principle an "
@@ -795,11 +785,11 @@ msgstr ""
"往往十分複雜。Taler 所著重的是日常的付款，所以我們近期並沒有計畫支持貨幣轉換"
"的功能。"
-#: template/faq.html.j2:128
+#: template/faq.html.j2:120
msgid "How does Taler relate to the (European) Electronic Money Directive?"
msgstr "Taler 與（歐洲）電子貨幣指令有甚麼關係？"
-#: template/faq.html.j2:130
+#: template/faq.html.j2:122
msgid ""
"We believe the European Electronic Money Directive provides part of the "
"regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -808,13 +798,13 @@ msgstr ""
"我們認為，《歐洲電子貨幣指令》是以歐元計價的 Taler 交易所必須遵循的監管框架的"
"一部分。"
-#: template/faq.html.j2:137
+#: template/faq.html.j2:129
msgid ""
"What bank would guarantee the conversion between Taler coins and bank money "
"in regular bank accounts?"
msgstr "哪家銀行可以保證 Taler 貨幣與常規銀行帳戶中的銀行貨幣之間的轉換？"
-#: template/faq.html.j2:139
+#: template/faq.html.j2:131
msgid ""
"The exchange would be operated by a bank or in cooperation with a bank, and "
"that bank would hold the funds in escrow. Note that this bank could be a "
@@ -828,13 +818,13 @@ msgstr ""
"遵循其所屬的銀行法規，這也是消費者可以信任 Taler 貨幣兌換成普通銀行貨幣的原"
"因。"
-#: template/faq.html.j2:148
+#: template/faq.html.j2:140
msgid ""
"To whom would consumers complain to in case of non-conversion or non-"
"compliance?"
msgstr "如果出現無法兌換或是不遵守規定的情況，消費者該向誰投訴？"
-#: template/faq.html.j2:150
+#: template/faq.html.j2:142
msgid ""
"From a technical point of view, any exchange is audited by one or more "
"independent auditors. Merchants and consumer wallets will report certain "
@@ -853,11 +843,11 @@ msgid ""
"Union."
msgstr ""
-#: template/faq.html.j2:158
+#: template/faq.html.j2:150
msgid "Are there any projects already using Taler?"
msgstr "有任何項目已經在使用 Taler 了嗎?"
-#: template/faq.html.j2:160
+#: template/faq.html.j2:152
msgid ""
"We are aware of several businesses running exploratory projects or having "
"developed working prototypes. We are also in discussions with several "
@@ -871,11 +861,11 @@ msgstr ""
"為這對於此計畫目前的狀態來說言之過早（請一併查看<a href=\"https://gnunet.org/";
"bugs/\">我們的 bugtracker</a> 以檢視未解決問題清單）。"
-#: template/faq.html.j2:171
+#: template/faq.html.j2:163
msgid "Does Taler support recurring payments?"
msgstr "Taler 支援定期付款嗎？"
-#: template/faq.html.j2:173
+#: template/faq.html.j2:165
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -921,8 +911,8 @@ msgid ""
"is <span class=\"tlr\">not meant as a store</span> of value. Payments are "
"always backed by an existing currency."
msgstr ""
-"GNU Taler 的主要用途是<span class=\"tlr\">付款</span>；而非<span class=\"tlr"
-"\">儲存</span>價值。付款始終以現有貨幣支援。"
+"GNU Taler 的主要用途是<span class=\"tlr\">付款</span>；而非<span "
+"class=\"tlr\">儲存</span>價值。付款始終以現有貨幣支援。"
#: template/features.html.j2:32
msgid ""
@@ -930,8 +920,8 @@ msgid ""
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
-"在通過 Exchange 服務（即 Taler 的付款服務提供商）的幫助下，將<span class="
-"\"tlr\">現有的貨幣轉換</span>為<em>電子貨幣</em>後，即可進行付款。"
+"在通過 Exchange 服務（即 Taler 的付款服務提供商）的幫助下，將<span "
+"class=\"tlr\">現有的貨幣轉換</span>為<em>電子貨幣</em>後，即可進行付款。"
#: template/features.html.j2:41
msgid ""
@@ -1418,31 +1408,31 @@ msgstr "報導中的 GNU Taler"
msgid "2022"
msgstr ""
-#: template/press.html.j2:10
+#: template/press.html.j2:14
msgid "2021"
msgstr "2021"
-#: template/press.html.j2:42
+#: template/press.html.j2:47
msgid "2020"
msgstr "2020"
-#: template/press.html.j2:56
+#: template/press.html.j2:61
msgid "2019"
msgstr "2019"
-#: template/press.html.j2:62
+#: template/press.html.j2:67
msgid "2018"
msgstr "2018"
-#: template/press.html.j2:72
+#: template/press.html.j2:77
msgid "2017"
msgstr "2017"
-#: template/press.html.j2:82
+#: template/press.html.j2:87
msgid "2016"
msgstr "2016"
-#: template/press.html.j2:100
+#: template/press.html.j2:105
msgid "2015"
msgstr "2015"
@@ -1466,8 +1456,8 @@ msgstr "... 在電腦學的領域，自由代表不使用專有軟體"
#: template/principles.html.j2:36
msgid ""
-"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
-"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.";
+"html\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
"vendor lock-in meaning merchants can easily choose another service provider "
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
@@ -1478,8 +1468,8 @@ msgstr ""
"GNU Taler 必須是<a href=\"https://www.gnu.org/philosophy/free-sw.html\";>自由"
"軟體</a>。對於商家來說，自由軟體防止供應商鎖定，這意味著商家可以輕鬆選擇其他"
"服務提供商來處理他們的付款。對於國家來說，自由軟體意味著 GNU Taler 無法通過施"
-"加限制或要求來損害其主權。對於交易所運營商而言，透明度對於滿足<a href="
-"\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"加限制或要求來損害其主權。對於交易所運營商而言，透明度對於滿足<a "
+"href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
"principle</a>尤其重要，這也能建立公眾的信心。"
#: template/principles.html.j2:49
@@ -1785,6 +1775,24 @@ msgstr "訂閱我們的 RSS feed"
msgid "read more"
msgstr "閱讀更多"
+#, fuzzy
+#~| msgid ""
+#~| "If your friend provides goods or services for you in exchange for a "
+#~| "payment, they can easily set up a Taler merchant and receive the payment "
+#~| "in their bank account."
+#~ msgid ""
+#~ "If your friends provide goods or services for you in exchange for a "
+#~ "payment, they can easily set up a Taler merchant and receive the payment "
+#~ "in their bank account."
+#~ msgstr ""
+#~ "如果您的朋友為您提供商品或服務以換取付款，他們可以輕鬆地建立 Taler "
+#~ "merchant 並通過其銀行帳戶接收付款。"
+
+#~ msgid ""
+#~ "Future versions of the Taler wallet may allow exchanging coins among "
+#~ "friends directly as well."
+#~ msgstr "未來版本的 Taler 錢包也可能允許朋友之間直接交換貨幣。"
+
#~ msgid "Components"
#~ msgstr "組成部分"
diff --git a/template/faq.html.j2 b/template/faq.html.j2
index 703ad12..71129d8 100644
--- a/template/faq.html.j2
+++ b/template/faq.html.j2
@@ -59,15 +59,7 @@
<h2>{{ _("Can I send money to my friends with Taler?") }}</h2>
<p>
{% trans %}
- If your friends provide goods or services for you in exchange for a
- payment, they can easily set up a Taler merchant and receive the
- payment in their bank account.
- {% endtrans %}
- </p>
- <p>
- {% trans %}
- Future versions of the Taler wallet may allow exchanging coins
- among friends directly as well.
+ Taler supports push and pull payments between wallets (also known as
peer-to-peer payments). While the payment appears to be directly between
wallets, technically the operation is intermediated by the payment service
provider which will typically be legally required to identify the recipient of
the funds before allowing the transaction to complete.
{% endtrans %}
</p>
diff --git a/template/press.html.j2 b/template/press.html.j2
index 86e0643..90ba56e 100644
--- a/template/press.html.j2
+++ b/template/press.html.j2
@@ -4,6 +4,8 @@
<h1>{{ _("GNU Taler in the Press")}}</h1>
<h2>{{ _("2022")}}</h2>
<ul>
+ <li><a
href="https://www.blick.ch/politik/glp-maeder-will-digitales-bargeld-e-franken-soll-anonymes-zahlen-ermoeglichen-id17943890.html";>E-Franken
soll anonymes Zahlen ermöglichen</a></li>
+ <li><a
href="https://www.heise.de/news/Digitales-Bargeld-Schweizer-Parlament-soll-Verwendung-von-GNU-Taler-pruefen-7283842.html";>Digitales
Bargeld: Schweizer Parlament soll Verwendung von GNU Taler prüfen</a></li>
<li><a
href="https://www.watson.ch/digital/schweiz/567383477-gnu-taler-bundesrat-soll-einfuehrung-von-digitalem-bargeld-pruefen";>GNU-Taler:
Bundesrat soll Einführung von digitalem Bargeld prüfen</a></li>
<li><a
href="https://www.srf.ch/news/gesellschaft/kreislaufwirtschaft-sharing-economy-mieten-statt-besitzen-oder-wegwerfen";>GNU
Taler im Vergleich zu Ethereum (Minute 59:40-1:00:27)</a></li>
<li><a
href="https://news.slashdot.org/story/22/04/16/2222229/richard-stallman-speaks-on-cryptocurrency-blockchain-gnu-taler-and-encryption";>Richard
Stallman Speaks on Cryptocurrency, Blockchain, GNU Taler, and
Encryption</a></li>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch stable updated (2a7da80 -> beb000e),
gnunet <=