resolve merge conflicts
This commit is contained in:
Tomislav R
commit
52ea4eec49
23 changed files with 393 additions and 834 deletions
Binary file not shown.
|
|
@ -20,105 +20,105 @@ msgstr ""
|
|||
|
||||
#: templates/ungleich_page/includes/_about.html:8
|
||||
msgid "ABOUT"
|
||||
msgstr ""
|
||||
msgstr "Über ungleich"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:9
|
||||
msgid "The timeline of ungleich"
|
||||
msgstr ""
|
||||
msgstr "Die Chronik von ungleich"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:24
|
||||
msgid "The first incarnation of ungleich"
|
||||
msgstr ""
|
||||
msgstr "Die erste Inkarnation von ungleich"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:25
|
||||
msgid "in Germany"
|
||||
msgstr ""
|
||||
msgstr "in Deutschland"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:37
|
||||
msgid "ungleich founded"
|
||||
msgstr ""
|
||||
msgstr "ungleich gegründet"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:38
|
||||
msgid "in Switzerland"
|
||||
msgstr ""
|
||||
msgstr "in der Schweiz"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:51
|
||||
msgid "ungleich present at various conferences"
|
||||
msgstr ""
|
||||
msgstr "ungleich präsent an mehreren Konferenzen"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:65
|
||||
msgid "ungleich introduces HA-Hosting"
|
||||
msgstr ""
|
||||
msgstr "ungleich führt HA-Hosting ein"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:66
|
||||
msgid "and introduces affordable 24X7 support."
|
||||
msgstr ""
|
||||
msgstr "und führt kostengünstigen 24X7 Support ein."
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:67
|
||||
msgid "ungleich launches"
|
||||
msgstr ""
|
||||
msgstr "ungleich lanciert"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:68
|
||||
msgid "Digital Glarus project"
|
||||
msgstr ""
|
||||
msgstr "Digital Glarus Projekt"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:74
|
||||
msgid "and"
|
||||
msgstr ""
|
||||
msgstr "und"
|
||||
|
||||
#: templates/ungleich_page/includes/_about.html:74
|
||||
msgid "the story continues!"
|
||||
msgstr ""
|
||||
msgstr "Die Geschichte geht weiter!"
|
||||
|
||||
#: templates/ungleich_page/includes/_contact_us.html:14
|
||||
#: templates/ungleich_page/includes/_contact_us.html:21 views.py:35
|
||||
msgid "Contact Us"
|
||||
msgstr "Kontaktiere Uns"
|
||||
msgstr "Kontaktieren Sie uns"
|
||||
|
||||
#: templates/ungleich_page/includes/_contact_us.html:16
|
||||
msgid "Join us at"
|
||||
msgstr ""
|
||||
msgstr "Schliessen Sie sich uns an"
|
||||
|
||||
#: templates/ungleich_page/includes/_contact_us.html:16
|
||||
msgid "Digital Glarus"
|
||||
msgstr ""
|
||||
msgstr "Digital Glarus"
|
||||
|
||||
#: templates/ungleich_page/includes/_contact_us.html:17
|
||||
msgid "a great co-working space in the middle of Alps!"
|
||||
msgstr ""
|
||||
msgstr "ein wunderschöner Co-Working Space mitten in den Alpen"
|
||||
|
||||
#: templates/ungleich_page/includes/_contact_us.html:17
|
||||
msgid "You can contact us at"
|
||||
msgstr ""
|
||||
msgstr "Sie können uns kontaktieren unter"
|
||||
|
||||
#: templates/ungleich_page/includes/_contact_us.html:20
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
msgstr "oder"
|
||||
|
||||
#: templates/ungleich_page/includes/_contact_us.html:50
|
||||
msgid "Submit"
|
||||
msgstr ""
|
||||
msgstr "Absenden"
|
||||
|
||||
#: templates/ungleich_page/includes/_footer.html:8
|
||||
msgid "Copyright © ungleich GmbH "
|
||||
msgstr ""
|
||||
msgstr "Copyright © ungleich GmbH"
|
||||
|
||||
#: templates/ungleich_page/includes/_footer.html:22
|
||||
msgid "ungleich Home"
|
||||
msgstr ""
|
||||
msgstr "ungleich Home"
|
||||
|
||||
#: templates/ungleich_page/includes/_header.html:11
|
||||
msgid "We Design, Configure & Maintain <br> Your Linux Infrastructure "
|
||||
msgstr ""
|
||||
msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur"
|
||||
|
||||
#: templates/ungleich_page/includes/_portfolio.html:8
|
||||
#: templates/ungleich_page/includes/_portfolio.html:9
|
||||
msgid "Hosting Products "
|
||||
msgstr ""
|
||||
msgstr "Hosting Produkte"
|
||||
|
||||
#: templates/ungleich_page/includes/_portfolio.html:16
|
||||
msgid "HA Hosting"
|
||||
msgstr ""
|
||||
msgstr "HA Hosting"
|
||||
|
||||
#: templates/ungleich_page/includes/_portfolio.html:18
|
||||
msgid ""
|
||||
|
|
@ -151,11 +151,11 @@ msgstr ""
|
|||
|
||||
#: templates/ungleich_page/includes/_services.html:8
|
||||
msgid "our services"
|
||||
msgstr ""
|
||||
msgstr "Unsere Dienstleistungen"
|
||||
|
||||
#: templates/ungleich_page/includes/_services.html:18
|
||||
msgid "Hosting"
|
||||
msgstr ""
|
||||
msgstr "Hosting"
|
||||
|
||||
#: templates/ungleich_page/includes/_services.html:20
|
||||
msgid ""
|
||||
|
|
@ -165,7 +165,7 @@ msgstr ""
|
|||
|
||||
#: templates/ungleich_page/includes/_services.html:28
|
||||
msgid "Configuration as a Service"
|
||||
msgstr ""
|
||||
msgstr "Konfiguration als Service"
|
||||
|
||||
#: templates/ungleich_page/includes/_services.html:30
|
||||
msgid ""
|
||||
|
|
@ -186,7 +186,7 @@ msgstr ""
|
|||
|
||||
#: templates/ungleich_page/includes/_team.html:8
|
||||
msgid "Why ungleich?*"
|
||||
msgstr ""
|
||||
msgstr "Warum ungleich?"
|
||||
|
||||
#: templates/ungleich_page/includes/_team.html:9
|
||||
msgid "What our customers say"
|
||||
|
|
@ -257,9 +257,8 @@ msgstr ""
|
|||
|
||||
#: views.py:25
|
||||
msgid "Message Successfully Sent"
|
||||
msgstr ""
|
||||
msgstr "Nachricht erfolgreich versendet"
|
||||
|
||||
#: views.py:36
|
||||
msgid "If you have any question, just send us an email."
|
||||
msgstr ""
|
||||
"Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail."
|
||||
msgstr "Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail."
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
{% load cms_tags menu_tags sekizai_tags staticfiles bootstrap3 %}
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<title>
|
||||
{% block title %}
|
||||
{% page_attribute "page_title" %}
|
||||
{% endblock %}
|
||||
</title>
|
||||
{% addtoblock "external-css" %}
|
||||
{% bootstrap_css %}
|
||||
|
||||
<link href='//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' rel="stylesheet" type="text/css">
|
||||
<link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
|
||||
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800'
|
||||
rel='stylesheet' type='text/css'>
|
||||
|
||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
||||
<!--[if lt IE 9]>
|
||||
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
|
||||
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
{% endaddtoblock %}
|
||||
|
||||
{% addtoblock "css" %}
|
||||
<link href="{% static 'blog.ungleich.ch/css/clean-blog.css' %}" type="text/css"
|
||||
rel="stylesheet" medial="all" />
|
||||
{% endaddtoblock %}
|
||||
{% block meta %}
|
||||
<meta charset="UTF-8">
|
||||
<meta name="description" content="{% page_attribute 'meta_description' %}">
|
||||
{% include 'meta.html' %}
|
||||
{% endblock %}
|
||||
{% render_block "external-css" %}
|
||||
{% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
|
||||
</head>
|
||||
<body>
|
||||
{% cms_toolbar %}
|
||||
{% show_menu 0 0 0 1 "cms/ungleichch/_menu.html" %}
|
||||
<!-- body -->
|
||||
<!-- Main Content -->
|
||||
{% block base_header %}
|
||||
{% include "ungleich_page/_header_base.html" %}
|
||||
{% endblock %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
|
||||
{% block base_content %}
|
||||
{% placeholder "default" %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end body -->
|
||||
{% include "cms/ungleichch/_footer.html" %}
|
||||
{% addtoblock "external-js" %}
|
||||
{% bootstrap_javascript %}
|
||||
{% endaddtoblock %}
|
||||
{% addtoblock "js" %}
|
||||
<script>
|
||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
||||
|
||||
ga('create', 'UA-62285904-4', 'auto');
|
||||
ga('send', 'pageview');
|
||||
|
||||
</script>
|
||||
|
||||
<script src="{% static 'blog.ungleich.ch/vendor/js/jquery.min.js' %}" type="text/javascript" />
|
||||
<script src="{% static 'blog.ungleich.ch/js/navbar-scroll-up.js' %}" type="text/javascript" />
|
||||
{% endaddtoblock %}
|
||||
{% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
|
||||
{% render_block "external-js" %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
{% extends "ungleich_page/base_ungleich.html" %}
|
||||
|
||||
{% block base_content %}
|
||||
<form action="{% url 'ungleich_page:contact' %}" method="post" >
|
||||
{% csrf_token %}
|
||||
<div class="row">
|
||||
<div autofocus class="form-group col-lg-4 {% if form.name.errors %}has-error text-danger{% endif %}">
|
||||
{{ form.name.label_tag }}
|
||||
{{ form.name }}
|
||||
{{ form.name.errors|striptags}}
|
||||
</div>
|
||||
<div class="form-group col-lg-4 {% if form.email.errors %}has-error text-danger {% endif %}">
|
||||
{{ form.email.label_tag }}
|
||||
{{ form.email }}
|
||||
{{ form.email.errors|striptags}}
|
||||
</div>
|
||||
<div class="form-group col-lg-4 {% if form.phone_number.errors %}has-error text-danger {% endif %}">
|
||||
{{ form.phone_number.label_tag }}
|
||||
{{ form.phone_number }}
|
||||
{{ form.phone_number.errors|striptags}}
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="form-group col-lg-12 {% if form.message.errors %}has-error text-danger {% endif %}">
|
||||
{{ form.message.label_tag }}
|
||||
{{ form.message }}
|
||||
{{ form.message.errors|striptags}}
|
||||
</div>
|
||||
{{ form.non_field_errors }}
|
||||
<div class="form-group col-lg-12">
|
||||
<input type="hidden" name="save" value="contact">
|
||||
<button type="submit" class="btn btn-default" {% if form.name.errors %} autofocus {% endif %}>Submit</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{% extends "base_glarus.html" %}
|
||||
{% block base_content %}
|
||||
{% endblock %}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{% extends "base_ungleich.html" %}
|
||||
{% load cms_tags %}
|
||||
{% block base_content %}
|
||||
{% placeholder "page_content" %}
|
||||
{% endblock %}
|
||||
|
|
@ -4,5 +4,6 @@ from django.utils.translation import ugettext_lazy as _
|
|||
|
||||
urlpatterns = [
|
||||
url(r'^$', LandingView.as_view(), name='landing'),
|
||||
url(r'^ungleich_page/?$', LandingView.as_view(), name='landing'),
|
||||
url(_(r'contact/$'), ContactView.as_view(), name='contact'),
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue