merged master

This commit is contained in:
Arvind Tiwari 2017-09-21 19:43:20 +05:30
commit 0993f2cab1
3 changed files with 46 additions and 19 deletions

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 = [

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -354,11 +354,35 @@ 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 "Finish Configuration" msgid "Month"
msgstr "Konfiguration beenden" 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." msgid "Order Nr."
msgstr "Bestellung Nr." msgstr "Bestellung Nr."
@ -381,15 +405,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"
@ -631,13 +649,19 @@ msgstr ""
msgid "Invalid credit card" msgid "Invalid credit card"
msgstr "Ungültige Kreditkarte" 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" msgid "Confirm Order"
msgstr "Bestellung Bestätigen" 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." msgid "In order to create a VM, you need to create/upload your SSH KEY first."
msgstr "" msgstr ""
"Um eine VM zu erstellen musst du zuerst einen SSH-Key erstellen / hochladen." "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" #~ msgid "VM %(VM_ID)s terminated successfully"
#~ msgstr "VM %(VM_ID)s erfolgreich beendet" #~ 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" #~ msgid "My Virtual Machines"
#~ msgstr "Meine virtuellen Maschinen" #~ msgstr "Meine virtuellen Maschinen"
@ -752,9 +782,6 @@ msgstr "VM Kündigung"
#~ msgid "Payment Details" #~ msgid "Payment Details"
#~ msgstr "Rechnungsdetails" #~ msgstr "Rechnungsdetails"
#~ msgid "Place Order"
#~ msgstr "Bestelle"
#~ msgid "CARD NUMBER" #~ msgid "CARD NUMBER"
#~ msgstr "Kreditkartennummer" #~ msgstr "Kreditkartennummer"

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>