diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 96dd650c..c0e44342 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 02:06+0530\n" +"POT-Creation-Date: 2017-09-27 04:21+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/datacenterlight/static/datacenterlight/img/logo_black.png b/datacenterlight/static/datacenterlight/img/logo_black.png index d5377a76..c62e6b93 100644 Binary files a/datacenterlight/static/datacenterlight/img/logo_black.png and b/datacenterlight/static/datacenterlight/img/logo_black.png differ diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 9af1c6e9..8c9c5509 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 02:06+0530\n" +"POT-Creation-Date: 2017-09-27 04:21+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -198,9 +198,8 @@ msgstr "Deine Neue VM %(vm_name)s" msgid "You have ordered a new virtual machine!" msgstr "Du hast eine neue virtuelle Maschine bestellt!" -#, python-format -msgid "Your order of [%(vm_name)s] has been charged." -msgstr "Deine Bestellung von [%(vm_name)s] wurde erhoben." +msgid "Your order of [ %(vm_name)s ] has been charged." +msgstr "Deine Bestellung von [ %(vm_name)s ] wurde erhoben." msgid "You can view your VM detail by clicking the button below." msgstr "Um die Rechnung zu sehen, klicke auf den Button unten." @@ -211,6 +210,10 @@ msgstr "Details anzeigen" msgid "Your Data Center Light Team" msgstr "Dein Data Center Light Team" +#, python-format +msgid "Your order of [%(vm_name)s] has been charged." +msgstr "Deine Bestellung von [%(vm_name)s] wurde erhoben." + msgid "You can view your VM detail by following the link below." msgstr "Um die Rechnung zu sehen, klicke auf den Link unten." @@ -234,12 +237,12 @@ msgstr "Dankeschön!" msgid "Virtual Machine Cancellation" msgstr "VM Kündigung" -#, python-format msgid "" -"You are receiving this email because your virutal machine [%(vm_name)s] has " -"been cancelled." +"You are receiving this email because your virutal machine [ " +"%(vm_name)s ] has been cancelled." msgstr "" -"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt " +"Du erhälst diese E-Mail, da deine virtuelle Maschine [ " +"%(vm_name)s ] gekündigt " "wurde." msgid "You can always order a new VM by clicking the button below." @@ -250,6 +253,14 @@ msgstr "" msgid "CREATE VM" msgstr "NEUE VM" +#, python-format +msgid "" +"You are receiving this email because your virutal machine [%(vm_name)s] has " +"been cancelled." +msgstr "" +"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt " +"wurde." + msgid "You can always order a new VM by following the link below." msgstr "" @@ -355,6 +366,12 @@ msgstr "Abarbeitung..." msgid "Hold tight, we are processing your request" msgstr "Bitte warten - wir bearbeiten Deine Anfrage gerade" +msgid "OK" +msgstr "" + +msgid "Close" +msgstr "Schliessen" + msgid "Some problem encountered. Please try again later." msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal." @@ -564,9 +581,6 @@ msgstr "Deine Virtuelle Maschine beenden" msgid "Do you want to cancel your Virtual Machine" msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst" -msgid "OK" -msgstr "" - #, python-format msgid "" "Your Virtual Machine %(machine_name)s is successfully " @@ -605,6 +619,9 @@ msgstr "Dein Account wurde aktiviert." msgid "You can now" msgstr "Du kannst dich nun" +msgid "Welcome to Data Center Light!" +msgstr "Willkommen beim Data Center Light!" + msgid "Sorry. Your request is invalid." msgstr "Entschuldigung, deine Anfrage ist ungültig." @@ -714,9 +731,6 @@ msgstr "Fehler beenden VM" #~ msgid "VM %(VM_ID)s terminated successfully" #~ msgstr "VM %(VM_ID)s erfolgreich beendet" -#~ msgid "Close" -#~ msgstr "Schliessen" - #~ msgid "days" #~ msgstr "Tage" diff --git a/hosting/templates/hosting/emails/new_booked_vm.html b/hosting/templates/hosting/emails/new_booked_vm.html index 68f99526..fdf56c76 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.html +++ b/hosting/templates/hosting/emails/new_booked_vm.html @@ -26,7 +26,7 @@

{% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %}
- {% blocktrans %}Your order of [{{ vm_name }}] has been charged.{% endblocktrans %}
+ {% blocktrans %}Your order of [ {{ vm_name }} ] has been charged.{% endblocktrans %}
{% blocktrans %}You can view your VM detail by clicking the button below.{% endblocktrans %}

diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html index d969cfc6..6836fc0d 100644 --- a/hosting/templates/hosting/emails/vm_canceled.html +++ b/hosting/templates/hosting/emails/vm_canceled.html @@ -25,7 +25,7 @@

- {% blocktrans %}You are receiving this email because your virutal machine [{{ vm_name }}] has been cancelled.{% endblocktrans %}
+ {% blocktrans %}You are receiving this email because your virutal machine [ {{ vm_name }} ] has been cancelled.{% endblocktrans %}
{% blocktrans %}You can always order a new VM by clicking the button below.{% endblocktrans %}