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

merged master

This commit is contained in:
Arvind Tiwari 2017-09-21 19:43:20 +05:30
parent 1eff51099c dd3c967500
commit 0993f2cab1
3 changed files with 46 additions and 19 deletions
Show Stats 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
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 = [

59
hosting/locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-19 14:20+0530\n"
"POT-Creation-Date: 2017-09-20 20:23+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -354,11 +354,35 @@ msgstr "Arbeitsspeicher"
msgid "Disk space"
msgstr "Festplattenkapazität"
msgid "Configuration"
msgstr "Konfiguration"
msgid "Total"
msgstr "Gesamt"
msgid "Finish Configuration"
msgstr "Konfiguration beenden"
msgid "Month"
msgstr "Monat"
#, python-format
msgid ""
"By clicking \"Place order\" this plan will charge your credit card account "
"with the fee of %(vm_price)sCHF/month"
msgstr ""
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(vm_price)sCHF "
"pro Monat belastet"
msgid "Place order"
msgstr "Bestelle"
msgid "Processing..."
msgstr "Abarbeitung..."
msgid "Hold tight, we are processing your request"
msgstr "Bitte warten - wir verbeiten Deine Anfrage gerade"
msgid "Some problem encountered. Please try again later."
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
msgid "Order Nr."
msgstr "Bestellung Nr."
@ -381,15 +405,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"
@ -631,13 +649,19 @@ msgstr ""
msgid "Invalid credit card"
msgstr "Ungültige Kreditkarte"
#, python-format
msgid "Your New VM %(vm_name)s at Data Center Light"
msgstr "Deine neue VM %(vm_name)s bei Data Center Light"
msgid "Confirm Order"
msgstr "Bestellung Bestätigen"
msgid "Thank you for the order."
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 ""
"Um eine VM zu erstellen musst du zuerst einen SSH-Key erstellen / hochladen."
@ -662,6 +686,12 @@ msgstr "VM Kündigung"
#~ msgid "VM %(VM_ID)s terminated successfully"
#~ msgstr "VM %(VM_ID)s erfolgreich beendet"
#~ msgid "Finish Configuration"
#~ msgstr "Konfiguration beenden"
#~ msgid "Your New VM %(vm_name)s at Data Center Light"
#~ msgstr "Deine neue VM %(vm_name)s bei Data Center Light"
#~ msgid "My Virtual Machines"
#~ msgstr "Meine virtuellen Maschinen"
@ -752,9 +782,6 @@ msgstr "VM Kündigung"
#~ msgid "Payment Details"
#~ msgstr "Rechnungsdetails"
#~ msgid "Place Order"
#~ msgstr "Bestelle"
#~ msgid "CARD NUMBER"
#~ msgstr "Kreditkartennummer"

4
ungleich_page/templates/ungleich_page/includes/_about.html
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>