Merge branch 'version-3.0.1'v3.0.1

1 files changed, 100 insertions, 95 deletions

diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index d3bbfbd0b..e4a336027 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.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-03-03 15:29+0000\n"
+"POT-Creation-Date: 2020-05-06 13:37+0100\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:714
 #: perllib/FixMyStreet/DB/Result/Problem.pm:716
-#: perllib/FixMyStreet/Script/Reports.pm:174
+#: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " dan "
 
@@ -175,8 +175,8 @@ msgstr "(hantar kepada kedua-dua)"
 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
+#: 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 "-- Pilih kategori --"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "<span>%s</span> saved."
 msgstr ""
 
-#: templates/web/base/status/stats.html:18
+#: templates/web/base/status/stats.html:17
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
 msgstr "<strong>%s</strong> masalah"
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Tambahkan cara hubungan dengan borang dibawah"
 
-#: templates/web/base/admin/bodies/contact-form.html:101
+#: templates/web/base/admin/bodies/contact-form.html:108
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Tambah kategori baru"
@@ -359,7 +359,7 @@ msgstr "%s telah ditambahi"
 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 ""
 
@@ -669,12 +669,12 @@ msgstr "Kategori"
 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/index.html:14
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Kategori rata masalah diselesai > 4 minggu"
 
@@ -931,7 +931,7 @@ msgstr "Laporan baru"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:131
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Kategori baru"
@@ -1362,7 +1362,7 @@ msgstr "Endpoint"
 msgid "Enter a Zürich street name"
 msgstr "Masukkan nama jalan Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:21
+#: perllib/FixMyStreet/Cobrand/UK.pm:22
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan"
 
@@ -1457,7 +1457,7 @@ msgstr ""
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:107
+#: 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
@@ -1663,7 +1663,7 @@ msgstr "Teruskan dengan menghantar soalan selidik?"
 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 "Graf masalah dibuat dengan status dari masa ke masa"
 
@@ -1683,12 +1683,12 @@ msgstr "Adakan masalah ini telah diselesai?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama kali anda?"
 
-#: 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/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
@@ -1906,7 +1906,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 ""
 
@@ -2053,7 +2053,7 @@ msgstr "Senaraikan semua laporan masalah"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Loading..."
@@ -2071,8 +2071,8 @@ msgstr "RSS feed tempatan dan pemberitahuan emel"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "RSS feed tempatan dan pemberitahuan emel untuk '%s'"
 
-#: 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 "Pemberitahuan tempatan"
 
@@ -2308,7 +2308,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Badan baru ditambahi"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
 msgid "New category contact added"
 msgstr "Kategori hubungan baru ditambahi"
 
@@ -2656,15 +2656,15 @@ 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/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/Script/Reports.pm:168
-#: perllib/FixMyStreet/Script/Reports.pm:175
+#: perllib/FixMyStreet/Queue/Item/Report.pm:132
+#: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
 msgstr "Lain-lain"
 
@@ -2694,7 +2694,7 @@ msgstr "Laman Tidak Dijumpai"
 msgid "Parent"
 msgstr "Induk"
 
-#: templates/web/base/admin/bodies/contact-form.html:91
+#: templates/web/base/admin/bodies/contact-form.html:98
 #, fuzzy
 msgid "Parent categories"
 msgstr "Kategori baru"
@@ -2856,8 +2856,8 @@ 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
+#: 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 "Sila pilihkan kategori"
@@ -2867,7 +2867,7 @@ msgstr "Sila pilihkan kategori"
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:307
+#: 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
@@ -2887,7 +2887,7 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:293
+#: 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"
@@ -2906,7 +2906,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 ""
 
@@ -2968,7 +2968,7 @@ msgid "Please enter your first name"
 msgstr "Sila masukkan nama pertama anda"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:343
+#: 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 "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah"
@@ -3173,7 +3173,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:35
+#: templates/web/base/main_nav_items.html:27
 msgid "Privacy"
 msgstr ""
 
@@ -3186,7 +3186,7 @@ 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/report/new/form_user_loggedin.html:69
 msgid "Private"
 msgstr "Peribadi"
 
@@ -3229,13 +3229,13 @@ msgstr ""
 msgid "Problem %s sent to council %s"
 msgstr "Masalah %s dihantar kepada majlis %s"
 
-#: templates/web/base/admin/stats/index.html:5
+#: 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 "Pecahan masalah bagi negeri"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:276
+#: perllib/FixMyStreet/App/Controller/Admin.pm:244
 msgid "Problem marked as open."
 msgstr "Masalah ditanda sebagai terbukan"
 
