diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 029137b1..935c625e 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/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-12-22 01:00+0530\n" +"POT-Creation-Date: 2017-12-23 04:12+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" @@ -157,8 +157,37 @@ msgstr "Copyright © ungleich GmbH" msgid "ungleich Home" msgstr "ungleich Home" -msgid "We Design, Configure & Maintain<br>Your Linux Infrastructure " -msgstr "Wir designen, erstellen und warten<br>Ihre Linux-Infrastruktur" +msgid "Hosting" +msgstr "Hosting" + +msgid "" +"Ruby on Rails. Java hosting, Django hosting, we make it everything run " +"smooth and safe." +msgstr "" +"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen " +"reibungslosen Ablauf" + +msgid "Configuration as a Service" +msgstr "Konfiguration als Service" + +msgid "" +"Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that " +"needs to configured, we provide comprehensive solutions. Amazon, rackspace " +"or bare metal servers, we configure for you." +msgstr "" +"Ruby on Rails, Django, Java, Webserver, Mailserver, jegliche Infrastruktur " +"welche eine Konfiguration braucht, wir offerieren umfassende Lösungen, " +"Amazon, Rackspace oder Bare Metal Servers, wir konfigurieren alles." + +msgid "Linux System Engineering" +msgstr "Linux System Engineering" + +msgid "" +"Let your developers develop! We take care of your system administration. " +"Gentoo, Archlinux, Debian, Ubuntu, and many more." +msgstr "" +"Lassen sie ihre Entwickler entwickeln! Wir kümmern uns um ihre " +"Systemadministration. Gentoo, Archlinux, Debian, Ubuntu und viele mehr." msgid "Our Products" msgstr "Unsere Produkte" @@ -216,38 +245,6 @@ msgstr "" "Unser erstklassiges Konfigurationsmanagement ist erfrischend einfach und " "zuverlässig." -msgid "Hosting" -msgstr "Hosting" - -msgid "" -"Ruby on Rails. Java hosting, Django hosting, we make it everything run " -"smooth and safe." -msgstr "" -"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen " -"reibungslosen Ablauf" - -msgid "Configuration as a Service" -msgstr "Konfiguration als Service" - -msgid "" -"Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that " -"needs to configured, we provide comprehensive solutions. Amazon, rackspace " -"or bare metal servers, we configure for you." -msgstr "" -"Ruby on Rails, Django, Java, Webserver, Mailserver, jegliche Infrastruktur " -"welche eine Konfiguration braucht, wir offerieren umfassende Lösungen, " -"Amazon, Rackspace oder Bare Metal Servers, wir konfigurieren alles." - -msgid "Linux System Engineering" -msgstr "Linux System Engineering" - -msgid "" -"Let your developers develop! We take care of your system administration. " -"Gentoo, Archlinux, Debian, Ubuntu, and many more." -msgstr "" -"Lassen sie ihre Entwickler entwickeln! Wir kümmern uns um ihre " -"Systemadministration. Gentoo, Archlinux, Debian, Ubuntu und viele mehr." - msgid "Why ungleich?*" msgstr "Warum ungleich?" @@ -363,6 +360,9 @@ msgid "If you have any question, just send us an email." msgstr "" "Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail." +#~ msgid "We Design, Configure & Maintain<br>Your Linux Infrastructure " +#~ msgstr "Wir designen, erstellen und warten<br>Ihre Linux-Infrastruktur" + #~ msgid "Hosting Products " #~ msgstr "Hosting Produkte" diff --git a/ungleich_page/migrations/0017_auto_20171219_1856.py b/ungleich_page/migrations/0017_auto_20171219_1856.py index 14c137a9..f5d76c50 100644 --- a/ungleich_page/migrations/0017_auto_20171219_1856.py +++ b/ungleich_page/migrations/0017_auto_20171219_1856.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): blank=True, help_text='Text for the button, if a link is provided.', max_length=50, null=True)), ('heading', models.CharField( blank=True, help_text='An optional title for this slide.', max_length=100, null=True)), - ('video', filer.fields.file.FilerFileField(blank=True, help_text='Leavig this blank will make the image as the background.', + ('video', filer.fields.file.FilerFileField(blank=True, help_text='Leaving this blank will make the image as the background.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_item_video', to='filer.File')), ], options={ diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 88f8a023..2d1660e8 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -93,19 +93,6 @@ </div> </div> </li> - <li class="timeline-inverted"> - <div class="timeline-image"> - <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/2017a.jpg' %}"> - </div> - <div class="timeline-panel wow slideInRight"> - <div class="timeline-heading"> - <h4>2017</h4> - </div> - <div class="timeline-body"> - <p>{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}</p> - </div> - </div> - </li> <li class="timeline-inverted"> <div class="timeline-image"> <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/2017b.jpg' %}"> @@ -115,6 +102,7 @@ <h4>2017</h4> </div> <div class="timeline-body"> + <p>{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}</p> <p>{% blocktrans %}ungleich sells <a href="https://www.alplora.ch/de/">Alplora</a> to an IoT startup in canton Zürich.{% endblocktrans %}</p> <p>{% trans "ungleich showcases the most affordable Swiss VM hosting, Data Center Light." %}</p> </div> diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html index 4819ec1e..04bbce5d 100644 --- a/ungleich_page/templates/ungleich_page/includes/_header.html +++ b/ungleich_page/templates/ungleich_page/includes/_header.html @@ -18,11 +18,8 @@ </video> </div> <div class="container"> - <div class="intro-cap"> - {% trans "We Design, Configure & Maintain<br>Your Linux Infrastructure " %} - </div> - <p class="intro_lead">Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you.</p> - <a class="btn btn-trans" href="">Learn More</a> + <div class="intro-cap">{% trans "Hosting" %}</div> + <p class="intro_lead">{% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}</p> </div> </div> <div class="item"> @@ -33,11 +30,9 @@ </video> </div> <div class="container"> - <div class="intro-cap"> - {% trans "We Design, Configure & Maintain<br>Your Linux Infrastructure " %} - </div> - <p class="intro_lead">Ruby on Rails, Django, Nothing else.</p> - <a class="btn btn-trans" href="">Learn More</a> + <div class="intro-cap">{% trans "Configuration as a Service" %}</div> + <p class="intro_lead">{% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}</p> + <!-- <a class="btn btn-trans" href="">Learn More</a> --> </div> </div> <div class="item"> @@ -47,10 +42,8 @@ </video> </div> <div class="container"> - <div class="intro-cap"> - {% trans "We Design, Configure & Maintain<br>Your Linux Infrastructure " %} - </div> - <a class="btn btn-trans" href="">Learn More</a> + <div class="intro-cap">{% trans "Linux System Engineering" %}</div> + <p class="intro_lead">{% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}</p> </div> </div> </div>