gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-www] branch stable updated (84817a5 -> 7a1889d)


From: gnunet
Subject: [taler-www] branch stable updated (84817a5 -> 7a1889d)
Date: Mon, 24 May 2021 08:33:02 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch stable
in repository www.

    from 84817a5  fix news link
     add 654e722  mark virtual link
     add 6015221  Translated using Weblate (Russian)
     add 636389f  Translated using Weblate (German)
     add f7661ef  Translated using Weblate (Russian)
     add 4c6d980  Translated using Weblate (Chinese (Traditional))
     add a248c1c  add sp
     add fb72fb4  Translated using Weblate (Russian)
     add 06cd915  Translated using Weblate (Russian)
     add 3b87318  Translated using Weblate (Italian)
     add 082eb61  Translated using Weblate (Russian)
     add 477e4d2  Translated using Weblate (Chinese (Traditional))
     add 7a1889d  Translated using Weblate (Chinese (Traditional))

No new revisions were added by this update.

Summary of changes:
 common/header.j2.inc                   |   2 +-
 inc                                    |   2 +-
 locale/de/LC_MESSAGES/messages.po      |  19 +-
 locale/it/LC_MESSAGES/messages.po      |  18 +-
 locale/ru/LC_MESSAGES/messages.po      |  49 +++--
 locale/zh_Hant/LC_MESSAGES/messages.po | 329 ++++++++++++---------------------
 static/.well-known/security.txt        |   2 +-
 template/wallet.html.j2                |   2 +-
 8 files changed, 158 insertions(+), 265 deletions(-)

diff --git a/common/header.j2.inc b/common/header.j2.inc
index 1e2f5c8..65b2c71 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -61,4 +61,4 @@
       <script 
src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js";></script>
     <![endif]-->
 
-    <link rel="alternate" type="application/rss+xml" title="Taler.net rss" 
href="{{ url_localized('news/rss.xml') }}" />
+    <link rel="alternate" type="application/rss+xml" title="Taler.net rss" 
href="{{ url_localized('rss.xml') }}" />
diff --git a/inc b/inc
index 9e9363e..1e9e766 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit 9e9363ec2797fcb51f998ce6e388eb9877e8788c
+Subproject commit 1e9e7661a47f73d0cd2d8889d4d6e5f8f7eca09d
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index a1867cc..7f34fa9 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,10 +3,10 @@ msgstr ""
 "Project-Id-Version: German (Taler Website)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-05-07 18:32+0200\n"
-"PO-Revision-Date: 2021-03-28 11:27+0000\n"
+"PO-Revision-Date: 2021-05-13 21:08+0000\n"
 "Last-Translator: Stefan <eintritt@hotmail.com>\n"
-"Language-Team: German <http://weblate.taler.net/projects/gnu-taler/main-web-";
-"site/de/>\n"
+"Language-Team: German <http://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"
@@ -1342,7 +1342,7 @@ msgstr ""
 
 #: template/index.html.j2:7
 msgid "Taler logo"
-msgstr ""
+msgstr "Taler-Logo"
 
 #: template/index.html.j2:16
 msgid ""
@@ -1819,13 +1819,10 @@ msgid "Wallets for other browsers will be provided in 
the near future."
 msgstr "Wallets für andere Browser werden zukünftig bereitgestellt."
 
 #: template/news/index.html.j2:11
-#, 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"
 msgstr ""
-"Nachrichtenbeiträge zu Änderungen, die GNU Taler betreffen, wie neue "
-"Versionen und Veranstaltungen"
+"Nachrichtenbeiträge zu Änderungen, die GNUnet betreffen, wie neue Versionen "
+"und Veranstaltungen"
 
 #: template/news/index.html.j2:16
 msgid "subscribe to our RSS feed"
@@ -1836,10 +1833,8 @@ msgid "read more"
 msgstr "weiterlesen"
 
 #: template/news/index.html.j2:45
-#, fuzzy
-#| msgid "archive"
 msgid "News archives:"
-msgstr "Archiv"
+msgstr "Archivierte Nachrichten und Mitteilungen:"
 
 #~ msgid ""
 #~ "GNU Taler must enable a diverse set of operators, breaking up the current "
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index a308815..09021af 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,10 +3,10 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-05-07 18:32+0200\n"
-"PO-Revision-Date: 2021-03-26 05:47+0000\n"
-"Last-Translator: Francesca Giusti <francescag1194@gmail.com>\n"
-"Language-Team: Italian <http://weblate.taler.net/projects/gnu-taler/main-web-";
-"site/it/>\n"
+"PO-Revision-Date: 2021-05-19 00:11+0000\n"
+"Last-Translator: Francesca Cipriani <cesca.cipriani@gmail.com>\n"
+"Language-Team: Italian <http://weblate.taler.net/projects/gnu-taler/";
+"main-web-site/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1627,13 +1627,9 @@ msgid "Wallets for other browsers will be provided in 
the near future."
 msgstr "I wallet per altri browser saranno forniti nel prossimo futuro."
 
 #: template/news/index.html.j2:11
-#, 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"
 msgstr ""
-"Post di notizie relative alle modifiche di GNU Taler come pubblicazioni ed "
-"eventi"
+"Post di notizie relative alle novità di GNUnet come nuove versioni ed eventi"
 
 #: template/news/index.html.j2:16
 msgid "subscribe to our RSS feed"
@@ -1644,7 +1640,5 @@ msgid "read more"
 msgstr "Leggi di più"
 
 #: template/news/index.html.j2:45
-#, fuzzy
-#| msgid "archive"
 msgid "News archives:"
-msgstr "archivio"
+msgstr "Archivi delle notizie:"
diff --git a/locale/ru/LC_MESSAGES/messages.po 
b/locale/ru/LC_MESSAGES/messages.po
index 0563d83..0bad9c1 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-05-07 18:32+0200\n"
-"PO-Revision-Date: 2021-05-04 14:22+0000\n"
+"PO-Revision-Date: 2021-05-19 19:28+0000\n"
 "Last-Translator: Yulia Greben <yulia.greben@gmail.com>\n"
-"Language-Team: Russian <http://weblate.taler.net/projects/gnu-taler/main-web-";
-"site/ru/>\n"
+"Language-Team: Russian <http://weblate.taler.net/projects/gnu-taler/";
+"main-web-site/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,7 @@ msgstr "GNU Taler"
 
 #: common/base.j2:6 common/news.j2:6
 msgid "Taxable Anonymous Libre Electronic Reserves"
-msgstr ""
-"Облагаемые налогом анонимные свободные резервы электронных денежных средств"
+msgstr "Taxable Anonymous Libre Electronic Reserves"
 
 #: common/footer.j2.inc:11
 msgid "Contact"
@@ -315,7 +314,7 @@ msgstr "Документ также доступен в формате <a href=\
 
 #: template/docs.html.j2:59
 msgid "Exchange"
-msgstr "Обмен валюты"
+msgstr "Обмен"
 
 #: template/docs.html.j2:61
 msgid "Operator&#39;s manual for the GNU Taler exchange."
@@ -353,7 +352,7 @@ msgstr "Руководство по управлению веб-приложен
 
 #: template/docs.html.j2:104
 msgid "Merchant POS Terminal"
-msgstr "POS-терминал"
+msgstr "POS-терминал продавца"
 
 #: template/docs.html.j2:106
 msgid "Manual for configuring and using the point of sale app."
@@ -531,7 +530,7 @@ msgid ""
 "bank account."
 msgstr ""
 "Если ваш друг продает вам товар или оказывает услуги за деньги, то он может "
-"установить компонент «Мерчант Taler» и принимать платёж на его банковский "
+"установить компонент «Taler Мерчант» и принимать платёж на его банковский "
 "счёт."
 
 #: template/faq.html.j2:70
@@ -570,10 +569,10 @@ 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:101
 msgid "How much does it cost?"
