common base template, new logo and lots of cleanup

1 files changed, 68 insertions, 75 deletions

diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po b/translations/zh_Hant/LC_MESSAGES/messages.po
index 49d0349..333ed26 100644
--- a/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/translations/zh_Hant/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
-"POT-Creation-Date: 2021-04-20 17:06+0200\n"
+"POT-Creation-Date: 2021-04-21 18:28+0200\n"
 "PO-Revision-Date: 2021-03-20 01:31+0000\n"
 "Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
 "Language: zh_Hant\n"
@@ -147,8 +147,8 @@ msgstr "要求退款"
 
 #: talermerchantdemos/blog/templates/error.html.j2:3
 #: talermerchantdemos/donations/templates/error.html.j2:3
-#: talermerchantdemos/landing/templates/error.html.j2:3
 #: talermerchantdemos/survey/templates/error.html.j2:3
+#: talermerchantdemos/templates/landing-error.html.j2:3
 #, fuzzy
 msgid "Error encountered"
 msgstr "發生錯誤"
@@ -168,15 +168,14 @@ msgstr "後端回應:"
 
 #: talermerchantdemos/blog/templates/error.html.j2:19
 #: talermerchantdemos/donations/templates/error.html.j2:19
-#: talermerchantdemos/landing/templates/error.html.j2:8
 #: talermerchantdemos/survey/templates/error.html.j2:19
+#: talermerchantdemos/templates/landing-error.html.j2:8
 #, fuzzy
 msgid "Stack trace:"
 msgstr "堆疊追蹤:"
 
 #: talermerchantdemos/blog/templates/footer.html.j2:5
 #: talermerchantdemos/donations/templates/footer.html.j2:5
-#: talermerchantdemos/landing/templates/footer.html.j2:5
 #: talermerchantdemos/survey/templates/footer.html.j2:5
 #: talermerchantdemos/templates/footer.html.j2:5
 msgid ""
@@ -230,16 +229,14 @@ msgstr "沒有此以語言撰寫的文章。"
 
 #: talermerchantdemos/blog/templates/menu.html.j2:6
 #: talermerchantdemos/donations/templates/menu.html.j2:6
-#: talermerchantdemos/landing/templates/base.html.j2:32
-#: talermerchantdemos/landing/templates/menu.html.j2:6
 #: talermerchantdemos/survey/templates/menu.html.j2:6
+#: talermerchantdemos/templates/landing-base.html.j2:32
 #: talermerchantdemos/templates/menu.html.j2:6
 msgid "Introduction"
 msgstr "簡介"
 
 #: talermerchantdemos/blog/templates/menu.html.j2:9
 #: talermerchantdemos/donations/templates/menu.html.j2:9
-#: talermerchantdemos/landing/templates/menu.html.j2:9
 #: talermerchantdemos/survey/templates/menu.html.j2:9
 #: talermerchantdemos/templates/menu.html.j2:9
 msgid "Bank"
@@ -247,7 +244,6 @@ msgstr "銀行"
 
 #: talermerchantdemos/blog/templates/menu.html.j2:12
 #: talermerchantdemos/donations/templates/menu.html.j2:12
-#: talermerchantdemos/landing/templates/menu.html.j2:12
 #: talermerchantdemos/survey/templates/menu.html.j2:12
 #: talermerchantdemos/templates/menu.html.j2:12
 msgid "Essay Shop"
@@ -256,7 +252,6 @@ msgstr "論文商店"
 #: talermerchantdemos/blog/templates/menu.html.j2:15
 #: talermerchantdemos/donations/templates/base.html.j2:32
 #: talermerchantdemos/donations/templates/menu.html.j2:15
-#: talermerchantdemos/landing/templates/menu.html.j2:15
 #: talermerchantdemos/survey/templates/menu.html.j2:15
 #: talermerchantdemos/templates/menu.html.j2:15
 msgid "Donations"
@@ -264,7 +259,6 @@ msgstr "捐款"
 
 #: talermerchantdemos/blog/templates/menu.html.j2:18
 #: talermerchantdemos/donations/templates/menu.html.j2:18
