diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 7585c0cc..72b8ba89 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-07-09 15:21+0530\n"
+"POT-Creation-Date: 2017-07-13 23:55+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"
@@ -62,16 +62,16 @@ msgid "Hosted in Switzerland"
 msgstr "Standort: Schweiz"
 
 #: templates/datacenterlight/calculator_form.html:21
-msgid "Please enter a value greater than or equal to 1."
-msgstr "Bitte gib einen Wert größer oder gleich 1 ein."
+msgid "Please enter a value in range 1 - 48."
+msgstr "Bitte gib einen Wert von 1 bis 48 ein."
 
 #: templates/datacenterlight/calculator_form.html:30
-msgid "Please enter a value greater than or equal to 2."
-msgstr "Bitte gib einen Wert größer oder gleich 2 ein."
+msgid "Please enter a value in range 2 - 200."
+msgstr "Bitte gib einen Wert von 2 bis 200 ein."
 
 #: templates/datacenterlight/calculator_form.html:39
-msgid "Please enter a value greater than or equal to 10."
-msgstr "Bitte gib einen Wert größer oder gleich 10 ein"
+msgid "Please enter a value in range 10 - 2000."
+msgstr "Bitte gib einen Wert von 10 bis 200 ein."
 
 #: templates/datacenterlight/calculator_form.html:40
 #: templates/datacenterlight/pricing.html:50
@@ -87,7 +87,9 @@ msgid "Your Name"
 msgstr "Dein Name"
 
 #: templates/datacenterlight/calculator_form.html:60
-msgid "Please enter your name"
+#, fuzzy
+#| msgid "Please enter your name"
+msgid "Please enter your name."
 msgstr "Bitte gib Deinen Namen ein"
 
 #: templates/datacenterlight/calculator_form.html:74
@@ -99,7 +101,9 @@ msgid "Your Email"
 msgstr "Deine E-Mail"
 
 #: templates/datacenterlight/calculator_form.html:75
-msgid "Please enter a valid email address"
+#, fuzzy
+#| msgid "Please enter a valid email address"
+msgid "Please enter a valid email address."
 msgstr "Bitte gib eine gültige E-Mailadresse ein"
 
 #: templates/datacenterlight/calculator_form.html:88
@@ -501,6 +505,12 @@ msgstr "ist kein gültiger Name"
 msgid "is not a proper email"
 msgstr "ist keine gültige E-Mailadresse"
 
+#~ msgid "Please enter a value greater than or equal to 1."
+#~ msgstr "Bitte gib einen Wert größer oder gleich 1 ein."
+
+#~ msgid "Please enter a value greater than or equal to 10."
+#~ msgstr "Bitte gib einen Wert größer oder gleich 10 ein"
+
 #~ msgid "Buy VM"
 #~ msgstr "VM Kaufen"
 
diff --git a/datacenterlight/templates/datacenterlight/calculator_form.html b/datacenterlight/templates/datacenterlight/calculator_form.html
index c247f36f..09b59b6f 100644
--- a/datacenterlight/templates/datacenterlight/calculator_form.html
+++ b/datacenterlight/templates/datacenterlight/calculator_form.html
@@ -18,7 +18,7 @@
         <div class="form-group">
             <div class="description input">
             <i class="fa fa-minus-circle left" data-minus="cpu" aria-hidden="true"></i>
-            <input class="input-price select-number" type="number"  min="1" max="48" id="coreValue" name="cpu" data-error="{% trans 'Please enter a value in range 1 - 48' %}" required>
+            <input class="input-price select-number" type="number"  min="1" max="48" id="coreValue" name="cpu" data-error="{% trans 'Please enter a value in range 1 - 48.' %}" required>
             <span> Core</span>
             <i class="fa fa-plus-circle right" data-plus="cpu"  aria-hidden="true"></i>
             </div>
@@ -27,7 +27,7 @@
         <div class="form-group">
             <div class="description input">
             <i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i>
-            <input id="ramValue" class="input-price select-number" type="number"  min="2" max="200"  name="ram" data-error="{% trans 'Please enter a value in range 2-200.' %}" required>
+            <input id="ramValue" class="input-price select-number" type="number"  min="2" max="200"  name="ram" data-error="{% trans 'Please enter a value in range 2 - 200.' %}" required>
             <span> GB RAM</span>
             <i class="fa fa-plus-circle right" data-plus="ram"  aria-hidden="true"></i>
             </div>
@@ -57,7 +57,7 @@
         <div class="form-group">
             <div class="description input justify-center">
             <label for="name" class="control-label">{% trans "Name"%}</label>
-            <input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}" data-minlength="3" data-error="{% trans 'Please enter your name' %}" required>
+            <input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}" data-minlength="3" data-error="{% trans 'Please enter your name.' %}" required>
             </div>
             <div class="help-block with-errors">
                 {% for message in messages %}
@@ -72,7 +72,7 @@
         <div class="form-group">
             <div class="description input justify-center">
             <label for="email" class="control-label">{% trans "Email"%}</label>
-            <input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" placeholder="{% trans 'Your Email' %}" data-error="{% trans 'Please enter a valid email address' %}" required>
+            <input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" placeholder="{% trans 'Your Email' %}" data-error="{% trans 'Please enter a valid email address.' %}" required>
             </div>
             <div class="help-block with-errors">
                 {% for message in messages %}