diff --git a/zsite/locale/ru/LC_MESSAGES/django.mo b/zsite/locale/ru/LC_MESSAGES/django.mo index bd70e80..0081838 100644 Binary files a/zsite/locale/ru/LC_MESSAGES/django.mo and b/zsite/locale/ru/LC_MESSAGES/django.mo differ diff --git a/zsite/locale/ru/LC_MESSAGES/django.po b/zsite/locale/ru/LC_MESSAGES/django.po index 7aadcfe..d213498 100644 --- a/zsite/locale/ru/LC_MESSAGES/django.po +++ b/zsite/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-07 22:29+0300\n" +"POT-Creation-Date: 2016-08-04 00:08+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Alexander Kondratev \n" "Language-Team: Zuykov and partners\n" @@ -76,7 +76,7 @@ msgstr "" msgid "Form" msgstr "" -#: djangocms_forms/conf.py:27 djangocms_forms/settings.py:20 +#: djangocms_forms/conf.py:27 djangocms_forms/settings.py:20 promo/models.py:24 msgid "Text" msgstr "" @@ -86,6 +86,7 @@ msgstr "" #: djangocms_forms/conf.py:29 djangocms_forms/settings.py:22 #: zsite/templates/form_template/consultation.html:38 +#: zsite/templates/form_template/order_modal.html:42 msgid "Email" msgstr "По почте" @@ -95,6 +96,7 @@ msgstr "" #: djangocms_forms/conf.py:31 djangocms_forms/settings.py:24 #: zsite/templates/form_template/consultation.html:55 +#: zsite/templates/form_template/order_modal.html:59 #, fuzzy #| msgid "Phone:" msgid "Phone" @@ -181,50 +183,51 @@ msgstr "" msgid "Please select an option" msgstr "" -#: djangocms_forms/forms.py:372 +#: djangocms_forms/forms.py:384 msgid "CSV" msgstr "" -#: djangocms_forms/forms.py:373 +#: djangocms_forms/forms.py:385 msgid "JSON" msgstr "" -#: djangocms_forms/forms.py:374 +#: djangocms_forms/forms.py:386 msgid "YAML" msgstr "" -#: djangocms_forms/forms.py:375 +#: djangocms_forms/forms.py:387 msgid "Microsoft Excel" msgstr "" -#: djangocms_forms/forms.py:379 +#: djangocms_forms/forms.py:391 msgid "Select a Form" msgstr "" -#: djangocms_forms/forms.py:380 +#: djangocms_forms/forms.py:392 msgid "Please select a form." msgstr "" -#: djangocms_forms/forms.py:381 +#: djangocms_forms/forms.py:393 msgid "" "Select the form you would like to export entry data from. You may only " "export data from one form at a time." msgstr "" -#: djangocms_forms/forms.py:385 djangocms_forms/forms.py:386 +#: djangocms_forms/forms.py:397 djangocms_forms/forms.py:398 msgid "Fields" msgstr "" -#: djangocms_forms/forms.py:388 +#: djangocms_forms/forms.py:400 msgid "From date" msgstr "" -#: djangocms_forms/forms.py:390 +#: djangocms_forms/forms.py:402 msgid "To date" msgstr "" #: djangocms_forms/models.py:19 #: zsite/templates/form_template/consultation.html:27 +#: zsite/templates/form_template/order_modal.html:31 msgid "Name" msgstr "Имя" @@ -444,37 +447,29 @@ msgstr "" msgid "Invalid form data, one or more fields had errors" msgstr "" -#: service/cms_app.py:11 zsite/templates/form_template/consultation.html:10 -#, fuzzy -#| msgid "Our Services" -msgid "Service" -msgstr "Наши услуги" - -#: service/cms_appconfig.py:22 -msgid "application title" +#: promo/cms_plugins.py:11 +msgid "Promos" msgstr "" -#: service/cms_appconfig.py:26 -msgid "Category slug" +#: promo/cms_plugins.py:12 +msgid "Promo Plugin" msgstr "" -#: service/cms_appconfig.py:29 -msgid "Only category to display" +#: promo/models.py:15 +msgid "page" msgstr "" -#: service/cms_appconfig.py:67 -msgid "untitled" +#: promo/models.py:18 +msgid "A link to a page has priority over a text link." msgstr "" -#: service/cms_appconfig.py:72 -msgid "Post published by default" +#: promo/models.py:30 +msgid "promo" msgstr "" -#: service/cms_plugins.py:23 service/cms_plugins.py:46 -#, fuzzy -#| msgid "Our Services" -msgid "Context Services" -msgstr "Наши услуги" +#: promo/models.py:31 +msgid "promos" +msgstr "" #: smartsnippets/models.py:27 msgid "Template code" @@ -535,6 +530,7 @@ msgid "Save" msgstr "" #: smartsnippets/templates/smartsnippets/plugin_change_form.html:135 +#: zsite/templates/form_template/consultation.html:80 msgid "Cancel" msgstr "" @@ -554,32 +550,49 @@ msgstr "доступно обо всём расскажет" msgid "Our Team" msgstr "Наши сотрудники" -#: zsite/templates/base.html:29 -msgid "Intellectual Property Protection" -msgstr "Защита интеллектуальной собственности" - -#: zsite/templates/base.html:71 +#: zsite/templates/base.html:82 msgid "— There is nothing impossible. Almost nothing" msgstr "— Защищаем две части целого: идею и право" +#: zsite/templates/form_template/angular.html:88 +#: zsite/templates/form_template/product_class.html:165 +#: zsite/templates/form_template/wizard.html:44 +msgid "" +"\n" +"

