[taler-taler-merchant-demos] branch master updated (a5bedb7 -> ea17362)

[gnunet]

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

skuegel pushed a change to branch master
in repository taler-merchant-demos.

    from a5bedb7  unquote article name for summary
     new d8b4bab  Reintegrated Chinese message.po file after rebase in Weblate
     new ea17362  Merge branch 'master' of 
ssh://git.taler.net/taler-merchant-demos

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 translations/zh_Hant/LC_MESSAGES/messages.po | 35 ++++++----------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po 
b/translations/zh_Hant/LC_MESSAGES/messages.po
index 8f1ed48..a09390d 100644
--- a/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/translations/zh_Hant/LC_MESSAGES/messages.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
 "POT-Creation-Date: 2021-03-12 18:42+0100\n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2021-05-20 20:47+0000\n"
+=======
 "PO-Revision-Date: 2021-05-16 06:58+0000\n"
+>>>>>>> a5bedb7db9ceaa0342306f12f900914a8e9b4155
 "Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/";
 "gnu-taler/demonstration-pages/zh_Hant/>\n"
@@ -48,17 +52,14 @@ msgid "Internal error: Files for article ({}) not found."
 msgstr "內部錯誤: 找不到此項目({})的檔案。"
 
 #: talermerchantdemos/blog/blog.py:253
-#, fuzzy
 msgid "Supplemental file ({}) for article ({}) not found."
 msgstr "找不到項目({})的補充文件({})。"
 
 #: talermerchantdemos/blog/blog.py:326 talermerchantdemos/blog/blog.py:339
-#, fuzzy
 msgid "Direct access forbidden"
-msgstr "不允許直接存取"
+msgstr "禁止直接存取"
 
 #: talermerchantdemos/blog/blog.py:405
-#, fuzzy
 msgid "Internal server error"
 msgstr "內部伺服器錯誤"
 
@@ -70,9 +71,8 @@ msgid "Page not found"
 msgstr "找不到此頁面"
 
 #: talermerchantdemos/blog/templates/article_frame.html.j2:9
-#, fuzzy
 msgid "Taler allows merchants to offer refunds to customers."
-msgstr "Taler使得商家可以提供退款給顧客。"
+msgstr "Taler允許商家提供退款給顧客。"
 
 #: talermerchantdemos/blog/templates/article_frame.html.j2:10
 msgid ""
@@ -106,7 +106,6 @@ msgid ""
 msgstr "這些文章是Richard Stallman所寫的書裡面的篇章 &quot;Free Software, Free 
Society&quot;。"
 
 #: talermerchantdemos/blog/templates/base.html.j2:39
-#, fuzzy
 msgid ""
 "The book is <a href=\"{shop}\">published by the FSF</a> and available "
 "gratis at <a href=\"{gnu}\">gnu.org</a>."
@@ -138,7 +137,7 @@ msgstr "在獲得退款之後，您將無法再次閱讀此文章。"
 msgid ""
 "You will only be able to receive the refund on the same wallet that you "
 "have used to pay for this article originally."
-msgstr "您只能透過使用當初購買文章所使用的錢包獲取退款。"
+msgstr "您只能透過使用當初購買文章所使用的錢包取得退款。"
 
 #: talermerchantdemos/blog/templates/confirm_refund.html.j2:21
 msgid "Request refund"
@@ -148,7 +147,6 @@ msgstr "要求退款"
 #: talermerchantdemos/donations/templates/error.html.j2:3
 #: talermerchantdemos/landing/templates/error.html.j2:3
 #: talermerchantdemos/survey/templates/error.html.j2:3
-#, fuzzy
 msgid "Error encountered"
 msgstr "發生錯誤"
 
@@ -161,7 +159,6 @@ msgstr "後端回傳狀態碼 {code}。"
 #: talermerchantdemos/blog/templates/error.html.j2:14
 #: talermerchantdemos/donations/templates/error.html.j2:14
 #: talermerchantdemos/survey/templates/error.html.j2:14
-#, fuzzy
 msgid "Backend response:"
 msgstr "後端回應:"
 
@@ -169,7 +166,6 @@ msgstr "後端回應:"
 #: talermerchantdemos/donations/templates/error.html.j2:19
 #: talermerchantdemos/landing/templates/error.html.j2:8
 #: talermerchantdemos/survey/templates/error.html.j2:19
-#, fuzzy
 msgid "Stack trace:"
 msgstr "堆疊追蹤:"
 
@@ -307,21 +303,18 @@ msgid "This is an example for a \"checkout\" page of a 
Web shop."
 msgstr "這是一個網路商店的\"付款\"頁面範例。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:10
-#, fuzzy
 msgid ""
 "On the previous page, you have created the shopping cart and decided "
 "which product to buy (i.e. which project to donate KUDOS to)."
 msgstr "您已在前一個頁面創建了一個購物車並決定將購入的產品 (範例: 要捐款KUDOS給哪個專案)。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:11
