merged master

This commit is contained in:
Arvind Tiwari 2017-09-21 19:38:47 +05:30
commit 6be245a811
3 changed files with 15 additions and 13 deletions

View file

@ -16,7 +16,7 @@ CACHES = {
# MANAGERS = ADMINS
REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='digitalglarus.ungleich.ch',
REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='digitalglarus.ch',
slug='{slug}') # flake8: noqa
ALLOWED_HOSTS = [

View file

@ -361,9 +361,15 @@ msgstr "Arbeitsspeicher"
msgid "Disk space"
msgstr "Festplattenkapazität"
msgid "Configuration"
msgstr "Konfiguration"
msgid "Total"
msgstr "Gesamt"
msgid "Month"
msgstr "Monat"
#, python-format
msgid ""
"By clicking \"Place order\" this plan will charge your credit card account "
@ -379,13 +385,13 @@ msgid "BACK TO LIST"
msgstr "ZURÜCK ZUR LISTE"
msgid "Processing..."
msgstr "Weiter..."
msgstr "Abarbeitung..."
msgid "Hold tight, we are processing your request"
msgstr ""
msgstr "Bitte warten - wir verbeiten Deine Anfrage gerade"
msgid "Some problem encountered. Please try again later."
msgstr ""
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
msgid "Order Nr."
msgstr "Bestellung Nr."
@ -408,15 +414,9 @@ msgstr ""
msgid "Your Order"
msgstr "Deine Bestellung"
msgid "Configuration"
msgstr "Konfiguration"
msgid "including VAT"
msgstr "inkl. Mehrwertsteuer"
msgid "Month"
msgstr "Monat"
msgid "Billing Address"
msgstr "Rechnungsadresse"
@ -646,12 +646,14 @@ msgid "Confirm Order"
msgstr "Bestellung Bestätigen"
msgid "Thank you for the order."
msgstr "Danke für den Auftrag"
msgstr "Danke für Deine Bestellung."
msgid ""
"Your VM will be up and running in a few moments. We will send you a "
"confirmation email as soon as it is ready."
msgstr ""
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, "
"sobald Du auf sie zugreifen kannst."
msgid "In order to create a VM, you need to create/upload your SSH KEY first."
msgstr ""

View file

@ -64,7 +64,7 @@
<div class="timeline-body">
<p>{% trans "ungleich introduces HA-Hosting" %} </p>
<p>{% trans "and introduces affordable 24X7 support." %}</p>
<p>{% trans "ungleich launches" %}<a href="https://digitalglarus.ungleich.ch/digitalglarus/">
<p>{% trans "ungleich launches" %}<a href="https://digitalglarus.ch">
{% trans "Digital Glarus project" %}</a></p>
</div>
</div>
@ -79,4 +79,4 @@
</div>
</div>
</div>
</section>
</section>