Merge branch 'master' of git+ssh://git.taler.net/www

1 files changed, 85 insertions, 55 deletions

diff --git a/locale/hi/LC_MESSAGES/messages.po b/locale/hi/LC_MESSAGES/messages.po
index 79ad00f8..ee091e9e 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-02-24 18:55+0100\n"
+"POT-Creation-Date: 2022-09-11 12:19+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-"
@@ -126,7 +126,7 @@ msgstr ""
 "लेने पर बैंक वेब साइट पर आपको जो मिल सकता है, उसके बराबर कार्यक्षमता प्रदान करता है।"
 
 #: template/cashier.html.j2:61 template/pos.html.j2:61
-#: template/wallet.html.j2:239
+#: template/wallet.html.j2:247
 msgid "Install Android App from Google App Store, or"
 msgstr "Google ऐप स्टोर से Android ऐप इंस्टॉल करें, या"
 
@@ -509,21 +509,28 @@ msgid "What if my computer is hacked?"
 msgstr "अगर मेरा कंप्यूटर हैक हो जाए तो क्या होगा?"
 
 #: template/faq.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "In case of a compromise of one of your devices, an attacker can spend "
+#| "coins from your wallet. Checking your balance might reveal to you that "
+#| "your device has been compromised."
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend coins "
-"from your wallet. Checking your balance might reveal to you that your device "
-"has been compromised."
+"from your wallet. Checking your balance might reveal to you whether your "
+"device has eventually been compromised. If a coin has been spent, this coin "
+"cannot be spent a second time. The Exchange examines every coin whether it "
+"has been spent and thus makes double spending impossible."
 msgstr ""
 "आपके उपकरणों में से किसी से छेड़छाड़ के मामले में, एक हमलावर आपके वॉलेट से सिक्के खर्च कर सकता "
 "है। आपकी शेष राशि की जाँच से आपको पता चल सकता है कि आपके उपकरण से छेड़छाड़ की गई है।"
 
-#: template/faq.html.j2:61
+#: template/faq.html.j2:59
 #, fuzzy
 #| msgid "Can I send money to my friend with Taler?"
 msgid "Can I send money to my friends with Taler?"
 msgstr "क्या मैं अपने दोस्त को टेलर के साथ पैसे भेज सकता हूं?"
 
-#: template/faq.html.j2:63
+#: template/faq.html.j2:61
 #, fuzzy
 #| msgid ""
 #| "If your friend provides goods or services for you in exchange for a "
@@ -537,7 +544,7 @@ msgstr ""
 "यदि आपका दोस्त भुगतान के बदले में आपके लिए सामान या सेवाएं प्रदान करता है, तो वे आसानी से "
 "एक टेलर मर्चेंट सेट कर सकते हैं और अपने बैंक खाते में भुगतान प्राप्त कर सकते हैं।"
 
-#: template/faq.html.j2:70
+#: template/faq.html.j2:68
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among friends "
 "directly as well."
@@ -545,11 +552,11 @@ msgstr ""
 "टेलर वॉलेट के भविष्य के संस्करण सीधे दोस्तों के बीच भी सिक्कों के आदान-प्रदान की अनुमति दे "
 "सकते हैं।"
 
-#: template/faq.html.j2:76
+#: template/faq.html.j2:74
 msgid "How does Taler handle payments in different currencies?"
 msgstr "टाएँलर विभिन्न मुद्राओं में भुगतान कैसे करता है?"
 
-#: template/faq.html.j2:78
+#: template/faq.html.j2:76
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
@@ -557,15 +564,15 @@ msgstr ""
 "टेलर पर्स यूरो, यूएस डॉलर या बिटकॉइन जैसी कई अलग-अलग मुद्राओं के अनुरूप डिजिटल सिक्कों को "
 "स्टोर कर सकते हैं।"
 
-#: template/faq.html.j2:84
+#: template/faq.html.j2:82
 msgid "Taler currently does not offer conversion between currencies."
 msgstr "वर्तमान में टेलर मुद्राओं के बीच विनिमय की पेशकश नहीं करता है।"
 
