Manually merge changes from #672 (thanks @koebi!)

src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html

@@ -4,7 +4,7 @@
     {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %}
     {% blocktrans trimmed with charge=data.charge stripe_href="href='https://dashboard.stripe.com/payments/"|add:data.charge|add:"' target='_blank'"|safe order="<a href='"|add:ourl|add:"'>"|add:data.order|add:"</a>"|safe %}
         The Stripe transaction <a {{ stripe_href }}>{{ charge }}</a> has succeeded, but the order {{ order }} is
-        expired and the product was sold out in the meantime. Therefore, the payment could not be acceped. Please
+        expired and the product was sold out in the meantime. Therefore, the payment could not be accepted. Please
         contact the user and refund the money via Stripe's interface.
     {% endblocktrans %}
 </p>

src/pretix/plugins/ticketoutputpdf/ticketoutput.py

@@ -130,7 +130,7 @@ DEFAULT_VARIABLES = OrderedDict((
         "evaluate": lambda op, order, ev: order.invoice_address.name if getattr(order, 'invoice_address') else ''
     }),
     ("invoice_company", {
-        "label": _("Invocie address: company"),
+        "label": _("Invoice address: company"),
         "editor_sample": _("Sample company"),
         "evaluate": lambda op, order, ev: order.invoice_address.company if getattr(order, 'invoice_address') else ''
     }),