common base template, new logo and lots of cleanup

1 files changed, 66 insertions, 73 deletions

diff --git a/translations/ko/LC_MESSAGES/messages.po b/translations/ko/LC_MESSAGES/messages.po
index 70388d4..7a0cf37 100644
--- a/translations/ko/LC_MESSAGES/messages.po
+++ b/translations/ko/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\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-08 03:05+0000\n"
 "Last-Translator: Choyi Whang <choyi.whang@gmail.com>\n"
 "Language: ko\n"
@@ -139,8 +139,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
 msgid "Error encountered"
 msgstr "오류가 발생했습니다"
 
@@ -158,14 +158,13 @@ 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
 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 ""
@@ -219,16 +218,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"
@@ -236,7 +233,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"
@@ -245,7 +241,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"
@@ -253,7 +248,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"
@@ -261,7 +255,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"
@@ -433,94 +426,126 @@ 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 데모: 설문조사"
+
+#: talermerchantdemos/survey/templates/base.html.j2:32
+msgid "Survey"
+msgstr "설문조사"
+
+#: talermerchantdemos/survey/templates/base.html.j2:34
+msgid "This page demonstrates how to tip visitors for completing small tasks."
+msgstr "해당 페이지에서는 방문자가 작은 단계를 마무리할 때마다 어떤 식으로 팀을 받는지 설명하고 있습니다."
+
+#: talermerchantdemos/survey/templates/base.html.j2:35
+msgid ""
+"Tipping is a way for offer cash rewards that go directly into a user's "
+"wallet."
+msgstr "여기서 팁을 준다는 의미는 사용자분들은 walllet에 현금 보상이 곧바로 지급되는 과정을 말합니다."
+
+#: 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 데모: 소개"
 
-#: talermerchantdemos/landing/templates/base.html.j2:34
+#: talermerchantdemos/templates/landing-base.html.j2:34
 msgid "This is the GNU Taler demo."
 msgstr "GNU Taler 데모를 찾아주셔서 감사합니다."
 
-#: talermerchantdemos/landing/templates/base.html.j2:35
+#: talermerchantdemos/templates/landing-base.html.j2:35
 msgid "Here you can try out the GNU Taler payment system using a toy currency."
 msgstr "저희 사이트에서 장난감 화폐를 통해 GNU Taler 결제 시스템을 사용해 보실 수 있습니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:4
+#: talermerchantdemos/templates/landing-index.html.j2:4
 msgid "Step 1: Install the Taler wallet"
 msgstr "1단계: Taler wallet 설치하기"
 
-#: talermerchantdemos/landing/templates/index.html.j2:7
+#: talermerchantdemos/templates/landing-index.html.j2:7
 msgid "Install the wallet from the <a href=\"{link}\">installation page</a>."
 msgstr "<a href=\"{link}\">설치 페이지</a>에서 wallet을 설치하실 수 있습니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:8
+#: talermerchantdemos/templates/landing-index.html.j2:8
 msgid "Installation only takes one click."
 msgstr "한 번의 클릭으로 설치가 가능합니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:12
+#: talermerchantdemos/templates/landing-index.html.j2:12
 msgid ""
 "After installation, you may be asked to grant the browser-based Taler "
 "wallet additional optional permissions that allow it to improve your user"
 " experience."
 msgstr "설치 후 사용자 경험 향상을 위해 브라우저 기반 Taler wallet에 추가로 선택적 권한을 부여하라는 요청을 받을 수 있습니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:13
+#: talermerchantdemos/templates/landing-index.html.j2:13
 msgid ""
 "These permissions will allow the wallet to automatically open if a page "
 "asks for a Taler payment."
 msgstr "이 권한 요청을 수락하시면 Taler 결제가 요청 됐을 때 wallet이 자동적으로 열리게 됩니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:14
+#: talermerchantdemos/templates/landing-index.html.j2:14
 msgid ""
 "Regardless of the permissions you grant, the wallet will never transmit "
 "information about you or your browsing history to anyone."
 msgstr "권한이 부여된 후에도 wallet은 사용자의 개인정보나 검색 기록에 대한 정보를 유출하지 않습니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:19
+#: talermerchantdemos/templates/landing-index.html.j2:19
 msgid "Step 2: Withdraw coins"
 msgstr "2단계: 코인 인출하기"
 
-#: talermerchantdemos/landing/templates/index.html.j2:22
+#: talermerchantdemos/templates/landing-index.html.j2:22
 msgid "In this demo you are paying with {currency}, an imaginary currency."
 msgstr "이 데모 버전에서는 가상 화폐 {통화}를 통해 결제가 이루어집니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:23