-#: template/faq.html.j2:89
+#: template/faq.html.j2:87
 msgid "How does Taler protect my privacy?"
 msgstr "टैलर मेरी निजता की रक्षा कैसे करता है?"
 
-#: template/faq.html.j2:91
+#: template/faq.html.j2:89
 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 "
@@ -577,11 +584,11 @@ msgstr ""
 "उपयोग आपकी गोपनीयता की रक्षा करता है क्योंकि यह एक्सचेंज को यह जानने से रोकता है कि यह "
 "किस ग्राहक के लिए किस सिक्के पर हस्ताक्षर किया गया है।"
 
-#: template/faq.html.j2:101
+#: template/faq.html.j2:99
 msgid "How much does it cost?"
 msgstr "इसकी क्या कीमत है?"
 
-#: template/faq.html.j2:103
+#: template/faq.html.j2:101
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -601,11 +608,11 @@ msgstr ""
 "लग बग एक अरब स्थानांतरण, ना मान के प्रवास मूल्य)। ध्यान दे कि ये एक शीघ्र अंदाज़ा हे, "
 "विस्तार हो सके निर्भर करे समुदाय एवं पूर्तिकर आवश्यकताओ"
 
-#: template/faq.html.j2:117
+#: template/faq.html.j2:115
 msgid "Does Taler work with international payments?"
 msgstr "क्या Taler अंतर्राष्ट्रीय भुगतान से काम करता है ?"
 
-#: template/faq.html.j2:119
+#: template/faq.html.j2:117
 msgid ""
 "Taler&#39;s wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -616,24 +623,24 @@ msgid ""
 "future."
 msgstr ""
 
-#: template/faq.html.j2:130
+#: template/faq.html.j2:128
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: template/faq.html.j2:132
+#: template/faq.html.j2:130
 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:139
+#: template/faq.html.j2:137
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
 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 "
@@ -643,26 +650,36 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 
-#: template/faq.html.j2:150
+#: template/faq.html.j2:148
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
 msgid ""
-"Any exchange should be audited by one or more independent auditors. "
-"Merchants and consumer wallets will report certain issues automatically to "
-"the auditors, but auditors may also provide a method for manual submission "
-"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public."
-msgstr ""
-
-#: template/faq.html.j2:161
+"From a technical point of view, any exchange is audited by one or more "
+"independent auditors. Merchants and consumer wallets will report certain "
+"issues automatically to the auditors, but auditors may also provide a method "
+"for manual submission of issues. The auditors are expected to make their "
+"reports available to the respective regulatory authorities, or even the "
+"general public. </p> <p> From a legal point of view, users can always turn "
+"to their national authority responsible for settling disputes concerning the "
+"management of exchange services. For exchange services conducting business "
+"in Germany, this would be the general authority in charge of disputes (<a "
+"href=\"https://www.verbraucher-schlichter.de\">Universalschlichtungsstelle "
+"des Bundes</a>). In addition to this, the European Online Dispute Resolution "
+"(see <a href=\"http://ec.europa.eu/odr\">ODR</a>) as a platform provided by "
+"the European Commission can be called for the settlement of disputes "
+"concerning exchange services headquartered in member states of the European "
+"Union."
+msgstr ""
+
+#: template/faq.html.j2:158
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: template/faq.html.j2:163
+#: template/faq.html.j2:160
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -672,13 +689,13 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker</a> for a list of open issues)."
 msgstr ""
 
-#: template/faq.html.j2:174
+#: template/faq.html.j2:171
 #, fuzzy
 #| msgid "Does Taler work with international payments?"
 msgid "Does Taler support recurring payments?"
 msgstr "क्या Taler अंतर्राष्ट्रीय भुगतान से काम करता है ?"
 
-#: template/faq.html.j2:176
+#: template/faq.html.j2:173
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1139,31 +1156,35 @@ msgstr ""
 msgid "GNU Taler in the Press"
 msgstr ""
 
