diff --git a/hosting/locale/de/LC_MESSAGES/django.mo b/hosting/locale/de/LC_MESSAGES/django.mo
index 23a4bb4f..b42a1e03 100644
Binary files a/hosting/locale/de/LC_MESSAGES/django.mo and b/hosting/locale/de/LC_MESSAGES/django.mo differ
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index bdc2c038..f95cfe3c 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-05-26 14:41+0000\n"
+"POT-Creation-Date: 2017-05-29 12:29+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"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: hosting/templates/hosting/base_short.html:67
 msgid "My Virtual Machines"
-msgstr "Meine virtuellen Machinen"
+msgstr "Meine virtuellen Maschinen"
 
 #: hosting/templates/hosting/base_short.html:72
 #: hosting/templates/hosting/orders.html:12
@@ -29,7 +29,7 @@ msgstr "Meine Bestellungen"
 
 #: hosting/templates/hosting/base_short.html:77
 msgid "Keys"
-msgstr "Keys"
+msgstr "Schlüssel"
 
 #: hosting/templates/hosting/base_short.html:82
 msgid "Notifications "
@@ -144,7 +144,7 @@ msgid "Customers"
 msgstr "Kunden"
 
 #: hosting/templates/hosting/bills.html:16
-#: hosting/templates/hosting/virtual_machine_key.html:45
+#: hosting/templates/hosting/virtual_machine_key.html:47
 msgid "Name"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr ""
 
 #: hosting/templates/hosting/bills.html:28
 msgid "View Bill"
-msgstr ""
+msgstr "Rechnung anzeigen"
 
 #: hosting/templates/hosting/bills.html:41
 #: hosting/templates/hosting/orders.html:83
@@ -191,6 +191,34 @@ msgstr "Anmelden"
 msgid "New Virtual Machine"
 msgstr "Neue virtuelle Maschine"
 
+#: hosting/templates/hosting/create_virtual_machine.html:24
+msgid "Select VM Template:"
+msgstr "Wählen Sie eine Vorlage"
+
+#: hosting/templates/hosting/create_virtual_machine.html:32
+msgid "Select VM Configuration:"
+msgstr "Wählen Sie eine Konfiguration"
+
+#: hosting/templates/hosting/create_virtual_machine.html:36
+msgid "Core:"
+msgstr "Prozessorkerne:"
+
+#: hosting/templates/hosting/create_virtual_machine.html:37
+msgid "RAM:"
+msgstr ""
+
+#: hosting/templates/hosting/create_virtual_machine.html:38
+msgid "SSD:"
+msgstr ""
+
+#: hosting/templates/hosting/create_virtual_machine.html:39
+msgid "Price:"
+msgstr "Preis:"
+
+#: hosting/templates/hosting/create_virtual_machine.html:39
+msgid "CHF/Month"
+msgstr "CHF/Monat"
+
 #: hosting/templates/hosting/create_virtual_machine.html:45
 msgid "Start VM"
 msgstr "Start VM"
@@ -313,7 +341,7 @@ msgstr "Betrag"
 
 #: hosting/templates/hosting/orders.html:19
 #: hosting/templates/hosting/virtual_machine_detail.html:30
-#: hosting/templates/hosting/virtual_machine_key.html:47
+#: hosting/templates/hosting/virtual_machine_key.html:49
 #: hosting/templates/hosting/virtual_machines.html:31
 msgid "Status"
 msgstr ""
@@ -363,19 +391,19 @@ msgstr "Rechnungsdetails"
 msgid "CARD NUMBER"
 msgstr "Kreditkartennummer"
 
-#: hosting/templates/hosting/payment.html:70
+#: hosting/templates/hosting/payment.html:73
 msgid "Valid Card Number"
 msgstr "Gültige Kreditkartennummer"
 
-#: hosting/templates/hosting/payment.html:79
+#: hosting/templates/hosting/payment.html:82
 msgid "EXPIRATION DATE"
 msgstr "Ablaufdatum"
 
-#: hosting/templates/hosting/payment.html:90
+#: hosting/templates/hosting/payment.html:93
 msgid "CV CODE"
 msgstr "CV Code"
 
