Merge branch 'master' into task/3530/upgrade_to_django_1.11
This commit is contained in:
PCoder
commit
4069199252
18 changed files with 164 additions and 109 deletions
|
|
@ -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 05:18+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"
|
||||
|
|
@ -71,14 +71,14 @@ msgstr "Die Chronik von ungleich"
|
|||
msgid "The first incarnation of ungleich"
|
||||
msgstr "Die erste Inkarnation von ungleich"
|
||||
|
||||
msgid "in Germany"
|
||||
msgstr "in Deutschland"
|
||||
msgid "in Germany."
|
||||
msgstr "in Deutschland."
|
||||
|
||||
msgid "ungleich founded"
|
||||
msgstr "ungleich gegründet"
|
||||
|
||||
msgid "in Switzerland"
|
||||
msgstr "in der Schweiz"
|
||||
msgid "in Switzerland."
|
||||
msgstr "in der Schweiz."
|
||||
|
||||
msgid "ungleich present at various conferences"
|
||||
msgstr "ungleich präsent an mehreren Konferenzen"
|
||||
|
|
@ -107,7 +107,7 @@ msgstr "ungleich bietet einen PC-Grundkurs für Flüchtlinge an."
|
|||
|
||||
msgid ""
|
||||
"ungleich starts computer learning club for locals, \"Digitale Building "
|
||||
"ungleich.\""
|
||||
"ungleich\"."
|
||||
msgstr ""
|
||||
"ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige."
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ msgid ""
|
|||
"startup in canton Zürich."
|
||||
msgstr ""
|
||||
"ungleich verkauft das Projekt <a href=\"https://www.alplora.ch/de/"
|
||||
"\">AlpLora</a> an ein IoT-Startup aus dem Kanton Zürich"
|
||||
"\">AlpLora</a> an ein IoT-Startup aus dem Kanton Zürich."
|
||||
|
||||
msgid ""
|
||||
"ungleich showcases the most affordable Swiss VM hosting, Data Center Light."
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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={
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@ section h3.section-subheading {
|
|||
|
||||
@media(min-width:768px) {
|
||||
section {
|
||||
padding: 125px 0;
|
||||
padding: 80px 0;
|
||||
}
|
||||
section h2.section-heading {
|
||||
font-size: 40px;
|
||||
|
|
@ -985,4 +985,4 @@ section h3.section-comment {
|
|||
.carousel-author {
|
||||
height: 72px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,11 +220,11 @@
|
|||
</div>
|
||||
<div class="contact-details">
|
||||
<div class="subtitle">
|
||||
<h3>ungleich GmbH</h3>
|
||||
<h3>ungleich glarus ag</h3>
|
||||
</div>
|
||||
<div class="description">
|
||||
<p>glasfaser@ungleich.ch</p>
|
||||
<p>In der Au 7, Schwanden 8762</p>
|
||||
<p>Bahnhofstrasse 1, 8783 Linthal</p>
|
||||
<p>Switzerland</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>{% trans "The first incarnation of ungleich" %}</p>
|
||||
<p>{% trans "in Germany" %}</p>
|
||||
<p>{% trans "in Germany." %}</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>{% trans "ungleich founded" %} </p>
|
||||
<p>{% trans "in Switzerland" %}</p>
|
||||
<p>{% trans "in Switzerland." %}</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
<h4>2014</h4>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>{% trans "ungleich present at various conferences" %}: <br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a><br>
|
||||
<p>{% trans "ungleich present at various conferences" %}: <br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a>.<br>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
<p>{% trans "and introduces affordable 24X7 support." %}</p>
|
||||
<p>
|
||||
{% trans "ungleich launches" %}
|
||||
<a href="https://digitalglarus.ch">{% trans "Digital Glarus project" %}</a>
|
||||
<a href="https://digitalglarus.ch">{% trans "Digital Glarus project" %}</a>.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue