diff options
Diffstat (limited to 'locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po')
| -rw-r--r-- | locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1239 |
1 files changed, 660 insertions, 579 deletions
diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index b1898bdad..6e2451836 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2020-05-06 13:37+0100\n" +"POT-Creation-Date: 2020-11-11 16:01+0000\n" "PO-Revision-Date: 2019-04-29 18:03+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n" "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n" @@ -20,8 +20,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:714 -#: perllib/FixMyStreet/DB/Result/Problem.pm:716 +#: perllib/FixMyStreet/DB/Result/Problem.pm:717 +#: perllib/FixMyStreet/DB/Result/Problem.pm:719 #: perllib/FixMyStreet/Queue/Item/Report.pm:194 msgid " and " msgstr "şi" @@ -56,7 +56,7 @@ msgstr "" #: templates/web/base/dashboard/heatmap.html:0 #: templates/web/base/dashboard/heatmap.html:9 #: templates/web/base/reports/body.html:0 -#: templates/web/base/reports/body.html:31 +#: templates/web/base/reports/body.html:26 msgid "%s - Summary reports" msgstr "%s - rapoarte de sinteză" @@ -111,7 +111,7 @@ msgstr "%s chestionare trimise – %s completate (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:44 +#: perllib/FixMyStreet/Map/OSM.pm:47 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" @@ -157,6 +157,8 @@ msgstr "" msgid "(not sent to council)" msgstr "(netrimis)" +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/form/user_loggedout_by_email.html:56 #: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" @@ -175,8 +177,8 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 #: templates/web/zurich/admin/bodies/form.html:27 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" @@ -202,17 +204,18 @@ msgid "" msgstr "" #: templates/web/base/dashboard/index.html:18 +#: templates/web/base/dashboard/status.html:11 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/admin/triage/_list-filters.html:23 -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/admin/triage/_list-filters.html:24 +#: templates/web/base/reports/_list-filters.html:41 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:104 +#: templates/web/base/js/translation_strings.html:106 msgid "<span>%s</span> saved." msgstr "" @@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:80 msgid "<u>Take or choose existing photo</u>" msgstr "" @@ -259,7 +262,7 @@ msgid "Access denied" msgstr "" #: templates/web/base/auth/2fa/intro.html:20 -#: templates/web/base/auth/generate_token.html:61 +#: templates/web/base/auth/generate_token.html:65 msgid "Activate two-factor authentication" msgstr "" @@ -279,7 +282,7 @@ msgstr "" msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:108 +#: templates/web/base/admin/bodies/contact-form.html:140 #, fuzzy msgid "Add another parent category" msgstr "Adaugă o categorie nouă" @@ -312,7 +315,7 @@ msgstr "" msgid "Add new category" msgstr "Adaugă o categorie nouă" -#: templates/web/base/admin/extra-metadata-item.html:87 +#: templates/web/base/admin/extra-metadata-item.html:88 msgid "Add option" msgstr "" @@ -321,8 +324,8 @@ msgstr "" msgid "Add phone number" msgstr "" -#: templates/web/base/report/_item.html:10 -#: templates/web/base/report/_item.html:16 +#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:27 #: templates/web/base/report/_main.html:149 #: templates/web/base/report/_main.html:25 #: templates/web/base/report/_main.html:36 @@ -330,21 +333,20 @@ msgid "Add to shortlist" msgstr "" #: templates/web/base/admin/users/edit.html:4 -#: templates/web/base/admin/users/index.html:95 -#: templates/web/base/admin/users/index.html:98 +#: templates/web/base/admin/users/index.html:101 +#: templates/web/base/admin/users/index.html:104 msgid "Add user" msgstr "Adaugă utilizator" -#: perllib/FixMyStreet/Cobrand/Default.pm:777 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:209 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:779 +#: perllib/FixMyStreet/Cobrand/Default.pm:795 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:778 +#: perllib/FixMyStreet/Cobrand/Default.pm:794 msgid "Add/edit response templates" msgstr "" @@ -360,6 +362,12 @@ msgstr "" msgid "Admin" msgstr "" +#. ("JS") +#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5 +msgid "Aerial" +msgstr "" + #: templates/web/base/auth/change_password.html:51 msgid "Again:" msgstr "" @@ -372,8 +380,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:46 -#: templates/web/base/report/update/form_user_loggedin.html:35 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Alert me to future updates" msgstr "" @@ -385,10 +393,12 @@ msgstr "" #: templates/web/base/dashboard/index.html:52 #: templates/web/base/dashboard/index.html:65 #: templates/web/base/reports/_list-filter-status.html:4 +#: templates/web/zurich/header.html:57 #: templates/web/zurich/reports/_list-filter-status.html:2 msgid "All" msgstr "" +#: templates/web/zurich/admin/reports/index.html:1 #: templates/web/zurich/reports/index.html:14 msgid "All Reports" msgstr "" @@ -428,6 +438,10 @@ msgstr "" msgid "All time" msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:81 +msgid "Allow anonymous reports on this category" +msgstr "" + #: templates/web/base/report/new/duplicate_suggestions.html:7 msgid "Already been reported?" msgstr "" @@ -463,7 +477,7 @@ msgstr "" msgid "Anonymous user" msgstr "" -#: templates/web/base/admin/reports/edit.html:135 +#: templates/web/base/admin/reports/edit.html:148 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 #: templates/web/base/report/update/moderation_diff.html:5 @@ -476,7 +490,7 @@ msgid "Another user" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:81 msgid "Are you sure you want to cancel this upload?" msgstr "" @@ -485,8 +499,8 @@ msgstr "" #: templates/web/base/admin/reports/edit.html:85 #: templates/web/base/admin/roles/form.html:25 #: templates/web/base/admin/states/index.html:48 -#: templates/web/base/admin/templates/edit.html:88 -#: templates/web/base/js/translation_strings.html:99 +#: templates/web/base/admin/templates/edit.html:77 +#: templates/web/base/js/translation_strings.html:101 #: templates/web/base/report/display_tools.html:7 msgid "Are you sure?" msgstr "" @@ -497,7 +511,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/users/form.html:85 +#: templates/web/base/admin/users/form.html:56 msgid "Area:" msgstr "" @@ -510,27 +524,32 @@ msgstr "" msgid "Assign selected to role:" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:199 +#: templates/web/zurich/admin/reports/edit.html:203 msgid "Assign to competent body:" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:158 +#: templates/web/zurich/admin/reports/edit.html:162 #: templates/web/zurich/admin/stats/index.html:57 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:197 +#: templates/web/zurich/admin/reports/edit.html:201 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:176 +#: templates/web/zurich/admin/reports/edit.html:180 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:774 +#: perllib/FixMyStreet/Cobrand/Default.pm:790 msgid "Assign users to areas" msgstr "" +#: templates/web/base/admin/users/form.html:84 +#, fuzzy +msgid "Assigned categories only" +msgstr "Adaugă o categorie nouă" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:185 msgid "Assigned to %s" msgstr "" @@ -543,7 +562,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/users/form.html:99 +#: templates/web/base/admin/users/form.html:70 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -551,11 +570,11 @@ msgstr "" msgid "Auto Response" msgstr "" -#: templates/web/base/admin/templates/edit.html:77 +#: templates/web/base/admin/templates/edit.html:66 msgid "Auto-response:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:762 +#: perllib/FixMyStreet/Cobrand/Default.pm:778 msgid "Automatically populate report subject/detail" msgstr "" @@ -567,12 +586,13 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:342 +#: perllib/FixMyStreet/DB/Result/Problem.pm:363 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" #. ("JS") +#: templates/web/base/dashboard/status.html:17 #: templates/web/base/js/translation_strings.html:45 msgid "Back" msgstr "" @@ -593,14 +613,12 @@ msgstr "" msgid "Behaviour" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:693 -#: perllib/FixMyStreet/Cobrand/Default.pm:776 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:208 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:325 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:792 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:388 #: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/reports/edit.html:56 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:61 msgid "Bodies" msgstr "" @@ -613,11 +631,13 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/users/form.html:53 +#: templates/web/base/admin/users/form.html:24 +#: templates/web/zurich/admin/users/form.html:13 msgid "Body:" msgstr "" #: templates/web/base/admin/users/import.html:12 +#: templates/web/base/dashboard/status.html:24 msgid "CSV File" msgstr "" @@ -629,8 +649,7 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:693 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:325 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 #: templates/web/base/admin/responsepriorities/index.html:8 #: templates/web/base/admin/templates/view.html:7 msgid "Categories" @@ -646,15 +665,13 @@ msgstr "" #: templates/web/base/admin/bodies/body.html:73 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:16 -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_inspect.html:15 +#: templates/web/base/report/_item.html:87 #: templates/web/base/report/new/category.html:23 #: templates/web/base/report/new/category_wrapper.html:3 +#: templates/web/zurich/admin/_index_table.html:5 #: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/bodies/form.html:25 -#: templates/web/zurich/admin/index-dm.html:25 -#: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports/index.html:13 #: templates/web/zurich/admin/stats/index.html:26 #: templates/web/zurich/admin/stats/index.html:71 msgid "Category" @@ -664,7 +681,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -687,6 +704,10 @@ msgstr "" msgid "Change" msgstr "" +#: templates/web/base/report/inspect/information.html:62 +msgid "Change asset" +msgstr "" + #: templates/web/base/auth/change_email.html:2 #: templates/web/base/auth/change_email.html:3 msgid "Change email address" @@ -703,7 +724,7 @@ msgstr "" msgid "Change phone number" msgstr "" -#: templates/web/base/auth/generate_token.html:56 +#: templates/web/base/auth/generate_token.html:60 msgid "Change two-factor authentication" msgstr "" @@ -713,12 +734,12 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:44 +#: templates/web/base/report/_inspect.html:45 msgid "Choose another" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:100 msgid "Clear offline data" msgstr "" @@ -755,8 +776,8 @@ msgid "Close" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:162 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,11 +787,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:905 -msgid "Closed by council" -msgstr "" - -#: templates/web/base/admin/reports/edit.html:181 +#: templates/web/base/admin/reports/edit.html:194 msgid "Closed to updates" msgstr "" @@ -803,13 +820,12 @@ msgid "Code" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:71 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:687 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:321 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:432 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -926,7 +942,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:131 +#: templates/web/base/admin/bodies/contact-form.html:164 #: templates/web/zurich/admin/bodies/contact-form.html:51 msgid "Create category" msgstr "" @@ -936,27 +952,25 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:765 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:200 +#: perllib/FixMyStreet/Cobrand/Default.pm:781 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:766 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:201 +#: perllib/FixMyStreet/Cobrand/Default.pm:782 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:764 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:199 +#: perllib/FixMyStreet/Cobrand/Default.pm:780 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/templates/edit.html:84 +#: templates/web/base/admin/templates/edit.html:73 #: templates/web/zurich/admin/templates/edit.html:32 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 +#: templates/web/base/dashboard/status.html:23 #: templates/web/zurich/admin/templates/view.html:10 msgid "Created" msgstr "" @@ -965,6 +979,15 @@ msgstr "" msgid "Created %d new users" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238 +msgid "Created Body" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232 +msgid "Created By" +msgstr "" + #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/reports/edit.html:78 #: templates/web/base/admin/update_edit.html:55 @@ -976,10 +999,6 @@ msgstr "" msgid "Current password:" msgstr "" -#: templates/web/base/auth/generate_token.html:72 -msgid "Current token:" -msgstr "" - #: templates/web/base/dashboard/index.html:93 msgid "Currently grouped by %s" msgstr "" @@ -989,19 +1008,21 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 -#: templates/web/zurich/admin/report_edit-sdm.html:92 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:891 +#: templates/web/zurich/admin/report_edit-sdm.html:98 msgid "Customer not contactable" msgstr "" #: templates/web/base/dashboard/index.html:8 #: templates/web/base/dashboard/index.html:9 +#: templates/web/base/dashboard/status.html:3 +#: templates/web/base/dashboard/status.html:4 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/base/auth/generate_token.html:58 +#: templates/web/base/auth/generate_token.html:62 msgid "Deactivate two-factor authentication" msgstr "" @@ -1013,7 +1034,7 @@ msgstr "" msgid "Default" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:767 +#: perllib/FixMyStreet/Cobrand/Default.pm:783 msgid "Default to creating reports/updates as the council" msgstr "" @@ -1023,7 +1044,7 @@ msgid "Delete" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79 -#: templates/web/base/admin/templates/edit.html:88 +#: templates/web/base/admin/templates/edit.html:77 #: templates/web/zurich/admin/templates/edit.html:36 msgid "Delete template" msgstr "" @@ -1044,9 +1065,7 @@ msgid "Describe why you are moderating this" msgstr "" #: templates/web/base/admin/responsepriorities/index.html:7 -#: templates/web/zurich/admin/index-dm.html:24 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports/index.html:12 +#: templates/web/zurich/admin/_index_table.html:4 msgid "Description" msgstr "" @@ -1054,7 +1073,7 @@ msgstr "" msgid "Destination" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:442 +#: perllib/FixMyStreet/App/Controller/Report.pm:464 msgid "Detailed information is limited to %d characters." msgstr "" @@ -1090,7 +1109,7 @@ msgid "Disable" msgstr "" #: templates/web/base/admin/bodies/contact-form.html:58 -#: templates/web/base/admin/extra-metadata-item.html:99 +#: templates/web/base/admin/extra-metadata-item.html:100 msgid "Disable form when this category is selected" msgstr "" @@ -1098,6 +1117,14 @@ msgstr "" msgid "Disable form when this option is selected" msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:74 +msgid "Disable reopening of reports in this category" +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:68 +msgid "Disable updates on reports in this category" +msgstr "" + #: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" @@ -1132,24 +1159,24 @@ msgstr "" msgid "Don't like forms?" msgstr "" -#: templates/web/base/report/_item.html:27 +#: templates/web/base/report/_item.html:38 msgid "Down one" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:79 msgid "Drag photos here or <u>browse photos</u>" msgstr "" -#: templates/web/base/admin/extra-metadata-item.html:70 +#: templates/web/base/admin/extra-metadata-item.html:71 msgid "Drop-down list" msgstr "" -#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_inspect.html:40 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:49 +#: templates/web/base/report/_inspect.html:50 msgid "Duplicates" msgstr "" @@ -1161,7 +1188,7 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item.html:78 #: templates/web/base/report/inspect/information.html:22 msgid "Easting/Northing:" msgstr "" @@ -1173,7 +1200,7 @@ msgstr "" #: templates/web/base/admin/roles/index.html:24 #: templates/web/base/admin/templates/view.html:31 #: templates/web/base/admin/users/index.html:67 -#: templates/web/zurich/admin/problem_row.html:49 +#: templates/web/zurich/admin/problem_row.html:52 #: templates/web/zurich/admin/templates/view.html:20 msgid "Edit" msgstr "" @@ -1184,12 +1211,11 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:772 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:206 +#: perllib/FixMyStreet/Cobrand/Default.pm:788 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:757 +#: perllib/FixMyStreet/Cobrand/Default.pm:773 msgid "Edit report category" msgstr "" @@ -1197,17 +1223,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:758 +#: perllib/FixMyStreet/Cobrand/Default.pm:774 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:756 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:198 +#: perllib/FixMyStreet/Cobrand/Default.pm:772 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:771 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:205 +#: perllib/FixMyStreet/Cobrand/Default.pm:787 msgid "Edit users' details/search for their reports" msgstr "" @@ -1244,8 +1268,9 @@ msgstr "" #: templates/web/base/admin/users/import.html:24 #: templates/web/base/admin/users/import.html:47 #: templates/web/base/admin/users/index.html:44 -#: templates/web/base/alert/updates.html:21 -#: templates/web/base/report/display_tools.html:50 +#: templates/web/base/alert/updates.html:23 +#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/form/user_loggedout_by_email.html:38 #: templates/web/base/report/new/duplicate_suggestions.html:33 #: templates/web/zurich/admin/bodies/body.html:15 #: templates/web/zurich/admin/bodies/form.html:9 @@ -1254,15 +1279,14 @@ msgstr "" msgid "Email" msgstr "" -#: templates/web/base/alert/_list.html:69 +#: templates/web/base/alert/_list.html:70 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:38 -#: templates/web/base/report/new/form_user_loggedin.html:60 +#: templates/web/base/report/new/form_user_loggedin.html:63 msgid "Email address (optional)" msgstr "" @@ -1282,12 +1306,13 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/users/form.html:28 +#: templates/web/base/admin/users/_form_details.html:21 msgid "Email verified:" msgstr "" -#: templates/web/base/admin/reports/edit.html:151 -#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36 +#: templates/web/base/admin/reports/edit.html:164 +#: templates/web/base/admin/users/_form_details.html:14 +#: templates/web/base/my/my.html:36 #: templates/web/zurich/admin/bodies/contact-form.html:23 msgid "Email:" msgstr "" @@ -1350,11 +1375,11 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:83 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:85 msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:22 +#: perllib/FixMyStreet/Cobrand/UK.pm:26 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -1381,10 +1406,10 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:12 +#: templates/web/base/admin/triage/_list-filters.html:13 #: templates/web/base/admin/triage/_list-filters.html:3 -#: templates/web/base/reports/_list-filters.html:16 -#: templates/web/base/reports/_list-filters.html:28 +#: templates/web/base/reports/_list-filters.html:18 +#: templates/web/base/reports/_list-filters.html:30 msgid "Everything" msgstr "" @@ -1397,7 +1422,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/admin/report-category.html:10 +#: templates/web/base/admin/report-category.html:8 msgid "Existing category" msgstr "" @@ -1406,7 +1431,7 @@ msgid "Existing users won't be modified." msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:70 msgid "Expand map" msgstr "" @@ -1431,7 +1456,7 @@ msgid "External body" msgstr "" #: templates/web/base/admin/reports/edit.html:112 -#: templates/web/base/admin/templates/edit.html:63 +#: templates/web/base/admin/templates/_external.html:10 msgid "External status code" msgstr "" @@ -1443,20 +1468,20 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:734 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:114 +#: templates/web/base/admin/bodies/contact-form.html:146 #: templates/web/base/admin/reports/edit.html:134 #: templates/web/base/admin/update_edit.html:97 #: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_item.html:90 +#: templates/web/base/report/_item.html:99 #: templates/web/base/report/inspect/_extra_details_field.html:2 #: templates/web/base/report/new/category_extras.html:15 msgid "Extra details" @@ -1489,20 +1514,23 @@ msgid "Fill in your details manually." msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:73 msgid "Filter" msgstr "" -#: templates/web/zurich/admin/index-dm.html:35 -#: templates/web/zurich/admin/index-sdm.html:30 -msgid "Filter report list" -msgstr "" - #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:68 msgid "First time" msgstr "" +#: templates/web/base/dashboard/heatmap-list.html:4 +msgid "Five most recent commented reports" +msgstr "" + +#: templates/web/base/dashboard/heatmap-list.html:1 +msgid "Five newest reports" +msgstr "" + #: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1532,7 +1560,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:685 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #: templates/web/base/admin/users/index.html:47 msgid "Flagged" msgstr "" @@ -1541,7 +1569,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/users/form.html:110 +#: templates/web/base/admin/users/form.html:95 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1549,8 +1577,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/reports/edit.html:155 -#: templates/web/base/admin/users/form.html:117 +#: templates/web/base/admin/reports/edit.html:168 +#: templates/web/base/admin/users/form.html:102 msgid "Flagged:" msgstr "" @@ -1576,11 +1604,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:818 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:812 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:819 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:813 msgid "Forwarded wish to external body" msgstr "" @@ -1590,12 +1618,20 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "" +#: templates/web/base/dashboard/heatmap.html:29 +msgid "From" +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:101 +msgid "Frontend staff access only to users assigned to this category" +msgstr "" + #: templates/web/base/contact/enquiry/index.html:1 #: templates/web/base/contact/enquiry/index.html:3 msgid "General Enquiry" msgstr "" -#: templates/web/base/auth/generate_token.html:78 +#: templates/web/base/auth/generate_token.html:75 msgid "Generate token" msgstr "" @@ -1617,7 +1653,7 @@ msgstr "" msgid "Get updates of problems in this %s" msgstr "" -#: templates/web/base/alert/_list.html:80 +#: templates/web/base/alert/_list.html:81 msgid "Give me an RSS feed" msgstr "" @@ -1633,15 +1669,15 @@ msgstr "" #: templates/web/base/admin/index.html:37 #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/responsepriorities/index.html:48 -#: templates/web/base/admin/triage/_list-filters.html:24 -#: templates/web/base/admin/triage/_list-filters.html:39 -#: templates/web/base/admin/triage/_list-filters.html:45 +#: templates/web/base/admin/triage/_list-filters.html:25 +#: templates/web/base/admin/triage/_list-filters.html:40 +#: templates/web/base/admin/triage/_list-filters.html:46 #: templates/web/base/admin/users/index.html:32 #: templates/web/base/around/_postcode_submit_button.html:2 #: templates/web/base/around/_postcode_submit_button.html:5 #: templates/web/base/reports/_list-filters-sort.html:13 -#: templates/web/base/reports/_list-filters.html:40 -#: templates/web/base/reports/_list-filters.html:49 +#: templates/web/base/reports/_list-filters.html:42 +#: templates/web/base/reports/_list-filters.html:51 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1651,7 +1687,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:773 +#: perllib/FixMyStreet/Cobrand/Default.pm:789 msgid "Grant access to the admin" msgstr "" @@ -1677,6 +1713,7 @@ msgstr "" #: templates/web/base/admin/stats/index.html:17 #: templates/web/base/admin/stats/index.html:23 +#: templates/web/base/dashboard/heatmap.html:44 msgid "Heatmap" msgstr "" @@ -1711,7 +1748,8 @@ msgstr "" msgid "Hidden data in reporting form" msgstr "" -#: templates/web/base/admin/users/form.html:196 +#: templates/web/base/admin/users/form.html:181 +#: templates/web/zurich/admin/users/form.html:38 msgid "Hide all reports and updates" msgstr "" @@ -1739,7 +1777,7 @@ msgstr "" #. ("JS") #: templates/web/base/around/display_location.html:65 #: templates/web/base/around/display_location.html:73 -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:76 msgid "Hide pins" msgstr "" @@ -1792,11 +1830,9 @@ msgstr "" #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports/index.html:12 #: templates/web/base/admin/users/alerts.html:8 -#: templates/web/zurich/admin/index-dm.html:23 -#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/_index_table.html:3 #: templates/web/zurich/admin/list_updates.html:24 #: templates/web/zurich/admin/list_updates.html:38 -#: templates/web/zurich/admin/reports/index.html:11 msgid "ID" msgstr "" @@ -1815,15 +1851,15 @@ msgstr "" msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here." msgstr "" -#: templates/web/base/admin/extra-metadata-item.html:100 +#: templates/web/base/admin/extra-metadata-item.html:101 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed." msgstr "" -#: templates/web/base/admin/extra-metadata-item.html:106 +#: templates/web/base/admin/extra-metadata-item.html:107 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script." msgstr "" -#: templates/web/base/admin/templates/edit.html:72 +#: templates/web/base/admin/templates/edit.html:61 msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" @@ -1837,7 +1873,7 @@ msgstr "" msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" -#: templates/web/base/auth/generate_token.html:83 +#: templates/web/base/auth/generate_token.html:80 msgid "If you generate a new token the existing token will no longer work." msgstr "" @@ -1861,7 +1897,7 @@ msgstr "" msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/base/admin/templates/edit.html:59 +#: templates/web/base/admin/templates/_external.html:6 msgid "If you want to use this template to prefill the update field when a report’s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here." msgstr "" @@ -1898,7 +1934,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:124 +#: templates/web/base/admin/bodies/contact-form.html:157 msgid "If you’ve made changes, leave a note explaining what, for other admins to see." msgstr "" @@ -1922,6 +1958,16 @@ 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 "" +#. ("JS") +#: templates/web/base/dashboard/status.html:37 +#: templates/web/base/dashboard/status.html:53 +msgid "In progress" +msgstr "" + +#: templates/web/base/dashboard/heatmap.html:33 +msgid "In wards" +msgstr "" + #: templates/web/base/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/bodies/contact-form.html:40 msgid "Inactive" @@ -1931,20 +1977,20 @@ msgstr "" msgid "Inbox zero, here we come!" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:213 +#: templates/web/zurich/admin/reports/edit.html:217 msgid "Include reporter personal details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:334 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/admin/triage/_inspect.html:31 -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/admin/triage/_inspect.html:30 +#: templates/web/base/report/_inspect.html:4 msgid "Inspect report" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:761 +#: perllib/FixMyStreet/Cobrand/Default.pm:777 msgid "Instruct contractors to fix problems" msgstr "" @@ -1960,16 +2006,12 @@ msgstr "" msgid "Internal notes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 -msgid "Invalid agency_responsible value %s" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:443 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" #: perllib/FixMyStreet/App/Controller/Moderate.pm:305 -#: perllib/FixMyStreet/App/Controller/Report.pm:504 +#: perllib/FixMyStreet/App/Controller/Report.pm:534 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -2020,13 +2062,13 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/report/_item.html:70 +#: templates/web/base/report/_item.html:83 #: templates/web/base/report/inspect/information.html:26 #: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:36 +#: templates/web/base/admin/triage/_list-filters.html:37 #: templates/web/base/reports/_list-filters-sort.html:10 msgid "Least recently updated" msgstr "" @@ -2043,7 +2085,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606 #: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "" @@ -2081,17 +2123,18 @@ msgid "Log in with Twitter" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/report/form/user.html:27 msgid "Log in with email" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:85 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/users/form.html:194 +#: templates/web/base/admin/users/form.html:179 +#: templates/web/zurich/admin/users/form.html:36 msgid "Log out of all sessions" msgstr "" @@ -2109,19 +2152,20 @@ msgstr "" msgid "MAP" msgstr "" -#: templates/web/base/admin/users/form.html:195 +#: templates/web/base/admin/users/form.html:180 +#: templates/web/zurich/admin/users/form.html:37 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:763 +#: perllib/FixMyStreet/Cobrand/Default.pm:779 msgid "Manage shortlist" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:688 +#: perllib/FixMyStreet/Cobrand/Default.pm:704 msgid "Manifest Theme" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:31 +#: templates/web/base/admin/triage/_list-filters.html:32 #: templates/web/base/reports/_list-filters-sort.html:5 msgid "Manual order" msgstr "" @@ -2135,24 +2179,24 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/users/form.html:108 +#: templates/web/base/admin/users/form.html:93 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:760 +#: perllib/FixMyStreet/Cobrand/Default.pm:776 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/enquiry/index.html:41 +#: templates/web/base/contact/enquiry/index.html:42 #: templates/web/base/contact/index.html:109 msgid "Message" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:269 +#: templates/web/zurich/admin/reports/edit.html:273 msgid "Message to competent body:" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:267 +#: templates/web/zurich/admin/reports/edit.html:271 msgid "Message to external body:" msgstr "" @@ -2165,7 +2209,7 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:451 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" @@ -2173,8 +2217,7 @@ msgstr "" msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:755 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:197 +#: perllib/FixMyStreet/Cobrand/Default.pm:771 msgid "Moderate report details" msgstr "" @@ -2197,7 +2240,7 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/admin/reports/edit.html:193 +#: templates/web/base/admin/reports/edit.html:206 #: templates/web/base/admin/update_edit.html:86 msgid "Moderation history" msgstr "" @@ -2207,14 +2250,14 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:37 +#: templates/web/base/admin/triage/_list-filters.html:38 #: templates/web/base/reports/_list-filters-sort.html:11 msgid "Most commented" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:696 -#: perllib/FixMyStreet/App/Controller/Report.pm:703 -#: perllib/FixMyStreet/App/Controller/Report.pm:707 +#: perllib/FixMyStreet/App/Controller/Report.pm:724 +#: perllib/FixMyStreet/App/Controller/Report.pm:731 +#: perllib/FixMyStreet/App/Controller/Report.pm:735 #: templates/web/base/admin/category-checkboxes.html:32 msgid "Multiple Groups" msgstr "" @@ -2242,9 +2285,10 @@ msgstr "" msgid "Name" msgstr "" -#: templates/web/base/admin/reports/edit.html:140 +#: templates/web/base/admin/reports/edit.html:153 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/_form_details.html:10 +#: templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "" @@ -2262,7 +2306,7 @@ msgstr "" msgid "Nearest calculated address:" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:154 +#: perllib/FixMyStreet/Geocode/OSM.pm:155 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" @@ -2270,12 +2314,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:607 +#: perllib/FixMyStreet/Cobrand/Default.pm:623 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:358 +#: perllib/FixMyStreet/Script/Alerts.pm:363 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2298,7 +2342,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334 msgid "New category contact added" msgstr "" @@ -2311,8 +2355,8 @@ msgstr "" msgid "New field" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:96 -#: templates/web/zurich/admin/reports/edit.html:125 +#: templates/web/zurich/admin/report_edit-sdm.html:102 +#: templates/web/zurich/admin/reports/edit.html:129 msgid "New internal note:" msgstr "" @@ -2320,13 +2364,13 @@ msgstr "" msgid "New local problems on FixMyStreet" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:100 +#: templates/web/zurich/admin/report_edit-sdm.html:106 msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 #: templates/web/base/auth/create.html:64 -#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/form/user_loggedout_by_email.html:73 msgid "New password:" msgstr "" @@ -2403,7 +2447,7 @@ msgstr "" msgid "New updates on report <a href=\"%s\">%s</a>" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:33 +#: templates/web/base/admin/triage/_list-filters.html:34 #: templates/web/base/reports/_list-filters-sort.html:7 msgid "Newest" msgstr "" @@ -2416,7 +2460,6 @@ msgstr "" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1262 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 #: templates/web/base/admin/bodies/category.html:5 @@ -2425,11 +2468,11 @@ msgstr "" #: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/reports/edit.html:101 -#: templates/web/base/admin/reports/edit.html:138 +#: templates/web/base/admin/reports/edit.html:151 #: templates/web/base/admin/update_edit.html:26 #: templates/web/base/admin/users/alerts.html:21 -#: templates/web/base/questionnaire/index.html:108 #: templates/web/base/questionnaire/index.html:41 +#: templates/web/base/questionnaire/index.html:85 msgid "No" msgstr "" @@ -2441,11 +2484,12 @@ msgstr "" msgid "No account?" msgstr "" -#: templates/web/base/admin/users/form.html:55 +#: templates/web/base/admin/users/form.html:26 +#: templates/web/zurich/admin/users/form.html:15 msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 msgid "No council selected" msgstr "" @@ -2461,8 +2505,8 @@ msgstr "" msgid "No flagged users found." msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:112 -#: templates/web/zurich/admin/reports/edit.html:248 +#: templates/web/zurich/admin/report_edit-sdm.html:118 +#: templates/web/zurich/admin/reports/edit.html:252 msgid "No further updates" msgstr "" @@ -2498,15 +2542,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/users/form.html:79 -#: templates/web/base/admin/users/form.html:80 +#: templates/web/base/admin/users/form.html:50 +#: templates/web/base/admin/users/form.html:51 msgid "" "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/users/form.html:45 -#: templates/web/base/admin/users/form.html:46 +#: templates/web/base/admin/users/form.html:16 +#: templates/web/base/admin/users/form.html:17 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" @@ -2514,10 +2558,14 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:88 +#: templates/web/zurich/admin/report_edit-sdm.html:94 msgid "Not for my subdivision" msgstr "" +#: templates/web/base/dashboard/heatmap-list.html:5 +msgid "Not from yourself/backend" +msgstr "" + #: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -2565,12 +2613,12 @@ msgid "Offline" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:100 +#: templates/web/base/js/translation_strings.html:102 msgid "Offline data cleared" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:99 msgid "Offline update data saved" msgstr "" @@ -2578,12 +2626,12 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:34 +#: templates/web/base/admin/triage/_list-filters.html:35 #: templates/web/base/reports/_list-filters-sort.html:8 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:98 +#: perllib/FixMyStreet/SendReport/Email.pm:96 msgid "On behalf of %s" msgstr "" @@ -2592,7 +2640,7 @@ msgid "Only staff users will be able to add reports in this category." msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:157 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2623,7 +2671,7 @@ msgstr "" msgid "Open311 specification" msgstr "" -#: templates/web/base/admin/extra-metadata-item.html:75 +#: templates/web/base/admin/extra-metadata-item.html:76 msgid "Options" msgstr "" @@ -2635,7 +2683,7 @@ msgstr "" msgid "Or sign in with password to prefill this information." msgstr "" -#: templates/web/base/alert/_list.html:79 +#: templates/web/base/alert/_list.html:80 msgid "Or subscribe by RSS" msgstr "" @@ -2643,16 +2691,16 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99 -#: perllib/FixMyStreet/App/Controller/Report.pm:703 -#: perllib/FixMyStreet/App/Controller/Report.pm:706 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:770 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:771 -#: perllib/FixMyStreet/DB/Result/Problem.pm:641 -#: perllib/FixMyStreet/DB/Result/Problem.pm:648 -#: perllib/FixMyStreet/DB/Result/Problem.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:672 +#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97 +#: perllib/FixMyStreet/App/Controller/Report.pm:731 +#: perllib/FixMyStreet/App/Controller/Report.pm:734 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:779 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:780 +#: perllib/FixMyStreet/DB/Result/Problem.pm:644 +#: perllib/FixMyStreet/DB/Result/Problem.pm:651 +#: perllib/FixMyStreet/DB/Result/Problem.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:675 #: perllib/FixMyStreet/Queue/Item/Report.pm:132 #: perllib/FixMyStreet/Queue/Item/Report.pm:195 msgid "Other" @@ -2684,7 +2732,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:98 +#: templates/web/base/admin/bodies/contact-form.html:130 msgid "Parent categories" msgstr "" @@ -2692,13 +2740,13 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:51 +#: templates/web/base/report/form/user_loggedout_by_email.html:74 #: templates/web/zurich/auth/general.html:20 #: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248 +#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259 msgid "Password change cancelled." msgstr "" @@ -2710,7 +2758,7 @@ msgstr "" msgid "Permissions" msgstr "" -#: templates/web/base/admin/users/form.html:159 +#: templates/web/base/admin/users/form.html:144 msgid "Permissions:" msgstr "" @@ -2718,19 +2766,23 @@ msgstr "" msgid "Permit blank updates" msgstr "" +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +msgid "Phone" +msgstr "" + #: templates/web/base/report/inspect/information.html:15 msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/form/user_loggedout_by_email.html:56 #: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:13 -#: templates/web/base/report/form/user_loggedout_by_email.html:33 -#: templates/web/base/report/new/form_user_loggedin.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:56 msgid "Phone number (optional)" msgstr "" @@ -2738,30 +2790,26 @@ msgstr "" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/users/form.html:32 +#: templates/web/base/admin/users/_form_details.html:26 msgid "Phone verified:" msgstr "" -#: templates/web/base/admin/reports/edit.html:148 -#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47 +#: templates/web/base/admin/reports/edit.html:161 +#: templates/web/base/admin/users/_form_details.html:24 +#: templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "" #: templates/web/base/admin/update_edit.html:95 -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/report/form/photo_upload.html:19 +#: templates/web/base/report/form/photo_upload.html:21 +#: templates/web/base/report/form/photo_upload.html:4 #: templates/web/base/report/new/form_report.html:41 #: templates/web/base/report/new/form_report.html:56 #: templates/web/base/report/new/form_report.html:58 -#: templates/web/base/report/update/form_update.html:22 -#: templates/web/base/report/update/form_update.html:24 -#: templates/web/base/report/update/form_update.html:7 #: templates/web/base/report/update/moderation_diff.html:4 -#: templates/web/zurich/admin/index-dm.html:31 -#: templates/web/zurich/admin/index-sdm.html:24 -#: templates/web/zurich/admin/reports/index.html:16 +#: templates/web/zurich/admin/_index_table.html:11 #: templates/web/zurich/admin/stats/index.html:58 #: templates/web/zurich/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:36 @@ -2781,9 +2829,8 @@ msgstr "" msgid "Photo upload failed." msgstr "" -#: templates/web/base/questionnaire/index.html:80 +#: templates/web/base/report/form/photo_upload.html:4 #: templates/web/base/report/new/form_report.html:41 -#: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" msgstr "" @@ -2792,7 +2839,7 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/base/contact/enquiry/index.html:49 +#: templates/web/base/contact/enquiry/index.html:50 msgid "Photos/Documents" msgstr "" @@ -2806,6 +2853,10 @@ msgstr "" msgid "Pick your ward" msgstr "" +#: templates/web/base/dashboard/heatmap.html:46 +msgid "Pin map" +msgstr "" + #. ("JS") #: templates/web/base/around/display_location.html:79 #: templates/web/base/js/translation_strings.html:44 @@ -2833,27 +2884,26 @@ msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521 -#: perllib/FixMyStreet/DB/Result/User.pm:263 -#: perllib/FixMyStreet/DB/Result/User.pm:264 +#: perllib/FixMyStreet/DB/Result/User.pm:268 +#: perllib/FixMyStreet/DB/Result/User.pm:269 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:7 msgid "Please check your phone number is correct" msgstr "" #. ("JS") -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111 #: templates/web/base/js/translation_strings.html:21 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:471 #: perllib/FixMyStreet/App/Controller/Auth.pm:497 msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325 #: templates/web/base/admin/bodies/body.html:12 #: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/templates/edit.html:13 @@ -2872,27 +2922,27 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #. ("JS") -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298 -#: perllib/FixMyStreet/DB/Result/Comment.pm:143 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311 +#: perllib/FixMyStreet/DB/Result/Comment.pm:198 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519 -#: perllib/FixMyStreet/DB/Result/User.pm:266 -#: perllib/FixMyStreet/DB/Result/User.pm:267 +#: perllib/FixMyStreet/DB/Result/User.pm:271 +#: perllib/FixMyStreet/DB/Result/User.pm:272 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:4 msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449 msgid "Please enter a name for this body" msgstr "" @@ -2905,16 +2955,16 @@ msgstr "" #. ("JS") #: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/DB/Result/Problem.pm:365 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 #: templates/web/base/js/translation_strings.html:9 msgid "Please enter a subject" msgstr "" #. ("JS") -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261 -#: perllib/FixMyStreet/DB/Result/User.pm:256 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256 +#: perllib/FixMyStreet/DB/Result/User.pm:261 #: templates/web/base/js/translation_strings.html:24 #: templates/web/base/js/translation_strings.html:28 msgid "Please enter a valid email" @@ -2925,20 +2975,20 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250 msgid "Please enter a valid email or phone number" msgstr "" #. ("JS") -#: perllib/FixMyStreet/DB/Result/Problem.pm:371 +#: perllib/FixMyStreet/DB/Result/Problem.pm:392 #: templates/web/base/js/translation_strings.html:14 msgid "Please enter some details" msgstr "" #. ("JS") #: perllib/FixMyStreet/App/Controller/Contact.pm:146 -#: perllib/FixMyStreet/DB/Result/User.pm:254 +#: perllib/FixMyStreet/DB/Result/User.pm:259 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 @@ -2954,7 +3004,7 @@ msgid "Please enter your first name" msgstr "" #. ("JS") -#: perllib/FixMyStreet/Cobrand/UK.pm:337 +#: perllib/FixMyStreet/Cobrand/UK.pm:341 #: templates/web/base/js/translation_strings.html:19 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" @@ -2965,9 +3015,9 @@ msgstr "" #. ("JS") #: perllib/FixMyStreet/App/Controller/Contact.pm:145 -#: perllib/FixMyStreet/DB/Result/Comment.pm:140 -#: perllib/FixMyStreet/DB/Result/Problem.pm:379 -#: perllib/FixMyStreet/DB/Result/User.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Problem.pm:400 +#: perllib/FixMyStreet/DB/Result/User.pm:254 #: templates/web/base/js/translation_strings.html:18 msgid "Please enter your name" msgstr "" @@ -3008,18 +3058,18 @@ msgstr "" msgid "Please generate a two-factor code and enter it below:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #. ("JS") -#: perllib/FixMyStreet/DB/Result/Problem.pm:368 +#: perllib/FixMyStreet/DB/Result/Problem.pm:389 #: templates/web/base/js/translation_strings.html:11 msgid "Please make sure you are not including an email address" msgstr "" #. ("JS") -#: perllib/FixMyStreet/App/Controller/Auth.pm:494 +#: perllib/FixMyStreet/App/Controller/Auth.pm:495 #: templates/web/base/js/translation_strings.html:34 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -3046,24 +3096,28 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:471 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:912 +msgid "Please pick your update preference" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:493 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:453 +#: perllib/FixMyStreet/App/Controller/Report.pm:475 msgid "Please provide a public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259 msgid "Please provide some text as well as a photo" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -3071,7 +3125,7 @@ msgstr "" msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:194 +#: templates/web/zurich/admin/reports/edit.html:198 msgid "Please select a body." msgstr "" @@ -3083,7 +3137,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -3091,12 +3145,12 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:82 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253 msgid "Please verify at least one of email/phone" msgstr "" @@ -3104,27 +3158,23 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_user_loggedin.html:38 -msgid "Post" -msgstr "" - #: templates/web/base/alert/index.html:11 msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:215 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:257 +#: perllib/FixMyStreet/DB/Result/Comment.pm:318 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:306 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:247 +#: perllib/FixMyStreet/DB/Result/Comment.pm:308 msgid "Posted by <strong>%s</strong> at %s" msgstr "" @@ -3140,7 +3190,7 @@ msgstr "" msgid "Prevent new reports from using this category, but keep it available in map filters." msgstr "" -#: templates/web/base/admin/extra-metadata-item.html:94 +#: templates/web/base/admin/extra-metadata-item.html:95 msgid "Prevent user from submitting the form until this field is filled in." msgstr "" @@ -3148,11 +3198,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:708 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Priorities" msgstr "" -#: templates/web/base/report/_item.html:82 +#: templates/web/base/report/_item.html:95 #: templates/web/base/report/inspect/extra_details.html:2 msgid "Priority" msgstr "" @@ -3168,9 +3218,9 @@ msgid "Privacy and cookies" msgstr "" #: templates/web/base/admin/bodies/body.html:90 -#: templates/web/base/admin/reports/edit.html:157 +#: templates/web/base/admin/reports/edit.html:170 #: templates/web/base/report/inspect/information.html:3 -#: templates/web/base/report/new/form_user_loggedin.html:69 +#: templates/web/base/report/new/form_user_loggedin.html:73 msgid "Private" msgstr "" @@ -3216,7 +3266,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:244 +#: perllib/FixMyStreet/App/Controller/Admin.pm:247 msgid "Problem marked as open." msgstr "" @@ -3224,8 +3274,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:754 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:196 +#: perllib/FixMyStreet/Cobrand/Default.pm:770 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3250,18 +3299,18 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:905 +#: perllib/FixMyStreet/Cobrand/Default.pm:921 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265 -#: perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:238 msgid "Problems within %s ward" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 +#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 msgid "Problems within %s ward, %s" msgstr "" @@ -3269,7 +3318,7 @@ msgstr "" #: templates/web/base/admin/triage/index.html:0 #: templates/web/base/admin/triage/index.html:14 #: templates/web/base/reports/body.html:0 -#: templates/web/base/reports/body.html:32 +#: templates/web/base/reports/body.html:27 msgid "Problems within %s, %s" msgstr "" @@ -3277,11 +3326,15 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/admin/extra-metadata-item.html:105 +#: templates/web/base/admin/extra-metadata-item.html:106 msgid "Protect from Open311 changes" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:69 +#: templates/web/base/admin/bodies/contact-form.html:95 +msgid "Protect this category from being re-named" +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:88 msgid "Protect this category's name and group(s) from Open311 changes" msgstr "" @@ -3295,11 +3348,11 @@ msgstr "" msgid "Provide update as" msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:57 +#: templates/web/base/report/form/user_loggedout_by_email.html:80 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/form/user_loggedout_by_email.html:59 +#: templates/web/base/report/form/user_loggedout_by_email.html:82 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -3307,12 +3360,12 @@ msgstr "" msgid "Public details" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:230 -#: templates/web/zurich/admin/reports/edit.html:257 +#: templates/web/zurich/admin/reports/edit.html:234 +#: templates/web/zurich/admin/reports/edit.html:261 msgid "Public response:" msgstr "" -#: templates/web/base/report/inspect/public_update.html:11 +#: templates/web/base/report/inspect/public_update.html:13 msgid "Public update:" msgstr "" @@ -3354,11 +3407,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed for %s ward, %s" msgstr "" @@ -3366,11 +3419,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306 +#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 +#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3378,13 +3431,13 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:906 +#: perllib/FixMyStreet/Cobrand/Default.pm:922 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:233 +#: perllib/FixMyStreet/Cobrand/UK.pm:237 msgid "RSS feed of problems within %s ward" msgstr "" @@ -3398,11 +3451,11 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/report/_item_expandable.html:55 +#: templates/web/base/report/_item_expandable.html:57 msgid "Read less" msgstr "" -#: templates/web/base/report/_item_expandable.html:55 +#: templates/web/base/report/_item_expandable.html:57 msgid "Read more" msgstr "" @@ -3415,7 +3468,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:815 +#: perllib/FixMyStreet/DB/Result/Problem.pm:823 msgid "Received by %s moments later" msgstr "" @@ -3429,7 +3482,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:35 +#: templates/web/base/admin/triage/_list-filters.html:36 #: templates/web/base/reports/_list-filters-sort.html:9 msgid "Recently updated" msgstr "" @@ -3442,7 +3495,8 @@ msgstr "" msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." msgstr "" -#: templates/web/base/admin/users/form.html:197 +#: templates/web/base/admin/users/form.html:182 +#: templates/web/zurich/admin/users/form.html:39 msgid "Remove account details" msgstr "" @@ -3454,8 +3508,8 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/report/_item.html:12 -#: templates/web/base/report/_item.html:9 +#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:23 #: templates/web/base/report/_main.html:147 #: templates/web/base/report/_main.html:24 #: templates/web/base/report/_main.html:32 @@ -3470,17 +3524,21 @@ msgstr "" msgid "Remove option" msgstr "" -#: templates/web/base/admin/reports/edit.html:174 +#: templates/web/base/admin/reports/edit.html:187 #: templates/web/base/admin/update_edit.html:74 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/auth/generate_token.html:78 +#: templates/web/base/admin/users/index.html:85 +msgid "Remove staff permissions" +msgstr "" + +#: templates/web/base/auth/generate_token.html:75 msgid "Replace token" msgstr "" -#: templates/web/zurich/admin/reports/edit.html:228 +#: templates/web/zurich/admin/reports/edit.html:232 msgid "Reply to user:" msgstr "" @@ -3488,14 +3546,14 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/_item.html:73 #: templates/web/base/report/inspect/information.html:7 msgid "Report ID:" msgstr "" #. ("JS") #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:91 #: templates/web/base/navigation/_report.html:6 #: templates/web/base/navigation/_report.html:8 #: templates/web/zurich/footer.html:18 @@ -3504,7 +3562,7 @@ msgid "Report a problem" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:92 #: templates/web/base/navigation/_report.html:4 msgid "Report a problem here" msgstr "" @@ -3519,7 +3577,7 @@ msgid "Report anonymously" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:93 #: templates/web/base/navigation/_report.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3554,7 +3612,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:652 +#: perllib/FixMyStreet/DB/Result/Problem.pm:655 #: templates/web/base/contact/index.html:64 msgid "Reported anonymously at %s" msgstr "" @@ -3565,7 +3623,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:676 +#: perllib/FixMyStreet/DB/Result/Problem.pm:679 #: templates/web/base/contact/index.html:66 msgid "Reported by %s at %s" msgstr "" @@ -3579,27 +3637,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:649 +#: perllib/FixMyStreet/DB/Result/Problem.pm:652 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 +#: perllib/FixMyStreet/DB/Result/Problem.pm:676 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:646 +#: perllib/FixMyStreet/DB/Result/Problem.pm:649 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +#: perllib/FixMyStreet/DB/Result/Problem.pm:673 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:643 +#: perllib/FixMyStreet/DB/Result/Problem.pm:646 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 +#: perllib/FixMyStreet/DB/Result/Problem.pm:668 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3618,17 +3676,15 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:698 -#: perllib/FixMyStreet/Cobrand/Default.pm:712 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:330 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:380 #: templates/web/base/around/tabbed_lists.html:3 #: templates/web/base/dashboard/index.html:108 -#: templates/web/zurich/header.html:48 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:26 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38 msgid "Reports are limited to %s characters in length. Please shorten your report" @@ -3656,15 +3712,15 @@ msgid "Reports published" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:101 +#: templates/web/base/js/translation_strings.html:103 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 +#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3677,7 +3733,7 @@ msgstr "" msgid "Reposition if needed, then hit Continue" msgstr "" -#: templates/web/base/admin/extra-metadata-item.html:93 +#: templates/web/base/admin/extra-metadata-item.html:94 msgid "Required" msgstr "" @@ -3730,39 +3786,45 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:161 +#: perllib/FixMyStreet/Geocode/OSM.pm:162 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:159 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" +#. ("JS") +#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3 +msgid "Roads" +msgstr "" + #: templates/web/base/admin/roles/index.html:5 msgid "Role" msgstr "" -#: templates/web/base/admin/users/form.html:143 +#: templates/web/base/admin/users/form.html:128 #: templates/web/base/admin/users/index.html:29 msgid "Role:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 #: templates/web/base/admin/roles/form.html:1 #: templates/web/base/admin/roles/index.html:1 msgid "Roles" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:416 -#: templates/web/base/admin/reports/edit.html:171 +#: perllib/FixMyStreet/App/Controller/Admin.pm:422 +#: perllib/FixMyStreet/App/Controller/Admin.pm:426 +#: templates/web/base/admin/reports/edit.html:184 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/reports/edit.html:106 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: templates/web/base/admin/reports/edit.html:172 +#: perllib/FixMyStreet/App/Controller/Admin.pm:422 +#: templates/web/base/admin/reports/edit.html:185 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/reports/edit.html:107 msgid "Rotate Right" @@ -3778,20 +3840,20 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/triage/_inspect.html:69 -#: templates/web/base/report/_inspect.html:78 +#: templates/web/base/admin/triage/_inspect.html:68 +#: templates/web/base/report/_inspect.html:79 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:131 +#: templates/web/base/admin/bodies/contact-form.html:164 #: templates/web/base/admin/manifesttheme/form.html:58 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:41 #: templates/web/base/admin/roles/form.html:21 -#: templates/web/base/admin/templates/edit.html:84 -#: templates/web/base/admin/triage/_inspect.html:69 -#: templates/web/base/admin/users/index.html:83 -#: templates/web/base/report/_inspect.html:78 +#: templates/web/base/admin/templates/edit.html:73 +#: templates/web/base/admin/triage/_inspect.html:68 +#: templates/web/base/admin/users/index.html:89 +#: templates/web/base/report/_inspect.html:79 #: templates/web/base/report/_main.html:129 #: templates/web/base/report/update.html:58 #: templates/web/zurich/admin/bodies/contact-form.html:51 @@ -3808,13 +3870,12 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5", "JS") -#: templates/web/base/js/translation_strings.html:102 +#: templates/web/base/js/translation_strings.html:104 msgid "Saving reports offline" msgstr "" #: templates/web/base/admin/index.html:26 #: templates/web/base/admin/reports/index.html:1 -#: templates/web/zurich/admin/reports/index.html:1 msgid "Search Reports" msgstr "" @@ -3827,7 +3888,7 @@ msgstr "" msgid "Search for location of email alert or RSS feed" msgstr "" -#: templates/web/zurich/header.html:70 +#: templates/web/zurich/header.html:79 msgid "Search reports" msgstr "" @@ -3842,12 +3903,12 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users/index.html:89 +#: templates/web/base/admin/users/index.html:95 msgid "Searching found no users." msgstr "" #: templates/web/base/auth/generate_token.html:2 -#: templates/web/base/auth/generate_token.html:45 +#: templates/web/base/auth/generate_token.html:49 #: templates/web/base/my/my.html:75 msgid "Security" msgstr "" @@ -3857,8 +3918,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:768 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:202 +#: perllib/FixMyStreet/Cobrand/Default.pm:784 msgid "See user detail for reports created as the council" msgstr "" @@ -3868,7 +3928,7 @@ msgid "Select a body" msgstr "" #: templates/web/base/admin/bodies/form.html:78 -#: templates/web/base/admin/users/form.html:87 +#: templates/web/base/admin/users/form.html:58 #: templates/web/zurich/admin/bodies/form.html:37 msgid "Select an area" msgstr "" @@ -3889,7 +3949,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/enquiry/index.html:75 +#: templates/web/base/contact/enquiry/index.html:76 #: templates/web/base/contact/index.html:120 msgid "Send" msgstr "" @@ -3902,7 +3962,7 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/users/form.html:25 +#: templates/web/base/admin/users/_form_details.html:17 msgid "Send login email" msgstr "" @@ -3911,11 +3971,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:904 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:892 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:819 +#: perllib/FixMyStreet/DB/Result/Problem.pm:827 msgid "Sent to %s %s later" msgstr "" @@ -3953,7 +4013,7 @@ msgstr "" msgid "Shortlist" msgstr "" -#: templates/web/base/reports/body.html:39 +#: templates/web/base/reports/body.html:34 msgid "Shortlist all visible" msgstr "" @@ -3964,7 +4024,7 @@ msgstr "" msgid "Shortlisted" msgstr "" -#: templates/web/base/report/_item.html:15 +#: templates/web/base/report/_item.html:26 #: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3989,8 +4049,8 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:43 -#: templates/web/base/reports/_list-filters.html:47 +#: templates/web/base/admin/triage/_list-filters.html:44 +#: templates/web/base/reports/_list-filters.html:49 msgid "Show older reports" msgstr "" @@ -4001,7 +4061,7 @@ msgstr "" #. ("JS") #: templates/web/base/around/display_location.html:63 #: templates/web/base/around/display_location.html:71 -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:75 msgid "Show pins" msgstr "" @@ -4061,7 +4121,7 @@ msgid "Some photos of recent reports" msgstr "" #. ('Optional comment for translator') -#: perllib/FixMyStreet/Template.pm:62 +#: perllib/FixMyStreet/Template.pm:66 msgid "Some text to localize" msgstr "" @@ -4070,12 +4130,11 @@ msgid "Someone has moderated this report since you started." msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:78 msgid "Sorry! You’ve hit the limit of images that can be attached to one report." msgstr "" -#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100 -#: perllib/FixMyStreet/Cobrand/UK.pm:86 +#: perllib/FixMyStreet/Cobrand/UK.pm:90 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -4093,9 +4152,9 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:249 -#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47 -#: perllib/FixMyStreet/Geocode/OSM.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:250 +#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50 +#: perllib/FixMyStreet/Geocode/OSM.pm:54 msgid "Sorry, we could not find that location." msgstr "" @@ -4105,13 +4164,13 @@ msgstr "" msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:44 +#: perllib/FixMyStreet/Geocode/Bing.pm:47 #: perllib/FixMyStreet/Geocode/Google.pm:56 #: perllib/FixMyStreet/Geocode/Zurich.pm:119 msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108 +#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54 #: perllib/FixMyStreet/PhotoStorage.pm:63 msgid "Sorry, we couldn't save your file(s), please try again." @@ -4125,11 +4184,11 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:176 +#: perllib/FixMyStreet/App/Controller/Report.pm:195 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report." msgstr "" -#: templates/web/base/admin/triage/_list-filters.html:28 +#: templates/web/base/admin/triage/_list-filters.html:29 #: templates/web/base/reports/_list-filters-sort.html:2 msgid "Sort by" msgstr "" @@ -4138,11 +4197,11 @@ msgstr "" msgid "Staff only" msgstr "" -#: templates/web/base/admin/users/form.html:65 +#: templates/web/base/admin/users/form.html:36 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/users/form.html:69 +#: templates/web/base/admin/users/form.html:40 msgid "Staff:" msgstr "" @@ -4166,18 +4225,18 @@ msgstr "" #: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:102 #: templates/web/base/report/_inspect.html:34 -#: templates/web/base/report/_item.html:78 -#: templates/web/base/report/update/form_update.html:41 +#: templates/web/base/report/_item.html:91 +#: templates/web/base/report/update/form_update.html:18 #: templates/web/zurich/admin/bodies/contact-form.html:37 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107 -#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108 +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110 +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111 msgid "State and external status code cannot be used simultaneously." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:106 +#: perllib/FixMyStreet/Script/Alerts.pm:107 #: templates/web/base/report/_update_state.html:7 #: templates/web/base/report/updates.html:21 msgid "State changed to:" @@ -4186,31 +4245,28 @@ msgstr "" #: templates/web/base/admin/reports/edit.html:128 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:63 -#: templates/web/zurich/admin/reports/edit.html:139 +#: templates/web/zurich/admin/reports/edit.html:143 #: templates/web/zurich/admin/reports/edit.html:91 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:686 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:320 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:431 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:680 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:413 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: 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:61 +#: templates/web/zurich/header.html:70 msgid "Stats" msgstr "" -#: templates/web/zurich/admin/index-dm.html:25 -#: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports/index.html:13 +#: templates/web/zurich/admin/_index_table.html:5 msgid "Status" msgstr "" @@ -4228,7 +4284,7 @@ msgstr "" msgid "Subcategory" msgstr "" -#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/_index_table.html:9 msgid "Subdivision/Body" msgstr "" @@ -4247,50 +4303,48 @@ msgstr "" #: templates/web/base/auth/2fa/form.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/form/user_loggedout_by_email.html:65 +#: templates/web/base/report/form/submit.html:1 +#: templates/web/base/report/form/submit.html:2 #: templates/web/base/report/form/user_loggedout_password.html:29 #: templates/web/base/report/new/form_report.html:21 -#: templates/web/base/report/new/form_user_loggedin.html:73 -#: templates/web/base/report/new/login_success_form.html:17 -#: templates/web/base/report/new/oauth_email_form.html:20 #: templates/web/base/report/new/report_import.html:103 -#: templates/web/zurich/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Submit" msgstr "" -#: templates/web/base/admin/reports/edit.html:185 +#: templates/web/base/admin/reports/edit.html:198 #: templates/web/base/admin/reports/edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/users/form.html:189 -#: templates/web/zurich/admin/report_edit-sdm.html:111 -#: templates/web/zurich/admin/reports/edit.html:253 +#: templates/web/base/admin/users/form.html:174 +#: templates/web/zurich/admin/report_edit-sdm.html:117 +#: templates/web/zurich/admin/reports/edit.html:257 #: templates/web/zurich/admin/update_edit.html:38 +#: templates/web/zurich/admin/users/form.html:31 msgid "Submit changes" msgstr "" -#: templates/web/base/questionnaire/index.html:112 +#: templates/web/base/questionnaire/index.html:89 msgid "Submit questionnaire" msgstr "" -#: templates/web/zurich/admin/index-dm.html:25 +#: templates/web/zurich/admin/_index_table.html:5 #: templates/web/zurich/admin/index-dm.html:8 -#: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports/index.html:13 msgid "Submitted" msgstr "" -#: templates/web/base/alert/_list.html:72 -#: templates/web/base/alert/_list.html:75 -#: templates/web/base/alert/updates.html:24 -#: templates/web/base/alert/updates.html:27 -#: templates/web/base/alert/updates.html:34 -#: templates/web/base/report/display_tools.html:53 -#: templates/web/base/report/display_tools.html:56 -#: templates/web/base/report/display_tools.html:62 +#: templates/web/base/alert/_list.html:73 +#: templates/web/base/alert/_list.html:76 +#: templates/web/base/alert/updates.html:26 +#: templates/web/base/alert/updates.html:29 +#: templates/web/base/alert/updates.html:36 +#: templates/web/base/report/display_tools.html:54 +#: templates/web/base/report/display_tools.html:57 +#: templates/web/base/report/display_tools.html:63 msgid "Subscribe" msgstr "" -#: templates/web/base/alert/_list.html:67 +#: templates/web/base/alert/_list.html:68 msgid "Subscribe by email" msgstr "" @@ -4302,7 +4356,7 @@ msgstr "" msgid "Summaries are limited to %d characters in length. Please shorten your summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138 +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16 msgid "Summaries are limited to %s characters in length. Please shorten your summary" msgstr "" @@ -4316,20 +4370,19 @@ msgstr "" msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:123 +#: templates/web/base/admin/bodies/contact-form.html:156 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:678 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:314 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:409 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:379 #: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 -#: templates/web/zurich/header.html:45 +#: templates/web/zurich/header.html:46 msgid "Summary" msgstr "" @@ -4340,14 +4393,19 @@ msgstr "" #: templates/web/base/admin/stats/index.html:15 #: templates/web/base/dashboard/index.html:21 +#: templates/web/base/dashboard/status.html:14 msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/users/form.html:130 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238 +msgid "Superuser" +msgstr "" + +#: templates/web/base/admin/users/form.html:115 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/users/form.html:126 +#: templates/web/base/admin/users/form.html:111 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" @@ -4365,13 +4423,17 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:704 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:420 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:390 #: templates/web/base/develop/email_list.html:3 -#: templates/web/zurich/header.html:65 +#: templates/web/zurich/header.html:74 msgid "Templates" msgstr "" +#: templates/web/base/dashboard/heatmap-list.html:9 +msgid "Ten least recently updated open reports" +msgstr "" + #: templates/web/zurich/admin/templates/view.html:9 msgid "Text" msgstr "" @@ -4392,6 +4454,10 @@ msgstr "" msgid "Text:" msgstr "" +#: templates/web/base/admin/extra-metadata-item.html:70 +msgid "Textarea" +msgstr "" + #: templates/web/base/tokens/confirm_problem.html:29 msgid "Thank you for reporting this issue!" msgstr "" @@ -4421,7 +4487,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever msgstr "" #: templates/web/base/auth/2fa/intro.html:11 -#: templates/web/base/auth/generate_token.html:30 +#: templates/web/base/auth/generate_token.html:34 msgid "Thanks, you have successfully enabled two-factor authentication on your account." msgstr "" @@ -4433,27 +4499,29 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:161 +#: perllib/FixMyStreet/App/Controller/Location.pm:186 msgid "That location does not appear to be in the UK; please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/Auth.pm:499 +msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 -#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93 -#: perllib/FixMyStreet/Cobrand/UK.pm:79 +#: perllib/FixMyStreet/Cobrand/UK.pm:83 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:156 +#: perllib/FixMyStreet/App/Controller/Report.pm:176 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -4499,8 +4567,8 @@ msgstr "" msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:76 -#: templates/web/base/admin/bodies/contact-form.html:77 +#: templates/web/base/admin/bodies/contact-form.html:108 +#: templates/web/base/admin/bodies/contact-form.html:109 #: templates/web/base/admin/bodies/form.html:101 #: templates/web/base/admin/bodies/form.html:102 msgid "" @@ -4554,7 +4622,7 @@ msgstr "" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:153 +#: perllib/FixMyStreet/Geocode/OSM.pm:154 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -4616,8 +4684,8 @@ msgstr "" msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/users/form.html:13 -#: templates/web/base/admin/users/form.html:14 +#: templates/web/base/admin/users/_form_details.html:4 +#: templates/web/base/admin/users/_form_details.html:5 msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." @@ -4650,7 +4718,7 @@ msgstr "" msgid "There is already a template with that title." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4668,12 +4736,12 @@ msgstr "" msgid "There was a problem with your login information." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:916 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:944 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165 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:376 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4681,7 +4749,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431 msgid "There were problems with your update. Please see below." msgstr "" @@ -4757,10 +4825,10 @@ msgstr "" 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:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210 -#: perllib/FixMyStreet/Cobrand/UK.pm:51 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244 +#: perllib/FixMyStreet/Cobrand/UK.pm:55 msgid "This information is required" msgstr "" @@ -4777,19 +4845,23 @@ msgstr "" msgid "This is the problem" msgstr "" +#: templates/web/base/admin/users/form.html:79 +msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories." +msgstr "" + #: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" -#: templates/web/base/report/update/form_state_checkbox.html:14 +#: templates/web/base/report/update/form_state_checkbox.html:16 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_state_checkbox.html:7 +#: templates/web/base/report/update/form_state_checkbox.html:9 msgid "This problem has not been fixed" msgstr "" -#: templates/web/base/report/update/form_state_checkbox.html:5 +#: templates/web/base/report/update/form_state_checkbox.html:7 msgid "This problem is still ongoing" msgstr "" @@ -4802,26 +4874,26 @@ msgstr "" msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:123 +#: perllib/FixMyStreet/Script/Alerts.pm:124 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:121 +#: perllib/FixMyStreet/Script/Alerts.pm:122 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:125 +#: perllib/FixMyStreet/Script/Alerts.pm:126 msgid "This report is currently marked as open." msgstr "" #: templates/web/base/report/_updates_disallowed_message.html:1 -#: templates/web/base/report/display.html:58 +#: templates/web/base/report/display.html:55 msgid "This report is now closed to updates." msgstr "" @@ -4829,15 +4901,18 @@ msgstr "" msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:106 +#: templates/web/base/auth/generate_token.html:16 +msgid "This will be the only time this token is visible, so please make a note of it now." +msgstr "" + +#: templates/web/zurich/admin/report_edit-sdm.html:112 #: templates/web/zurich/admin/report_edit-sdm.html:66 -#: templates/web/zurich/admin/reports/edit.html:132 +#: templates/web/zurich/admin/reports/edit.html:136 #: templates/web/zurich/admin/reports/edit.html:94 msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:315 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 #: templates/web/base/admin/timeline.html:1 #: templates/web/base/admin/users/index.html:68 #: templates/web/base/admin/users/log.html:1 @@ -4861,6 +4936,10 @@ msgstr "" msgid "Title:" msgstr "" +#: templates/web/base/dashboard/heatmap.html:30 +msgid "To" +msgstr "" + #: templates/web/base/alert/_index_text.html:21 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" @@ -4886,7 +4965,7 @@ msgid "To view a map of the precise location of this issue" msgstr "" #: templates/web/base/auth/generate_token.html:11 -#: templates/web/base/auth/generate_token.html:66 +#: templates/web/base/auth/generate_token.html:70 msgid "Token" msgstr "" @@ -4911,11 +4990,6 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_item.html:86 -#: templates/web/base/report/inspect/extra_details.html:13 -msgid "Traffic management required?" -msgstr "" - #: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" @@ -4938,16 +5012,16 @@ msgstr "" #: templates/web/base/auth/2fa/intro.html:2 #: templates/web/base/auth/2fa/intro.html:6 -#: templates/web/base/auth/generate_token.html:36 -#: templates/web/base/auth/generate_token.html:49 +#: templates/web/base/auth/generate_token.html:40 +#: templates/web/base/auth/generate_token.html:53 msgid "Two-factor authentication" msgstr "" -#: templates/web/base/auth/generate_token.html:29 +#: templates/web/base/auth/generate_token.html:33 msgid "Two-factor authentication has been activated" msgstr "" -#: templates/web/base/auth/generate_token.html:21 +#: templates/web/base/auth/generate_token.html:25 msgid "Two-factor authentication has been deactivated" msgstr "" @@ -4957,7 +5031,7 @@ msgstr "" msgid "Type" msgstr "" -#: templates/web/base/admin/users/form.html:37 +#: templates/web/base/admin/users/_form_details.html:31 msgid "Unban" msgstr "" @@ -4987,10 +5061,10 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:188 #: perllib/FixMyStreet/App/Controller/Develop.pm:207 -#: perllib/FixMyStreet/App/Controller/My.pm:229 -#: perllib/FixMyStreet/App/Controller/Report.pm:141 -#: perllib/FixMyStreet/App/Controller/Report.pm:147 -#: perllib/FixMyStreet/App/Controller/Report.pm:150 +#: perllib/FixMyStreet/App/Controller/My.pm:244 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 +#: perllib/FixMyStreet/App/Controller/Report.pm:167 +#: perllib/FixMyStreet/App/Controller/Report.pm:170 msgid "Unknown problem ID" msgstr "" @@ -5002,13 +5076,13 @@ msgstr "" msgid "Unshortlisted" msgstr "" -#: templates/web/base/report/_item.html:26 +#: templates/web/base/report/_item.html:37 msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/users/alerts.html:58 -#: templates/web/base/report/update/form_update.html:31 +#: templates/web/base/report/update/form_update.html:8 msgid "Update" msgstr "" @@ -5058,29 +5132,27 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/zurich/admin/index-dm.html:25 -#: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports/index.html:13 +#: templates/web/zurich/admin/_index_table.html:5 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:312 msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:253 +#: perllib/FixMyStreet/DB/Result/Comment.pm:314 msgid "Updated by <strong>%s</strong> at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:239 -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 +#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:837 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:862 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:935 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:831 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:856 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:925 msgid "Updated!" msgstr "" @@ -5091,7 +5163,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:149 +#: perllib/FixMyStreet/DB/Result/Comment.pm:204 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -5121,6 +5193,14 @@ msgstr "" msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address." msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:102 +msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end." +msgstr "" + +#: templates/web/base/admin/bodies/contact-form.html:75 +msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update." +msgstr "" + #: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" @@ -5134,8 +5214,8 @@ msgstr "" msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153 -#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277 msgid "User already exists" msgstr "" @@ -5153,7 +5233,7 @@ msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users/form.html:37 +#: templates/web/base/admin/users/_form_details.html:31 #: templates/web/base/admin/users/index.html:65 msgid "User in abuse table" msgstr "" @@ -5166,27 +5246,25 @@ msgstr "" msgid "User's alerts" msgstr "" -#: templates/web/base/admin/reports/edit.html:142 +#: templates/web/base/admin/reports/edit.html:155 #: templates/web/base/admin/update_edit.html:36 msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 -#: perllib/FixMyStreet/Cobrand/Default.pm:770 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:204 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:336 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:425 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:395 #: templates/web/base/admin/flagged.html:29 #: templates/web/base/admin/roles/index.html:25 -#: templates/web/zurich/header.html:57 +#: templates/web/zurich/header.html:66 msgid "Users" msgstr "" -#: templates/web/base/admin/users/form.html:140 +#: templates/web/base/admin/users/form.html:125 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection." msgstr "" -#: templates/web/base/admin/users/form.html:156 +#: templates/web/base/admin/users/form.html:141 msgid "Users can perform the following actions within their assigned body or area." msgstr "" @@ -5194,9 +5272,9 @@ msgstr "" msgid "Users with this role can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372 msgid "Values updated" msgstr "" @@ -5222,7 +5300,7 @@ msgstr "" msgid "View report on site" msgstr "" -#: templates/web/base/reports/body.html:21 +#: templates/web/base/reports/body.html:16 msgid "View reports by ward" msgstr "" @@ -5230,7 +5308,7 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:759 +#: perllib/FixMyStreet/Cobrand/Default.pm:775 msgid "View/Mark private reports" msgstr "" @@ -5248,7 +5326,7 @@ msgstr "" msgid "Ward:" msgstr "" -#: templates/web/base/reports/body.html:23 +#: templates/web/base/reports/body.html:18 msgid "Wards of this council" msgstr "" @@ -5318,7 +5396,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:40 +#: templates/web/base/report/_inspect.html:41 msgid "Which report is it a duplicate of?" msgstr "" @@ -5338,7 +5416,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:103 +#: templates/web/base/questionnaire/index.html:80 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -5350,7 +5428,6 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1261 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 #: templates/web/base/admin/bodies/category.html:6 @@ -5361,12 +5438,12 @@ msgstr "" #: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/reports/edit.html:101 -#: templates/web/base/admin/reports/edit.html:137 +#: templates/web/base/admin/reports/edit.html:150 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/admin/users/index.html:65 -#: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 +#: templates/web/base/questionnaire/index.html:83 msgid "Yes" msgstr "" @@ -5379,7 +5456,7 @@ msgid "You are not sure of the origin or validity of the contact." msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:103 +#: templates/web/base/js/translation_strings.html:105 msgid "You are offline" msgstr "" @@ -5392,7 +5469,7 @@ msgid "You are reporting the following update for being abusive, containing pers msgstr "" #: templates/web/base/report/_updates_disallowed_message.html:2 -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:56 msgid "You can <a href=\"%s\">make a new report in the same location</a>." msgstr "" @@ -5401,7 +5478,7 @@ msgstr "" msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/users/form.html:112 +#: templates/web/base/admin/users/form.html:97 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5431,7 +5508,7 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241 msgid "You cannot rename a category to an existing category" msgstr "" @@ -5441,7 +5518,7 @@ msgid "You declined; please fill in the box above" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:105 +#: templates/web/base/js/translation_strings.html:107 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -5449,7 +5526,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/contact/enquiry/index.html:58 +#: templates/web/base/contact/enquiry/index.html:59 msgid "You have already attached files to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" @@ -5458,8 +5535,7 @@ msgstr "" msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/base/questionnaire/index.html:89 -#: templates/web/base/report/update/form_update.html:16 +#: templates/web/base/report/form/photo_upload.html:13 msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" @@ -5523,9 +5599,9 @@ msgstr "Rapoartele dvs." #: templates/web/base/auth/2fa/intro.html:12 #: templates/web/base/auth/change_password.html:13 -#: templates/web/base/auth/generate_token.html:15 -#: templates/web/base/auth/generate_token.html:23 -#: templates/web/base/auth/generate_token.html:31 +#: templates/web/base/auth/generate_token.html:19 +#: templates/web/base/auth/generate_token.html:27 +#: templates/web/base/auth/generate_token.html:35 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" @@ -5534,13 +5610,14 @@ msgstr "" msgid "Your account requires two-factor authentication to be set up." msgstr "" -#: templates/web/base/alert/updates.html:30 +#: templates/web/base/alert/updates.html:32 #: templates/web/base/auth/create.html:50 #: templates/web/base/auth/general.html:56 #: templates/web/base/contact/enquiry/index.html:18 #: templates/web/base/contact/index.html:91 -#: templates/web/base/report/display_tools.html:59 -#: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/display_tools.html:60 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/form/user_loggedout_email.html:6 #: templates/web/base/report/new/duplicate_suggestions.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" @@ -5569,16 +5646,16 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:301 +#: perllib/FixMyStreet/App/Controller/My.pm:316 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:297 +#: perllib/FixMyStreet/App/Controller/My.pm:312 msgid "Your name has been hidden." msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:97 msgid "Your offline reports" msgstr "" @@ -5598,8 +5675,8 @@ msgid "Your password has expired, please create a new one below. When you click msgstr "" #: templates/web/base/auth/create.html:67 -#: templates/web/base/report/form/user_loggedout_by_email.html:57 -#: templates/web/base/report/form/user_loggedout_by_email.html:59 +#: templates/web/base/report/form/user_loggedout_by_email.html:80 +#: templates/web/base/report/form/user_loggedout_by_email.html:82 #: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" @@ -5632,7 +5709,7 @@ msgid "Your update" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:98 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5663,19 +5740,19 @@ msgstr "" #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18 #: templates/web/base/admin/category-checkboxes.html:5 -#: templates/web/base/admin/users/form.html:167 +#: templates/web/base/admin/users/form.html:152 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:220 -#: perllib/FixMyStreet/DB/Result/User.pm:344 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161 +#: perllib/FixMyStreet/DB/Result/Comment.pm:127 +#: perllib/FixMyStreet/DB/Result/Comment.pm:281 +#: perllib/FixMyStreet/DB/Result/User.pm:349 #: templates/web/base/admin/update_edit.html:92 #: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:261 +#: perllib/FixMyStreet/DB/Result/Comment.pm:322 msgid "and a defect raised" msgstr "" @@ -5683,8 +5760,8 @@ msgstr "" msgid "by %s" msgstr "" -#: templates/web/base/reports/body.html:13 -#: templates/web/base/reports/body.html:14 +#: templates/web/base/reports/body.html:8 +#: templates/web/base/reports/body.html:9 msgid "council" msgstr "" @@ -5715,6 +5792,10 @@ msgstr "" msgid "from %s different users" msgstr "" +#: templates/web/zurich/admin/users/form.html:24 +msgid "government-internal" +msgstr "" + #: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" @@ -5732,7 +5813,7 @@ msgstr "indisponibil" #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19 #: templates/web/base/admin/category-checkboxes.html:6 -#: templates/web/base/admin/users/form.html:168 +#: templates/web/base/admin/users/form.html:153 msgid "none" msgstr "" @@ -5814,12 +5895,12 @@ msgid "today" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:106 +#: templates/web/base/js/translation_strings.html:108 msgid "update" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:107 +#: templates/web/base/js/translation_strings.html:109 msgid "updates" msgstr "" @@ -5844,7 +5925,7 @@ msgid "user removed from abuse list" msgstr "" #: templates/web/base/reports/body.html:0 -#: templates/web/base/reports/body.html:10 +#: templates/web/base/reports/body.html:5 msgid "ward" msgstr "" @@ -5912,7 +5993,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/fixmystreet.com/reports/summary.html:153 +#: templates/web/base/reports/index.html:120 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5936,7 +6017,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/fixmystreet.com/reports/summary.html:168 +#: templates/web/base/reports/index.html:136 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5960,7 +6041,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/westminster/front/stats.html:8 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -5968,7 +6049,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/westminster/front/stats.html:13 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -5976,7 +6057,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/westminster/front/stats.html:19 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -6016,7 +6097,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/email/fixamingata/inactive-account.txt:8 +#: templates/email/default/inactive-account.txt:8 #, perl-format msgid "month" msgid_plural "months" @@ -6024,7 +6105,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/email/westminster/archive.txt:9 +#: templates/email/rutland/archive.html:28 #, perl-format msgid "report" msgid_plural "reports" |