-#: template/press.html.j2:6
+#: template/press.html.j2:5
+msgid "2022"
+msgstr ""
+
+#: template/press.html.j2:10
 msgid "2021"
 msgstr ""
 
-#: template/press.html.j2:37
+#: template/press.html.j2:42
 msgid "2020"
 msgstr ""
 
-#: template/press.html.j2:51
+#: template/press.html.j2:56
 msgid "2019"
 msgstr ""
 
-#: template/press.html.j2:57
+#: template/press.html.j2:62
 msgid "2018"
 msgstr ""
 
-#: template/press.html.j2:67
+#: template/press.html.j2:72
 msgid "2017"
 msgstr ""
 
-#: template/press.html.j2:77
+#: template/press.html.j2:82
 msgid "2016"
 msgstr ""
 
-#: template/press.html.j2:95
+#: template/press.html.j2:100
 msgid "2015"
 msgstr ""
 
@@ -1392,55 +1413,63 @@ msgstr ""
 msgid "demonstration"
 msgstr ""
 
-#: template/wallet.html.j2:143 template/wallet.html.j2:153
+#: template/wallet.html.j2:134
+msgid "For source, see this"
+msgstr ""
+
+#: template/wallet.html.j2:138
+msgid "directory"
+msgstr ""
+
+#: template/wallet.html.j2:151 template/wallet.html.j2:161
 msgid "or"
 msgstr ""
 
-#: template/wallet.html.j2:147
+#: template/wallet.html.j2:155
 msgid "is required, but it appears you don&#39;t have it installed."
 msgstr ""
 
-#: template/wallet.html.j2:157
+#: template/wallet.html.j2:165
 msgid "version"
 msgstr ""
 
-#: template/wallet.html.j2:161
+#: template/wallet.html.j2:169
 msgid "or newer is required, but it appears you have an older version."
 msgstr ""
 
-#: template/wallet.html.j2:168
+#: template/wallet.html.j2:176
 msgid "Install wallet"
 msgstr ""
 
-#: template/wallet.html.j2:175
+#: template/wallet.html.j2:183
 msgid "JavaScript is disabled, installation won&#39;t work."
 msgstr ""
 
-#: template/wallet.html.j2:214
+#: template/wallet.html.j2:222
 msgid "Install Download Chrome Extension"
 msgstr ""
 
-#: template/wallet.html.j2:221
+#: template/wallet.html.j2:229
 #, fuzzy
 #| msgid "GNU Taler"
 msgid "Install GNU Taler"
 msgstr "जी एन यू टेलर"
 
-#: template/wallet.html.j2:225
+#: template/wallet.html.j2:233
 msgid "from the Chrome Web Store"
 msgstr ""
 
-#: template/wallet.html.j2:246
+#: template/wallet.html.j2:254
 #, fuzzy
 #| msgid "Download App from F-Droid.org."
 msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr "F-Droid.org से ऐप डाउनलोड करें।"
 
-#: template/wallet.html.j2:259
+#: template/wallet.html.j2:267
 msgid "Other browsers"
 msgstr ""
 
-#: template/wallet.html.j2:261
+#: template/wallet.html.j2:269
 #, fuzzy
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "निकट भविष्य में अन्य ब्राउज़रों के लिए वॉलेट प्रदान किए जाएंगे।"
@@ -1449,14 +1478,15 @@ msgstr "निकट भविष्य में अन्य ब्राउ�
 #, fuzzy
 #| msgid ""
 #| "News posts about changes related to GNU Taler such as releases and events"
-msgid "News posts about changes related to GNUnet such as releases and events"
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
 msgstr "GNU टेलर से संबंधित परिवर्तनों के बारे में समाचार पोस्ट करता है जैसे कि रिलीज़ और ईवेंट"
 
-#: template/news/index.html.j2:16
+#: template/news/index.html.j2:13
 msgid "subscribe to our RSS feed"
 msgstr "हमारी आरएसएस फीड को सब्सक्राइब करें"
 
-#: template/news/index.html.j2:36
+#: template/news/index.html.j2:33
 msgid "read more"
 msgstr "और पढ़ें..."