diff options
Diffstat (limited to 'locale/ru.UTF-8')
| -rw-r--r-- | locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po | 1629 |
1 files changed, 950 insertions, 679 deletions
diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index 103e4256d..0e469a8d9 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2017\n" "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n" @@ -18,8 +18,8 @@ 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:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "и" @@ -32,6 +32,10 @@ msgstr "и" msgid " or " msgstr "или" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d правок от %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s конт. органов местного самоуправления – %s подтвержд., %s неподтвержд." #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 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" @@ -75,7 +79,7 @@ msgstr "" "может касаться как неисправностей в вашем районе, так и неполадок, которые были зафиксированы в пределах определенного расстояния от заданной точки." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 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" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s обновлений" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "Отправлено опросов: %s – получено ответов: %s (%s%%)" @@ -97,7 +106,7 @@ msgstr "Отправлено опросов: %s – получено отв msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© участники проекта <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>" @@ -105,11 +114,6 @@ msgstr "© участники проекта <a href=\"http://www.openstreet msgid "(Defect & location of defect)" msgstr "(Повреждение и местоположение повреждения)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(адрес эл. почты в таблице пользователей, которые писали оскорбительные комментарии)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -145,7 +149,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(например: граффити, мусор в неположенных местах, поврежденная тротуарная плитка, разбитые уличные фонари)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -167,8 +171,8 @@ msgstr "(отправлено в обе инстанции)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-фид о проблемах в пределах: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Выберите категорию --" @@ -181,14 +185,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -200,17 +196,17 @@ msgstr "" "Возможно, поэтому поле «зона покрытия» не заполнено (см. ниже).<br>\n" "Хотите добавить несколько <code>MAPIT_TYPES</code> в ваш файл конфигурации?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "<label for=\"statuses\">Показать отчеты:</label> %s <label for=\"filter_categories\">в категории:</label> %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "<span>%s</span> saved." msgstr "" @@ -219,33 +215,52 @@ msgstr "" msgid "<strong>%s</strong> live problems" msgstr "Актуальных неполадок: <strong>%s</strong>" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Нет</strong> Я хочу подтвердить свое обращение электронным письмом" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my report by email/text" +msgstr "<strong>Нет</strong> Я хочу подтвердить свое обращение электронным письмом" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Нет</strong> Я хочу подтвердить обновление электронным письмом" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my update by email/text" +msgstr "<strong>Нет</strong> Я хочу подтвердить обновление электронным письмом" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Нет</strong>, я хочу войти на сайт с помощью адреса эл. почты" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "<strong>No</strong> let me sign in by email or text" +msgstr "<strong>Нет</strong>, я хочу войти на сайт с помощью адреса эл. почты" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> У меня есть пароль" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -262,11 +277,17 @@ msgid "Add a contact using the form below." msgstr "Добавить контакт с помощью формы." #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Добавить учреждение" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Добавить адрес эл. почты в черный список" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -289,11 +310,17 @@ msgstr "Добавить категорию" msgid "Add option" msgstr "(необязательно)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(номер телефона отсутствует)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -303,23 +330,23 @@ msgstr "" msgid "Add user" msgstr "Добавить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Добавлено: %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -343,9 +370,10 @@ msgstr "Уведомление «%d» отключено (создано: %s)" msgid "Alert me to future updates" msgstr "Оповещать меня об обновлениях в будущем" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: templates/web/base/dashboard/index.html:30 +#: templates/web/base/dashboard/index.html:40 +#: templates/web/base/dashboard/index.html:51 +#: templates/web/base/dashboard/index.html:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -354,12 +382,13 @@ msgstr "" msgid "All Reports" msgstr "Все Отчеты" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 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 msgid "All categories" msgstr "" @@ -375,17 +404,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Все отчеты" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Все отчеты с %s по %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -423,7 +452,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -434,7 +464,7 @@ msgstr "" msgid "Area covered" msgstr "Зона покрытия" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -448,7 +478,7 @@ msgid "Assign to competent body:" msgstr "Направить в учреждение, которое специализируется на решении подобных вопросов:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Назначить другую категорию:" @@ -460,7 +490,7 @@ msgstr "Направить во внешнее учреждение:" msgid "Assign to subdivision:" msgstr "Направить в подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -476,12 +506,17 @@ msgstr "Как правило, количество результатов, ко msgid "At the moment only searching for and looking at reports work." msgstr "Сейчас можно только искать и просматривать обращения" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Ответственности не несет" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -489,18 +524,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -514,20 +541,21 @@ msgstr "Ожидает модерации" msgid "Back" msgstr "Назад" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Добавить адрес эл. почты в черный список" +#, fuzzy +msgid "Ban user" +msgstr "Пометить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Учреждения" @@ -538,14 +566,10 @@ msgstr "Учреждения" msgid "Body" msgstr "Учреждение" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Учреждение:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "По дате" - #: templates/web/base/admin/extra-metadata-form.html:36 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 "" @@ -558,8 +582,9 @@ msgstr "Письмо не пришло? Оно могло попасть в па msgid "Can't see the map? <em>Skip this step</em>" msgstr "Карта не отображается? <em>Пропустите этот шаг</em>" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -570,30 +595,36 @@ msgstr "" #: templates/web/base/admin/body.html:72 #: templates/web/base/admin/contact-form.html:19 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/base/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Категория" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Категория" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент устранения неполадок в этой категории, которым больше 4 недель" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -601,17 +632,17 @@ msgstr "Процент устранения неполадок в этой ка msgid "Category:" msgstr "Категория:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Категория: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -619,10 +650,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Сменить пароль" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(номер телефона отсутствует)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent." msgstr "" @@ -653,19 +690,14 @@ msgstr "" "Выберите название <strong>категории</strong> которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и \n" " сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений." -#: templates/web/base/report/_inspect.html:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Нажмите здесь или введите дату в формате дд/мм/гггг" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Нажмите на карту, чтобы сообщить о проблеме" @@ -694,18 +726,19 @@ msgstr "Чтобы войти, пройдите по ссылке, указан #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Закрыто" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Закрыто органом самоуправления" @@ -720,16 +753,17 @@ msgid "Cobrand" msgstr "Кобренд" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Данные о кобренде:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Кобренд:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -737,7 +771,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" @@ -746,7 +780,7 @@ msgstr "Конфигурация" msgid "Confirm" msgstr "Подтвердить" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Подтвердить аккаунт" @@ -765,14 +799,10 @@ msgstr "Подтверждение" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Подтверждено" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Подтвержденные обращения с %s по %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -799,8 +829,8 @@ msgstr "Свяжитесь с командой" msgid "Coordinates:" msgstr "Координаты:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Не удалось найти пользователя" @@ -818,43 +848,16 @@ msgstr "Орган самоуправления" msgid "Council contacts for %s" msgstr "Контакты органа самоуправления для %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Ссылка на орган самоуправления: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Орган самоуправления:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Подсчет" @@ -876,39 +879,44 @@ msgstr "Создать категорию" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Создать шаблон" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Создано" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Создано:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Статус" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -919,14 +927,14 @@ msgstr "В данный момент на сайте не зарегистрир msgid "Customer not contactable" msgstr "Невозможно связаться с покупателем" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: 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/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Вопрос решен подразделением в течение 5 рабочих дней" @@ -938,12 +946,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Удалить шаблон" @@ -954,8 +962,8 @@ msgstr "Удалить шаблон" msgid "Deleted" msgstr "Удалено" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -971,6 +979,10 @@ msgstr "Описание" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -983,6 +995,10 @@ msgstr "Дополнительная информация" msgid "Details:" msgstr "Дополнительная информация:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Передано" @@ -996,8 +1012,8 @@ msgstr "Карта не использовалась" msgid "Diligency prize league table" msgstr "Таблица самых активных пользователей" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -1006,7 +1022,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1014,7 +1030,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "У вас есть пароль на сайте %s?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1034,11 +1050,11 @@ msgstr "" msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1062,9 +1078,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Редактировать" @@ -1074,33 +1091,33 @@ msgstr "Редактировать" msgid "Edit body details" msgstr "Редактировать информацию об учреждении" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Редактирование данных о неполадке: %d" @@ -1121,7 +1138,6 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1129,17 +1145,20 @@ msgstr "Редактор" msgid "Email" msgstr "Адрес эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Адрес эл. почты добавлен в черный список" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Пароль (необязательно)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Создано уведомление по эл. почте" @@ -1148,19 +1167,18 @@ msgstr "Создано уведомление по эл. почте" msgid "Email alert deleted" msgstr "Уведомление по эл. почте удалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Этот адрес эл. почты уже находится в черном списке" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Адрес эл. почты:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Адрес эл. почты: %s" @@ -1177,8 +1195,8 @@ msgstr "" " Подробнее читайте в \n" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>этой статье</a>." +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 msgid "" "Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1188,8 +1206,9 @@ msgstr "" " разные конечные точки (и метод отправки), отличающиеся от тех, которые соответствуют учреждению. Например: для некоторых категорий проблем обращения должны\n" " отправляться по эл. почте, а для других – с помощью сервиса Open311." -#: templates/web/base/admin/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Дата окончания:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1210,14 +1229,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Введите индекс ближайшего отделения связи, название улицы или регион" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: 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 "Введите название ближайшей улицы и регион" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введите пароль" @@ -1235,8 +1254,8 @@ msgstr "Подробно опишите проблему" msgid "Error" msgstr "Ошибка" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Всё" @@ -1261,7 +1280,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1277,7 +1296,7 @@ msgstr "Внешн." msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Внешний URL" @@ -1289,7 +1308,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1301,7 +1320,7 @@ msgstr "Дополнительная информация:" msgid "Extra data:" msgstr "Дополнительная информация:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1331,21 +1350,22 @@ msgstr "Исправьте это, выбрав <strong>зону покрыти #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Исправлено" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Исправлено (орган самоуправления)" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Исправлено (пользователь)" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Пометить как удаленное" @@ -1353,7 +1373,7 @@ msgstr "Пометить как удаленное" msgid "Flag user" msgstr "Пометить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Помечено" @@ -1362,7 +1382,7 @@ msgstr "Помечено" msgid "Flagged reports and users" msgstr "Помеченные обращения и профили пользователей" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Список помеченных профилей пользователей находится на странице <a href='%s'>Помеченное</a>." @@ -1370,8 +1390,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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Помечено:" @@ -1391,7 +1411,7 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Подробнее читайте в разделе <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как в FixMyStreet используется инструмент Mapit</a>." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1411,8 +1431,12 @@ msgstr "Пожелание перенаправлено во внешнее уч msgid "Frequently Asked Questions" msgstr "Часто задаваемые вопросы" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1445,12 +1469,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Поехали!" @@ -1458,7 +1482,7 @@ msgstr "Поехали!" msgid "Going to send questionnaire?" msgstr "Собираетесь отправить опрос?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1466,6 +1490,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "График устранения неполадки: статус/время" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "автор: %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Эта проблема решена?" @@ -1486,21 +1519,26 @@ msgstr "Помощь" msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Фотографии происшествий поблизости, размещенные в недавних обращениях" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Привет, %s!" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Скрыто" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1521,21 +1559,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Скрыть старые" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Скрыть метки" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1547,7 +1582,7 @@ msgstr "" msgid "History" msgstr "История" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "На главную страницу" @@ -1606,6 +1641,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +msgid "If ticked, this template will be used for Open311 updates that put problems in this state." +msgstr "" + #: templates/web/base/admin/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1614,6 +1653,10 @@ msgstr "" "Если одно местоположение обслуживают два и более учреждений, система сайта FixMyStreet объединяет похожие категории в единую запись,\n" " которая располагается в меню. Если вы хотите, чтобы это произошло, убедитесь, что вы используете одно и то же название категории для выбранных учреждений." +#: templates/web/base/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Если вы узнаете больше о статусе вашего обращения, обновите данные на нашем сайте." @@ -1622,7 +1665,7 @@ msgstr "Если вы узнаете больше о статусе вашего 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:29 +#: templates/web/base/admin/template_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 "" @@ -1631,7 +1674,7 @@ msgstr "" 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:36 +#: templates/web/base/admin/template_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 "" @@ -1713,11 +1756,7 @@ msgstr "Ура, новых писем нет!" msgid "Include reporter personal details" msgstr "Включить персональные данные заявителя" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Включить неподтвержденные обращения" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Нверно задано значение has_photo \"%s\"" @@ -1729,7 +1768,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1741,26 +1780,18 @@ msgstr "Внутренние заметки" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Неверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Неверно указана дата окончания" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Неверно задан формат: %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Неверно указана дата начала" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Загляните в раздел <a href=\"%s\">Часто задаваемые вопросы</a>: возможно, вы найдете там нужную информацию." @@ -1779,7 +1810,7 @@ msgstr "Юрисдикция неизвестна" msgid "Jurisdiction unknown" msgstr "Юрисдикция неизвестна" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1804,12 +1835,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1835,18 +1861,14 @@ msgstr "Последнее обновление:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-form.html:128 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/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1855,13 +1877,13 @@ msgstr "" msgid "List all reported problems" msgstr "Все сообщения о неполадках в виде списка" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Загрузка..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 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/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" @@ -1893,12 +1915,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1906,11 +1931,11 @@ msgstr "" msgid "MAP" msgstr "КАРТА" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1922,11 +1947,11 @@ msgstr "Карта" msgid "Mark as sent" msgstr "Пометить как отправленное" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "<strong>Помечайте</strong> тех пользователей, за действиями которых вы хотите следить." -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1946,45 +1971,45 @@ msgstr "Сообщение внешнему учреждению:" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Не найден параметр jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Прошло модерацию в течение одного рабочего дня" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Месяц" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -2002,9 +2027,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2015,19 +2040,23 @@ msgstr "Имя" #: templates/web/base/admin/report_edit.html:127 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 -#: templates/web/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Имя:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Имя: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2037,12 +2066,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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2058,19 +2087,24 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Почти готово! Проверьте почту…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Почти готово! Проверьте почту…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Добавлено новое учреждение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Добавлен новый контакт в категории" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2091,6 +2125,11 @@ msgstr "Новая заметка для DM:" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(номер телефона отсутствует)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2120,18 +2159,19 @@ msgstr "Новые неполадки в ведении учреждения: {{ msgid "New reports" msgstr "Новые обращения" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Новый статус" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Новый шаблон" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2139,7 +2179,7 @@ msgstr "" msgid "Next" msgstr "Далее" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2151,22 +2191,18 @@ msgstr "Далее" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Нет" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Нет учреждения" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Нет органа самоуправления" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Орган самоуправления не выбран" @@ -2196,6 +2232,10 @@ msgstr "" msgid "No inspections in the selected date range." 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:37 msgid "No result returned" msgstr "Результатов нет" @@ -2220,15 +2260,15 @@ msgstr "Нет группы поддержки" msgid "None" msgstr "Нет" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-form.html:77 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/user-form.html:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 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" @@ -2251,7 +2291,7 @@ msgstr "Контакты не указаны" msgid "Not for my subdivision" msgstr "Не для моего подразделения" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Первое обращение по этой проблеме" @@ -2265,10 +2305,6 @@ msgstr "Первое обращение в органы самоуправлен msgid "Note" msgstr "Примечание" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Учтите, что когда система включает неподтвержденные обращения, регистрируется дата создания обращения. Она может отличаться от даты подтверждения обращения, поэтому эти данные могут быть неточными." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2296,37 +2332,46 @@ msgstr "Теперь обращение можно отправить…" msgid "Now to submit your update…" msgstr "Теперь обновление можно отправить…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "ОК" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Давний статус" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2365,23 +2410,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Другое" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "другие области" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2399,19 +2451,19 @@ msgstr "Страница не найдена" msgid "Parent" msgstr "Родительская" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Частичная" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Пароль (необязательно)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Пароль:" @@ -2419,7 +2471,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "Постоянная ссылка" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2428,19 +2480,25 @@ msgstr "" msgid "Phone Reporter:" msgstr "Обращение отправлено:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Номер телефона" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Номер телефона (необязательно)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Обращение отправлено:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Телефон:" @@ -2456,7 +2514,7 @@ msgstr "Телефон:" #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 -#: templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:38 @@ -2482,12 +2540,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Фотографии происшествий поблизости, размещенные в недавних обращениях" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Поставить метку на карте" @@ -2509,25 +2572,34 @@ msgstr "Будьте вежливы, выражайте свои мысли кр msgid "Please check the passwords and try again" msgstr "Проверьте пароли и попробуйте еще раз" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Проверьте правильность написания адреса эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Проверьте правильность написания адреса эл. почты" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Выберите категорию" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Исправьте ошибки ниже" @@ -2545,39 +2617,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Будьте вежливы! Грубые, некорректные обращения к представителям органов самоуправления дискредитируют всех пользователей сервиса. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Введите текст сообщения" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Введите номер своего телефона" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Введите пароль" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Введите действующий адрес эл. почты" @@ -2586,55 +2666,62 @@ msgstr "Введите действующий адрес эл. почты" msgid "Please enter a valid email address" msgstr "Введите действующий адрес эл. почты" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Введите номер своего телефона" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Введите дополнительную информацию" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Введите свой эл. адрес" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Введите адрес своей эл. почты" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Введите свое имя" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Введите свое имя" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Введите номер своего телефона" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Введите свою фамилию" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Напишите, как к вам обращаться" @@ -2683,7 +2770,12 @@ msgstr "" msgid "Please note:" msgstr "Внимание:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Поясните, почему вы решили заново отправить это обращение" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2723,6 +2815,11 @@ msgstr "Сообщите о статусе неполадки: проблема msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Напишите сообщение" @@ -2732,7 +2829,7 @@ msgid "Please write your update here" msgstr "Введите новые данные здесь" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Опубликовать" @@ -2741,15 +2838,15 @@ msgstr "Опубликовать" msgid "Posted anonymously at %s" msgstr "Опубликовано анонимно (%s)" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "Автор публикации: <strong>%s</strong> (%s), время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by <strong>%s</strong> at %s" msgstr "Автор публикации: <strong>%s</strong>, время публикации: %s" @@ -2761,11 +2858,11 @@ msgstr "На базе платформы <a class=\"platform-logo\" href=\"http: msgid "Previous" msgstr "Предыдущая" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2782,7 +2879,7 @@ msgstr "Конфиденциальность и файлы cookie" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Доступ ограничен" @@ -2806,21 +2903,21 @@ msgstr "Проблема подтверждена: %s" msgid "Problem %s sent to council %s" msgstr "Проблема (%s) отправлена в орган самоуправления: %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Сортировка проблем по статусу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Проблема помечена как открытая." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Смена статуса проблемы на основании результатов опроса" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Проблемы" @@ -2847,7 +2944,7 @@ msgstr "Недавно решенные проблемы на сайте FixMySt msgid "Problems within %.1fkm of %s" msgstr "Проблемы в пределах %.1fkm от этого места" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2873,7 +2970,8 @@ msgstr "Проблемы в пределах этого места: %s, %s" msgid "Property address:" msgstr "Адрес имущества:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Предоставить новые данные" @@ -2882,12 +2980,12 @@ msgstr "Предоставить новые данные" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and 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_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Пароль необязателен. Но когда вы предоставите эти данные, вы сможете быстрее сообщать о проблемах, вводить новые данные о них и редактировать свои обращения." @@ -2900,12 +2998,12 @@ msgstr "" msgid "Public response:" msgstr "Публичный ответ:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Опубликовать фото" @@ -2960,7 +3058,7 @@ msgstr "%s: RSS-фид, в пределах района: %s" msgid "RSS feed of nearby problems" msgstr "RSS-фид о проблемах поблизости" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2985,7 +3083,7 @@ msgstr "RSS-фид об обновлениях по этой проблеме" msgid "Receive email when updates are left on this problem." msgstr "Получать эл. письма об обновлениях по этой проблеме." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2999,7 +3097,7 @@ msgstr "Недавние проблемы поблизости, %s" msgid "Recently reported problems" msgstr "Недавние обращения о проблемах" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -3023,9 +3121,9 @@ msgstr "Удалить пометку" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -3033,12 +3131,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Удалить фото (действие отменить невозможно)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Ответить пользователю:" @@ -3067,11 +3169,11 @@ msgstr "Сообщить об оскорбительном поведении" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Сообщить о пользователе: %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3086,17 +3188,17 @@ msgstr "Сообщить о своей проблеме" msgid "Report, view, or discuss local problems" msgstr "Городские проблемы. Сообщайте, просматривайте, обсуждайте." -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Сообщено анонимно в: %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Сообщено ранее" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Автор обращения: %s, время отправки: %s" @@ -3110,27 +3212,27 @@ msgstr "Автор обращения:" msgid "Reported in the %s category" msgstr "Обращение отнесено к категории: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Обращение (категория: %s) отправлено анонимно в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Обращение (категория: %s), автор: %s, отправлено в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Анонимно отправлено через: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Отправлено через: %s, автор: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Анонимно отправлено через: %s, категория: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Отправлено через: %s, категория: %s, автор обращения: %s, время отправки: %s" @@ -3139,8 +3241,8 @@ msgstr "Отправлено через: %s, категория: %s, автор msgid "Reported:" msgstr "Обращение отправлено:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3148,10 +3250,9 @@ msgstr "Обращение отправлено:" msgid "Reporting a problem" msgstr "Сообщение о проблеме" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Обращения" @@ -3168,7 +3269,7 @@ msgstr "Обращения, ожидающие проверки" msgid "Reports by destination" msgstr "Автор обращения: %s, время отправки: %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3180,7 +3281,7 @@ msgstr "" msgid "Reports published" msgstr "Опубликованные обращения" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3236,21 +3337,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: 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 msgid "Response Templates for %s" msgstr "Шаблоны ответов для: %s" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3269,17 +3371,17 @@ msgstr "Дорога находится в ведении: %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Повернуть влево" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Повернуть вправо" @@ -3289,21 +3391,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Перед поворотом фото необходимо сохранить все необходимые изменения в обращении" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Спутник" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3314,12 +3416,12 @@ msgstr "Сохранить изменения" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3338,7 +3440,7 @@ msgstr "Искать обращения" msgid "Search Users" msgstr "Искать пользователей" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Искать обращения" @@ -3349,6 +3451,7 @@ msgid "Search:" msgstr "Поиск:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Обращений не найдено." @@ -3361,7 +3464,7 @@ msgstr "Пользователи не найдены." msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3370,8 +3473,8 @@ msgstr "" msgid "Select a body" msgstr "Выберите учреждение" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Выберите местность" @@ -3391,11 +3494,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "Обращение возвращено" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Отправлено позже: %s %s" @@ -3404,11 +3512,11 @@ msgid "Sent:" msgstr "Отправлено:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Сервис:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3417,9 +3525,9 @@ msgid "Share" msgstr "Поделиться" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3427,19 +3535,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3447,40 +3555,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Показывать мое имя на сайте" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Показать давние" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Показать метки" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3491,12 +3596,16 @@ msgstr "Вход" 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/general.html:96 +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 "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Войдите или создайте аккаунт" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Выход" @@ -3514,7 +3623,7 @@ msgstr "" "Для некоторых конечных точек требуется <strong>ключ API</strong>. С его помощью система помечает, что обращения были отправлены\n" " из установленного вами реурса FixMyStreet." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Некоторые фото недавних обращений" @@ -3527,15 +3636,20 @@ msgstr "Некоторое количество текста для локали msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "К сожалению, адреса по данному индексу относятся к коронным землям. Зона покрытия нашего ресурса на них не распространяется." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Указана неверная ссылка" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Указана неверная ссылка" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "При подтверждении вашего обращения произошла ошибка." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3568,20 +3682,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Дата начала:" #: templates/web/base/admin/body.html:73 @@ -3591,15 +3706,18 @@ msgstr "Дата начала:" #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 -#: templates/web/base/admin/template_edit.html:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Статус" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Сохранить изменения" @@ -3613,17 +3731,19 @@ msgstr "Сохранить изменения" msgid "State:" msgstr "Статус:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Статус" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: templates/web/base/admin/index.html:71 +#: 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:59 msgid "Stats" msgstr "Статистика" @@ -3633,7 +3753,7 @@ msgstr "Статистика" msgid "Status" msgstr "Статус" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Открыто (через опрос): %s" @@ -3646,7 +3766,12 @@ msgstr "Просмотр улиц" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Субкатегория: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Субкатегория: %s" @@ -3663,18 +3788,19 @@ msgstr "Тема" msgid "Subject:" msgstr "Тема:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Отправить" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3716,7 +3842,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3724,25 +3850,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Итог" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Отчеты об итогах" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Отчеты об итогах" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Результаты опроса" @@ -3750,14 +3882,14 @@ msgstr "Результаты опроса" msgid "Template «%s»" msgstr "Шаблон «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Шаблоны" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Текст" @@ -3765,7 +3897,7 @@ msgstr "Текст" msgid "Text only version" msgstr "Только текстовая версия" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3792,7 +3924,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Благодарим вас за отзыв" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 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 "Спасибо за предоставленное фото. Теперь нам нужно определить, где именно располагается неполадка. В поле выше введите название ближайшей улицы или индекс:" @@ -3808,7 +3940,7 @@ 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:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Это местоположение находится за пределами Великобритании. Повторите попытку." @@ -3818,11 +3950,11 @@ msgstr "Это местоположение находится за предел msgid "That postcode was not recognised, sorry." msgstr "Не удалось распознать индекс." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Проблема помечена как отправленная." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Сейчас мы еще раз отправим это обращение." @@ -3860,8 +3992,8 @@ msgstr "" "Данные о <strong>юрисдикции</strong> необходимы только, если конечная точка используется для нескольких\n" " учреждений. Если учреждение привязано к отдельной конечной точке, оставьте это поле пустым." +#: templates/web/base/admin/body-form.html:101 #: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3898,8 +4030,8 @@ msgstr "Вам необходимо предоставить максимум и msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "В таблице самых активных пользователей показана деятельность тех редакторов, которые отредактировали наибольшее количество записей." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Ошибка: %s" @@ -3941,7 +4073,7 @@ msgstr "Недавние проблемы, помеченные пользова msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Недавние обращения пользователей о проблемах в пределах местности: {{NAME}}" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Возможно, ссылка устарела или вы не полностью ее скопировали." @@ -3966,7 +4098,7 @@ msgstr "Запрошенный URL '%s' не был найден на этом 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." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Пользователь не смог определить местоположение неполадки на карте. Вместо этого он ввел данные о местности поблизости от неполадки." @@ -3979,33 +4111,38 @@ msgstr "" "<strong>Имя</strong> пользователя отображается в обращениях, которые не были помечены как <em>анонимные</em>.\n" " Имя может быть неуникальным." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Нет обращений." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "При загрузке страницы «Все обращения» произошла ошибка. Повторите попытку позже." #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "При загрузке страницы произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Имя пользователя или пароль указаны неверно. Если вы не помните свой пароль или у вас его нет, заполните форму «Вход с помощью адреса эл. почты»." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Имя пользователя или пароль указаны неверно. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +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:338 msgid "There was a problem with your update. Please try again." msgstr "Не удалось загрузить новые данные. Повторите попытку." @@ -4013,7 +4150,7 @@ msgstr "Не удалось загрузить новые данные. Повт msgid "There were problems with your report. Please see below." msgstr "Не удалось загрузить обращение. Прочтите информациию ниже." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Не удалось загрузить новые данные. Прочтите информациию ниже." @@ -4078,26 +4215,34 @@ msgstr "" "В это учреждение будут отправляться только те обращения, неполадки в которых находятся на <strong>подведомственной территории</strong>.\n" " Чтобы получать обращения, учреждению необходимо иметь в ведении минимум одну область." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Эта информация является обязательной" +#: templates/web/base/admin/template_edit.html:19 +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 +msgid "This is the <strong>public</strong> text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4114,7 +4259,7 @@ msgstr "Эта проблема не была решена" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4124,23 +4269,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Это обращение ожидает модерации." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Это обращение на данный момент помечено как закрытое." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Это обращение на данный момент помечено как решенное." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Это обращение на данный момент помечено как открытое." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Это обращение было оставлено анонимно." -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Эта веб-страница также содержит фото неполадки, предоставленное пользователем." @@ -4151,7 +4296,7 @@ msgstr "Эта веб-страница также содержит фото не msgid "Time spent (in minutes):" msgstr "Времени потрачено (в минутах):" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Временной отрезок" @@ -4163,20 +4308,21 @@ 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:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Название" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Название:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 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:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Введите индекс или название улицы и района, чтобы узнать, какие уведомления актуальны для вашего местоположения:" @@ -4188,44 +4334,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Просмотр точного местоположения данной проблемы на карте" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Всего" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Всего" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4238,18 +4376,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Повторите попытку" @@ -4264,7 +4403,11 @@ msgstr "Напишите нам:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +msgid "Unban" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 #: templates/web/base/admin/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 @@ -4273,15 +4416,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Не подтверждено" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "обращения с неустраненными неполадками" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Неизв." -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Неизвестный тип уведомления" @@ -4291,13 +4430,14 @@ msgstr "Неизвестный тип уведомления" msgid "Unknown error" msgstr "Неизвестная ошибка" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Неизвестный идентификатор проблемы" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4322,12 +4462,12 @@ msgstr "Ниже представлены анонимно добавленны msgid "Update below added by %s at %s" msgstr "Ниже представлены новые данные, добавленные пользователем: %s, в: %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Обновить данные об учреждении" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Сортировка обновлений по статусу" @@ -4335,16 +4475,16 @@ msgstr "Сортировка обновлений по статусу" msgid "Update by {{name}}" msgstr "Обновлено: {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "В результате добавления данных статус проблемы изменен на: %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "В результате добавления данных проблема помечена как решенная" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "В результате добавления данных проблема помечена как заново открытая" @@ -4358,20 +4498,20 @@ msgstr "Обновление статусов" msgid "Updated" msgstr "Обновлено" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "Автор публикации: <strong>%s</strong> (%s), время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by <strong>%s</strong> at %s" msgstr "Автор публикации: <strong>%s</strong>, время публикации: %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4379,7 +4519,7 @@ msgid "Updated!" msgstr "Обновлено!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Обновления" @@ -4426,40 +4566,81 @@ msgstr "Использованная карта" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Адрес эл. почты добавлен в черный список" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Этот адрес эл. почты уже находится в черном списке" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Аккаунт пользователя помечен" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "Вы в черном списке?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "При поиске пользователей на сайте система находит соответствия между именами пользователей и адресами эл. почты." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Пользователи" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Пользователи" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Значения обновлены" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Ваш адрес эл. почты" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ваш номер телефона" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4481,12 +4662,7 @@ msgstr "Просмотр местоположения" msgid "Viewing a problem" msgstr "Просмотр проблемы" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4496,20 +4672,25 @@ msgstr "Районы, которые находятся в ведении дан #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Мы нашли более одного соответствия этому местоположению. На странице отображается не более десяти результатов поиска. Если вы не нашли нужную информацию в результатах, попробуйте поиск по другим параметрам." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Не удалось найти это местоположение." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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;. Однако в нашей системе нет ее контактных данных. Если вам известен действующий адрес этой организации, напишите нам об этом." @@ -4517,6 +4698,12 @@ msgstr "Скорее всего, эта проблема находится в msgid "We send it to the council on your behalf" msgstr "Данные будут отправлены в орган самоуправления от вашего имени" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Мы нашли более одного соответствия этому местоположению. На странице отображается не более десяти результатов поиска. Если вы не нашли нужную информацию в результатах, попробуйте поиск по другим параметрам." + #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" @@ -4526,8 +4713,8 @@ 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:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4555,7 +4742,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4578,6 +4765,10 @@ msgstr "Пожелание" 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:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Хотите помочь проекту FixMyStreet? Наш код находится в открытом доступе и <a href=\"http://fixmystreet.org\">доступен на сайте fixmystreet.org</a>." @@ -4594,16 +4785,7 @@ msgstr "Избегайте пунктуационных ошибок и не п msgid "Wrong location? Just click again on the map." msgstr "Неверно указано местоположение? Нажмите на карту еще раз." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Год" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4618,7 +4800,7 @@ msgstr "Год" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Да" @@ -4631,7 +4813,7 @@ msgstr "Да, у меня есть пароль" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Вы считаете, что эта проблема не нуждалась в модерации:" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4648,7 +4830,7 @@ msgstr "Вы собираетесь пожаловаться на это обн msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Вы можете <a href=\"%s%s\">ознакомиться с проблемой на этом сайте</a>." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Вы можете добавить адрес эл. почты пользователя, который проявляет себя некорректно, в черный список. Все дальнейшие обращения этого пользователя не будут опубликованы и отправлены." @@ -4677,7 +4859,7 @@ msgstr "" 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>." -#: templates/web/base/admin/body-form.html:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Вы можете отметить учреждение как удаленное, если не хотите, чтобы его представители осуществляли деятельность на этом сайте." @@ -4685,7 +4867,7 @@ msgstr "Вы можете отметить учреждение как удал msgid "You declined; please fill in the box above" msgstr "Вы отказались; заполните форму выше" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -4712,18 +4894,38 @@ 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 "Вы определили местоположение проблемы на карте, используя зеленую метку. Если оно указано неверно, нажмите на карту еще раз." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Вы подтвердили свой адрес эл. почты." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Вы вошли в систему. Проверьте и подтвердите информацию в своем профиле:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" msgstr "Вы еще не создали ни одного обращения. <a href=\"%s\">Самое время начать!</a>" @@ -4750,36 +4952,43 @@ msgid "Your Reports" msgstr "Ваши обращения" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваш эл. адрес" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ваш адрес эл. почты" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Ваш адрес эл. почты" + #: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей <a href=\"/privacy\">политикой конфиденциальности</a>" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4790,19 +4999,19 @@ 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:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4813,8 +5022,8 @@ msgstr "Ваш пароль" msgid "Your password has been changed" msgstr "Ваш пароль был изменен" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ваш номер телефона" @@ -4823,7 +5032,7 @@ msgstr "Ваш номер телефона" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Ваши обращения" @@ -4832,25 +5041,40 @@ msgstr "Ваши обращения" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ваш пароль был изменен" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Ваши обновления" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4867,8 +5091,8 @@ msgstr "орган самоуправления" msgid "didn't use map" msgstr "карта не использовалась" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр.: ‘%s’ или ‘%s’" @@ -4891,23 +5115,24 @@ msgstr "последнее обновление: %s" msgid "less than a minute" msgstr "менее минуты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: 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/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "помечено как вопрос вне ответственности органа управления" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "или определите мое местоположение автоматически" @@ -4948,7 +5173,7 @@ msgstr "метка не отображается, так как карта не msgid "this location" msgstr "Просмотр местоположения" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "этот тип проблемы поблизости" @@ -4956,11 +5181,11 @@ msgstr "этот тип проблемы поблизости" msgid "today" msgstr "сегодня" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4968,14 +5193,24 @@ msgstr "" msgid "used map" msgstr "карта использована" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "пользователь проживает недалеко от обнаруженной неполадки на территории, подконтрольной органу самоуправления (%d)" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "неполадка находится в собственности пользователя" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Этот адрес эл. почты уже находится в черном списке" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Адрес эл. почты добавлен в черный список" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5053,7 +5288,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5062,7 +5297,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -5071,7 +5306,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -5080,7 +5315,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5089,7 +5324,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5179,6 +5414,45 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(адрес эл. почты в таблице пользователей, которые писали оскорбительные комментарии)" + +#~ msgid "By Date" +#~ msgstr "По дате" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Нажмите здесь или введите дату в формате дд/мм/гггг" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Подтвержденные обращения с %s по %s" + +#~ msgid "Hide old" +#~ msgstr "Скрыть старые" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Включить неподтвержденные обращения" + +#~ msgid "Invalid end date" +#~ msgstr "Неверно указана дата окончания" + +#~ msgid "Invalid start date" +#~ msgstr "Неверно указана дата начала" + +#~ msgid "No council" +#~ msgstr "Нет органа самоуправления" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Учтите, что когда система включает неподтвержденные обращения, регистрируется дата создания обращения. Она может отличаться от даты подтверждения обращения, поэтому эти данные могут быть неточными." + +#~ msgid "Show old" +#~ msgstr "Показать давние" + +#~ msgid "Unfixed reports" +#~ msgstr "обращения с неустраненными неполадками" + +#~ msgid "Year" +#~ msgstr "Год" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" @@ -5236,9 +5510,6 @@ msgstr[3] "" #~ msgid "No further action" #~ msgstr "Невозможно устранить" -#~ msgid "Not Responsible" -#~ msgstr "Ответственности не несет" - #~ msgid "Or problems reported to:" #~ msgstr "Или данные о неполадках, отправленные сюда:" |