@@ -659,8 +658,8 @@ msgid ""
 "Taler coins into regular bank money."
 msgstr ""
 "Работа биржи осуществляется банком или в партнерстве с банком; банк держит "
-"средства на эскроу-счёте. Обратите внимание, что таковым банком может "
-"выступать как обычный банк, так и центральный банк, в котором "
+"средства на эскроу-счёте. Обращаем ваше внимание на то, что таковым банком "
+"может выступать как обычный банк, так и центральный банк, в котором "
 "централизованно хранится электронная валюта. В любом случае банк попадает "
 "под соответствующее регулирование. Это даёт потребителям основание уверенно "
 "конвертировать монеты Taler в безналичные деньги."
@@ -682,7 +681,7 @@ msgid ""
 "respective regulatory authorities, or even the general public."
 msgstr ""
 "Каждая конверсионная операция должна пройти аудиторскую проверку одним или "
-"несколькими аудиторами. Кошельки продавцов и потребителей автоматически "
+"несколькими аудиторами. Кошельки продавцов и покупателей автоматически "
 "выдадут сообщение о конкретных ошибках, которое будет направлено аудиторам. "
 "Аудиторы также могут предоставить свой метод обратной связи, который "
 "позволит сообщать об ошибках напрямую. Аудиторы должны предоставлять свои "
@@ -859,7 +858,7 @@ msgid ""
 "even having to register an account."
 msgstr ""
 "Интегрировать Taler в интернет-магазин продавца просто, а покупателям не "
-"нужно открывать счёт на сайте продавца для осуществления платежей."
+"нужно регистрироваться на сайте продавца для осуществления платежей."
 
 #: template/features.html.j2:112
 msgid "See how merchant integration works in our developer documentation!"
@@ -1317,8 +1316,8 @@ msgid ""
 "3. Auditability - enable the state to tax income and crack down on illegal "
 "business activities"
 msgstr ""
-"3. Аудитоспособность - позволяет государству облагать налогом доход "
-"продавцов и пресекать незаконную предпринимательскую деятельность"
+"3. Аудитоспособность. Позволяет государству облагать налогом доход продавцов "
+"и пресекать незаконную предпринимательскую деятельность"
 
 #: template/principles.html.j2:85
 msgid "Money laundering"
@@ -1529,11 +1528,11 @@ msgstr ""
 
 #: template/wallet.html.j2:126
 msgid "Install the wallet for your browser below, then check out the"
-msgstr ""
+msgstr "Установите кошелёк для вашего браузера и протестируйте"
 
 #: template/wallet.html.j2:130
 msgid "demonstration"
-msgstr ""
+msgstr "демоверсию"
 
 #: template/wallet.html.j2:143 template/wallet.html.j2:153
 msgid "or"
@@ -1553,7 +1552,7 @@ msgstr ""
 
 #: template/wallet.html.j2:168
 msgid "Install wallet"
-msgstr ""
+msgstr "Установить кошелёк"
 
 #: template/wallet.html.j2:175
 msgid "JavaScript is disabled, installation won&#39;t work."
@@ -1561,7 +1560,7 @@ msgstr ""
 
 #: template/wallet.html.j2:214
 msgid "Install Download Chrome Extension"
-msgstr ""
+msgstr "Установить расширение Chrome"
 
 #: template/wallet.html.j2:221
 #, fuzzy
@@ -1571,7 +1570,7 @@ msgstr "GNU Taler"
 
 #: template/wallet.html.j2:225
 msgid "from the Chrome Web Store"
-msgstr ""
+msgstr "из интернет-магазина Chrome"
 
 #: template/wallet.html.j2:246
 #, fuzzy
@@ -1581,11 +1580,11 @@ msgstr "Загрузить приложение с F-Droid.org."
 
 #: template/wallet.html.j2:259
 msgid "Other browsers"
-msgstr ""
+msgstr "Другие браузеры"
 
 #: template/wallet.html.j2:261
 msgid "Wallets for other browsers will be provided in the near future."
-msgstr ""
+msgstr "Мы планируем версии кошельков для других браузеров в будущем."
 
 #: template/news/index.html.j2:11
 #, fuzzy
diff --git a/locale/zh_Hant/LC_MESSAGES/messages.po 
b/locale/zh_Hant/LC_MESSAGES/messages.po
index 368e272..3d9a4fa 100644
--- a/locale/zh_Hant/LC_MESSAGES/messages.po
+++ b/locale/zh_Hant/LC_MESSAGES/messages.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-05-07 18:32+0200\n"
-"PO-Revision-Date: 2021-04-12 05:50+0000\n"
+"PO-Revision-Date: 2021-05-24 00:10+0000\n"
 "Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
-"Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/gnu-";
-"taler/main-web-site/zh_Hant/>\n"
+"Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/";
+"gnu-taler/main-web-site/zh_Hant/>\n"
 "Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,6 @@ msgid "GNU Taler"
 msgstr "GNU Taler"
 
 #: common/base.j2:6 common/news.j2:6
-#, fuzzy
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "應課稅匿名自由電子儲備(Taxable Anonymous Libre Electronic Reserves)"
 
@@ -46,16 +45,12 @@ msgid "Bibliography"
 msgstr "參考書目"
 
 #: common/footer.j2.inc:29
-#, fuzzy
 msgid ""
 "GNU Taler is developed as part of the <a href='https://www.gnu.org/'>GNU "
 "project</a> for the GNU operating system."
-msgstr ""
-"GNU Taler是為了GNU作業系統所開發的 <a href='https://www.gnu.org/'>GNU 計畫</"
-"a> 的一部分。"
+msgstr "GNU Taler是為了GNU作業系統所開發的 <a href='https://www.gnu.org/'>GNU 計畫</a> 
的一部分。"
 
 #: common/footer.j2.inc:31 template/bibliography.html.j2:34
-#, fuzzy
 msgid "and"
 msgstr "和"
 
@@ -68,14 +63,12 @@ msgstr ""
 "存。"
 
 #: common/footer.j2.inc:36
-#, fuzzy
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
 msgstr "此頁面僅使用<a href='https://www.gnu.org/'>免費軟體</a>來建立。"
 
 #: common/footer.j2.inc:38
-#, fuzzy
 msgid "JavaScript license information"
 msgstr "JavaScript授權資訊"
 
@@ -84,7 +77,6 @@ msgid "Features"
 msgstr "功能"
 
 #: common/navigation.j2.inc:24
-#, fuzzy
 msgid "Principles"
 msgstr "準則"
 
@@ -102,7 +94,6 @@ msgid "GNU Taler Bibliography"
 msgstr "GNU Taler參考書目"
 
 #: template/bibliography.html.j2:27
-#, fuzzy
 msgid "by"
 msgstr "由"
 
@@ -143,68 +134,57 @@ msgid "archive"
 msgstr "檔案室"
 
 #: template/contact.html.j2:21
-#, fuzzy
 msgid "You can send messages to the list at"
-msgstr "您可以對名單傳送訊息於"
+msgstr "您可以於此對名單傳送訊息"
 
 #: template/contact.html.j2:29
-#, fuzzy
 msgid "Contacting individuals"
-msgstr "聯絡人"
+msgstr "聯繫個人"
 
 #: template/contact.html.j2:31
-#, fuzzy
 msgid ""
 "Team members are generally reachable at <tt>LASTNAME@taler.net</tt>. All of "
 "us support receiving GnuPG encrypted e-mails."
-msgstr ""
-"所有的團隊成員大致上都可以在 <tt>LASTNAME@taler.net</tt>聯繫到。我們都支援接"
-"收GnuPG 的加密信件。"
+msgstr "您可以從<tt>LASTNAME@taler.net</tt>聯繫到大致的團隊成員。我們都支援接收GnuPG 的加密信件。"
 
 #: template/contact.html.j2:40
-#, fuzzy
 msgid "Chat"
 msgstr "聊天"
 
 #: template/contact.html.j2:42
