diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index c0dc55ca..80d88c04 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-08-24 11:28+0000\n"
+"POT-Creation-Date: 2017-09-02 03:08+0530\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"
@@ -95,7 +95,9 @@ msgid "Message"
 msgstr "Nachricht"
 
 msgid "Sorry, there was an unexpected error. Kindly retry."
-msgstr "Bitte entschuldige, es scheint ein unerwarteter Fehler aufgetreten zu sein. Versuche es doch bitte noch einmal."
+msgstr ""
+"Bitte entschuldige, es scheint ein unerwarteter Fehler aufgetreten zu sein. "
+"Versuche es doch bitte noch einmal."
 
 msgid "SUBMIT"
 msgstr "ABSENDEN"
@@ -166,6 +168,9 @@ msgstr ""
 "Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst "
 "%(base_url)s%(activation_link)s\n"
 
+msgid "Home"
+msgstr "Home"
+
 msgid "Highlights"
 msgstr ""
 
@@ -175,18 +180,15 @@ msgstr "Skalierung"
 msgid "Reliable and light"
 msgstr "Zuverlässig und leicht"
 
+msgid "Pricing"
+msgstr "Preise"
+
 msgid "Order VM"
 msgstr "VM bestellen"
 
 msgid "Contact"
 msgstr "Kontakt"
 
-msgid "Home"
-msgstr "Home"
-
-msgid "Pricing"
-msgstr "Preise"
-
 msgid "All Rights Reserved"
 msgstr "Alle Rechte vorbehalten"
 
@@ -256,25 +258,10 @@ msgid "Contact us"
 msgstr "Kontaktiere uns"
 
 msgid "Switzerland "
-msgstr "Schweiz"
+msgstr "Schweiz "
 
-msgid "Confirm Order"
-msgstr "Bestellung Bestätigen"
-
-msgid "Date"
-msgstr "Datum"
-
-msgid "Billed To:"
-msgstr "Rechnungsadresse"
-
-msgid "Payment Method:"
-msgstr "Bezahlmethode"
-
-msgid "ending"
-msgstr "endend in"
-
-msgid "Order summary"
-msgstr "Bestellungsübersicht"
+msgid "Your Order"
+msgstr "Deine Bestellung"
 
 msgid "Cores"
 msgstr "Prozessorkerne"
@@ -289,13 +276,80 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 msgid "Total"
-msgstr ""
+msgstr "Gesamt"
+
+msgid "including VAT"
+msgstr "inkl. Mehrwertsteuer"
 
-#, fuzzy
-#| msgid "month"
 msgid "Month"
 msgstr "Monat"
 
+msgid "Billing Address"
+msgstr "Rechnungsadresse"
+
+msgid "Credit Card"
+msgstr "Kreditkarte"
+
+msgid ""
+"\n"
+"                                Please fill in your credit card information "
+"below. We are using <a\n"
+"                                    href=\"https://stripe.com\" target="
+"\"_blank\">Stripe</a> for payment and do not store\n"
+"                                your information in our database.\n"
+"                                "
+msgstr ""
+"\n"
+"Bitte füll Deine Kreditkarteninformationen unten aus. Wir nutzen <a href="
+"\"https://stripe.com\" target=\"_blank\">Stripe</a> für die Bezahlung und "
+"speichern keine Informationen in unserer Datenbank."
+
+msgid ""
+"You are not making any payment yet. After submitting your card information, "
+"you will be taken to the Confirm Order Page."
+msgstr ""
+"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
+"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
+
+msgid "Submit"
+msgstr "Absenden"
+
+msgid "Card Number"
+msgstr "Kreditkartennummer"
+
+msgid "Expiry Date"
+msgstr "Ablaufdatum"
+
+msgid "CVC"
+msgstr ""
+
+msgid "Card Type"
+msgstr "Kartentyp"
+
+msgid "Processing"
+msgstr "Weiter"
+
+msgid "Enter your credit card number"
+msgstr "Deine Kreditkartennummer"
+
+msgid "Confirm Order"
+msgstr "Bestellung Bestätigen"
+
+msgid "Date"
+msgstr "Datum"
+
+msgid "Billed To:"
+msgstr "Rechnungsadresse"
+
+msgid "Payment Method:"
+msgstr "Bezahlmethode"
+
+msgid "ending"
+msgstr "endend"
+
+msgid "Order summary"
+msgstr "Bestellungsübersicht"
+
 #, python-format
 msgid ""
 "By clicking \"Place order\" this plan will charge your credit card account "
@@ -331,7 +385,7 @@ msgstr ""
 msgid "Thank you for order! Our team will contact you via email"
 msgstr ""
 "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit "
