diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-02-12 17:12:10 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-02-12 17:12:10 +0000 |
| commit | 6e2da95bc6a758c0cf070b9ddd51acc769f7acf1 (patch) | |
| tree | f04f74c68199ceafc63f1d236138de136f38de22 /locale/FixMyStreet.po | |
| parent | 236f615c046dfcfadbba376b735ef7a352a79ef9 (diff) | |
| parent | f640d08ef45215676cbd9ea140be567ad4c1daf2 (diff) | |
Merge branch 'version-2.3.1'v2.3.1
Diffstat (limited to 'locale/FixMyStreet.po')
| -rw-r--r-- | locale/FixMyStreet.po | 618 |
1 files changed, 349 insertions, 269 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index e18d2f932..6b6a8069a 100644 --- a/locale/FixMyStreet.po +++ b/locale/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-12-15 17:48+0000\n" +"POT-Creation-Date: 2018-02-12 15:46+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:650 perllib/FixMyStreet/Script/Reports.pm:196 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 perllib/FixMyStreet/Script/Reports.pm:193 msgid " and " msgstr "" @@ -78,7 +78,7 @@ msgstr "" msgid "%s live updates" msgstr "" -#: templates/web/base/dashboard/index.html:159 templates/web/base/dashboard/index.html:163 +#: templates/web/base/dashboard/index.html:160 templates/web/base/dashboard/index.html:164 msgid "%s opened, %s closed, %s fixed" msgstr "" @@ -110,7 +110,7 @@ msgstr "" msgid "(a-z and space only)" msgstr "" -#: templates/web/zurich/report/_item.html:19 +#: templates/web/zurich/report/_item.html:21 msgid "(closed)" msgstr "" @@ -118,7 +118,7 @@ msgstr "" msgid "(covers roughly 200,000 people)" msgstr "" -#: templates/web/zurich/report/_item.html:17 +#: templates/web/zurich/report/_item.html:19 msgid "(fixed)" msgstr "" @@ -138,7 +138,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:59 +#: templates/web/base/report/new/form_user_loggedin.html:38 templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "" @@ -151,7 +151,7 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 perllib/FixMyStreet/App/Controller/Report/New.pm:688 perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 perllib/FixMyStreet/App/Controller/Report/New.pm:685 perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "" @@ -179,7 +179,7 @@ msgstr "" msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:84 msgid "<span>%s</span> saved." msgstr "" @@ -203,11 +203,11 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:110 templates/web/zurich/auth/general.html:51 +#: templates/web/base/auth/general.html:112 templates/web/zurich/auth/general.html:41 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:108 +#: templates/web/base/auth/general.html:110 msgid "<strong>No</strong> let me sign in by email or text" msgstr "" @@ -219,10 +219,14 @@ msgstr "" 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:79 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/auth/general.html:81 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 "" +#: templates/web/base/auth/generate_token.html:54 +msgid "Activate two-factor authentication" +msgstr "" + #: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 msgid "Add" msgstr "" @@ -278,15 +282,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/ACV.pm:108 perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/ACV.pm:110 perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/ACV.pm:109 perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -302,7 +306,7 @@ msgstr "" msgid "Admin" msgstr "" -#: templates/web/base/auth/change_password.html:39 +#: templates/web/base/auth/change_password.html:51 msgid "Again:" msgstr "" @@ -318,11 +322,11 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: 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 +#: 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:64 templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" -#: templates/web/zurich/reports/index.html:13 +#: templates/web/zurich/reports/index.html:14 msgid "All Reports" msgstr "" @@ -378,11 +382,11 @@ msgstr "" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:59 +#: templates/web/base/js/translation_strings.html:65 msgid "Are you sure you want to cancel this upload?" msgstr "" -#: templates/web/base/admin/report_edit.html:84 templates/web/base/admin/template_edit.html:75 templates/web/base/js/translation_strings.html:73 templates/web/base/report/display_tools.html:6 +#: templates/web/base/admin/report_edit.html:84 templates/web/base/admin/template_edit.html:75 templates/web/base/js/translation_strings.html:79 templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -390,7 +394,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/user-form.html:78 msgid "Area:" msgstr "" @@ -414,11 +418,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/ACV.pm:105 perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:219 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:220 msgid "Assigned to %s" msgstr "" @@ -430,7 +434,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/user-form.html:92 templates/web/base/admin/user-form.html:93 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -454,11 +458,11 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:344 templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:37 msgid "Back" msgstr "" @@ -470,7 +474,7 @@ msgstr "" msgid "Ban user" msgstr "" -#: 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:50 +#: perllib/FixMyStreet/Cobrand/ACV.pm:107 perllib/FixMyStreet/Cobrand/ACV.pm:260 perllib/FixMyStreet/Cobrand/Default.pm:651 perllib/FixMyStreet/Cobrand/Default.pm:735 perllib/FixMyStreet/Cobrand/Zurich.pm:423 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:50 msgid "Bodies" msgstr "" @@ -478,7 +482,7 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:54 +#: templates/web/base/admin/user-form.html:46 msgid "Body:" msgstr "" @@ -494,7 +498,7 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:633 templates/web/base/admin/responsepriorities/list.html:8 templates/web/base/admin/templates.html:7 +#: perllib/FixMyStreet/Cobrand/ACV.pm:260 perllib/FixMyStreet/Cobrand/Default.pm:651 templates/web/base/admin/responsepriorities/list.html:8 templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -502,11 +506,11 @@ msgstr "" msgid "Categories:" 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/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: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/index.html:50 +#: 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/dashboard/index.html:100 templates/web/base/report/_inspect.html:54 templates/web/base/report/_item.html:92 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/index.html:50 msgid "Category" msgstr "" -#: templates/web/base/dashboard/index.html:102 +#: templates/web/base/dashboard/index.html:103 msgid "Category and State" msgstr "" @@ -522,7 +526,7 @@ msgstr "" msgid "Category:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:187 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Category: %s" msgstr "" @@ -534,7 +538,7 @@ msgstr "" msgid "Change email address" msgstr "" -#: templates/web/base/auth/change_password.html:1 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:63 +#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:5 templates/web/base/my/my.html:63 msgid "Change password" msgstr "" @@ -567,7 +571,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:72 +#: templates/web/base/js/translation_strings.html:78 msgid "Clear offline data" msgstr "" @@ -595,7 +599,7 @@ msgstr "" msgid "Click the link in that email to sign in." 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: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/index.html:31 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132 perllib/FixMyStreet/Cobrand/Zurich.pm:1004 perllib/FixMyStreet/Cobrand/Zurich.pm:195 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:113 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/index.html:31 msgid "Closed" msgstr "" @@ -619,15 +623,15 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:14 templates/web/base/auth/smsform.html:24 +#: templates/web/base/admin/extra-metadata-form.html:14 templates/web/base/auth/2faform.html:18 templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:56 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/Cobrand/ACV.pm:256 perllib/FixMyStreet/Cobrand/Default.pm:647 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -635,7 +639,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 +#: templates/web/base/auth/2faform.html:1 templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" @@ -672,11 +676,11 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1801 perllib/FixMyStreet/App/Controller/Admin.pm:1830 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1854 perllib/FixMyStreet/App/Controller/Admin.pm:1883 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:42 msgid "Could not look up location" msgstr "" @@ -716,15 +720,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:701 +#: perllib/FixMyStreet/Cobrand/ACV.pm:91 perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:702 +#: perllib/FixMyStreet/Cobrand/ACV.pm:92 perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:700 +#: perllib/FixMyStreet/Cobrand/ACV.pm:90 perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -740,11 +744,15 @@ msgstr "" msgid "Created:" msgstr "" -#: templates/web/base/auth/generate_token.html:27 +#: templates/web/base/auth/change_password.html:40 +msgid "Current password:" +msgstr "" + +#: templates/web/base/auth/generate_token.html:46 msgid "Current token:" msgstr "" -#: templates/web/base/dashboard/index.html:91 +#: templates/web/base/dashboard/index.html:92 msgid "Currently grouped by %s" msgstr "" @@ -752,7 +760,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 templates/web/zurich/admin/report_edit-sdm.html:105 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:869 templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -760,6 +768,10 @@ msgstr "" msgid "Dashboard" msgstr "" +#: templates/web/base/auth/generate_token.html:54 +msgid "Deactivate two-factor authentication" +msgstr "" + #: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -800,7 +812,7 @@ msgstr "" 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 +#: templates/web/base/js/translation_strings.html:39 templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" @@ -808,7 +820,7 @@ msgstr "" msgid "Details:" msgstr "" -#: templates/web/base/dashboard/index.html:103 +#: templates/web/base/dashboard/index.html:104 msgid "Device and Site" msgstr "" @@ -853,7 +865,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" @@ -885,23 +897,23 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/ACV.pm:102 perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/ACV.pm:103 perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:695 +#: perllib/FixMyStreet/Cobrand/ACV.pm:89 perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:696 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:694 +#: perllib/FixMyStreet/Cobrand/ACV.pm:88 perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit reports" msgstr "" @@ -921,7 +933,7 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/category_edit.html:28 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:17 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 +#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/category_edit.html:28 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:17 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:44 msgid "Email" msgstr "" @@ -941,7 +953,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/user-form.html:21 msgid "Email verified:" msgstr "" @@ -949,10 +961,6 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:111 -msgid "Email: %s" -msgstr "" - #: templates/web/base/admin/open311-form-fields.html:55 templates/web/base/admin/open311-form-fields.html:56 msgid "" "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" @@ -968,7 +976,7 @@ msgid "" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/dashboard/index.html:77 +#: templates/web/base/dashboard/index.html:78 msgid "End Date" msgstr "" @@ -976,7 +984,7 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:81 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:82 msgid "Enter a Zürich street name" msgstr "" @@ -992,7 +1000,7 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: 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 +#: templates/web/base/auth/general.html:128 templates/web/base/report/new/form_user_loggedout_by_email.html:47 templates/web/base/report/update/form_user_loggedout_by_email.html:20 templates/web/zurich/auth/general.html:58 msgid "Enter a password" msgstr "" @@ -1020,7 +1028,7 @@ msgstr "" msgid "Existing category" msgstr "" -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Expand map" msgstr "" @@ -1028,11 +1036,11 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:104 +#: templates/web/base/dashboard/index.html:105 msgid "Export as CSV" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:179 perllib/FixMyStreet/Cobrand/Zurich.pm:918 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:12 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:957 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:12 msgid "Extern" msgstr "" @@ -1052,7 +1060,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:656 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:674 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" @@ -1084,7 +1092,7 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: 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/dashboard/index.html:113 +#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 templates/web/base/admin/states/index.html:29 templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:114 msgid "Fixed" msgstr "" @@ -1104,7 +1112,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:627 templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:645 templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1112,7 +1120,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/user-form.html:108 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1120,7 +1128,7 @@ 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:140 templates/web/base/admin/user-form.html:118 +#: templates/web/base/admin/report_edit.html:142 templates/web/base/admin/user-form.html:115 msgid "Flagged:" msgstr "" @@ -1140,15 +1148,15 @@ 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 "" -#: 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 +#: templates/web/base/auth/general.html:96 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?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:748 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:749 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded wish to external body" msgstr "" @@ -1156,7 +1164,7 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "" -#: 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 +#: templates/web/base/auth/generate_token.html:52 msgid "Generate token" msgstr "" @@ -1192,7 +1200,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/ACV.pm:104 perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1200,11 +1208,11 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/dashboard/index.html:93 +#: templates/web/base/dashboard/index.html:94 msgid "Group by %s" msgstr "" -#: templates/web/base/dashboard/index.html:98 +#: templates/web/base/dashboard/index.html:99 msgid "Group by:" msgstr "" @@ -1232,10 +1240,14 @@ msgstr "" msgid "Hi %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:911 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/index.html:32 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:950 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/index.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" +#: templates/web/base/admin/user-form.html:197 +msgid "Hide all reports and updates" +msgstr "" + #: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1256,7 +1268,7 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 templates/web/base/around/display_location.html:68 templates/web/base/js/translation_strings.html:55 +#: templates/web/base/around/display_location.html:60 templates/web/base/around/display_location.html:68 templates/web/base/js/translation_strings.html:61 msgid "Hide pins" msgstr "" @@ -1284,7 +1296,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:38 msgid "How to send successful reports" msgstr "" @@ -1332,7 +1344,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/auth/generate_token.html:39 +#: templates/web/base/auth/generate_token.html:61 msgid "If you generate a new token the existing token will no longer work." msgstr "" @@ -1402,7 +1414,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 perllib/FixMyStreet/Cobrand/Zurich.pm:959 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 perllib/FixMyStreet/Cobrand/Zurich.pm:998 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 msgid "In progress" msgstr "" @@ -1430,7 +1442,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:698 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Instruct contractors to fix problems" msgstr "" @@ -1462,15 +1474,15 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:182 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Jurisdiction Unknown" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:923 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:15 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:962 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:15 msgid "Jurisdiction unknown" msgstr "" -#: 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 +#: templates/web/base/auth/general.html:92 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:30 msgid "Keep me signed in on this computer" msgstr "" @@ -1530,6 +1542,10 @@ msgstr "" msgid "List all reported problems" msgstr "" +#: templates/web/base/around/on_map_list_items.html:18 +msgid "Loading reports…" +msgstr "" + #: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "" @@ -1558,23 +1574,31 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:71 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Log in with email/text" msgstr "" -#: templates/web/base/dashboard/index.html:81 +#: templates/web/base/admin/user-form.html:195 +msgid "Log out of all sessions" +msgstr "" + +#: templates/web/base/dashboard/index.html:82 msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:699 +#: templates/web/base/admin/user-form.html:196 +msgid "Make anonymous on all reports and updates" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Manage shortlist" msgstr "" @@ -1582,7 +1606,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "Map" msgstr "" @@ -1590,11 +1614,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/user-form.html:106 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:697 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Markup problem details" msgstr "" @@ -1622,7 +1646,7 @@ msgstr "" msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:693 +#: perllib/FixMyStreet/Cobrand/ACV.pm:87 perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Moderate report details" msgstr "" @@ -1646,7 +1670,7 @@ msgstr "" msgid "Moderation reason:" msgstr "" -#: templates/web/base/dashboard/index.html:101 +#: templates/web/base/dashboard/index.html:102 msgid "Month" msgstr "" @@ -1654,7 +1678,7 @@ msgstr "" msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/extra-metadata-form.html:65 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reportextrafields/edit.html:11 templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/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: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 templates/web/zurich/report/new/fill_in_details_form.html:59 +#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/extra-metadata-form.html:65 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reportextrafields/edit.html:11 templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/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:115 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:50 templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" @@ -1662,10 +1686,6 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:110 -msgid "Name: %s" -msgstr "" - #: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" @@ -1682,7 +1702,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:521 perllib/FixMyStreet/Cobrand/Default.pm:549 +#: perllib/FixMyStreet/Cobrand/Default.pm:539 perllib/FixMyStreet/Cobrand/Default.pm:567 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1700,11 +1720,11 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" -#: templates/web/base/auth/smsform.html:19 +#: templates/web/base/auth/2faform.html:8 templates/web/base/auth/smsform.html:19 msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:129 msgid "New" msgstr "" @@ -1732,7 +1752,7 @@ msgstr "" msgid "New note to DM:" msgstr "" -#: templates/web/base/auth/change_password.html:35 +#: templates/web/base/auth/change_password.html:47 msgid "New password:" msgstr "" @@ -1784,15 +1804,15 @@ msgstr "" msgid "Next" msgstr "" -#: 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 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:125 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 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:98 +#: perllib/FixMyStreet/Cobrand/Default.pm:1240 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:125 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 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:98 msgid "No" msgstr "" -#: templates/web/base/admin/user-form.html:84 +#: templates/web/base/admin/user-form.html:80 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:48 msgid "No body" msgstr "" @@ -1828,7 +1848,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:43 msgid "No result returned" msgstr "" @@ -1846,13 +1866,13 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:76 templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/user-form.html:72 templates/web/base/admin/user-form.html:73 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:46 templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:38 templates/web/base/admin/user-form.html:39 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" @@ -1860,7 +1880,7 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:186 perllib/FixMyStreet/Cobrand/Zurich.pm:933 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:187 perllib/FixMyStreet/Cobrand/Zurich.pm:972 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:13 msgid "Not contactable" msgstr "" @@ -1912,15 +1932,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:49 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Offline update data saved" msgstr "" @@ -1936,7 +1956,7 @@ msgstr "" msgid "On behalf of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:174 perllib/FixMyStreet/Cobrand/Zurich.pm:905 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 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:175 perllib/FixMyStreet/Cobrand/Zurich.pm:944 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:112 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1972,7 +1992,7 @@ msgstr "" msgid "Order" msgstr "" -#: 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/DB/Result/Problem.pm:619 perllib/FixMyStreet/Script/Reports.pm:182 perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1262 perllib/FixMyStreet/App/Controller/Report/New.pm:686 perllib/FixMyStreet/App/Controller/Report/New.pm:687 perllib/FixMyStreet/App/Controller/Report/New.pm:716 perllib/FixMyStreet/App/Controller/Report/New.pm:719 perllib/FixMyStreet/DB/Result/Problem.pm:588 perllib/FixMyStreet/DB/Result/Problem.pm:595 perllib/FixMyStreet/DB/Result/Problem.pm:610 perllib/FixMyStreet/DB/Result/Problem.pm:619 perllib/FixMyStreet/Script/Reports.pm:179 perllib/FixMyStreet/Script/Reports.pm:194 msgid "Other" msgstr "" @@ -2004,19 +2024,19 @@ msgstr "" msgid "Partial" msgstr "" -#: 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 +#: templates/web/base/auth/general.html:118 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:22 templates/web/zurich/auth/general.html:53 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/general.html:81 +#: templates/web/base/auth/general.html:83 msgid "Password:" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:58 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:162 +#: templates/web/base/admin/user-form.html:164 msgid "Permissions:" msgstr "" @@ -2032,11 +2052,11 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: templates/web/base/admin/user-form.html:30 +#: templates/web/base/admin/user-form.html:25 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 +#: templates/web/base/admin/report_edit.html:135 templates/web/base/admin/user-form.html:23 templates/web/base/my/my.html:47 templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "" @@ -2068,11 +2088,11 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 templates/web/base/js/translation_strings.html:30 +#: templates/web/base/around/display_location.html:74 templates/web/base/js/translation_strings.html:36 msgid "Place pin on map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:945 perllib/FixMyStreet/Cobrand/Zurich.pm:951 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:984 perllib/FixMyStreet/Cobrand/Zurich.pm:990 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 msgid "Planned" msgstr "" @@ -2080,22 +2100,26 @@ msgstr "" msgid "Please be polite, concise and to the point." msgstr "" -#: templates/web/base/auth/change_password.html:22 templates/web/base/auth/change_password.html:27 +#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:31 msgid "Please check the passwords and try again" msgstr "" -#: 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 +#: 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 msgid "Please check your email address is correct" msgstr "" -#: 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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 perllib/FixMyStreet/DB/Result/User.pm:205 perllib/FixMyStreet/DB/Result/User.pm:206 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:7 msgid "Please check your phone number is correct" msgstr "" -#: 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:10 +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 perllib/FixMyStreet/App/Controller/Report/New.pm:923 perllib/FixMyStreet/App/Controller/Report/New.pm:946 perllib/FixMyStreet/DB/Result/Problem.pm:383 templates/web/base/js/translation_strings.html:13 msgid "Please choose a category" msgstr "" +#: perllib/FixMyStreet/App/Controller/Auth.pm:383 perllib/FixMyStreet/App/Controller/Auth.pm:409 +msgid "Please choose a less commonly-used password" +msgstr "" + #: 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 "" @@ -2111,15 +2135,15 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:298 perllib/FixMyStreet/DB/Result/Comment.pm:128 templates/web/base/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 perllib/FixMyStreet/DB/Result/Comment.pm:128 templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: 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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 perllib/FixMyStreet/DB/Result/User.pm:208 perllib/FixMyStreet/DB/Result/User.pm:209 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:4 msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1358 perllib/FixMyStreet/App/Controller/Admin.pm:1462 msgid "Please enter a name" msgstr "" @@ -2127,31 +2151,31 @@ msgstr "" 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:20 +#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:29 templates/web/base/js/translation_strings.html:23 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:4 +#: perllib/FixMyStreet/App/Controller/Contact.pm:115 perllib/FixMyStreet/DB/Result/Problem.pm:366 templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "" -#: 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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 perllib/FixMyStreet/App/Controller/Admin.pm:1453 perllib/FixMyStreet/App/Controller/Admin.pm:311 perllib/FixMyStreet/DB/Result/User.pm:198 templates/web/base/js/translation_strings.html:16 templates/web/base/js/translation_strings.html:20 msgid "Please enter a valid email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:350 perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 perllib/FixMyStreet/App/Controller/Contact.pm:125 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1349 perllib/FixMyStreet/App/Controller/Admin.pm:1447 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 templates/web/base/js/translation_strings.html:5 +#: perllib/FixMyStreet/DB/Result/Problem.pm:369 templates/web/base/js/translation_strings.html:8 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:114 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 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/User.pm:196 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:15 templates/web/base/js/translation_strings.html:19 msgid "Please enter your email" msgstr "" @@ -2159,27 +2183,27 @@ msgstr "" msgid "Please enter your email address" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:326 templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/Cobrand/UK.pm:326 templates/web/base/js/translation_strings.html:11 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:186 templates/web/base/js/translation_strings.html:7 +#: 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:191 templates/web/base/js/translation_strings.html:10 msgid "Please enter your name" msgstr "" -#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6 templates/web/base/js/translation_strings.html:23 +#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6 templates/web/base/js/translation_strings.html:29 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/js/translation_strings.html:33 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:31 msgid "Please enter your title" msgstr "" @@ -2199,10 +2223,18 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" +#: templates/web/base/auth/2faform.html:9 +msgid "Please generate a two-factor code and enter it below:" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" +#: perllib/FixMyStreet/App/Controller/Auth.pm:406 templates/web/base/js/translation_strings.html:26 +msgid "Please make sure your password is at least %d characters long" +msgstr "" + #: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" @@ -2259,11 +2291,11 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 perllib/FixMyStreet/App/Model/PhotoSet.pm:158 templates/web/base/js/translation_strings.html:60 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 perllib/FixMyStreet/App/Model/PhotoSet.pm:158 templates/web/base/js/translation_strings.html:66 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 perllib/FixMyStreet/App/Controller/Admin.pm:1449 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1352 perllib/FixMyStreet/App/Controller/Admin.pm:1450 msgid "Please verify at least one of email/phone" msgstr "" @@ -2275,23 +2307,23 @@ msgstr "" 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:18 templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update-form.html:25 templates/web/base/report/update/form_user_loggedout_by_email.html:21 templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:211 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:266 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:254 +#: perllib/FixMyStreet/DB/Result/Comment.pm:234 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 msgid "Posted by <strong>%s</strong> at %s" msgstr "" @@ -2303,7 +2335,7 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 msgid "Priorities" msgstr "" @@ -2319,7 +2351,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 templates/web/base/admin/contact-form.html:75 templates/web/base/admin/report_edit.html:142 +#: templates/web/base/admin/body.html:88 templates/web/base/admin/contact-form.html:75 templates/web/base/admin/report_edit.html:144 msgid "Private" msgstr "" @@ -2347,7 +2379,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 msgid "Problem marked as open." msgstr "" @@ -2355,7 +2387,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:692 templates/web/base/admin/flagged.html:10 +#: perllib/FixMyStreet/Cobrand/ACV.pm:86 perllib/FixMyStreet/Cobrand/Default.pm:710 templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2379,7 +2411,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:839 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "Problems within %s" msgstr "" @@ -2408,11 +2440,11 @@ msgstr "" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 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:41 templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:43 templates/web/base/report/update/form_user_loggedout_by_email.html:16 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2428,7 +2460,7 @@ msgstr "" msgid "Public update:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:123 templates/web/zurich/admin/stats/index.html:38 +#: templates/web/zurich/admin/report_edit.html:122 templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2472,7 +2504,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:822 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:222 +#: perllib/FixMyStreet/Cobrand/Default.pm:840 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" msgstr "" @@ -2517,6 +2549,10 @@ msgstr "" msgid "Remove" msgstr "" +#: templates/web/base/admin/user-form.html:198 +msgid "Remove account details" +msgstr "" + #: templates/web/base/admin/extra-metadata-form.html:4 msgid "Remove field" msgstr "" @@ -2533,11 +2569,11 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:159 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/base/admin/report_edit.html:161 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 +#: templates/web/base/auth/generate_token.html:52 msgid "Replace token" msgstr "" @@ -2565,11 +2601,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:302 +#: perllib/FixMyStreet/App/Controller/Rss.pm:303 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:61 +#: templates/web/base/dashboard/index.html:62 msgid "Report state:" msgstr "" @@ -2629,11 +2665,11 @@ msgstr "" msgid "Reported:" msgstr "" -#: 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 templates/web/zurich/report/new/fill_in_details_form.html:4 +#: templates/web/base/around/index.html:3 templates/web/base/around/lookup_by_ref.html:3 templates/web/base/js/translation_strings.html:48 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:8 templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 perllib/FixMyStreet/Cobrand/Zurich.pm:388 templates/web/zurich/header.html:46 +#: perllib/FixMyStreet/Cobrand/ACV.pm:265 perllib/FixMyStreet/Cobrand/Default.pm:656 perllib/FixMyStreet/Cobrand/Zurich.pm:415 templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -2649,7 +2685,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:125 +#: templates/web/base/admin/user-form.html:124 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -2661,7 +2697,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:81 msgid "Reports saved offline." msgstr "" @@ -2729,7 +2765,7 @@ msgstr "" msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:28 templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:34 templates/web/base/js/translation_strings.html:46 msgid "Right place?" msgstr "" @@ -2741,11 +2777,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: 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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1928 perllib/FixMyStreet/App/Controller/Admin.pm:1932 templates/web/base/admin/report_edit.html:158 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: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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1928 templates/web/base/admin/report_edit.html:159 templates/web/base/admin/update_edit.html:69 templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -2753,7 +2789,7 @@ msgstr "" 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:2 +#: templates/web/base/js/translation_strings.html:53 templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -2774,11 +2810,11 @@ 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:76 +#: templates/web/base/js/translation_strings.html:82 msgid "Saving reports offline" msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:130 msgid "Scheduled" msgstr "" @@ -2806,11 +2842,15 @@ msgstr "" msgid "Searching found no users." msgstr "" +#: templates/web/base/auth/generate_token.html:1 templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:39 templates/web/base/my/my.html:65 +msgid "Security" +msgstr "" + #: templates/web/base/report/new/councils_text_private.html:7 templates/web/base/report/new/form_user.html:5 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:703 +#: perllib/FixMyStreet/Cobrand/ACV.pm:93 perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" @@ -2842,7 +2882,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:831 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:870 msgid "Sent report back" msgstr "" @@ -2858,6 +2898,10 @@ msgstr "" msgid "Service:" msgstr "" +#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:4 +msgid "Set password" +msgstr "" + #: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -2902,7 +2946,7 @@ msgstr "" msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 templates/web/base/around/display_location.html:66 templates/web/base/js/translation_strings.html:54 +#: templates/web/base/around/display_location.html:58 templates/web/base/around/display_location.html:66 templates/web/base/js/translation_strings.html:60 msgid "Show pins" msgstr "" @@ -2914,15 +2958,15 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:124 templates/web/base/auth/general.html:3 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 +#: templates/web/base/auth/general.html:129 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:87 templates/web/base/main_nav_items.html:6 templates/web/zurich/auth/general.html:25 templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/general.html:100 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 +#: templates/web/base/auth/general.html:98 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 "" @@ -2953,15 +2997,27 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:80 +#: perllib/FixMyStreet/Cobrand/ACV.pm:59 perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" +#: perllib/FixMyStreet/Cobrand/ACV.pm:73 +msgid "Sorry, that appears to be a Northern Irish postcode, which we don't cover." +msgstr "" + +#: perllib/FixMyStreet/Cobrand/ACV.pm:65 +msgid "Sorry, that appears to be a Scottish postcode, which we don't cover." +msgstr "" + +#: perllib/FixMyStreet/Cobrand/ACV.pm:69 +msgid "Sorry, that appears to be a Welsh postcode, which we don't cover." +msgstr "" + #: 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 +#: templates/web/base/auth/2faform.html:5 templates/web/base/auth/smsform.html:16 msgid "Sorry, that wasn’t the correct code" msgstr "" @@ -2999,19 +3055,19 @@ msgstr "" msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:65 +#: templates/web/base/admin/user-form.html:58 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:68 +#: templates/web/base/admin/user-form.html:62 msgid "Staff:" msgstr "" -#: templates/web/base/dashboard/index.html:73 +#: templates/web/base/dashboard/index.html:74 msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 templates/web/base/admin/category_edit.html:29 templates/web/base/admin/contact-form.html:53 templates/web/base/admin/flagged.html:18 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: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 +#: templates/web/base/admin/body.html:73 templates/web/base/admin/category_edit.html:29 templates/web/base/admin/contact-form.html:53 templates/web/base/admin/flagged.html:18 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:50 templates/web/base/admin/templates.html:8 templates/web/base/dashboard/index.html:101 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 "" @@ -3023,11 +3079,11 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:628 templates/web/base/admin/states/index.html:1 +#: perllib/FixMyStreet/Cobrand/ACV.pm:255 perllib/FixMyStreet/Cobrand/Default.pm:646 templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:622 perllib/FixMyStreet/Cobrand/Zurich.pm:391 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 perllib/FixMyStreet/Cobrand/Zurich.pm:418 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 "" @@ -3051,7 +3107,7 @@ msgstr "" msgid "Subcategory" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:191 +#: perllib/FixMyStreet/Script/Reports.pm:188 msgid "Subcategory: %s" msgstr "" @@ -3067,11 +3123,11 @@ 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: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 +#: templates/web/base/auth/2faform.html:21 templates/web/base/auth/smsform.html:27 templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:76 templates/web/base/report/new/form_user_loggedout_by_email.html:48 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:167 templates/web/base/admin/report_edit.html:24 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 +#: templates/web/base/admin/report_edit.html:169 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:79 templates/web/base/admin/user-form.html:191 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 msgid "Submit changes" msgstr "" @@ -3079,7 +3135,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:898 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:170 perllib/FixMyStreet/Cobrand/Zurich.pm:937 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 msgid "Submitted" msgstr "" @@ -3099,11 +3155,11 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: 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 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:43 +#: perllib/FixMyStreet/Cobrand/ACV.pm:249 perllib/FixMyStreet/Cobrand/Default.pm:638 perllib/FixMyStreet/Cobrand/Zurich.pm:414 templates/web/base/admin/bodies.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:43 msgid "Summary" msgstr "" -#: templates/web/zurich/reports/index.html:0 templates/web/zurich/reports/index.html:5 +#: templates/web/zurich/reports/index.html:0 templates/web/zurich/reports/index.html:6 msgid "Summary reports" msgstr "" @@ -3115,7 +3171,7 @@ msgstr "" msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:148 +#: templates/web/base/admin/user-form.html:147 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" @@ -3127,7 +3183,7 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/zurich/header.html:63 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 perllib/FixMyStreet/Cobrand/Zurich.pm:425 templates/web/zurich/header.html:63 msgid "Templates" msgstr "" @@ -3183,7 +3239,7 @@ msgstr "" msgid "That location does not appear to be in the UK; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50 perllib/FixMyStreet/Cobrand/UK.pm:73 +#: perllib/FixMyStreet/Cobrand/ACV.pm:52 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50 perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -3203,6 +3259,22 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1769 +msgid "That user has been logged out." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +msgid "That user has been made anonymous on all reports and updates." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1812 +msgid "That user’s personal details have been removed." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1790 +msgid "That user’s reports and updates have been hidden." +msgstr "" + #: templates/web/base/admin/contact-form.html:27 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" @@ -3249,7 +3321,7 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 perllib/FixMyStreet/App/Controller/Reports.pm:85 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 perllib/FixMyStreet/App/Controller/Reports.pm:84 msgid "The error was: %s" msgstr "" @@ -3301,7 +3373,7 @@ msgstr "" msgid "The ordering of this field on the report page. Fields are shown in ascending order according to this value." msgstr "" -#: templates/web/base/auth/change_password.html:22 templates/web/base/auth/change_password.html:26 +#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:30 msgid "The passwords do not match" msgstr "" @@ -3313,7 +3385,7 @@ msgstr "" 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:95 +#: perllib/FixMyStreet/Script/Reports.pm:96 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3323,7 +3395,7 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: 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 +#: templates/web/base/around/on_map_list_items.html:20 templates/web/base/my/_problem-list.html:8 templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" @@ -3331,7 +3403,7 @@ msgstr "" msgid "There is already an auto-response template for this category/state." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:82 +#: perllib/FixMyStreet/App/Controller/Reports.pm:81 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3339,15 +3411,15 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:359 +#: perllib/FixMyStreet/App/Controller/Alert.pm:364 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: 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 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:815 perllib/FixMyStreet/App/Controller/Report/Update.pm:142 templates/web/base/auth/general.html:51 templates/web/zurich/auth/general.html:18 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 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:348 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3355,7 +3427,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:389 msgid "There were problems with your update. Please see below." msgstr "" @@ -3405,15 +3477,15 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/Script/Reports.pm:195 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:201 +#: perllib/FixMyStreet/Script/Reports.pm:198 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: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 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1004 perllib/FixMyStreet/App/Controller/Report/New.pm:1021 perllib/FixMyStreet/App/Controller/Report/New.pm:1067 perllib/FixMyStreet/App/Controller/Report/New.pm:960 perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -3449,7 +3521,7 @@ msgstr "" msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:166 perllib/FixMyStreet/Cobrand/Zurich.pm:167 templates/web/zurich/report/_main.html:14 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:167 perllib/FixMyStreet/Cobrand/Zurich.pm:168 templates/web/zurich/report/_main.html:12 msgid "This report is awaiting moderation." msgstr "" @@ -3465,11 +3537,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:108 -msgid "This report was submitted anonymously" -msgstr "" - -#: perllib/FixMyStreet/Script/Reports.pm:88 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3477,7 +3545,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:621 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/Cobrand/ACV.pm:250 perllib/FixMyStreet/Cobrand/Default.pm:639 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3509,7 +3577,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:94 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3529,7 +3597,7 @@ msgstr "" msgid "Top 5 wards" 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 +#: templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/admin/stats/questionnaire.html:24 templates/web/base/dashboard/index.html:115 templates/web/base/dashboard/index.html:120 templates/web/base/dashboard/index.html:144 templates/web/zurich/admin/stats/index.html:30 msgid "Total" msgstr "" @@ -3545,19 +3613,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:129 +#: templates/web/base/admin/user-form.html:128 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/ACV.pm:99 perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:137 +#: templates/web/base/admin/user-form.html:136 msgid "Trusted:" msgstr "" -#: templates/web/base/auth/smsform.html:17 templates/web/base/js/translation_strings.html:29 +#: templates/web/base/auth/2faform.html:6 templates/web/base/auth/smsform.html:17 templates/web/base/js/translation_strings.html:35 msgid "Try again" msgstr "" @@ -3565,11 +3633,19 @@ msgstr "" msgid "Try emailing us directly:" msgstr "" +#: templates/web/base/auth/generate_token.html:21 +msgid "Two-factor authentication has been activated" +msgstr "" + +#: templates/web/base/auth/generate_token.html:32 +msgid "Two-factor authentication has been deactivated" +msgstr "" + #: templates/web/base/admin/extra-metadata-form.html:44 templates/web/base/admin/states/index.html:10 templates/web/base/admin/states/index.html:100 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/user-form.html:30 msgid "Unban" msgstr "" @@ -3585,7 +3661,7 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:109 perllib/FixMyStreet/App/Controller/Root.pm:141 templates/web/base/js/translation_strings.html:38 +#: perllib/FixMyStreet/App/Controller/Photo.pm:109 perllib/FixMyStreet/App/Controller/Root.pm:141 templates/web/base/js/translation_strings.html:44 msgid "Unknown error" msgstr "" @@ -3649,15 +3725,15 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:260 +#: perllib/FixMyStreet/DB/Result/Comment.pm:240 msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Updated by <strong>%s</strong> at %s" msgstr "" -#: 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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 perllib/FixMyStreet/App/Controller/Admin.pm:1391 perllib/FixMyStreet/App/Controller/Admin.pm:1592 perllib/FixMyStreet/App/Controller/Admin.pm:933 perllib/FixMyStreet/Cobrand/Zurich.pm:806 perllib/FixMyStreet/Cobrand/Zurich.pm:831 perllib/FixMyStreet/Cobrand/Zurich.pm:901 msgid "Updated!" msgstr "" @@ -3704,27 +3780,27 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 perllib/FixMyStreet/App/Controller/Admin.pm:1756 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:1473 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1369 perllib/FixMyStreet/App/Controller/Admin.pm:1474 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1743 perllib/FixMyStreet/App/Controller/Admin.pm:1753 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1887 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1858 msgid "User flagged" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/user-form.html:38 templates/web/base/admin/users.html:32 +#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/user-form.html:30 templates/web/base/admin/users.html:32 msgid "User in abuse table" msgstr "" @@ -3736,11 +3812,11 @@ msgstr "" 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:55 +#: perllib/FixMyStreet/Cobrand/ACV.pm:101 perllib/FixMyStreet/Cobrand/ACV.pm:271 perllib/FixMyStreet/Cobrand/Default.pm:670 perllib/FixMyStreet/Cobrand/Default.pm:729 perllib/FixMyStreet/Cobrand/Zurich.pm:430 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:159 +#: templates/web/base/admin/user-form.html:161 msgid "Users can perform the following actions within their assigned body or area." msgstr "" @@ -3800,7 +3876,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:207 +#: perllib/FixMyStreet/Script/Reports.pm:204 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 "" @@ -3820,7 +3896,7 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:117 +#: templates/web/base/dashboard/index.html:118 msgid "Website" msgstr "" @@ -3852,7 +3928,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -3860,7 +3936,7 @@ msgstr "" msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:190 perllib/FixMyStreet/Cobrand/Zurich.pm:928 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:14 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:191 perllib/FixMyStreet/Cobrand/Zurich.pm:967 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:14 msgid "Wish" msgstr "" @@ -3868,7 +3944,7 @@ 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 "" -#: templates/web/base/dashboard/index.html:158 +#: templates/web/base/dashboard/index.html:159 msgid "Within the specified timeframe:" msgstr "" @@ -3888,7 +3964,7 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" -#: 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 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:124 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 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:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:1239 templates/web/base/admin/bodies.html:70 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:124 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 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:96 msgid "Yes" msgstr "" @@ -3900,7 +3976,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:83 msgid "You are offline" msgstr "" @@ -3916,7 +3992,7 @@ msgstr "" msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/user-form.html:110 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3943,11 +4019,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:41 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:85 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -3971,11 +4047,11 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:142 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 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:158 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 "" @@ -3983,7 +4059,7 @@ msgstr "" msgid "You have successfully confirmed your phone number." msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:129 msgid "You have successfully removed your phone number." msgstr "" @@ -3991,7 +4067,7 @@ msgstr "" msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:164 msgid "You have successfully verified your phone number." msgstr "" @@ -4018,7 +4094,7 @@ msgstr "" 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 +#: templates/web/base/auth/change_password.html:13 templates/web/base/auth/generate_token.html:15 templates/web/base/auth/generate_token.html:26 templates/web/base/auth/generate_token.html:34 templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" @@ -4026,7 +4102,7 @@ msgstr "" msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:15 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 +#: templates/web/base/auth/change_email.html:15 templates/web/zurich/auth/general.html:20 templates/web/zurich/auth/general.html:48 msgid "Your email address" msgstr "" @@ -4038,7 +4114,7 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: 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: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 +#: templates/web/base/auth/general.html:116 templates/web/base/contact/index.html:74 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:51 templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Your name" msgstr "" @@ -4054,18 +4130,22 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Your offline reports" msgstr "" -#: 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 +#: templates/web/base/auth/general.html:86 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:24 msgid "Your password" msgstr "" -#: templates/web/base/auth/change_password.html:10 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:170 templates/web/base/auth/change_password.html:12 msgid "Your password has been changed" msgstr "" +#: templates/web/base/auth/general.html:133 templates/web/base/report/new/form_user_loggedout_by_email.html:52 templates/web/base/report/update/form_user_loggedout_by_email.html:25 templates/web/zurich/auth/general.html:63 +msgid "Your password should include %d or more characters." +msgstr "" + #: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/index.html:87 templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -4086,7 +4166,7 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -4102,15 +4182,15 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:169 +#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:171 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:909 perllib/FixMyStreet/App/Controller/Moderate.pm:85 perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 perllib/FixMyStreet/App/Controller/Moderate.pm:85 perllib/FixMyStreet/DB/Result/Comment.pm:216 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:270 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "and a defect raised" msgstr "" @@ -4138,7 +4218,7 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:63 templates/web/zurich/report/_item.html:14 +#: templates/web/base/report/_item.html:63 templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" @@ -4150,7 +4230,7 @@ msgstr "" msgid "n/a" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:172 msgid "none" msgstr "" @@ -4186,7 +4266,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "this type of local problem" msgstr "" @@ -4194,11 +4274,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 msgid "updates" msgstr "" @@ -4214,11 +4294,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1831 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1829 msgid "user removed from abuse list" msgstr "" @@ -4282,7 +4362,7 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/fixmystreet.com/reports/summary.html:103 +#: templates/web/fixmystreet.com/reports/summary.html:104 #, perl-format msgid "%s day" msgid_plural "%s days" |