-#, fuzzy
 msgid ""
 "You can find some team members in the IRC channel <tt>#taler</tt> on <tt>irc."
 "freenode.net</tt>."
 msgstr ""
-"您可以在 <tt>irc.freenode.net</tt>上的IRC channel <tt>#taler</tt> 上找到我們"
-"的一些團隊成員。"
+"您可以在 <tt>irc.freenode.net</tt>上的IRC channel <tt>#taler</tt> 上找到我們的一些團隊成員。"
 
 #: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr "回報錯誤"
 
 #: template/contact.html.j2:52
-#, fuzzy
 msgid "We track open feature requests and bugs in our"
-msgstr "我們追蹤公開的功能請求和錯誤於我們的"
+msgstr "我們於此追蹤公開的功能請求與錯誤"
 
 #: template/contact.html.j2:55
 msgid "Bug tracker"
 msgstr "偵錯工具"
 
 #: template/contact.html.j2:56
-#, fuzzy
 msgid ""
 "which is shared with the GNUnet project. You can also report bugs or feature "
 "requests to the mailing list."
-msgstr "與GNUnet project共用。您也可以透過寄件名單舉報錯誤與功能要求。"
+msgstr "與GNUnet project共用。您也可以透過寄件名單舉報錯誤以及要求新功能。"
 
 #: template/contact.html.j2:65
 msgid "General inquiries"
 msgstr "一般詢問"
 
 #: template/contact.html.j2:67
-#, fuzzy
 msgid ""
 "You can reach a group of team members handling general inquiries at "
 "<tt>contact AT taler.net</tt>."
-msgstr "您可以透過 <tt>contact AT taler.net</tt>聯繫我們的成員並提交一般詢問。"
+msgstr "您可以透過 <tt>contact AT taler.net</tt> 聯繫我們的成員並提交一般詢問。"
 
 #: template/contact.html.j2:75
 msgid "Executive team"
@@ -242,45 +222,39 @@ msgid ""
 "the ability to dual-license (for example, so that we can distribute via App-"
 "stores that are hostile to free software)."
 msgstr ""
-"這些協定確保代碼將繼續在免費軟體許可證下提供,這使開發人員可以自由地在 "
-"GNUnet 和 GNU Taler 之間移動程式碼,而不必擔心許可證和公司能夠獲得雙重許可(例"
-"如,以便我們可以通過對免費軟體懷有敵意的應用商店進行分發)。"
+"這些協定確保程式碼將持續地在免費軟體許可證之下被提供,這使開發人員可以自由地在 GNUnet 和 GNU Taler "
+"之間移動程式碼,而不必擔心許可證和公司能夠獲得雙重許可(例如,以便我們可以通過對免費軟體懷有敵意的應用商店進行分發)。"
 
 #: template/copyright.html.j2:29
-#, fuzzy
 msgid ""
 "Minor contributions (basically, anyone without Git access) do not require "
 "copyright assignment. Pseudonymous contributions are accepted, in this case "
 "simply sign the agreement with your pseudonym. Scanned copies are "
 "sufficient, but snail mail is preferred."
 msgstr ""
-"小額捐款(基本上,任何沒有Git訪問許可權的人)都不需要版權轉讓。可接受匿名捐款,"
-"在此情況下,您只需使用您的假名/筆名簽署同意書並掃描副本即可,不過蝸牛郵件為更"
-"好的方式。"
+"小額捐款(基本上,任何沒有Git訪問許可權的人)都不需要版權轉讓。我們也接受匿名捐款,在此情況下,您只需使用您的假名/筆名簽署同意書並掃描副本即可,不過蝸"
+"牛郵件為更好的方式。"
 
 #: template/docs.html.j2:6
 msgid "GNU Taler: Documentation and Resources"
 msgstr "GNU Taler: 文件與資源"
 
 #: template/docs.html.j2:12
-#, fuzzy
 msgid ""
 "This is an overview of documentation and other resources for GNU Taler. The "
 "full documentation contents can be found <a href=\"https://docs.taler.net/";
 "\">here</a>."
 msgstr ""
-"這是GNU Taler相關文件與其他資源的概述。您可於 <a href=\"https://docs.taler.";
-"net/\">這裡</a>查看完整的文件內容。"
+"這是GNU Taler相關文件與其他資源的概述。您可於 <a href=\"https://docs.taler.net/\"";
+">這裡</a>查看完整的文件內容。"
 
 #: template/docs.html.j2:26
-#, fuzzy
 msgid "Components"
-msgstr "組成"
+msgstr "元件"
 
 #: template/docs.html.j2:37
-#, fuzzy
 msgid "Merchant Backend Administration"
-msgstr "商家後端管理"
+msgstr "商家後端管理(Merchant Backend Administration)"
 
 #: template/docs.html.j2:39
 #, python-format
@@ -296,23 +270,20 @@ msgid "Merchant API Tutorial"
 msgstr "商家API教學"
 
 #: template/docs.html.j2:50
-#, fuzzy
 msgid "Tutorial for processing Taler payments using the merchant backend API."
 msgstr "使用商家後端API處理Taler payments的教學。"
 
 #: template/docs.html.j2:53 template/docs.html.j2:64 template/docs.html.j2:75
 #: template/docs.html.j2:98 template/docs.html.j2:109 template/docs.html.j2:156
-#, fuzzy, python-format
+#, python-format
 msgid "Also available as <a href=\"%(link)s\">PDF</a>."
 msgstr "也有 <a href=\"%(link)s\">PDF</a>可供參考。"
 
 #: template/docs.html.j2:59
-#, fuzzy
 msgid "Exchange"
 msgstr "交易所"
 
 #: template/docs.html.j2:61
-#, fuzzy
 msgid "Operator&#39;s manual for the GNU Taler exchange."
 msgstr "操作員&#39;的GNU Taler exchange手冊。"
 
@@ -321,7 +292,6 @@ msgid "Bank Integration"
 msgstr "銀行整合"
 
 #: template/docs.html.j2:72
-#, fuzzy
 msgid "Manual for tightly integrating Taler with banking applications."
 msgstr "緊密整合Taler與銀行應用的使用手冊。"
 
@@ -330,17 +300,15 @@ msgid "Wallet"
 msgstr "錢包"
 
 #: template/docs.html.j2:83
-#, fuzzy
 msgid ""
 "Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
 "download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
 "Web site</a>."
 msgstr ""
-"關於Taler wallets的手冊(網路擴充、Android、CLI)。您可以從<a href=\"wallet."
-"html\">Taler wallet的網站</a>下載預包裝的二進制文件(pre-packaged binaries)。"
+"關於Taler wallets的手冊(網路擴充、Android、CLI)。您可以從<a href=\"wallet.html\">Taler "
+"wallet的網站</a>下載預包裝的二進制文件(pre-packaged binaries)。"
 
 #: template/docs.html.j2:93
-#, fuzzy
 msgid "Back office"
 msgstr "後台"
 
@@ -349,27 +317,22 @@ msgid "Manual to run the back-office Web application."
 msgstr "後台網頁應用程式的運作手冊。"
 
 #: template/docs.html.j2:104
-#, fuzzy
 msgid "Merchant POS Terminal"
-msgstr "商家POS終端"
+msgstr "商家POS終端 (Merchant POS Terminal)"
 
 #: template/docs.html.j2:106
-#, fuzzy
 msgid "Manual for configuring and using the point of sale app."
-msgstr "銷售時點情報系統應用程式的配置與使用手冊"
+msgstr "銷售時點情報系統應用程式(Point of Sale App)的配置與使用手冊"
 
 #: template/docs.html.j2:115
-#, fuzzy
 msgid "Cashier"
 msgstr "收銀員"
 
 #: template/docs.html.j2:117
-#, fuzzy
 msgid "An app for taking in cash and handing out electronic cash."
 msgstr "一個接收現金與發放電子貨幣的應用程式"
 
 #: template/docs.html.j2:130
