diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 8f4d30cd..7726a38d 100644 Binary files a/datacenterlight/locale/de/LC_MESSAGES/django.mo and b/datacenterlight/locale/de/LC_MESSAGES/django.mo differ diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 45629dab..353d5345 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-05-23 17:26-0500\n" +"POT-Creation-Date: 2017-05-27 10:13-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,7 +66,10 @@ msgid "Thank you!" msgstr "Vielen Dank!" #: templates/datacenterlight/index.html:62 +#: templates/datacenterlight/index.html:142 +#: templates/datacenterlight/index.html:328 #: templates/datacenterlight/pricing.html:62 +#: templates/datacenterlight/pricing.html:185 msgid "What is it" msgstr "Was ist es?" @@ -88,8 +91,8 @@ msgstr "Zuverlässig und leicht" #: templates/datacenterlight/index.html:71 #: templates/datacenterlight/pricing.html:71 -msgid "Buy VM" -msgstr "VM Kaufen" +msgid "Order VM" +msgstr "VM bestellen" #: templates/datacenterlight/index.html:74 #: templates/datacenterlight/index.html:341 @@ -110,12 +113,6 @@ msgstr "Was ist es?" msgid "I want it!" msgstr "Das will ich haben!" -#: templates/datacenterlight/index.html:142 -#: templates/datacenterlight/index.html:328 -#: templates/datacenterlight/pricing.html:185 -msgid "How it works" -msgstr "Wie es funktioniert" - #: templates/datacenterlight/index.html:147 msgid "Reuse existing factory halls intead of building an expensive building." msgstr "" @@ -177,7 +174,9 @@ msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" #: templates/datacenterlight/index.html:243 -msgid "15 GB Storage (SSD)" +#, fuzzy +#| msgid "15 GB Storage (SSD)" +msgid "10 GB Storage (SSD)" msgstr "15 GB Storage (SSD)" #: templates/datacenterlight/index.html:246 @@ -217,7 +216,7 @@ msgstr "Preise" msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: templates/datacenterlight/pricing.html:136 +#: templates/datacenterlight/pricing.html:139 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" @@ -225,6 +224,18 @@ msgstr "GB Storage (SSD)" msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" +#: templates/datacenterlight/pricing.html:166 +msgid "" +"Our VMs are hosted in Glarus, Switzerland, and our website is currently " +"running in BETA mode. If you want more information that you did not find on " +"our website, or if your order is more detailed, or if you encounter any " +"technical hiccups, please contact us at support@datacenterlight.ch, our team " +"will get in touch with you asap." +msgstr "Unsere VMs werden in der Schweiz im Kanton Glarus gehostet und befinden sich zur Zeit noch in der BETA-Phase. Möchtest du mehr über uns erfahren und hast auf unserer Website nicht genügend Informationen gefunden? Möchtest eine detailliertere Bestellung aufgeben? Bist du auf technische Probleme gestossen, die du uns mitteilen möchtest? Dann zögere nicht und kontaktiere uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein Anliegen kümmern!" + +#~ msgid "How it works" +#~ msgstr "Was ist es" + #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 89297926..29539f2a 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -68,7 +68,7 @@ {% trans "Reliable and light" %}
  • - {% trans "Buy VM" %} + {% trans "Order VM" %}
  • {% trans "Contact" %} @@ -110,7 +110,7 @@
    • - {% trans "What is it?" %} + {% trans "What is it?" %}
    • {% trans "I want it!" %} @@ -139,7 +139,7 @@
      -

      {% trans "How it works" %}

      +

      {% trans "What is it" %}

        @@ -325,7 +325,7 @@
      • ⋅
      • - {% trans "How it works" %}
        • + {% trans "What is it" %}
      • ⋅
      • {% trans "Scale out" %}
        • diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 1674f82e..94c29119 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -163,7 +163,7 @@

        {% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

        -

        Our VMs are hosted in Glarus, Switzerland. WARNING: We are currently running in BETA mode, especially our website We hope you will not encounter any hiccups, but if you, please let us know at support@datacenterlight.ch

        +

        {% trans "Our VMs are hosted in Glarus, Switzerland, and our website is currently running in BETA mode. If you want more information that you did not find on our website, or if your order is more detailed, or if you encounter any technical hiccups, please contact us at support@datacenterlight.ch, our team will get in touch with you asap." %}

      @@ -182,7 +182,7 @@
    • ⋅
    • - {% trans "How it works" %}
      • + {% trans "What is it" %}
    • ⋅
    • {% trans "Scale out" %}
      • diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 94e84df5..234b680f 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -1,5 +1,5 @@ .dashboard-container { - padding-top:5%; padding-bottom: 11%; + padding-top:70px; padding-bottom: 11%; } .borderless td { diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css index 8e0c5919..2abc47db 100644 --- a/hosting/static/hosting/css/order.css +++ b/hosting/static/hosting/css/order.css @@ -1,4 +1,4 @@ -.order-detail-container {padding-top:5%; padding-bottom: 11%;} +.order-detail-container {padding-top: 70px; padding-bottom: 11%;} .order-detail-container .invoice-title h2, .invoice-title h3 { display: inline-block; diff --git a/hosting/static/hosting/css/orders.css b/hosting/static/hosting/css/orders.css index 64e95328..6819a94b 100644 --- a/hosting/static/hosting/css/orders.css +++ b/hosting/static/hosting/css/orders.css @@ -1,4 +1,4 @@ -.orders-container {padding-top:5%; padding-bottom: 11%;} +.orders-container {padding-top:70px; padding-bottom: 11%;} .orders-container .table > tbody > tr > td { vertical-align: middle; diff --git a/hosting/static/hosting/css/payment.css b/hosting/static/hosting/css/payment.css index 57e830f4..68a36837 100644 --- a/hosting/static/hosting/css/payment.css +++ b/hosting/static/hosting/css/payment.css @@ -1,5 +1,5 @@ -.payment-container {padding-top:5%; padding-bottom: 11%;} +.payment-container {padding-top:70px; padding-bottom: 11%;} .creditcard-box .panel-title {display: inline;font-weight: bold; font-size:17px;} .creditcard-box .checkbox.pull-right { margin: 0; } .creditcard-box .pl-ziro { padding-left: 0px; }