From c891694dc00fd7c871880e7d5a36c11e3c285ad4 Mon Sep 17 00:00:00 2001
From: Malcolm Anyakee <MalcolmA@users.noreply.github.com>
Date: Sat, 25 Aug 2018 23:13:16 +0200
Subject: [PATCH 1/2] Update Bugfix

Fixed bugs and fixed typo
---
 hosting/locale/de/LC_MESSAGES/django.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index a9e33644..4cdfc6f6 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -209,7 +209,7 @@ msgstr "Du hast eine neue virtuelle Maschine bestellt!"
 
 #, python-format
 msgid "Your order of <strong>%(vm_name)s</strong> has been charged."
-msgstr "Deine Bestellung von <strong>%(vm_name)s</strong> wurde erhoben."
+msgstr "Deine Bestellung von <strong>%(vm_name)s</strong> wurde entgegengenommen."
 
 msgid "You can view your VM detail by clicking the button below."
 msgstr "Um die Rechnung zu sehen, klicke auf den Button unten."
@@ -222,7 +222,7 @@ 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."
+msgstr "Deine Bestellung von %(vm_name)s wurde entgegengenommen."
 
 msgid "You can view your VM detail by following the link below."
 msgstr "Um die Rechnung zu sehen, klicke auf den Link unten."
@@ -249,7 +249,7 @@ msgstr "VM Kündigung"
 
 #, python-format
 msgid ""
-"You are receiving this email because your virutal machine <strong>"
+"You are receiving this email because your virtual machine <strong>"
 "%(vm_name)s</strong> has been cancelled."
 msgstr ""
 "Du erhälst diese E-Mail, da deine virtuelle Maschine <strong>%(vm_name)s</"
@@ -265,7 +265,7 @@ msgstr "NEUE VM"
 
 #, python-format
 msgid ""
-"You are receiving this email because your virutal machine %(vm_name)s has "
+"You are receiving this email because your virtual machine %(vm_name)s has "
 "been cancelled."
 msgstr ""
 "Du erhälst diese E-Mail, da deine virtuelle Maschine %(vm_name)s gekündigt "

From 4feeec23d40f2119f1a531370cb7fb3503e671d5 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 26 Sep 2018 20:50:19 +0200
Subject: [PATCH 2/2] Correct spelling: virutal -> virtual

---
 hosting/templates/hosting/emails/vm_canceled.html | 2 +-
 hosting/templates/hosting/emails/vm_canceled.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html
index 9c2ec4c2..78781d5c 100644
--- a/hosting/templates/hosting/emails/vm_canceled.html
+++ b/hosting/templates/hosting/emails/vm_canceled.html
@@ -25,7 +25,7 @@
         <tr>
             <td style="padding-top: 25px; font-size: 16px;">
                 <p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
-                    {% blocktrans %}You are receiving this email because your virutal machine <strong>{{ vm_name }}</strong> has been cancelled.{% endblocktrans %}
+                    {% blocktrans %}You are receiving this email because your virtual machine <strong>{{ vm_name }}</strong> has been cancelled.{% endblocktrans %}
                 </p>
                 <p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
                     {% blocktrans %}You can always order a new VM by clicking the button below.{% endblocktrans %}
diff --git a/hosting/templates/hosting/emails/vm_canceled.txt b/hosting/templates/hosting/emails/vm_canceled.txt
index 9149a554..43263c40 100644
--- a/hosting/templates/hosting/emails/vm_canceled.txt
+++ b/hosting/templates/hosting/emails/vm_canceled.txt
@@ -2,7 +2,7 @@
 
 {% trans "Virtual Machine Cancellation" %}
 
-{% blocktrans %}You are receiving this email because your virutal machine {{vm_name}} has been cancelled.{% endblocktrans %}
+{% blocktrans %}You are receiving this email because your virtual machine {{vm_name}} has been cancelled.{% endblocktrans %}
 {% blocktrans %}You can always order a new VM by following the link below.{% endblocktrans %}
 
 {{ base_url }}{% url 'hosting:create_virtual_machine' %}