-#, fuzzy
 msgid "Internals"
 msgstr "內部"
 
@@ -378,17 +341,14 @@ msgid "HTTP API"
 msgstr "HTTP API"
 
 #: template/docs.html.j2:143
-#, fuzzy
 msgid "Reference for the HTTP-based API for Taler components."
-msgstr "以 HTTP 為基礎的 API 的Taler元件的參考。"
+msgstr "以 HTTP 為基礎的 API Taler元件的參考。"
 
 #: template/docs.html.j2:151
-#, fuzzy
 msgid "Onboarding"
 msgstr "上線"
 
 #: template/docs.html.j2:153
-#, fuzzy
 msgid "Description of our taler.net setup and how to contribute."
 msgstr "關於我們的taler.net的設置與如何捐助的描述。"
 
@@ -413,12 +373,10 @@ msgid "Our IRC channel is #taler on freenode."
 msgstr "我們在freenode上的頻道為#taler。"
 
 #: template/docs.html.j2:192
-#, fuzzy
 msgid "Bug Tracker"
 msgstr "Bug Tracker"
 
 #: template/docs.html.j2:194
-#, fuzzy
 msgid "Our bug tracker for bugs and feature request."
 msgstr "我們對於bugs與功能要求的bug tracker。"
 
@@ -427,12 +385,10 @@ msgid "Code"
 msgstr "程式碼"
 
 #: template/docs.html.j2:216
-#, fuzzy
 msgid "Git repositories"
 msgstr "Git儲存庫"
 
 #: template/docs.html.j2:218
-#, fuzzy
 msgid "Git repositories for all of GNU Taler."
 msgstr "予所有GNU Taler的Git儲存庫。"
 
@@ -441,7 +397,6 @@ msgid "lcov results"
 msgstr "lcov結果"
 
 #: template/docs.html.j2:226
-#, fuzzy
 msgid "Shows results of the code coverage analysis for our test suite."
 msgstr "顯示我們測試套件的代碼覆蓋分析結果。"
 
@@ -450,65 +405,52 @@ msgid "Continuous integration"
 msgstr "持續整合"
 
 #: template/docs.html.j2:234
-#, fuzzy
 msgid "Continuous integration and deployment is managed by our Buildbot."
 msgstr "持續整合與配置是由我們的 Buildbot 進行管理。"
 
 #: template/faq.html.j2:5
-#, fuzzy
 msgid "How is Taler related to Bitcoin or Blockchains?"
 msgstr "Taler是如何與比特幣和區塊鍊相關聯?"
 
 #: template/faq.html.j2:8
-#, fuzzy
 msgid ""
 "Taler does not require any Blockchain technology, and is also not based on "
 "proof-of-work or any other distributed consensus mechanism. Instead, Taler "
 "is based on blind signatures. However, it is theoretically possible to "
 "combine Taler with peer-to-peer crypto-currencies like Bitcoin."
 msgstr ""
-"Taler 不需要任何區塊鏈技術,也不基於工作證明或任何其他分散式共識機制。取而代"
-"之,Taler的基礎為盲簽名(blind signature)。然而,在理論上,結合Taler與對等網路"
-"(peer-to-peer )加密貨幣(crypto-currencies)如比特幣(Bitcoin)是可行的。"
+"Taler 不需要任何區塊鏈技術,也不基於工作證明或任何其他分散式共識機制。取而代之,Taler的基礎為盲簽名(blind "
+"signature)。然而,在理論上,結合Taler與對等網路(peer-to-peer )加密貨幣(crypto-"
+"currencies)如比特幣(Bitcoin)是可行的。"
 
 #: template/faq.html.j2:18
-#, fuzzy
 msgid ""
 "It would be possible, however, to withdraw coins denominated in Bitcoin into "
 "a Taler wallet (with an appropriate exchange), which would give some "
 "benefits over plain Bitcoin, such as instant confirmation times."
-msgstr ""
-"然而,有可能將以比特幣計價的貨幣提取到 Taler 錢包中(通過適當的交換),這帶來"
-"比普通比特幣更多的好處,如即時確認。"
+msgstr "然而,(通過適當的交換)有可能將以比特幣計價的貨幣提取到 Taler 錢包中,這帶來比普通比特幣更多的好處,如即時確認。"
 
 #: template/faq.html.j2:26
 msgid "Where is the balance in my wallet stored?"
 msgstr "我錢包裡的餘額存放在哪裡?"
 
 #: template/faq.html.j2:28
-#, fuzzy
 msgid ""
 "Your wallet stores digital coins and thus ultimately your computer holds "
 "your balance. The exchange keeps funds matching all unspent coins in an "
 "escrow bank account."
-msgstr ""
-"您的錢包存儲數位貨幣,從而最終您的電腦持有您的餘額。交易所將資金與託管銀行帳"
-"戶中未使用的貨幣進行匹配。"
+msgstr "您的錢包存儲數位貨幣,從而最終您的電腦持有您的餘額。交易所將資金與託管銀行帳戶中未使用的貨幣進行匹配。"
 
 #: template/faq.html.j2:35
-#, fuzzy
 msgid "What if my wallet is lost?"
 msgstr "如果我遺失了我的錢包怎麼辦?"
 
 #: template/faq.html.j2:37
-#, fuzzy
 msgid ""
 "Since the digital coins of value in your wallet are anonymized, the exchange "
 "can not assist you in recovering a lost or stolen wallet. Just like with a "
 "physical wallet for cash, you are responsible for keeping it safe."
-msgstr ""
-"由於您錢包中的有價電子貨幣是匿名的,交易所無法幫助您找回丟失或被盜竊的錢包。"
-"就如同裝有現金的實體錢包,您需要負對錢包的保管責任。"
+msgstr "由於您錢包中的有價電子貨幣是匿名的,交易所無法幫助您找回丟失或被盜竊的錢包。就如同裝有現金的實體錢包,您需要負對錢包的保管責任。"
 
 #: template/faq.html.j2:46
 msgid ""
@@ -543,14 +485,12 @@ msgstr ""
 "銀行帳戶接收付款。"
 
 #: template/faq.html.j2:70
-#, fuzzy
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among friends "
 "directly as well."
 msgstr "未來版本的Taler錢包也可能允許朋友之間直接交換貨幣。"
 
 #: template/faq.html.j2:76
-#, fuzzy
 msgid "How does Taler handle payments in different currencies?"
 msgstr "Taler 如何處理不同幣值的款項?"
 
@@ -570,21 +510,18 @@ msgid "How does Taler protect my privacy?"
 msgstr "Taler如何保護我的隱私?"
 
 #: template/faq.html.j2:91
-#, fuzzy
 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:101
-#, fuzzy
 msgid "How much does it cost?"
-msgstr "花費多少錢?"
+msgstr "這需要花費多少錢?"
 
 #: template/faq.html.j2:103
 msgid ""
@@ -610,7 +547,6 @@ msgid "Does Taler work with international payments?"
 msgstr "Taler支持跨國轉帳嗎?"
 
 #: template/faq.html.j2:119
-#, fuzzy
 msgid ""
 "Taler&#39;s wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -620,35 +556,27 @@ msgid ""
 "payments, so we have no plans to support currency conversion in the near "
 "future."
 msgstr ""
-"Taler&#39;的錢包支持多種貨幣,但系統當前不支持貨幣之間的轉換。雖然原則上,一"
-"個能夠接收某貨幣存款並允許使用另一種貨幣提款的實體是可以被製造出來的。然而,"
-"對於這方面的監管障礙通常十分複雜。Taler 所著重的是日常的付款,所以我們近期並"
-"沒有計畫支持貨幣轉換的功能。"
+"Taler&#39;的錢包支持多種貨幣,但系統當前不支持貨幣之間的轉換。雖然原則上,一個能夠接收某貨幣存款並允許使用另一種貨幣提款的實體是可以被製造出來的"
+"。然而,對於這方面的監管障礙通常十分複雜。Taler 所著重的是日常的付款,所以我們近期並沒有計畫支持貨幣轉換的功能。"
 
 #: template/faq.html.j2:130