+#: talermerchantdemos/templates/landing-index.html.j2:23
 msgid ""
 "To withdraw {currency} coins you must first create an account at our <a "
 "href=\"{bank}\">bank</a>."
 msgstr "{통화} 코인을 인출하려면 먼저 저희 <a href=\"{bank}\"> 은행 </a>에서 계좌를 만드셔야 합니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:24
+#: talermerchantdemos/templates/landing-index.html.j2:24
 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
 msgid ""
 "When you create an account at our bank, you will be credited 100 "
 "{currency} for signing up."
 msgstr "저희 은행에서 계좌를 만드실 때 100 {통화}가 적립됩니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:26
+#: talermerchantdemos/templates/landing-index.html.j2:26
 msgid ""
 "Afterwards, use the bank's Web interface to authorize the transfer of "
 "{currency} to your wallet."
 msgstr "이후 은행의 웹 인터페이스를 통해 {통화}를 wallet으로 전송하실 수 있습니다."
 
-#: 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 "3단계: 결제하기"
 
-#: talermerchantdemos/landing/templates/index.html.j2:38
+#: talermerchantdemos/templates/landing-index.html.j2:38
 msgid "We have two demo merchants where you can spend your coins:"
 msgstr "현 데모 버전에서는 2명의 판매자와 코인을 통해 거래하실 수 있습니다:"
 
-#: talermerchantdemos/landing/templates/index.html.j2:44
+#: talermerchantdemos/templates/landing-index.html.j2:44
 msgid ""
 "At the <a href=\"{blog}\">essay store</a> you can pay in {currency} for "
 "individual chapters of Richard Stallman&#39;s book &quot;Free Software, "
@@ -529,11 +554,11 @@ msgstr ""
 "<a href=\"{blog}\">에세이 샵</a> 에서는 {통화}로 리차드 스톨만의 &#39; 책&quot;자유 소프트웨어, 자유"
 " 사회&quot; 개별 챕터들을 구매하실 수 있습니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:45
+#: talermerchantdemos/templates/landing-index.html.j2:45
 msgid "The book is also available for free at <a href=\"{fsf}\">the FSF</a>."
 msgstr "책은 <a href=\"{fsf}\">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 "
@@ -542,11 +567,11 @@ msgstr ""
 "프로젝트 <a href=\"{donations}\">후원 웹사이트</a>에서 사용자분들은 스스로 선택하신 소프트웨어 프로젝트를 "
 "{통화}로 후원함을 통해 지지를 표명하실 수 있습니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:56
+#: talermerchantdemos/templates/landing-index.html.j2:56
 msgid "Step 4: Check money flow"
 msgstr "4단계: 자금 흐름 확인하기"
 
-#: 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 "
@@ -555,70 +580,38 @@ msgstr ""
 "거래소의 에스크로 계좌에서 은행의 <a href=\"{bank}/public-accounts\">공용 계좌 페이지에서</a> "
 "판매자에게 송금되는 것을 확인하실 수 있습니다."
 
-#: 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 "5단계: 설문조사하기"
 
-#: talermerchantdemos/landing/templates/index.html.j2:68
+#: talermerchantdemos/templates/landing-index.html.j2:68
 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
 msgid ""
 "You can earn some {currency} coins by filling in our <a "
 "href=\"{url}\">survey</a>."
 msgstr "사용자분들은 <a href=\"{url}\">설문조사</a>를 완료하시면 소정의 {통화}를 지급받으실 수 있습니다."
 
-#: talermerchantdemos/landing/templates/index.html.j2:81
+#: talermerchantdemos/templates/landing-index.html.j2:81
 msgid "Step 6: Reach out to us"
 msgstr "6단계: 관리자에게 연락하는 방법"
 
-#: talermerchantdemos/landing/templates/index.html.j2:84
+#: talermerchantdemos/templates/landing-index.html.j2:84
 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
 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 데모: 설문조사"
-
-#: talermerchantdemos/survey/templates/base.html.j2:32
-msgid "Survey"
-msgstr "설문조사"
-
-#: talermerchantdemos/survey/templates/base.html.j2:34
-msgid "This page demonstrates how to tip visitors for completing small tasks."
-msgstr "해당 페이지에서는 방문자가 작은 단계를 마무리할 때마다 어떤 식으로 팀을 받는지 설명하고 있습니다."
-
-#: talermerchantdemos/survey/templates/base.html.j2:35
-msgid ""
-"Tipping is a way for offer cash rewards that go directly into a user's "
-"wallet."
-msgstr "여기서 팁을 준다는 의미는 사용자분들은 walllet에 현금 보상이 곧바로 지급되는 과정을 말합니다."
-
-#: 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]"