[taler-taler-merchant-demos] branch master updated: Trying to merge the Chinese messages.po file for the demo pages

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 3abb09a  Trying to merge the Chinese messages.po file for the demo 
pages
3abb09a is described below

commit 3abb09a617548603026531e94d4b96a39f7da82b
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Fri May 21 10:26:31 2021 +0200

    Trying to merge the Chinese messages.po file for the demo pages
---
 translations/zh_Hant/LC_MESSAGES/messages.po | 122 ++++++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 3 deletions(-)

diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po 
b/translations/zh_Hant/LC_MESSAGES/messages.po
index a09390d..0b59d9d 100644
--- a/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/translations/zh_Hant/LC_MESSAGES/messages.po
@@ -9,10 +9,10 @@ msgstr ""
 "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-04-10 10:05+0000\n"
 =======
-"PO-Revision-Date: 2021-05-16 06:58+0000\n"
->>>>>>> a5bedb7db9ceaa0342306f12f900914a8e9b4155
+"PO-Revision-Date: 2021-05-20 20:47+0000\n"
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 "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"
@@ -40,10 +40,18 @@ msgid "Article is not anymore refundable"
 msgstr "此項目已無法退款"
 
 #: talermerchantdemos/blog/blog.py:217
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "You did not pay for this article (nice try!)"
 msgstr "您並沒有為此項目付款(可惜沒成功!)"
 
 #: talermerchantdemos/blog/blog.py:223
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Item not refundable (anymore)"
 msgstr "此項目無法退款(已無法)"
 
@@ -52,14 +60,26 @@ msgid "Internal error: Files for article ({}) not found."
 msgstr "內部錯誤: 找不到此項目({})的檔案。"
 
 #: talermerchantdemos/blog/blog.py:253
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Supplemental file ({}) for article ({}) not found."
 msgstr "找不到項目({})的補充文件({})。"
 
 #: talermerchantdemos/blog/blog.py:326 talermerchantdemos/blog/blog.py:339
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Direct access forbidden"
 msgstr "禁止直接存取"
 
 #: talermerchantdemos/blog/blog.py:405
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Internal server error"
 msgstr "內部伺服器錯誤"
 
@@ -71,6 +91,10 @@ msgid "Page not found"
 msgstr "找不到此頁面"
 
 #: talermerchantdemos/blog/templates/article_frame.html.j2:9
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Taler allows merchants to offer refunds to customers."
 msgstr "Taler允許商家提供退款給顧客。"
 
@@ -106,6 +130,10 @@ msgid ""
 msgstr "這些文章是Richard Stallman所寫的書裡面的篇章 &quot;Free Software, Free 
Society&quot;。"
 
 #: talermerchantdemos/blog/templates/base.html.j2:39
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid ""
 "The book is <a href=\"{shop}\">published by the FSF</a> and available "
 "gratis at <a href=\"{gnu}\">gnu.org</a>."
@@ -147,6 +175,10 @@ msgstr "要求退款"
 #: talermerchantdemos/donations/templates/error.html.j2:3
 #: talermerchantdemos/landing/templates/error.html.j2:3
 #: talermerchantdemos/survey/templates/error.html.j2:3
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Error encountered"
 msgstr "發生錯誤"
 
@@ -159,6 +191,10 @@ msgstr "後端回傳狀態碼 {code}。"
 #: talermerchantdemos/blog/templates/error.html.j2:14
 #: talermerchantdemos/donations/templates/error.html.j2:14
 #: talermerchantdemos/survey/templates/error.html.j2:14
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Backend response:"
 msgstr "後端回應:"
 
@@ -166,6 +202,10 @@ msgstr "後端回應:"
 #: talermerchantdemos/donations/templates/error.html.j2:19
 #: talermerchantdemos/landing/templates/error.html.j2:8
 #: talermerchantdemos/survey/templates/error.html.j2:19
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Stack trace:"
 msgstr "堆疊追蹤:"
 
@@ -275,11 +315,19 @@ msgstr "小費/調查"
 #: talermerchantdemos/templates/menu.html.j2:21
 msgid "Back-office"
 msgstr "後台"
+<<<<<<< HEAD
+
+#: talermerchantdemos/donations/donations.py:143
+msgid "parameter '{}' required"
+msgstr "需要'{}'參數"
+
+=======
 
 #: talermerchantdemos/donations/donations.py:143
 msgid "parameter '{}' required"
 msgstr "需要'{}'參數"
 
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 #: talermerchantdemos/donations/templates/base.html.j2:20
 msgid "GNU Taler Demo: Donations"
 msgstr "GNU Taler 演示: 捐款"
