Merge branch 'version-3.0.1'v3.0.1

1 files changed, 79 insertions, 75 deletions

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 1a7551107..2f9446010 100644
--- a/locale/FixMyStreet.po
+++ b/locale/FixMyStreet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-03-03 15:29+0000\n"
+"POT-Creation-Date: 2020-05-06 13:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714 perllib/FixMyStreet/DB/Result/Problem.pm:716 perllib/FixMyStreet/Script/Reports.pm:174
+#: perllib/FixMyStreet/DB/Result/Problem.pm:714 perllib/FixMyStreet/DB/Result/Problem.pm:716 perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 perllib/FixMyStreet/App/Controller/Report/New.pm:764 templates/web/zurich/admin/bodies/form.html:27
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 perllib/FixMyStreet/App/Controller/Report/New.pm:769 templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr ""
 msgid "<span>%s</span> saved."
 msgstr ""
 
-#: templates/web/base/status/stats.html:18 templates/web/zurich/admin/index.html:4
+#: templates/web/base/status/stats.html:17 templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
 msgstr ""
 
@@ -253,7 +253,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:101
+#: templates/web/base/admin/bodies/contact-form.html:108
 msgid "Add another parent category"
 msgstr ""
 
@@ -317,7 +317,7 @@ msgstr ""
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:39
+#: templates/web/base/main_nav_items.html:31
 msgid "Admin"
 msgstr ""
 
@@ -564,11 +564,11 @@ msgstr ""
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:412
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: templates/web/base/admin/stats/fix_rate.html:1 templates/web/base/admin/stats/index.html:6
+#: templates/web/base/admin/stats/fix_rate.html:1 templates/web/base/admin/stats/index.html:14
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
@@ -775,7 +775,7 @@ msgstr ""
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124 templates/web/zurich/admin/bodies/contact-form.html:51
+#: templates/web/base/admin/bodies/contact-form.html:131 templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr ""
 
@@ -1126,7 +1126,7 @@ msgstr ""
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:21
+#: perllib/FixMyStreet/Cobrand/UK.pm:22
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1208,7 +1208,7 @@ msgstr ""
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:107 templates/web/base/admin/reports/edit.html:134 templates/web/base/admin/update_edit.html:97 templates/web/base/report/update/moderation_diff.html:8
+#: templates/web/base/admin/bodies/contact-form.html:114 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 ""
 
@@ -1373,7 +1373,7 @@ msgstr ""
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:82
+#: templates/web/base/admin/stats/index.html:7
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1393,11 +1393,11 @@ msgstr ""
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr ""
 
-#: templates/web/base/admin/stats/index.html:15 templates/web/base/admin/stats/index.html:9
+#: templates/web/base/admin/stats/index.html:17 templates/web/base/admin/stats/index.html:23
 msgid "Heatmap"
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:32 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8
+#: templates/web/base/main_nav_items.html:24 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8
 msgid "Help"
 msgstr ""
 
@@ -1589,7 +1589,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:117
+#: templates/web/base/admin/bodies/contact-form.html:124
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 templates/web/base/report/new/category_wrapper.html:9
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr ""
 
@@ -1737,7 +1737,7 @@ msgstr ""
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:24 templates/web/base/main_nav_items.html:29
+#: templates/web/base/main_nav_items.html:16 templates/web/base/main_nav_items.html:21
 msgid "Local alerts"
 msgstr ""
 
@@ -1931,7 +1931,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
 msgid "New category contact added"
 msgstr ""
 
@@ -2234,7 +2234,7 @@ 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:1423 perllib/FixMyStreet/App/Controller/Report/New.pm:765 perllib/FixMyStreet/App/Controller/Report/New.pm:766 perllib/FixMyStreet/DB/Result/Problem.pm:641 perllib/FixMyStreet/DB/Result/Problem.pm:648 perllib/FixMyStreet/DB/Result/Problem.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:672 perllib/FixMyStreet/Script/Reports.pm:168 perllib/FixMyStreet/Script/Reports.pm:175
+#: 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/Queue/Item/Report.pm:132 perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
 msgstr ""
 
@@ -2262,7 +2262,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:91
+#: templates/web/base/admin/bodies/contact-form.html:98
 msgid "Parent categories"
 msgstr ""
 
@@ -2380,7 +2380,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:1029 perllib/FixMyStreet/App/Controller/Report/New.pm:1073 templates/web/base/js/translation_strings.html:21
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 perllib/FixMyStreet/App/Controller/Report/New.pm:1034 perllib/FixMyStreet/App/Controller/Report/New.pm:1077 templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr ""
 