-#, fuzzy
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
-msgstr "Taler與(歐洲)電子貨幣指令有何關係?"
+msgstr "Taler與(歐洲)電子貨幣指令有何關係?"
 
 #: template/faq.html.j2:132
-#, fuzzy
 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 ""
-"我們認為,《歐洲電子貨幣指令》將為Taler交易提供以歐元為單位的硬幣交易之監管框"
-"架的一部分。"
+msgstr "我們認為,《歐洲電子貨幣指令》將為Taler交易提供以歐元為單位的硬幣交易之監管框架的一部分。"
 
 #: template/faq.html.j2:139
-#, fuzzy
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
-msgstr "哪家銀行可以保證Taler硬幣與常規銀行帳戶中的銀行貨幣之間的轉換?"
+msgstr "哪家銀行可以保證Taler貨幣與常規銀行帳戶中的銀行貨幣之間的轉換?"
 
 #: template/faq.html.j2:141
-#, fuzzy
 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 "
@@ -657,19 +585,16 @@ msgid ""
 "establishing a reason why consumers would have faith in the conversion from "
 "Taler coins into regular bank money."
 msgstr ""
-"交易所將由銀行運營或與銀行合作,並且該銀行將資金託管。請注意,此銀行可能會是"
-"一個普通銀行或是一個集中存入電子貨幣的中央銀行。無論如何,此銀行需遵循個別銀"
-"行的規定、建立顧客對於轉換Taler錢幣至一般銀行貨幣的信任。"
+"交易所將由銀行運營或與銀行合作,並且該銀行將資金託管。請注意,此銀行可能會是一個普通銀行或是一個集中存入電子貨幣的中央銀行。無論如何,此銀行需遵循個別銀行"
+"的規定、建立顧客對於轉換Taler錢幣至一般銀行貨幣的信任。"
 
 #: template/faq.html.j2:150
-#, fuzzy
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
-msgstr "如果不轉換或不遵守規定,消費者會向誰投訴?"
+msgstr "如果不轉換(non-conversion)或不遵守規定(non-compliance),消費者會向誰投訴?"
 
 #: template/faq.html.j2:152
-#, fuzzy
 msgid ""
 "Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -677,9 +602,8 @@ msgid ""
 "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
 msgid "Are there any projects already using Taler?"
@@ -719,6 +643,10 @@ msgid ""
 "version of the Taler wallet will likely support them. But this is not a "
 "feature that we are targeting for Taler 1.0. at this time."
 msgstr ""
+"我們的錢包應用程式日前不支援定期付款。Taler在理論上可以定期支付固定金額的定期付款,但需要注意一些事項。具體來說,定期付款只有在Taler錢包於所需時"
+"間運行並且在線時,方可使用。此外,定期付款的重複性質使其為可鏈接的,這可以用於提供匿名性予進行定期付款的使用者,例如通過使得用戶在付款時離線,此使用者在特"
+"定時間的付款就不會被按時觀察到。最後,Taler錢包無法使用信用卡付款,因此用戶必須確保持有足夠的餘額以進行定期付款。儘管如此,這還是有用的,而且Tale"
+"r錢包的未來版本可能會支援這些功能。但這不是我們此時針對Taler 1.0的功能。"
 
 #: template/features.html.j2:7
 msgid "GNU Taler: Features"
@@ -763,15 +691,14 @@ msgstr ""
 "冊</span>於商家的&#39;網頁之形況下接受付款。"
 
 #: template/features.html.j2:50
-#, fuzzy
 msgid ""
 "GNU Taler is <span class=\"tlr\">immune against many types of fraud</span>, "
 "such as phishing of credit card information or chargeback fraud. In case of "
 "loss or theft, only the limited amount of money left in the wallet might be "
 "gone."
 msgstr ""
-"GNU Taler可以<span class=\"tlr\">抵抗類型的詐欺免疫</span>,例如信用卡信息的"
-"網絡釣魚或退款欺詐。萬一丟失或被盜,只有剩下的有限餘額可能會消失。"
+"GNU Taler可以<span class=\"tlr\""
+">抵抗類型的詐欺免疫</span>,例如信用卡信息的網絡釣魚或退款欺詐。萬一丟失或被盜,只有剩下的有限餘額可能會消失。"
 
 #: template/features.html.j2:69
 msgid "Paying with Taler"
@@ -796,9 +723,8 @@ msgstr ""
 "遭受網絡釣魚或身份盜用的任何風險。"
 
 #: template/features.html.j2:87
-#, fuzzy
 msgid "Try it yourself with the interactive demo!"
-msgstr "您也來試用看看互動式的demo吧!"
+msgstr "您也來試用看看互動式的demo吧!"
 
 #: template/features.html.j2:94
 msgid "Receiving payments with Taler"
@@ -831,64 +757,54 @@ msgid "Practical"
 msgstr "實用的"
 
 #: template/features.html.j2:130
-#, fuzzy
 msgid ""
 "Taler is easy to integrate with existing Web applications. Payments are "
 "cryptographically secured and are confirmed within milliseconds with "
 "extremely low transaction costs."
-msgstr ""
-"Taler能夠很輕鬆地與現有的網頁應用程序進行整合。付款被密碼保護並只需幾毫秒即可"
-"確認,交易成本極低。"
+msgstr "Taler能夠很輕鬆地與現有的網頁應用程序進行整合。付款被密碼保護並只需幾毫秒即可確認,交易成本極低。"
 
 #: template/features.html.j2:140
 msgid "Stable"
 msgstr "穩定的"
 
 #: template/features.html.j2:143
-#, fuzzy
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
 "currencies. Thus, Taler&#39;s cryptographic coins correspond to existing "
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
-"Taler並沒有引入新的貨幣。Taler使用一種電子錢包來儲存貨幣以及付款服務提供商來"
-"從已存在的貨幣中提供託管帳戶。因此,Taler&#39;的加密貨幣對應到已存在的貨幣,"
-"如: 美金、歐元、甚至是比特幣。"
+"Taler並沒有引入新的貨幣。Taler使用一種電子錢包來儲存貨幣以及付款服務提供商來從已存在的貨幣中提供託管帳戶。因此,Taler&#39;的加密貨幣對"
+"應到已存在的貨幣,如:美金、歐元、甚至是比特幣。"
 
 #: template/features.html.j2:154 template/governments.html.j2:55
 msgid "Secure"
 msgstr "安全的"
 
 #: template/features.html.j2:157
-#, fuzzy
 msgid ""
 "By design Taler does not suffer from many classes of security problems such "
 "as phishing or counterfeit. Thanks to its security features, Taler never "
 "rejects a legitimate customer due to a fraud-detection false positive."
 msgstr ""
-"Taler經過設計,並不會遭受到許多種類的安全問題,例如網絡釣魚或假冒。虧得Taler"
-"的安全特性,Taler從不會因為錯誤的詐欺識別結果而拒絕一個合法的顧客。"
+"Taler經過設計,並不會遭受到許多種類的安全問題,例如網絡釣魚或假冒。虧得Taler的安全特性,Taler從不會因為錯誤的詐欺識別結果而拒絕一個合法的顧"
+"客。"
 
 #: template/features.html.j2:169 template/governments.html.j2:25
-#, fuzzy
 msgid "Taxable"
 msgstr "應課稅"
 
 #: template/features.html.j2:172
-#, fuzzy
 msgid ""
 "When using Taler, merchant&#39;s revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
-"使用Taler時,商家&#39;的收入對於稅收徵管機構而言是透明的。不同於現金或是大部"
-"分的數位貨幣,Taler幫助預防黑市。Taler不適用於非法活動。"
+"使用Taler時,商家&#39;的收入對於稅收徵管機構而言是透明的。不同於現金或是大部分的數位貨幣,Taler幫助預防黑市。Taler不適用於非法活動。"
 
 #: template/features.html.j2:182