@@ -303,18 +351,30 @@ msgid "This is an example for a \"checkout\" page of a 
Web shop."
 msgstr "這是一個網路商店的\"付款\"頁面範例。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:10
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 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
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 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
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "To continue with the demo, select the &quot;Taler&quot; payment option."
 msgstr "請選擇 &quot;Taler&quot;付款選項以繼續進行demo。"
 
@@ -326,6 +386,10 @@ msgid ""
 msgstr "請注意，您必須在此處選擇Taler來繼續demo的進行，因為其他的支付選項僅為佔位符、無法在demo中運作。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:18
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 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 "
@@ -333,6 +397,10 @@ msgid ""
 msgstr "可以要求使用者在前一頁(使用購物車)做出此選擇;我們只是分開了兩個步驟，以保持每一步儘可能簡單。"
 
 #: talermerchantdemos/donations/templates/checkout.html.j2:44
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Confirm selection"
 msgstr "確認選擇的項目"
 
@@ -341,6 +409,10 @@ msgid "Donation Receipt"
 msgstr "捐款收據"
 
 #: talermerchantdemos/donations/templates/fulfillment.html.j2:7
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid ""
 "Thank you, <strong>{donor}</strong>, for donating "
 "<strong>{amount}</strong> to <strong>{receiver}</strong>."
@@ -369,12 +441,20 @@ msgid "Donate to Free Software projects"
 msgstr "捐款給無償軟體專案"
 
 #: talermerchantdemos/donations/templates/index.html.j2:8
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid ""
 "This donations website shows the user experience for donations with GNU "
 "Taler."
 msgstr "這個捐款網頁展示了與GNU Taler捐款的顧客體驗。"
 
 #: talermerchantdemos/donations/templates/index.html.j2:9
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "You can make donations in an toy currency ({currency})"
 msgstr "您可以使用任何的toy currency ({currency})來捐款"
 
@@ -406,6 +486,10 @@ msgstr ""
 "。但是請不要擔心，在Taler wallet中，會提供機會給您檢查商家最終折扣表單。透過此種方式，Taler保護您、免於支付錯誤的款項。"
 
 #: talermerchantdemos/donations/templates/provider-not-supported.html.j2:4
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Payment Provider Not Supported"
 msgstr "不支援付款提供商"
 
@@ -414,6 +498,10 @@ msgid "Unfortunately the selected payment provider is not 
supported in this demo
 msgstr "很抱歉，您所選擇的付款提供商不支持此demo。"
 
 #: talermerchantdemos/donations/templates/provider-not-supported.html.j2:8
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Please go back and select &quot;Taler&quot;."
 msgstr "請回到先前步驟並選擇&quot;Taler&quot;。"
 
@@ -424,16 +512,28 @@ msgstr "無法建立後台連線"
 
 #: talermerchantdemos/httpcommon/__init__.py:41
 #: talermerchantdemos/httpcommon/__init__.py:75
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Could not parse response from backend"
 msgstr "無法解析後台回覆"
 
 #: talermerchantdemos/httpcommon/__init__.py:47
 #: talermerchantdemos/httpcommon/__init__.py:79
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Backend returned error status"
 msgstr "後台回傳錯誤狀態"
 
 #: talermerchantdemos/landing/landing.py:179
 #: talermerchantdemos/survey/survey.py:179
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "HTTP method not allowed for this page"
 msgstr "HTTP方法不被此頁面允許"
 
@@ -446,6 +546,10 @@ msgid "This is the GNU Taler demo."
 msgstr "這是GNU Taler的demo。"
 
 #: talermerchantdemos/landing/templates/base.html.j2:35
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Here you can try out the GNU Taler payment system using a toy currency."
 msgstr "您可以在這裡嘗試使用toy currency來使用GNU Taler付款系統。"
 
@@ -454,14 +558,26 @@ msgid "Step 1: Install the Taler wallet"
 msgstr "步驟一: 安裝Taler wallet"
 
 #: talermerchantdemos/landing/templates/index.html.j2:7
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Install the wallet from the <a href=\"{link}\">installation page</a>."
 msgstr "從 <a href=\"{link}\">安裝頁面</a>安裝錢包。"
 
 #: talermerchantdemos/landing/templates/index.html.j2:8
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 msgid "Installation only takes one click."
 msgstr "一鍵安裝。"
 
 #: talermerchantdemos/landing/templates/index.html.j2:12
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8
 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.