-#: talermerchantdemos/landing/templates/menu.html.j2:18
 #: talermerchantdemos/survey/templates/menu.html.j2:18
 #: talermerchantdemos/templates/menu.html.j2:18
 msgid "Tipping/Survey"
@@ -272,7 +266,6 @@ msgstr "小費/調查"
 
 #: talermerchantdemos/blog/templates/menu.html.j2:21
 #: talermerchantdemos/donations/templates/menu.html.j2:21
-#: talermerchantdemos/landing/templates/menu.html.j2:21
 #: talermerchantdemos/survey/templates/menu.html.j2:21
 #: talermerchantdemos/templates/menu.html.j2:21
 msgid "Back-office"
@@ -449,34 +442,68 @@ msgstr "後台回傳錯誤狀態"
 msgid "HTTP method not allowed for this page"
 msgstr "HTTP方法不被此頁面允許"
 
-#: talermerchantdemos/landing/templates/base.html.j2:20
+#: talermerchantdemos/survey/templates/base.html.j2:20
+msgid "GNU Taler Demo: Survey"
+msgstr "GNU Taler Demo: 問卷調查"
+
+#: talermerchantdemos/survey/templates/base.html.j2:32
+msgid "Survey"
+msgstr "問卷調查"
+
+#: talermerchantdemos/survey/templates/base.html.j2:34
+#, fuzzy
+msgid "This page demonstrates how to tip visitors for completing small tasks."
+msgstr "這個頁面展示了如何給予小費予完成任務的訪客。"
+
+#: talermerchantdemos/survey/templates/base.html.j2:35
+#, fuzzy
+msgid ""
+"Tipping is a way for offer cash rewards that go directly into a user's "
+"wallet."
+msgstr "給予小費是一種直接提供現金回饋至使用者錢包的方式。"
+
+#: talermerchantdemos/survey/templates/index.html.j2:6
+msgid ""
+"Please participate in our survey about payment systems and receive a tip "
+"in return."
+msgstr "請參與我們關於支付系統的問卷調查以獲得小費。"
+
+#: talermerchantdemos/survey/templates/index.html.j2:12
+msgid "Which payment system do you prefer?"
+msgstr "請問您偏好哪個支付系統?"
+
+#: talermerchantdemos/survey/templates/index.html.j2:23
+msgid "Submit Survey"
+msgstr "提交問卷"
+
+#: talermerchantdemos/templates/landing-base.html.j2:20
 msgid "GNU Taler Demo: Introduction"
 msgstr "GNU Taler Demo: 介紹"
 
-#: talermerchantdemos/landing/templates/base.html.j2:34
+#: talermerchantdemos/templates/landing-base.html.j2:34
 msgid "This is the GNU Taler demo."
 msgstr "這是GNU Taler的demo。"
 
-#: talermerchantdemos/landing/templates/base.html.j2:35
+#: talermerchantdemos/templates/landing-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付款系統。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:4
+#: talermerchantdemos/templates/landing-index.html.j2:4
 msgid "Step 1: Install the Taler wallet"
 msgstr "步驟一: 安裝Taler wallet"
 
-#: talermerchantdemos/landing/templates/index.html.j2:7
+#: talermerchantdemos/templates/landing-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
+#: talermerchantdemos/templates/landing-index.html.j2:8
 #, fuzzy
 msgid "Installation only takes one click."
 msgstr "一鍵安裝。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:12
+#: talermerchantdemos/templates/landing-index.html.j2:12
 #, fuzzy
 msgid ""
 "After installation, you may be asked to grant the browser-based Taler "
@@ -484,71 +511,71 @@ msgid ""
 " experience."
 msgstr "在安裝完成之後，為了提升您的使用體驗，您可能會被要求提供瀏覽器基礎的Taler wallet額外、非強制的權限。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:13
+#: talermerchantdemos/templates/landing-index.html.j2:13
 #, fuzzy
 msgid ""
 "These permissions will allow the wallet to automatically open if a page "
 "asks for a Taler payment."
 msgstr "這些權限許可會在頁面要求使用Taler payment錢包時，允許錢包自動被開啟。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:14