@@ -2388,7 +2388,7 @@ msgstr ""
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:307 templates/web/base/admin/bodies/body.html:12 templates/web/base/admin/bodies/index.html:4 templates/web/base/admin/templates/edit.html:13
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312 templates/web/base/admin/bodies/body.html:12 templates/web/base/admin/bodies/index.html:4 templates/web/base/admin/templates/edit.html:13
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2404,7 +2404,7 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:293 perllib/FixMyStreet/DB/Result/Comment.pm:143 templates/web/base/js/translation_strings.html:6
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298 perllib/FixMyStreet/DB/Result/Comment.pm:143 templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr ""
 
@@ -2416,7 +2416,7 @@ msgstr ""
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:431
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2459,7 +2459,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:343 templates/web/base/js/translation_strings.html:19
+#: perllib/FixMyStreet/Cobrand/UK.pm:337 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 ""
 
@@ -2642,7 +2642,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:35
+#: templates/web/base/main_nav_items.html:27
 msgid "Privacy"
 msgstr ""
 
@@ -2650,7 +2650,7 @@ msgstr ""
 msgid "Privacy and cookies"
 msgstr ""
 
-#: templates/web/base/admin/bodies/body.html:90 templates/web/base/admin/reports/edit.html:157 templates/web/base/report/inspect/information.html:3 templates/web/base/report/new/form_user_loggedin.html:67
+#: templates/web/base/admin/bodies/body.html:90 templates/web/base/admin/reports/edit.html:157 templates/web/base/report/inspect/information.html:3 templates/web/base/report/new/form_user_loggedin.html:69
 msgid "Private"
 msgstr ""
 
@@ -2690,11 +2690,11 @@ msgstr ""
 msgid "Problem %s sent to council %s"
 msgstr ""
 
-#: templates/web/base/admin/stats/index.html:5 templates/web/base/admin/stats/state.html:12 templates/web/zurich/admin/index.html:9
+#: templates/web/base/admin/stats/index.html:13 templates/web/base/admin/stats/state.html:12 templates/web/zurich/admin/index.html:9
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:276
+#: perllib/FixMyStreet/App/Controller/Admin.pm:244
 msgid "Problem marked as open."
 msgstr ""
 
@@ -2726,15 +2726,15 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:226 perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/Default.pm:905 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:240
+#: perllib/FixMyStreet/Cobrand/UK.pm:234
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -2751,6 +2751,10 @@ msgstr ""
 msgid "Protect from Open311 changes"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:69
+msgid "Protect this category's name and group(s) from Open311 changes"
+msgstr ""
+
 #: templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form-wrapper.html:9 templates/web/base/report/update-form.html:9
 msgid "Provide an update"
 msgstr ""
@@ -2807,19 +2811,19 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
+#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 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
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:317
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2827,11 +2831,11 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/Default.pm:906 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:227
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:239
+#: perllib/FixMyStreet/Cobrand/UK.pm:233
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2929,12 +2933,12 @@ msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:89 templates/web/base/main_nav_items.html:6 templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4
+#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:89 templates/web/base/navigation/_report.html:6 templates/web/base/navigation/_report.html:8 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90 templates/web/base/main_nav_items.html:4
+#: templates/web/base/js/translation_strings.html:90 templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
 
@@ -2947,7 +2951,7 @@ msgid "Report anonymously"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91 templates/web/base/main_nav_items.html:2 templates/web/base/tokens/confirm_problem.html:40
+#: templates/web/base/js/translation_strings.html:91 templates/web/base/navigation/_report.html:2 templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
 msgstr ""
 
@@ -3066,11 +3070,11 @@ msgstr ""
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:304 perllib/FixMyStreet/Cobrand/UK.pm:318
+#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3152,11 +3156,11 @@ msgstr ""
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:444 perllib/FixMyStreet/App/Controller/Admin.pm:448 templates/web/base/admin/reports/edit.html:171 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/reports/edit.html:106
+#: perllib/FixMyStreet/App/Controller/Admin.pm:412 perllib/FixMyStreet/App/Controller/Admin.pm:416 templates/web/base/admin/reports/edit.html:171 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:444 templates/web/base/admin/reports/edit.html:172 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/reports/edit.html:107
+#: perllib/FixMyStreet/App/Controller/Admin.pm:412 templates/web/base/admin/reports/edit.html:172 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
 msgstr ""
 
