diff --git a/Changelog b/Changelog index 8842e064..3687dd23 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,14 @@ +1.0.5: 2017-06-06 + * [all] General cleanup + * [datacenterlight] Add German translations + * [datacenterlight] Change beta access to subscriptions + * [hosting] Add German translations + * [blog] Add German translation for header + * [opennebula_api] Improve testing, add ssh key functions + * [opennebula_api] Remove template views + * [datacenterlight] Allow user to have multiple ssh keys + * [datacenterlight] Changed stripe.js v2 to v3 + * [datacenterlight] Added support for stripe payment errors on current user language 1.0.4: 2017-06-05 * [all] Added new Domains to accept 1.0.3: 2017-06-02 diff --git a/alplora/locale/de/LC_MESSAGES/django.mo b/alplora/locale/de/LC_MESSAGES/django.mo index 00859bbb..c69bd979 100644 Binary files a/alplora/locale/de/LC_MESSAGES/django.mo and b/alplora/locale/de/LC_MESSAGES/django.mo differ diff --git a/alplora/locale/de/LC_MESSAGES/django.po b/alplora/locale/de/LC_MESSAGES/django.po index 7d9e3630..c39a4595 100644 --- a/alplora/locale/de/LC_MESSAGES/django.po +++ b/alplora/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-04-11 22:34-0500\n" +"POT-Creation-Date: 2017-05-30 13:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,88 +18,137 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: templates/alplora/index.html:13 +#: alplora/templates/alplora/contact.html:6 +msgid "New message" +msgstr "Neue Nachricht" + +#: alplora/templates/alplora/contact.html:13 +msgid "Name:" +msgstr "Name:" + +#: alplora/templates/alplora/contact.html:15 +msgid "What is your name ?" +msgstr "Was ist Dein Name?" + +#: alplora/templates/alplora/contact.html:19 +msgid "From:" +msgstr "Von:" + +#: alplora/templates/alplora/contact.html:21 +msgid "You email" +msgstr "Deine Email" + +#: alplora/templates/alplora/contact.html:25 +msgid "Message:" +msgstr "Nachricht:" + +#: alplora/templates/alplora/contact.html:27 +msgid "Leave us your message" +msgstr "Schreibe hier Deine Nachricht" + +#: alplora/templates/alplora/contact.html:32 +msgid "Close" +msgstr "schliessen" + +#: alplora/templates/alplora/contact.html:33 +msgid "Send message" +msgstr "Nachricht senden" + +#: alplora/templates/alplora/contact_success.html:6 +msgid "Message Sent" +msgstr "Nachricht gesendet" + +#: alplora/templates/alplora/contact_success.html:9 +msgid "Thank you, we will contact you as soon as possible" +msgstr "Dankeschön! Wir melden uns sobald wie möglich!" + +#: alplora/templates/alplora/index.html:13 msgid "Find your animal anywhere, anytime" msgstr "Finde deine Tiere" -#: templates/alplora/index.html:100 templates/alplora/index.html.py:513 +#: alplora/templates/alplora/index.html:99 +#: alplora/templates/alplora/index.html:463 msgid "About" msgstr "Über" -#: templates/alplora/index.html:103 templates/alplora/index.html.py:249 -#: templates/alplora/index.html:519 +#: alplora/templates/alplora/index.html:102 +#: alplora/templates/alplora/index.html:248 +#: alplora/templates/alplora/index.html:469 msgid "Why Alplora?" msgstr "Warum Alplora?" -#: templates/alplora/index.html:106 templates/alplora/index.html.py:516 +#: alplora/templates/alplora/index.html:105 +#: alplora/templates/alplora/index.html:466 msgid "Usecase" msgstr "" -#: templates/alplora/index.html:109 templates/alplora/index.html.py:359 +#: alplora/templates/alplora/index.html:108 +#: alplora/templates/alplora/index.html:358 msgid "Testimonials" msgstr "Referenzen" -#: templates/alplora/index.html:112 templates/alplora/index.html.py:422 -#: templates/alplora/index.html:527 +#: alplora/templates/alplora/index.html:111 +#: alplora/templates/alplora/index.html:423 +#: alplora/templates/alplora/index.html:477 msgid "Contact" msgstr "Kontakt" -#: templates/alplora/index.html:115 +#: alplora/templates/alplora/index.html:114 msgid "Login" msgstr "Login" -#: templates/alplora/index.html:138 +#: alplora/templates/alplora/index.html:137 msgid "Find your herd anytime, anywhere" msgstr "Finde deine Herde jederzeit und überall" -#: templates/alplora/index.html:139 +#: alplora/templates/alplora/index.html:138 msgid "Perfect fit for Swiss Alps" msgstr "Perfekt für die Schweizer Alpen" -#: templates/alplora/index.html:164 +#: alplora/templates/alplora/index.html:163 msgid "What is Alplora?" msgstr "Was ist Alplora?" -#: templates/alplora/index.html:165 +#: alplora/templates/alplora/index.html:164 msgid "" "Alplora is an animal tracker made for outdoor grazing animals in Swiss Alps." msgstr "" "Alplora ist ein Sender, der speziell für Weidetiere in den Schweizer Alpen " "entwickelt wurde." -#: templates/alplora/index.html:166 +#: alplora/templates/alplora/index.html:165 msgid "Alplora is just like a cattle bell, but much better." msgstr "Alplora ist wie eine Kuhglocke, nur viel besser." -#: templates/alplora/index.html:175 +#: alplora/templates/alplora/index.html:174 msgid "LOST" msgstr "VERLOREN" -#: templates/alplora/index.html:177 +#: alplora/templates/alplora/index.html:176 msgid "When an animal gets separated from the herd and is lost." msgstr "Wenn ein Tier sich von der Herde absondert und verloren geht." -#: templates/alplora/index.html:185 +#: alplora/templates/alplora/index.html:184 msgid "WOLF" msgstr "WOLF" -#: templates/alplora/index.html:187 +#: alplora/templates/alplora/index.html:186 msgid "When a wolf gets close to the herd." msgstr "Wenn ein Wolf sich der Herde nähert." -#: templates/alplora/index.html:194 +#: alplora/templates/alplora/index.html:193 msgid "INJURED" msgstr "VERLETZT" -#: templates/alplora/index.html:196 +#: alplora/templates/alplora/index.html:195 msgid "When one of the animals is hurt." msgstr "Wenn eins der Tiere verletzt ist." -#: templates/alplora/index.html:206 +#: alplora/templates/alplora/index.html:205 msgid "How does Alplora track my animals?" msgstr "Wie kann Alplora meine Tiere verfolgen und ausfindig machen ?" -#: templates/alplora/index.html:207 +#: alplora/templates/alplora/index.html:206 msgid "" "Each animal will be wearing a small tracker,