+#: talermerchantdemos/templates/landing-index.html.j2:14
 #, fuzzy
 msgid ""
 "Regardless of the permissions you grant, the wallet will never transmit "
 "information about you or your browsing history to anyone."
 msgstr "除了您允許的權限以外，Tatler Wallet永遠不會將關於您瀏覽紀錄的資訊傳送給任何人。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:19
+#: talermerchantdemos/templates/landing-index.html.j2:19
 msgid "Step 2: Withdraw coins"
 msgstr "步驟二: 提款"
 
-#: talermerchantdemos/landing/templates/index.html.j2:22
+#: talermerchantdemos/templates/landing-index.html.j2:22
 #, fuzzy
 msgid "In this demo you are paying with {currency}, an imaginary currency."
 msgstr "這是一個您使用{currency}(一個假想貨幣)付款的demo。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:23
+#: talermerchantdemos/templates/landing-index.html.j2:23
 #, fuzzy
 msgid ""
 "To withdraw {currency} coins you must first create an account at our <a "
 "href=\"{bank}\">bank</a>."
 msgstr "您需要先在我們的 <a href=\"{bank}\">銀行</a>建立一個帳號以提取 {currency}貨幣。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:24
+#: talermerchantdemos/templates/landing-index.html.j2:24
 #, fuzzy
 msgid "Signing up only requires you to pick a username and password."
 msgstr "只需選擇您的使用者名稱以及密碼即可註冊。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:25
+#: talermerchantdemos/templates/landing-index.html.j2:25
 #, fuzzy
 msgid ""
 "When you create an account at our bank, you will be credited 100 "
 "{currency} for signing up."
 msgstr "在您於我們的銀行建立一個帳號之後，您會獲得100 {currency}。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:26
+#: talermerchantdemos/templates/landing-index.html.j2:26
 #, fuzzy
 msgid ""
 "Afterwards, use the bank's Web interface to authorize the transfer of "
 "{currency} to your wallet."
 msgstr "在這之後，使用銀行的網頁介面來授權{currency} 轉帳至您的錢包。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:30
+#: talermerchantdemos/templates/landing-index.html.j2:30
 msgid ""
 "Once you have completed this step, you can click on the Taler icon in "
 "your browser to check your balance."
 msgstr "在完成這個步驟之後，您可以在瀏覽器中點選Taler 圖標來檢視您的帳戶餘額。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:35
+#: talermerchantdemos/templates/landing-index.html.j2:35
 msgid "Step 3: Pay"
 msgstr "步驟三: 付款"
 
-#: talermerchantdemos/landing/templates/index.html.j2:38
+#: talermerchantdemos/templates/landing-index.html.j2:38
 #, fuzzy
 msgid "We have two demo merchants where you can spend your coins:"
 msgstr "您可以在我們的兩個demo merchants使用您的貨幣:"
 
-#: talermerchantdemos/landing/templates/index.html.j2:44
+#: talermerchantdemos/templates/landing-index.html.j2:44
 #, fuzzy
 msgid ""
 "At the <a href=\"{blog}\">essay store</a> you can pay in {currency} for "
@@ -558,101 +585,67 @@ msgstr ""
 "在 <a href=\"{blog}\">文章商店</a>，您可以使用{currency}來購買Richard Stallman的&#39;書籍 "
 "&quot;Free Software, Free Society&quot;的獨立章節。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:45
+#: talermerchantdemos/templates/landing-index.html.j2:45
 #, fuzzy
 msgid "The book is also available for free at <a href=\"{fsf}\">the FSF</a>."
 msgstr "您也可以在<a href=\"{fsf}\">the FSF</a>免費參閱此書。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:50
+#: talermerchantdemos/templates/landing-index.html.j2:50
 msgid ""
 "At the project <a href=\"{donations}\">donation website</a> you can show "
 "respect to a software project of your choice by donating {currency} to "
 "them."
 msgstr ""
 
