[taler-bank] 03/03: merge

[gnunet]

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

grothoff pushed a commit to branch master
in repository bank.

commit 2e3fdd795b2c3b272edf1494c8d1b68a4044f81d
Merge: 977eff9 0649fb3
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Oct 21 13:28:07 2020 +0200

    merge

 talerbank/app/locale/de/LC_MESSAGES/django.po   | 235 +++++++++++++++++++-
 talerbank/app/locale/django.pot                 | 237 +++++++++++++++++++--
 talerbank/app/locale/it/LC_MESSAGES/django.po   | 271 ++++++++++++++++++++++--
 talerbank/app/templates/base.html               |  25 ++-
 talerbank/app/templates/login.html              |  29 +--
 talerbank/app/templates/payto_wiretransfer.html |  10 +-
 talerbank/app/templates/profile_page.html       |  10 +-
 talerbank/app/templates/public_accounts.html    |  26 +--
 talerbank/app/templates/register.html           |   7 +-
 talerbank/app/templates/withdraw_confirm.html   |  16 +-
 talerbank/app/templates/withdraw_show.html      |  14 +-
 talerbank/app/urls.py                           |  23 +-
 talerbank/app/views.py                          |  14 +-
 talerbank/jinja2.py                             |   4 +-
 14 files changed, 802 insertions(+), 119 deletions(-)

diff --cc talerbank/app/locale/de/LC_MESSAGES/django.po
index 186d9d9,c94b2bf..f134d8c
--- a/talerbank/app/locale/de/LC_MESSAGES/django.po
+++ b/talerbank/app/locale/de/LC_MESSAGES/django.po
@@@ -16,53 -16,265 +16,266 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 +"Plural-Forms: nplurals=2; plural=n != 1;\n"
 +"X-Generator: Weblate 4.2.2\n"
  
+ #: talerbank/app/templates/404.html:23
+ msgid "Error"
+ msgstr ""
+ 
+ #: talerbank/app/templates/404.html:30
+ msgid "Page not found!"
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:23
+ #, python-brace-format
+ msgid "{currency} Bank - Taler Demo"
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:74
+ #, python-brace-format
+ msgid ""
+ "This part of the demo shows how a bank that supports Taler directly would "
+ "work. In addition to using your own bank account, you can also see the "
+ "transaction history of some <a href=\"{public_accounts}\">Public Accounts</"
+ "a>."
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:80
+ msgid "Introduction"
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:81
+ msgid "Bank"
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:82
+ msgid "Essay Shop"
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:83
+ msgid "Donations"
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:84
+ msgid "Tipping/Survey"
+ msgstr ""
+ 
+ #: talerbank/app/templates/base.html:94
+ #, python-brace-format
+ msgid ""
+ "You can learn more about Taler on our main <a href={taler_site}>website</a>."
+ msgstr ""
+ 
+ #: talerbank/app/templates/login.html:22
+ #, python-brace-format
+ msgid "Welcome to the {currency} Bank!"
+ msgstr ""
+ 
  #: talerbank/app/templates/login.html:29
  msgid "Please login!"
 -msgstr ""
 +msgstr "Bitte melden Sie sich an!"
  
- #: talerbank/app/templates/profile_page.html:29
+ #: talerbank/app/templates/login.html:33
+ msgid "Your username and password didn't match. Please try again."
+ msgstr ""
+ 
+ #: talerbank/app/templates/login.html:40
+ msgid ""
+ "Your account doesn't have access to this page. To proceed, please login with 
"
+ "an account that has access."
+ msgstr ""
+ 
+ #: talerbank/app/templates/login.html:43
+ msgid "Please login to see this page."
+ msgstr ""
+ 
+ #: talerbank/app/templates/login.html:59
+ #, python-brace-format
+ msgid ""
+ "If you are a new customer please <a href=\"{register_link}\">register</a>.  "
+ "Registration is fast and free, and it gives you a registration bonus of 100 "
+ "{currency}"
+ msgstr ""
+ 
+ #: talerbank/app/templates/login.html:63
+ msgid "Registrations are not open to the public."
+ msgstr ""
+ 
+ #: talerbank/app/templates/login.html:67
+ #, python-brace-format
+ msgid ""
+ "To view transactions of public accounts, please <a href="
+ "\"{public_accounts}\">click here</a>."
+ msgstr ""
+ 
+ #: talerbank/app/templates/payto_wiretransfer.html:23
+ #: talerbank/app/templates/profile_page.html:28
+ msgid "Logout"
+ msgstr ""
+ 
+ #: talerbank/app/templates/payto_wiretransfer.html:30
+ msgid "Wire transfer"
+ msgstr ""
+ 
+ #: talerbank/app/templates/payto_wiretransfer.html:31
+ msgid "Transfer money via the payto system:"
+ msgstr ""
+ 
+ #: talerbank/app/templates/payto_wiretransfer.html:41
+ msgid "payto address"
+ msgstr ""
+ 
+ #: talerbank/app/templates/payto_wiretransfer.html:45
+ msgid "Confirm"
+ msgstr ""
+ 
+ #: talerbank/app/templates/profile_page.html:25
+ #, python-brace-format
+ msgid "Welcome <em>{name}</em>!"
+ msgstr ""
+ 
+ #: talerbank/app/templates/profile_page.html:33
  msgid "Bank account balance"
 -msgstr ""
 +msgstr "Kontostand"
  