@@ -3173,7 +3177,7 @@ msgstr ""
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124 templates/web/base/admin/manifesttheme/form.html:58 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:41 templates/web/base/admin/roles/form.html:21 templates/web/base/admin/templates/edit.html:84 templates/web/base/admin/triage/_inspect.html:69 templates/web/base/admin/users/index.html:83 templates/web/base/report/_inspect.html:78 templates/web/base/report/_main.html:129 templates/web/base/report/update.html:58 templates/web/zurich/admin/bodies/contact-form.html:51 templates/web/zurich/admin/templates/edit.html:32
+#: templates/web/base/admin/bodies/contact-form.html:131 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/report/_main.html:129 templates/web/base/report/update.html:58 templates/web/zurich/admin/bodies/contact-form.html:51 templates/web/zurich/admin/templates/edit.html:32
 msgid "Save changes"
 msgstr ""
 
@@ -3306,7 +3310,7 @@ msgstr ""
 msgid "Short Name"
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:149 templates/web/base/report/_main.html:27 templates/web/base/report/_main.html:35
+#: templates/web/base/main_nav_items.html:10 templates/web/base/report/_main.html:149 templates/web/base/report/_main.html:27 templates/web/base/report/_main.html:35
 msgid "Shortlist"
 msgstr ""
 
@@ -3363,7 +3367,7 @@ msgstr ""
 msgid "Show reports in your area"
 msgstr ""
 
-#: templates/web/base/auth/create.html:72 templates/web/base/auth/general.html:4 templates/web/base/auth/general.html:94 templates/web/base/main_nav_items.html:14 templates/web/zurich/auth/general.html:23 templates/web/zurich/auth/general.html:8
+#: templates/web/base/auth/create.html:72 templates/web/base/auth/general.html:4 templates/web/base/auth/general.html:94 templates/web/base/main_nav_items.html:6 templates/web/zurich/auth/general.html:23 templates/web/zurich/auth/general.html:8
 msgid "Sign in"
 msgstr ""
 
@@ -3415,7 +3419,7 @@ msgstr ""
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:95 perllib/FixMyStreet/Cobrand/UK.pm:85
+#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100 perllib/FixMyStreet/Cobrand/UK.pm:86
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3431,7 +3435,7 @@ 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/Geocode/URL.pm:19
+#: 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
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -3503,7 +3507,7 @@ msgstr ""
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680 perllib/FixMyStreet/Cobrand/Zurich.pm:413 templates/web/base/admin/index.html:77 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:61
+#: perllib/FixMyStreet/Cobrand/Default.pm:680 perllib/FixMyStreet/Cobrand/Zurich.pm:413 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
 msgid "Stats"
 msgstr ""
 
@@ -3535,7 +3539,7 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: templates/web/base/auth/2fa/form-add.html:14 templates/web/base/auth/2fa/form.html:20 templates/web/base/auth/smsform.html:27 templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/form/user_loggedout_by_email.html:65 templates/web/base/report/form/user_loggedout_password.html:29 templates/web/base/report/new/form_report.html:21 templates/web/base/report/new/form_user_loggedin.html:71 templates/web/base/report/new/login_success_form.html:17 templates/web/base/report/new/oauth_email_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/base/auth/2fa/form-add.html:14 templates/web/base/auth/2fa/form.html:20 templates/web/base/auth/smsform.html:27 templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/form/user_loggedout_by_email.html:65 templates/web/base/report/form/user_loggedout_password.html:29 templates/web/base/report/new/form_report.html:21 templates/web/base/report/new/form_user_loggedin.html: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
 msgid "Submit"
 msgstr ""
 
@@ -3580,7 +3584,7 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:116
+#: templates/web/base/admin/bodies/contact-form.html:123
 msgid "Summarise your changes"
 msgstr ""
 
@@ -3592,7 +3596,7 @@ msgstr ""
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/stats/index.html:7 templates/web/base/dashboard/index.html:21
+#: templates/web/base/admin/stats/index.html:15 templates/web/base/dashboard/index.html:21
 msgid "Summary statistics"
 msgstr ""
 
@@ -3604,7 +3608,7 @@ msgstr ""
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
-#: templates/web/base/admin/stats/index.html:4 templates/web/base/admin/stats/questionnaire.html:1
+#: templates/web/base/admin/stats/index.html:12 templates/web/base/admin/stats/questionnaire.html:1
 msgid "Survey Results"
 msgstr ""
 
@@ -3680,15 +3684,15 @@ msgstr ""
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 perllib/FixMyStreet/Cobrand/KiitC.pm:157 perllib/FixMyStreet/Cobrand/TransportFocus.pm:88 perllib/FixMyStreet/Cobrand/UK.pm:78
+#: 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
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:263
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
 msgid "That problem will now be resent."
 msgstr ""
 