-#: talermerchantdemos/landing/templates/index.html.j2:56
+#: talermerchantdemos/templates/landing-index.html.j2:56
 #, fuzzy
 msgid "Step 4: Check money flow"
 msgstr "步驟四: 檢查資金流量"
 
-#: talermerchantdemos/landing/templates/index.html.j2:59
+#: talermerchantdemos/templates/landing-index.html.j2:59
 msgid ""
 "You can see the wire transfers from the escrow account of the exchange to"
 " the merchants on the <a href=\"{bank}/public-accounts\">public accounts "
 "page</a> of the bank."
 msgstr ""
 
-#: talermerchantdemos/landing/templates/index.html.j2:60
+#: talermerchantdemos/templates/landing-index.html.j2:60
 msgid ""
 "Note that only accounts configured to be publicly viewable are shown on "
 "that page."
 msgstr "請注意，只有被設定為公開檢視的帳號會顯示在此頁面。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:65
+#: talermerchantdemos/templates/landing-index.html.j2:65
 msgid "Step 5: Survey"
 msgstr "步驟五: 問卷調查"
 
-#: talermerchantdemos/landing/templates/index.html.j2:68
+#: talermerchantdemos/templates/landing-index.html.j2:68
 #, fuzzy
 msgid "Websites can give tips to visitors for completing tasks."
 msgstr "這些網站可以提供指點予訪客以完成任務。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:69
+#: talermerchantdemos/templates/landing-index.html.j2:69
 #, fuzzy
 msgid ""
 "You can earn some {currency} coins by filling in our <a "
 "href=\"{url}\">survey</a>."
 msgstr "您可以透過填寫我們的 <a href=\"{url}\">問卷調查</a>以獲得一些{currency}貨幣。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:81
+#: talermerchantdemos/templates/landing-index.html.j2:81
 #, fuzzy
 msgid "Step 6: Reach out to us"
 msgstr "步驟六: 與我們聯絡"
 
-#: talermerchantdemos/landing/templates/index.html.j2:84
+#: talermerchantdemos/templates/landing-index.html.j2:84
 #, fuzzy
 msgid "We appreciate feedback about Taler and this demonstrator."
 msgstr "謝謝您對於Taler 和此示範的回饋。"
 
-#: talermerchantdemos/landing/templates/index.html.j2:85
+#: talermerchantdemos/templates/landing-index.html.j2:85
 #, fuzzy
 msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
 msgstr "<a href=\"{link}\">聯絡我們</a>並讓我們知道您的想法。"
 
-#: talermerchantdemos/survey/templates/base.html.j2:20
-msgid "GNU Taler Demo: Survey"
-msgstr "GNU Taler Demo: 問卷調查"
-
-#: talermerchantdemos/survey/templates/base.html.j2:32
-msgid "Survey"
-msgstr "問卷調查"
-
-#: talermerchantdemos/survey/templates/base.html.j2:34
-#, fuzzy
-msgid "This page demonstrates how to tip visitors for completing small tasks."
-msgstr "這個頁面展示了如何給予小費予完成任務的訪客。"
-
-#: talermerchantdemos/survey/templates/base.html.j2:35
-#, fuzzy
-msgid ""
-"Tipping is a way for offer cash rewards that go directly into a user's "
-"wallet."
-msgstr "給予小費是一種直接提供現金回饋至使用者錢包的方式。"
-
-#: talermerchantdemos/survey/templates/index.html.j2:6
-msgid ""
-"Please participate in our survey about payment systems and receive a tip "
-"in return."
-msgstr "請參與我們關於支付系統的問卷調查以獲得小費。"
-
-#: talermerchantdemos/survey/templates/index.html.j2:12
-msgid "Which payment system do you prefer?"
-msgstr "請問您偏好哪個支付系統?"
-
-#: talermerchantdemos/survey/templates/index.html.j2:23
-msgid "Submit Survey"
-msgstr "提交問卷"
-
 #~ msgid "English [en]"
 #~ msgstr "英語 [en]"