From 9ae2b94b441d3783d73e1da1d4eb69ea381b8712 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 12 Oct 2017 00:01:31 +0530 Subject: [PATCH 1/6] hosting products -> our products --- ungleich_page/locale/de/LC_MESSAGES/django.po | 13 ++++++++----- .../ungleich_page/includes/_portfolio.html | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 05ee80f2..5f0fd264 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-10-10 21:35+0530\n" +"POT-Creation-Date: 2017-10-11 23:59+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -145,8 +145,8 @@ msgstr "ungleich Home" msgid "We Design, Configure & Maintain
Your Linux Infrastructure " msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur" -msgid "Hosting Products " -msgstr "Hosting Produkte" +msgid "Our Products" +msgstr "Unsere Produkte" msgid "Data Center Light" msgstr "" @@ -177,8 +177,8 @@ msgid "" "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." msgstr "" -"Wir bieten außerdem Hochgeschwindigkeitsfaser Internet in Glarus Süd, " -"Glarus und Glarus Nord. Surfen Sie mit 100 Mbit/s und erleben Sie, wie " +"Wir bieten außerdem Hochgeschwindigkeitsfaser Internet in Glarus Süd, Glarus " +"und Glarus Nord. Surfen Sie mit 100 Mbit/s und erleben Sie, wie " "Geschwindigkeit alles ändern kann." msgid "our services" @@ -338,6 +338,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 "Hosting Products " +#~ msgstr "Hosting Produkte" + #~ msgid "HA Hosting" #~ msgstr "HA Hosting" diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index de27d731..9c32ae15 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -5,8 +5,8 @@
-

{% trans "Hosting Products " %}

-

{% trans "Hosting Products " %}

+

{% trans "Our Products" %}

+

{% trans "Our Products" %}

From 2d5acff4a89bf2d9e48d4bb842b08eb50d32f0c8 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 13 Oct 2017 01:55:36 +0530 Subject: [PATCH 2/6] sub heading text changed --- ungleich_page/locale/de/LC_MESSAGES/django.po | 7 +++++++ .../templates/ungleich_page/includes/_portfolio.html | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 5f0fd264..9708f0e1 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -148,6 +148,13 @@ msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur" msgid "Our Products" msgstr "Unsere Produkte" +msgid "" +"Our products include an innovative datacenter, affordable VM hosting, and " +"high speed fiber internet for canton Glarus." +msgstr "" +"Zu unseren Produkten gehört ein innovatives Rechenzentrum, modernes VM-Hosting " +"und Glasfaser-Internet für den Kanton Glarus." + msgid "Data Center Light" msgstr "" diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index 9c32ae15..c2568869 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -6,7 +6,7 @@

{% trans "Our Products" %}

-

{% trans "Our Products" %}

+

{% trans "Our products include an innovative datacenter, affordable VM hosting, and high speed fiber internet for canton Glarus." %}

From 0e0057c8ce43188fef40037508a3b329cbd8a916 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 13 Oct 2017 01:57:25 +0530 Subject: [PATCH 3/6] translation update --- ungleich_page/locale/de/LC_MESSAGES/django.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 9708f0e1..35c4c1b8 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-10-11 23:59+0530\n" +"POT-Creation-Date: 2017-10-13 01:56+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -152,8 +152,8 @@ msgid "" "Our products include an innovative datacenter, affordable VM hosting, and " "high speed fiber internet for canton Glarus." msgstr "" -"Zu unseren Produkten gehört ein innovatives Rechenzentrum, modernes VM-Hosting " -"und Glasfaser-Internet für den Kanton Glarus." +"Zu unseren Produkten gehört ein innovatives Rechenzentrum, modernes VM-" +"Hosting und Glasfaser-Internet für den Kanton Glarus." msgid "Data Center Light" msgstr "" From bb0b2f33a7453f3ad1ad372acb56d57f8123a6c3 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 13 Oct 2017 02:05:10 +0530 Subject: [PATCH 4/6] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index fdcb6053..74ba0160 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ Next release: * 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 * Bugfix: [dcl] Refactor and optimize images, links in glasfaser page * Bugfix: [dcl] Fix email not being sent issue From 2493536fb4988b9c4782885a462546a78b7e036f Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 13 Oct 2017 02:22:51 +0530 Subject: [PATCH 5/6] line break on subheading --- ungleich_page/locale/de/LC_MESSAGES/django.po | 7 +++---- .../templates/ungleich_page/includes/_portfolio.html | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 35c4c1b8..d1738f82 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-10-13 01:56+0530\n" +"POT-Creation-Date: 2017-10-13 02:21+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,11 +148,10 @@ msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur" msgid "Our Products" msgstr "Unsere Produkte" -msgid "" -"Our products include an innovative datacenter, affordable VM hosting, and " +"Our products include an innovative datacenter,
affordable VM hosting, and " "high speed fiber internet for canton Glarus." msgstr "" -"Zu unseren Produkten gehört ein innovatives Rechenzentrum, modernes VM-" +"Zu unseren Produkten gehört ein innovatives Rechenzentrum,
modernes VM-" "Hosting und Glasfaser-Internet für den Kanton Glarus." msgid "Data Center Light" diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index c2568869..0df3b4c2 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -6,7 +6,7 @@

{% trans "Our Products" %}

-

{% trans "Our products include an innovative datacenter, affordable VM hosting, and high speed fiber internet for canton Glarus." %}

+

{% blocktrans %}Our products include an innovative datacenter,
affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

From d250539adec63d725a255479d0257fb3fed37fa6 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 13 Oct 2017 02:24:29 +0530 Subject: [PATCH 6/6] minor fix --- ungleich_page/locale/de/LC_MESSAGES/django.po | 1 + 1 file changed, 1 insertion(+) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index d1738f82..78921c45 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -148,6 +148,7 @@ msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur" msgid "Our Products" msgstr "Unsere Produkte" +msgid "" "Our products include an innovative datacenter,
affordable VM hosting, and " "high speed fiber internet for canton Glarus." msgstr ""