-"Ihnen via E-Mail in Verbindung."
+"Dir via E-Mail in Verbindung."
 
 msgid "as soon as possible!"
 msgstr ""
@@ -495,9 +549,6 @@ msgstr "ist keine gültige E-Mailadresse"
 #~ msgid "Buy Now!"
 #~ msgstr "Kaufe jetzt!"
 
-#~ msgid "Email address"
-#~ msgstr "E-Mail Adresse"
-
 #~ msgid "Our promise"
 #~ msgstr "Unser Versprechen"
 
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 598bcff6..f905d905 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-02 01:47+0530\n"
+"POT-Creation-Date: 2017-09-02 03:08+0530\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"
@@ -73,7 +73,7 @@ msgid "Mwst-Nummer: CHE-109.549.333 MWST"
 msgstr ""
 
 msgid "Total:"
-msgstr ""
+msgstr "Gesamt:"
 
 #, python-format
 msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
@@ -242,12 +242,21 @@ msgstr "Datum"
 msgid "Status:"
 msgstr ""
 
+msgid "Approved"
+msgstr "Akzeptiert"
+
+msgid "Declined"
+msgstr "Abgelehnt"
+
 msgid "Billed To:"
 msgstr "Rechnungsadresse"
 
 msgid "Payment Method:"
 msgstr "Bezahlmethode"
 
+msgid "ending in"
+msgstr "endend in"
+
 msgid "Order summary"
 msgstr "Bestellungsübersicht"
 
@@ -275,12 +284,6 @@ msgstr "Betrag"
 msgid "Status"
 msgstr ""
 
-msgid "Approved"
-msgstr "Akzeptiert"
-
-msgid "Declined"
-msgstr "Abgelehnt"
-
 msgid "See Invoice"
 msgstr "Rechnung"
 
diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 8a5f39f6..64c0b5d3 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -1,7 +1,7 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 %}
 {% load i18n %}
-{% block content %} 
+{% block content %}
 
 <div class="order-detail-container">
    {% if messages %}
@@ -17,7 +17,7 @@
     </div>
     {% endif %}
     {% if not error %}
-    <div class="row">  
+    <div class="row">
         <div class="col-xs-12 col-md-8 col-md-offset-2">
     		<div class="invoice-title">
     			<h2>{{page_header_text}}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
@@ -29,9 +29,11 @@
                         <strong>{% trans "Date"%}:</strong><br>
                         <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i'}}</span><br><br>
                         <strong>{% trans "Status:"%}</strong><br>
-                        <strong class="{% if order.status == 'Approved' %}text-success
-                                       {%else%} text-danger
-                                       {% endif %}">{{order.status}}</strong>
+                        {% if order.status == 'Approved' %}
+                            <strong class="text-success">{% trans "Approved" %}</strong>
+                        {% else %}
+                            <strong class="text-danger">{% trans "Declined" %}</strong>
+                        {% endif %}
                         <br><br>
                     </address>
 
@@ -44,20 +46,20 @@
                         {{order.billing_address.city}}, {{order.billing_address.country}}.
     				</address>
     			</div>
-                
+
     		</div>
     		<div class="row">
     			<div class="col-xs-6">
     				<address>
     					<strong>{% trans "Payment Method:"%}</strong><br>
-    					{{order.cc_brand}} ending **** {{order.last4}}<br>
+    					{{order.cc_brand}} {% trans "ending in" %} **** {{order.last4}}<br>
     					{{user.email}}
     				</address>
     			</div>
     		</div>
     	</div>
     </div>
-    
+
     <div class="row">
         <div class="col-md-8 col-md-offset-2">
             <h3><b>{% trans "Order summary"%}</b></h3>
@@ -83,8 +85,8 @@
     {% endif %}
 </div>
 
- 
-<script type="text/javascript"> 
+
+<script type="text/javascript">
 
     window.onload = function () {
             var locale_date = moment.utc(document.getElementById("order-created_at").textContent,'YYYY-MM-DD HH:mm').toDate();
diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index 3699e9a2..7ec3e91b 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="dashboard-container">
     <div class="dashboard-container-head">
-        <h3 class="dashboard-title-thin"><img src="{% static 'hosting/img/shopping-cart.svg' %}" class="un-icon" style="margin-top: -4px; width: 30px;"> {% trans "My Orders" %}</h3>
+        <h3 class="dashboard-title-thin"><img src="{% static 'hosting/img/shopping-cart.svg' %}" class="un-icon" style="margin-top: -4px; width: 30px;"> {% trans "My Bills" %}</h3>
         {% if messages %}
             <div class="alert alert-warning">
                 {% for message in messages %}