-#: hosting/templates/hosting/payment.html:98
+#: hosting/templates/hosting/payment.html:101
 msgid "Submit Payment"
 msgstr "Betrag überweisen"
 
@@ -409,7 +437,7 @@ msgstr "Aktueller Preis"
 
 #: hosting/templates/hosting/virtual_machine_detail.html:115
 msgid "Current status"
-msgstr "Aktuller Status"
+msgstr "Aktueller Status"
 
 #: hosting/templates/hosting/virtual_machine_detail.html:140
 msgid "Terminate Virtual Machine"
@@ -433,58 +461,69 @@ msgstr "Zugriffsschlüssel"
 
 #: hosting/templates/hosting/virtual_machine_key.html:22
 msgid "Upload your own key. "
-msgstr ""
+msgstr "Laden Sie ihren Schlüssel hoch"
 
 #: hosting/templates/hosting/virtual_machine_key.html:29
 msgid "Upload Key"
-msgstr ""
+msgstr "Schlüssel hochladen"
 
 #: hosting/templates/hosting/virtual_machine_key.html:33
 msgid "Or generate a new key pair."
-msgstr ""
+msgstr "Oder erstellen Sie ein neues Schlüsselpaar"
 
 #: hosting/templates/hosting/virtual_machine_key.html:37
 msgid "Generate Key Pair"
-msgstr ""
+msgstr "Schlüsselpaar generieren"
 
-#: hosting/templates/hosting/virtual_machine_key.html:46
+#: hosting/templates/hosting/virtual_machine_key.html:41
+msgid ""
+"Use your created key to access to the machine. If you lost it, contact us."
+msgstr ""
+"Verwenden Sie Ihren privaten SSH Schlüssel um sich mit Ihren Maschinen zu "
+"verbinden. Falls Sie ihn verloren haben kontaktieren Sie uns."
+
+#: hosting/templates/hosting/virtual_machine_key.html:48
 msgid "Created at"
 msgstr "Erstellt am"
 
-#: hosting/templates/hosting/virtual_machine_key.html:68
-#: hosting/templates/hosting/virtual_machine_key.html:81
+#: hosting/templates/hosting/virtual_machine_key.html:70
+#: hosting/templates/hosting/virtual_machine_key.html:83
 msgid "Warning!"
-msgstr ""
+msgstr "Achtung!"
 
-#: hosting/templates/hosting/virtual_machine_key.html:68
+#: hosting/templates/hosting/virtual_machine_key.html:70
 msgid "You can download your SSH  private key once. Don't lost your key"
 msgstr ""
+"Sie können ihren privaten SSH Schlüssel nur einmal herunterladen. Bewaren "
+"Sie ihn sicher auf."
 
-#: hosting/templates/hosting/virtual_machine_key.html:76
+#: hosting/templates/hosting/virtual_machine_key.html:78
 msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Kopieren"
 
-#: hosting/templates/hosting/virtual_machine_key.html:77
+#: hosting/templates/hosting/virtual_machine_key.html:79
 msgid "Download"
 msgstr ""
 
-#: hosting/templates/hosting/virtual_machine_key.html:81
+#: hosting/templates/hosting/virtual_machine_key.html:83
 msgid ""
 "Your SSH private key was already generated and downloaded, if you lost it, "
 "contact us. "
 msgstr ""
+"Ihr privater SSH Schlüssel wurde bereits generiert und heruntergeladen, "
+"falls Sie ihn verloren haben kontaktieren Sie uns."
 
-#: hosting/templates/hosting/virtual_machine_key.html:84
+#: hosting/templates/hosting/virtual_machine_key.html:86
 msgid "Generate my key"
-msgstr ""
+msgstr "Generiere meinen Schlüssel"
 
 #: hosting/templates/hosting/virtual_machines.html:9
 msgid "Virtual Machines"
-msgstr ""
+msgstr "Virtuelle Maschinen"
 
 #: hosting/templates/hosting/virtual_machines.html:22
 msgid "Create VM"
-msgstr ""
+msgstr "Neue VM"
 
 #: hosting/templates/hosting/virtual_machines.html:28
 msgid "ID"