Submission successful

\n" +"

Thank You! Your form has been successfully submitted!\n" +" " +msgstr "" + +#: zsite/templates/form_template/consultation.html:10 +#, fuzzy +#| msgid "Our Services" +msgid "Service" +msgstr "Наши услуги" + #: zsite/templates/form_template/consultation.html:33 +#: zsite/templates/form_template/order_modal.html:37 msgid "We can call you or anwser by email" msgstr "Мы можем вам позвонить или ответить письмом" #: zsite/templates/form_template/consultation.html:36 +#: zsite/templates/form_template/order_modal.html:40 msgid "Call" msgstr "Связаться по телефону" #: zsite/templates/form_template/consultation.html:48 +#: zsite/templates/form_template/order_modal.html:52 msgid "Question" msgstr "Ваш вопрос" #: zsite/templates/form_template/consultation.html:62 +#: zsite/templates/form_template/order_modal.html:66 msgid "Subject" msgstr "Тема" -#: zsite/templates/form_template/consultation.html:86 -#: zsite/templates/form_template/order_modal.html:75 +#: zsite/templates/form_template/consultation.html:88 +#: zsite/templates/form_template/order_modal.html:90 msgid "" "\n" "

Submission successful

\n" @@ -596,23 +609,21 @@ msgstr "Каталог классов" msgid "All Classes" msgstr "Все классы" -#: zsite/templates/form_template/product_class.html:165 -#: zsite/templates/form_template/wizard.html:44 -msgid "" -"\n" -"

Submission successful

\n" -"

Thank You! Your form has been successfully submitted!\n" -" " -msgstr "" - -#: zsite/templates/language_chooser.html:6 +#: zsite/templates/language_chooser.html:8 msgid "Change to language:" msgstr "Изменить язык на:" #: zsite/templates/menu_header.html:4 msgid "Our Services" -msgstr "Наши услуги" +msgstr "Услуги и цены" + +#, fuzzy +#~| msgid "Our Services" +#~ msgid "Context Services" +#~ msgstr "Наши услуги" + +#~ msgid "Intellectual Property Protection" +#~ msgstr "Защита интеллектуальной собственности" #~ msgid "Worldwide" #~ msgstr "По всей России" diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less index e055ab4..ba3fa6b 100644 --- a/zsite/static/less/header.less +++ b/zsite/static/less/header.less @@ -162,16 +162,14 @@ .header-menu-font { font-family: @font-family-monospace; + + span { + display: inline-block; + } + + .header-menu-services { + margin-right: 15px; - .header-menu-contacts { - margin-left: 15px; - @media (min-width: 0) { - display: inline-block; - } - - @media (min-width: @screen-phone) { - display: none; - } } } diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 1352807..7ede651 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -49,6 +49,7 @@

{% static_placeholder 'consultation' %} diff --git a/zsite/templates/menu_header.html b/zsite/templates/menu_header.html index efb9909..2052ed8 100644 --- a/zsite/templates/menu_header.html +++ b/zsite/templates/menu_header.html @@ -1,7 +1,7 @@ {% load i18n menu_tags cms_tags cache %} {% if children|length > 1 %} -

{% trans 'Our Services' %} {% page_attribute "page_title" "contacts" %}

+

{% trans 'Our Services' %} {% page_attribute "page_title" "about" %}