diff --git a/src/pretix/control/views/mailsetup.py b/src/pretix/control/views/mailsetup.py index eca96a405..da637b785 100644 --- a/src/pretix/control/views/mailsetup.py +++ b/src/pretix/control/views/mailsetup.py @@ -193,7 +193,7 @@ class MailSettingsSetupView(TemplateView): if not spf_record: spf_warning = _( 'We could not find an SPF record set for the domain you are trying to use. This means that ' - 'there is a very high change most of the emails will be rejected or markes as spam. We ' + 'there is a very high change most of the emails will be rejected or marked as spam. We ' 'strongly recommend setting an SPF record on the domain. You can do so through the DNS ' 'settings at the provider you registered your domain with.' ) diff --git a/src/pretix/locale/de/wordlist.txt b/src/pretix/locale/de/wordlist.txt index 336d0d044..366d32c9c 100644 --- a/src/pretix/locale/de/wordlist.txt +++ b/src/pretix/locale/de/wordlist.txt @@ -1,5 +1,6 @@ 2FA ABN +AES Absenderadresse Absenderinformation Absendername @@ -74,6 +75,7 @@ Cronjob csv Customer CZK +Dashboard Debug dekodi deliverability @@ -178,6 +180,7 @@ Merchandise Meta Metadaten Mi +Mifare Mitgliedschafts Mitgliedschaftsdauer min @@ -191,6 +194,7 @@ NFC Nr NREI number +NXP OK On Open @@ -215,6 +219,7 @@ Plugins POS Postfix PostgreSQL +PPRO prefix pretix pretixdesk @@ -313,6 +318,7 @@ txt überzahlte uhrzeit UID +Ultralight ungespeicherte unkategorisiert Unkategorisierte diff --git a/src/pretix/locale/de_Informal/wordlist.txt b/src/pretix/locale/de_Informal/wordlist.txt index 336d0d044..366d32c9c 100644 --- a/src/pretix/locale/de_Informal/wordlist.txt +++ b/src/pretix/locale/de_Informal/wordlist.txt @@ -1,5 +1,6 @@ 2FA ABN +AES Absenderadresse Absenderinformation Absendername @@ -74,6 +75,7 @@ Cronjob csv Customer CZK +Dashboard Debug dekodi deliverability @@ -178,6 +180,7 @@ Merchandise Meta Metadaten Mi +Mifare Mitgliedschafts Mitgliedschaftsdauer min @@ -191,6 +194,7 @@ NFC Nr NREI number +NXP OK On Open @@ -215,6 +219,7 @@ Plugins POS Postfix PostgreSQL +PPRO prefix pretix pretixdesk @@ -313,6 +318,7 @@ txt überzahlte uhrzeit UID +Ultralight ungespeicherte unkategorisiert Unkategorisierte diff --git a/src/pretix/locale/wordlist.txt b/src/pretix/locale/wordlist.txt index d2dcadcfe..91f4418ed 100644 --- a/src/pretix/locale/wordlist.txt +++ b/src/pretix/locale/wordlist.txt @@ -1,5 +1,6 @@ 2FA ABN +AES AGPL Alipay APM @@ -76,6 +77,7 @@ LLC MapQuest MariaDB Mercado +Mifare MOTO Multibanco Mx @@ -83,6 +85,7 @@ MyBank multiline NFC NREI +NXP OpenCage OpenID OpenStreetMap @@ -97,6 +100,7 @@ personalization POS postfix PostgreSQL +PPRO prepended presale pretix diff --git a/src/pretix/plugins/stripe/payment.py b/src/pretix/plugins/stripe/payment.py index dddd2bc3d..a964f9cb7 100644 --- a/src/pretix/plugins/stripe/payment.py +++ b/src/pretix/plugins/stripe/payment.py @@ -297,8 +297,8 @@ class StripeSettingsHolder(BasePaymentProvider): ' ' + '{}'.format(_('experimental')) ), - help_text=_("pretix will attempt to check if the customer's webbrowser supports wallet-based payment " - "methods like Apple Pay or Google Pay and display them prominently with the credit card" + help_text=_("pretix will attempt to check if the customer's web browser supports wallet-based payment " + "methods like Apple Pay or Google Pay and display them prominently with the credit card " "payment method. This detection does not take into consideration if Google Pay/Apple Pay " "has been disabled in the Stripe Dashboard."), initial=True, diff --git a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html index b16fe7fd5..93b64f166 100644 --- a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html +++ b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html @@ -49,7 +49,7 @@

{% blocktrans trimmed with sepa_creditor_name=settings.sepa_creditor_name %} - By providing your payment information and confirming this payment, you authorise (A) + By providing your payment information and confirming this payment, you authorize (A) {{ sepa_creditor_name }} and Stripe, our payment service provider and/or PPRO, its local service provider, to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with those instructions. As part of your rights, you are entitled to a refund from your bank