-#, fuzzy
 msgid ""
 "As Taler is not yet universally used, we expect merchants will offer "
 "various payment options."
 msgstr "由於Taler的使用尚未普及，我們期望商家會提供各種付款方式。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:12
-#, fuzzy
 msgid "To continue with the demo, select the &quot;Taler&quot; payment option."
 msgstr "請選擇 &quot;Taler&quot;付款選項以繼續進行demo。"
 
@@ -333,7 +326,6 @@ msgid ""
 msgstr "請注意，您必須在此處選擇Taler來繼續demo的進行，因為其他的支付選項僅為佔位符、無法在demo中運作。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:18
-#, fuzzy
 msgid ""
 "It would be possible to ask the user to make this choice already on the "
 "previous page (with the shopping cart); we just separated the two steps "
@@ -341,7 +333,6 @@ msgid ""
 msgstr "可以要求使用者在前一頁(使用購物車)做出此選擇;我們只是分開了兩個步驟，以保持每一步儘可能簡單。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:44
-#, fuzzy
 msgid "Confirm selection"
 msgstr "確認選擇的項目"
 
@@ -350,7 +341,6 @@ msgid "Donation Receipt"
 msgstr "捐款收據"
 
 #: talermerchantdemos/donations/templates/fulfillment.html.j2:7
-#, fuzzy
 msgid ""
 "Thank you, <strong>{donor}</strong>, for donating "
 "<strong>{amount}</strong> to <strong>{receiver}</strong>."
@@ -379,14 +369,12 @@ msgid "Donate to Free Software projects"
 msgstr "捐款給無償軟體專案"
 
 #: talermerchantdemos/donations/templates/index.html.j2:8
-#, fuzzy
 msgid ""
 "This donations website shows the user experience for donations with GNU "
 "Taler."
 msgstr "這個捐款網頁展示了與GNU Taler捐款的顧客體驗。"
 
 #: talermerchantdemos/donations/templates/index.html.j2:9
-#, fuzzy
 msgid "You can make donations in an toy currency ({currency})"
 msgstr "您可以使用任何的toy currency ({currency})來捐款"
 
@@ -418,7 +406,6 @@ msgstr ""
 "。但是請不要擔心，在Taler wallet中，會提供機會給您檢查商家最終折扣表單。透過此種方式，Taler保護您、免於支付錯誤的款項。"
 
 #: talermerchantdemos/donations/templates/provider-not-supported.html.j2:4
-#, fuzzy
 msgid "Payment Provider Not Supported"
 msgstr "不支援付款提供商"
 
@@ -427,7 +414,6 @@ msgid "Unfortunately the selected payment provider is not 
supported in this demo
 msgstr "很抱歉，您所選擇的付款提供商不支持此demo。"
 
 #: talermerchantdemos/donations/templates/provider-not-supported.html.j2:8
-#, fuzzy
 msgid "Please go back and select &quot;Taler&quot;."
 msgstr "請回到先前步驟並選擇&quot;Taler&quot;。"
 
@@ -438,19 +424,16 @@ msgstr "無法建立後台連線"
 
 #: talermerchantdemos/httpcommon/__init__.py:41
 #: talermerchantdemos/httpcommon/__init__.py:75
-#, fuzzy
 msgid "Could not parse response from backend"
 msgstr "無法解析後台回覆"
 
 #: talermerchantdemos/httpcommon/__init__.py:47
 #: talermerchantdemos/httpcommon/__init__.py:79
-#, fuzzy
 msgid "Backend returned error status"
 msgstr "後台回傳錯誤狀態"
 
 #: talermerchantdemos/landing/landing.py:179
 #: talermerchantdemos/survey/survey.py:179
-#, fuzzy
 msgid "HTTP method not allowed for this page"
 msgstr "HTTP方法不被此頁面允許"
 
@@ -463,7 +446,6 @@ msgid "This is the GNU Taler demo."
 msgstr "這是GNU Taler的demo。"
 
 #: talermerchantdemos/landing/templates/base.html.j2:35
-#, fuzzy
 msgid "Here you can try out the GNU Taler payment system using a toy currency."
 msgstr "您可以在這裡嘗試使用toy currency來使用GNU Taler付款系統。"
 
@@ -472,17 +454,14 @@ msgid "Step 1: Install the Taler wallet"
 msgstr "步驟一: 安裝Taler wallet"
 
 #: talermerchantdemos/landing/templates/index.html.j2:7
-#, fuzzy
 msgid "Install the wallet from the <a href=\"{link}\">installation page</a>."
 msgstr "從 <a href=\"{link}\">安裝頁面</a>安裝錢包。"
 
 #: talermerchantdemos/landing/templates/index.html.j2:8
-#, fuzzy
 msgid "Installation only takes one click."
 msgstr "一鍵安裝。"
 
 #: talermerchantdemos/landing/templates/index.html.j2:12
-#, fuzzy
 msgid ""
 "After installation, you may be asked to grant the browser-based Taler "
 "wallet additional optional permissions that allow it to improve your user"

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