- #: talerbank/app/templates/profile_page.html:47
+ #: talerbank/app/templates/profile_page.html:51
  msgid "Withdraw Money into a Taler wallet"
 -msgstr ""
 +msgstr "Geld in eine Taler-Brieftasche abheben"
  
- #: talerbank/app/templates/profile_page.html:54
+ #: talerbank/app/templates/profile_page.html:58
  msgid "Amount to withdraw"
 -msgstr ""
 +msgstr "Abzuhebender Betrag"
  
- #: talerbank/app/templates/profile_page.html:74
+ #: talerbank/app/templates/profile_page.html:73
+ msgid "Start withdrawal"
+ msgstr ""
+ 
+ #: talerbank/app/templates/profile_page.html:78
  msgid "Wire money"
 -msgstr ""
 +msgstr "Geld überweisen"
  
- #: talerbank/app/templates/profile_page.html:77
+ #: talerbank/app/templates/profile_page.html:81
  msgid "Transactions for"
 -msgstr ""
 +msgstr "Transaktionen für"
  
- #: talerbank/app/templates/profile_page.html:83
+ #: talerbank/app/templates/profile_page.html:87
+ #: talerbank/app/templates/public_accounts.html:59
  msgid "Date"
 -msgstr ""
 +msgstr "Datum"
  
- #: talerbank/app/templates/profile_page.html:84
+ #: talerbank/app/templates/profile_page.html:88
+ #: talerbank/app/templates/public_accounts.html:60
  msgid "Amount"
 -msgstr ""
 +msgstr "Betrag"
  
- #: talerbank/app/templates/profile_page.html:85
+ #: talerbank/app/templates/profile_page.html:89
+ #: talerbank/app/templates/public_accounts.html:61
  msgid "Counterpart"
 -msgstr ""
 +msgstr "Gegenpartei"
  
- #: talerbank/app/templates/profile_page.html:86
+ #: talerbank/app/templates/profile_page.html:90
+ #: talerbank/app/templates/public_accounts.html:62
  msgid "Subject"
 -msgstr ""
 +msgstr "Betreff"
  
- #: talerbank/app/templates/profile_page.html:103
+ #: talerbank/app/templates/profile_page.html:107
  msgid "cancelled"
 -msgstr ""
 +msgstr "Abgebrochen"
  
- #: talerbank/app/templates/profile_page.html:112
+ #: talerbank/app/templates/profile_page.html:116
  msgid "No transactions made to/from this account"
 -msgstr ""
 +msgstr "Keine Transaktionen auf / von diesem Konto"
+ 
+ #: talerbank/app/templates/public_accounts.html:21
+ msgid "History of public accounts"
+ msgstr ""
+ 
+ #: talerbank/app/templates/public_accounts.html:71
+ msgid "account"
+ msgstr ""
+ 
+ #: talerbank/app/templates/public_accounts.html:101
+ #, python-brace-format
+ msgid "No history for account #{account_number} ({account_name}) yet"
+ msgstr ""
+ 
+ #: talerbank/app/templates/register.html:22
+ #, python-brace-format
+ msgid "Register to the {currency} bank!"
+ msgstr ""
+ 
+ #: talerbank/app/templates/register.html:30
+ msgid "Back"
+ msgstr ""
+ 
+ #: talerbank/app/templates/register.html:39
+ msgid ""
+ "Sorry, this username is no longer available.  Please choose another one!"
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_confirm.html:23
+ msgid "Confirm Withdrawal"
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_confirm.html:34
+ #, python-brace-format
+ msgid ""
+ "{currency} Bank needs to verify that you intend to withdraw <b>{amount}</b> "
+ "from <b>{exchange}</b>.  To prove that you are the account owner, please "
+ "answer the following &quot;security question&quot; (*):"
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_confirm.html:38
+ #, python-brace-format
+ msgid "What is {question}?"
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_confirm.html:64
+ msgid ""
+ "A real bank should ask for a PIN/TAN instead of a simple calculation. For "
+ "example by sending a one time password to the customer's mobile or providing 
"
+ "her a random password generator."
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_show.html:22
+ msgid "Withdraw to a Taler Wallet"
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_show.html:66
+ #, python-brace-format
+ msgid ""
+ "Looks like your browser doesn't support GNU Taler payments. You can try "
+ "installing a <a href=\"{wallet_link}\">wallet browser extension</a>."
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_show.html:72
+ msgid "You can use this QR code to withdraw to your mobile wallet:"
+ msgstr ""
+ 
+ #: talerbank/app/templates/withdraw_show.html:77
+ #, python-brace-format
+ msgid ""
+ "Click <a href=\"{taler_withdraw_uri}\">this link</a> to open your system's "
+ "Taler wallet if it exists."
+ msgstr ""
+ 
+ #: talerbank/app/views.py:353
+ msgid "Bad form submitted!"
+ msgstr ""
+ 
+ #: talerbank/app/views.py:367
+ msgid "Wire transfer successful!"
+ msgstr ""
+ 
+ #: talerbank/app/views.py:520
+ msgid "Registration successful!"
+ msgstr ""
+ 
+ #: talerbank/app/views.py:1212
+ msgid "Wrong CAPTCHA answer."
+ msgstr ""
+ 
+ #: talerbank/app/views.py:1223
+ msgid "Withdrawal successful!"
+ msgstr ""

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