and the tracker will be " "sending a signal every 30 to 60 minutes." @@ -107,33 +156,33 @@ msgstr "" "Jedes Tier wird einen kleinen Sender tragen,

welcher alle 30 bis 60 " "Minuten ein Signal senden wird." -#: templates/alplora/index.html:216 +#: alplora/templates/alplora/index.html:215 msgid "Access app" msgstr "Zugang zur App" -#: templates/alplora/index.html:218 +#: alplora/templates/alplora/index.html:217 msgid "" "You can see the animal locations on a map by logging into our Alplora app." msgstr "" "Du kannst den Standort deiner Tiere jederzeit auf einer Karte verfolgen, " "indem du dich in unsere Alplora App einloggst." -#: templates/alplora/index.html:226 +#: alplora/templates/alplora/index.html:225 msgid "Get an alarm" msgstr "Erhalte ein Warnsignal" -#: templates/alplora/index.html:228 +#: alplora/templates/alplora/index.html:227 msgid "" "When certain signals for danger are detected, Alplora sends an alarm to you." msgstr "" "Wenn Anzeichen von Gefahr bestehen, sendet dir die Alplora App einen " "Warnsignal." -#: templates/alplora/index.html:236 +#: alplora/templates/alplora/index.html:235 msgid "Find your animal" msgstr "Finde deine Tiere" -#: templates/alplora/index.html:239 +#: alplora/templates/alplora/index.html:238 msgid "" "You can locate the animal in trouble on the realtime map and can take " "actions for keeping the animal safe." @@ -141,11 +190,11 @@ msgstr "" "Du kannst dein Tier in Notsituationen auf einer Echtzeit-Karte lokalisieren " "und hast die Möglichkeit es in Sicherheit zu bringen." -#: templates/alplora/index.html:256 +#: alplora/templates/alplora/index.html:255 msgid "Perfect fit for Swiss mountains" msgstr "Perfekt für die Schweizer Alpen" -#: templates/alplora/index.html:258 +#: alplora/templates/alplora/index.html:257 msgid "" "Alplora is made and tested for Swiss Alps. It is a perfect fit for Swiss " "environment." @@ -153,11 +202,11 @@ msgstr "" "Alplora wurde speziell für die Schweizer Alpen entwickelt und vor Ort " "getestet. Das Produkt passt perfekt in die Schweiz!" -#: templates/alplora/index.html:264 +#: alplora/templates/alplora/index.html:263 msgid "Energy efficient" msgstr "Energieeffizient" -#: templates/alplora/index.html:266 +#: alplora/templates/alplora/index.html:265 msgid "" "Alplora uses the latest wireless technology, our batteries last the whole " "alp season." @@ -165,11 +214,11 @@ msgstr "" "Alplora arbeitet mit den neuesten Technologien, so dass der Akku die gesamte " "Alpsaison überdauert." -#: templates/alplora/index.html:272 +#: alplora/templates/alplora/index.html:271 msgid "Made with love" msgstr "Mit Liebe gemacht" -#: templates/alplora/index.html:274 +#: alplora/templates/alplora/index.html:273 msgid "" "With a lot of love and respect for Swiss agriculture and nature, Alplora is " "made by a Swiss company." @@ -177,61 +226,61 @@ msgstr "" "Alplora wurde mit viel Liebe und Respekt für die Schweizer Natur und " "Landwirtschaft von einer Schweizer Firma entwickelt." -#: templates/alplora/index.html:286 +#: alplora/templates/alplora/index.html:285 msgid "Who needs Alplora?" msgstr "Wer benötigt Alplora?" -#: templates/alplora/index.html:302 +#: alplora/templates/alplora/index.html:301 msgid " Are your animals..." msgstr "Sind deine Tiere..." -#: templates/alplora/index.html:305 +#: alplora/templates/alplora/index.html:304 msgid "sheep, goats, cows or llamas living freely in the Alps?" msgstr "Schafe, Ziegen, Kühe oder Lamas, die frei in den Alpen leben?" -#: templates/alplora/index.html:307 +#: alplora/templates/alplora/index.html:306 msgid "wearing bells?" msgstr "solche, die Glocken tragen?" -#: templates/alplora/index.html:309 +#: alplora/templates/alplora/index.html:308 msgid "" "sometimes getting confused and going too far away from where they are " "supposed to be?" msgstr "" "manchmal verwirrt und entfernen sich zu weit von ihrem vorgesehenen Standort?" -#: templates/alplora/index.html:333 +#: alplora/templates/alplora/index.html:332 msgid "Do you..." msgstr "Möchtest du..." -#: templates/alplora/index.html:336 +#: alplora/templates/alplora/index.html:335 msgid "have animals which are staying outdoor during some time of the year?" msgstr "" "deine Tiere, die eine längere Zeit im Jahr unbeobachtet Draussen verbringen, " "schützen und überwachen können?" -#: templates/alplora/index.html:338 +#: alplora/templates/alplora/index.html:337 msgid "want to get an alarm when your animal is hurt, or in danger?" msgstr "" "alarmiert werden, wenn sich eines deiner Tiere verletzt oder in Gefahr " "befindet ?" -#: templates/alplora/index.html:340 +#: alplora/templates/alplora/index.html:339 msgid "want to see where your animals are on your cell phone map?" msgstr "" "mit deinem Smartphone auf einer Karte sehen können, wo sich deine Tiere " "befinden? " -#: templates/alplora/index.html:342 +#: alplora/templates/alplora/index.html:341 msgid "want to make sure 24/7 that your animals are safe?" msgstr "" "sicherstellen, dass sich deine Tiere rund um die Uhr in Sicherheit befinden?" -#: templates/alplora/index.html:360 +#: alplora/templates/alplora/index.html:359 msgid "What our customers say" msgstr "" -#: templates/alplora/index.html:380 +#: alplora/templates/alplora/index.html:379 msgid "" "“Alplora is an innovation in looking after my cows. I can check where my " "cows have been in the higher mountain all day while doing other works at the " @@ -243,11 +292,11 @@ msgstr "" "selben Zeit andereDinge auf dem Hof unten im Dorf erledigen. Dank Alplora " "kann ich meinen Kühenmehr Sicherheit gewährleisten." -#: templates/alplora/index.html:383 +#: alplora/templates/alplora/index.html:382 msgid "Farmer in canton Glarus" msgstr "Bauern im Kanton Glarus" -#: templates/alplora/index.html:389 +#: alplora/templates/alplora/index.html:388 msgid "" "\"Alplora is exactly what I was waiting for. I have lost my sheep almost " "every year. Finally I have a way when I want to locate them.\"" @@ -256,11 +305,11 @@ msgstr "" "Schafe fastjedes Jahr aus den Augen verloren. Nun habe ich endlich die " "Möglichkeit, sie zulokalisieren.\"" -#: templates/alplora/index.html:392 +#: alplora/templates/alplora/index.html:391 msgid "Owner of 50 sheep " msgstr "Besitzerin von 50 Schafen" -#: templates/alplora/index.html:398 +#: alplora/templates/alplora/index.html:397 msgid "" "\"I have a farm down all the way down in the village and y goats are always " "freely grazing in the Alps. There are times that I am worried about them but " @@ -274,74 +323,30 @@ msgstr "" "noch um meineanderen Tiere kümmern muss. Mit Alplora kann ich nun ohne " "Probleme beides tun.\"" -#: templates/alplora/index.html:402 +#: alplora/templates/alplora/index.html:401 msgid "Farmer at Berner Oberland" msgstr "Bauer aus dem Berner Oberland" -#: templates/alplora/index.html:419 +#: alplora/templates/alplora/index.html:418 msgid "How do I get Alplora?" msgstr "Wie kriege ich Zugriff zu Alplora?" -#: templates/alplora/index.html:420 +#: alplora/templates/alplora/index.html:419 msgid "Click the button below and leave us your contact." msgstr "Klicke unten auf Kontakt und hinterlasse uns deine Angaben." -#: templates/alplora/index.html:420 +#: alplora/templates/alplora/index.html:419 msgid "Team Alplora will contact you and visit you with a tracking device." msgstr "Das Alpora Team wird sich mit Dir schnellstens in Verbindung setzen." -#: templates/alplora/index.html:437 -msgid "New message" -msgstr "Neue Nachricht" - -#: templates/alplora/index.html:445 -msgid "Name:" -msgstr "Name:" - -#: templates/alplora/index.html:446 -msgid "What is your name ?" -msgstr "Was ist Dein Name?" - -#: templates/alplora/index.html:449 -msgid "From:" -msgstr "Von:" - -#: templates/alplora/index.html:450 -msgid "You email" -msgstr "Deine Email" - -#: templates/alplora/index.html:454 -msgid "Message:" -msgstr "Nachricht:" - -#: templates/alplora/index.html:455 -msgid "Leave us your message" -msgstr "Schreibe hier Deine Nachricht" - -#: templates/alplora/index.html:460 -msgid "Close" -msgstr "schliessen" - -#: templates/alplora/index.html:461 -msgid "Send message" -msgstr "Nachricht senden" - -#: templates/alplora/index.html:474 -msgid "Message Sent" -msgstr "Nachricht gesendet" - -#: templates/alplora/index.html:477 -msgid "Thank you, we will contact you as soon as possible" -msgstr "Dankeschön! Wir melden uns sobald wie möglich!" - -#: templates/alplora/index.html:509 +#: alplora/templates/alplora/index.html:459 msgid "Home" msgstr "Startseite" -#: templates/alplora/index.html:522 +#: alplora/templates/alplora/index.html:472 msgid "Testimonials " msgstr "Referenzen" -#: views.py:14 +#: alplora/views.py:24 msgid "Message Successfully Sent" msgstr "" diff --git a/cms_templates/djangocms_blog/_header_post_detail.html b/cms_templates/djangocms_blog/_header_post_detail.html index 2fa8697e..909b8427 100644 --- a/cms_templates/djangocms_blog/_header_post_detail.html +++ b/cms_templates/djangocms_blog/_header_post_detail.html @@ -17,7 +17,7 @@ {% render_model post "abstract" "" "" 'truncatewords_html:10' %} - Posted on {{ post.date_published|date:"DATE_FORMAT" }} + {% trans "Posted on"%} {{ post.date_published|date:"DATE_FORMAT" }} diff --git a/configs/nginx.dynamicweb.conf b/configs/nginx.dynamicweb.conf deleted file mode 100644 index ba25debc..00000000 --- a/configs/nginx.dynamicweb.conf +++ /dev/null @@ -1,69 +0,0 @@ -user www-data; -worker_processes 2; -pid /var/run/nginx.pid; -daemon off; - -events { - worker_connections 512; - # multi_accept on; -} - -http { - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - server_tokens off; - port_in_redirect on; - - server_names_hash_bucket_size 128; - server_name_in_redirect off; - - client_max_body_size 60m; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - send_timeout 300; - client_body_timeout 300; - client_header_timeout 300; - - access_log /logs/access.log; - error_log /logs/error.log; - - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 6; - gzip_buffers 16 8k; - gzip_http_version 1.1; - gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - - upstream django { - server 127.0.0.1:8000; - } - - server { - listen 80 default; - server_name localhost; - location / { - proxy_pass http://django; - include proxy_params; - } - location /media/ { - root /data; - expires max; - access_log off; - } - location /static/ { - root /data; - expires max; - access_log off; - } - location ~ /\.ht { deny all; } - location ~ /\.hg { deny all; } - location ~ /\.svn { deny all; } - } -} diff --git a/configs/nginx.proxy.conf b/configs/nginx.proxy.conf deleted file mode 100644 index cee2e4c1..00000000 --- a/configs/nginx.proxy.conf +++ /dev/null @@ -1,25 +0,0 @@ -server { - listen 80; - server_name dynamicweb-staging.ungleich.ch; - - location /static { - alias /home/app/django/dynamicweb/static/; - } - - location /media { - alias /home/app/django/dynamicweb/media/; - } - - location / { - proxy_pass http://127.0.0.1:8000/; - proxy_pass_header Server; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-Host $host; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Scheme $scheme; - proxy_connect_timeout 600; - proxy_send_timeout 600; - proxy_read_timeout 600; - } -} diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 2ef22e79..db372410 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-06-06 23:53+0530\n" +"POT-Creation-Date: 2017-05-30 13:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,41 +18,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: templates/datacenterlight/beta_access.html:21 -msgid "Request Beta Access" -msgstr "Beantrage Beta-Zugang" +#: datacenterlight/templates/datacenterlight/beta_access.html:13 +msgid "Enter name" +msgstr "Name" -#: templates/datacenterlight/beta_success.html:9 -#, fuzzy -#| msgid "Request Beta Access" +#: datacenterlight/templates/datacenterlight/beta_access.html:17 +msgid "Enter email" +msgstr "E-Mail-Adresse" + +#: datacenterlight/templates/datacenterlight/beta_access.html:21 +msgid "Request Newsletter" +msgstr "Newsletter abonnieren" + +#: datacenterlight/templates/datacenterlight/beta_success.html:9 msgid "Request Sent" msgstr "Anfrage verschickt" -#: templates/datacenterlight/beta_success.html:12 -msgid "Thank you, we will contact you as soon as possible" -msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." +#: datacenterlight/templates/datacenterlight/beta_success.html:12 +msgid "" +"Thank you for your subscription! You will receive a confirmation mail from " +"our team" +msgstr "" +"Vielen dank für Ihre Anmeldung. Sie erhalten in kürze eine Bestätigungsmail " +"von unserem Team" -#: templates/datacenterlight/emails/request_access_confirmation.html:99 -#: templates/datacenterlight/emails/request_access_confirmation.txt:99 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:99 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:99 msgid "Thank you for your request." msgstr "Vielen Dank für Ihre Anfrage." -#: templates/datacenterlight/emails/request_access_confirmation.html:104 -#: templates/datacenterlight/emails/request_access_confirmation.txt:104 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:104 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:104 msgid "You are one step away from being our beta tester!" msgstr "" "Sie sind nur noch einen Schritt davon entfernt, unser Beta-Tester zu werden!" -#: templates/datacenterlight/emails/request_access_confirmation.html:105 -#: templates/datacenterlight/emails/request_access_confirmation.txt:105 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:105 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:105 msgid "" "Currently we are running our tests to make sure everything runs perfectly." msgstr "" "Momentan testen wir die Beta-Umgebung um sie für Ihren Gebrauch " "sicherzustellen." -#: templates/datacenterlight/emails/request_access_confirmation.html:106 -#: templates/datacenterlight/emails/request_access_confirmation.txt:106 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:106 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:106 msgid "" "In the meantime, we would like to ask you a little patience
until our " "team contacts you with beta access." @@ -60,95 +70,77 @@ msgstr "" "Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie " "daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld." -#: templates/datacenterlight/emails/request_access_confirmation.html:107 -#: templates/datacenterlight/emails/request_access_confirmation.txt:107 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:107 +#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:107 msgid "Thank you!" msgstr "Vielen Dank!" -#: templates/datacenterlight/index.html:62 -#: templates/datacenterlight/order.html:62 -#: templates/datacenterlight/pricing.html:62 -#: templates/datacenterlight/success.html:62 +#: datacenterlight/templates/datacenterlight/index.html:62 +#: datacenterlight/templates/datacenterlight/index.html:160 +#: datacenterlight/templates/datacenterlight/index.html:346 +#: datacenterlight/templates/datacenterlight/pricing.html:62 +#: datacenterlight/templates/datacenterlight/pricing.html:190 msgid "What is it" msgstr "Was ist es?" -#: templates/datacenterlight/index.html:65 -#: templates/datacenterlight/index.html:171 -#: templates/datacenterlight/index.html:331 -#: templates/datacenterlight/order.html:65 -#: templates/datacenterlight/order.html:198 -#: templates/datacenterlight/pricing.html:65 -#: templates/datacenterlight/pricing.html:201 -#: templates/datacenterlight/success.html:65 +#: datacenterlight/templates/datacenterlight/index.html:65 +#: datacenterlight/templates/datacenterlight/index.html:189 +#: datacenterlight/templates/datacenterlight/index.html:349 +#: datacenterlight/templates/datacenterlight/pricing.html:65 +#: datacenterlight/templates/datacenterlight/pricing.html:193 msgid "Scale out" msgstr "Skalierung" -#: templates/datacenterlight/index.html:68 -#: templates/datacenterlight/index.html:197 -#: templates/datacenterlight/index.html:334 -#: templates/datacenterlight/order.html:68 -#: templates/datacenterlight/order.html:201 -#: templates/datacenterlight/pricing.html:68 -#: templates/datacenterlight/pricing.html:204 -#: templates/datacenterlight/success.html:68 +#: datacenterlight/templates/datacenterlight/index.html:68 +#: datacenterlight/templates/datacenterlight/index.html:215 +#: datacenterlight/templates/datacenterlight/index.html:352 +#: datacenterlight/templates/datacenterlight/pricing.html:68 +#: datacenterlight/templates/datacenterlight/pricing.html:196 msgid "Reliable and light" msgstr "Zuverlässig und leicht" -#: templates/datacenterlight/index.html:71 -#: templates/datacenterlight/order.html:71 -#: templates/datacenterlight/pricing.html:71 -#: templates/datacenterlight/success.html:71 -msgid "Buy VM" -msgstr "VM Kaufen" +#: datacenterlight/templates/datacenterlight/index.html:71 +msgid "Order VM" +msgstr "VM bestellen" -#: templates/datacenterlight/index.html:74 -#: templates/datacenterlight/index.html:341 -#: templates/datacenterlight/order.html:74 -#: templates/datacenterlight/order.html:208 -#: templates/datacenterlight/pricing.html:74 -#: templates/datacenterlight/pricing.html:211 -#: templates/datacenterlight/success.html:74 +#: datacenterlight/templates/datacenterlight/index.html:74 +#: datacenterlight/templates/datacenterlight/index.html:359 +#: datacenterlight/templates/datacenterlight/pricing.html:74 +#: datacenterlight/templates/datacenterlight/pricing.html:203 msgid "Contact" msgstr "Kontakt" -#: templates/datacenterlight/index.html:109 +#: datacenterlight/templates/datacenterlight/index.html:127 msgid "Finally, an affordable VM hosting in Switzerland!" msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" -#: templates/datacenterlight/index.html:113 +#: datacenterlight/templates/datacenterlight/index.html:131 msgid "What is it?" msgstr "Was ist es?" -#: templates/datacenterlight/index.html:116 +#: datacenterlight/templates/datacenterlight/index.html:134 msgid "I want it!" msgstr "Das will ich haben!" -#: templates/datacenterlight/index.html:142 -#: templates/datacenterlight/index.html:328 -#: templates/datacenterlight/order.html:195 -#: templates/datacenterlight/pricing.html:198 -msgid "How it works" -msgstr "Wie es funktioniert" - -#: templates/datacenterlight/index.html:147 +#: datacenterlight/templates/datacenterlight/index.html:165 msgid "Reuse existing factory halls intead of building an expensive building." msgstr "" "Nachhaltigkeit: Wiederverwendung ehemaliger Fabrikhallen an Stelle der " "Errichtung eines neuen Gebäudes" -#: templates/datacenterlight/index.html:150 +#: datacenterlight/templates/datacenterlight/index.html:168 msgid "Being creative, using modern and alternative design for a datacenter." msgstr "" "Kreativität: Verwendung eines modernen und alternativen Designs für unser " "Datencenter" -#: templates/datacenterlight/index.html:152 +#: datacenterlight/templates/datacenterlight/index.html:170 msgid "Being open: Using FOSS exclusively, we can save money for licenses." msgstr "" "Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, " "erspart Lizenzgebühren" -#: templates/datacenterlight/index.html:174 +#: datacenterlight/templates/datacenterlight/index.html:192 msgid "" "We don't use special hardware. We use commodity hardware: we buy computers " "that you buy. Just many more and put them in a cozy home for computers " @@ -158,7 +150,7 @@ msgstr "" "erschwingliche Systeme. Bei grösserer Auslastung werden mehr Standard " "komponenten hinzugekauft und skalieren so das Datencenter." -#: templates/datacenterlight/index.html:200 +#: datacenterlight/templates/datacenterlight/index.html:218 msgid "" "Our VMs are located in Switzerland, with reliable power supply and fast " "internet connection. Our VM costs less thanks to our featherlight " @@ -168,106 +160,123 @@ msgstr "" "Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser " "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." -#: templates/datacenterlight/index.html:218 -#: templates/datacenterlight/order.html:101 -#: templates/datacenterlight/pricing.html:101 +#: datacenterlight/templates/datacenterlight/index.html:236 +#: datacenterlight/templates/datacenterlight/pricing.html:106 msgid "We are cutting down the costs significantly!" msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" -#: templates/datacenterlight/index.html:219 +#: datacenterlight/templates/datacenterlight/index.html:237 msgid "Affordable VM hosting based in Switzerland" msgstr "Bezahlbares VM Hosting in der Schweiz" -#: templates/datacenterlight/index.html:220 +#: datacenterlight/templates/datacenterlight/index.html:238 msgid "More Info" msgstr "Weitere Informationen" -#: templates/datacenterlight/index.html:227 -#: templates/datacenterlight/order.html:114 -#: templates/datacenterlight/pricing.html:114 +#: datacenterlight/templates/datacenterlight/index.html:245 +#: datacenterlight/templates/datacenterlight/pricing.html:119 msgid "VM hosting" -msgstr "" +msgstr "VM Hosting" -#: templates/datacenterlight/index.html:234 +#: datacenterlight/templates/datacenterlight/index.html:252 msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: templates/datacenterlight/index.html:243 -#, fuzzy -#| msgid "15 GB Storage (SSD)" +#: datacenterlight/templates/datacenterlight/index.html:261 msgid "10 GB Storage (SSD)" -msgstr "15 GB Storage (SSD)" +msgstr "10 GB Storage (SSD)" -#: templates/datacenterlight/index.html:246 -#: templates/datacenterlight/order.html:166 -#: templates/datacenterlight/pricing.html:166 +#: datacenterlight/templates/datacenterlight/index.html:264 +#: datacenterlight/templates/datacenterlight/pricing.html:161 msgid "Order Now!" msgstr "Bestelle jetzt!" -#: templates/datacenterlight/index.html:262 -#| msgid "I want to try!" -msgid "I want to have it!" -msgstr "Das möchte ich haben" +#: datacenterlight/templates/datacenterlight/index.html:280 +msgid "Want to know more? Subscribe to our newsletter!" +msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" -#: templates/datacenterlight/index.html:289 +#: datacenterlight/templates/datacenterlight/index.html:307 msgid "Switzerland " msgstr "Schweiz" -#: templates/datacenterlight/index.html:306 +#: datacenterlight/templates/datacenterlight/index.html:324 msgid "Questions?" msgstr "Fragen?" -#: templates/datacenterlight/index.html:306 +#: datacenterlight/templates/datacenterlight/index.html:324 msgid "Contact us!" msgstr "Kontaktiere uns!" -#: templates/datacenterlight/index.html:324 -#: templates/datacenterlight/order.html:191 -#: templates/datacenterlight/pricing.html:194 +#: datacenterlight/templates/datacenterlight/index.html:342 +#: datacenterlight/templates/datacenterlight/pricing.html:186 msgid "Home" msgstr "Home" -#: templates/datacenterlight/index.html:337 -#: templates/datacenterlight/order.html:204 -#: templates/datacenterlight/pricing.html:207 +#: datacenterlight/templates/datacenterlight/index.html:355 +#: datacenterlight/templates/datacenterlight/pricing.html:199 msgid "Pricing" msgstr "Preise" -#: templates/datacenterlight/order.html:122 -#: templates/datacenterlight/pricing.html:122 -#, fuzzy -#| msgid "Based in Switzerland" +#: datacenterlight/templates/datacenterlight/pricing.html:71 +msgid "Buy VM" +msgstr "VM Kaufen" + +#: datacenterlight/templates/datacenterlight/pricing.html:127 msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: templates/datacenterlight/order.html:139 -#: templates/datacenterlight/pricing.html:139 +#: datacenterlight/templates/datacenterlight/pricing.html:144 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: templates/datacenterlight/order.html:173 -#: templates/datacenterlight/pricing.html:176 +#: datacenterlight/templates/datacenterlight/pricing.html:168 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" +"Simpel und bezahlbar: Testen Sie unsere virtuelen Machinen mit " +"federleichten Preisen" -#: templates/datacenterlight/success.html:101 -msgid "Thank you for order! Our team will contact you via email" +#: datacenterlight/templates/datacenterlight/pricing.html:171 +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 "" -"Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit " -"Ihnen via E-Mail in Verbindung." +"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!" -#: templates/datacenterlight/success.html:103 -msgid "as soon as possible!" -msgstr "" +#~ msgid "How it works" +#~ msgstr "Wie es funktioniert" -#~ msgid "Want to know more? Subscribe to our newsletter!" -#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" +#~ msgid "Our VMs are hosted in Glarus, Switzerland." +#~ msgstr "Standort des Datacenters ist in der Schweiz" + +#~ msgid "" +#~ " WARNING: We are currently running in BETA mode. We hope you won't " +#~ "encounter any hiccups, but if you do, please let us know at " +#~ "support@datacenterlight.ch" +#~ msgstr "" +#~ " Achtung: Wir befinden uns zurzeit im Beta-Release. Wir hoffen, dass Sie " +#~ "davon nichts mitbekommen, falls doch melden Sie sich bitte via " +#~ "support@datacenterlight.ch" + +#~ msgid "Request Beta Access" +#~ msgstr "Beantrage Beta-Zugang" + +#~ msgid "Thank you, we will contact you as soon as possible" +#~ msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" -#~ msgid "How it works:" -#~ msgstr "Warum können wir diese Leistung so günstig anbieten:" +#~ msgid "I want to try!" +#~ msgstr "Das möchte ich haben" #~ msgid "Email address" #~ msgstr "E-Mail Adresse" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 24264a39..ad9a9198 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -136,7 +136,7 @@ h6 { cursor: pointer; } .navbar-right { - margin-right: 0px; + margin-right: 10px; } .navbar-default .btn-link { color: #fff; @@ -144,6 +144,52 @@ h6 { .navbar-default .btn-link:hover { color: #fff !important; } +.nav-language{ + position: relative; +} +.nav-language .select-language{ + padding: 15px 10px; + color: #777; +} +.navbar-transparent .nav-language .select-language{ + color: #fff; +} + +.nav-language .select-language span{ + margin-left: 5px; + margin-right: 5px; + +} +.nav-language .drop-language{ + position: absolute; + top: 45px; + left: -8px; + background: #fff; + width: 100px; + height: 40px; + padding: 9px 10px; + -webkit-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1); + -moz-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1); + box-shadow: -8px 13px 31px -8px rgba(77,77,77,1); + display: none; + z-index: 100; + /* margin-left: 10px; */ + text-align: center; + border-radius: 4px; +} +.nav-language .drop-language a{ + cursor: pointer; +} +.navbar-transparent .nav-language .drop-language{ + background: transparent; + border: 1px solid #fff; +} +.navbar-transparent .nav-language .drop-language a{ + color: #fff; +} +.nav-language:hover .drop-language{ + display: block; +} .intro-header { height: 100vh; text-align: center; @@ -699,6 +745,14 @@ h6 { margin-bottom: 20px; padding: 0; } + .intro-pricing .intro-message .section-heading { + font-size: 35px; + width: 80%; + margin: 0 auto; + } + .intro-pricing .intro-message { + padding-bottom: 0; + } ul.intro-social-buttons > li:last-child { margin-bottom: 0; @@ -722,6 +776,23 @@ h6 { font-size: 15px; color: #777; } + .nav-language:hover{ + height: 80px; + } + .navbar-transparent .nav-language .select-language { + color: #777; + } + .navbar-transparent .nav-language .drop-language a { + color: #777; + } + .navbar-transparent .nav-language .drop-language { + background: #fff; + /* border: 1px solid #fff; */ + z-index: 100000; + left: 9px; + border: 1px solid rgba(119, 119, 119, 0.4); + box-shadow: none; + } .split-section { padding: 10px 0; } diff --git a/datacenterlight/templates/datacenterlight/beta_access.html b/datacenterlight/templates/datacenterlight/beta_access.html index b1bdfe21..1552a1c0 100644 --- a/datacenterlight/templates/datacenterlight/beta_access.html +++ b/datacenterlight/templates/datacenterlight/beta_access.html @@ -10,15 +10,15 @@
- + {{ form.name.errors|striptags}}
- + {{ form.email.errors|striptags}}
- + @@ -174,8 +184,9 @@ + + - diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html index ac72046c..b2257934 100644 --- a/hosting/templates/hosting/create_virtual_machine.html +++ b/hosting/templates/hosting/create_virtual_machine.html @@ -21,7 +21,7 @@
{% csrf_token %}
- Select VM Template: + {% trans "Select VM Template:" %}
- Select VM Configuration: + {% trans "Select VM Configuration:" %} diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index 3f3a60b7..e06099bd 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -3,12 +3,16 @@ {% load staticfiles bootstrap3%} {% block content %} -