sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merged master

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
dynamicweb/settings/prod.py
View file

@ -16,7 +16,7 @@ CACHES = {
# MANAGERS = ADMINS # 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 slug='{slug}') # flake8: noqa
ALLOWED_HOSTS = [ ALLOWED_HOSTS = [

22
hosting/locale/de/LC_MESSAGES/django.po
View file

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

2
ungleich_page/templates/ungleich_page/includes/_about.html
View file

@ -64,7 +64,7 @@
<div class="timeline-body"> <div class="timeline-body">
<p>{% trans "ungleich introduces HA-Hosting" %} </p> <p>{% trans "ungleich introduces HA-Hosting" %} </p>
<p>{% trans "and introduces affordable 24X7 support." %}</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> {% trans "Digital Glarus project" %}</a></p>
</div> </div>
</div> </div>