-#, fuzzy
 msgid "Private"
-msgstr "有隱私的"
+msgstr "隱私的"
 
 #: template/features.html.j2:184
 msgid ""
@@ -914,12 +830,10 @@ msgstr ""
 "行自行的支付基礎架構。由於實作參考是一個"
 
 #: template/features.html.j2:205
-#, fuzzy
 msgid "package, it will always remain free software."
 msgstr "套裝軟體,它將永遠是免費的軟體。"
 
 #: template/financial-news.html.j2:6
-#, fuzzy
 msgid "Financial News"
 msgstr "財經新聞"
 
@@ -934,7 +848,6 @@ msgid "Advantages for Governments"
 msgstr "予政府的優勢"
 
 #: template/governments.html.j2:8
-#, fuzzy
 msgid ""
 "Taler provides accountability to ensure business operate legally, while also "
 "respecting civil liberties of citizens. Taler is a payment system based on "
@@ -942,13 +855,10 @@ msgid ""
 "financial framework and act as trusted regulators. Taler contributes to "
 "digital sovereignty in the critical financial infrastructure."
 msgstr ""
-"Taler提供問責制,以確保企業合法經營,同時也尊重公民的公民自由。Taler是一個基"
-"於開放標準以及免費軟開放標準以及免費軟體的支付系統。Taler於建立財務框架以及充"
-"當可信賴的監管機構時需要政府。Taler在關鍵的金融基礎設施中為數位主權做出了貢"
-"獻。"
+"Taler提供問責制,以確保企業合法經營,同時也尊重公民的公民自由。Taler是一個基於開放標準以及免費軟開放標準以及免費軟體的支付系統。Taler於建立"
+"財務框架以及充當可信賴的監管機構時需要政府。Taler在關鍵的金融基礎設施中為數位主權做出了貢獻。"
 
 #: template/governments.html.j2:27
-#, fuzzy
 msgid ""
 "Taler was built with the goal of fighting corruption and supporting "
 "taxation. With Taler, the receiver of any form of payment is easily "
@@ -957,9 +867,8 @@ msgid ""
 "data to tax businesses and individuals based on their income, making tax "
 "evasion and black markets less viable."
 msgstr ""
-"Taler的建立主旨為打擊腐敗和支持稅收。有了Taler,任何款項的接收者能夠被政府輕"
-"易地辨識,也能夠強制商家提供顧客接受的合約。政府可以使用這些數據根據企業和個"
-"人的收入向他們徵稅,從而打擊逃漏稅與黑市交易。"
+"Taler的建立主旨為打擊腐敗和支持稅收。有了Taler,任何款項的接收者能夠被政府輕易地辨識,也能夠強制商家提供顧客接受的合約。政府可以使用這些數據根據"
+"企業和個人的收入向他們徵稅,從而打擊逃漏稅與黑市交易。"
 
 #: template/governments.html.j2:40
 msgid ""
@@ -972,6 +881,8 @@ msgid ""
 "funds with trusted friends and family, or synchronizing wallets across "
 "multiple devices."
 msgstr ""
+"因此,儘管Taler提供了匿名服務予使用數位現金購買商品與服務的民眾,Taler也確保了國家能夠觀察資金的流入。這可用於確保企業僅從事合法活動,而不會逃避"
+"所得稅,營業稅或增值稅。但是,這種觀察能力並未擴展到直接的個人領域。尤其,監控範疇不包括與可信賴的朋友和家人共享對資金的訪問,也不包括跨多個設備同步錢包。"
 
 #: template/governments.html.j2:58
 msgid ""
@@ -981,6 +892,8 @@ msgid ""
 "disputes. Financial damages are strictly limited, improving economic "
 "security for individuals, merchants, the exchange and the state."
 msgstr ""
+"Taler&#39;的付款採用密碼保護。因此,發生糾紛時,客戶、商人和Taler付款服務提供商(交易所)可以在法庭上以數學方式證明其合法行為。Taler嚴"
+"格限制財務損失,從而也改善了個人、商人、交易所和國家的經濟安全。"
 
 #: template/governments.html.j2:70
 msgid ""
@@ -991,6 +904,8 @@ msgid ""
 "the exchange to ensure that the escrow account is managed honestly. This "
 "ensures that the exchange does not threaten the economy due to fraud."
 msgstr ""
+"作為付款服務提供商,Taler交易所必須遵守金融法規。財務監管和定期審核對於建立信任至關重要。特別來說,Taler設計了一個獨立的審計員,該審計員檢查在交"
+"易所積累的加密證明,以確保誠實地對託管賬戶進行管理。這樣可以確保交易所不會因欺詐而威脅到經濟。"
 
 #: template/governments.html.j2:88
 msgid ""
@@ -1023,7 +938,6 @@ msgid "Anti money laundering (AML)"
 msgstr "反洗錢(AML)"
 
 #: template/governments.html.j2:120
-#, fuzzy
 msgid ""
 "With Taler, income is visible and can be tied to the contract signed by both "
 "parties."
@@ -1034,64 +948,50 @@ msgid "Know your customer (KYC)"
 msgstr "了解您的顧客(KYC)"
 
 #: template/governments.html.j2:122
-#, fuzzy
 msgid ""
 "In Taler, payer and payee are known by their bank accounts when withdrawing "
 "or depositing coins respectively"
-msgstr ""
-"使用Taler時,付款人和收款人各自的銀行帳戶都知道顧客何時提取或存放貨幣。"
+msgstr "使用Taler時,付款人和收款人各自的銀行帳戶都知道顧客何時提取或存放貨幣。"
 
 #: template/governments.html.j2:123
 msgid "General Data Protection Regulation (GDPR)"
 msgstr "一般資料保護規範(GDPR)"
 
 #: template/governments.html.j2:124
-#, fuzzy
 msgid ""
 "Taler cryptographically protects citizen's privacy, and by design implements "
 "data minimization and privacy by default."
-msgstr ""
-"Taler通過密碼保護公民的隱私,並且默認情況下通過設計實施數據最小化以及隱私保"
-"護。"
+msgstr "Taler通過密碼保護公民的隱私,並且默認情況下通過設計實施數據最小化以及隱私保護。"
 
 #: template/governments.html.j2:125
-#, fuzzy
 msgid "Payment Services Directive (PSD2)"
-msgstr "支付服務指令(PSD2)"
+msgstr "支付服務指令(PSD2)"
 
 #: template/governments.html.j2:126
-#, fuzzy
 msgid ""
 "Taler provides an open standard with public APIs contributing to a "
 "competitive banking sector."
 msgstr "Taler通過公共APIs提供了開放標準,並為競爭激烈的銀行業做出貢獻。"
 
 #: template/governments.html.j2:134
-#, fuzzy
 msgid "Taler provides privacy and accountability"
 msgstr "Taler提供隱私與責任"
 
 #: template/governments.html.j2:137
-#, fuzzy
 msgid ""
 "Taler assumes governments can observe traditional wire transfers entering "
 "and leaving the Taler payment system. Starting with the wire transfers, "
 "governments can obtain:"
-msgstr ""
-"Taler假設政府可以觀察進入和離開Taler付款系統的傳統電匯。自從電匯開始,政府可"
-"以獲得:"
+msgstr "Taler假設政府可以觀察進入和離開Taler付款系統的傳統電匯。自從電匯開始,政府可以獲得:"
 
 #: template/governments.html.j2:145
-#, fuzzy
 msgid ""
 "The total amount of digital currency withdrawn by a customer. The government "
 "can impose limits on how much digital cash a customer can withdraw within a "
 "given time frame."
