diff options
Diffstat (limited to 'locale/ru.UTF-8')
| -rw-r--r-- | locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po | 2850 |
1 files changed, 1639 insertions, 1211 deletions
diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index 4bba2ce1e..b3436c926 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"POT-Creation-Date: 2020-03-03 15:29+0000\n" "PO-Revision-Date: 2019-04-29 18:03+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n" "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n" @@ -20,23 +20,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:678 -#: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:714 +#: perllib/FixMyStreet/DB/Result/Problem.pm:716 +#: perllib/FixMyStreet/Script/Reports.pm:174 msgid " and " msgstr "и" -#: templates/web/base/js/translation_strings.html:50 -#: templates/web/base/report/new/category_extras.html:15 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/top_message_none.html:12 +#. ("JS") +#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/report/new/category_extras.html:17 +#: templates/web/base/report/new/councils_text_all.html:6 +#: templates/web/base/report/new/top_message_none.html:13 #: templates/web/base/report/new/top_message_none.html:15 +#: templates/web/base/report/new/top_message_some.html:10 #: templates/web/base/report/new/top_message_some.html:12 -#: templates/web/base/report/new/top_message_some.html:9 msgid " or " msgstr "или" -#: templates/web/base/report/_inspect.html:171 +#: templates/web/base/report/inspect/_extra_details_field.html:5 msgid "%d characters maximum" msgstr "" @@ -52,8 +53,10 @@ msgstr "%d по %d из %d" msgid "%d users already existed" msgstr "пользователей уже зарегистрировано" +#: templates/web/base/dashboard/heatmap.html:0 +#: templates/web/base/dashboard/heatmap.html:9 #: templates/web/base/reports/body.html:0 -#: templates/web/base/reports/body.html:24 +#: templates/web/base/reports/body.html:31 msgid "%s - Summary reports" msgstr "%s - Итоговые отчеты" @@ -76,7 +79,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s конт. органов местного самоуправления – %s подтвержд., %s неподтвержд." #. ("%s is the site name") -#: templates/web/base/alert/index.html:8 +#: templates/web/base/alert/_index_text.html:3 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -87,7 +90,7 @@ msgstr "" "может касаться как неисправностей в вашем районе, так и неполадок, которые были зафиксированы в пределах определенного расстояния от заданной точки." #. ("%s is the site name") -#: templates/web/base/alert/index.html:12 +#: templates/web/base/alert/_index_text.html:7 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -101,8 +104,8 @@ msgstr "" msgid "%s live updates" msgstr "%s обновлений" -#: templates/web/base/dashboard/index.html:164 -#: templates/web/base/dashboard/index.html:168 +#: templates/web/base/dashboard/index.html:166 +#: templates/web/base/dashboard/index.html:169 msgid "%s opened, %s closed, %s fixed" msgstr "" @@ -122,13 +125,13 @@ msgstr "© участники проекта <a href=\"http://www.openstreet msgid "(Defect & location of defect)" msgstr "(Повреждение и местоположение повреждения)" -#: templates/web/zurich/admin/report_edit-sdm.html:62 -#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit-sdm.html:50 +#: templates/web/zurich/admin/reports/edit.html:78 msgid "(No name)" msgstr "(имя отсутствует)" -#: templates/web/zurich/admin/report_edit-sdm.html:69 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit-sdm.html:57 +#: templates/web/zurich/admin/reports/edit.html:85 msgid "(No phone number)" msgstr "(номер телефона отсутствует)" @@ -140,7 +143,7 @@ msgstr "" msgid "(closed)" msgstr "(закрыто)" -#: templates/web/base/alert/_list.html:30 +#: templates/web/base/alert/_list_rss_local.html:8 msgid "(covers roughly 200,000 people)" msgstr "" @@ -148,10 +151,6 @@ msgstr "" msgid "(fixed)" msgstr "(исправлено)" -#: templates/web/base/admin/extra-metadata-form.html:63 -msgid "(ignored if type is \"String\")" -msgstr "" - #: templates/web/base/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(например: граффити, мусор в неположенных местах, поврежденная тротуарная плитка, разбитые уличные фонари)" @@ -178,13 +177,13 @@ msgid "(sent to both)" msgstr "(отправлено в обе инстанции)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") -#: templates/web/base/alert/_list.html:36 +#: templates/web/base/alert/_list.html:29 msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:386 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: templates/web/zurich/admin/bodies/form.html:27 msgid "-- Pick a category --" msgstr "-- Выберите категорию --" @@ -192,6 +191,11 @@ msgstr "-- Выберите категорию --" msgid "-- Pick an option --" msgstr "" +#: templates/web/base/contact/enquiry/index.html:35 +#, fuzzy +msgid "-- Please select --" +msgstr "Выберите учреждение." + #: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -212,11 +216,13 @@ msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/admin/triage/_list-filters.html:23 +#: templates/web/base/reports/_list-filters.html:39 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" -#: templates/web/base/js/translation_strings.html:101 +#. ("JS") +#: templates/web/base/js/translation_strings.html:104 msgid "<span>%s</span> saved." msgstr "" @@ -241,23 +247,29 @@ msgstr "<strong>Нет</strong> Я хочу подтвердить обновл msgid "<strong>No</strong> Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:200 -msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." -msgstr "" - -#: templates/web/base/report/_inspect.html:202 -msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." -msgstr "" - #: templates/web/base/report/form/user_loggedout_password.html:4 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> У меня есть пароль" +#. ("JS") +#: templates/web/base/js/translation_strings.html:78 +msgid "<u>Take or choose existing photo</u>" +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:12 +msgid "A service ID (Open311 or similar)." +msgstr "" + #: templates/web/base/report/new/form_user.html:8 msgid "About the problem" msgstr "" -#: templates/web/base/auth/generate_token.html:54 +#: perllib/FixMyStreet/App/Controller/Root.pm:128 +msgid "Access denied" +msgstr "" + +#: templates/web/base/auth/2fa/intro.html:20 +#: templates/web/base/auth/generate_token.html:61 msgid "Activate two-factor authentication" msgstr "" @@ -280,13 +292,18 @@ msgstr "" msgid "Add a contact using the form below." msgstr "Добавить контакт с помощью формы." +#: templates/web/base/admin/bodies/contact-form.html:101 +#, fuzzy +msgid "Add another parent category" +msgstr "Добавить категорию" + #: templates/web/base/admin/bodies/form.html:139 #: templates/web/base/admin/bodies/index.html:78 -#: templates/web/zurich/admin/bodies/form.html:51 +#: templates/web/zurich/admin/bodies/form.html:63 msgid "Add body" msgstr "Добавить учреждение" -#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:2 #: templates/web/base/auth/change_email.html:7 msgid "Add email address" msgstr "" @@ -295,7 +312,7 @@ msgstr "" msgid "Add extra fields" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:89 +#: templates/web/base/admin/extra-metadata-form.html:11 msgid "Add field" msgstr "" @@ -303,16 +320,16 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/base/admin/bodies/body.html:146 #: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Добавить категорию" -#: templates/web/base/admin/extra-metadata-form.html:82 +#: templates/web/base/admin/extra-metadata-item.html:87 msgid "Add option" msgstr "" -#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:2 #: templates/web/base/auth/change_phone.html:7 msgid "Add phone number" msgstr "" @@ -326,24 +343,25 @@ msgid "Add to shortlist" msgstr "" #: templates/web/base/admin/users/edit.html:4 -#: templates/web/base/admin/users/index.html:48 -#: templates/web/base/admin/users/index.html:51 +#: templates/web/base/admin/users/index.html:95 +#: templates/web/base/admin/users/index.html:98 msgid "Add user" msgstr "Добавить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:777 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:209 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:779 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:778 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:115 +#: templates/web/base/my/my.html:119 msgid "Added %s" msgstr "Добавлено: %s" @@ -351,7 +369,7 @@ msgstr "Добавлено: %s" msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" -#: templates/web/base/main_nav_items.html:55 +#: templates/web/base/main_nav_items.html:39 msgid "Admin" msgstr "" @@ -367,19 +385,20 @@ msgstr "Создано уведомление «%d» для: %s. Тип: %s, п msgid "Alert %d disabled (created %s)" msgstr "Уведомление «%d» отключено (создано: %s)" -#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/form/user_loggedout_by_email.html:46 #: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Оповещать меня об обновлениях в будущем" -#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/reports/edit.html:96 msgid "Alerts:" msgstr "" #: templates/web/base/dashboard/index.html:40 -#: templates/web/base/dashboard/index.html:51 -#: templates/web/base/dashboard/index.html:64 -#: templates/web/base/reports/_list-filters.html:4 +#: templates/web/base/dashboard/index.html:52 +#: templates/web/base/dashboard/index.html:65 +#: templates/web/base/reports/_list-filter-status.html:4 +#: templates/web/zurich/reports/_list-filter-status.html:2 msgid "All" msgstr "" @@ -392,8 +411,8 @@ msgid "All Reports as CSV" msgstr "Все обращения в виде CSV-файлов" #: templates/web/base/admin/category-multiselect.html:5 -#: templates/web/base/admin/responsepriorities/list.html:20 -#: templates/web/base/admin/templates.html:19 +#: templates/web/base/admin/responsepriorities/index.html:26 +#: templates/web/base/admin/templates/view.html:19 msgid "All categories" msgstr "" @@ -405,9 +424,9 @@ msgstr "" msgid "All languages" msgstr "" -#: templates/web/base/main_nav_items.html:0 -#: templates/web/base/main_nav_items.html:35 -#: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/base/navigation/_all_reports.html:0 +#: templates/web/base/navigation/_all_reports.html:12 +#: templates/web/zurich/admin/index-dm.html:14 #: templates/web/zurich/admin/stats/index.html:11 #: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 @@ -434,7 +453,17 @@ msgstr "" msgid "Always fetch all problems" msgstr "" -#: templates/web/base/questionnaire/index.html:31 +#: templates/web/base/admin/bodies/contact-form.html:10 +#: templates/web/base/admin/bodies/contact-form.html:16 +msgid "An email address or service ID (Open311 or similar)." +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:14 +#, fuzzy +msgid "An email address." +msgstr "новый адрес электронной почты" + +#: templates/web/base/questionnaire/index.html:33 msgid "An update marked this problem as fixed." msgstr "В обновлении эта неполадка помечена как исправленная." @@ -448,7 +477,7 @@ msgstr "Анонимно" msgid "Anonymous user" msgstr "" -#: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/reports/edit.html:135 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 #: templates/web/base/report/update/moderation_diff.html:5 @@ -460,24 +489,29 @@ msgstr "Анонимно:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#. ("JS") +#: templates/web/base/js/translation_strings.html:79 msgid "Are you sure you want to cancel this upload?" msgstr "" -#: templates/web/base/admin/report_edit.html:85 -#: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:96 -#: templates/web/base/report/display_tools.html:6 +#. ("JS") +#: templates/web/base/admin/manifesttheme/form.html:62 +#: templates/web/base/admin/reports/edit.html:85 +#: templates/web/base/admin/roles/form.html:25 +#: templates/web/base/admin/states/index.html:48 +#: templates/web/base/admin/templates/edit.html:88 +#: templates/web/base/js/translation_strings.html:99 +#: templates/web/base/report/display_tools.html:7 msgid "Are you sure?" msgstr "" #: templates/web/base/admin/bodies/body.html:21 #: templates/web/base/admin/bodies/form.html:77 -#: templates/web/zurich/admin/bodies/form.html:24 +#: templates/web/zurich/admin/bodies/form.html:36 msgid "Area covered" msgstr "Зона покрытия" -#: templates/web/base/admin/users/form.html:82 +#: templates/web/base/admin/users/form.html:85 msgid "Area:" msgstr "" @@ -486,28 +520,33 @@ msgstr "" msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Поскольку это отладочный сайт и в параметре %s значение False, все обращения, оставленные на сайте, будут отправлены их авторам, а не в учреждения, обозначенные в категориях." -#: templates/web/zurich/admin/report_edit.html:211 +#: templates/web/base/admin/users/index.html:73 +#, fuzzy +msgid "Assign selected to role:" +msgstr "Направлено сюда: %s" + +#: templates/web/zurich/admin/reports/edit.html:199 msgid "Assign to competent body:" msgstr "Направить в учреждение, которое специализируется на решении подобных вопросов:" -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/reports/edit.html:158 #: templates/web/zurich/admin/stats/index.html:57 msgid "Assign to different category:" msgstr "Назначить другую категорию:" -#: templates/web/zurich/admin/report_edit.html:209 +#: templates/web/zurich/admin/reports/edit.html:197 msgid "Assign to external body:" msgstr "Направить во внешнее учреждение:" -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/reports/edit.html:176 msgid "Assign to subdivision:" msgstr "Направить в подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:733 +#: perllib/FixMyStreet/Cobrand/Default.pm:774 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 msgid "Assigned to %s" msgstr "Направлено сюда: %s" @@ -519,31 +558,22 @@ msgstr "Как правило, количество результатов, ко msgid "At the moment only searching for and looking at reports work." msgstr "Сейчас можно только искать и просматривать обращения" -#: templates/web/base/admin/users/form.html:98 #: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/templates.html:9 +#: templates/web/base/admin/templates/view.html:9 msgid "Auto Response" msgstr "" -#: templates/web/base/admin/template_edit.html:80 +#: templates/web/base/admin/templates/edit.html:77 msgid "Auto-response:" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:14 -msgid "Automated" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:762 msgid "Automatically populate report subject/detail" msgstr "" -#: templates/web/base/admin/report-category.html:8 -msgid "Available categories" -msgstr "" - #: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" @@ -552,12 +582,13 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:349 +#: perllib/FixMyStreet/DB/Result/Problem.pm:342 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Ожидает модерации" -#: templates/web/base/js/translation_strings.html:43 +#. ("JS") +#: templates/web/base/js/translation_strings.html:45 msgid "Back" msgstr "Назад" @@ -565,29 +596,39 @@ msgstr "Назад" msgid "Back to all reports" msgstr "" +#: templates/web/base/admin/manifesttheme/index.html:9 +msgid "Background Colour" +msgstr "" + #: templates/web/base/admin/report_blocks.html:18 msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:647 -#: perllib/FixMyStreet/Cobrand/Default.pm:735 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/extra-metadata-item.html:35 +msgid "Behaviour" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:693 +#: perllib/FixMyStreet/Cobrand/Default.pm:776 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:208 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:325 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:418 #: templates/web/base/admin/bodies/index.html:1 -#: templates/web/base/admin/report_edit.html:56 -#: templates/web/zurich/header.html:49 +#: templates/web/base/admin/reports/edit.html:56 +#: templates/web/zurich/header.html:52 msgid "Bodies" msgstr "Учреждения" #: templates/web/base/admin/flagged.html:17 -#: templates/web/base/admin/index.html:63 -#: templates/web/base/admin/reports.html:15 +#: templates/web/base/admin/index.html:69 +#: templates/web/base/admin/reports/index.html:15 #: templates/web/base/admin/users/import.html:25 #: templates/web/base/admin/users/import.html:48 -#: templates/web/base/admin/users/index.html:18 +#: templates/web/base/admin/users/index.html:45 msgid "Body" msgstr "Учреждение" -#: templates/web/base/admin/users/form.html:50 +#: templates/web/base/admin/users/form.html:53 msgid "Body:" msgstr "Учреждение:" @@ -595,10 +636,6 @@ msgstr "Учреждение:" msgid "CSV File" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:46 -msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>" -msgstr "" - #: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." msgstr "Письмо не пришло? Оно могло попасть в папку «Спам»." @@ -607,39 +644,42 @@ msgstr "Письмо не пришло? Оно могло попасть в па msgid "Can't see the map? <em>Skip this step</em>" msgstr "Карта не отображается? <em>Пропустите этот шаг</em>" -#: perllib/FixMyStreet/Cobrand/Default.pm:647 -#: templates/web/base/admin/responsepriorities/list.html:8 -#: templates/web/base/admin/templates.html:7 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:325 +#: templates/web/base/admin/responsepriorities/index.html:8 +#: templates/web/base/admin/templates/view.html:7 msgid "Categories" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:2 +#: templates/web/base/admin/category-checkboxes.html:26 #: templates/web/base/admin/category-multiselect.html:2 +#: templates/web/base/admin/responsepriorities/edit.html:31 msgid "Categories:" msgstr "" +#: templates/web/base/admin/bodies/_category_field.html:12 #: templates/web/base/admin/bodies/body.html:73 -#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 -#: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:72 -#: templates/web/base/report/_item.html:64 -#: templates/web/base/report/new/category.html:22 +#: templates/web/base/dashboard/index.html:101 +#: templates/web/base/report/_inspect.html:16 +#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/new/category.html:23 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/bodies/body.html:14 -#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/bodies/form.html:25 +#: templates/web/zurich/admin/index-dm.html:25 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/reports/index.html:13 #: templates/web/zurich/admin/stats/index.html:26 #: templates/web/zurich/admin/stats/index.html:71 msgid "Category" msgstr "Категория" -#: templates/web/base/dashboard/index.html:103 +#: templates/web/base/dashboard/index.html:104 msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:412 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -648,12 +688,12 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент устранения неполадок в этой категории, которым больше 4 недель" -#: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/reports/edit.html:131 #: templates/web/base/dashboard/index.html:39 #: templates/web/base/report/update/moderation_diff.html:7 #: templates/web/zurich/admin/bodies/contact-form.html:8 -#: templates/web/zurich/admin/report_edit-sdm.html:72 -#: templates/web/zurich/admin/report_edit.html:100 +#: templates/web/zurich/admin/report_edit-sdm.html:60 +#: templates/web/zurich/admin/reports/edit.html:88 msgid "Category:" msgstr "Категория:" @@ -662,45 +702,27 @@ msgstr "Категория:" msgid "Change" msgstr "" -#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:2 #: templates/web/base/auth/change_email.html:3 msgid "Change email address" msgstr "" -#: templates/web/base/auth/change_password.html:1 +#: templates/web/base/auth/change_password.html:2 #: templates/web/base/auth/change_password.html:5 -#: templates/web/base/my/my.html:65 +#: templates/web/base/my/my.html:64 templates/web/base/my/my.html:68 msgid "Change password" msgstr "Сменить пароль" -#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:2 #: templates/web/base/auth/change_phone.html:3 msgid "Change phone number" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:80 -msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent." +#: templates/web/base/auth/generate_token.html:56 +msgid "Change two-factor authentication" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:64 -msgid "" -"Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" -" <br>\n" -" Normally, categories are not private.\n" -" <br>\n" -" This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n" -" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n" -" at a specific address." -msgstr "" -"Отметьте галочкой поле <strong>приватные</strong>, если обращения из этой категории <strong>никогда не должны отображаться на сайте</strong>.\n" -" <br>\n" -" По умолчанию категории общедоступны.\n" -" <br>\n" -" Ограничение доступа к категориям может быть полезно в тех случаях, когда у пользователей должна быть возможность подать обращение в учреждение, но сами обращения в этой категории не \n" -" имеют публичной ценности. Например: просьба обеспечить жителей определенного дома \n" -" дополнительным мусорным баком." - -#: templates/web/base/admin/bodies/contact-form.html:11 +#: templates/web/base/admin/bodies/_category_field.html:3 msgid "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -708,11 +730,12 @@ msgstr "" "Выберите название <strong>категории</strong> которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и \n" " сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений." -#: templates/web/base/report/_inspect.html:127 +#: templates/web/base/report/_inspect.html:44 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#. ("JS") +#: templates/web/base/js/translation_strings.html:98 msgid "Clear offline data" msgstr "" @@ -749,57 +772,61 @@ msgid "Close" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:71 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:72 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 #: templates/web/base/admin/states/index.html:33 -#: templates/web/base/dashboard/index.html:117 +#: templates/web/base/dashboard/index.html:118 #: templates/web/zurich/admin/stats/index.html:52 msgid "Closed" msgstr "Закрыто" -#: perllib/FixMyStreet/DB/Result/Problem.pm:866 +#: perllib/FixMyStreet/DB/Result/Problem.pm:905 msgid "Closed by council" msgstr "Закрыто органом самоуправления" -#: templates/web/base/admin/report_edit.html:176 +#: templates/web/base/admin/reports/edit.html:181 msgid "Closed to updates" msgstr "" -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/reports/edit.html:38 msgid "Co-ordinates:" msgstr "Координаторы:" #: templates/web/base/admin/list_updates.html:10 +#: templates/web/base/admin/manifesttheme/index.html:6 #: templates/web/base/admin/reportextrafields/edit.html:24 #: templates/web/base/admin/reportextrafields/index.html:7 msgid "Cobrand" msgstr "Кобренд" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/reports/edit.html:99 #: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Данные о кобренде:" -#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/reports/edit.html:98 #: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Кобренд:" -#: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:17 +#: templates/web/base/admin/extra-metadata-item.html:29 +#: templates/web/base/auth/2fa/form-add.html:11 +#: templates/web/base/auth/2fa/form.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#. ("JS") +#: templates/web/base/js/translation_strings.html:69 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Default.pm:687 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:321 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:432 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" @@ -808,12 +835,12 @@ msgstr "Конфигурация" msgid "Confirm" msgstr "Подтвердить" -#: templates/web/base/auth/2faform.html:1 +#: templates/web/base/auth/2fa/form.html:1 #: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Подтвердить аккаунт" -#: templates/web/base/report/form/user_loggedout_password.html:30 +#: templates/web/base/report/form/user_loggedout_password.html:26 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -825,16 +852,16 @@ msgstr "" msgid "Confirmation" msgstr "Подтверждение" -#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/bodies/contact-form.html:30 #: templates/web/base/admin/users/alerts.html:10 -#: templates/web/zurich/admin/bodies/contact-form.html:35 +#: templates/web/zurich/admin/bodies/contact-form.html:39 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Подтверждено" #: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/reports/edit.html:79 msgid "Confirmed:" msgstr "Подтверждено:" @@ -849,10 +876,12 @@ msgstr "Свяжитесь с командой сайта %s" msgid "Contact Us" msgstr "Свяжитесь с нами" -#: templates/web/base/contact/index.html:15 +#: templates/web/base/contact/index.html:18 msgid "Contact the team" msgstr "Свяжитесь с командой" +#. ("JS") +#: templates/web/base/js/translation_strings.html:62 #: templates/web/base/report/form/user.html:8 msgid "Continue" msgstr "" @@ -865,17 +894,13 @@ msgstr "" msgid "Convert location from Easting/Northing" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:61 -msgid "Coordinates:" -msgstr "Координаты:" - -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:753 msgid "Could not find user" msgstr "Не удалось найти пользователя" -#: templates/web/base/js/translation_strings.html:53 +#. ("JS") +#: templates/web/base/js/translation_strings.html:55 msgid "Could not look up location" msgstr "Не удалось найти местоположение" @@ -895,7 +920,7 @@ msgstr "Контакты органа самоуправления для %s" msgid "Council ref: %s" msgstr "Ссылка на орган самоуправления: %s" -#: templates/web/base/dashboard/index.html:50 +#: templates/web/base/dashboard/index.html:51 msgid "Council:" msgstr "Орган самоуправления:" @@ -904,6 +929,8 @@ msgstr "Орган самоуправления:" msgid "Count" msgstr "Подсчет" +#: templates/web/base/admin/manifesttheme/index.html:31 +#: templates/web/base/admin/roles/index.html:32 #: templates/web/base/admin/states/index.html:114 msgid "Create" msgstr "" @@ -912,38 +939,42 @@ msgstr "" msgid "Create a report" msgstr "Создать обращение" -#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:7 msgid "Create an account" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:156 -#: templates/web/zurich/admin/bodies/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:124 +#: templates/web/zurich/admin/bodies/contact-form.html:51 msgid "Create category" msgstr "Создать категорию" -#: templates/web/base/admin/responsepriorities/edit.html:58 +#: templates/web/base/admin/responsepriorities/edit.html:41 +#: templates/web/base/admin/responsepriorities/index.html:41 msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:765 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:200 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:766 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:201 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:764 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:199 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:87 -#: templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/templates/edit.html:84 +#: templates/web/zurich/admin/templates/edit.html:32 msgid "Create template" msgstr "Создать шаблон" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/zurich/admin/templates.html:10 +#: templates/web/zurich/admin/templates/view.html:10 msgid "Created" msgstr "Создано" @@ -952,7 +983,7 @@ msgid "Created %d new users" msgstr "" #: templates/web/base/admin/list_updates.html:39 -#: templates/web/base/admin/report_edit.html:78 +#: templates/web/base/admin/reports/edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" @@ -962,11 +993,11 @@ msgstr "Создано:" msgid "Current password:" msgstr "" -#: templates/web/base/auth/generate_token.html:46 +#: templates/web/base/auth/generate_token.html:72 msgid "Current token:" msgstr "" -#: templates/web/base/dashboard/index.html:92 +#: templates/web/base/dashboard/index.html:93 msgid "Currently grouped by %s" msgstr "" @@ -975,19 +1006,19 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "В данный момент на сайте не зарегистрировано ни одного учреждения." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 -#: templates/web/zurich/admin/report_edit-sdm.html:105 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: templates/web/zurich/admin/report_edit-sdm.html:92 msgid "Customer not contactable" msgstr "Невозможно связаться с покупателем" -#: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:8 #: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Панель управления" -#: templates/web/base/auth/generate_token.html:54 +#: templates/web/base/auth/generate_token.html:58 msgid "Deactivate two-factor authentication" msgstr "" @@ -995,35 +1026,33 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "Вопрос решен подразделением в течение 5 рабочих дней" -#: templates/web/base/admin/responsepriorities/list.html:9 +#: templates/web/base/admin/responsepriorities/index.html:9 msgid "Default" msgstr "" -#: templates/web/base/admin/responsepriorities/edit.html:39 -msgid "Default priority" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:767 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:96 -msgid "Defect type" -msgstr "" - +#: templates/web/base/admin/roles/form.html:25 #: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:773 -#: templates/web/base/admin/template_edit.html:91 -#: templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79 +#: templates/web/base/admin/templates/edit.html:88 +#: templates/web/zurich/admin/templates/edit.html:36 msgid "Delete template" msgstr "Удалить шаблон" -#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/manifesttheme/form.html:62 +#, fuzzy +msgid "Delete theme" +msgstr "Удалить шаблон" + +#: templates/web/base/admin/bodies/contact-form.html:40 #: templates/web/base/admin/bodies/index.html:31 -#: templates/web/zurich/admin/bodies/contact-form.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:41 msgid "Deleted" msgstr "Удалено" @@ -1032,49 +1061,45 @@ msgstr "Удалено" msgid "Describe why you are moderating this" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:42 -#: templates/web/base/admin/responsepriorities/list.html:7 -#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/base/admin/responsepriorities/index.html:7 +#: templates/web/zurich/admin/index-dm.html:24 #: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/zurich/admin/reports/index.html:12 msgid "Description" msgstr "Описание" -#: templates/web/base/admin/responsepriorities/edit.html:17 -msgid "Description:" -msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:7 +#, fuzzy +msgid "Destination" +msgstr "Описание" -#: perllib/FixMyStreet/App/Controller/Report.pm:416 +#: perllib/FixMyStreet/App/Controller/Report.pm:442 msgid "Detailed information is limited to %d characters." msgstr "" +#. ("JS") #: templates/web/base/admin/users/alerts.html:12 -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:47 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Дополнительная информация" -#: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/reports/edit.html:124 #: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit.html:31 -#: templates/web/zurich/admin/report_edit.html:45 +#: templates/web/zurich/admin/reports/edit.html:31 +#: templates/web/zurich/admin/reports/edit.html:45 msgid "Details:" msgstr "Дополнительная информация:" -#: templates/web/base/dashboard/index.html:104 +#: templates/web/base/dashboard/index.html:105 msgid "Device and Site" msgstr "" -#: templates/web/base/admin/bodies/body.html:93 +#: templates/web/base/admin/bodies/body.html:94 msgid "Devolved" msgstr "Передано" -#: templates/web/zurich/admin/report_edit-sdm.html:52 -#: templates/web/zurich/admin/report_edit.html:71 -msgid "Didn't use map" -msgstr "Карта не использовалась" - #: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Таблица самых активных пользователей" @@ -1083,6 +1108,15 @@ msgstr "Таблица самых активных пользователей" msgid "Disable" msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/extra-metadata-item.html:99 +msgid "Disable form when this category is selected" +msgstr "" + +#: templates/web/base/admin/extra-metadata-option.html:18 +msgid "Disable form when this option is selected" +msgstr "" + #: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" @@ -1092,6 +1126,14 @@ msgstr "" msgid "Discard changes" msgstr "" +#: templates/web/base/admin/extra-metadata-item.html:67 +msgid "Display as" +msgstr "" + +#: templates/web/base/admin/extra-metadata-option.html:10 +msgid "Displayed label" +msgstr "" + #: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1101,15 +1143,11 @@ msgstr "" msgid "Do you have a %s password?" msgstr "У вас есть пароль на сайте %s?" -#: templates/web/base/report/_inspect.html:111 -msgid "Do you want to automatically raise a defect?" -msgstr "" - -#: templates/web/base/questionnaire/index.html:41 +#: templates/web/base/questionnaire/index.html:43 msgid "Don’t know" msgstr "Не знаю" -#: templates/web/base/contact/index.html:124 +#: templates/web/base/contact/index.html:128 msgid "Don't like forms?" msgstr "Не любите заполнять формы?" @@ -1117,19 +1155,24 @@ msgstr "Не любите заполнять формы?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:75 -msgid "Drag and drop photos here or <u>click to upload</u>" +#. ("JS") +#: templates/web/base/js/translation_strings.html:77 +msgid "Drag photos here or <u>browse photos</u>" +msgstr "" + +#: templates/web/base/admin/extra-metadata-item.html:70 +msgid "Drop-down list" msgstr "" -#: templates/web/base/report/_inspect.html:122 +#: templates/web/base/report/_inspect.html:39 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:132 +#: templates/web/base/report/_inspect.html:49 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/bodies/body.html:117 +#: templates/web/base/admin/bodies/body.html:136 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories <strong>can have the same contact</strong> (email address).\n" @@ -1141,32 +1184,35 @@ msgstr "" " Следовательно, вы можете добавлять много категорий для одного контакта учреждения.\n" " " -#: templates/web/base/report/_inspect.html:35 -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/inspect/information.html:22 msgid "Easting/Northing:" msgstr "" #: templates/web/base/admin/list_updates.html:44 +#: templates/web/base/admin/manifesttheme/index.html:22 #: templates/web/base/admin/problem_row.html:43 -#: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users/index.html:34 +#: templates/web/base/admin/responsepriorities/index.html:34 +#: templates/web/base/admin/roles/index.html:24 +#: templates/web/base/admin/templates/view.html:31 +#: templates/web/base/admin/users/index.html:67 #: templates/web/zurich/admin/problem_row.html:49 -#: templates/web/zurich/admin/templates.html:20 +#: templates/web/zurich/admin/templates/view.html:20 msgid "Edit" msgstr "Редактировать" -#: templates/web/base/admin/bodies/body.html:142 -#: templates/web/base/admin/index.html:39 +#: templates/web/base/admin/bodies/body.html:161 +#: templates/web/base/admin/index.html:43 #: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Редактировать информацию об учреждении" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:772 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:206 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 msgid "Edit report category" msgstr "" @@ -1174,15 +1220,17 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:758 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:756 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:198 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:771 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:205 msgid "Edit users' details/search for their reports" msgstr "" @@ -1190,13 +1238,13 @@ msgstr "" msgid "Edit your update" msgstr "" -#: templates/web/base/admin/report_edit.html:0 -#: templates/web/base/admin/report_edit.html:15 -#: templates/web/base/admin/report_edit.html:6 -#: templates/web/zurich/admin/report_edit-sdm.html:1 +#: templates/web/base/admin/reports/edit.html:0 +#: templates/web/base/admin/reports/edit.html:15 +#: templates/web/base/admin/reports/edit.html:6 +#: templates/web/zurich/admin/report_edit-sdm.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:6 -#: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:6 +#: templates/web/zurich/admin/reports/edit.html:2 +#: templates/web/zurich/admin/reports/edit.html:6 msgid "Editing problem %d" msgstr "Редактирование данных о неполадке: %d" @@ -1218,7 +1266,10 @@ msgstr "Редактор" #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users/import.html:24 #: templates/web/base/admin/users/import.html:47 -#: templates/web/base/admin/users/index.html:17 +#: templates/web/base/admin/users/index.html:44 +#: templates/web/base/alert/updates.html:21 +#: templates/web/base/report/display_tools.html:50 +#: templates/web/base/report/new/duplicate_suggestions.html:33 #: templates/web/zurich/admin/bodies/body.html:15 #: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 @@ -1226,15 +1277,14 @@ msgstr "Редактор" msgid "Email" msgstr "Адрес эл. почты" -#: templates/web/base/admin/bodies/contact-form.html:38 -#: templates/web/base/alert/_list.html:74 +#: templates/web/base/alert/_list.html:69 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/form/user_loggedout_by_email.html:38 #: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1247,21 +1297,21 @@ msgstr "Создано уведомление по эл. почте" msgid "Email alert deleted" msgstr "Уведомление по эл. почте удалено" -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:106 msgid "Email me a link or text me a code to sign in" msgstr "" -#: templates/web/base/auth/general.html:101 +#: templates/web/base/auth/general.html:108 msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/users/form.html:25 +#: templates/web/base/admin/users/form.html:28 msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/bodies/contact-form.html:18 +#: templates/web/base/admin/reports/edit.html:151 +#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:23 msgid "Email:" msgstr "Адрес эл. почты:" @@ -1322,7 +1372,7 @@ msgstr "" msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" -#: templates/web/base/dashboard/index.html:78 +#: templates/web/base/dashboard/index.html:79 msgid "End Date" msgstr "" @@ -1330,11 +1380,12 @@ msgstr "" msgid "Endpoint" msgstr "Конечная точка" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:81 -msgid "Enter a Zürich street name" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:83 +#, fuzzy +msgid "Enter a Zürich street name" msgstr "Введите название улицы в Цюрихе" -#: perllib/FixMyStreet/Cobrand/UK.pm:16 +#: perllib/FixMyStreet/Cobrand/UK.pm:21 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Введите почтовый индекс ближайшего отделения связи в Великобритании или название улицы и регион" @@ -1343,7 +1394,6 @@ msgstr "Введите почтовый индекс ближайшего отд msgid "Enter a nearby postcode, or street name and area" msgstr "Введите индекс ближайшего отделения связи, название улицы или регион" -#: templates/web/base/around/postcode_form.html:7 #: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Введите название ближайшей улицы и регион" @@ -1352,8 +1402,9 @@ msgstr "Введите название ближайшей улицы и рег msgid "Enter details of the problem" msgstr "Подробно опишите проблему" +#. ("JS") #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:8 +#: templates/web/base/js/translation_strings.html:7 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 @@ -1361,8 +1412,10 @@ msgstr "Подробно опишите проблему" msgid "Error" msgstr "Ошибка" -#: templates/web/base/reports/_list-filters.html:50 -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/admin/triage/_list-filters.html:12 +#: templates/web/base/admin/triage/_list-filters.html:3 +#: templates/web/base/reports/_list-filters.html:16 +#: templates/web/base/reports/_list-filters.html:28 msgid "Everything" msgstr "Всё" @@ -1375,7 +1428,7 @@ msgstr "Пример почтового индекса: %s" msgid "Examples:" msgstr "Примеры:" -#: templates/web/base/admin/report-category.html:3 +#: templates/web/base/admin/report-category.html:10 msgid "Existing category" msgstr "" @@ -1383,20 +1436,20 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#. ("JS") +#: templates/web/base/js/translation_strings.html:68 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:53 +#: templates/web/base/report/new/form_report.html:65 msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:106 +#: templates/web/base/dashboard/index.html:107 msgid "Export as CSV" msgstr "" -#: templates/web/base/admin/report_edit.html:98 -#: templates/web/base/admin/responsepriorities/edit.html:27 +#: templates/web/base/admin/reports/edit.html:103 msgid "External ID" msgstr "" @@ -1404,12 +1457,12 @@ msgstr "" msgid "External URL" msgstr "Внешний URL" -#: templates/web/base/admin/report_edit.html:100 +#: templates/web/base/admin/reports/edit.html:105 msgid "External body" msgstr "" -#: templates/web/base/admin/report_edit.html:107 -#: templates/web/base/admin/template_edit.html:66 +#: templates/web/base/admin/reports/edit.html:112 +#: templates/web/base/admin/templates/edit.html:63 msgid "External status code" msgstr "" @@ -1417,32 +1470,37 @@ msgstr "" msgid "External status code:" msgstr "" -#: templates/web/base/admin/report_edit.html:102 +#: templates/web/base/admin/reports/edit.html:107 msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:671 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:159 -#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/bodies/contact-form.html:107 +#: templates/web/base/admin/reports/edit.html:134 #: templates/web/base/admin/update_edit.html:97 #: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Дополнительная информация:" -#: templates/web/base/report/_inspect.html:168 -#: templates/web/base/report/_item.html:80 +#: templates/web/base/report/_item.html:90 +#: templates/web/base/report/inspect/_extra_details_field.html:2 +#: templates/web/base/report/new/category_extras.html:15 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/bodies/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:27 msgid "Extra fields:" msgstr "" +#: templates/web/base/admin/extra-metadata-item.html:38 +msgid "Extra question shown to user" +msgstr "" + #: templates/web/base/contact/submit.html:13 msgid "Failed to send message" msgstr "Не удалось отправить сообщение" @@ -1452,18 +1510,27 @@ msgstr "Не удалось отправить сообщение" msgid "Fields" msgstr "" -#: templates/web/base/report/form/user_loggedout_password.html:25 +#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:42 +msgid "File type not recognised. Please upload an image." +msgstr "" + +#: templates/web/base/report/form/user_loggedout_password.html:21 #: templates/web/base/report/form/user_loggedout_password.html:8 msgid "Fill in your details manually." msgstr "" -#: templates/web/zurich/admin/index-dm.html:33 +#. ("JS") +#: templates/web/base/js/translation_strings.html:71 +msgid "Filter" +msgstr "" + +#: templates/web/zurich/admin/index-dm.html:35 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" msgstr "Сортировать список обращений" #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:66 +#: templates/web/base/questionnaire/index.html:68 msgid "First time" msgstr "Впервые" @@ -1475,21 +1542,20 @@ msgstr "Исправьте это, выбрав <strong>зону покрыти #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179 #: templates/web/base/admin/states/index.html:29 #: templates/web/base/admin/stats/fix_rate.html:4 -#: templates/web/base/dashboard/index.html:118 +#: templates/web/base/dashboard/index.html:119 msgid "Fixed" msgstr "Исправлено" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - Council" msgstr "Исправлено (орган самоуправления)" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:68 msgid "Fixed - User" msgstr "Исправлено (пользователь)" #: templates/web/base/admin/bodies/form.html:96 -#: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/bodies/form.html:35 +#: templates/web/zurich/admin/bodies/form.html:47 msgid "Flag as deleted" msgstr "Пометить как удаленное" @@ -1497,8 +1563,8 @@ msgstr "Пометить как удаленное" msgid "Flag user" msgstr "Пометить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:640 -#: templates/web/base/admin/users/index.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:685 +#: templates/web/base/admin/users/index.html:47 msgid "Flagged" msgstr "Помечено" @@ -1506,7 +1572,7 @@ msgstr "Помечено" msgid "Flagged reports and users" msgstr "Помеченные обращения и профили пользователей" -#: templates/web/base/admin/users/form.html:114 +#: templates/web/base/admin/users/form.html:110 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Список помеченных профилей пользователей находится на странице <a href='%s'>Помеченное</a>." @@ -1514,8 +1580,8 @@ msgstr "Список помеченных профилей пользовате msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "На помеченные аккаунты пользователей не накладываются ограничения. Это просто аккаунты, к которым проявляется повышенное внимание." -#: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/users/form.html:121 +#: templates/web/base/admin/reports/edit.html:155 +#: templates/web/base/admin/users/form.html:117 msgid "Flagged:" msgstr "Помечено:" @@ -1527,29 +1593,25 @@ msgstr "Чтобы посмотреть только обращения, отн msgid "For best results include a close-up and a wide shot" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:62 -msgid "For each option, <strong>Key</strong> is the value which is stored in the database for that option and <strong>Name</strong> is the value displayed to the user." -msgstr "" - #: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Подробнее читайте в разделе <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как в FixMyStreet используется инструмент Mapit</a>." -#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:3 msgid "Forgot password" msgstr "" -#: templates/web/base/auth/general.html:91 -#: templates/web/base/report/form/user_loggedout_password.html:24 -#: templates/web/base/report/form/user_loggedout_password.html:29 +#: templates/web/base/auth/general.html:98 +#: templates/web/base/report/form/user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:25 msgid "Forgotten your password?" msgstr "Забыли пароль?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:818 msgid "Forwarded to external body" msgstr "Перенаправлено во внешнее учреждение" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:819 msgid "Forwarded wish to external body" msgstr "Пожелание перенаправлено во внешнее учреждение" @@ -1559,28 +1621,34 @@ msgstr "Пожелание перенаправлено во внешнее уч msgid "Frequently Asked Questions" msgstr "Часто задаваемые вопросы" -#: templates/web/base/auth/generate_token.html:52 +#: templates/web/base/contact/enquiry/index.html:1 +#: templates/web/base/contact/enquiry/index.html:3 +msgid "General Enquiry" +msgstr "" + +#: templates/web/base/auth/generate_token.html:78 msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 -#: templates/web/base/report/display_tools.html:14 -#: templates/web/base/report/new/duplicate_suggestions.html:32 -#: templates/web/base/report/new/duplicate_suggestions.html:37 +#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/new/duplicate_suggestions.html:36 +#: templates/web/base/report/new/duplicate_suggestions.html:39 +#: templates/web/base/report/new/duplicate_suggestions.html:45 msgid "Get updates" msgstr "Получать обновления" -#: templates/web/base/reports/_rss.html:3 -#: templates/web/base/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:12 +#: templates/web/base/reports/_rss.html:4 msgid "Get updates of %s problems" msgstr "Получать новости о ходе работы над неполадками в: %s" -#: templates/web/base/reports/_rss.html:11 -#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:14 +#: templates/web/base/reports/_rss.html:4 msgid "Get updates of problems in this %s" msgstr "Получать новости о неполадках в:" -#: templates/web/base/alert/_list.html:85 +#: templates/web/base/alert/_list.html:80 msgid "Give me an RSS feed" msgstr "Подпишите меня на RSS-фид" @@ -1592,60 +1660,66 @@ msgstr "" msgid "Glad to hear it’s been fixed!" msgstr "Здорово, что проблема решена!" -#: templates/web/base/admin/index.html:28 -#: templates/web/base/admin/index.html:34 -#: templates/web/base/admin/index.html:49 -#: templates/web/base/alert/index.html:37 -#: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:71 -#: templates/web/base/reports/_list-filters.html:86 -#: templates/web/base/reports/_list-filters.html:92 +#: templates/web/base/admin/index.html:29 +#: templates/web/base/admin/index.html:37 +#: templates/web/base/admin/index.html:54 +#: templates/web/base/admin/responsepriorities/index.html:48 +#: templates/web/base/admin/triage/_list-filters.html:24 +#: templates/web/base/admin/triage/_list-filters.html:39 +#: templates/web/base/admin/triage/_list-filters.html:45 +#: templates/web/base/admin/users/index.html:32 +#: templates/web/base/around/_postcode_submit_button.html:2 +#: templates/web/base/around/_postcode_submit_button.html:5 +#: templates/web/base/reports/_list-filters-sort.html:13 +#: templates/web/base/reports/_list-filters.html:40 +#: templates/web/base/reports/_list-filters.html:49 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" msgstr "Поехали!" -#: templates/web/base/admin/report_edit.html:96 +#: templates/web/base/admin/reports/edit.html:101 msgid "Going to send questionnaire?" msgstr "Собираетесь отправить опрос?" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:773 msgid "Grant access to the admin" msgstr "" -#: templates/web/base/admin/index.html:76 +#: templates/web/base/admin/index.html:82 msgid "Graph of problem creation by status over time" msgstr "График устранения неполадки: статус/время" -#: templates/web/base/admin/bodies/contact-form.html:134 -msgid "Group" -msgstr "" - -#: templates/web/base/dashboard/index.html:94 +#: templates/web/base/dashboard/index.html:95 msgid "Group by %s" msgstr "" -#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/dashboard/index.html:100 msgid "Group by:" msgstr "" -#: templates/web/base/questionnaire/index.html:32 +#: templates/web/base/questionnaire/index.html:34 msgid "Has this problem been fixed?" msgstr "Эта проблема решена?" -#: templates/web/base/questionnaire/index.html:61 +#: templates/web/base/questionnaire/index.html:63 msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Вы впервые отправляете обращение в орган самоуправления?" -#: templates/web/base/main_nav_items.html:48 +#: templates/web/base/admin/stats/index.html:15 +#: templates/web/base/admin/stats/index.html:9 +msgid "Heatmap" +msgstr "" + +#: templates/web/base/main_nav_items.html:32 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "Помощь" -#: templates/web/base/report/new/category_extras.html:15 -#: templates/web/base/report/new/category_extras.html:16 +#: templates/web/base/report/new/category_extras.html:17 +#: templates/web/base/report/new/category_extras.html:18 msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" @@ -1657,18 +1731,18 @@ msgstr "" msgid "Hi %s" msgstr "Привет, %s!" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/stats/index.html:53 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Скрыто" -#: templates/web/base/admin/extra-metadata-form.html:18 -msgid "Hidden Field" +#: templates/web/base/admin/extra-metadata-item.html:46 +msgid "Hidden data in reporting form" msgstr "" -#: templates/web/base/admin/users/form.html:204 +#: templates/web/base/admin/users/form.html:196 msgid "Hide all reports and updates" msgstr "" @@ -1693,12 +1767,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:61 -#: templates/web/base/around/display_location.html:69 -#: templates/web/base/js/translation_strings.html:72 +#. ("JS") +#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:73 +#: templates/web/base/js/translation_strings.html:74 msgid "Hide pins" msgstr "Скрыть метки" +#: templates/web/base/admin/bodies/contact-form.html:52 +#, fuzzy +msgid "Hide reports made in this category" +msgstr "Обращение отнесено к категории: %s" + #: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1708,15 +1788,11 @@ msgstr "" msgid "Hide your name?" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:48 -msgid "Hint" -msgstr "" - #: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "История" -#: templates/web/base/around/display_location.html:74 +#: templates/web/base/around/display_location.html:78 msgid "Home" msgstr "На главную страницу" @@ -1724,7 +1800,8 @@ msgstr "На главную страницу" msgid "How to report a problem" msgstr "Как сообщить о проблеме" -#: templates/web/base/js/translation_strings.html:44 +#. ("JS") +#: templates/web/base/js/translation_strings.html:46 msgid "How to send successful reports" msgstr "Как успешно создавать и отправлять обращения" @@ -1743,15 +1820,15 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Нам не удалось найти ваше обращение в базе данных.\n" #: templates/web/base/admin/flagged.html:14 -#: templates/web/base/admin/index.html:60 +#: templates/web/base/admin/index.html:66 #: templates/web/base/admin/list_updates.html:6 -#: templates/web/base/admin/reports.html:12 +#: templates/web/base/admin/reports/index.html:12 #: templates/web/base/admin/users/alerts.html:8 -#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 #: templates/web/zurich/admin/list_updates.html:38 -#: templates/web/zurich/admin/reports.html:11 +#: templates/web/zurich/admin/reports/index.html:11 msgid "ID" msgstr "Идентификатор" @@ -1768,19 +1845,23 @@ msgstr "" msgid "If there's a user associated with the address you entered, we've sent a confirmation email." msgstr "" -#: templates/web/base/admin/responsepriorities/edit.html:23 +#: templates/web/base/admin/responsepriorities/edit.html:12 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here." msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:34 -msgid "If ticked the user won’t see an input field, just the ‘Description’ text." +#: templates/web/base/admin/extra-metadata-item.html:100 +msgid "If ticked, the form will be disabled and this item’s notice text will be displayed." msgstr "" -#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/admin/extra-metadata-item.html:106 +msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script." +msgstr "" + +#: templates/web/base/admin/templates/edit.html:72 msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:14 +#: templates/web/base/admin/bodies/_category_field.html:6 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1788,11 +1869,11 @@ msgstr "" "Если одно местоположение обслуживают два и более учреждений, система сайта FixMyStreet объединяет похожие категории в единую запись,\n" " которая располагается в меню. Если вы хотите, чтобы это произошло, убедитесь, что вы используете одно и то же название категории для выбранных учреждений." -#: templates/web/base/contact/index.html:112 +#: templates/web/base/contact/index.html:116 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" -#: templates/web/base/auth/generate_token.html:61 +#: templates/web/base/auth/generate_token.html:83 msgid "If you generate a new token the existing token will no longer work." msgstr "" @@ -1804,28 +1885,27 @@ msgstr "Если вы узнаете больше о статусе вашего msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." msgstr "" -#: templates/web/base/admin/responsepriorities/edit.html:45 +#: templates/web/base/admin/responsepriorities/edit.html:28 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" -#: templates/web/base/admin/template_edit.html:39 +#: templates/web/base/admin/templates/edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" #: templates/web/base/report/new/top_message_none.html:10 -#: templates/web/base/report/new/top_message_none.html:9 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:62 +#: templates/web/base/admin/templates/edit.html:59 msgid "If you want to use this template to prefill the update field when a report’s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here." msgstr "" -#: templates/web/base/admin/template_edit.html:49 +#: templates/web/base/admin/templates/edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" -#: templates/web/base/questionnaire/index.html:70 +#: templates/web/base/questionnaire/index.html:72 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." @@ -1833,10 +1913,6 @@ msgstr "" "Если вы хотите внести новую публичную информацию о неполадке,\n" "введите ее здесь (важно: новые данные не будут отправлены в орган самоуправления)." -#: templates/web/base/admin/bodies/contact-form.html:32 -msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." -msgstr "Если вы <strong>не пользуетесь электронной почтой</strong>, а предпочитаете другой способ связи, введите сервисный идентификатор (Open311) или его эквивалент." - #: templates/web/base/admin/bodies/open311-form-fields.html:112 #: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" @@ -1860,11 +1936,15 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:152 +#: templates/web/base/admin/bodies/contact-form.html:117 +msgid "If you’ve made changes, leave a note explaining what, for other admins to see." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:166 msgid "Illegal ID" msgstr "Неверный идентификатор" -#: perllib/FixMyStreet/App/Controller/Alert.pm:103 +#: perllib/FixMyStreet/App/Controller/Alert.pm:106 msgid "Illegal feed selection" msgstr "Неверно выбран фид" @@ -1880,7 +1960,8 @@ msgstr "Вы в черном списке?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Кроме того, возвращаются следующие параметры, которые не являются частью сервиса Open311 версии 2: agency_sent_datetime, title (также возвращается как часть описания), interface_used, comment_count, requestor_name (присутствует только если инициатор запроса разрешил отображение имени на сайте)." -#: templates/web/base/admin/bodies/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:35 +#: templates/web/zurich/admin/bodies/contact-form.html:40 msgid "Inactive" msgstr "" @@ -1888,44 +1969,46 @@ msgstr "" msgid "Inbox zero, here we come!" msgstr "Ура, новых писем нет!" -#: templates/web/zurich/admin/report_edit.html:225 +#: templates/web/zurich/admin/reports/edit.html:213 msgid "Include reporter personal details" msgstr "Включить персональные данные заявителя" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:348 msgid "Incorrect has_photo value \"%s\"" msgstr "Нверно задано значение has_photo \"%s\"" -#: templates/web/base/report/_inspect.html:8 +#: templates/web/base/admin/triage/_inspect.html:31 +#: templates/web/base/report/_inspect.html:5 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:85 -msgid "Inspection required" +#: perllib/FixMyStreet/Cobrand/Default.pm:761 +msgid "Instruct contractors to fix problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 -msgid "Instruct contractors to fix problems" +#: templates/web/base/admin/extra-metadata-item.html:50 +msgid "Internal data set by Open311" msgstr "" +#: templates/web/base/admin/extra-metadata-option.html:6 +#, fuzzy +msgid "Internal key" +msgstr "Внутренние заметки" + #: templates/web/zurich/admin/list_updates.html:35 msgid "Internal notes" msgstr "Внутренние заметки" -#: templates/web/base/offline/appcache.html:4 -msgid "Internet glitch" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:333 msgid "Invalid agency_responsible value %s" msgstr "Неверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:435 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Invalid format %s specified." msgstr "Неверно задан формат: %s." #: perllib/FixMyStreet/App/Controller/Moderate.pm:305 -#: perllib/FixMyStreet/App/Controller/Report.pm:485 +#: perllib/FixMyStreet/App/Controller/Report.pm:504 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1937,10 +2020,6 @@ msgstr "Загляните в раздел <a href=\"%s\">Часто задав msgid "It’s on its way to the council right now." msgstr "Отправлено в орган самоуправления." -#: templates/web/base/admin/extra-metadata-form.html:71 -msgid "Key" -msgstr "" - #: templates/web/base/admin/states/index.html:9 #: templates/web/base/admin/states/index.html:95 msgid "Label" @@ -1964,11 +2043,16 @@ msgstr "" msgid "Last editor" msgstr "Последний редактор" -#: templates/web/base/questionnaire/index.html:53 +#: templates/web/base/admin/reports/edit.html:92 +#, fuzzy +msgid "Last failure:" +msgstr "Последнее обновление:" + +#: templates/web/base/questionnaire/index.html:55 msgid "Last update" msgstr "" -#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/reports/edit.html:95 msgid "Last update:" msgstr "Последнее обновление:" @@ -1976,13 +2060,14 @@ msgstr "Последнее обновление:" msgid "Last update:" msgstr "Последнее обновление:" -#: templates/web/base/report/_inspect.html:39 -#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/_item.html:70 +#: templates/web/base/report/inspect/information.html:26 #: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:83 +#: templates/web/base/admin/triage/_list-filters.html:36 +#: templates/web/base/reports/_list-filters-sort.html:10 msgid "Least recently updated" msgstr "" @@ -1990,10 +2075,6 @@ msgstr "" msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Оставьте поле пустым, если все обращения в это учреждение должны быть отправлены единым способом (например: «%s»)." -#: templates/web/base/admin/extra-metadata-form.html:57 -msgid "List" -msgstr "" - #: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Все сообщения о неполадках в виде списка" @@ -2002,25 +2083,26 @@ msgstr "Все сообщения о неполадках в виде списк msgid "Loading reports…" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 #: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Загрузка..." #: templates/web/base/alert/choose.html:2 #: templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2 -#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:2 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" msgstr "Местные RSS-фиды и уведомления по эл. почте" -#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 -#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 +#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Местные RSS-фиды и уведомления по эл. почте (‘%s’)" -#: templates/web/base/main_nav_items.html:39 -#: templates/web/base/main_nav_items.html:45 +#: templates/web/base/main_nav_items.html:24 +#: templates/web/base/main_nav_items.html:29 msgid "Local alerts" msgstr "Местные уведомления" @@ -2033,77 +2115,97 @@ msgstr "Укажите на карте местоположение пробле msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:37 -#: templates/web/base/report/form/user.html:19 +#: templates/web/base/auth/general.html:44 +#: templates/web/base/report/form/user.html:24 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:82 -#: templates/web/base/report/form/user.html:22 +#. ("JS") +#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/report/form/user.html:27 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:80 +#. ("JS") +#: templates/web/base/js/translation_strings.html:83 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/users/form.html:202 +#: templates/web/base/admin/users/form.html:194 msgid "Log out of all sessions" msgstr "" -#: templates/web/base/dashboard/index.html:82 +#: templates/web/base/auth/general.html:36 +#: templates/web/base/report/form/user.html:18 +msgid "Login with %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:83 msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#. ("JS") +#: templates/web/base/js/translation_strings.html:63 msgid "MAP" msgstr "КАРТА" -#: templates/web/base/admin/users/form.html:203 +#: templates/web/base/admin/users/form.html:195 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:763 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: perllib/FixMyStreet/Cobrand/Default.pm:688 +msgid "Manifest Theme" +msgstr "" + +#: templates/web/base/admin/triage/_list-filters.html:31 +#: templates/web/base/reports/_list-filters-sort.html:5 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#. ("JS") +#: templates/web/base/js/translation_strings.html:65 msgid "Map" msgstr "Карта" -#: templates/web/base/admin/report_edit.html:87 +#: templates/web/base/admin/reports/edit.html:87 msgid "Mark as sent" msgstr "Пометить как отправленное" -#: templates/web/base/admin/users/form.html:112 +#: templates/web/base/admin/users/form.html:108 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "<strong>Помечайте</strong> тех пользователей, за действиями которых вы хотите следить." -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:760 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:105 +#: templates/web/base/contact/enquiry/index.html:41 +#: templates/web/base/contact/index.html:109 msgid "Message" msgstr "Сообщение" -#: templates/web/zurich/admin/report_edit.html:281 +#: templates/web/zurich/admin/reports/edit.html:269 msgid "Message to competent body:" msgstr "Сообщение компетентному учреждению:" -#: templates/web/zurich/admin/report_edit.html:279 +#: templates/web/zurich/admin/reports/edit.html:267 msgid "Message to external body:" msgstr "Сообщение внешнему учреждению:" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/bodies/contact-form.html:62 +#: templates/web/base/admin/extra-metadata-option.html:21 +msgid "Message to show when form is disabled (HTML permitted)" +msgstr "" + +#: templates/web/base/admin/reports/edit.html:72 msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:443 +#: perllib/FixMyStreet/App/Controller/Open311.pm:451 msgid "Missing jurisdiction_id" msgstr "Не найден параметр jurisdiction_id" @@ -2111,7 +2213,8 @@ msgstr "Не найден параметр jurisdiction_id" msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:708 +#: perllib/FixMyStreet/Cobrand/Default.pm:755 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:197 msgid "Moderate report details" msgstr "" @@ -2134,36 +2237,44 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Прошло модерацию в течение одного рабочего дня" -#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/reports/edit.html:193 #: templates/web/base/admin/update_edit.html:86 msgid "Moderation history" msgstr "" -#: templates/web/base/dashboard/index.html:102 +#: templates/web/base/dashboard/index.html:103 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" msgstr "Месяц" -#: templates/web/base/reports/_list-filters.html:84 +#: templates/web/base/admin/triage/_list-filters.html:37 +#: templates/web/base/reports/_list-filters-sort.html:11 msgid "Most commented" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:696 +#: perllib/FixMyStreet/App/Controller/Report.pm:703 +#: perllib/FixMyStreet/App/Controller/Report.pm:707 +#: templates/web/base/admin/category-checkboxes.html:32 +msgid "Multiple Groups" +msgstr "" + #: templates/web/base/admin/bodies/form.html:24 #: templates/web/base/admin/bodies/index.html:25 -#: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 -#: templates/web/base/admin/index.html:62 +#: templates/web/base/admin/index.html:68 #: templates/web/base/admin/list_updates.html:7 +#: templates/web/base/admin/manifesttheme/index.html:7 #: templates/web/base/admin/reportextrafields/edit.html:11 #: templates/web/base/admin/reportextrafields/index.html:6 -#: templates/web/base/admin/reports.html:14 -#: templates/web/base/admin/responsepriorities/list.html:6 +#: templates/web/base/admin/reports/index.html:14 +#: templates/web/base/admin/responsepriorities/index.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users/import.html:23 #: templates/web/base/admin/users/import.html:46 -#: templates/web/base/admin/users/index.html:16 +#: templates/web/base/admin/users/index.html:43 #: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 @@ -2171,28 +2282,27 @@ msgstr "" msgid "Name" msgstr "Имя" -#: templates/web/base/admin/report_edit.html:135 -#: templates/web/base/admin/responsepriorities/edit.html:13 +#: templates/web/base/admin/reports/edit.html:140 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Имя:" -#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 -#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#: perllib/FixMyStreet/Cobrand/Rutland.pm:20 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:26 msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/inspect/information.html:40 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:48 +#: templates/web/base/report/inspect/information.html:35 msgid "Nearest calculated address:" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:151 +#: perllib/FixMyStreet/Geocode/OSM.pm:154 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Ближайшая к метке дорога (генерируется автоматически с использованием сервиса OpenStreetMap): %s%s" @@ -2200,12 +2310,12 @@ msgstr "Ближайшая к метке дорога (генерируется msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ближайший к метке почтовый индекс (генерируется автоматически): %s (%sm мил.)" -#: perllib/FixMyStreet/Cobrand/Default.pm:562 +#: perllib/FixMyStreet/Cobrand/Default.pm:607 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ближайшая к метке дорога (генерируется автоматически с использованием сервиса Bing Maps): %s" -#: perllib/FixMyStreet/Script/Alerts.pm:344 +#: perllib/FixMyStreet/Script/Alerts.pm:358 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2221,16 +2331,16 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Почти готово! Проверьте почту…" -#: templates/web/base/auth/2faform.html:8 +#: templates/web/base/auth/2fa/form.html:8 #: templates/web/base/auth/smsform.html:19 msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:54 msgid "New body added" msgstr "Добавлено новое учреждение" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 msgid "New category contact added" msgstr "Добавлен новый контакт в категории" @@ -2238,8 +2348,13 @@ msgstr "Добавлен новый контакт в категории" msgid "New email address:" msgstr "новый адрес электронной почты" -#: templates/web/zurich/admin/report_edit-sdm.html:109 -#: templates/web/zurich/admin/report_edit.html:137 +#: templates/web/base/admin/extra-metadata-item.html:14 +#: templates/web/base/admin/extra-metadata-item.html:20 +msgid "New field" +msgstr "" + +#: templates/web/zurich/admin/report_edit-sdm.html:96 +#: templates/web/zurich/admin/reports/edit.html:125 msgid "New internal note:" msgstr "Новая внутренняя заметка:" @@ -2247,13 +2362,13 @@ msgstr "Новая внутренняя заметка:" msgid "New local problems on FixMyStreet" msgstr "Новые неполадки в вашем районе на FixMyStreet" -#: templates/web/zurich/admin/report_edit-sdm.html:113 +#: templates/web/zurich/admin/report_edit-sdm.html:100 msgid "New note to DM:" msgstr "Новая заметка для DM:" #: templates/web/base/auth/change_password.html:47 -#: templates/web/base/auth/create.html:49 -#: templates/web/base/report/form/user_loggedout_by_email.html:54 +#: templates/web/base/auth/create.html:64 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 msgid "New password:" msgstr "Новый пароль" @@ -2261,8 +2376,8 @@ msgstr "Новый пароль" msgid "New phone number:" msgstr "Новый номер телефона" -#: templates/web/base/admin/responsepriorities/edit.html:4 -#: templates/web/base/admin/responsepriorities/list.html:34 +#: templates/web/base/admin/responsepriorities/edit.html:3 +#: templates/web/base/admin/responsepriorities/index.html:52 msgid "New priority" msgstr "Новый приоритет" @@ -2319,10 +2434,10 @@ msgstr "Новые обращения" msgid "New state" msgstr "Новый статус" -#: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:37 -#: templates/web/zurich/admin/template_edit.html:9 -#: templates/web/zurich/admin/templates.html:26 +#: templates/web/base/admin/templates/edit.html:4 +#: templates/web/base/admin/templates/view.html:37 +#: templates/web/zurich/admin/templates/edit.html:9 +#: templates/web/zurich/admin/templates/view.html:26 msgid "New template" msgstr "Новый шаблон" @@ -2330,7 +2445,8 @@ msgstr "Новый шаблон" msgid "New updates on report <a href=\"%s\">%s</a>" msgstr "" -#: templates/web/base/reports/_list-filters.html:80 +#: templates/web/base/admin/triage/_list-filters.html:33 +#: templates/web/base/reports/_list-filters-sort.html:7 msgid "Newest" msgstr "Самые новые" @@ -2342,33 +2458,36 @@ msgstr "Далее" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1201 -#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 -#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 +#: perllib/FixMyStreet/Cobrand/Default.pm:1262 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 #: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:133 -#: templates/web/base/admin/report_edit.html:96 +#: templates/web/base/admin/reports/edit.html:101 +#: templates/web/base/admin/reports/edit.html:138 #: templates/web/base/admin/update_edit.html:26 #: templates/web/base/admin/users/alerts.html:21 -#: templates/web/base/questionnaire/index.html:106 -#: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:116 +#: templates/web/base/questionnaire/index.html:108 +#: templates/web/base/questionnaire/index.html:41 msgid "No" msgstr "Нет" +#: templates/web/base/admin/category-checkboxes.html:31 +msgid "No Group" +msgstr "" + #: templates/web/base/report/form/user_loggedout_password.html:7 msgid "No account?" msgstr "" -#: templates/web/base/admin/users/form.html:52 +#: templates/web/base/admin/users/form.html:55 msgid "No body" msgstr "Нет учреждения" -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 msgid "No council selected" msgstr "Орган самоуправления не выбран" @@ -2384,24 +2503,22 @@ msgstr "Не найдено помеченных неполадок." msgid "No flagged users found." msgstr "Не найдено помеченных пользователей." -#: templates/web/zurich/admin/report_edit-sdm.html:125 -#: templates/web/zurich/admin/report_edit.html:260 +#: templates/web/zurich/admin/report_edit-sdm.html:112 +#: templates/web/zurich/admin/reports/edit.html:248 msgid "No further updates" msgstr "Пока нет обновлений" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 -msgid "No inspections by that inspector in the selected date range." -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 -msgid "No inspections in the selected date range." +#: templates/web/base/report/form/user.html:33 +#: templates/web/base/report/form/user.html:40 +msgid "No personal details will be stored, and you will not receive updates about this report." msgstr "" #: templates/web/base/around/on_map_list_items.html:13 msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#. ("JS") +#: templates/web/base/js/translation_strings.html:56 msgid "No result returned" msgstr "Результатов нет" @@ -2414,26 +2531,26 @@ msgstr "" "В данный момент конкретные области недоступны, так как <code>MAPIT_URL</code>в вашем\n" " файле конфигурации не указывает на сервис MapIt в реальном времени." -#: templates/web/base/report/_support.html:2 +#: templates/web/base/report/_support.html:3 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Нет группы поддержки" -#: templates/web/base/admin/report_edit.html:67 -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/reports/edit.html:67 +#: templates/web/base/admin/reports/edit.html:97 +#: templates/web/base/admin/reports/edit.html:99 msgid "None" msgstr "Нет" -#: templates/web/base/admin/users/form.html:76 -#: templates/web/base/admin/users/form.html:77 +#: templates/web/base/admin/users/form.html:79 +#: templates/web/base/admin/users/form.html:80 msgid "" "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/users/form.html:42 -#: templates/web/base/admin/users/form.html:43 +#: templates/web/base/admin/users/form.html:45 +#: templates/web/base/admin/users/form.html:46 msgid "" "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n" " Authorised staff users can be associated with the body they represent.<br>\n" @@ -2445,7 +2562,7 @@ msgstr "" " В зависимости от должности, сотрудники могут иметь доступ к панели управления (там содержится краткая информация\n" " о действиях их учреждения), а также возможность скрывать обращения или устанавливать специфические статусы обращений." -#: templates/web/zurich/admin/report_edit-sdm.html:104 +#: templates/web/zurich/admin/report_edit-sdm.html:88 msgid "Not for my subdivision" msgstr "Не для моего подразделения" @@ -2463,7 +2580,7 @@ msgstr "Первое обращение в органы самоуправлен msgid "Note" msgstr "Примечание" -#: templates/web/zurich/admin/bodies/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:47 msgid "Note:" msgstr "Примечание:" @@ -2475,8 +2592,12 @@ msgstr "Примечание: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "Заметки SDM для DM" -#: templates/web/base/admin/extra-metadata-form.html:36 -msgid "Notice" +#: templates/web/base/admin/extra-metadata-item.html:42 +msgid "Notice shown to user" +msgstr "" + +#: templates/web/base/admin/extra-metadata-item.html:61 +msgid "Notice text" msgstr "" #: templates/web/base/reports/index.html:127 @@ -2487,15 +2608,17 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:60 -msgid "OK" -msgstr "ОК" +#: templates/web/base/offline/fallback.html:4 +msgid "Offline" +msgstr "" -#: templates/web/base/js/translation_strings.html:97 +#. ("JS") +#: templates/web/base/js/translation_strings.html:100 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#. ("JS") +#: templates/web/base/js/translation_strings.html:97 msgid "Offline update data saved" msgstr "" @@ -2503,22 +2626,27 @@ msgstr "" msgid "Old state" msgstr "Давний статус" -#: templates/web/base/reports/_list-filters.html:81 +#: templates/web/base/admin/triage/_list-filters.html:34 +#: templates/web/base/reports/_list-filters-sort.html:8 msgid "Oldest" msgstr "Самые старые" -#: perllib/FixMyStreet/SendReport/Email.pm:94 +#: perllib/FixMyStreet/SendReport/Email.pm:98 msgid "On behalf of %s" msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:46 +msgid "Only staff users will be able to add reports in this category." +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:70 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 #: templates/web/base/admin/states/index.html:32 #: templates/web/base/admin/update_edit.html:30 -#: templates/web/base/dashboard/index.html:116 +#: templates/web/base/dashboard/index.html:117 #: templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "Вопрос открыт" @@ -2543,7 +2671,7 @@ msgstr "Веб-страница сервиса Open311" msgid "Open311 specification" msgstr "Спецификация Open311" -#: templates/web/base/admin/extra-metadata-form.html:63 +#: templates/web/base/admin/extra-metadata-item.html:75 msgid "Options" msgstr "" @@ -2555,25 +2683,26 @@ msgstr "" msgid "Or sign in with password to prefill this information." msgstr "" -#: templates/web/base/alert/_list.html:84 +#: templates/web/base/alert/_list.html:79 msgid "Or subscribe by RSS" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:8 +#: templates/web/base/admin/extra-metadata-item.html:55 msgid "Order" msgstr "Порядок" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 -#: perllib/FixMyStreet/DB/Result/Problem.pm:612 -#: perllib/FixMyStreet/DB/Result/Problem.pm:627 -#: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:192 -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99 +#: perllib/FixMyStreet/App/Controller/Report.pm:703 +#: perllib/FixMyStreet/App/Controller/Report.pm:706 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1423 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:765 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:766 +#: perllib/FixMyStreet/DB/Result/Problem.pm:641 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 +#: perllib/FixMyStreet/DB/Result/Problem.pm:663 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 +#: perllib/FixMyStreet/Script/Reports.pm:168 +#: perllib/FixMyStreet/Script/Reports.pm:175 msgid "Other" msgstr "Другое" @@ -2603,21 +2732,37 @@ msgstr "Страница не найдена" msgid "Parent" msgstr "Родительская" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 +#: templates/web/base/admin/bodies/contact-form.html:91 +#, fuzzy +msgid "Parent categories" +msgstr "Другие категории" + +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Partial" msgstr "Частичная" -#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/base/report/form/user_loggedout_by_email.html:51 #: templates/web/zurich/auth/general.html:20 #: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Пароль (необязательно)" -#: templates/web/base/js/translation_strings.html:69 -msgid "Permalink" +#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248 +#, fuzzy +msgid "Password change cancelled." +msgstr "Ваш пароль был изменен" + +#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Password expired" +msgstr "Пароль (необязательно)" + +#: templates/web/base/admin/roles/index.html:6 +#, fuzzy +msgid "Permissions" msgstr "Постоянная ссылка" -#: templates/web/base/admin/users/form.html:170 +#: templates/web/base/admin/users/form.html:159 msgid "Permissions:" msgstr "" @@ -2625,7 +2770,7 @@ msgstr "" msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:28 +#: templates/web/base/report/inspect/information.html:15 msgid "Phone Reporter:" msgstr "" @@ -2636,39 +2781,39 @@ msgid "Phone number" msgstr "Номер телефона" #: templates/web/base/report/form/user_loggedout_by_email.html:13 -#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/form/user_loggedout_by_email.html:33 #: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Номер телефона (необязательно)" -#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:30 msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/users/form.html:29 +#: templates/web/base/admin/users/form.html:32 msgid "Phone verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/reports/edit.html:148 +#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Телефон:" #: templates/web/base/admin/update_edit.html:95 -#: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/questionnaire/index.html:93 +#: templates/web/base/questionnaire/index.html:80 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:29 -#: templates/web/base/report/new/form_report.html:44 -#: templates/web/base/report/new/form_report.html:46 +#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/report/new/form_report.html:41 +#: templates/web/base/report/new/form_report.html:56 +#: templates/web/base/report/new/form_report.html:58 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 #: templates/web/base/report/update/moderation_diff.html:4 -#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-dm.html:31 #: templates/web/zurich/admin/index-sdm.html:24 -#: templates/web/zurich/admin/reports.html:16 +#: templates/web/zurich/admin/reports/index.html:16 #: templates/web/zurich/admin/stats/index.html:58 #: templates/web/zurich/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:36 @@ -2676,20 +2821,20 @@ msgstr "Телефон:" msgid "Photo" msgstr "Фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:196 +#: perllib/FixMyStreet/App/Controller/Photo.pm:213 msgid "Photo is required." msgstr "Необходимо добавить фото." -#: templates/web/zurich/admin/bodies/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:44 msgid "Photo required" msgstr "Необходимо добавить фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:113 +#: perllib/FixMyStreet/App/Controller/Photo.pm:130 msgid "Photo upload failed." msgstr "" -#: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/questionnaire/index.html:80 +#: templates/web/base/report/new/form_report.html:41 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2699,6 +2844,10 @@ msgstr "Фотографии" msgid "Photos of recent nearby reports" msgstr "Фотографии происшествий поблизости, размещенные в недавних обращениях" +#: templates/web/base/contact/enquiry/index.html:49 +msgid "Photos/Documents" +msgstr "" + #: templates/web/base/reports/index.html:76 #: templates/web/base/reports/index.html:79 msgid "Pick your council" @@ -2709,8 +2858,9 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:75 -#: templates/web/base/js/translation_strings.html:42 +#. ("JS") +#: templates/web/base/around/display_location.html:79 +#: templates/web/base/js/translation_strings.html:44 msgid "Place pin on map" msgstr "Поставить метку на карте" @@ -2734,31 +2884,31 @@ msgstr "Проверьте пароли и попробуйте еще раз" msgid "Please check your email address is correct" msgstr "Проверьте правильность написания адреса эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 -#: perllib/FixMyStreet/DB/Result/User.pm:220 -#: perllib/FixMyStreet/DB/Result/User.pm:221 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521 +#: perllib/FixMyStreet/DB/Result/User.pm:263 +#: perllib/FixMyStreet/DB/Result/User.pm:264 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:7 msgid "Please check your phone number is correct" msgstr "" +#. ("JS") #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:19 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1029 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1073 +#: templates/web/base/js/translation_strings.html:21 msgid "Please choose a category" msgstr "Выберите категорию" -#: perllib/FixMyStreet/App/Controller/Auth.pm:387 -#: perllib/FixMyStreet/App/Controller/Auth.pm:413 +#: perllib/FixMyStreet/App/Controller/Auth.pm:471 +#: perllib/FixMyStreet/App/Controller/Auth.pm:497 msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:307 #: templates/web/base/admin/bodies/body.html:12 #: templates/web/base/admin/bodies/index.html:4 -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/templates/edit.html:13 msgid "Please correct the errors below" msgstr "Исправьте ошибки ниже" @@ -2776,104 +2926,122 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Будьте вежливы! Грубые, некорректные обращения к представителям органов самоуправления дискредитируют всех пользователей сервиса. " +#. ("JS") #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 -#: perllib/FixMyStreet/DB/Result/Comment.pm:149 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:293 +#: perllib/FixMyStreet/DB/Result/Comment.pm:143 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Введите текст сообщения" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 -#: perllib/FixMyStreet/DB/Result/User.pm:223 -#: perllib/FixMyStreet/DB/Result/User.pm:224 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519 +#: perllib/FixMyStreet/DB/Result/User.pm:266 +#: perllib/FixMyStreet/DB/Result/User.pm:267 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:4 msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:431 msgid "Please enter a name for this body" msgstr "" +#. ("JS") #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:31 msgid "Please enter a password" msgstr "Введите пароль" -#: perllib/FixMyStreet/App/Controller/Contact.pm:133 -#: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:8 +#. ("JS") +#: perllib/FixMyStreet/App/Controller/Contact.pm:147 +#: perllib/FixMyStreet/DB/Result/Problem.pm:365 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter a subject" msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 -#: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:22 -#: templates/web/base/js/translation_strings.html:26 +#. ("JS") +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261 +#: perllib/FixMyStreet/DB/Result/User.pm:256 +#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:28 msgid "Please enter a valid email" msgstr "Введите действующий адрес эл. почты" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:157 msgid "Please enter a valid email address" msgstr "Введите действующий адрес эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:12 +#. ("JS") +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 +#: templates/web/base/js/translation_strings.html:14 msgid "Please enter some details" msgstr "Введите дополнительную информацию" -#: perllib/FixMyStreet/App/Controller/Contact.pm:132 -#: perllib/FixMyStreet/DB/Result/User.pm:211 +#. ("JS") +#: perllib/FixMyStreet/App/Controller/Contact.pm:146 +#: perllib/FixMyStreet/DB/Result/User.pm:254 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:21 -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your email" msgstr "Введите свой эл. адрес" -#: templates/web/base/js/translation_strings.html:38 +#. ("JS") +#: templates/web/base/js/translation_strings.html:40 msgid "Please enter your first name" msgstr "Введите свое имя" -#: perllib/FixMyStreet/Cobrand/UK.pm:330 -#: templates/web/base/js/translation_strings.html:17 +#. ("JS") +#: perllib/FixMyStreet/Cobrand/UK.pm:343 +#: templates/web/base/js/translation_strings.html:19 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Введите свое полное имя. Эта информация необходима представителям органов самоуправления. Если вы не хотите, чтобы ваше полное имя отображалось на сайте, снимите галочку ниже." -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 -#: perllib/FixMyStreet/DB/Result/Comment.pm:146 -#: perllib/FixMyStreet/DB/Result/Problem.pm:382 -#: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:35 +#, fuzzy +msgid "Please enter your full name." +msgstr "Введите свое имя" + +#. ("JS") +#: perllib/FixMyStreet/App/Controller/Contact.pm:145 +#: perllib/FixMyStreet/DB/Result/Comment.pm:140 +#: perllib/FixMyStreet/DB/Result/Problem.pm:379 +#: perllib/FixMyStreet/DB/Result/User.pm:249 +#: templates/web/base/js/translation_strings.html:18 msgid "Please enter your name" msgstr "Введите свое имя" +#. ("JS") #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your phone number" msgstr "Введите номер своего телефона" -#: templates/web/base/js/translation_strings.html:39 +#. ("JS") +#: templates/web/base/js/translation_strings.html:41 msgid "Please enter your second name" msgstr "Введите свою фамилию" -#: templates/web/base/js/translation_strings.html:37 +#. ("JS") +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your title" msgstr "Напишите, как к вам обращаться" @@ -2882,7 +3050,7 @@ msgstr "Напишите, как к вам обращаться" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Вы можете еще раз <a href=\"%s\">войти на сайт</a> или вернуться на <a href=\"/\">главную страницу</a>." -#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:2 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Подробно расскажите о неполадке в поле ниже." @@ -2892,7 +3060,7 @@ msgstr "Подробно расскажите о неполадке в поле msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Заполните форму ниже: расскажите о неполадке, уточните местоположение. Постарайтесь предоставить как можно более подробную информацию." -#: templates/web/base/auth/2faform.html:9 +#: templates/web/base/auth/2fa/form.html:9 msgid "Please generate a two-factor code and enter it below:" msgstr "" @@ -2900,8 +3068,16 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Укажите, хотите ли вы еще один опросник" -#: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:32 +#. ("JS") +#: perllib/FixMyStreet/DB/Result/Problem.pm:368 +#: templates/web/base/js/translation_strings.html:11 +#, fuzzy +msgid "Please make sure you are not including an email address" +msgstr "Введите действующий адрес эл. почты" + +#. ("JS") +#: perllib/FixMyStreet/App/Controller/Auth.pm:494 +#: templates/web/base/js/translation_strings.html:34 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2927,11 +3103,11 @@ msgstr "" msgid "Please note:" msgstr "Внимание:" -#: perllib/FixMyStreet/App/Controller/Report.pm:445 +#: perllib/FixMyStreet/App/Controller/Report.pm:471 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:427 +#: perllib/FixMyStreet/App/Controller/Report.pm:453 msgid "Please provide a public update for this report." msgstr "" @@ -2948,15 +3124,19 @@ msgstr "Предоставьте не только фото, но и письм msgid "Please say whether you've ever reported a problem to your council before" msgstr "Вы впервые отправляете обращение в ваш орган самоуправления?" -#: templates/web/zurich/admin/report_edit.html:206 +#: templates/web/base/auth/2fa/form-add.html:1 +msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:" +msgstr "" + +#: templates/web/zurich/admin/reports/edit.html:194 msgid "Please select a body." msgstr "Выберите учреждение." -#: perllib/FixMyStreet/App/Controller/Alert.pm:83 +#: perllib/FixMyStreet/App/Controller/Alert.pm:86 msgid "Please select the feed you want" msgstr "Выберите рассылку" -#: perllib/FixMyStreet/App/Controller/Alert.pm:131 +#: perllib/FixMyStreet/App/Controller/Alert.pm:134 msgid "Please select the type of alert you want" msgstr "Выберите тип уведомления" @@ -2964,19 +3144,20 @@ msgstr "Выберите тип уведомления" msgid "Please state whether or not the problem has been fixed" msgstr "Сообщите о статусе неполадки: проблема была решена?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:77 +#. ("JS") +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:140 +#: templates/web/base/js/translation_strings.html:80 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:148 msgid "Please write a message" msgstr "Напишите сообщение" @@ -2984,23 +3165,23 @@ msgstr "Напишите сообщение" msgid "Post" msgstr "Опубликовать" -#: templates/web/base/alert/index.html:33 +#: templates/web/base/alert/index.html:11 msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:221 +#: perllib/FixMyStreet/DB/Result/Comment.pm:215 msgid "Posted anonymously at %s" msgstr "Опубликовано анонимно (%s)" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:257 msgid "Posted by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:246 +#: perllib/FixMyStreet/DB/Result/Comment.pm:245 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "Автор публикации: <strong>%s</strong> (%s), время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:248 +#: perllib/FixMyStreet/DB/Result/Comment.pm:247 msgid "Posted by <strong>%s</strong> at %s" msgstr "Автор публикации: <strong>%s</strong>, время публикации: %s" @@ -3008,20 +3189,32 @@ msgstr "Автор публикации: <strong>%s</strong>, время пуб msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "На базе платформы <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet</a>" +#: templates/web/base/admin/bodies/contact-form.html:41 +msgid "Prevent new reports from using this category, <em>and</em> also remove it from map filters." +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:36 +msgid "Prevent new reports from using this category, but keep it available in map filters." +msgstr "" + +#: templates/web/base/admin/extra-metadata-item.html:94 +msgid "Prevent user from submitting the form until this field is filled in." +msgstr "" + #: templates/web/base/pagination.html:4 msgid "Previous" msgstr "Предыдущая" -#: perllib/FixMyStreet/Cobrand/Default.pm:662 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:147 -#: templates/web/base/report/_item.html:72 +#: templates/web/base/report/_item.html:82 +#: templates/web/base/report/inspect/extra_details.html:2 msgid "Priority" msgstr "" -#: templates/web/base/main_nav_items.html:51 +#: templates/web/base/main_nav_items.html:35 msgid "Privacy" msgstr "Конфиденциальность" @@ -3031,15 +3224,14 @@ msgstr "Конфиденциальность" msgid "Privacy and cookies" msgstr "Конфиденциальность и файлы cookie" -#: templates/web/base/admin/bodies/body.html:89 -#: templates/web/base/admin/bodies/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:16 +#: templates/web/base/admin/bodies/body.html:90 +#: templates/web/base/admin/reports/edit.html:157 +#: templates/web/base/report/inspect/information.html:3 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Доступ ограничен" -#: templates/web/base/reports/_list-filters.html:28 +#: templates/web/base/reports/_list-filter-status.html:28 msgid "Private only" msgstr "" @@ -3051,10 +3243,29 @@ msgstr "Проблема" msgid "Problem %d created" msgstr "Сообщено о проблеме: %d" +#: templates/web/base/admin/users/log.html:54 +#, fuzzy +msgid "Problem %s added to shortlist" +msgstr "Проблема (%s) отправлена в орган самоуправления: %s" + #: templates/web/base/admin/timeline.html:24 msgid "Problem %s confirmed" msgstr "Проблема подтверждена: %s" +#: templates/web/base/admin/users/log.html:47 +#, fuzzy +msgid "Problem %s created" +msgstr "Сообщено о проблеме: %d" + +#: templates/web/base/admin/users/log.html:49 +#, fuzzy +msgid "Problem %s created on behalf of %s" +msgstr "Сообщено о проблеме: %d" + +#: templates/web/base/admin/users/log.html:56 +msgid "Problem %s removed from shortlist" +msgstr "" + #: templates/web/base/admin/timeline.html:26 msgid "Problem %s sent to council %s" msgstr "Проблема (%s) отправлена в орган самоуправления: %s" @@ -3065,7 +3276,7 @@ msgstr "Проблема (%s) отправлена в орган самоупр msgid "Problem breakdown by state" msgstr "Сортировка проблем по статусу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:921 +#: perllib/FixMyStreet/App/Controller/Admin.pm:276 msgid "Problem marked as open." msgstr "Проблема помечена как открытая." @@ -3073,7 +3284,8 @@ msgstr "Проблема помечена как открытая." msgid "Problem state change based on survey results" msgstr "Смена статуса проблемы на основании результатов опроса" -#: perllib/FixMyStreet/Cobrand/Default.pm:707 +#: perllib/FixMyStreet/Cobrand/Default.pm:754 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:196 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Проблемы" @@ -3082,11 +3294,11 @@ msgstr "Проблемы" msgid "Problems in an area" msgstr "" -#: templates/web/base/report/display_tools.html:22 +#: templates/web/base/report/display_tools.html:24 msgid "Problems nearby" msgstr "Проблемы поблизости" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems on the map" msgstr "Проблемы на карте" @@ -3094,37 +3306,43 @@ msgstr "Проблемы на карте" msgid "Problems recently reported fixed on FixMyStreet" msgstr "Недавно решенные проблемы на сайте FixMyStreet" -#: templates/web/base/alert/_list.html:29 +#: templates/web/base/alert/_list_rss_local.html:7 msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:847 +#: perllib/FixMyStreet/Cobrand/Default.pm:905 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 -#: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 -#: perllib/FixMyStreet/Cobrand/UK.pm:270 +#: perllib/FixMyStreet/Cobrand/UK.pm:226 perllib/FixMyStreet/Cobrand/UK.pm:271 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "Problems within %s" msgstr "Проблемы в пределах этого места: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "Problems within %s ward" msgstr "Проблемы в пределах этого района: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:264 perllib/FixMyStreet/Cobrand/UK.pm:276 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "Problems within %s ward, %s" msgstr "" #. ("First %s is the body name, second %s the site name") +#: templates/web/base/admin/triage/index.html:0 +#: templates/web/base/admin/triage/index.html:14 #: templates/web/base/reports/body.html:0 -#: templates/web/base/reports/body.html:25 +#: templates/web/base/reports/body.html:32 msgid "Problems within %s, %s" msgstr "Проблемы в пределах этого места: %s, %s" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/reports/edit.html:75 msgid "Property address:" msgstr "Адрес имущества:" +#: templates/web/base/admin/extra-metadata-item.html:105 +msgid "Protect from Open311 changes" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:3 -#: templates/web/base/report/update-form-wrapper.html:3 +#: templates/web/base/report/update-form-wrapper.html:9 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Предоставить новые данные" @@ -3133,32 +3351,37 @@ msgstr "Предоставить новые данные" msgid "Provide update as" msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:57 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/base/report/form/user_loggedout_by_email.html:59 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Пароль необязателен. Но когда вы предоставите эти данные, вы сможете быстрее сообщать о проблемах, вводить новые данные о них и редактировать свои обращения." -#: templates/web/base/report/new/form_report.html:13 +#: templates/web/base/report/new/form_public_councils_text.html:2 msgid "Public details" msgstr "" -#: templates/web/zurich/admin/report_edit.html:242 -#: templates/web/zurich/admin/report_edit.html:269 +#: templates/web/zurich/admin/reports/edit.html:230 +#: templates/web/zurich/admin/reports/edit.html:257 msgid "Public response:" msgstr "Публичный ответ:" -#: templates/web/base/report/_inspect.html:192 +#: templates/web/base/report/inspect/public_update.html:11 msgid "Public update:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:122 +#: templates/web/zurich/admin/reports/edit.html:110 #: templates/web/zurich/admin/stats/index.html:59 msgid "Publish photo" msgstr "Опубликовать фото" +#: templates/web/base/admin/extra-metadata-item.html:60 +#, fuzzy +msgid "Question text" +msgstr "Опрос" + #: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 @@ -3175,23 +3398,24 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Опрос (%d) отправлен для проблемы «%d»" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 -#: templates/web/base/report/updates.html:17 +#: templates/web/base/report/updates.html:20 msgid "Questionnaire filled in by problem reporter" msgstr "Опрос заполнен автором обращения" -#: templates/web/base/alert/_list.html:26 +#: templates/web/base/alert/_list.html:35 +#: templates/web/base/alert/_list.html:53 +#: templates/web/base/alert/_list_rss_local.html:3 #: templates/web/base/alert/updates.html:9 -#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display_tools.html:42 +#: templates/web/base/report/display_tools.html:44 msgid "RSS feed" msgstr "RSS-фид" -#: perllib/FixMyStreet/Cobrand/UK.pm:259 perllib/FixMyStreet/Cobrand/UK.pm:271 +#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 msgid "RSS feed for %s" msgstr "RSS-фид для: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290 msgid "RSS feed for %s ward, %s" msgstr "RSS-фид для района: %s, %s" @@ -3199,52 +3423,56 @@ msgstr "RSS-фид для района: %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 +#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "RSS feed of %s" msgstr "%s: RSS-фид" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:317 msgid "RSS feed of %s, within %s ward" msgstr "%s: RSS-фид, в пределах района: %s" -#: templates/web/base/alert/_list.html:26 +#: templates/web/base/alert/_list_rss_local.html:3 msgid "RSS feed of nearby problems" msgstr "RSS-фид о проблемах поблизости" -#: perllib/FixMyStreet/Cobrand/Default.pm:848 +#: perllib/FixMyStreet/Cobrand/Default.pm:906 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:233 msgid "RSS feed of problems within %s" msgstr "RSS-фид о проблемах в пределах: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:226 +#: perllib/FixMyStreet/Cobrand/UK.pm:239 msgid "RSS feed of problems within %s ward" msgstr "RSS-фид о проблемах в пределах района: %s" -#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:3 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-фид о недавних проблемах поблизости" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display_tools.html:42 +#: templates/web/base/report/display_tools.html:44 msgid "RSS feed of updates to this problem" msgstr "RSS-фид об обновлениях по этой проблеме" -#: templates/web/base/report/_item_expandable.html:50 +#: templates/web/base/report/_item_expandable.html:55 msgid "Read less" msgstr "" -#: templates/web/base/report/_item_expandable.html:50 +#: templates/web/base/report/_item_expandable.html:55 msgid "Read more" msgstr "" +#: templates/web/base/admin/reports/edit.html:93 +msgid "Reason:" +msgstr "" + #: templates/web/base/alert/updates.html:14 -#: templates/web/base/report/display_tools.html:44 +#: templates/web/base/report/display_tools.html:46 msgid "Receive email when updates are left on this problem." msgstr "Получать эл. письма об обновлениях по этой проблеме." -#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:815 msgid "Received by %s moments later" msgstr "" @@ -3258,11 +3486,12 @@ msgstr "Недавние проблемы поблизости, %s" msgid "Recently reported problems" msgstr "Недавние обращения о проблемах" -#: templates/web/base/reports/_list-filters.html:82 +#: templates/web/base/admin/triage/_list-filters.html:35 +#: templates/web/base/reports/_list-filters-sort.html:9 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:63 +#: templates/web/base/report/inspect/information.html:52 msgid "Reject report" msgstr "" @@ -3270,15 +3499,11 @@ msgstr "" msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." msgstr "Важно: сайт FixMyStreet предназначен для регистрации материальных проблем, которые возможно устранить, и работы с ними. Если проблема, о которой вы хотите сообщить, не соответствует тематике сайта, обратитесь в местный орган самоуправления через соответствующий сайт." -#: templates/web/base/admin/extra-metadata-form.html:78 -msgid "Remove" -msgstr "" - -#: templates/web/base/admin/users/form.html:205 +#: templates/web/base/admin/users/form.html:197 msgid "Remove account details" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:4 +#: templates/web/base/admin/extra-metadata-item.html:23 msgid "Remove field" msgstr "" @@ -3294,21 +3519,25 @@ msgstr "Удалить пометку" msgid "Remove from shortlist" msgstr "" -#: templates/web/base/report/display_tools.html:6 +#: templates/web/base/report/display_tools.html:7 msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:169 +#: templates/web/base/admin/extra-metadata-option.html:26 +msgid "Remove option" +msgstr "" + +#: templates/web/base/admin/reports/edit.html:174 #: templates/web/base/admin/update_edit.html:74 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Удалить фото (действие отменить невозможно)" -#: templates/web/base/auth/generate_token.html:52 +#: templates/web/base/auth/generate_token.html:78 msgid "Replace token" msgstr "" -#: templates/web/zurich/admin/report_edit.html:240 +#: templates/web/zurich/admin/reports/edit.html:228 msgid "Reply to user:" msgstr "Ответить пользователю:" @@ -3316,30 +3545,38 @@ msgstr "Ответить пользователю:" msgid "Report" msgstr "Сообщить" -#: templates/web/base/report/_inspect.html:20 -#: templates/web/base/report/_item.html:50 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/inspect/information.html:7 msgid "Report ID:" msgstr "" +#. ("JS") #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Сообщить о проблеме" -#: templates/web/base/js/translation_strings.html:87 +#. ("JS") +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" -#: templates/web/base/report/display_tools.html:10 -#: templates/web/base/report/display_tools.html:9 +#: templates/web/base/report/display_tools.html:11 msgid "Report abuse" msgstr "Сообщить об оскорбительном поведении" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/report/form/user.html:32 +#: templates/web/base/report/form/user.html:39 +#, fuzzy +msgid "Report anonymously" +msgstr "Сообщено анонимно в: %s" + +#. ("JS") +#: templates/web/base/js/translation_strings.html:91 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3349,17 +3586,20 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:303 +#: templates/web/base/report/new/form_public_councils_text.html:3 +#, fuzzy +msgid "Report details" +msgstr "Сообщить об оскорбительном поведении" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:306 msgid "Report on %s" msgstr "Сообщить о пользователе: %s" -#: templates/web/base/dashboard/index.html:62 +#: templates/web/base/dashboard/index.html:63 msgid "Report state:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/base/report/new/login_success_form.html:1 -#: templates/web/base/report/new/oauth_email_form.html:1 +#: templates/web/base/report/new/form_heading.html:1 msgid "Report your problem" msgstr "Сообщить о своей проблеме" @@ -3372,24 +3612,24 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Городские проблемы. Сообщайте, просматривайте, обсуждайте." -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:60 +#: perllib/FixMyStreet/DB/Result/Problem.pm:652 +#: templates/web/base/contact/index.html:64 msgid "Reported anonymously at %s" msgstr "Сообщено анонимно в: %s" #: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/creator_fixed.html:14 -#: templates/web/base/questionnaire/index.html:64 +#: templates/web/base/questionnaire/index.html:66 msgid "Reported before" msgstr "Сообщено ранее" -#: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:62 +#: perllib/FixMyStreet/DB/Result/Problem.pm:676 +#: templates/web/base/contact/index.html:66 msgid "Reported by %s at %s" msgstr "Автор обращения: %s, время отправки: %s" -#: templates/web/zurich/admin/report_edit-sdm.html:60 -#: templates/web/zurich/admin/report_edit.html:88 +#: templates/web/zurich/admin/report_edit-sdm.html:48 +#: templates/web/zurich/admin/reports/edit.html:76 msgid "Reported by:" msgstr "Автор обращения:" @@ -3397,59 +3637,63 @@ msgstr "Автор обращения:" msgid "Reported in the %s category" msgstr "Обращение отнесено к категории: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:649 msgid "Reported in the %s category anonymously at %s" msgstr "Обращение (категория: %s) отправлено анонимно в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:637 +#: perllib/FixMyStreet/DB/Result/Problem.pm:673 msgid "Reported in the %s category by %s at %s" msgstr "Обращение (категория: %s), автор: %s, отправлено в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:646 msgid "Reported via %s anonymously at %s" msgstr "Анонимно отправлено через: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:634 +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 msgid "Reported via %s by %s at %s" msgstr "Отправлено через: %s, автор: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:643 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Анонимно отправлено через: %s, категория: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:665 msgid "Reported via %s in the %s category by %s at %s" msgstr "Отправлено через: %s, категория: %s, автор обращения: %s, время отправки: %s" #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/reports/edit.html:57 msgid "Reported:" msgstr "Обращение отправлено:" +#. ("JS") #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:59 +#: templates/web/base/js/translation_strings.html:61 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Сообщение о проблеме" -#: perllib/FixMyStreet/Cobrand/Default.pm:652 -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 -#: templates/web/base/dashboard/index.html:107 -#: templates/web/zurich/header.html:45 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:330 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: templates/web/base/around/tabbed_lists.html:3 +#: templates/web/base/dashboard/index.html:108 +#: templates/web/zurich/header.html:48 msgid "Reports" msgstr "Обращения" #: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 -#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Количество символов в тексте обращения не должно превышать %s. Напишите более короткое обращение." -#: templates/web/base/js/translation_strings.html:13 +#. ("JS") +#: templates/web/base/js/translation_strings.html:15 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3457,14 +3701,10 @@ msgstr "" msgid "Reports awaiting approval" msgstr "Обращения, ожидающие проверки" -#: templates/web/base/alert/_list.html:54 +#: templates/web/base/alert/_list.html:48 msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/users/form.html:130 -msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." -msgstr "" - #: templates/web/base/alert/_list.html:15 msgid "Reports near %s are sent to different councils, depending on the type of problem." msgstr "" @@ -3473,63 +3713,61 @@ msgstr "" msgid "Reports published" msgstr "Опубликованные обращения" -#: templates/web/base/js/translation_strings.html:98 +#. ("JS") +#: templates/web/base/js/translation_strings.html:101 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 +#: perllib/FixMyStreet/Cobrand/UK.pm:304 perllib/FixMyStreet/Cobrand/UK.pm:318 msgid "Reports sent to %s, within %s ward" msgstr "" -#: templates/web/base/admin/index.html:56 +#: templates/web/base/admin/index.html:62 msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:90 -msgid "Reports will automatically be sent without needing to be inspected if the user's <strong>reputation</strong> is at or above this value. Set to <strong>0</strong> if all reports must be inspected regardless." -msgstr "" - -#: templates/web/base/admin/bodies/contact-form.html:95 -msgid "Reputation threshold" +#. ("JS") +#: templates/web/base/js/translation_strings.html:42 +msgid "Reposition if needed, then hit Continue" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:30 +#: templates/web/base/admin/extra-metadata-item.html:93 msgid "Required" msgstr "" -#: templates/web/base/admin/report_edit.html:85 +#: templates/web/base/admin/reports/edit.html:85 msgid "Resend report" msgstr "Отправить обращение еще раз" -#: templates/web/base/admin/responsepriorities/index.html:1 -msgid "Response Priorities" +#: templates/web/base/auth/create.html:72 +msgid "Reset" msgstr "" -#: templates/web/base/admin/responsepriorities/list.html:1 -msgid "Response Priorities for %s" +#: templates/web/base/admin/responsepriorities/index.html:1 +msgid "Response Priorities" msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:1 msgid "Response Priority for %s" msgstr "" -#: templates/web/base/admin/template_edit.html:1 +#: templates/web/base/admin/templates/edit.html:1 msgid "Response Template for %s" msgstr "" -#: templates/web/base/admin/templates_index.html:1 +#: templates/web/base/admin/templates/index.html:1 msgid "Response Templates" msgstr "" -#: templates/web/base/admin/templates.html:1 -#: templates/web/zurich/admin/template_edit.html:1 -#: templates/web/zurich/admin/template_edit.html:4 -#: templates/web/zurich/admin/templates.html:1 -#: templates/web/zurich/admin/templates.html:3 +#: templates/web/base/admin/templates/view.html:1 +#: templates/web/zurich/admin/templates/edit.html:1 +#: templates/web/zurich/admin/templates/edit.html:4 +#: templates/web/zurich/admin/templates/view.html:1 +#: templates/web/zurich/admin/templates/view.html:3 msgid "Response Templates for %s" msgstr "Шаблоны ответов для: %s" @@ -3545,56 +3783,77 @@ msgstr "" msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:40 -#: templates/web/base/js/translation_strings.html:57 +#. ("JS") +#: templates/web/base/js/translation_strings.html:59 msgid "Right place?" msgstr "Место указано верно?" -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:161 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Дорога находится в ведении: %s" -#: perllib/FixMyStreet/Geocode/OSM.pm:155 +#: perllib/FixMyStreet/Geocode/OSM.pm:158 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 -#: templates/web/base/admin/report_edit.html:166 +#: templates/web/base/admin/roles/index.html:5 +msgid "Role" +msgstr "" + +#: templates/web/base/admin/users/form.html:143 +#: templates/web/base/admin/users/index.html:29 +msgid "Role:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: templates/web/base/admin/roles/form.html:1 +#: templates/web/base/admin/roles/index.html:1 +msgid "Roles" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:444 +#: perllib/FixMyStreet/App/Controller/Admin.pm:448 +#: templates/web/base/admin/reports/edit.html:171 #: templates/web/base/admin/update_edit.html:71 -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/reports/edit.html:106 msgid "Rotate Left" msgstr "Повернуть влево" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 -#: templates/web/base/admin/report_edit.html:167 +#: perllib/FixMyStreet/App/Controller/Admin.pm:444 +#: templates/web/base/admin/reports/edit.html:172 #: templates/web/base/admin/update_edit.html:72 -#: templates/web/zurich/admin/report_edit.html:119 +#: templates/web/zurich/admin/reports/edit.html:107 msgid "Rotate Right" msgstr "Повернуть вправо" -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/reports/edit.html:98 msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Перед поворотом фото необходимо сохранить все необходимые изменения в обращении" -#: templates/web/base/js/translation_strings.html:64 +#. ("JS") +#: templates/web/base/js/translation_strings.html:66 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Спутник" -#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/admin/triage/_inspect.html:69 +#: templates/web/base/report/_inspect.html:78 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:124 +#: templates/web/base/admin/manifesttheme/form.html:58 #: templates/web/base/admin/reportextrafields/edit.html:64 -#: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/admin/responsepriorities/edit.html:41 +#: templates/web/base/admin/roles/form.html:21 +#: templates/web/base/admin/templates/edit.html:84 +#: templates/web/base/admin/triage/_inspect.html:69 +#: templates/web/base/admin/users/index.html:83 +#: templates/web/base/report/_inspect.html:78 #: templates/web/base/report/_main.html:129 #: templates/web/base/report/update.html:58 -#: templates/web/zurich/admin/bodies/contact-form.html:49 -#: templates/web/zurich/admin/template_edit.html:29 +#: templates/web/zurich/admin/bodies/contact-form.html:51 +#: templates/web/zurich/admin/templates/edit.html:32 msgid "Save changes" msgstr "Сохранить изменения" @@ -3602,58 +3861,62 @@ msgstr "Сохранить изменения" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:188 +#: templates/web/base/report/inspect/public_update.html:7 msgid "Save with a public update" msgstr "" -#. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:99 +#. ("This is followed by a progress count, e.g. 3/5", "JS") +#: templates/web/base/js/translation_strings.html:102 msgid "Saving reports offline" msgstr "" #: templates/web/base/admin/index.html:26 -#: templates/web/base/admin/reports.html:1 -#: templates/web/zurich/admin/reports.html:1 +#: templates/web/base/admin/reports/index.html:1 +#: templates/web/zurich/admin/reports/index.html:1 msgid "Search Reports" msgstr "Искать обращения" -#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/index.html:34 #: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Искать пользователей" -#: templates/web/zurich/header.html:67 +#: templates/web/base/alert/index.html:10 +msgid "Search for location of email alert or RSS feed" +msgstr "" + +#: templates/web/zurich/header.html:70 msgid "Search reports" msgstr "Искать обращения" -#: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users/index.html:8 -#: templates/web/zurich/admin/reports.html:5 +#: templates/web/base/admin/reports/index.html:5 +#: templates/web/base/admin/users/index.html:26 +#: templates/web/zurich/admin/reports/index.html:5 msgid "Search:" msgstr "Поиск:" -#: templates/web/base/admin/reports.html:27 +#: templates/web/base/admin/reports/index.html:27 #: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Обращений не найдено." -#: templates/web/base/admin/users/index.html:42 +#: templates/web/base/admin/users/index.html:89 msgid "Searching found no users." msgstr "Пользователи не найдены." -#: templates/web/base/auth/generate_token.html:1 #: templates/web/base/auth/generate_token.html:2 -#: templates/web/base/auth/generate_token.html:39 -#: templates/web/base/my/my.html:71 +#: templates/web/base/auth/generate_token.html:45 +#: templates/web/base/my/my.html:75 msgid "Security" msgstr "" #: templates/web/base/report/form/private_details.html:14 -#: templates/web/base/report/new/councils_text_private.html:7 +#: templates/web/base/report/new/councils_text_private.html:8 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:768 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:202 msgid "See user detail for reports created as the council" msgstr "" @@ -3663,12 +3926,12 @@ msgid "Select a body" msgstr "Выберите учреждение" #: templates/web/base/admin/bodies/form.html:78 -#: templates/web/base/admin/users/form.html:84 -#: templates/web/zurich/admin/bodies/form.html:25 +#: templates/web/base/admin/users/form.html:87 +#: templates/web/zurich/admin/bodies/form.html:37 msgid "Select an area" msgstr "Выберите местность" -#: templates/web/base/admin/responsepriorities/edit.html:33 +#: templates/web/base/admin/responsepriorities/edit.html:19 msgid "Select if this is the default priority" msgstr "" @@ -3680,19 +3943,24 @@ msgstr "" msgid "Select multiple wards?" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:6 +#: templates/web/base/admin/category-checkboxes.html:4 msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:116 +#: templates/web/base/contact/enquiry/index.html:75 +#: templates/web/base/contact/index.html:120 msgid "Send" msgstr "" +#: templates/web/base/admin/reports/edit.html:91 +msgid "Send Fail Count:" +msgstr "" + #: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/users/form.html:22 +#: templates/web/base/admin/users/form.html:25 msgid "Send login email" msgstr "" @@ -3701,41 +3969,41 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:904 msgid "Sent report back" msgstr "Обращение возвращено" -#: perllib/FixMyStreet/DB/Result/Problem.pm:781 +#: perllib/FixMyStreet/DB/Result/Problem.pm:819 msgid "Sent to %s %s later" msgstr "Отправлено позже: %s %s" -#: templates/web/base/admin/report_edit.html:80 +#: templates/web/base/admin/reports/edit.html:80 msgid "Sent:" msgstr "Отправлено:" -#: templates/web/base/admin/extra-metadata-form.html:17 -msgid "Server Set" -msgstr "" - -#: templates/web/base/admin/report_edit.html:92 +#: templates/web/base/admin/reports/edit.html:97 #: templates/web/zurich/admin/stats/index.html:66 msgid "Service:" msgstr "Сервис:" -#: templates/web/base/auth/change_password.html:1 +#: templates/web/base/auth/change_password.html:2 #: templates/web/base/auth/change_password.html:4 -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:70 msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:56 +#: templates/web/base/report/inspect/information.html:44 msgid "Set to my current location" msgstr "" -#: templates/web/base/report/display_tools.html:17 +#: templates/web/base/report/display_tools.html:18 msgid "Share" msgstr "Поделиться" +#: templates/web/base/admin/manifesttheme/index.html:8 +msgid "Short Name" +msgstr "" + #: templates/web/base/main_nav_items.html:18 #: templates/web/base/report/_main.html:149 #: templates/web/base/report/_main.html:27 @@ -3743,14 +4011,14 @@ msgstr "Поделиться" msgid "Shortlist" msgstr "" -#: templates/web/base/reports/body.html:32 +#: templates/web/base/reports/body.html:39 msgid "Shortlist all visible" msgstr "" #: templates/web/base/report/_main.html:147 #: templates/web/base/report/_main.html:26 #: templates/web/base/report/_main.html:31 -#: templates/web/base/reports/_list-filters.html:24 +#: templates/web/base/reports/_list-filter-status.html:24 msgid "Shortlisted" msgstr "" @@ -3763,7 +4031,7 @@ msgstr "" msgid "Show Photo?" msgstr "" -#: templates/web/base/questionnaire/index.html:54 +#: templates/web/base/questionnaire/index.html:56 msgid "Show all updates" msgstr "" @@ -3779,7 +4047,8 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:90 +#: templates/web/base/admin/triage/_list-filters.html:43 +#: templates/web/base/reports/_list-filters.html:47 msgid "Show older reports" msgstr "" @@ -3787,9 +4056,10 @@ msgstr "" msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:59 -#: templates/web/base/around/display_location.html:67 -#: templates/web/base/js/translation_strings.html:71 +#. ("JS") +#: templates/web/base/around/display_location.html:63 +#: templates/web/base/around/display_location.html:71 +#: templates/web/base/js/translation_strings.html:73 msgid "Show pins" msgstr "Показать метки" @@ -3801,20 +4071,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/create.html:72 #: templates/web/base/auth/general.html:4 -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:94 #: templates/web/base/main_nav_items.html:14 #: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Вход" -#: templates/web/base/auth/create.html:22 +#: templates/web/base/auth/create.html:26 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/create.html:20 +#: templates/web/base/auth/create.html:24 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3823,16 +4093,17 @@ msgstr "" msgid "Sign in or create an account" msgstr "Войдите или создайте аккаунт" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:87 msgid "Sign in with a password" msgstr "" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 +#: templates/web/base/auth/create.html:31 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:77 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Выход" -#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:2 msgid "Some categories may require additional information." msgstr "Для некоторых категорий может потребоваться дополнительная информация." @@ -3845,12 +4116,12 @@ msgstr "" "Для некоторых конечных точек требуется <strong>ключ API</strong>. С его помощью система помечает, что обращения были отправлены\n" " из установленного вами реурса FixMyStreet." -#: templates/web/base/alert/index.html:44 +#: templates/web/base/alert/index.html:22 msgid "Some photos of recent reports" msgstr "Некоторые фото недавних обращений" #. ('Optional comment for translator') -#: perllib/FixMyStreet/Template.pm:53 +#: perllib/FixMyStreet/Template.pm:62 msgid "Some text to localize" msgstr "Некоторое количество текста для локализации" @@ -3858,11 +4129,13 @@ msgstr "Некоторое количество текста для локали msgid "Someone has moderated this report since you started." msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#. ("JS") +#: templates/web/base/js/translation_strings.html:76 msgid "Sorry! You’ve hit the limit of images that can be attached to one report." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:80 +#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:95 +#: perllib/FixMyStreet/Cobrand/UK.pm:85 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "К сожалению, адреса по данному индексу относятся к коронным землям. Зона покрытия нашего ресурса на них не распространяется." @@ -3870,7 +4143,8 @@ msgstr "К сожалению, адреса по данному индексу msgid "Sorry, that wasn’t a valid link" msgstr "Указана неверная ссылка" -#: templates/web/base/auth/2faform.html:5 +#: templates/web/base/auth/2fa/form-add.html:7 +#: templates/web/base/auth/2fa/form.html:5 #: templates/web/base/auth/smsform.html:16 msgid "Sorry, that wasn’t the correct code" msgstr "" @@ -3879,9 +4153,9 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "При подтверждении вашего обращения произошла ошибка." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 -#: perllib/FixMyStreet/Geocode/OSM.pm:52 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:249 +#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:53 perllib/FixMyStreet/Geocode/URL.pm:19 msgid "Sorry, we could not find that location." msgstr "Не удалось найти это местоположение." @@ -3891,174 +4165,193 @@ msgstr "Не удалось найти это местоположение." msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:37 -#: perllib/FixMyStreet/Geocode/Google.pm:55 -#: perllib/FixMyStreet/Geocode/Zurich.pm:88 +#: perllib/FixMyStreet/Geocode/Bing.pm:44 +#: perllib/FixMyStreet/Geocode/Google.pm:56 +#: perllib/FixMyStreet/Geocode/Zurich.pm:119 msgid "Sorry, we could not parse that location. Please try again." msgstr "Не удалось проанализировать это местоположение. Повторите попытку." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 -msgid "Sorry, we couldn't save your image(s), please try again." +#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108 +#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54 +#: perllib/FixMyStreet/PhotoStorage.pm:63 +#, fuzzy +msgid "Sorry, we couldn't save your file(s), please try again." msgstr "Не удалось сохранить фото. Повторите попытку." -#: templates/web/base/offline/appcache.html:6 -msgid "" -"Sorry, we don’t have a good enough connection to fetch that page, or the\n" -"page wasn’t found or there was a server error. Please try again later." +#: templates/web/base/offline/fallback.html:6 +msgid "Sorry, we don’t have a good enough connection to fetch that page." msgstr "" -#: perllib/FixMyStreet/App/Controller/Root.pm:125 +#: perllib/FixMyStreet/App/Controller/Root.pm:129 msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: perllib/FixMyStreet/App/Controller/Report.pm:176 +msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report." +msgstr "" + +#: templates/web/base/admin/triage/_list-filters.html:28 +#: templates/web/base/reports/_list-filters-sort.html:2 msgid "Sort by" msgstr "" -#: templates/web/base/admin/users/form.html:62 +#: templates/web/base/admin/bodies/contact-form.html:45 +msgid "Staff only" +msgstr "" + +#: templates/web/base/admin/users/form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/users/form.html:66 +#: templates/web/base/admin/users/form.html:69 msgid "Staff:" msgstr "" -#: templates/web/base/dashboard/index.html:74 +#: templates/web/base/debug_header.html:3 +msgid "Staging site" +msgstr "" + +#: templates/web/base/dashboard/index.html:75 msgid "Start Date" msgstr "" #: templates/web/base/admin/bodies/body.html:74 #: templates/web/base/admin/bodies/category.html:30 -#: templates/web/base/admin/bodies/contact-form.html:53 +#: templates/web/base/admin/bodies/contact-form.html:22 #: templates/web/base/admin/flagged.html:18 -#: templates/web/base/admin/index.html:64 +#: templates/web/base/admin/index.html:70 #: templates/web/base/admin/list_updates.html:11 -#: templates/web/base/admin/reports.html:16 -#: templates/web/base/admin/template_edit.html:53 -#: templates/web/base/admin/templates.html:8 +#: templates/web/base/admin/reports/index.html:16 +#: templates/web/base/admin/templates/edit.html:50 +#: templates/web/base/admin/templates/view.html:8 #: templates/web/base/admin/users/alerts.html:11 -#: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:106 -#: templates/web/base/report/_item.html:68 +#: templates/web/base/dashboard/index.html:102 +#: templates/web/base/report/_inspect.html:34 +#: templates/web/base/report/_item.html:78 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/bodies/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:37 msgid "State" msgstr "Статус" -#: perllib/FixMyStreet/App/Controller/Admin.pm:791 -#: perllib/FixMyStreet/App/Controller/Admin.pm:792 +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107 +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108 msgid "State and external status code cannot be used simultaneously." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: perllib/FixMyStreet/Script/Alerts.pm:106 #: templates/web/base/report/_update_state.html:7 -#: templates/web/base/report/updates.html:18 +#: templates/web/base/report/updates.html:21 msgid "State changed to:" msgstr "" -#: templates/web/base/admin/report_edit.html:123 +#: templates/web/base/admin/reports/edit.html:128 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:75 -#: templates/web/zurich/admin/report_edit.html:103 -#: templates/web/zurich/admin/report_edit.html:151 +#: templates/web/zurich/admin/report_edit-sdm.html:63 +#: templates/web/zurich/admin/reports/edit.html:139 +#: templates/web/zurich/admin/reports/edit.html:91 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Статус:" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Default.pm:686 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:320 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:431 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:635 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/index.html:71 +#: perllib/FixMyStreet/Cobrand/Default.pm:680 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:413 +#: templates/web/base/admin/index.html:77 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 #: templates/web/zurich/admin/stats/index.html:1 -#: templates/web/zurich/header.html:58 +#: templates/web/zurich/header.html:61 msgid "Stats" msgstr "Статистика" -#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-dm.html:25 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/reports/index.html:13 msgid "Status" msgstr "Статус" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:22 +#: templates/web/base/report/updates.html:25 msgid "Still open, via questionnaire" msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/reports/edit.html:28 msgid "Street View" msgstr "Просмотр улиц" -#: templates/web/base/admin/extra-metadata-form.html:56 -msgid "String" -msgstr "" - -#: templates/web/base/report/new/category.html:46 +#: templates/web/base/report/new/category.html:35 msgid "Subcategory" msgstr "" -#: templates/web/zurich/admin/index-dm.html:27 +#: templates/web/zurich/admin/index-dm.html:29 msgid "Subdivision/Body" msgstr "Подразделение/учреждение" -#: templates/web/base/contact/index.html:99 +#: templates/web/base/contact/enquiry/index.html:30 +#: templates/web/base/contact/index.html:103 msgid "Subject" msgstr "Тема" -#: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/reports/edit.html:122 #: templates/web/base/report/update/moderation_diff.html:2 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/reports/edit.html:41 msgid "Subject:" msgstr "Тема:" -#: templates/web/base/auth/2faform.html:20 +#: templates/web/base/auth/2fa/form-add.html:14 +#: templates/web/base/auth/2fa/form.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/form/user_loggedout_by_email.html:69 -#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/form/user_loggedout_by_email.html:65 +#: templates/web/base/report/form/user_loggedout_password.html:29 +#: templates/web/base/report/new/form_report.html:21 #: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/login_success_form.html:17 +#: templates/web/base/report/new/oauth_email_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Отправить" -#: templates/web/base/admin/report_edit.html:180 -#: templates/web/base/admin/report_edit.html:25 +#: templates/web/base/admin/reports/edit.html:185 +#: templates/web/base/admin/reports/edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/users/form.html:197 -#: templates/web/zurich/admin/report_edit-sdm.html:124 -#: templates/web/zurich/admin/report_edit.html:265 +#: templates/web/base/admin/users/form.html:189 +#: templates/web/zurich/admin/report_edit-sdm.html:111 +#: templates/web/zurich/admin/reports/edit.html:253 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Отправить изменения" -#: templates/web/base/questionnaire/index.html:110 +#: templates/web/base/questionnaire/index.html:112 msgid "Submit questionnaire" msgstr "Отправить опрос" -#: templates/web/zurich/admin/index-dm.html:23 -#: templates/web/zurich/admin/index-dm.html:6 +#: templates/web/zurich/admin/index-dm.html:25 +#: templates/web/zurich/admin/index-dm.html:8 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/reports/index.html:13 msgid "Submitted" msgstr "Отправлено" -#: templates/web/base/alert/_list.html:77 -#: templates/web/base/alert/_list.html:80 -#: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:47 -#: templates/web/base/report/display_tools.html:52 +#: templates/web/base/alert/_list.html:72 +#: templates/web/base/alert/_list.html:75 +#: templates/web/base/alert/updates.html:24 +#: templates/web/base/alert/updates.html:27 +#: templates/web/base/alert/updates.html:34 +#: templates/web/base/report/display_tools.html:53 +#: templates/web/base/report/display_tools.html:56 +#: templates/web/base/report/display_tools.html:62 msgid "Subscribe" msgstr "Подписаться" -#: templates/web/base/alert/_list.html:72 +#: templates/web/base/alert/_list.html:67 msgid "Subscribe by email" msgstr "" @@ -4066,11 +4359,18 @@ msgstr "" msgid "Subscribed:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:34 +#, fuzzy +msgid "Summaries are limited to %d characters in length. Please shorten your summary" +msgstr "Текст обновления ограничен %s симв. Напишите более короткое сообщение" + +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138 +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 msgid "Summaries are limited to %s characters in length. Please shorten your summary" msgstr "" -#: templates/web/base/js/translation_strings.html:9 +#. ("JS") +#: templates/web/base/js/translation_strings.html:10 msgid "Summaries are limited to {0} characters in length. Please shorten your summary" msgstr "" @@ -4078,19 +4378,20 @@ msgstr "" msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:116 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:633 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Default.pm:678 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:314 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:409 #: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 -#: templates/web/zurich/header.html:42 +#: templates/web/zurich/header.html:45 msgid "Summary" msgstr "Итог" @@ -4104,11 +4405,11 @@ msgstr "Отчеты об итогах" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/users/form.html:157 +#: templates/web/base/admin/users/form.html:130 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/users/form.html:153 +#: templates/web/base/admin/users/form.html:126 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" @@ -4122,29 +4423,33 @@ msgstr "Результаты опроса" msgid "Tell us about you" msgstr "" -#: templates/web/zurich/admin/template_edit.html:7 +#: templates/web/zurich/admin/templates/edit.html:7 msgid "Template «%s»" msgstr "Шаблон «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:658 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Default.pm:704 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:420 #: templates/web/base/develop/email_list.html:3 -#: templates/web/zurich/header.html:62 +#: templates/web/zurich/header.html:65 msgid "Templates" msgstr "Шаблоны" -#: templates/web/zurich/admin/templates.html:9 +#: templates/web/zurich/admin/templates/view.html:9 msgid "Text" msgstr "Текст" +#: templates/web/base/admin/extra-metadata-item.html:69 +msgid "Text field" +msgstr "" + #: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Только текстовая версия" -#: templates/web/base/admin/template_edit.html:33 +#: templates/web/base/admin/templates/edit.html:35 #: templates/web/base/admin/update_edit.html:20 #: templates/web/base/admin/update_edit.html:94 -#: templates/web/zurich/admin/template_edit.html:24 +#: templates/web/zurich/admin/templates/edit.html:27 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Текст:" @@ -4169,7 +4474,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Благодарим вас за отзыв" -#: templates/web/base/around/_error_multiple.html:23 +#: templates/web/base/around/_error_multiple.html:26 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Спасибо за предоставленное фото. Теперь нам нужно определить, где именно располагается неполадка. В поле выше введите название ближайшей улицы или индекс:" @@ -4177,7 +4482,12 @@ msgstr "Спасибо за предоставленное фото. Тепер msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Мы рады узнать, что проблема решена! Это было ваше первое обращение в орган самоуправления?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 +#: templates/web/base/auth/2fa/intro.html:11 +#: templates/web/base/auth/generate_token.html:30 +msgid "Thanks, you have successfully enabled two-factor authentication on your account." +msgstr "" + +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Кажется, возникли трудности с загрузкой фото (%s).Повторите попытку." @@ -4185,55 +4495,49 @@ msgstr "Кажется, возникли трудности с загрузко msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Кажется, это местоположение не находится в ведении органа самоуправления. Возможно, им заведует другое учреждение или же вы указали место в другой стране. Попробуйте еще раз." -#: perllib/FixMyStreet/App/Controller/Location.pm:141 +#: perllib/FixMyStreet/App/Controller/Location.pm:161 msgid "That location does not appear to be in the UK; please try again." msgstr "Это местоположение находится за пределами Великобритании. Повторите попытку." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/UK.pm:73 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "That postcode was not recognised, sorry." msgstr "Не удалось распознать индекс." -#: perllib/FixMyStreet/App/Controller/Admin.pm:495 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:270 msgid "That problem has been marked as sent." msgstr "Проблема помечена как отправленная." -#: perllib/FixMyStreet/App/Controller/Admin.pm:488 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:263 msgid "That problem will now be resent." msgstr "Сейчас мы еще раз отправим это обращение." -#: perllib/FixMyStreet/App/Controller/Report.pm:161 -msgid "That report cannot be viewed on %s." -msgstr "Просмотр обращения невозможен на этом устройстве (%s)." - -#: perllib/FixMyStreet/App/Controller/Report.pm:151 +#: perllib/FixMyStreet/App/Controller/Report.pm:156 msgid "That report has been removed from FixMyStreet." msgstr "Это обращение было удалено с сайта FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:581 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:588 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:637 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:602 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:27 -msgid "" -"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" -" Other categories for this body may have the same email address." +#: templates/web/base/admin/manifesttheme/form.html:20 +msgid "The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has loaded. Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>." msgstr "" -"На <strong>электронный адрес</strong> будут приходить обращения из этой категории. \n" -" Сюда же могут приходить и обращения из других категорий, адресованные одному и тому же учреждению." #: templates/web/base/admin/bodies/open311-form-fields.html:14 #: templates/web/base/admin/bodies/open311-form-fields.html:15 @@ -4244,11 +4548,8 @@ msgstr "" "<strong>Конечная точка</strong> – это URL сервиса, с которым будет связываться система FixMyStreet \n" " при отправке обращений в данное учреждение." -#: templates/web/base/admin/bodies/contact-form.html:126 -#: templates/web/base/admin/bodies/contact-form.html:127 -msgid "" -"The <strong>group</strong> is used for the top-level category field when\n" -" subcategory grouping is enabled." +#: templates/web/base/admin/manifesttheme/form.html:49 +msgid "The <strong>icons</strong> are used when the application is installed to the user's home screen. Icons must be <strong>square</strong>, with <strong>512x512</strong>px and <strong>192x192</strong>px being the most common sizes." msgstr "" #: templates/web/base/admin/bodies/open311-form-fields.html:27 @@ -4260,8 +4561,12 @@ msgstr "" "Данные о <strong>юрисдикции</strong> необходимы только, если конечная точка используется для нескольких\n" " учреждений. Если учреждение привязано к отдельной конечной точке, оставьте это поле пустым." -#: templates/web/base/admin/bodies/contact-form.html:104 -#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/manifesttheme/form.html:5 +msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)." +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:69 +#: templates/web/base/admin/bodies/contact-form.html:70 #: templates/web/base/admin/bodies/form.html:101 #: templates/web/base/admin/bodies/form.html:102 msgid "" @@ -4271,6 +4576,14 @@ msgstr "" "<strong>Метод отправки</strong> – это способ, которым будут отправлены обращения в учреждение.\n" " Если оставить это поле пустым, <strong>по умолчанию обращения будут доставлены по эл. почте</strong>." +#: templates/web/base/admin/manifesttheme/form.html:10 +msgid "The <strong>short name</strong> is a string that represents the name of the web application displayed to the user if there is not enough space to display name (e.g., as a label for an icon on the phone home screen)." +msgstr "" + +#: templates/web/base/admin/manifesttheme/form.html:15 +msgid "The <strong>theme colour</strong> defines the default theme colour for the application. This sometimes affects how the OS displays the site (e.g., on Android's task switcher, the theme colour surrounds the site). Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>." +msgstr "" + #: templates/web/base/open311/index.html:82 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Параметр agency_responsible в Open311 версии 2 используется для составления списка администраций, которые получили обращение. Это не совсем стандартный способ использования этого атрибута в спецификации Open311 версии 2." @@ -4284,11 +4597,16 @@ msgstr "" "<strong>Название</strong> учреждения является его идентификатором (например, <em>Районный орган самоуправления графства Борсетшир</em>).\n" " Название учреждения может быть видно всем пользователям сайта." -#: templates/web/base/admin/extra-metadata-form.html:22 -msgid "The code used to store this field value in the database. e.g. <code>address</code> would be available as <code>problem.extra.address</code> in the templates." +#: templates/web/base/admin/extra-metadata-item.html:30 +msgid "The code used to store this field value in the database." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/admin/bodies/contact-form.html:31 +#, fuzzy +msgid "The contact has been confirmed as correct." +msgstr "Проблема помечена как отправленная." + +#: templates/web/base/report/new/fill_in_details_text.html:2 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Вам необходимо предоставить максимум информации, чтобы сотрудники органа самоуправления могли помочь в решении проблемы. Укажите точное местонахождение неполадки (напр., «на стене»), опишите, что это и как давно вы впервые заметили неисправность (также можно приложить фото неполадки) и т. д." @@ -4303,15 +4621,11 @@ msgstr "В таблице самых активных пользователей msgid "The error was: %s" msgstr "Ошибка: %s" -#: templates/web/base/admin/extra-metadata-form.html:40 -msgid "The field name as shown to the user on the report form." -msgstr "" - #: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Следующие параметры Open311 версии 2 возвращаются для каждого запроса: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code и service_name." -#: perllib/FixMyStreet/Geocode/OSM.pm:150 +#: perllib/FixMyStreet/Geocode/OSM.pm:153 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "Информация о ближайшей дороге может быть неверной или неточной, если проблема находится рядом с несколькими дорогами или поблизости от безымянной дороги, зарегистрированной на OpenStreetMap." @@ -4348,10 +4662,6 @@ msgstr "Возможно, ссылка устарела или вы не пол msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Список доступных местоположений предоставлен сервисом MapIt на сайте: %s." -#: templates/web/base/admin/extra-metadata-form.html:6 -msgid "The ordering of this field on the report page. Fields are shown in ascending order according to this value." -msgstr "" - #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:30 msgid "The passwords do not match" @@ -4361,24 +4671,24 @@ msgstr "Пароли не совпадают" msgid "The requested URL '%s' was not found on this server" msgstr "Запрошенный URL '%s' не был найден на этом сервере" -#: templates/web/base/admin/extra-metadata-form.html:52 -msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection." +#: templates/web/base/admin/roles/form.html:5 +msgid "The role's <strong>name</strong> is used to refer to this group of permissions elsewhere in the admin." msgstr "" #: templates/web/base/admin/users/import.html:68 -msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" +msgid "The uploaded CSV file must contain a header row, and records can have the following fields:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:101 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Пользователь не смог определить местоположение неполадки на карте. Вместо этого он ввел данные о местности поблизости от неполадки." -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:627 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/users/form.html:10 -#: templates/web/base/admin/users/form.html:11 +#: templates/web/base/admin/users/form.html:13 +#: templates/web/base/admin/users/form.html:14 msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." @@ -4386,7 +4696,20 @@ msgstr "" "<strong>Имя</strong> пользователя отображается в обращениях, которые не были помечены как <em>анонимные</em>.\n" " Имя может быть неуникальным." +#: templates/web/base/admin/manifesttheme/form.html:1 +msgid "Theme" +msgstr "" + +#: templates/web/base/admin/manifesttheme/index.html:10 +msgid "Theme Colour" +msgstr "" + +#: templates/web/base/admin/manifesttheme/index.html:1 +msgid "Themes" +msgstr "" + #: templates/web/base/around/_on_map_empty.html:1 +#: templates/web/base/dashboard/heatmap-list.html:21 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." @@ -4396,7 +4719,11 @@ msgstr "Нет обращений." msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:819 +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:98 +msgid "There is already a template with that title." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4404,30 +4731,26 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "При загрузке страницы «Все обращения» произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Contact.pm:170 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "При загрузке страницы произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Alert.pm:364 -msgid "There was a problem with your email/password combination. Please try again." -msgstr "Имя пользователя или пароль указаны неверно. Повторите попытку." - #: templates/web/base/auth/_username_error.html:0 #: templates/web/base/auth/_username_error.html:14 msgid "There was a problem with your login information." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 -msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +#: perllib/FixMyStreet/App/Controller/Report/New.pm:911 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:147 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Не удалось загрузить новые данные. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/Contact.pm:160 +#: perllib/FixMyStreet/App/Controller/Contact.pm:174 msgid "There were problems with your report. Please see below." msgstr "Не удалось загрузить обращение. Прочтите информациию ниже." @@ -4435,12 +4758,16 @@ msgstr "Не удалось загрузить обращение. Прочти msgid "There were problems with your update. Please see below." msgstr "Не удалось загрузить новые данные. Прочтите информациию ниже." +#: templates/web/base/admin/category-checkboxes.html:33 +msgid "These categories appear in more than one group:" +msgstr "" + #: templates/web/base/report/form/private_details.html:13 -#: templates/web/base/report/new/councils_text_private.html:5 +#: templates/web/base/report/new/councils_text_private.html:6 msgid "These details will be sent to the council, but will never be shown online without your permission." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:3 +#: templates/web/base/report/new/councils_text_private.html:4 msgid "These details will never be shown online without your permission." msgstr "" @@ -4463,16 +4790,21 @@ msgstr "" msgid "These users weren't updated." msgstr "" -#: templates/web/base/report/new/councils_text.html:3 #: templates/web/base/report/new/councils_text.html:4 +#: templates/web/base/report/new/councils_text.html:5 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." msgstr "" -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_all.html:7 +#: templates/web/base/report/new/councils_text_all.html:6 +#: templates/web/base/report/new/councils_text_all.html:9 msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." msgstr "" +#: templates/web/base/report/new/councils_text_all.html:16 +#: templates/web/base/report/new/councils_text_all.html:6 +msgid "These will be sent to <strong>%s</strong> but not published online." +msgstr "" + #: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Реализация API пока работает в тестовом режиме, поэтому в процессе работы могут возникать неполадки. Они будут исправлены через некоторое время." @@ -4500,34 +4832,31 @@ msgstr "" "В это учреждение будут отправляться только те обращения, неполадки в которых находятся на <strong>подведомственной территории</strong>.\n" " Чтобы получать обращения, учреждению необходимо иметь в ведении минимум одну область." -#: perllib/FixMyStreet/Script/Reports.pm:200 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Поскольку пользователь не обозначил категорию проблемы, обращение было отправлено в оба органа самоуправления. Если данная проблема находится вне вашей ответственности, игнорируйте это обращение. Вы также можете написать нам, к какой категории относится данная проблема, и мы добавим новую информацию в систему." -#: perllib/FixMyStreet/Script/Reports.pm:203 +#: perllib/FixMyStreet/Script/Reports.pm:179 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Поскольку пользователь обозначил категорию проблемы, находящейся в ведении нескольких органов самоуправления, мы отправили это письмо во все эти инстанции. Если данная проблема находится вне вашей ответственности, игнорируйте это обращение." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 -#: perllib/FixMyStreet/Cobrand/UK.pm:45 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1087 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1159 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1206 +#: perllib/FixMyStreet/Cobrand/UK.pm:50 msgid "This information is required" msgstr "Эта информация является обязательной" -#: templates/web/base/admin/template_edit.html:19 +#: templates/web/base/admin/templates/edit.html:21 msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin." msgstr "" -#: templates/web/base/debug_header.html:3 -msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." -msgstr "Это сайт разработчиков, поэтому в его функционировании иногда могут возникать сбои. База данных периодически удаляется." - -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/templates/edit.html:31 msgid "This is the <strong>public</strong> text that will be shown on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#. ("JS") +#: templates/web/base/js/translation_strings.html:50 msgid "This is the problem" msgstr "" @@ -4547,7 +4876,8 @@ msgstr "Эта проблема не была решена" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/js/translation_strings.html:47 +#. ("JS") +#: templates/web/base/js/translation_strings.html:49 msgid "This report" msgstr "" @@ -4555,41 +4885,45 @@ msgstr "" msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Это обращение ожидает модерации." -#: perllib/FixMyStreet/Script/Alerts.pm:119 +#: perllib/FixMyStreet/Script/Alerts.pm:123 msgid "This report is currently marked as closed." msgstr "Это обращение на данный момент помечено как закрытое." -#: perllib/FixMyStreet/Script/Alerts.pm:117 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as fixed." msgstr "Это обращение на данный момент помечено как решенное." -#: perllib/FixMyStreet/Script/Alerts.pm:121 +#: perllib/FixMyStreet/Script/Alerts.pm:125 msgid "This report is currently marked as open." msgstr "Это обращение на данный момент помечено как открытое." +#: templates/web/base/report/_updates_disallowed_message.html:1 #: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Эта веб-страница также содержит фото неполадки, предоставленное пользователем." -#: templates/web/zurich/admin/report_edit-sdm.html:119 -#: templates/web/zurich/admin/report_edit-sdm.html:78 -#: templates/web/zurich/admin/report_edit.html:106 -#: templates/web/zurich/admin/report_edit.html:144 +#: templates/web/zurich/admin/report_edit-sdm.html:106 +#: templates/web/zurich/admin/report_edit-sdm.html:66 +#: templates/web/zurich/admin/reports/edit.html:132 +#: templates/web/zurich/admin/reports/edit.html:94 msgid "Time spent (in minutes):" msgstr "Времени потрачено (в минутах):" -#: perllib/FixMyStreet/Cobrand/Default.pm:634 +#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:315 #: templates/web/base/admin/timeline.html:1 +#: templates/web/base/admin/users/index.html:68 +#: templates/web/base/admin/users/log.html:1 msgid "Timeline" msgstr "Временной отрезок" @@ -4598,23 +4932,23 @@ msgid "Tips for perfect photos" msgstr "" #: templates/web/base/admin/flagged.html:15 -#: templates/web/base/admin/index.html:61 -#: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:6 -#: templates/web/zurich/admin/templates.html:8 +#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/reports/index.html:13 +#: templates/web/base/admin/templates/view.html:6 +#: templates/web/zurich/admin/templates/view.html:8 msgid "Title" msgstr "Название" -#: templates/web/base/admin/template_edit.html:23 -#: templates/web/zurich/admin/template_edit.html:20 +#: templates/web/base/admin/templates/edit.html:25 +#: templates/web/zurich/admin/templates/edit.html:23 msgid "Title:" msgstr "Название:" -#: templates/web/base/alert/index.html:26 +#: templates/web/base/alert/_index_text.html:21 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Введите индекс (%s) или название улицы и района, чтобы узнать, какие уведомления актуальны для вашего местоположения:" -#: templates/web/base/alert/index.html:28 +#: templates/web/base/alert/_index_text.html:23 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Введите индекс или название улицы и района, чтобы узнать, какие уведомления актуальны для вашего местоположения:" @@ -4626,12 +4960,17 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:97 +#: templates/web/base/report/update-form-wrapper.html:4 +msgid "To provide an update, please <a href=\"%s\">sign in</a>." +msgstr "" + +#: perllib/FixMyStreet/Script/Reports.pm:100 msgid "To view a map of the precise location of this issue" msgstr "Просмотр точного местоположения данной проблемы на карте" #: templates/web/base/auth/generate_token.html:11 -msgid "Token:" +#: templates/web/base/auth/generate_token.html:66 +msgid "Token" msgstr "" #: templates/web/base/reports/index.html:126 @@ -4648,15 +4987,15 @@ msgstr "" #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/admin/stats/questionnaire.html:24 -#: templates/web/base/dashboard/index.html:119 -#: templates/web/base/dashboard/index.html:124 -#: templates/web/base/dashboard/index.html:148 +#: templates/web/base/dashboard/index.html:120 +#: templates/web/base/dashboard/index.html:125 +#: templates/web/base/dashboard/index.html:149 #: templates/web/zurich/admin/stats/index.html:51 msgid "Total" msgstr "Всего" -#: templates/web/base/report/_inspect.html:158 -#: templates/web/base/report/_item.html:76 +#: templates/web/base/report/_item.html:86 +#: templates/web/base/report/inspect/extra_details.html:13 msgid "Traffic management required?" msgstr "" @@ -4668,21 +5007,11 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/users/form.html:134 -msgid "Trusted by bodies:" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:727 -msgid "Trusted to make reports that don't need to be inspected" -msgstr "" - -#: templates/web/base/admin/users/form.html:142 -msgid "Trusted:" -msgstr "" - -#: templates/web/base/auth/2faform.html:6 +#. ("JS") +#: templates/web/base/auth/2fa/form-add.html:8 +#: templates/web/base/auth/2fa/form.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:43 msgid "Try again" msgstr "Повторите попытку" @@ -4690,30 +5019,36 @@ msgstr "Повторите попытку" msgid "Try emailing us directly:" msgstr "Напишите нам:" -#: templates/web/base/auth/generate_token.html:21 +#: templates/web/base/auth/2fa/intro.html:2 +#: templates/web/base/auth/2fa/intro.html:6 +#: templates/web/base/auth/generate_token.html:36 +#: templates/web/base/auth/generate_token.html:49 +msgid "Two-factor authentication" +msgstr "" + +#: templates/web/base/auth/generate_token.html:29 msgid "Two-factor authentication has been activated" msgstr "" -#: templates/web/base/auth/generate_token.html:32 +#: templates/web/base/auth/generate_token.html:21 msgid "Two-factor authentication has been deactivated" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 #: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/form.html:37 msgid "Unban" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/bodies/contact-form.html:55 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 +#: templates/web/base/admin/bodies/contact-form.html:25 #: templates/web/base/admin/update_edit.html:30 -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/reports/edit.html:82 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Не подтверждено" @@ -4726,26 +5061,27 @@ msgstr "Неизв." msgid "Unknown alert type" msgstr "Неизвестный тип уведомления" -#: perllib/FixMyStreet/App/Controller/Photo.pm:119 -#: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:55 +#. ("JS") +#: perllib/FixMyStreet/App/Controller/Photo.pm:136 +#: perllib/FixMyStreet/App/Controller/Root.pm:147 +#: templates/web/base/js/translation_strings.html:57 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: perllib/FixMyStreet/App/Controller/Develop.pm:159 -#: perllib/FixMyStreet/App/Controller/Develop.pm:178 -#: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:136 -#: perllib/FixMyStreet/App/Controller/Report.pm:142 -#: perllib/FixMyStreet/App/Controller/Report.pm:145 +#: perllib/FixMyStreet/App/Controller/Develop.pm:188 +#: perllib/FixMyStreet/App/Controller/Develop.pm:207 +#: perllib/FixMyStreet/App/Controller/My.pm:229 +#: perllib/FixMyStreet/App/Controller/Report.pm:141 +#: perllib/FixMyStreet/App/Controller/Report.pm:147 +#: perllib/FixMyStreet/App/Controller/Report.pm:150 msgid "Unknown problem ID" msgstr "Неизвестный идентификатор проблемы" -#: perllib/FixMyStreet/App/Controller/Contact.pm:99 +#: perllib/FixMyStreet/App/Controller/Contact.pm:106 msgid "Unknown update ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:25 +#: templates/web/base/reports/_list-filter-status.html:25 msgid "Unshortlisted" msgstr "" @@ -4759,20 +5095,25 @@ msgstr "" msgid "Update" msgstr "Обновление" +#: templates/web/base/admin/users/log.html:51 +#, fuzzy +msgid "Update %s created for problem %d" +msgstr "Добавлены новые данные (%s) для проблемы: %d;, автор: %s" + #: templates/web/base/admin/timeline.html:33 msgid "Update %s created for problem %d; by %s" msgstr "Добавлены новые данные (%s) для проблемы: %d;, автор: %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:37 msgid "Update below added anonymously at %s" msgstr "Ниже представлены анонимно добавленные новые данные в: %s" -#: templates/web/base/contact/index.html:35 +#: templates/web/base/contact/index.html:39 msgid "Update below added by %s at %s" msgstr "Ниже представлены новые данные, добавленные пользователем: %s, в: %s" #: templates/web/base/admin/bodies/form.html:139 -#: templates/web/zurich/admin/bodies/form.html:51 +#: templates/web/zurich/admin/bodies/form.html:63 msgid "Update body" msgstr "Обновить данные об учреждении" @@ -4797,43 +5138,44 @@ msgstr "В результате добавления данных проблем msgid "Update reopened problem" msgstr "В результате добавления данных проблема помечена как заново открытая" -#: templates/web/base/admin/bodies/body.html:111 +#: templates/web/base/admin/bodies/body.html:130 msgid "Update statuses" msgstr "Обновление статусов" -#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-dm.html:25 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/reports/index.html:13 msgid "Updated" msgstr "Обновлено" -#: perllib/FixMyStreet/DB/Result/Comment.pm:252 +#: perllib/FixMyStreet/DB/Result/Comment.pm:251 msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:254 +#: perllib/FixMyStreet/DB/Result/Comment.pm:253 msgid "Updated by <strong>%s</strong> at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:575 -#: perllib/FixMyStreet/App/Controller/Admin.pm:915 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/App/Controller/Admin.pm:271 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:837 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:862 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:935 msgid "Updated!" msgstr "Обновлено!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/dashboard/index.html:108 +#: templates/web/base/dashboard/index.html:109 #: templates/web/base/report/update.html:4 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Обновления" -#: perllib/FixMyStreet/DB/Result/Comment.pm:155 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Текст обновления ограничен %s симв. Напишите более короткое сообщение" @@ -4851,17 +5193,6 @@ msgstr "Новые данные для проблемы: %s" msgid "Usage notes" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:43 -#: templates/web/base/admin/bodies/contact-form.html:44 -msgid "" -"Use <strong>confirmed</strong> to indicate that this contact has been\n" -"confirmed as correct. If you are not sure of the origin or validity of the\n" -"contact, use <strong>unconfirmed</strong>. <strong>inactive</strong> will\n" -"remove the category from use when reporting problems, but keep it available in\n" -"map filters, and <strong>deleted</strong> will remove the category from there\n" -"as well." -msgstr "" - #: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" @@ -4870,15 +5201,10 @@ msgstr "" msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:143 -msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." +#: templates/web/base/admin/bodies/contact-form.html:53 +msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address." msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:50 -#: templates/web/zurich/admin/report_edit.html:69 -msgid "Used map" -msgstr "Использованная карта" - #: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" @@ -4887,36 +5213,36 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:676 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:672 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:758 msgid "User flag removed" msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:728 msgid "User flagged" msgstr "Аккаунт пользователя помечен" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users/form.html:34 -#: templates/web/base/admin/users/index.html:32 +#: templates/web/base/admin/users/form.html:37 +#: templates/web/base/admin/users/index.html:65 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users/index.html:5 +#: templates/web/base/admin/users/index.html:20 msgid "User search finds matches in users' names and email addresses." msgstr "При поиске пользователей на сайте система находит соответствия между именами пользователей и адресами эл. почты." @@ -4924,24 +5250,36 @@ msgstr "При поиске пользователей на сайте сист msgid "User's alerts" msgstr "" -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/reports/edit.html:142 #: templates/web/base/admin/update_edit.html:36 msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:667 -#: perllib/FixMyStreet/Cobrand/Default.pm:729 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:770 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:204 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:336 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:425 +#: templates/web/base/admin/flagged.html:29 +#: templates/web/base/admin/roles/index.html:25 +#: templates/web/zurich/header.html:57 msgid "Users" msgstr "Пользователи" -#: templates/web/base/admin/users/form.html:167 +#: templates/web/base/admin/users/form.html:140 +msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection." +msgstr "" + +#: templates/web/base/admin/users/form.html:156 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: templates/web/base/admin/roles/form.html:14 +msgid "Users with this role can perform the following actions within their assigned body or area." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311 #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Значения обновлены" @@ -4950,25 +5288,25 @@ msgstr "Значения обновлены" msgid "Verify" msgstr "" -#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:2 #: templates/web/base/auth/change_email.html:5 msgid "Verify email address" msgstr "" -#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:2 #: templates/web/base/auth/change_phone.html:5 msgid "Verify phone number" msgstr "" -#: templates/web/base/admin/report_edit.html:36 +#: templates/web/base/admin/reports/edit.html:36 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:24 +#: templates/web/zurich/admin/reports/edit.html:24 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Посмотреть обращение на сайте" -#: templates/web/base/reports/body.html:14 +#: templates/web/base/reports/body.html:21 msgid "View reports by ward" msgstr "Посмотреть обращения по районам" @@ -4976,7 +5314,7 @@ msgstr "Посмотреть обращения по районам" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:759 msgid "View/Mark private reports" msgstr "" @@ -4986,6 +5324,7 @@ msgid "Viewing a location" msgstr "Просмотр местоположения" #: templates/web/base/report/display.html:0 +#: templates/web/base/report/display.html:6 msgid "Viewing a problem" msgstr "Просмотр проблемы" @@ -4993,7 +5332,7 @@ msgstr "Просмотр проблемы" msgid "Ward:" msgstr "" -#: templates/web/base/reports/body.html:16 +#: templates/web/base/reports/body.html:23 msgid "Wards of this council" msgstr "Районы, которые находятся в ведении данного органа самоуправления" @@ -5016,7 +5355,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:209 +#: perllib/FixMyStreet/Script/Reports.pm:185 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Скорее всего, эта проблема находится в ведении этой инстанции: %s;. Однако в нашей системе нет ее контактных данных. Если вам известен действующий адрес этой организации, напишите нам об этом." @@ -5025,7 +5364,7 @@ msgid "We send it to the council on your behalf" msgstr "Данные будут отправлены в орган самоуправления от вашего имени" #: templates/web/base/alert/choose.html:13 -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:20 msgid "We show up to ten matches, please try a different search if yours is not here." msgstr "" @@ -5038,7 +5377,7 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Нам жаль, что проблему не удалось решить. Рекомендуем обратиться к представителям муниципальной власти." -#: templates/web/base/dashboard/index.html:122 +#: templates/web/base/dashboard/index.html:123 msgid "Website" msgstr "" @@ -5059,19 +5398,11 @@ msgstr "Когда были отредактированы данные" msgid "When sent" msgstr "Когда были отправлены данные" -#: templates/web/base/admin/extra-metadata-form.html:12 -msgid "Whether the field is displayed to the user, included as a hidden field and automatically populated, or set by the server upon Open311 submission. This field is usually set automatically." -msgstr "" - -#: templates/web/base/admin/extra-metadata-form.html:28 -msgid "Whether the user is required to provide a value for this field." -msgstr "" - #: templates/web/base/alert/_list.html:9 msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:40 msgid "Which report is it a duplicate of?" msgstr "" @@ -5083,7 +5414,7 @@ msgstr "И это еще не всё! <a href=\"/alert\">Подпишитесь msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "С помощью поиска по запросу можно искать, используя параметр agency_responsible, чтобы ограничить результаты поиска до обращений, которые были отправлены в один административный орган. Условие поиска – идентификатор администрации, предоставленный сервисом <a href=\"%s\">MaPit</a>." -#: templates/web/base/dashboard/index.html:163 +#: templates/web/base/dashboard/index.html:164 msgid "Within the specified timeframe:" msgstr "" @@ -5091,7 +5422,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Хотите помочь проекту FixMyStreet? Наш код находится в открытом доступе и <a href=\"https://fixmystreet.org\">доступен на сайте fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:103 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хотите получить еще один опрос через 4 недели? В нем мы напомним вам проверить статус обращения." @@ -5103,9 +5434,9 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Избегайте пунктуационных ошибок и не пишите сообщения заглавными буквами: всё это усложняет прочтение текста." -#: perllib/FixMyStreet/Cobrand/Default.pm:1200 -#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 -#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 +#: perllib/FixMyStreet/Cobrand/Default.pm:1261 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 #: templates/web/base/admin/bodies/category.html:6 #: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 @@ -5113,22 +5444,26 @@ msgstr "Избегайте пунктуационных ошибок и не п #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:132 -#: templates/web/base/admin/report_edit.html:96 +#: templates/web/base/admin/reports/edit.html:101 +#: templates/web/base/admin/reports/edit.html:137 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/admin/users/alerts.html:21 -#: templates/web/base/admin/users/index.html:32 -#: templates/web/base/questionnaire/index.html:104 -#: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:114 +#: templates/web/base/admin/users/index.html:65 +#: templates/web/base/questionnaire/index.html:106 +#: templates/web/base/questionnaire/index.html:39 msgid "Yes" msgstr "Да" -#: templates/web/base/contact/index.html:50 +#: templates/web/base/contact/index.html:54 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Вы считаете, что эта проблема не нуждалась в модерации:" -#: templates/web/base/js/translation_strings.html:100 +#: templates/web/base/admin/bodies/contact-form.html:26 +msgid "You are not sure of the origin or validity of the contact." +msgstr "" + +#. ("JS") +#: templates/web/base/js/translation_strings.html:103 msgid "You are offline" msgstr "" @@ -5136,20 +5471,21 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Вы собираетесь пожаловаться на это обращение и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:" -#: templates/web/base/contact/index.html:27 +#: templates/web/base/contact/index.html:31 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Вы собираетесь пожаловаться на это обновление и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:" +#: templates/web/base/report/_updates_disallowed_message.html:2 #: templates/web/base/report/display.html:59 msgid "You can <a href=\"%s\">make a new report in the same location</a>." msgstr "" -#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:6 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Вы можете <a href=\"%s%s\">ознакомиться с проблемой на этом сайте</a>." -#: templates/web/base/admin/users/form.html:116 +#: templates/web/base/admin/users/form.html:112 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Вы можете добавить адрес эл. почты пользователя, который проявляет себя некорректно, в черный список. Все дальнейшие обращения этого пользователя не будут опубликованы и отправлены." @@ -5157,7 +5493,7 @@ msgstr "Вы можете добавить адрес эл. почты поль msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:127 +#: templates/web/base/contact/index.html:131 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Вы можете написать в службу технической поддержки: <a href='mailto:%s'>%s</a>" @@ -5171,10 +5507,10 @@ msgstr "" " Так можно поступать в случаях, когда вы хотите отслеживать действия пользователя, который ранее публиковал \n" " неуместные материалы." -#: templates/web/base/report/new/top_message_none.html:12 +#: templates/web/base/report/new/top_message_none.html:13 #: templates/web/base/report/new/top_message_none.html:14 +#: templates/web/base/report/new/top_message_some.html:10 #: templates/web/base/report/new/top_message_some.html:11 -#: templates/web/base/report/new/top_message_some.html:9 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "Вы можете помочь нам: найдите контактные данные учреждения, в ведении которого находятся неполадки в районе (%s), и пришлите эти данные нам: <a href='mailto:%s'>%s</a>." @@ -5182,11 +5518,17 @@ msgstr "Вы можете помочь нам: найдите контактны msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Вы можете отметить учреждение как удаленное, если не хотите, чтобы его представители осуществляли деятельность на этом сайте." -#: templates/web/base/js/translation_strings.html:52 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242 +msgid "You cannot rename a category to an existing category" +msgstr "" + +#. ("JS") +#: templates/web/base/js/translation_strings.html:54 msgid "You declined; please fill in the box above" msgstr "Вы отказались; заполните форму выше" -#: templates/web/base/js/translation_strings.html:102 +#. ("JS") +#: templates/web/base/js/translation_strings.html:105 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -5194,12 +5536,17 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Вы уже ответили на этот опрос. Если у вас есть вопросы, <a href='%s'>пишите нам</a> или <a href='%s'>ознакомьтесь с данными опубликованной вами проблемы</a>.\n" -#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/contact/enquiry/index.html:58 +#, fuzzy +msgid "You have already attached files to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +msgstr "Вы уже предоставили фото в этом обращении. Важно: можно прикрепить не более 3 фото (если выбрать больше изображений, они заменят прикрепленные ранее)." + +#: templates/web/base/report/new/form_report.html:50 #: templates/web/zurich/report/new/fill_in_details_form.html:30 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "Вы уже предоставили фото в этом обращении. Важно: можно прикрепить не более 3 фото (если выбрать больше изображений, они заменят прикрепленные ранее)." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:89 #: templates/web/base/report/update/form_update.html:16 msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" @@ -5213,12 +5560,11 @@ msgstr "Был осуществлен выход из системы" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Вы определили местоположение проблемы на карте, используя зеленую метку. Если оно указано неверно, нажмите на карту еще раз." -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:142 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:143 msgid "You have successfully added your phone number." msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:158 -#: templates/web/zurich/tokens/confirm_problem.html:5 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Вы подтвердили свой адрес эл. почты." @@ -5227,7 +5573,7 @@ msgstr "Вы подтвердили свой адрес эл. почты." msgid "You have successfully confirmed your phone number." msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:129 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:130 msgid "You have successfully removed your phone number." msgstr "" @@ -5236,11 +5582,11 @@ msgstr "" msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Вы вошли в систему. Проверьте и подтвердите информацию в своем профиле:" -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:164 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:165 msgid "You have successfully verified your phone number." msgstr "" -#: templates/web/base/my/my.html:79 +#: templates/web/base/my/my.html:83 msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" msgstr "Вы еще не создали ни одного обращения. <a href=\"%s\">Самое время начать!</a>" @@ -5266,21 +5612,27 @@ msgstr "" msgid "Your Reports" msgstr "Ваши обращения" +#: templates/web/base/auth/2fa/intro.html:12 #: templates/web/base/auth/change_password.html:13 #: templates/web/base/auth/generate_token.html:15 -#: templates/web/base/auth/generate_token.html:26 -#: templates/web/base/auth/generate_token.html:34 +#: templates/web/base/auth/generate_token.html:23 +#: templates/web/base/auth/generate_token.html:31 #: templates/web/base/main_nav_items.html:12 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" -#: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/create.html:37 -#: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:87 -#: templates/web/base/report/display_tools.html:49 +#: templates/web/base/auth/2fa/intro.html:18 +msgid "Your account requires two-factor authentication to be set up." +msgstr "" + +#: templates/web/base/alert/updates.html:30 +#: templates/web/base/auth/create.html:50 +#: templates/web/base/auth/general.html:56 +#: templates/web/base/contact/enquiry/index.html:18 +#: templates/web/base/contact/index.html:91 +#: templates/web/base/report/display_tools.html:59 #: templates/web/base/report/form/user_loggedout_email.html:7 -#: templates/web/base/report/new/duplicate_suggestions.html:34 +#: templates/web/base/report/new/duplicate_suggestions.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваш эл. адрес" @@ -5289,8 +5641,8 @@ msgstr "Ваш эл. адрес" msgid "Your email address" msgstr "Ваш адрес эл. почты" -#: templates/web/base/auth/create.html:35 -#: templates/web/base/auth/general.html:47 +#: templates/web/base/auth/create.html:48 +#: templates/web/base/auth/general.html:54 #: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5299,7 +5651,8 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"%s\">privacy policy</a>" msgstr "" -#: templates/web/base/contact/index.html:81 +#: templates/web/base/contact/enquiry/index.html:12 +#: templates/web/base/contact/index.html:85 msgid "Your name" msgstr "Ваше имя" @@ -5307,46 +5660,52 @@ msgstr "Ваше имя" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:272 +#: perllib/FixMyStreet/App/Controller/My.pm:301 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:268 +#: perllib/FixMyStreet/App/Controller/My.pm:297 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#. ("JS") +#: templates/web/base/js/translation_strings.html:95 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/create.html:49 -#: templates/web/base/auth/general.html:83 -#: templates/web/base/report/form/user_loggedout_password.html:17 +#: templates/web/base/auth/create.html:64 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/report/form/user_loggedout_password.html:13 msgid "Your password" msgstr "Ваш пароль" -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:170 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:171 #: templates/web/base/auth/change_password.html:12 msgid "Your password has been changed" msgstr "Ваш пароль был изменен" -#: templates/web/base/auth/create.html:52 -#: templates/web/base/report/form/user_loggedout_by_email.html:61 -#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/base/auth/create.html:34 +msgid "Your password has expired, please create a new one below. When you click the link in your email, your password will be updated." +msgstr "" + +#: templates/web/base/auth/create.html:67 +#: templates/web/base/report/form/user_loggedout_by_email.html:57 +#: templates/web/base/report/form/user_loggedout_by_email.html:59 #: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:94 +#: templates/web/base/contact/enquiry/index.html:25 +#: templates/web/base/contact/index.html:98 msgid "Your phone number" msgstr "Ваш номер телефона" -#: templates/web/base/questionnaire/index.html:44 +#: templates/web/base/questionnaire/index.html:46 msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:76 +#: templates/web/base/my/my.html:80 msgid "Your reports" msgstr "Ваши обращения" @@ -5363,11 +5722,12 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#. ("JS") +#: templates/web/base/js/translation_strings.html:96 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:99 +#: templates/web/base/my/my.html:103 msgid "Your updates" msgstr "Ваши обновления" @@ -5384,24 +5744,29 @@ msgstr "" msgid "a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>." msgstr "" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/admin/users/import.html:73 +msgid "a colon-separated list of roles to assign to that user." +msgstr "" + +#: templates/web/base/report/inspect/information.html:10 msgid "admin" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/users/form.html:177 +#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18 +#: templates/web/base/admin/category-checkboxes.html:5 +#: templates/web/base/admin/users/form.html:167 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/DB/Result/Comment.pm:220 +#: perllib/FixMyStreet/DB/Result/User.pm:344 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 #: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:261 msgid "and a defect raised" msgstr "" @@ -5409,17 +5774,17 @@ msgstr "" msgid "by %s" msgstr "автор: %s" -#: templates/web/base/reports/body.html:6 -#: templates/web/base/reports/body.html:7 +#: templates/web/base/reports/body.html:13 +#: templates/web/base/reports/body.html:14 msgid "council" msgstr "орган самоуправления" -#: templates/web/base/admin/report_edit.html:53 +#: templates/web/base/admin/reports/edit.html:53 msgid "didn't use map" msgstr "карта не использовалась" -#: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:13 +#: templates/web/base/alert/index.html:12 +#: templates/web/base/around/_postcode_form_examples.html:1 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр.: ‘%s’ или ‘%s’" @@ -5427,7 +5792,7 @@ msgstr "напр.: ‘%s’ или ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:58 +#: templates/web/base/report/new/form_report.html:70 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5450,54 +5815,64 @@ msgstr "последнее обновление: %s" msgid "less than a minute" msgstr "менее минуты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:123 +#: perllib/FixMyStreet/App/Controller/Admin.pm:114 #: templates/web/base/admin/stats/questionnaire.html:15 #: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "недоступн." -#: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/users/form.html:178 +#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19 +#: templates/web/base/admin/category-checkboxes.html:6 +#: templates/web/base/admin/users/form.html:168 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:80 msgid "not the council's responsibility" msgstr "" +#: templates/web/base/contact/enquiry/index.html:26 +#: templates/web/base/contact/index.html:99 +#, fuzzy +msgid "optional" +msgstr "(необязательно)" + +#: templates/web/base/report/form/user.html:31 +#: templates/web/base/report/form/user.html:41 +#, fuzzy +msgid "or" +msgstr "или" + #: templates/web/base/auth/general.html:6 msgid "or <a href=\"%s\">create an account</a>" msgstr "" -#: templates/web/base/auth/create.html:13 +#: templates/web/base/auth/create.html:16 msgid "or <a href=\"%s\">sign in</a>" msgstr "" -#: templates/web/base/alert/index.html:40 -#: templates/web/base/around/postcode_form.html:27 -msgid "or locate me automatically" -msgstr "или определите мое местоположение автоматически" +#: templates/web/base/alert/index.html:18 +#: templates/web/base/around/postcode_form.html:36 +#, fuzzy +msgid "or use my location" +msgstr "Просмотр местоположения" -#: templates/web/base/admin/report_edit.html:49 -#: templates/web/base/admin/report_edit.html:51 -#: templates/web/zurich/admin/report_edit-sdm.html:32 +#: templates/web/base/admin/reports/edit.html:50 +#: templates/web/base/admin/reports/edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:33 #: templates/web/zurich/admin/report_edit-sdm.html:34 -#: templates/web/zurich/admin/report_edit-sdm.html:55 -#: templates/web/zurich/admin/report_edit-sdm.html:57 -#: templates/web/zurich/admin/report_edit.html:34 -#: templates/web/zurich/admin/report_edit.html:36 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 -#: templates/web/zurich/admin/report_edit.html:74 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/reports/edit.html:35 +#: templates/web/zurich/admin/reports/edit.html:36 +#: templates/web/zurich/admin/reports/edit.html:51 +#: templates/web/zurich/admin/reports/edit.html:52 msgid "originally entered: “%s”" msgstr "введено: “%s”" -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/reports/edit.html:69 msgid "other areas:" msgstr "другие области" -#: templates/web/zurich/admin/bodies/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:29 msgid "show" msgstr "" @@ -5509,7 +5884,7 @@ msgstr "выйти" msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:16 +#: templates/web/base/report/new/form_public_councils_text.html:6 msgid "the local council" msgstr "местный орган самоуправления" @@ -5522,7 +5897,7 @@ msgstr "метка не отображается, так как карта не msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:169 msgid "this type of local problem" msgstr "этот тип проблемы поблизости" @@ -5530,15 +5905,17 @@ msgstr "этот тип проблемы поблизости" msgid "today" msgstr "сегодня" -#: templates/web/base/js/translation_strings.html:103 +#. ("JS") +#: templates/web/base/js/translation_strings.html:106 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:104 +#. ("JS") +#: templates/web/base/js/translation_strings.html:107 msgid "updates" msgstr "" -#: templates/web/base/admin/report_edit.html:53 +#: templates/web/base/admin/reports/edit.html:53 msgid "used map" msgstr "карта использована" @@ -5550,16 +5927,16 @@ msgstr "пользователь проживает недалеко от обн msgid "user is problem owner" msgstr "неполадка находится в собственности пользователя" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:700 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:698 msgid "user removed from abuse list" msgstr "" #: templates/web/base/reports/body.html:0 -#: templates/web/base/reports/body.html:3 +#: templates/web/base/reports/body.html:10 msgid "ward" msgstr "район" @@ -5635,7 +6012,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:120 +#: templates/web/fixmystreet.com/reports/summary.html:153 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5662,7 +6039,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:136 +#: templates/web/fixmystreet.com/reports/summary.html:168 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5689,7 +6066,7 @@ msgstr[1] "<big>%s</big> проблемы решены за прошлый ме msgstr[2] "<big>%s</big> проблем решено за прошлый месяц" msgstr[3] "<big>%s</big> проблем решено за прошлый месяц" -#: templates/web/base/front/stats.html:8 +#: templates/web/westminster/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -5698,7 +6075,7 @@ msgstr[1] "<big>%s</big> обращения за прошлую неделю" msgstr[2] "<big>%s</big> обращений за прошлую неделю" msgstr[3] "<big>%s</big> обращений за прошлую неделю" -#: templates/web/base/front/stats.html:13 +#: templates/web/westminster/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -5707,7 +6084,7 @@ msgstr[1] "<big>%s</big> недавних обращения" msgstr[2] "<big>%s</big> недавних обращений" msgstr[3] "<big>%s</big> недавних обращений" -#: templates/web/base/front/stats.html:25 +#: templates/web/westminster/front/stats.html:19 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -5752,7 +6129,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/email/default/inactive-account.html:18 +#: templates/email/fixamingata/inactive-account.txt:8 #, perl-format msgid "month" msgid_plural "months" @@ -5761,7 +6138,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/email/bathnes/archive.html:25 +#: templates/email/westminster/archive.txt:9 #, perl-format msgid "report" msgid_plural "reports" @@ -5769,3 +6146,54 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +#~ msgid "" +#~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" +#~ " <br>\n" +#~ " Normally, categories are not private.\n" +#~ " <br>\n" +#~ " This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n" +#~ " interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n" +#~ " at a specific address." +#~ msgstr "" +#~ "Отметьте галочкой поле <strong>приватные</strong>, если обращения из этой категории <strong>никогда не должны отображаться на сайте</strong>.\n" +#~ " <br>\n" +#~ " По умолчанию категории общедоступны.\n" +#~ " <br>\n" +#~ " Ограничение доступа к категориям может быть полезно в тех случаях, когда у пользователей должна быть возможность подать обращение в учреждение, но сами обращения в этой категории не \n" +#~ " имеют публичной ценности. Например: просьба обеспечить жителей определенного дома \n" +#~ " дополнительным мусорным баком." + +#~ msgid "Coordinates:" +#~ msgstr "Координаты:" + +#~ msgid "Didn't use map" +#~ msgstr "Карта не использовалась" + +#~ msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." +#~ msgstr "Если вы <strong>не пользуетесь электронной почтой</strong>, а предпочитаете другой способ связи, введите сервисный идентификатор (Open311) или его эквивалент." + +#~ msgid "OK" +#~ msgstr "ОК" + +#~ msgid "That report cannot be viewed on %s." +#~ msgstr "Просмотр обращения невозможен на этом устройстве (%s)." + +#~ msgid "" +#~ "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" +#~ " Other categories for this body may have the same email address." +#~ msgstr "" +#~ "На <strong>электронный адрес</strong> будут приходить обращения из этой категории. \n" +#~ " Сюда же могут приходить и обращения из других категорий, адресованные одному и тому же учреждению." + +#~ msgid "There was a problem with your email/password combination. Please try again." +#~ msgstr "Имя пользователя или пароль указаны неверно. Повторите попытку." + +#~ msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." +#~ msgstr "Это сайт разработчиков, поэтому в его функционировании иногда могут возникать сбои. База данных периодически удаляется." + +#~ msgid "Used map" +#~ msgstr "Использованная карта" + +#~ msgid "or locate me automatically" +#~ msgstr "или определите мое местоположение автоматически" |