ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page

Browse source
This commit is contained in:
M.Ravi 2017-10-14 11:41:25 +02:00
commit e7882c0dec
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog
View file

@ -1,5 +1,6 @@
Next release: Next release:
* Bugfix: [dcl, hosting] Fix Stripe js error in confirm payment page * Bugfix: [dcl, hosting] Fix Stripe js error in confirm payment page
* #3847: [ungleich] change text 'hosting products' -> 'our products'
1.2.6: 2017-10-10 1.2.6: 2017-10-10
* Bugfix: [dcl] Refactor and optimize images, links in glasfaser page * Bugfix: [dcl] Refactor and optimize images, links in glasfaser page
* Bugfix: [dcl] Fix email not being sent issue * Bugfix: [dcl] Fix email not being sent issue

20
ungleich_page/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-10 21:35+0530\n" "POT-Creation-Date: 2017-10-13 02:21+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -145,8 +145,15 @@ msgstr "ungleich Home"
msgid "We Design, Configure &amp; Maintain <br> Your Linux Infrastructure " msgid "We Design, Configure &amp; Maintain <br> Your Linux Infrastructure "
msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur" msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur"
msgid "Hosting Products " msgid "Our Products"
msgstr "Hosting Produkte" msgstr "Unsere Produkte"
msgid ""
"Our products include an innovative datacenter,<br>affordable VM hosting, and "
"high speed fiber internet for canton Glarus."
msgstr ""
"Zu unseren Produkten gehört ein innovatives Rechenzentrum,<br>modernes VM-"
"Hosting und Glasfaser-Internet für den Kanton Glarus."
msgid "Data Center Light" msgid "Data Center Light"
msgstr "" msgstr ""
@ -177,8 +184,8 @@ msgid ""
"We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. " "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. "
"Experience 100 Mbit/s and see how speed can change everything." "Experience 100 Mbit/s and see how speed can change everything."
msgstr "" msgstr ""
"Wir bieten außerdem Hochgeschwindigkeitsfaser Internet in Glarus Süd, " "Wir bieten außerdem Hochgeschwindigkeitsfaser Internet in Glarus Süd, Glarus "
"Glarus und Glarus Nord. Surfen Sie mit 100 Mbit/s und erleben Sie, wie " "und Glarus Nord. Surfen Sie mit 100 Mbit/s und erleben Sie, wie "
"Geschwindigkeit alles ändern kann." "Geschwindigkeit alles ändern kann."
msgid "our services" msgid "our services"
@ -338,6 +345,9 @@ msgid "If you have any question, just send us an email."
msgstr "" msgstr ""
"Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail." "Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail."
#~ msgid "Hosting Products "
#~ msgstr "Hosting Produkte"
#~ msgid "HA Hosting" #~ msgid "HA Hosting"
#~ msgstr "HA Hosting" #~ msgstr "HA Hosting"

4
ungleich_page/templates/ungleich_page/includes/_portfolio.html
View file

@ -5,8 +5,8 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-12 text-center wow fadeInDown"> <div class="col-lg-12 text-center wow fadeInDown">
<h2 class="section-heading">{% trans "Hosting Products " %}</h2> <h2 class="section-heading">{% trans "Our Products" %}</h2>
<h3 class="section-subheading text-muted">{% trans "Hosting Products " %} </h3> <h3 class="section-subheading text-muted" style="line-height: 1.8;">{% blocktrans %}Our products include an innovative datacenter,<br>affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}</h3>
</div> </div>
</div> </div>
<div class="row"> <div class="row">