From 985fd13ad3b848521e07c22c2387638d10f8a111 Mon Sep 17 00:00:00 2001 From: Stefan Kügel Date: Fri, 21 May 2021 10:53:34 +0200 Subject: Integrating the latest Chinese messages.po file for the demo pages --- translations/zh_Hant/LC_MESSAGES/messages.po | 122 +-------------------------- 1 file changed, 3 insertions(+), 119 deletions(-) diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po b/translations/zh_Hant/LC_MESSAGES/messages.po index 0b59d9d..a09390d 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-04-10 10:05+0000\n" -======= "PO-Revision-Date: 2021-05-20 20:47+0000\n" ->>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8 +======= +"PO-Revision-Date: 2021-05-16 06:58+0000\n" +>>>>>>> a5bedb7db9ceaa0342306f12f900914a8e9b4155 "Last-Translator: Ting-Yi Fu \n" "Language-Team: Chinese (Traditional) \n" @@ -40,18 +40,10 @@ 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 "此項目無法退款(已無法)" @@ -60,26 +52,14 @@ 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 "內部伺服器錯誤" @@ -91,10 +71,6 @@ 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允許商家提供退款給顧客。" @@ -130,10 +106,6 @@ msgid "" msgstr "這些文章是Richard Stallman所寫的書裡面的篇章 "Free Software, Free Society"。" #: talermerchantdemos/blog/templates/base.html.j2:39 -<<<<<<< HEAD -#, fuzzy -======= ->>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8 msgid "" "The book is published by the FSF and available " "gratis at gnu.org." @@ -175,10 +147,6 @@ 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 "發生錯誤" @@ -191,10 +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 -<<<<<<< HEAD -#, fuzzy -======= ->>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8 msgid "Backend response:" msgstr "後端回應:" @@ -202,10 +166,6 @@ 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 "堆疊追蹤:" @@ -315,19 +275,11 @@ 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 演示: 捐款" @@ -351,30 +303,18 @@ 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 "Taler" payment option." msgstr "請選擇 "Taler"付款選項以繼續進行demo。" @@ -386,10 +326,6 @@ 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 " @@ -397,10 +333,6 @@ msgid "" msgstr "可以要求使用者在前一頁(使用購物車)做出此選擇;我們只是分開了兩個步驟，以保持每一步儘可能簡單。" #: talermerchantdemos/donations/templates/checkout.html.j2:44 -<<<<<<< HEAD -#, fuzzy -======= ->>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8 msgid "Confirm selection" msgstr "確認選擇的項目" @@ -409,10 +341,6 @@ msgid "Donation Receipt" msgstr "捐款收據" #: talermerchantdemos/donations/templates/fulfillment.html.j2:7 -<<<<<<< HEAD -#, fuzzy -======= ->>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8 msgid "" "Thank you, {donor}, for donating " "{amount} to {receiver}." @@ -441,20 +369,12 @@ 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})來捐款" @@ -486,10 +406,6 @@ msgstr "" "。但是請不要擔心，在Taler wallet中，會提供機會給您檢查商家最終折扣表單。透過此種方式，Taler保護您、免於支付錯誤的款項。" #: talermerchantdemos/donations/templates/provider-not-supported.html.j2:4 -<<<<<<< HEAD -#, fuzzy -======= ->>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8 msgid "Payment Provider Not Supported" msgstr "不支援付款提供商" @@ -498,10 +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 -<<<<<<< HEAD -#, fuzzy -======= ->>>>>>> de72020ead7bfa2732f1f02658804e1b1d0b85d8 msgid "Please go back and select "Taler"." msgstr "請回到先前步驟並選擇"Taler"。" @@ -512,28 +424,16 @@ 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方法不被此頁面允許" @@ -546,10 +446,6 @@ 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付款系統。" @@ -558,26 +454,14 @@ 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 installation page." msgstr "從 安裝頁面安裝錢包。" #: 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" -- cgit v1.2.3