-msgstr ""
-"客戶提取的電子貨幣總金額。政府可以限制客戶在給定時間內可以提取多少數位現金。"
+msgstr "客戶提取的電子貨幣總金額。政府可以限制客戶在給定時間內可以提取多少數位現金。"
 
 #: template/governments.html.j2:154
-#, fuzzy
 msgid "The income received by any merchant via the Taler system."
 msgstr "任何商家通過Taler系統獲得的收入。"
 
@@ -1111,10 +1011,12 @@ msgid ""
 "merchants with the exchange, and the income of the exchange from transaction "
 "fees."
 msgstr ""
+"客戶合法從交易所提取的數位硬幣數量、客戶&#39;錢包中尚未兌換的電子貨幣的價值、商家在交易所進行的存款操作的價值和相應的電匯詳細資訊、以及交易所交易費用"
+"的收入。"
 
 #: template/index.html.j2:7
 msgid "Taler logo"
-msgstr ""
+msgstr "Taler logo"
 
 #: template/index.html.j2:16
 msgid ""
@@ -1127,26 +1029,23 @@ msgstr ""
 #: template/index.html.j2:21
 #, fuzzy
 msgid "Payments without registration"
-msgstr "不須法規的支付"
+msgstr "未經註冊的付款"
 
 #: template/index.html.j2:25
-#, fuzzy
 msgid "Data protection by default"
 msgstr "默認情況下的資料保護"
 
 #: template/index.html.j2:29
-#, fuzzy
 msgid "Fraud eliminated by design"
-msgstr "排除詐欺的設計"
+msgstr "通過設計消除欺詐"
 
 #: template/index.html.j2:33
 msgid "Not a new currency!"
 msgstr "不是一個新的貨幣!"
 
 #: template/index.html.j2:37
-#, fuzzy
 msgid "Empowers communities to run their own payment infrastructure"
-msgstr "授予權力於社區以運行自己的支付基礎設施"
+msgstr "授予權力於社區以運行自身的支付基礎設施"
 
 #: template/index.html.j2:41
 msgid "Free Software"
@@ -1167,9 +1066,10 @@ msgid ""
 "payments for these contracts. Its main use-case is for a mensa, cafeteria or "
 "restaurant when vending food from a menu."
 msgstr ""
+"這是Taler PoS App的頁面。Taler PoS "
+"App使得供應商可以維護其產品清單、快速建立Taler合約並處理這些合約的Taler付款。它的主要用例在於使用菜單販售食物的mensa,自助餐廳或餐廳。"
 
 #: template/press.html.j2:4
-#, fuzzy
 msgid "GNU Taler in the Press"
 msgstr "報導中的GNU Taler"
 
@@ -1211,12 +1111,10 @@ msgid ""
 msgstr "在設計GNU Taler時,在我們的腦海中有以下的設計原則:"
 
 #: template/principles.html.j2:31
-#, fuzzy
 msgid "1. Free/Libre Software"
 msgstr "1. 免費/自由 軟體"
 
 #: template/principles.html.j2:33
-#, fuzzy
 msgid ""
 "... in the area of computing, freedom means not using proprietary software"
 msgstr "... 在電腦學的領域,自由代表不使用專有軟體"
@@ -1232,6 +1130,12 @@ msgid ""
 "<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
 "principle</a> and to establish public confidence."
 msgstr ""
+"GNU Taler必須是<a href=\"https://www.gnu.org/philosophy/free-sw.html\"";
+">免費/自由軟體</a>。對於商家來說,免費/自由軟體防止供應商鎖定(lock-"
+"in),這意味著商家可以輕鬆選擇其他服務提供商來處理他們的付款。對於國家來說,免費/自由軟體意味著GNU Taler無法通過施加限制或要求來損害其主權。"
+"\n"
+"對於交易所運營商而言,透明度對於滿足<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs'"
+"s_principle\">Kerckhoff's principle</a>尤其重要,這也能建立公眾的信心。"
 
 #: template/principles.html.j2:49
 msgid ""
@@ -1240,14 +1144,14 @@ msgid ""
 "available and make it easy to verify that user-hostile features such as "
 "tracking or telemetry are absent."
 msgstr ""
+"因為任何人都可以自由修改錢包軟體,客戶可以從免費/自由軟體中受益並支持其他平台。其原始碼必須可被大眾使用,並且可以輕鬆地驗證其不存在諸如跟踪或遙測之類的對"
+"用戶不利的功能。"
 
 #: template/principles.html.j2:60
-#, fuzzy
 msgid "2. Protect the privacy of buyers"
 msgstr "2. 保護購買者的隱私"
 
 #: template/principles.html.j2:62
-#, fuzzy
 msgid "You deserve some privacy"
 msgstr "您值得擁有隱私"
 
@@ -1260,6 +1164,8 @@ msgid ""
 "online publications. Thus, GNU Taler must protect the privacy of buyers to "
 "avoid facilitating totalitarian control over the population."
 msgstr ""
+"當隱私權通過技術措施得到保障,而不是僅僅是政策,才是最有意義的。如果沒有技術層提供預設的隱私,財務交易就會顯示出非必要程度的個人或私人資料。尤其在為線上出"
+"版物進行小額付款時更是如此。因此,GNU Taler必須保護購買者的隱私,以避免促進對人口的極權控制。"
 
 #: template/principles.html.j2:72
 msgid ""
@@ -1268,16 +1174,16 @@ msgid ""
 "to local laws. In this case, GNU Taler must enable deletion of such data as "
 "soon as it is no longer required."
 msgstr ""
+"有限的私人資料可能需要根據業務需求而被收集(例如,實際交付的送貨地址),並根據當地法律進行保護。在這種情況下,GNU "
+"Taler必須在不再需要此類資料時立即將其刪除。"
 
 #: template/principles.html.j2:83
-#, fuzzy
 msgid ""
 "3. Auditability - enable the state to tax income and crack down on illegal "
 "business activities"
 msgstr "3. 可審核性 - 允許各州政府對收入課稅並打擊非法商業活動"
 
 #: template/principles.html.j2:85
-#, fuzzy
 msgid "Money laundering"
 msgstr "洗錢"
 
@@ -1290,9 +1196,11 @@ msgid ""
 "taxation requires income transparency. Thus, GNU Taler must enable "
 "authorities to track income."
 msgstr ""
+"由於付款系統必須符合當地法律才能合法運作,GNU Taler的設計必須符合這些要求。GNU "
+"Taler必須為依法展開調查地的調查人員提供審計追踪。此外,我們認為開徵稅收對社會有益,而收入透明為公平稅收的必要條件。因此,GNU "
+"Taler必須使當局能夠追踪收入。"
 
 #: template/principles.html.j2:102
-#, fuzzy
 msgid "4. Prevent payment fraud"
 msgstr "4. 預防支付詐欺"
 
@@ -1309,18 +1217,18 @@ msgid ""
 "extensive cryptographic evidence for all key processes to enable all parties "
 "to precisely attribute bad behavior."
 msgstr ""
+"GNU Taler必須減輕最常見的付款欺詐來源。我們必須遵循軟件設計中的最佳實踐和第三方設計準則,以防止混淆和誤導用戶界面,並且必須讓公眾檢查我們的公開程"
+"式碼。此外,GNU Taler必須為所有關鍵過程提供廣泛的加密證據,以使各方都能準確地將不良行為歸責。"
 
 #: template/principles.html.j2:120
-#, fuzzy
 msgid "5. Collect the minimum information necessary"
 msgstr "5. 蒐集最少的必要資訊"
 
 #: template/principles.html.j2:121
-#, fuzzy
 msgid ""
 "Privacy by design, privacy by default, General Data Protection Regulation "
 "(GDPR) compliant"
-msgstr "基於隱私來設計,以隱私為默認值,符合通用數據保護法規(GDPR)"
+msgstr "基於隱私來設計,以隱私為默認值,符合通用數據保護法規(GDPR)"
 
 #: template/principles.html.j2:123
 msgid ""