@@ -3736,7 +3740,7 @@ 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:69 templates/web/base/admin/bodies/contact-form.html:70 templates/web/base/admin/bodies/form.html:101 templates/web/base/admin/bodies/form.html:102
+#: templates/web/base/admin/bodies/contact-form.html:76 templates/web/base/admin/bodies/contact-form.html:77 templates/web/base/admin/bodies/form.html:101 templates/web/base/admin/bodies/form.html:102
 msgid ""
 "The <strong>send method</strong> determines how problem reports will be sent to the body.\n"
 "           If you leave this blank, <strong>send method defaults to email</strong>."
@@ -3836,7 +3840,7 @@ msgstr ""
 msgid "The uploaded CSV file must contain a header row, and records can have the following fields:"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:101
+#: perllib/FixMyStreet/Queue/Item/Report.pm:117
 msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
 msgstr ""
 
@@ -3890,11 +3894,11 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:911 perllib/FixMyStreet/App/Controller/Report/Update.pm:147
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:916 perllib/FixMyStreet/App/Controller/Report/Update.pm:161
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -3902,7 +3906,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -3964,15 +3968,15 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:176
+#: perllib/FixMyStreet/Queue/Item/Report.pm:196
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:179
+#: perllib/FixMyStreet/Queue/Item/Report.pm:199
 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:1087 perllib/FixMyStreet/App/Controller/Report/New.pm:1159 perllib/FixMyStreet/App/Controller/Report/New.pm:1206 perllib/FixMyStreet/Cobrand/UK.pm:50
+#: 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
 msgid "This information is required"
 msgstr ""
 
@@ -4034,7 +4038,7 @@ msgstr ""
 msgid "This report is now closed to updates."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:92
+#: perllib/FixMyStreet/Queue/Item/Report.pm:108
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
@@ -4078,7 +4082,7 @@ msgstr ""
 msgid "To provide an update, please <a href=\"%s\">sign in</a>."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:100
+#: perllib/FixMyStreet/Queue/Item/Report.pm:116
 msgid "To view a map of the precise location of this issue"
 msgstr ""
 
@@ -4236,7 +4240,7 @@ msgstr ""
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:271 perllib/FixMyStreet/App/Controller/Admin/Reports.pm:364 perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 perllib/FixMyStreet/App/Controller/Admin/Users.pm:572 perllib/FixMyStreet/Cobrand/Zurich.pm:837 perllib/FixMyStreet/Cobrand/Zurich.pm:862 perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: 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/Users.pm:382 perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 perllib/FixMyStreet/App/Controller/Admin/Users.pm:572 perllib/FixMyStreet/Cobrand/Zurich.pm:837 perllib/FixMyStreet/Cobrand/Zurich.pm:862 perllib/FixMyStreet/Cobrand/Zurich.pm:935
 msgid "Updated!"
 msgstr ""
 
@@ -4333,7 +4337,7 @@ 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:311 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
 msgid "Values updated"
 msgstr ""
 
@@ -4397,7 +4401,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:185
+#: perllib/FixMyStreet/Queue/Item/Report.pm:149
 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
 msgstr ""
 
@@ -4618,7 +4622,7 @@ msgstr ""
 msgid "Your Reports"
 msgstr ""
 
-#: templates/web/base/auth/2fa/intro.html:12 templates/web/base/auth/change_password.html:13 templates/web/base/auth/generate_token.html:15 templates/web/base/auth/generate_token.html:23 templates/web/base/auth/generate_token.html:31 templates/web/base/main_nav_items.html:12 templates/web/base/my/my.html:18
+#: 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/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4736,7 +4740,7 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220 perllib/FixMyStreet/DB/Result/User.pm:344 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 templates/web/base/admin/update_edit.html:92 templates/web/base/report/update/moderation_meta.html:2
+#: perllib/FixMyStreet/DB/Result/Comment.pm:220 perllib/FixMyStreet/DB/Result/User.pm:344 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161 templates/web/base/admin/update_edit.html:92 templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
@@ -4784,7 +4788,7 @@ msgstr ""
 msgid "less than a minute"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:114 templates/web/base/admin/stats/questionnaire.html:15 templates/web/base/admin/stats/questionnaire.html:16
+#: perllib/FixMyStreet/App/Controller/Admin/Stats.pm:54 templates/web/base/admin/stats/questionnaire.html:15 templates/web/base/admin/stats/questionnaire.html:16
 msgid "n/a"
 msgstr ""
 
@@ -4848,7 +4852,7 @@ msgstr ""
 msgid "this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:169
+#: perllib/FixMyStreet/Queue/Item/Report.pm:133
 msgid "this type of local problem"
 msgstr ""