@@ -3271,16 +3271,16 @@ 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/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
+#: perllib/FixMyStreet/Cobrand/UK.pm:277
 msgid "Problems within %s"
 msgstr "Masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:240
+#: perllib/FixMyStreet/Cobrand/UK.pm:234
 msgid "Problems within %s ward"
 msgstr "Masalah dalam kawasan pentadbiran %s"
 
-#: 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 ""
 
@@ -3300,6 +3300,10 @@ msgstr "Alamat bangunan"
 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
@@ -3370,11 +3374,11 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah"
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: 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 "Feed RSS untuk %s"
 
-#: 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 "Feed RSS untuk kawasan pentadbiran %s, %s"
 
@@ -3382,11 +3386,11 @@ msgstr "Feed RSS untuk kawasan pentadbiran %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
 msgid "RSS feed of %s"
 msgstr "Feed RSS untuk %s"
 
-#: 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 "Feed RSS untuk %s, dalam kawasan pentadbiran %s"
 
@@ -3396,11 +3400,11 @@ msgstr "Feed RSS untuk masalah berdekatan"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:906
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:227
 msgid "RSS feed of problems within %s"
 msgstr "Feed RSS untuk masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:239
+#: perllib/FixMyStreet/Cobrand/UK.pm:233
 msgid "RSS feed of problems within %s ward"
 msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s"
 
@@ -3512,15 +3516,16 @@ 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/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/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
 
@@ -3536,7 +3541,7 @@ msgstr "Post tanpa nama pada %s"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:91
-#: templates/web/base/main_nav_items.html:2
+#: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
 msgstr ""
@@ -3676,11 +3681,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 ""
 
@@ -3769,15 +3774,15 @@ msgstr ""
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:444
-#: perllib/FixMyStreet/App/Controller/Admin.pm:448
+#: 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
+#: 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
@@ -3799,7 +3804,7 @@ msgstr ""
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: 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
@@ -3962,7 +3967,7 @@ msgstr "Kongsi"
 msgid "Short Name"
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:18
+#: 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
@@ -4032,7 +4037,7 @@ 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/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:23
 #: templates/web/zurich/auth/general.html:8
 msgid "Sign in"
@@ -4090,8 +4095,8 @@ 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 ""
 
@@ -4111,7 +4116,7 @@ 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/Geocode/OSM.pm:53
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4217,7 +4222,6 @@ 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
@@ -4267,9 +4271,10 @@ msgstr "Tajuk:"
 #: 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/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 "Hantar"
@@ -4332,7 +4337,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 ""
 
@@ -4354,7 +4359,7 @@ msgstr "Ringkasan"
 msgid "Summary reports"
 msgstr "Laporan ringkasan"
 
-#: templates/web/base/admin/stats/index.html:7
+#: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
 msgid "Summary statistics"
 msgstr ""
@@ -4367,7 +4372,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/index.html:12
 #: templates/web/base/admin/stats/questionnaire.html:1
 msgid "Survey Results"
 msgstr "Hasil Kajian"
@@ -4456,16 +4461,16 @@ 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/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 ""
 
@@ -4515,8 +4520,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:69
-#: templates/web/base/admin/bodies/contact-form.html:70
+#: 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 ""
@@ -4624,7 +4629,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 ""
 
@@ -4684,12 +4689,12 @@ 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 ""
 
@@ -4697,7 +4702,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 ""
 
@@ -4765,18 +4770,18 @@ 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 ""
 
@@ -4841,7 +4846,7 @@ msgstr "Laporan ini ditanda sebagai terbuka sekarang."
 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 "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh pengguna."
 
@@ -4897,7 +4902,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 "Melihat lokasi tepat atas peta bagi isu ini"
 
@@ -5089,8 +5094,8 @@ 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.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
@@ -5212,8 +5217,8 @@ msgid "Users with this role can perform the following actions within their assig
 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:316
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
 msgid "Values updated"
 msgstr "Nilai dikemaskinikan"
 
@@ -5288,7 +5293,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 "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada masa kini kita tiada maklumat hubungan mereka. Jika anda tahu hubungan sewajanya, sila menghubungi mereka"
 
@@ -5546,7 +5551,7 @@ msgstr "Laporan Anda"
 #: 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/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -5689,7 +5694,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/DB/Result/Comment.pm:220
 #: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160
+#: 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"
@@ -5744,7 +5749,7 @@ msgstr "kemaskini yang lepas %s"
 msgid "less than a minute"
 msgstr "kurang dari seminit"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:114
+#: 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"
@@ -5826,7 +5831,7 @@ msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta"
 msgid "this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:169
+#: perllib/FixMyStreet/Queue/Item/Report.pm:133
 msgid "this type of local problem"
 msgstr "jenis masalah tempatan ini"