@@ -1329,14 +1237,14 @@ msgid ""
 "Generally, GNU Taler must collect the minimum information necessary: data "
 "that is not collected or is no longer stored can not be compromised."
 msgstr ""
+"作為原則(2)的一部分,買方的隱私受到特別重視。然而,其他各方(例如商家)的資料也必受到保護。通常,GNU "
+"Taler會收集必要的最少信息:不會破壞未收集或不再被存儲的資料。"
 
 #: template/principles.html.j2:137
-#, fuzzy
 msgid "6. Be usable"
-msgstr "6. 要可用"
+msgstr "6. 要為可用的"
 
 #: template/principles.html.j2:138
-#, fuzzy
 msgid "Buy with one click. Easy for children."
 msgstr "一鍵購買。對孩童來說也十分容易。"
 
@@ -1351,14 +1259,17 @@ msgid ""
 "well-documented Application Programming Interfaces (APIs) to allow "
 "frictionless integrations between GNU Taler and other projects."
 msgstr ""
+"GNU Taler必須適用於非專家客戶,包括GNU Taler錢包的終端使用者、希望使用GNU "
+"Taler接受付款的商家以及電子商務和其他平台的第三方應用程序開發人員。GNU "
+"Taler必須遵循最佳實踐可用性準則,並吸收專家和用戶的回饋。為了做出明智的選擇,免費/自由軟體還需要免費/自由文件。\n"
+"GNU Taler必須提供文件齊全的應用程序編程接口 (APIs) ,以實現GNU Taler與其他項目之間的無障礙整合(frictionless "
+"integrations)。"
 
 #: template/principles.html.j2:157
-#, fuzzy
 msgid "7. Be efficient"
 msgstr "7. 要有效率"
 
 #: template/principles.html.j2:158
-#, fuzzy
 msgid "Energy efficiency"
 msgstr "能量效率"
 
@@ -1370,13 +1281,14 @@ msgid ""
 "used for micropayments. Therefore certain expensive primitives, such as "
 "proof-of-work, must not be used by GNU Taler."
 msgstr ""
+"GNU Taler必須設計成高效率地。簡而言之,效率代表更少工作量、每秒從事更多的交易、更低的環境影響。效率對於將GNU "
+"Taler用於小額付款也至關重要。因此,GNU Taler不得使用某些昂貴的原語(primitives),例如工作量證明(proof-of-work)。"
 
 #: template/principles.html.j2:173
 msgid "8. Fault-tolerant design"
 msgstr "8. 容錯設計"
 
 #: template/principles.html.j2:174
-#, fuzzy
 msgid "Life Safers"
 msgstr "救星"
 
@@ -1390,14 +1302,15 @@ msgid ""
 "must fail gracefully. GNU Taler must have a plan to recover from malicious "
 "operators compromising core secrets."
 msgstr ""
+"惡意操作員、手滑(fat fingers)、電腦故障、gremlins。差錯會發生。GNU Taler的設計必須有容忍單個組件和系統的故障的能力。在系統可"
+"以繼續安全運行的地方,它將繼續安全運行。在它必須暫停運作的時,其他操作在非必要情況下不能離線。系統發生故障時,它們必須正常運行。GNU "
+"Taler必須制定一個計劃,以從危害核心秘密的惡意運營者中恢復。"
 
 #: template/principles.html.j2:194
-#, fuzzy
 msgid "9. Foster competition"
 msgstr "9. 促進競爭"
 
 #: template/principles.html.j2:195
-#, fuzzy
 msgid "A competitive market"
 msgstr "一個競爭市場"
 
@@ -1413,28 +1326,27 @@ msgid ""
 "can be operated, developed and improved upon independently, instead of "
 "having one completely monolithic system."
 msgstr ""
+"競爭對手必須相對容易地部署可互操作的替代方案。在傳統金融系統中,這方面的障礙相當高並超出了我們的控制範圍。然而,GNU "
+"Taler必須最大程度地減少新競爭對手進入市場的技術負擔。GNU Taler必須使各種運營商能夠打破目前只有少數幾家全球公司主導市場的系統。支持此目的的設"
+"計範例為一個將整個系統拆分為可以獨立操作、開發和改進的較小組件,而不是擁有一個完全獨立的系統。"
 
 #: template/schemafuzz.html.j2:6
 msgid "SchemaFuzz"
 msgstr "SchemaFuzz"
 
 #: template/wallet.html.j2:106
-#, fuzzy
 msgid "Congratulations, you have installed the Taler wallet. Check out the"
 msgstr "恭喜您,您已經安裝了Taler wallet。請查看"
 
 #: template/wallet.html.j2:111
-#, fuzzy
 msgid "demo"
 msgstr "demo"
 
 #: template/wallet.html.j2:117
-#, fuzzy
 msgid "You don&#39;t have a wallet installed yet."
 msgstr "您還沒有&#39;安裝錢包。"
 
 #: template/wallet.html.j2:126
-#, fuzzy
 msgid "Install the wallet for your browser below, then check out the"
 msgstr "從您的瀏覽器下方安裝錢包,然後查看"
 
@@ -1465,7 +1377,6 @@ msgid "Install wallet"
 msgstr "安裝錢包"
 
 #: template/wallet.html.j2:175
-#, fuzzy
 msgid "JavaScript is disabled, installation won&#39;t work."
 msgstr "JavaScript已被關閉,安裝無&#39;法運作。"
 
@@ -1478,26 +1389,22 @@ msgid "Install GNU Taler"
 msgstr "安裝GNU Taler"
 
 #: template/wallet.html.j2:225
-#, fuzzy
 msgid "from the Chrome Web Store"
 msgstr "從Chrome網路商店"
 
 #: template/wallet.html.j2:246
-#, fuzzy
 msgid "Download Android App from F-Droid (bypassing Google registration)."
-msgstr "從F-Droid下載Android App (跳過Google註冊)。"
+msgstr "從F-Droid下載Android App (跳過Google註冊)。"
 
 #: template/wallet.html.j2:259
 msgid "Other browsers"
 msgstr "其他瀏覽器"
 
 #: template/wallet.html.j2:261
-#, fuzzy
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "其他瀏覽器的錢包會於近期提供。"
 
 #: template/news/index.html.j2:11
-#, fuzzy
 msgid "News posts about changes related to GNUnet such as releases and events"
 msgstr "與GNU Taler更改、發布、活動等相關的最新消息"
 
@@ -1510,7 +1417,5 @@ msgid "read more"
 msgstr "閱讀更多"
 
 #: template/news/index.html.j2:45
-#, fuzzy
-#| msgid "archive"
 msgid "News archives:"
-msgstr "檔案室"
+msgstr "檔案室:"
diff --git a/static/.well-known/security.txt b/static/.well-known/security.txt
index 1726f52..2a67e77 100644
--- a/static/.well-known/security.txt
+++ b/static/.well-known/security.txt
@@ -11,4 +11,4 @@ Disclosure: Full
 
 # Happy to acknowledge once there is something to acknowledge,
 # for now 404 as we had no incidents.
-Acknowledgement: https://taler.net/en/security.html
+Acknowledgement: https://anastasis.lu/en/security.html
diff --git a/template/wallet.html.j2 b/template/wallet.html.j2
index 47c183a..1febffa 100644
--- a/template/wallet.html.j2
+++ b/template/wallet.html.j2
@@ -192,7 +192,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
         <!--
         <h3>Firefox Beta</h3>
         <ol>
-          <li><a href="{{ url('releases/taler-wallet/taler-wallet-stable.xpi') 
}}">Download the wallet</a> (right click, Save Link As...)</li>
+          <li><a href="{{ url('releases/taler-wallet/taler-wallet-stable.xpi', 
virtual=True) }}">Download the wallet</a> (right click, Save Link As...)</li>
           <li>On the <code>about:debugging</code> page, "Load temporary 
extension"</li>
         </ol>
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]